Bump simple-xml-2.7.1 to simple-xml-safe

android/src/main/java/com/genexus/GXGeospatial.java

@@ -15,12 +15,8 @@
 import org.locationtech.spatial4j.shape.Point;
 import org.locationtech.spatial4j.shape.Shape;
 import org.locationtech.spatial4j.shape.SpatialRelation;
-//import org.noggit.JSONParser.*;
-import org.simpleframework.xml.Root;
-import org.simpleframework.xml.Text;
 import com.genexus.internet.IGxJSONSerializable;
 
-@Root
 public final class GXGeospatial implements java.io.Serializable, IGxJSONSerializable{
 
 	private Shape innerShape;
@@ -323,13 +319,11 @@ public boolean intersect(GXGeospatial geowith)
 			return false;
 		}
 	}
-
-	@Text
+
 	public String getXML(){
 		return toWKT();
 	}
-
-	 @Text
+
 	public void setXML(String xml){
 		fromWKT(xml);
 	}

android/src/main/java/com/genexus/wrapper/GXCollectionWrapper.java

@@ -2,13 +2,8 @@
 
 import java.util.List;
 
-import org.simpleframework.xml.ElementList;
-import org.simpleframework.xml.Root;
-
-@Root
 public class GXCollectionWrapper<T> {
 
-    @ElementList(inline = true)
     List<T> list;
 
     public GXCollectionWrapper() {

common/pom.xml

@@ -33,17 +33,6 @@
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
 			<version>2.11.0</version>
-		</dependency>		
-		<dependency>
-			<groupId>org.simpleframework</groupId>
-			<artifactId>simple-xml</artifactId>
-			<version>2.7.1</version>
-			<exclusions>
-				<exclusion>
-					<groupId>*</groupId>
-					<artifactId>*</artifactId>
-				</exclusion>
-    	</exclusions>			
 		</dependency>
 		<dependency>
 			<groupId>org.bouncycastle</groupId>

common/src/main/java/com/genexus/GXBaseCollection.java

@@ -142,18 +142,7 @@ public short AddObjectInstance(XMLReader reader)
 	}
     @Override
     public String toxml(boolean includeHeader, boolean includeState, String header, String namespace) {
-		if(SpecificImplementation.Application.getProperty("SIMPLE_XML_SUPPORT", "0").equals("1")){
-			try {
-				Class<?> me = getClass();
-				Object struct = me.getMethod("getStruct", new Class[]{}).invoke(this, (Object[]) null);
-				return GXXMLSerializer.serializeSimpleXml(includeHeader, SpecificImplementation.Application.createCollectionWrapper(struct), header, this.elementsName, this.containedXmlNamespace); //simplexml
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-			return "";
-		}else{
-			return super.toxml(includeHeader, includeState, header, namespace);
-		}
+		return super.toxml(includeHeader, includeState, header, namespace);
     }
 
     @Override

common/src/main/java/com/genexus/GXSimpleCollection.java

@@ -1,45 +1,33 @@
 package com.genexus;
 
-import java.io.Serializable;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.AbstractCollection;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.Enumeration;
 import java.util.List;
 import java.util.StringTokenizer;
 import java.util.Vector;
 import java.util.Iterator;
-import java.io.InputStream;
-import java.io.StringWriter;
 
 import com.genexus.common.classes.AbstractGXFile;
-import com.genexus.ModelContext;
 import com.genexus.common.interfaces.SpecificImplementation;
 import com.genexus.db.DynamicExecute;
 import com.genexus.internet.IGxJSONAble;
 import com.genexus.internet.IGxJSONSerializable;
 import com.genexus.internet.StringCollection;
 import com.genexus.util.GXMap;
 import com.genexus.util.Quicksort;
-import com.genexus.xml.GXXMLSerializer;
 import com.genexus.xml.XMLReader;
-import com.genexus.xml.GXXMLSerializable;
 
 import com.genexus.xml.XMLWriter;
 
 import json.org.json.IJsonFormattable;
 import json.org.json.JSONArray;
 import json.org.json.JSONException;
 
-import org.simpleframework.xml.*;
-
-@Root(name="Collection")
 public class GXSimpleCollection<T> extends GXBaseList<T> {
 
-	@ElementList(entry="item",inline=true)
     GXSimpleCollection<T> list;
 	protected Class<T> elementsType;
 	protected String elementsName;
@@ -266,28 +254,16 @@ public String toxml(boolean includeHeader, String header, String namespace)
 	}
 
     public String toxml(boolean includeHeader, boolean includeState, String header, String namespace) {
-
-		if(SpecificImplementation.Application.getProperty("SIMPLE_XML_SUPPORT", "0").equals("1"))
-		{
-			try {
-				return GXXMLSerializer.serializeSimpleXml(includeHeader, SpecificImplementation.Application.createCollectionWrapper(this), header);
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-			return "";
-		}
-		else{
-			XMLWriter writer = new XMLWriter();
-			writer.setEncoding("UTF8");
-			writer.openToString();
-			if (includeHeader)
-				writer.writeStartDocument("UTF-8");
-			if (namespace == "")
-				namespace = "[*:nosend]";
-			writexml(writer, header, namespace, includeState);
-			writer.close();
-			return writer.getResultingString();
-		}
+		XMLWriter writer = new XMLWriter();
+		writer.setEncoding("UTF8");
+		writer.openToString();
+		if (includeHeader)
+			writer.writeStartDocument("UTF-8");
+		if (namespace == "")
+			namespace = "[*:nosend]";
+		writexml(writer, header, namespace, includeState);
+		writer.close();
+		return writer.getResultingString();
     }
 
 	public short readCollection( XMLReader oReader )
@@ -355,25 +331,18 @@ public boolean fromxml(String xml, String collName)
 	public boolean fromxml(String xml, GXBaseCollection<SdtMessages_Message> messages, String collName)
 	{
 		try{
-			if(SpecificImplementation.Application.getProperty("SIMPLE_XML_SUPPORT", "0").equals("1"))
-            {
-                xml=xml.replaceAll("<item>", "<item class=\""+elementsType.getName()+"\">");
-                GXXMLSerializer.deserializeSimpleXml(this, xml);
-                return true;
-            } else {
-				XMLReader reader = new XMLReader();
-				reader.openFromString(xml);
-				short result;
-				result = readIntegralCollectionFromXML(reader, "item");
-
-				reader.close();
-				if (result <= 0) { 
-					CommonUtil.ErrorToMessages(String.valueOf(reader.getErrCode()), reader.getErrDescription(), messages);
-					return false;
-				}
-				else
-					return true;
+			XMLReader reader = new XMLReader();
+			reader.openFromString(xml);
+			short result;
+			result = readIntegralCollectionFromXML(reader, "item");
+
+			reader.close();
+			if (result <= 0) {
+				CommonUtil.ErrorToMessages(String.valueOf(reader.getErrCode()), reader.getErrDescription(), messages);
+				return false;
 			}
+			else
+				return true;
 		}
 		catch(Exception ex)
 		{

common/src/main/java/com/genexus/GxSilentTrnSdt.java

@@ -133,19 +133,12 @@ public boolean fromxml( String sXML, String sName )
 	public boolean fromxml( String sXML, GXBaseCollection<SdtMessages_Message> messages, String sName )
 	{
 		try{
-			if(SpecificImplementation.Application.getProperty("SIMPLE_XML_SUPPORT", "0").equals("1")) {
-             	Class<?> me = getClass();
-             	Object struct = me.getMethod("getStruct", new Class[]{}).invoke(this, (Object[]) null);
-             	me.getMethod("setStruct", struct.getClass()).invoke(this, GXXMLSerializer.deserializeSimpleXml(struct, sXML));
-				return true;
-            }else{
-				boolean result = super.fromxml(sXML, messages, sName);
-				if (getTransaction() != null)
-				{
-					getTransaction().ReloadFromSDT();
-				}
-				return result;
+			boolean result = super.fromxml(sXML, messages, sName);
+			if (getTransaction() != null)
+			{
+				getTransaction().ReloadFromSDT();
 			}
+			return result;
 		}
 		catch(Exception ex)
 		{