You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2016/05/07 20:14:49 UTC
svn commit: r1742748 - in /axis/axis2/java/core/trunk/modules: adb-codegen/
adb-codegen/src/org/apache/axis2/schema/
adb-codegen/src/org/apache/axis2/schema/typemap/
adb-codegen/test-resources/testsuite/
adb-codegen/test/org/apache/axis2/schema/soapenc...
Author: veithen
Date: Sat May 7 20:14:48 2016
New Revision: 1742748
URL: http://svn.apache.org/viewvc?rev=1742748&view=rev
Log:
Remove the SOAP encoding support because
* it is incomplete;
* it is based on a huge amount of absolutely unmaintanable generated code checked into source control;
* there is not a single end to end test that demonstrates that it is actually usable in any way.
Removed:
axis/axis2/java/core/trunk/modules/adb-codegen/test-resources/testsuite/soapencoding.xsd
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/soapencoding/
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/types/xsd/
axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/types/
Modified:
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/typemap/CTypeMap.java
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/typemap/JavaTypeMap.java
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/typemap/TypeMap.java
axis/axis2/java/core/trunk/modules/adb-codegen/sub-build.xml
Modified: axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java?rev=1742748&r1=1742747&r2=1742748&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java (original)
+++ axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java Sat May 7 20:14:48 2016
@@ -184,10 +184,6 @@ public class SchemaCompiler {
//load the base types
baseSchemaTypeMap = SchemaPropertyLoader.getTypeMapperInstance().getTypeMap();
- // adding all the soap encoding schema classes
- processedTypemap.putAll(SchemaPropertyLoader.getTypeMapperInstance().getSoapEncodingTypesMap());
-
-
}
/**
Modified: axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/typemap/CTypeMap.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/typemap/CTypeMap.java?rev=1742748&r1=1742747&r2=1742748&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/typemap/CTypeMap.java (original)
+++ axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/typemap/CTypeMap.java Sat May 7 20:14:48 2016
@@ -171,105 +171,4 @@ public class CTypeMap implements TypeMap
private static void addTypemapping(QName name, String str) {
CTypeMap.typeMap.put(name, str);
}
-
- // Type map for the soap encoding types
- public Map getSoapEncodingTypesMap() {
- return soapEncodingTypeMap;
- }
-
- private static Map soapEncodingTypeMap = new HashMap();
-
- static {
- // populate the soapEncodingTypeMap
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_ARRAY,
- "axutil_array_list_t*");
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_STRUCT,
- "axiom_node_t*");
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_BASE64,
- "axutil_base64_binary_t*");
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_DURATION,
- "axutil_duration_t*");
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_DATETIME,
- "axutil_date_time_t*");
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_NOTATION,
- "axiom_node_t*");
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_TIME,
- "axutil_date_time_t*");
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_DATE,
- "axutil_date_time_t*");
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_GYEARMONTH,
- "axutil_date_time_t*");
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_GYEAR,
- "int");
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_GMONTHDAY,
- "axutil_date_time_t*");
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_GDAY,
- "int");
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_GMONTH,
- "int");
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_BOOLEAN,
- "axis2_bool_t");
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_BASE64BINARY,
- "axutil_base64_binary_t*");
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_HEXBINARY,
- "axiom_node_t*");
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_FLOAT,
- "float");
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_DOUBLE,
- "double");
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_ANYURI,
- "axutil_uri_t*");
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_QNAME,
- "axutil_qname_t*");
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_STRING,
- "axis2_char_t*");
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_NORMALIZEDSTRING,
- "axis2_char_t*");
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_TOKEN,
- "axis2_char_t*");
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_LANGUAGE,
- "axis2_char_t*");
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_NAME,
- "axis2_char_t*");
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_NMTOKEN,
- "axis2_char_t*");
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_NCNAME,
- "axis2_char_t*");
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_ID,
- "axis2_char_t*");
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_IDREF,
- "axis2_char_t*");
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_ENTITY,
- "axis2_char_t*");
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_IDREFS,
- "axis2_char_t*");
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_ENTITIES,
- "axis2_char_t*");
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_DECIMAL,
- "double");
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_INTEGER,
- "int");
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_NONPOSITIVEINTEGER,
- "int");
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_NEGATIVEINTEGER,
- "int");
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_LONG,
- "int64_t");
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_INT,
- "int");
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_SHORT,
- "short");
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_BYTE,
- "axis2_byte_t");
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_NONNEGATIVEINTEGER,
- "unsigned int");
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_UNSIGNEDLONG,
- "uint64_t");
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_UNSIGNEDINT,
- "unsigned int");
- }
-
- private static void addSoapEncodingTypeMapping(QName name, String className) {
- soapEncodingTypeMap.put(name, className);
- }
}
Modified: axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/typemap/JavaTypeMap.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/typemap/JavaTypeMap.java?rev=1742748&r1=1742747&r2=1742748&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/typemap/JavaTypeMap.java (original)
+++ axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/typemap/JavaTypeMap.java Sat May 7 20:14:48 2016
@@ -215,114 +215,4 @@ public class JavaTypeMap implements Type
private static void addTypemapping(QName name, String str) {
typeMap.put(name, str);
}
-
- public Map getSoapEncodingTypesMap() {
- return soapEncodingTypeMap;
- }
-
- private static Map soapEncodingTypeMap = new HashMap();
-
- static {
- // populate the soapEncodingTypeMap
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_ARRAY,
- org.apache.axis2.databinding.types.soapencoding.Array.class.getName());
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_STRUCT,
- org.apache.axis2.databinding.types.soapencoding.Struct.class.getName());
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_BASE64,
- org.apache.axis2.databinding.types.soapencoding.Base64.class.getName());
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_DURATION,
- org.apache.axis2.databinding.types.soapencoding.Duration.class.getName());
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_DATETIME,
- org.apache.axis2.databinding.types.soapencoding.DateTime.class.getName());
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_NOTATION,
- org.apache.axis2.databinding.types.soapencoding.NOTATION.class.getName());
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_TIME,
- org.apache.axis2.databinding.types.soapencoding.Time.class.getName());
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_DATE,
- org.apache.axis2.databinding.types.soapencoding.Date.class.getName());
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_GYEARMONTH,
- org.apache.axis2.databinding.types.soapencoding.GYearMonth.class.getName());
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_GYEAR,
- org.apache.axis2.databinding.types.soapencoding.GYear.class.getName());
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_GMONTHDAY,
- org.apache.axis2.databinding.types.soapencoding.GMonthDay.class.getName());
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_GDAY,
- org.apache.axis2.databinding.types.soapencoding.GDay.class.getName());
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_GMONTH,
- org.apache.axis2.databinding.types.soapencoding.GMonth.class.getName());
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_BOOLEAN,
- org.apache.axis2.databinding.types.soapencoding._boolean.class.getName());
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_BASE64BINARY,
- org.apache.axis2.databinding.types.soapencoding.Base64Binary.class.getName());
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_HEXBINARY,
- org.apache.axis2.databinding.types.soapencoding.HexBinary.class.getName());
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_FLOAT,
- org.apache.axis2.databinding.types.soapencoding._float.class.getName());
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_DOUBLE,
- org.apache.axis2.databinding.types.soapencoding._double.class.getName());
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_ANYURI,
- org.apache.axis2.databinding.types.soapencoding.AnyURI.class.getName());
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_QNAME,
- org.apache.axis2.databinding.types.soapencoding.QName.class.getName());
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_STRING,
- org.apache.axis2.databinding.types.soapencoding.String.class.getName());
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_NORMALIZEDSTRING,
- org.apache.axis2.databinding.types.soapencoding.NormalizedString.class.getName());
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_TOKEN,
- org.apache.axis2.databinding.types.soapencoding.Token.class.getName());
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_LANGUAGE,
- org.apache.axis2.databinding.types.soapencoding.Language.class.getName());
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_NAME,
- org.apache.axis2.databinding.types.soapencoding.Name.class.getName());
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_NMTOKEN,
- org.apache.axis2.databinding.types.soapencoding.NMTOKEN.class.getName());
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_NCNAME,
- org.apache.axis2.databinding.types.soapencoding.NCName.class.getName());
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_NMTOKENS,
- org.apache.axis2.databinding.types.soapencoding.NMTOKENS.class.getName());
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_ID,
- org.apache.axis2.databinding.types.soapencoding.ID.class.getName());
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_IDREF,
- org.apache.axis2.databinding.types.soapencoding.IDREF.class.getName());
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_ENTITY,
- org.apache.axis2.databinding.types.soapencoding.ENTITY.class.getName());
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_IDREFS,
- org.apache.axis2.databinding.types.soapencoding.IDREFS.class.getName());
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_ENTITIES,
- org.apache.axis2.databinding.types.soapencoding.ENTITIES.class.getName());
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_DECIMAL,
- org.apache.axis2.databinding.types.soapencoding.Decimal.class.getName());
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_INTEGER,
- org.apache.axis2.databinding.types.soapencoding.Integer.class.getName());
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_NONPOSITIVEINTEGER,
- org.apache.axis2.databinding.types.soapencoding.NonPositiveInteger.class.getName());
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_NEGATIVEINTEGER,
- org.apache.axis2.databinding.types.soapencoding.NegativeInteger.class.getName());
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_LONG,
- org.apache.axis2.databinding.types.soapencoding._long.class.getName());
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_INT,
- org.apache.axis2.databinding.types.soapencoding._int.class.getName());
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_SHORT,
- org.apache.axis2.databinding.types.soapencoding._short.class.getName());
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_BYTE,
- org.apache.axis2.databinding.types.soapencoding._byte.class.getName());
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_NONNEGATIVEINTEGER,
- org.apache.axis2.databinding.types.soapencoding.NonNegativeInteger.class.getName());
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_UNSIGNEDLONG,
- org.apache.axis2.databinding.types.soapencoding.UnsignedLong.class.getName());
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_UNSIGNEDINT,
- org.apache.axis2.databinding.types.soapencoding.UnsignedInt.class.getName());
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_UNSIGNEDSHORT,
- org.apache.axis2.databinding.types.soapencoding.UnsignedShort.class.getName());
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_UNSIGNEDBYTE,
- org.apache.axis2.databinding.types.soapencoding.UnsignedByte.class.getName());
- addSoapEncodingTypeMapping(SchemaConstants.SOAP_ENCODING_POSITIVEINTEGER,
- org.apache.axis2.databinding.types.soapencoding.PositiveInteger.class.getName());
- }
-
- private static void addSoapEncodingTypeMapping(QName name, String className) {
- soapEncodingTypeMap.put(name, className);
- }
-
-
}
Modified: axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/typemap/TypeMap.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/typemap/TypeMap.java?rev=1742748&r1=1742747&r2=1742748&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/typemap/TypeMap.java (original)
+++ axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/typemap/TypeMap.java Sat May 7 20:14:48 2016
@@ -27,7 +27,5 @@ import java.util.Map;
public interface TypeMap {
public Map getTypeMap();
-
- public Map getSoapEncodingTypesMap();
}
Modified: axis/axis2/java/core/trunk/modules/adb-codegen/sub-build.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/sub-build.xml?rev=1742748&r1=1742747&r2=1742748&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/adb-codegen/sub-build.xml (original)
+++ axis/axis2/java/core/trunk/modules/adb-codegen/sub-build.xml Sat May 7 20:14:48 2016
@@ -78,7 +78,6 @@
<arg file="${testsuite.source.dir}/union2.xsd"/>
<arg file="${testsuite.source.dir}/default_value.xsd"/>
<arg file="${testsuite.source.dir}/complexExtension.xsd"/>
- <arg file="${testsuite.source.dir}/soapencoding.xsd"/>
<arg file="${testsuite.source.dir}/chameleon.xsd"/>
<arg file="${testsuite.source.dir}/nonamespace.xsd"/> <!-- compile only; no tests -->
<arg file="${testsuite.source.dir}/unqualified.xsd"/>