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 am...@apache.org on 2007/02/13 13:38:42 UTC
svn commit: r506986 - in
/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen:
CodeGenerationEngine.java emitter/AxisServiceBasedMultiLanguageEmitter.java
Author: amilas
Date: Tue Feb 13 04:38:41 2007
New Revision: 506986
URL: http://svn.apache.org/viewvc?view=rev&rev=506986
Log:
set the iscodegen attribute in codegenerator and read the operations using the operations list
in axis service to preserve the parameter order
Modified:
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java?view=diff&rev=506986&r1=506985&r2=506986
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java Tue Feb 13 04:38:41 2007
@@ -19,6 +19,7 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.description.WSDL11ToAxisServiceBuilder;
import org.apache.axis2.description.WSDL20ToAxisServiceBuilder;
+import org.apache.axis2.description.WSDL20ToAllAxisServicesBuilder;
import org.apache.axis2.util.CommandLineOption;
import org.apache.axis2.util.CommandLineOptionConstants;
import org.apache.axis2.util.CommandLineOptionParser;
@@ -87,11 +88,12 @@
if(CommandLineOptionConstants.WSDL2JavaConstants.WSDL_VERSION_2.
equals(configuration.getWSDLVersion())){
- configuration.setAxisService(
- new WSDL20ToAxisServiceBuilder(wsdlUri,
+ WSDL20ToAxisServiceBuilder builder = new WSDL20ToAxisServiceBuilder(wsdlUri,
configuration.getServiceName(),
- configuration.getPortName()).
- populateService());
+ configuration.getPortName());
+ builder.setCodegen(true);
+ configuration.setAxisService(builder.populateService());
+
}else{
//It'll be WSDL 1.1
Definition wsdl4jDef = readInTheWSDLFile(wsdlUri);
@@ -100,12 +102,12 @@
serviceQname = new QName(wsdl4jDef.getTargetNamespace(), configuration.getServiceName());
}
- configuration.setAxisService(new WSDL11ToAxisServiceBuilder(
- wsdl4jDef,
- serviceQname,
- configuration.getPortName()).
- populateService()
- );
+ WSDL11ToAxisServiceBuilder builder = new WSDL11ToAxisServiceBuilder(
+ wsdl4jDef,
+ serviceQname,
+ configuration.getPortName());
+ builder.setCodegen(true);
+ configuration.setAxisService(builder.populateService());
}
} catch (AxisFault axisFault) {
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java?view=diff&rev=506986&r1=506985&r2=506986
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java Tue Feb 13 04:38:41 2007
@@ -1820,10 +1820,12 @@
Element methodElement;
String serviceName = makeJavaClassName(axisService.getName());
- Iterator operations = axisService.getOperations();
+ Iterator operationNames = axisService.getOperationsNameList().iterator();
boolean opsFound = false;
- while (operations.hasNext()) {
- AxisOperation axisOperation = (AxisOperation) operations.next();
+ QName operationName;
+ while (operationNames.hasNext()) {
+ operationName = (QName) operationNames.next();
+ AxisOperation axisOperation = axisService.getOperation(operationName);
// populate info holder with mep information. This will used in determining which
// message receiver to use, etc.,
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org