Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 60140 invoked from network); 12 Oct 2007 11:08:47 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 12 Oct 2007 11:08:46 -0000 Received: (qmail 77724 invoked by uid 500); 12 Oct 2007 11:08:33 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 77462 invoked by uid 500); 12 Oct 2007 11:08:32 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 77451 invoked by uid 500); 12 Oct 2007 11:08:32 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 77448 invoked by uid 99); 12 Oct 2007 11:08:32 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Oct 2007 04:08:32 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Oct 2007 11:08:44 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 04F481A9832; Fri, 12 Oct 2007 04:07:54 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r584131 - /webservices/axis2/branches/java/1_3_post_mods/modules/codegen/src/org/apache/axis2/wsdl/codegen/CodeGenerationEngine.java Date: Fri, 12 Oct 2007 11:07:53 -0000 To: axis2-cvs@ws.apache.org From: keithc@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071012110754.04F481A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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: axis-cvs-unsubscribe@ws.apache.org For additional commands, e-mail: axis-cvs-help@ws.apache.org