You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by th...@apache.org on 2006/09/02 08:10:21 UTC
svn commit: r439547 [3/3] - in /webservices/axis2/trunk/java/modules:
adb-codegen/src/org/apache/axis2/schema/
codegen/src/org/apache/axis2/wsdl/codegen/
codegen/src/org/apache/axis2/wsdl/i18n/
codegen/src/org/apache/axis2/wsdl/util/ integration/
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenConfiguration.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenConfiguration.java?rev=439547&r1=439546&r2=439547&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenConfiguration.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenConfiguration.java Fri Sep 1 23:10:21 2006
@@ -430,4 +430,18 @@
);
}
}
+
+ /**
+ * This flag determines whether the generated classes are expected to be
+ * backword compatible with Axis 1.x
+ */
+ private boolean backwordCompatibilityMode = true;
+
+ public boolean isBackwordCompatibilityMode() {
+ return backwordCompatibilityMode;
+ }
+
+ public void setBackwordCompatibilityMode(boolean backwordCompatibilityMode) {
+ this.backwordCompatibilityMode = backwordCompatibilityMode;
+ }
}
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodegenConfigLoader.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodegenConfigLoader.java?rev=439547&r1=439546&r2=439547&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodegenConfigLoader.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodegenConfigLoader.java Fri Sep 1 23:10:21 2006
@@ -178,12 +178,20 @@
}
- config.setFlattenFiles(loadOption(WSDL2JavaConstants.FLATTEN_FILES_OPTION,
- WSDL2JavaConstants.FLATTEN_FILES_OPTION_LONG,
- optionMap)!=null);
-
+ config
+ .setFlattenFiles(loadOption(
+ WSDL2JavaConstants.FLATTEN_FILES_OPTION,
+ WSDL2JavaConstants.FLATTEN_FILES_OPTION_LONG, optionMap) != null);
- //loop through the map and find parameters having the extra prefix.
+ commandLineOption = loadOption(
+ WSDL2JavaConstants.BACKWORD_COMPATIBILITY_OPTION,
+ WSDL2JavaConstants.BACKWORD_COMPATIBILITY_OPTION_LONG,
+ optionMap);
+ if (commandLineOption != null) {
+ config.setBackwordCompatibilityMode(true);
+ }
+
+ // loop through the map and find parameters having the extra prefix.
//put them in the property map
Iterator keyIterator = optionMap.keySet().iterator();
while (keyIterator.hasNext()) {
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/i18n/resource.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/i18n/resource.properties?rev=439547&r1=439546&r2=439547&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/i18n/resource.properties (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/i18n/resource.properties Fri Sep 1 23:10:21 2006
@@ -32,6 +32,7 @@
wsdl2code.arg16=\t -ns2p ns1=pkg1,ns2=pkg2 Specify a custom package name for each namespace specified in the wsdl's schema.
wsdl2code.arg17=\t -ssi Generate an interface for the service implementation (Default: off).
wsdl2code.arg18=\t -wv WSDL Version. Valid Options : 2, 2.0, 1.1
+wsdl2code.arg18=\t -b Generate Axis 1.x backword compatible code
################## prop file loader #################################
propfileload.frameworkMismatch=Number of frameworks and extension names do not match!
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/CommandLineOptionConstants.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/CommandLineOptionConstants.java?rev=439547&r1=439546&r2=439547&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/CommandLineOptionConstants.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/CommandLineOptionConstants.java Fri Sep 1 23:10:21 2006
@@ -42,6 +42,7 @@
String WSDL_VERSION_OPTION = "wv";
String FLATTEN_FILES_OPTION = "f";
String UNWRAP_PARAMETERS = "uw";
+ String BACKWORD_COMPATIBILITY_OPTION = "b";
//long option constants
@@ -67,6 +68,7 @@
String WSDL_VERSION_OPTION_LONG = "wsdl-version";
String FLATTEN_FILES_OPTION_LONG = "flatten-filess";
String UNWRAP_PARAMETERS_LONG = "unwrap-params";
+ String BACKWORD_COMPATIBILITY_OPTION_LONG = "backword-compatible";
String WSDL_VERSION_2 = "2.0";
String WSDL_VERSION_2_OPTIONAL = "2";
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/WSDL2JavaOptionsValidator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/WSDL2JavaOptionsValidator.java?rev=439547&r1=439546&r2=439547&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/WSDL2JavaOptionsValidator.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/util/WSDL2JavaOptionsValidator.java Fri Sep 1 23:10:21 2006
@@ -47,6 +47,7 @@
(WSDL2JavaConstants.WSDL_VERSION_OPTION).equalsIgnoreCase(optionType) ||
(WSDL2JavaConstants.FLATTEN_FILES_OPTION).equalsIgnoreCase(optionType) ||
(WSDL2JavaConstants.UNWRAP_PARAMETERS).equalsIgnoreCase(optionType) ||
+ (WSDL2JavaConstants.BACKWORD_COMPATIBILITY_OPTION).equalsIgnoreCase(optionType) ||
(WSDL2JavaConstants.OUTPUT_LOCATION_OPTION_LONG).equalsIgnoreCase(optionType) ||
(WSDL2JavaConstants.SERVER_SIDE_CODE_OPTION_LONG).equalsIgnoreCase(optionType) ||
@@ -67,7 +68,8 @@
(WSDL2JavaConstants.WSDL_VERSION_OPTION_LONG).equalsIgnoreCase(optionType) ||
(WSDL2JavaConstants.FLATTEN_FILES_OPTION_LONG).equalsIgnoreCase(optionType) ||
(WSDL2JavaConstants.UNWRAP_PARAMETERS_LONG).equalsIgnoreCase(optionType) ||
- (WSDL2JavaConstants.REPOSITORY_PATH_OPTION_LONG).equalsIgnoreCase(optionType)
+ (WSDL2JavaConstants.REPOSITORY_PATH_OPTION_LONG).equalsIgnoreCase(optionType)||
+ (WSDL2JavaConstants.BACKWORD_COMPATIBILITY_OPTION_LONG).equalsIgnoreCase(optionType)
);
}
Modified: webservices/axis2/trunk/java/modules/integration/maven.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/maven.xml?rev=439547&r1=439546&r2=439547&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/maven.xml Fri Sep 1 23:10:21 2006
@@ -162,7 +162,7 @@
<ant:echo>Running codegen for eBaySvc WSDL</ant:echo>
<java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
<classpath refid="maven.dependency.classpath"/>
- <arg line="-ss -sd -g -o target/eBaySvc -s -uri test-resources/eBaySvc.wsdl"/>
+ <arg line="-ss -sd -g -b -o target/eBaySvc -s -uri test-resources/eBaySvc.wsdl"/>
</java>
<ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/eBaySvc"
target="jar.server"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org