You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by em...@apache.org on 2007/03/20 10:13:43 UTC
svn commit: r520342 - in /incubator/cxf/trunk:
rt/core/src/main/java/org/apache/cxf/wsdl11/ testutils/
tools/common/src/main/java/org/apache/cxf/tools/common/
tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/
tools/wsdlto/databinding/jaxb/sr...
Author: ema
Date: Tue Mar 20 02:13:42 2007
New Revision: 520342
URL: http://svn.apache.org/viewvc?view=rev&rev=520342
Log:
[CXF-468]Enable tools to generate code for multiple service
Modified:
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
incubator/cxf/trunk/testutils/pom.xml
incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ToolConstants.java
incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java
incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
incubator/cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java?view=diff&rev=520342&r1=520341&r2=520342
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java Tue Mar 20 02:13:42 2007
@@ -25,6 +25,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.logging.Logger;
import javax.wsdl.Binding;
@@ -154,7 +155,7 @@
public ServiceInfo buildService(Definition def, Service serv) {
return buildService(def, serv, null);
}
-
+
private ServiceInfo buildService(Definition def, Service serv, DescriptionInfo d) {
DescriptionInfo description = d;
if (null == description) {
@@ -286,8 +287,12 @@
}
private void addSchema(Schema schema) {
- if (schemaList.get(schema.getDocumentBaseURI()) == null) {
- schemaList.put(schema.getDocumentBaseURI(), schema.getElement());
+ String docBaseURI = schema.getDocumentBaseURI();
+ Element schemaEle = schema.getElement();
+ if (schemaList.get(docBaseURI) == null) {
+ schemaList.put(docBaseURI, schemaEle);
+ } else if (schemaList.get(docBaseURI) != null && schemaList.containsValue(schemaEle)) {
+ //do nothing
} else {
String tns = schema.getDocumentBaseURI() + "#"
+ schema.getElement().getAttribute("targetNamespace");
Modified: incubator/cxf/trunk/testutils/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/pom.xml?view=diff&rev=520342&r1=520341&r2=520342
==============================================================================
--- incubator/cxf/trunk/testutils/pom.xml (original)
+++ incubator/cxf/trunk/testutils/pom.xml Tue Mar 20 02:13:42 2007
@@ -170,592 +170,188 @@
<version>${project.version}</version>
<executions>
<execution>
- <id>generate-sources</id>
- <phase>generate-sources</phase>
- <configuration>
- <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
- <wsdlOptions>
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/hello_world.wsdl</wsdl>
- <extraargs>
- <extraarg>-b</extraarg>
- <extraarg>
- ${basedir}/src/main/resources/wsdl/async_binding.xml
- </extraarg>
- <extraarg>-sn</extraarg>
- <extraarg>SOAPService</extraarg>
- </extraargs>
- </wsdlOption>
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/hello_world.wsdl</wsdl>
- <extraargs>
- <extraarg>-b</extraarg>
- <extraarg>${basedir}/src/main/resources/wsdl/async_binding.xml
- </extraarg>
- <extraarg>-sn</extraarg>
- <extraarg>SOAPProviderService</extraarg>
- </extraargs>
- </wsdlOption>
-
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/hello_world.wsdl</wsdl>
- <extraargs>
- <extraarg>-b</extraarg>
- <extraarg>${basedir}/src/main/resources/wsdl/async_binding.xml
- </extraarg>
- <extraarg>-sn</extraarg>
- <extraarg>SOAPDispatchService</extraarg>
- </extraargs>
- </wsdlOption>
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/hello_world.wsdl</wsdl>
- <extraargs>
- <extraarg>-b</extraarg>
- <extraarg>${basedir}/src/main/resources/wsdl/async_binding.xml
- </extraarg>
- <extraarg>-sn</extraarg>
- <extraarg>SOAPService_DocLitBare</extraarg>
- </extraargs>
- </wsdlOption>
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/hello_world.wsdl</wsdl>
- <extraargs>
- <extraarg>-b</extraarg>
- <extraarg>${basedir}/src/main/resources/wsdl/async_binding.xml
- </extraarg>
- <extraarg>-sn</extraarg>
- <extraarg>SOAPServiceAddressingDocLitBare</extraarg>
- </extraargs>
- </wsdlOption>
-
-
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/hello_world.wsdl</wsdl>
- <extraargs>
- <extraarg>-b</extraarg>
- <extraarg>${basedir}/src/main/resources/wsdl/async_binding.xml
- </extraarg>
- <extraarg>-sn</extraarg>
- <extraarg>SOAPService_Test1</extraarg>
- </extraargs>
- </wsdlOption>
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/hello_world.wsdl</wsdl>
- <extraargs>
- <extraarg>-b</extraarg>
- <extraarg>${basedir}/src/main/resources/wsdl/async_binding.xml
- </extraarg>
- <extraarg>-sn</extraarg>
- <extraarg>SOAPServiceAddressing</extraarg>
- </extraargs>
- </wsdlOption>
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/hello_world.wsdl</wsdl>
- <extraargs>
- <extraarg>-b</extraarg>
- <extraarg>${basedir}/src/main/resources/wsdl/async_binding.xml
- </extraarg>
- <extraarg>-sn</extraarg>
- <extraarg>SOAPServiceConcurrencyTest</extraarg>
- </extraargs>
- </wsdlOption>
-
-
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/hello_world_soap12.wsdl</wsdl>
- </wsdlOption>
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/hello_world_secure.wsdl</wsdl>
- <extraargs>
- <extraarg>-sn</extraarg>
- <extraarg>SecureSOAPService</extraarg>
- </extraargs>
- </wsdlOption>
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/hello_world_secure.wsdl</wsdl>
- <extraargs>
- <extraarg>-sn</extraarg>
- <extraarg>SecureDontRequireClientAuthSOAPService</extraarg>
- </extraargs>
- </wsdlOption>
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/hello_world_secure.wsdl</wsdl>
- <extraargs>
- <extraarg>-sn</extraarg>
- <extraarg>TargetSecureSOAPService</extraarg>
- </extraargs>
- </wsdlOption>
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/hello_world_secure.wsdl</wsdl>
- <extraargs>
- <extraarg>-sn</extraarg>
- <extraarg>InterSecureSOAPService</extraarg>
- </extraargs>
- </wsdlOption>
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/hello_world_secure.wsdl</wsdl>
- <extraargs>
- <extraarg>-sn</extraarg>
- <extraarg>TargetSecureDontRequireClientAuthSOAPService</extraarg>
- </extraargs>
- </wsdlOption>
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/hello_world_secure.wsdl</wsdl>
- <extraargs>
- <extraarg>-sn</extraarg>
- <extraarg>InterSecureDontRequireClientAuthSOAPService</extraarg>
- </extraargs>
- </wsdlOption>
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/hello_world_secure.wsdl</wsdl>
- <extraargs>
- <extraarg>-sn</extraarg>
- <extraarg>SecureSOAPServiceServerConfiguredByGoodProvider</extraarg>
- </extraargs>
- </wsdlOption>
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/hello_world_secure.wsdl</wsdl>
- <extraargs>
- <extraarg>-sn</extraarg>
- <extraarg>SecureSOAPServiceServerConfiguredByBadProvider</extraarg>
- </extraargs>
- </wsdlOption>
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/hello_world_secure.wsdl</wsdl>
- <extraargs>
- <extraarg>-sn</extraarg>
- <extraarg>SecureSOAPServiceP12</extraarg>
- </extraargs>
- </wsdlOption>
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/hello_world_secure.wsdl</wsdl>
- <extraargs>
- <extraarg>-sn</extraarg>
- <extraarg>SecureSOAPServiceDifferentCipherSuites</extraarg>
- </extraargs>
- </wsdlOption>
-
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/hello_world_secure.wsdl</wsdl>
- <extraargs>
- <extraarg>-sn</extraarg>
- <extraarg>SecureSOAPServiceClientPropertiesSet</extraarg>
- </extraargs>
- </wsdlOption>
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/hello_world_secure.wsdl</wsdl>
- <extraargs>
- <extraarg>-sn</extraarg>
- <extraarg>SecureSOAPServiceClientPropertiesNotSet</extraarg>
- </extraargs>
- </wsdlOption>
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/greeter_control.wsdl</wsdl>
- <extraargs>
- <extraarg>-b</extraarg>
- <extraarg>
- ${basedir}/src/main/resources/wsdl/greeter_control.xjb
- </extraarg>
- <extraarg>-sn</extraarg>
- <extraarg>BasicGreeterService</extraarg>
-
- </extraargs>
- </wsdlOption>
-
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/greeter_control.wsdl</wsdl>
- <extraargs>
- <extraarg>-b</extraarg>
- <extraarg>
- ${basedir}/src/main/resources/wsdl/greeter_control.xjb
- </extraarg>
- <extraarg>-sn</extraarg>
- <extraarg>ControlService</extraarg>
-
- </extraargs>
- </wsdlOption>
-
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/greeter_control.wsdl</wsdl>
- <extraargs>
- <extraarg>-b</extraarg>
- <extraarg>
- ${basedir}/src/main/resources/wsdl/greeter_control.xjb
- </extraarg>
- <extraarg>-sn</extraarg>
- <extraarg>GreeterService</extraarg>
-
- </extraargs>
- </wsdlOption>
-
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/mtom_xop.wsdl</wsdl>
- </wsdlOption>
-
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/swa-mime.wsdl</wsdl>
- </wsdlOption>
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/hello_world_xml_mixed.wsdl</wsdl>
- </wsdlOption>
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/hello_world_xml_bare.wsdl</wsdl>
- </wsdlOption>
-
- <wsdlOption>
- <wsdl>
- ${basedir}/src/main/resources/wsdl/hello_world_xml_wrapped.wsdl
- </wsdl>
- </wsdlOption>
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/hello_world_rpc_lit.wsdl</wsdl>
- <extraargs>
- <extraarg>-sn</extraarg>
- <extraarg>SOAPServiceRPCLit</extraarg>
- </extraargs>
- </wsdlOption>
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/hello_world_rpc_lit.wsdl</wsdl>
- <extraargs>
- <extraarg>-sn</extraarg>
- <extraarg>SOAPServiceProviderRPCLit</extraarg>
- </extraargs>
- </wsdlOption>
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/hello_world_rpc_lit.wsdl</wsdl>
- <extraargs>
- <extraarg>-sn</extraarg>
- <extraarg>SOAPServiceRPCLit1</extraarg>
- </extraargs>
- </wsdlOption>
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/hello_world_rpc_lit.wsdl</wsdl>
- <extraargs>
- <extraarg>-sn</extraarg>
- <extraarg>SOAPServiceRPCLit2</extraarg>
- </extraargs>
- </wsdlOption>
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/hello_world_rpc_lit.wsdl</wsdl>
- <extraargs>
- <extraarg>-sn</extraarg>
- <extraarg>SOAPServiceRPCLit3</extraarg>
- </extraargs>
- </wsdlOption>
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/hello_world_rpc_lit.wsdl</wsdl>
- <extraargs>
- <extraarg>-sn</extraarg>
- <extraarg>SOAPServiceRPCLit4</extraarg>
- </extraargs>
- </wsdlOption>
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/hello_world_rpc_lit.wsdl</wsdl>
- <extraargs>
- <extraarg>-sn</extraarg>
- <extraarg>SOAPServiceRPCLit5</extraarg>
- </extraargs>
- </wsdlOption>
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/hello_world_rpc_lit.wsdl</wsdl>
- <extraargs>
- <extraarg>-sn</extraarg>
- <extraarg>SOAPServiceRPCLit6</extraarg>
- </extraargs>
- </wsdlOption>
-
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/hello_world_mixedstyle.wsdl</wsdl>
- </wsdlOption>
-
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/hello_world_doc_lit.wsdl</wsdl>
- <extraargs>
- <extraarg>-sn</extraarg>
- <extraarg>SOAPService</extraarg>
- </extraargs>
- </wsdlOption>
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/hello_world_doc_lit.wsdl</wsdl>
- <extraargs>
- <extraarg>-sn</extraarg>
- <extraarg>SOAPService2</extraarg>
- </extraargs>
- </wsdlOption>
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/hello_world_doc_lit.wsdl</wsdl>
- <extraargs>
- <extraarg>-sn</extraarg>
- <extraarg>SOAPService3</extraarg>
- </extraargs>
- </wsdlOption>
-
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/hello_world_doc_lit.wsdl</wsdl>
- <extraargs>
- <extraarg>-sn</extraarg>
- <extraarg>SOAPService4</extraarg>
- </extraargs>
- </wsdlOption>
-
-
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/hello_world_doc_lit.wsdl</wsdl>
- <extraargs>
- <extraarg>-sn</extraarg>
- <extraarg>SOAPService5</extraarg>
- </extraargs>
- </wsdlOption>
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/hello_world_doc_lit.wsdl</wsdl>
- <extraargs>
- <extraarg>-sn</extraarg>
- <extraarg>XMLService1</extraarg>
- </extraargs>
- </wsdlOption>
-
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/hello_world_doc_lit.wsdl</wsdl>
- <extraargs>
- <extraarg>-sn</extraarg>
- <extraarg>XMLService2</extraarg>
- </extraargs>
- </wsdlOption>
-
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/hello_world_doc_lit.wsdl</wsdl>
- <extraargs>
- <extraarg>-sn</extraarg>
- <extraarg>XMLService3</extraarg>
- </extraargs>
- </wsdlOption>
-
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/hello_world_doc_lit.wsdl</wsdl>
- <extraargs>
- <extraarg>-sn</extraarg>
- <extraarg>XMLService4</extraarg>
- </extraargs>
- </wsdlOption>
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/doc_lit_bare.wsdl</wsdl>
- </wsdlOption>
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/jms_test.wsdl</wsdl>
- <extraargs>
- <extraarg>-sn</extraarg>
- <extraarg>HelloWorldOneWayQueueService</extraarg>
- </extraargs>
- </wsdlOption>
-
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/jms_test.wsdl</wsdl>
- <extraargs>
- <extraarg>-sn</extraarg>
- <extraarg>HelloWorldPubSubService</extraarg>
- </extraargs>
-
- </wsdlOption>
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/jms_test.wsdl</wsdl>
- <extraargs>
- <extraarg>-sn</extraarg>
- <extraarg>HelloWorldService</extraarg>
- </extraargs>
- </wsdlOption>
-
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/handler_test.wsdl</wsdl>
- </wsdlOption>
-
-
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/soapheader.wsdl</wsdl>
- </wsdlOption>
-
-
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/soapheader2.wsdl</wsdl>
- </wsdlOption>
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/soapheader_rpc.wsdl</wsdl>
- </wsdlOption>
-
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/locator.wsdl</wsdl>
- </wsdlOption>
-
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/schema_validation.wsdl</wsdl>
- </wsdlOption>
-
-
- <wsdlOption>
- <wsdl>
- ${basedir}/src/main/resources/wsdl/anonymous_complex_type.wsdl
- </wsdl>
- </wsdlOption>
-
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/basic_callback_test.wsdl</wsdl>
-
- <extraargs>
- <extraarg>-sn</extraarg>
- <extraarg>SOAPService</extraarg>
- </extraargs>
- </wsdlOption>
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/basic_callback_test.wsdl</wsdl>
-
- <extraargs>
- <extraarg>-sn</extraarg>
- <extraarg>CallbackService</extraarg>
- </extraargs>
- </wsdlOption>
-
- <wsdlOption>
- <wsdl>
- ${basedir}/src/main/resources/wsdl/hello_world_underscore.wsdl
- </wsdl>
- </wsdlOption>
-
- <wsdlOption>
- <wsdl>
- ${basedir}/target/generated/src/main/resources/wsdl/type_test/type_test_xml.wsdl
- </wsdl>
- <dependencies>
- <dependency>
- ${basedir}/target/generated/src/main/resources/wsdl/type_test/type_test_xml_inc.wsdl
- </dependency>
- <dependency>
- ${basedir}/target/generated/src/main/resources/wsdl/type_test/type_test_1.xsd
- </dependency>
- <dependency>
- ${basedir}/target/generated/src/main/resources/wsdl/type_test/type_test_2.xsd
- </dependency>
- <dependency>
- ${basedir}/target/generated/src/main/resources/wsdl/type_test/type_test_3.xsd
- </dependency>
- </dependencies>
- </wsdlOption>
- <wsdlOption>
- <wsdl>
- ${basedir}/target/generated/src/main/resources/wsdl/type_test/type_test_doclit_soap.wsdl
- </wsdl>
- <dependencies>
- <dependency>
- ${basedir}/target/generated/src/main/resources/wsdl/type_test/type_test_doclit.wsdl
- </dependency>
- <dependency>
- ${basedir}/target/generated/src/main/resources/wsdl/type_test/type_test_1.xsd
- </dependency>
- <dependency>
- ${basedir}/target/generated/src/main/resources/wsdl/type_test/type_test_2.xsd
- </dependency>
- <dependency>
- ${basedir}/target/generated/src/main/resources/wsdl/type_test/type_test_3.xsd
- </dependency>
- </dependencies>
- </wsdlOption>
- <wsdlOption>
- <wsdl>
- ${basedir}/target/generated/src/main/resources/wsdl/type_test/type_test_rpclit_soap.wsdl
- </wsdl>
- <dependencies>
- <dependency>
- ${basedir}/target/generated/src/main/resources/wsdl/type_test/type_test_rpclit.wsdl
- </dependency>
- <dependency>
- ${basedir}/target/generated/src/main/resources/wsdl/type_test/type_test_1.xsd
- </dependency>
- <dependency>
- ${basedir}/target/generated/src/main/resources/wsdl/type_test/type_test_2.xsd
- </dependency>
- <dependency>
- ${basedir}/target/generated/src/main/resources/wsdl/type_test/type_test_3.xsd
- </dependency>
- </dependencies>
- </wsdlOption>
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/addNumbers.wsdl</wsdl>
- </wsdlOption>
-
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/calculator.wsdl</wsdl>
- </wsdlOption>
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/jaxb_element_test.wsdl</wsdl>
- </wsdlOption>
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/ordered_param_holder.wsdl</wsdl>
- </wsdlOption>
-
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/wsdl/hello_world_services.wsdl</wsdl>
- </wsdlOption>
-
- </wsdlOptions>
- </configuration>
- <goals>
- <goal>wsdl2java</goal>
- </goals>
- </execution>
+ <id>generate-sources</id>
+ <phase>generate-sources</phase>
+ <configuration>
+ <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
+ <!--xsdOptions>
+ <xsdOption>
+ <xsd>${basedir}/src/main/resources/wsdl/jaxb/misc_test.xsd</xsd>
+ </xsdOption>
+ </xsdOptions-->
+ <wsdlOptions>
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/hello_world.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-b</extraarg>
+ <extraarg>
+ ${basedir}/src/main/resources/wsdl/async_binding.xml
+ </extraarg>
+ </extraargs>
+ </wsdlOption>
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/hello_world_soap12.wsdl</wsdl>
+ </wsdlOption>
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/hello_world_secure.wsdl</wsdl>
+ </wsdlOption>
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/greeter_control.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-b</extraarg>
+ <extraarg>
+ ${basedir}/src/main/resources/wsdl/greeter_control.xjb
+ </extraarg>
+ </extraargs>
+ </wsdlOption>
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/mtom_xop.wsdl</wsdl>
+ </wsdlOption>
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/swa-mime.wsdl</wsdl>
+ </wsdlOption>
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/hello_world_xml_mixed.wsdl</wsdl>
+ </wsdlOption>
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/hello_world_xml_bare.wsdl</wsdl>
+ </wsdlOption>
+ <wsdlOption>
+ <wsdl>
+ ${basedir}/src/main/resources/wsdl/hello_world_xml_wrapped.wsdl
+ </wsdl>
+ </wsdlOption>
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/hello_world_rpc_lit.wsdl</wsdl>
+ </wsdlOption>
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/hello_world_mixedstyle.wsdl</wsdl>
+ </wsdlOption>
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/hello_world_doc_lit.wsdl</wsdl>
+ </wsdlOption>
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/doc_lit_bare.wsdl</wsdl>
+ </wsdlOption>
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/jms_test.wsdl</wsdl>
+ </wsdlOption>
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/handler_test.wsdl</wsdl>
+ </wsdlOption>
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/soapheader.wsdl</wsdl>
+ </wsdlOption>
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/soapheader2.wsdl</wsdl>
+ </wsdlOption>
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/soapheader_rpc.wsdl</wsdl>
+ </wsdlOption>
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/locator.wsdl</wsdl>
+ <!--extraargs>
+ <extraarg>-p</extraarg>
+ <extraarg>org.apache.cxf.testutils.locator</extraarg>
+ </extraargs-->
+ </wsdlOption>
+
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/schema_validation.wsdl</wsdl>
+ </wsdlOption>
+ <wsdlOption>
+ <wsdl>
+ ${basedir}/src/main/resources/wsdl/anonymous_complex_type.wsdl
+ </wsdl>
+ </wsdlOption>
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/basic_callback_test.wsdl</wsdl>
+ </wsdlOption>
+
+ <wsdlOption>
+ <wsdl>
+ ${basedir}/src/main/resources/wsdl/hello_world_underscore.wsdl
+ </wsdl>
+ </wsdlOption>
+
+ <wsdlOption>
+ <wsdl>
+ ${basedir}/target/generated/src/main/resources/wsdl/type_test/type_test_xml.wsdl
+ </wsdl>
+ <dependencies>
+ <dependency>
+ ${basedir}/target/generated/src/main/resources/wsdl/type_test/type_test_xml_inc.wsdl
+ </dependency>
+ <dependency>
+ ${basedir}/target/generated/src/main/resources/wsdl/type_test/type_test_1.xsd
+ </dependency>
+ <dependency>
+ ${basedir}/target/generated/src/main/resources/wsdl/type_test/type_test_2.xsd
+ </dependency>
+ <dependency>
+ ${basedir}/target/generated/src/main/resources/wsdl/type_test/type_test_3.xsd
+ </dependency>
+ </dependencies>
+ </wsdlOption>
+ <wsdlOption>
+ <wsdl>
+ ${basedir}/target/generated/src/main/resources/wsdl/type_test/type_test_doclit_soap.wsdl
+ </wsdl>
+ <dependencies>
+ <dependency>
+ ${basedir}/target/generated/src/main/resources/wsdl/type_test/type_test_doclit.wsdl
+ </dependency>
+ <dependency>
+ ${basedir}/target/generated/src/main/resources/wsdl/type_test/type_test_1.xsd
+ </dependency>
+ <dependency>
+ ${basedir}/target/generated/src/main/resources/wsdl/type_test/type_test_2.xsd
+ </dependency>
+ <dependency>
+ ${basedir}/target/generated/src/main/resources/wsdl/type_test/type_test_3.xsd
+ </dependency>
+ </dependencies>
+ </wsdlOption>
+ <wsdlOption>
+ <wsdl>
+ ${basedir}/target/generated/src/main/resources/wsdl/type_test/type_test_rpclit_soap.wsdl
+ </wsdl>
+ <dependencies>
+ <dependency>
+ ${basedir}/target/generated/src/main/resources/wsdl/type_test/type_test_rpclit.wsdl
+ </dependency>
+ <dependency>
+ ${basedir}/target/generated/src/main/resources/wsdl/type_test/type_test_1.xsd
+ </dependency>
+ <dependency>
+ ${basedir}/target/generated/src/main/resources/wsdl/type_test/type_test_2.xsd
+ </dependency>
+ <dependency>
+ ${basedir}/target/generated/src/main/resources/wsdl/type_test/type_test_3.xsd
+ </dependency>
+ </dependencies>
+ </wsdlOption>
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/addNumbers.wsdl</wsdl>
+ </wsdlOption>
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/calculator.wsdl</wsdl>
+ </wsdlOption>
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/jaxb_element_test.wsdl</wsdl>
+ </wsdlOption>
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/ordered_param_holder.wsdl</wsdl>
+ </wsdlOption>
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/wsdl/hello_world_services.wsdl</wsdl>
+ </wsdlOption>
+ </wsdlOptions>
+ </configuration>
+ <goals>
+ <goal>wsdl2java</goal>
+ </goals>
+ </execution>
</executions>
</plugin>
</plugins>
Modified: incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ToolConstants.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ToolConstants.java?view=diff&rev=520342&r1=520341&r2=520342
==============================================================================
--- incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ToolConstants.java (original)
+++ incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ToolConstants.java Tue Mar 20 02:13:42 2007
@@ -174,7 +174,7 @@
- public static final String SCHEMA_LIST = "schemaList";
+ public static final String SCHEMA_MAP = "schemaMap";
public static final String PORTTYPE_MAP = "portTypeMap";
public static final String SCHEMA_TARGET_NAMESPACES = "schemaTargetNameSpaces";
public static final String WSDL_DEFINITION = "wsdlDefinition";
Modified: incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java?view=diff&rev=520342&r1=520341&r2=520342
==============================================================================
--- incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java (original)
+++ incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java Tue Mar 20 02:13:42 2007
@@ -19,10 +19,13 @@
package org.apache.cxf.tools.common;
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
-import javax.wsdl.extensions.schema.Schema;
import javax.xml.namespace.QName;
import org.xml.sax.InputSource;
@@ -203,11 +206,6 @@
public boolean isExcludeNamespaceEnabled() {
return excludeNamespacePackageMap.size() > 0;
- }
-
- @SuppressWarnings("unchecked")
- public List<Schema> getSchemaList() {
- return (List<Schema>)this.get(ToolConstants.SCHEMA_LIST);
}
public List<String> getExcludePkgList() {
Modified: incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java?view=diff&rev=520342&r1=520341&r2=520342
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java Tue Mar 20 02:13:42 2007
@@ -23,19 +23,24 @@
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import java.util.Properties;
import java.util.Set;
import java.util.logging.Logger;
import javax.wsdl.Definition;
import javax.xml.namespace.QName;
+import org.w3c.dom.Element;
+
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.service.model.InterfaceInfo;
import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.tools.common.AbstractCXFToolContainer;
import org.apache.cxf.tools.common.ClassUtils;
@@ -90,64 +95,86 @@
if (!hasInfoOption()) {
buildToolContext();
validate(context);
-
+
FrontEndProfile frontend = context.get(FrontEndProfile.class);
-
+
if (frontend == null) {
Message msg = new Message("FOUND_NO_FRONTEND", LOG);
throw new ToolException(msg);
}
-
+
DataBindingProfile dataBindingProfile = context.get(DataBindingProfile.class);
if (dataBindingProfile == null) {
Message msg = new Message("FOUND_NO_DATABINDING", LOG);
throw new ToolException(msg);
}
-
+
WSDLConstants.WSDLVersion version = getWSDLVersion();
- ServiceInfo service = null;
String wsdlURL = (String)context.get(ToolConstants.CFG_WSDLURL);
-
+ List<ServiceInfo> serviceList = new ArrayList<ServiceInfo>();
+
// Build the ServiceModel from the WSDLModel
if (version == WSDLConstants.WSDLVersion.WSDL11) {
- AbstractWSDLBuilder<Definition> builder =
- (AbstractWSDLBuilder<Definition>) frontend.getWSDLBuilder();
+ AbstractWSDLBuilder<Definition> builder = (AbstractWSDLBuilder<Definition>)frontend
+ .getWSDLBuilder();
builder.setContext(context);
-
- //TODO: Modify builder api, let customized definition make sense.
+
+ // TODO: Modify builder api, let customized definition make
+ // sense.
builder.build(URIParserUtil.getAbsoluteURI(wsdlURL));
builder.customize();
Definition definition = builder.getWSDLModel();
-
+
context.put(Definition.class, definition);
if (context.optionSet(ToolConstants.CFG_VALIDATE_WSDL)) {
builder.validate(definition);
}
-
+
WSDLServiceBuilder serviceBuilder = new WSDLServiceBuilder(getBus());
- service = serviceBuilder.buildService(definition, getServiceQName(definition));
+
+ String serviceName = (String)context.get(ToolConstants.CFG_SERVICENAME);
+
+ if (serviceName != null) {
+ ServiceInfo service = serviceBuilder
+ .buildService(definition, getServiceQName(definition));
+ serviceList.add(service);
+ } else {
+ serviceList = serviceBuilder.buildService(definition);
+ }
+
context.put(ClassCollector.class, new ClassCollector());
} else {
// TODO: wsdl2.0 support
}
- context.put(ServiceInfo.class, service);
- if (context.optionSet(ToolConstants.CFG_VALIDATE_WSDL)) {
- validate(service);
- }
- // Generate types
-
- generateTypes();
-
- // Build the JavaModel from the ServiceModel
- context.put(ServiceInfo.class, service);
- Processor processor = frontend.getProcessor();
- processor.setEnvironment(context);
- processor.process();
-
- // Generate artifacts
- for (FrontEndGenerator generator : frontend.getGenerators()) {
- generator.generate(context);
+ Map<String, InterfaceInfo> interfaces = new HashMap<String, InterfaceInfo>();
+ for (ServiceInfo service : serviceList) {
+ if (!interfaces.containsKey(service.getInterface().getName().toString())) {
+ interfaces.put(service.getInterface().getName().toString(), service.getInterface());
+ }
+ }
+ Map<String, Element> schemas = (Map<String, Element>)serviceList.get(0)
+ .getProperty(WSDLServiceBuilder.WSDL_SCHEMA_ELEMENT_LIST);
+ context.put(ToolConstants.SCHEMA_MAP, schemas);
+ context.put(ToolConstants.PORTTYPE_MAP, interfaces);
+ generateTypes();
+
+ for (ServiceInfo service : serviceList) {
+
+ context.put(ServiceInfo.class, service);
+ if (context.optionSet(ToolConstants.CFG_VALIDATE_WSDL)) {
+ validate(service);
+ }
+
+ // Build the JavaModel from the ServiceModel
+ Processor processor = frontend.getProcessor();
+ processor.setEnvironment(context);
+ processor.process();
+
+ // Generate artifacts
+ for (FrontEndGenerator generator : frontend.getGenerators()) {
+ generator.generate(context);
+ }
}
// Build projects: compile classes and copy resources etc.
@@ -162,7 +189,8 @@
throw new ToolException(e);
}
}
- }
+ }
+
}
public void execute(boolean exitOnFinish) throws ToolException {
Modified: incubator/cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java?view=diff&rev=520342&r1=520341&r2=520342
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java Tue Mar 20 02:13:42 2007
@@ -49,7 +49,7 @@
import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.StringUtils;
-import org.apache.cxf.service.model.ServiceInfo;
+import org.apache.cxf.service.model.InterfaceInfo;
import org.apache.cxf.tools.common.ToolConstants;
import org.apache.cxf.tools.common.ToolContext;
import org.apache.cxf.tools.common.ToolException;
@@ -57,35 +57,38 @@
import org.apache.cxf.tools.util.JAXBUtils;
import org.apache.cxf.tools.util.URIParserUtil;
import org.apache.cxf.tools.wsdlto.core.DataBindingProfile;
-import org.apache.cxf.wsdl11.WSDLServiceBuilder;
public class JAXBDataBinding implements DataBindingProfile {
private static final Logger LOG = LogUtils.getL7dLogger(JAXBDataBinding.class);
-
+
private S2JJAXBModel rawJaxbModelGenCode;
private ToolContext env;
- private ServiceInfo serviceInfo;
private Definition def;
@SuppressWarnings("unchecked")
private void initialize(ToolContext penv) throws ToolException {
env = penv;
- serviceInfo = env.get(ServiceInfo.class);
def = (Definition)env.get(Definition.class);
SchemaCompilerImpl schemaCompiler = (SchemaCompilerImpl)XJC.createSchemaCompiler();
ClassCollector classCollector = env.get(ClassCollector.class);
ClassNameAllocatorImpl allocator = new ClassNameAllocatorImpl(classCollector);
- allocator.setInterface(serviceInfo.getInterface(), env.mapPackageName(def.getTargetNamespace()));
+
+ Map<String, InterfaceInfo> interfaces = (Map<String, InterfaceInfo>)env
+ .get(ToolConstants.PORTTYPE_MAP);
+ for (String str : interfaces.keySet()) {
+ InterfaceInfo inf = interfaces.get(str);
+ allocator.setInterface(inf, env.mapPackageName(def.getTargetNamespace()));
+ }
schemaCompiler.setClassNameAllocator(allocator);
JAXBBindErrorListener listener = new JAXBBindErrorListener(env);
schemaCompiler.setErrorListener(listener);
// Collection<SchemaInfo> schemas = serviceInfo.getSchemas();
List<InputSource> jaxbBindings = env.getJaxbBindingFile();
- Map<String, Element> schemaLists = (Map<String, Element>)serviceInfo
- .getProperty(WSDLServiceBuilder.WSDL_SCHEMA_ELEMENT_LIST);
+ Map<String, Element> schemaLists = (Map<String, Element>)env.get(ToolConstants.SCHEMA_MAP);
+
Set<String> keys = schemaLists.keySet();
for (String key : keys) {
Element ele = schemaLists.get(key);
@@ -120,7 +123,6 @@
ele.appendChild(pkgNode);
}
}
-
schemaCompiler.parseSchema(key, ele);
}
@@ -164,8 +166,8 @@
// JAXB bug. JAXB ClassNameCollector may not be invoked when generated
// class is an enum. We need to use this method to add the missed file
// to classCollector.
- private void addedEnumClassToCollector(Map<String, Element> schemaList,
- ClassNameAllocatorImpl allocator) {
+ private void addedEnumClassToCollector(Map<String, Element> schemaList,
+ ClassNameAllocatorImpl allocator) {
for (Element schemaElement : schemaList.values()) {
String targetNamespace = schemaElement.getAttribute("targetNamespace");
if (StringUtils.isEmpty(targetNamespace)) {
Modified: incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java?view=diff&rev=520342&r1=520341&r2=520342
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java Tue Mar 20 02:13:42 2007
@@ -21,7 +21,6 @@
import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
-import java.io.IOException;
import java.lang.reflect.Modifier;
import java.net.URISyntaxException;
@@ -86,12 +85,7 @@
}
- /*
- * public void testHangingBug() throws Exception {
- * env.put(ToolConstants.CFG_WSDLURL,
- * getLocation("/wsdl2java_wsdl/bughanging/wsdl/wsrf.wsdl"));
- * processor.setContext(env); processor.execute(); }
- */
+
public void testBug305700() throws Exception {
env.put(ToolConstants.CFG_COMPILE, "compile");
env.put(ToolConstants.CFG_OUTPUTDIR, output.getCanonicalPath());
@@ -156,7 +150,7 @@
File cxf = new File(org, "cxf");
File[] files = cxf.listFiles();
- assertEquals(22, files.length);
+ assertEquals(23, files.length);
Class clz = classLoader.loadClass("org.cxf.Greeter");
assertTrue("Generate " + clz.getName() + "error", clz.isInterface());
@@ -180,72 +174,7 @@
assertTrue("wsdl location should be url style in build.xml", content.indexOf("param1=\"file:") > -1);
}
-
- public void testBug305728HelloWorld() {
- try {
- String[] args = new String[] {"-compile", "-classdir",
- output.getCanonicalPath() + "/classes",
- "-d",
- output.getCanonicalPath(),
- "-nexclude",
- "http://www.w3.org/2005/08/addressing"
- + "=org.apache.cxf.ws.addressing",
- getLocation("/wsdl2java_wsdl/bug305728/hello_world.wsdl")};
- WSDLToJava.main(args);
- } catch (Exception e) {
- e.printStackTrace(System.err);
- }
-
- try {
- File file = new File(output.getCanonicalPath(),
- "org/apache/cxf/ws/addressing/EndpointReferenceType.java");
-
- assertFalse("Exclude java file should not be generated : " + file.getCanonicalPath(), file
- .exists());
-
- file = new File(output.getCanonicalPath() + File.separator + "classes",
- "org/apache/cxf/ws/addressing/EndpointReferenceType.class");
- assertFalse("Exclude class should not be generated : " + file.getCanonicalPath(), file.exists());
-
- file = new File(output.getCanonicalPath(),
- "org/w3/_2005/_08/addressing/EndpointReferenceType.java");
- assertFalse("Exclude file should not be generated : " + file.getCanonicalPath(), file.exists());
-
- file = new File(output.getCanonicalPath() + File.separator + "classes",
- "org/w3/_2005/_08/addressing/EndpointReferenceType.class");
- assertFalse("Exclude class should not be generated : " + file.getCanonicalPath(), file.exists());
-
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
-
- public void testBug305728HelloWorld2() {
- try {
- String[] args = new String[] {"-compile", "-classdir", output.getCanonicalPath() + "/classes",
- "-d", output.getCanonicalPath(), "-nexclude",
- "http://apache.org/hello_world/types",
- getLocation("/wsdl2java_wsdl/bug305728/hello_world2.wsdl")};
- WSDLToJava.main(args);
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- try {
- File file = new File(output.getCanonicalPath(), "org/apache/hello_world/types");
- assertFalse("Exclude file should not be generated : " + file.getCanonicalPath(), file.exists());
-
- file = new File(output.getCanonicalPath() + File.separator + "classes",
- "org/apache/hello_world/types");
-
- assertFalse("Exclude file should not be generated : " + file.getCanonicalPath(), file.exists());
-
- } catch (IOException e) {
- e.printStackTrace();
- }
-
- }
-
+
public void testExcludeNSWithPackageName() throws Exception {
String[] args = new String[] {"-d", output.getCanonicalPath(), "-nexclude",
Modified: incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java?view=diff&rev=520342&r1=520341&r2=520342
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java Tue Mar 20 02:13:42 2007
@@ -224,7 +224,7 @@
File types = new File(helloworldsoaphttp, "types");
assertTrue(types.exists());
File[] files = helloworldsoaphttp.listFiles();
- assertEquals(6, files.length);
+ assertEquals(7, files.length);
files = types.listFiles();
assertEquals(17, files.length);