Author: richard.opalka(a)jboss.com
Date: 2010-03-03 06:44:53 -0500 (Wed, 03 Mar 2010)
New Revision: 11712
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java
stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml
stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml
Log:
[JBWS-2950] implementing support for JAX-WS 2.2 target in wsconsume and making it default
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java
===================================================================
---
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java 2010-03-03
11:42:21 UTC (rev 11711)
+++
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java 2010-03-03
11:44:53 UTC (rev 11712)
@@ -51,7 +51,7 @@
private PrintStream messageStream;
private String wsdlLocation;
private List<String> additionalCompilerClassPath = new
ArrayList<String>();
- private String target = "2.0";
+ private String target;
@Override
public void setBindingFiles(List<File> bindingFiles)
@@ -197,13 +197,15 @@
args.add("-d");
args.add(outputDir.getAbsolutePath());
- // Always set the target
- if(!target.equals("2.0") && !target.equals("2.1"))
- throw new IllegalArgumentException("WSConsume (native) only supports JAX-WS
2.0 and 2.1");
-
- args.add("-target");
- args.add(target);
+ if (target != null)
+ {
+ if(!target.equals("2.0") && !target.equals("2.1")
&& !target.equals("2.2"))
+ throw new IllegalArgumentException("WSConsume (native) supports only
JAX-WS 2.0, 2.1 and 2.2");
+ args.add("-target");
+ args.add(target);
+ }
+
// finally the WSDL file
args.add(wsdl.toString());
Modified:
stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml
===================================================================
---
stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml 2010-03-03
11:42:21 UTC (rev 11711)
+++
stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml 2010-03-03
11:44:53 UTC (rev 11712)
@@ -20,8 +20,13 @@
</classpath>
</taskdef>
- <wsconsume
wsdl="${tests.resources.dir}/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl"
package="org.jboss.test.ws.jaxws.complex"
sourcedestdir="${tests.output.dir}/wsconsume/java"
destdir="${tests.output.dir}" nocompile="true" keep="true"
verbose="false"/>
- <wsconsume
wsdl="${tests.resources.dir}/jaxws/holder/META-INF/wsdl/HolderService.wsdl"
package="org.jboss.test.ws.jaxws.holder"
sourcedestdir="${tests.output.dir}/wsconsume/java"
destdir="${tests.output.dir}" nocompile="true" keep="true"
verbose="false"/>
+ <!--
+ [JBWS-2950] We need to specify JAX-WS 2.1 target
+ explicitely here, because native default is 2.2
+ but JDK6 comes with JAX-WS 2.1 API only.
+ -->
+ <wsconsume
wsdl="${tests.resources.dir}/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl"
package="org.jboss.test.ws.jaxws.complex"
sourcedestdir="${tests.output.dir}/wsconsume/java"
destdir="${tests.output.dir}" nocompile="true" keep="true"
verbose="false" target="2.1"/>
+ <wsconsume
wsdl="${tests.resources.dir}/jaxws/holder/META-INF/wsdl/HolderService.wsdl"
package="org.jboss.test.ws.jaxws.holder"
sourcedestdir="${tests.output.dir}/wsconsume/java"
destdir="${tests.output.dir}" nocompile="true" keep="true"
verbose="false" target="2.1"/>
</target>
<target name="prepend-jars">
Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml
===================================================================
---
stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml 2010-03-03
11:42:21 UTC (rev 11711)
+++
stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml 2010-03-03
11:44:53 UTC (rev 11712)
@@ -20,13 +20,18 @@
</classpath>
</taskdef>
- <wsconsume
wsdl="${tests.resources.dir}/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl"
package="org.jboss.test.ws.benchmark.jaxws.doclit"
sourcedestdir="${tests.output.dir}/wsconsume/java"
destdir="${tests.output.dir}" nocompile="true" keep="true"
verbose="false"/>
- <wsconsume
wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl"
package="org.jboss.test.ws.interop.soapwsdl.basedoclitb"
sourcedestdir="${tests.output.dir}/wsconsume/java"
destdir="${tests.output.dir}" nocompile="true" keep="true"
verbose="false"/>
- <wsconsume
wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl"
package="org.jboss.test.ws.interop.soapwsdl.basedoclitw"
sourcedestdir="${tests.output.dir}/wsconsume/java"
destdir="${tests.output.dir}" nocompile="true" keep="true"
verbose="false"/>
- <wsconsume
wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl"
package="org.jboss.test.ws.interop.soapwsdl.baserpclit"
sourcedestdir="${tests.output.dir}/wsconsume/java"
destdir="${tests.output.dir}" nocompile="true" keep="true"
verbose="false"/>
- <wsconsume
wsdl="${tests.resources.dir}/jaxws/samples/wssecuritypolicy/WEB-INF/wsdl/HelloService.wsdl"
package="org.jboss.test.ws.jaxws.samples.wssecuritypolicy"
sourcedestdir="${tests.output.dir}/wsconsume/java"
destdir="${tests.output.dir}" nocompile="true" keep="true"
verbose="false"/>
- <wsconsume
wsdl="${tests.resources.dir}/jaxws/samples/wssecurityAnnotatedpolicy/META-INF/wsdl/HelloService.wsdl"
package="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy"
sourcedestdir="${tests.output.dir}/wsconsume/java"
destdir="${tests.output.dir}" nocompile="true" keep="true"
verbose="false"/>
- <wsconsume
wsdl="${tests.resources.dir}/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl"
package="org.jboss.test.ws.jaxws.samples.wssecurity"
sourcedestdir="${tests.output.dir}/wsconsume/java"
destdir="${tests.output.dir}" nocompile="true" keep="true"
verbose="false"/>
+ <!--
+ [JBWS-2950] We need to specify JAX-WS 2.1 target
+ explicitely here, because native default is 2.2
+ but JDK6 comes with JAX-WS 2.1 API only.
+ -->
+ <wsconsume
wsdl="${tests.resources.dir}/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl"
package="org.jboss.test.ws.benchmark.jaxws.doclit"
sourcedestdir="${tests.output.dir}/wsconsume/java"
destdir="${tests.output.dir}" nocompile="true" keep="true"
verbose="false" target="2.1"/>
+ <wsconsume
wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl"
package="org.jboss.test.ws.interop.soapwsdl.basedoclitb"
sourcedestdir="${tests.output.dir}/wsconsume/java"
destdir="${tests.output.dir}" nocompile="true" keep="true"
verbose="false" target="2.1"/>
+ <wsconsume
wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl"
package="org.jboss.test.ws.interop.soapwsdl.basedoclitw"
sourcedestdir="${tests.output.dir}/wsconsume/java"
destdir="${tests.output.dir}" nocompile="true" keep="true"
verbose="false" target="2.1"/>
+ <wsconsume
wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl"
package="org.jboss.test.ws.interop.soapwsdl.baserpclit"
sourcedestdir="${tests.output.dir}/wsconsume/java"
destdir="${tests.output.dir}" nocompile="true" keep="true"
verbose="false" target="2.1"/>
+ <wsconsume
wsdl="${tests.resources.dir}/jaxws/samples/wssecuritypolicy/WEB-INF/wsdl/HelloService.wsdl"
package="org.jboss.test.ws.jaxws.samples.wssecuritypolicy"
sourcedestdir="${tests.output.dir}/wsconsume/java"
destdir="${tests.output.dir}" nocompile="true" keep="true"
verbose="false" target="2.1"/>
+ <wsconsume
wsdl="${tests.resources.dir}/jaxws/samples/wssecurityAnnotatedpolicy/META-INF/wsdl/HelloService.wsdl"
package="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy"
sourcedestdir="${tests.output.dir}/wsconsume/java"
destdir="${tests.output.dir}" nocompile="true" keep="true"
verbose="false" target="2.1"/>
+ <wsconsume
wsdl="${tests.resources.dir}/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl"
package="org.jboss.test.ws.jaxws.samples.wssecurity"
sourcedestdir="${tests.output.dir}/wsconsume/java"
destdir="${tests.output.dir}" nocompile="true" keep="true"
verbose="false" target="2.1"/>
</target>
<target name="prepend-jars">
Show replies by date