Author: keithc
Date: Fri Oct 12 04:07:53 2007
New Revision: 584131
URL: http://svn.apache.org/viewvc?rev=584131&view=rev
Log:
Applying 582774r to branch
Modified:
webservices/axis2/branches/java/1_3_post_mods/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java
Modified:
webservices/axis2/branches/java/1_3_post_mods/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_3_post_mods/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java?rev=584131&r1=584130&r2=584131&view=diff
==============================================================================
---
webservices/axis2/branches/java/1_3_post_mods/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java
(original)
+++
webservices/axis2/branches/java/1_3_post_mods/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java
Fri Oct 12 04:07:53 2007
@@ -23,6 +23,7 @@
import org.apache.axis2.description.WSDL11ToAllAxisServicesBuilder;
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;
@@ -94,11 +95,25 @@
if (CommandLineOptionConstants.WSDL2JavaConstants.WSDL_VERSION_2.
equals(configuration.getWSDLVersion())) {
- WSDL20ToAxisServiceBuilder builder = new
WSDL20ToAxisServiceBuilder(wsdlUri,
-
configuration.getServiceName(),
-
configuration.getPortName());
- builder.setCodegen(true);
- configuration.addAxisService(builder.populateService());
+
+ WSDL20ToAxisServiceBuilder builder;
+
+ // jibx currently does not support multiservice
+ if ((configuration.getServiceName() != null) ||
(configuration.getDatabindingType().equals("jibx"))) {
+ builder = new WSDL20ToAxisServiceBuilder(
+ wsdlUri,
+ configuration.getServiceName(),
+ configuration.getPortName(),
+ configuration.isAllPorts());
+ builder.setCodegen(true);
+ configuration.addAxisService(builder.populateService());
+ } else {
+ builder = new WSDL20ToAllAxisServicesBuilder(wsdlUri,
configuration.getPortName());
+ builder.setCodegen(true);
+ builder.setAllPorts(configuration.isAllPorts());
+ configuration.setAxisServices(
+
((WSDL20ToAllAxisServicesBuilder)builder).populateAllServices());
+ }
} else {
//It'll be WSDL 1.1
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
