[jbossws-commits] JBossWS SVN: r2344 - in branches/jbossws-1.2.0: jbossws-tests and 4 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Tue Feb 13 04:48:06 EST 2007
Author: thomas.diesler at jboss.com
Date: 2007-02-13 04:48:06 -0500 (Tue, 13 Feb 2007)
New Revision: 2344
Added:
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/META-INF/
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/META-INF/wsdl/
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl
Removed:
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/Hello.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/UserType.java
Modified:
branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml
branches/jbossws-1.2.0/jbossws-tests/.classpath
branches/jbossws-1.2.0/jbossws-tests/build.xml
Log:
Run wsconsume before compile
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml 2007-02-12 17:40:10 UTC (rev 2343)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml 2007-02-13 09:48:06 UTC (rev 2344)
@@ -31,7 +31,7 @@
<!-- JDK Detection -->
<available classname="java.lang.StackTraceElement" property="HAVE_JDK_1.4"/>
<available classname="java.lang.Enum" property="HAVE_JDK_1.5"/>
-
+
<!-- Force thirdparty get -->
<condition property="force.thirdparty.get">
<not>
@@ -51,7 +51,7 @@
<!-- Available integration target -->
<property name="integration.target.${jbossws.integration.target}" value="true"/>
-
+
<!-- Define jboss.home -->
<condition property="jboss.home" value="${jboss50.home}">
<equals arg1="${jbossws.integration.target}" arg2="jboss50"/>
@@ -155,10 +155,10 @@
<pathelement location="${tests.lib.dir}/jboss-jaxrpc.jar"/>
<pathelement location="${tests.lib.dir}/jboss-jaxws.jar"/>
<pathelement location="${tests.lib.dir}/jboss-saaj.jar"/>
- <pathelement location="${tests.lib.dir}/jbossws-jboss50-integration.jar"/>
- <pathelement location="${tests.lib.dir}/jbossws-jboss42-integration.jar"/>
- <pathelement location="${tests.lib.dir}/jbossws-jboss40-integration.jar"/>
- <pathelement location="${tests.lib.dir}/jbossws-tomcat-integration.jar"/>
+ <pathelement location="${tests.lib.dir}/jbossws-jboss50-integration.jar"/>
+ <pathelement location="${tests.lib.dir}/jbossws-jboss42-integration.jar"/>
+ <pathelement location="${tests.lib.dir}/jbossws-jboss40-integration.jar"/>
+ <pathelement location="${tests.lib.dir}/jbossws-tomcat-integration.jar"/>
</path>
<!-- The combined compile classpath -->
@@ -191,11 +191,11 @@
<pathelement location="${jboss.client}/jbossretro-rt.jar"/>
<pathelement location="${jboss.client}/log4j.jar"/>
<pathelement location="${jboss.client}/jbossall-client.jar"/>
- <pathelement location="${jboss.lib}/jboss-vfs.jar"/>
+ <pathelement location="${jboss.lib}/jboss-vfs.jar"/>
<pathelement location="${jboss.server.lib}/hibernate3.jar"/>
- <pathelement location="${jboss.server.lib}/jboss.jar"/>
- <pathelement location="${jboss.server.lib}/jbosssx.jar"/>
- <pathelement location="${jboss.server.lib}/jbosssx.jar"/>
+ <pathelement location="${jboss.server.lib}/jboss.jar"/>
+ <pathelement location="${jboss.server.lib}/jbosssx.jar"/>
+ <pathelement location="${jboss.server.lib}/jbosssx.jar"/>
<path refid="javac.classpath"/>
</path>
@@ -203,10 +203,10 @@
<path id="jbpm.bpel.classpath">
<path refid="jbossws.classpath"/>
<pathelement location="${thirdparty.dir}/jbpm-bpel"/> <!-- jbpm.cfg.xml -->
- <pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-bpel.jar" />
- <pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-jpdl.jar" />
- <pathelement location="${thirdparty.dir}/jbpm-bpel/commons-lang.jar" />
- <pathelement location="${thirdparty.dir}/jbpm-bpel/jaxen.jar" />
+ <pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-bpel.jar"/>
+ <pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-jpdl.jar"/>
+ <pathelement location="${thirdparty.dir}/jbpm-bpel/commons-lang.jar"/>
+ <pathelement location="${thirdparty.dir}/jbpm-bpel/jaxen.jar"/>
<pathelement location="${thirdparty.dir}/commons-collections.jar"/>
<pathelement location="${thirdparty.dir}/commons-logging.jar"/>
<pathelement location="${thirdparty.dir}/dom4j.jar"/>
@@ -220,91 +220,35 @@
</target>
<target name="tomcat-classpath" depends="common-classpath" if="jbossws.integration.target.tomcat">
-
<fail message="jdk-1.5 is required for Tomcat integration" unless="HAVE_JDK_1.5"/>
-
- <!-- The test client classpath -->
<path id="test.client.classpath">
<path refid="jbossws.classpath"/>
- <pathelement location="${tomcat.home}/common/lib/jbossws-thirdparty.jar"/>
+ <pathelement location="${tomcat.home}/common/lib/jbossws-thirdparty.jar"/>
<path refid="javac.classpath"/>
</path>
</target>
-
<!-- ================================================================== -->
- <!-- Compiling -->
+ <!-- Generating sources -->
<!-- ================================================================== -->
- <target name="compile" depends="compile14,compile15" description="Compile sources"/>
-
- <target name="compile14" depends="init" unless="HAVE_JDK_1.5">
- <mkdir dir="${tests.output.dir}/classes"/>
- <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}"
- failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}">
- <src path="${tests.java.dir}"/>
- <exclude name="org/jboss/test/ws/jaxws/**"/>
- <exclude name="org/jboss/test/ws/tools/jsr181/**"/>
- <classpath refid="javac.classpath"/>
- </javac>
+ <target name="wsconsume" depends="init" description="Consume JAX-WS contracts" if="HAVE_JDK_1.5">
+
+ <!-- Define the JAX-WS wsconsume task -->
+ <taskdef name="wsconsume" classname="org.jboss.ws.tools.jaxws.ant.wsconsume">
+ <classpath refid="core.classpath"/>
+ <classpath refid="jbossws.classpath"/>
+ <classpath location="${thirdparty.dir}/jbossws-wsconsume-impl.jar"/>
+ <classpath location="${thirdparty.dir}/jaxb-xjc.jar"/>
+ </taskdef>
+
+ <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" keep="true"/>
</target>
- <target name="compile15" depends="init" if="HAVE_JDK_1.5">
- <mkdir dir="${tests.output.dir}/classes"/>
- <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}"
- failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}">
- <src path="${tests.java.dir}"/>
- <classpath refid="javac.classpath"/>
- </javac>
- </target>
-
- <target name="compile-generated" depends="init" description="Compile generated sources">
- <mkdir dir="${tests.output.dir}/classes"/>
- <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
- <src path="${tests.output.dir}/wstools/java"/>
- <src path="${tests.output.dir}/wsconsume/java"/>
- <exclude name="org/jboss/test/ws/interop/**"/>
- <classpath refid="javac.classpath"/>
- </javac>
- </target>
-
- <target name="copy-resources" depends="init" description="Copy the deployment resources.">
- <copy todir="${tests.output.dir}/classes" file="${tests.etc.dir}/jndi.properties"/>
- <copy todir="${tests.output.dir}/classes" file="${tests.etc.dir}/log4j.xml"/>
- <!-- Copy resources -->
- <copy todir="${tests.output.dir}/resources">
- <fileset dir="${tests.resources.dir}">
- <include name="**/*.wsdl"/>
- <include name="**/*.xml"/>
- <exclude name="jaxrpc/samples-override/**"/>
- </fileset>
- <filterset>
- <filter token="jbosstest.host.name" value="${node0}"/>
- <filter token="wsdl-publish-location" value="${tests.output.dir}/wsdl-publish"/>
- </filterset>
- </copy>
- <!-- Copy binary files -->
- <copy todir="${tests.output.dir}/resources">
- <fileset dir="${tests.resources.dir}">
- <exclude name="**/*.wsdl"/>
- <exclude name="**/*.xml"/>
- </fileset>
- </copy>
- </target>
-
- <!-- ================================================================== -->
- <!-- Building -->
- <!-- ================================================================== -->
-
- <target name="main" depends="compile,copy-resources,generate-sources,compile-generated" description="Build the deployments.">
- <ant antfile="${basedir}/ant-import/build-samples-jaxrpc.xml" target="build-samples-jaxrpc" inheritall="true"/>
- <ant antfile="${basedir}/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws" inheritall="true"/>
- </target>
-
<!--
Generate BPEL sources
-->
- <target name="generate-bpel-sources" depends="compile" description="Generate the BPEL resources.">
+ <target name="servicegen" depends="compile" description="Generate the BPEL resources.">
<!-- create jbpm process archives -->
<mkdir dir="${tests.output.dir}/libs"/>
<zip destfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip">
@@ -325,7 +269,7 @@
<!--
Generate JAX-RPC sources
-->
- <target name="generate-jaxrpc-sources" depends="compile" description="Generate the JAX-RPC artifacts.">
+ <target name="wstools" depends="compile" description="Generate the JAX-RPC artifacts.">
<!-- Define the JAX-RPC tools task -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
@@ -339,7 +283,6 @@
</taskdef>
<!-- Generate JAX-RPC artifacts -->
- <mkdir dir="${tests.output.dir}/libs"/>
<mkdir dir="${tests.output.dir}/wstools/java"/>
<wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/docstyle/wrapped/wstools-config.xml"/>
<wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/bare/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/docstyle/bare/wstools-config.xml"/>
@@ -381,7 +324,7 @@
<!--
Generate JAX-WS sources
-->
- <target name="generate-jaxws-sources" depends="compile" description="Generate the JAX-WS artifacts.">
+ <target name="wsprovide" depends="compile" description="Provide the JAX-WS contracts.">
<!-- Define the JAX-WS wsprovide task -->
<taskdef name="wsprovide" classname="org.jboss.ws.tools.jaxws.ant.wsprovide">
@@ -391,27 +334,80 @@
<classpath location="${tests.output.dir}/classes"/>
</taskdef>
- <!-- Define the JAX-WS wsconsume task -->
- <taskdef name="wsconsume" classname="org.jboss.ws.tools.jaxws.ant.wsconsume">
- <classpath refid="core.classpath"/>
- <classpath refid="jbossws.classpath"/>
- <classpath location="${thirdparty.dir}/jbossws-wsconsume-impl.jar"/>
- <classpath location="${thirdparty.dir}/jaxb-xjc.jar"/>
- <classpath location="${tests.output.dir}/classes"/>
- </taskdef>
-
- <!-- Generate JAX-RPC artifacts -->
- <mkdir dir="${tests.output.dir}/libs"/>
- <mkdir dir="${tests.output.dir}/wstools/java"/>
-
- <!-- Generate JAX-WS artifacts -->
<wsprovide resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurity" genwsdl="true" sei="org.jboss.test.ws.jaxws.samples.wssecurity.HelloJavaBean"/>
- <wsconsume keep="true" package="org.jboss.test.ws.jaxws.samples.wssecurity" sourcedestdir="${tests.output.dir}/wsconsume/java" wsdl="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurity/HelloService.wsdl"/>
</target>
- <target name="generate-sources" depends="generate-bpel-sources,generate-jaxrpc-sources,generate-jaxws-sources"/>
+ <target name="generate-resources" depends="servicegen,wstools,wsprovide">
+ <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
+ <src path="${tests.output.dir}/wstools/java"/>
+ <exclude name="org/jboss/test/ws/interop/**"/>
+ <classpath refid="javac.classpath"/>
+ </javac>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Compiling -->
+ <!-- ================================================================== -->
+
+ <target name="compile" depends="wsconsume,compile14,compile15" description="Compile sources"/>
+
+ <target name="compile14" depends="init" unless="HAVE_JDK_1.5">
+ <mkdir dir="${tests.output.dir}/classes"/>
+ <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}"
+ failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}">
+ <src path="${tests.java.dir}"/>
+ <exclude name="org/jboss/test/ws/jaxws/**"/>
+ <exclude name="org/jboss/test/ws/tools/jsr181/**"/>
+ <classpath refid="javac.classpath"/>
+ </javac>
+ </target>
+
+ <target name="compile15" depends="init" if="HAVE_JDK_1.5">
+ <mkdir dir="${tests.output.dir}/classes"/>
+ <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}"
+ failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}">
+ <src path="${tests.java.dir}"/>
+ <src path="${tests.output.dir}/wsconsume/java"/>
+ <classpath refid="javac.classpath"/>
+ </javac>
+ </target>
+
+ <!-- Copy resources -->
+ <target name="copy-resources" depends="init" description="Copy the deployment resources.">
+ <copy todir="${tests.output.dir}/classes" file="${tests.etc.dir}/jndi.properties"/>
+ <copy todir="${tests.output.dir}/classes" file="${tests.etc.dir}/log4j.xml"/>
+ <copy todir="${tests.output.dir}/resources">
+ <fileset dir="${tests.resources.dir}">
+ <include name="**/*.wsdl"/>
+ <include name="**/*.xml"/>
+ <exclude name="jaxrpc/samples-override/**"/>
+ </fileset>
+ <filterset>
+ <filter token="jbosstest.host.name" value="${node0}"/>
+ <filter token="wsdl-publish-location" value="${tests.output.dir}/wsdl-publish"/>
+ </filterset>
+ </copy>
+
+ <!-- Copy binary files -->
+ <copy todir="${tests.output.dir}/resources">
+ <fileset dir="${tests.resources.dir}">
+ <exclude name="**/*.wsdl"/>
+ <exclude name="**/*.xml"/>
+ </fileset>
+ </copy>
+ </target>
+
<!-- ================================================================== -->
+ <!-- Building -->
+ <!-- ================================================================== -->
+
+ <target name="main" depends="wsconsume,compile,copy-resources,generate-resources" description="Build the deployments.">
+ <ant antfile="${basedir}/ant-import/build-samples-jaxrpc.xml" target="build-samples-jaxrpc" inheritall="true"/>
+ <ant antfile="${basedir}/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws" inheritall="true"/>
+ </target>
+
+ <!-- ================================================================== -->
<!-- Testing -->
<!-- ================================================================== -->
@@ -424,8 +420,8 @@
</target>
<!--
- Run a collection of unit tests.
- ant -Dtest=tools test
+ Run a collection of unit tests.
+ ant -Dtest=tools test
-->
<target name="test" depends="init" if="test" description="Run all unit tests in a given directory">
<antcall target="tests-main">
@@ -469,8 +465,8 @@
</target>
<!--
- Run a single unit test.
- ant -Dtest=org.jboss.test.ws.jaxrpc.samples.jsr109pojo.RpcJSETestCase one-test
+ Run a single unit test.
+ ant -Dtest=org.jboss.test.ws.jaxrpc.samples.jsr109pojo.RpcJSETestCase one-test
-->
<target name="one-test" depends="init" if="test" description="Run a single unit test">
<mkdir dir="${tests.output.dir}/reports"/>
Modified: branches/jbossws-1.2.0/jbossws-tests/.classpath
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/.classpath 2007-02-12 17:40:10 UTC (rev 2343)
+++ branches/jbossws-1.2.0/jbossws-tests/.classpath 2007-02-13 09:48:06 UTC (rev 2344)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry excluding="org/jboss/test/ws/interop/|org/jboss/test/ws/jaxrpc/jbws718/" kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="output/wsconsume/java"/>
<classpathentry kind="src" path="output/wstools/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/build"/>
Modified: branches/jbossws-1.2.0/jbossws-tests/build.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-02-12 17:40:10 UTC (rev 2343)
+++ branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-02-13 09:48:06 UTC (rev 2344)
@@ -238,82 +238,27 @@
</path>
</target>
-
<!-- ================================================================== -->
- <!-- Compiling -->
+ <!-- Generating sources -->
<!-- ================================================================== -->
- <target name="compile" depends="compile14,compile15" description="Compile sources"/>
-
- <target name="compile14" depends="init" unless="HAVE_JDK_1.5">
- <mkdir dir="${tests.output.dir}/classes"/>
- <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}"
- failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}">
- <src path="${tests.java.dir}"/>
- <exclude name="org/jboss/test/ws/jaxws/**"/>
- <exclude name="org/jboss/test/ws/tools/jsr181/**"/>
- <classpath refid="javac.classpath"/>
- </javac>
+ <target name="wsconsume" depends="init" description="Consume JAX-WS contracts" if="HAVE_JDK_1.5">
+
+ <!-- Define the JAX-WS wsconsume task -->
+ <taskdef name="wsconsume" classname="org.jboss.ws.tools.jaxws.ant.wsconsume">
+ <classpath refid="core.classpath"/>
+ <classpath refid="jbossws.classpath"/>
+ <classpath location="${thirdparty.dir}/jbossws-wsconsume-impl.jar"/>
+ <classpath location="${thirdparty.dir}/jaxb-xjc.jar"/>
+ </taskdef>
+
+ <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" keep="true"/>
</target>
- <target name="compile15" depends="init" if="HAVE_JDK_1.5">
- <mkdir dir="${tests.output.dir}/classes"/>
- <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}"
- failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}">
- <src path="${tests.java.dir}"/>
- <classpath refid="javac.classpath"/>
- </javac>
- </target>
-
- <target name="compile-generated" depends="init" description="Compile generated sources">
- <mkdir dir="${tests.output.dir}/classes"/>
- <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
- <src path="${tests.output.dir}/wstools/java"/>
- <src path="${tests.output.dir}/wsconsume/java"/>
- <exclude name="org/jboss/test/ws/interop/**"/>
- <classpath refid="javac.classpath"/>
- </javac>
- </target>
-
- <target name="copy-resources" depends="init" description="Copy the deployment resources.">
- <copy todir="${tests.output.dir}/classes" file="${tests.etc.dir}/jndi.properties"/>
- <copy todir="${tests.output.dir}/classes" file="${tests.etc.dir}/log4j.xml"/>
- <!-- Copy resources -->
- <copy todir="${tests.output.dir}/resources">
- <fileset dir="${tests.resources.dir}">
- <include name="**/*.wsdl"/>
- <include name="**/*.xml"/>
- <exclude name="jaxrpc/samples-override/**"/>
- </fileset>
- <filterset>
- <filter token="jbosstest.host.name" value="${node0}"/>
- <filter token="wsdl-publish-location" value="${tests.output.dir}/wsdl-publish"/>
- </filterset>
- </copy>
- <!-- Copy binary files -->
- <copy todir="${tests.output.dir}/resources">
- <fileset dir="${tests.resources.dir}">
- <exclude name="**/*.wsdl"/>
- <exclude name="**/*.xml"/>
- </fileset>
- </copy>
- </target>
-
- <!-- ================================================================== -->
- <!-- Building -->
- <!-- ================================================================== -->
-
- <target name="main" depends="compile,copy-resources,generate-sources,compile-generated" description="Build the deployments.">
- <ant antfile="${basedir}/ant-import/build-samples-jaxrpc.xml" target="build-samples-jaxrpc" inheritall="true"/>
- <ant antfile="${basedir}/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws" inheritall="true"/>
- <ant antfile="${basedir}/ant-import/build-jars-jaxrpc.xml" target="build-jars-jaxrpc" inheritall="true"/>
- <ant antfile="${basedir}/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/>
- </target>
-
<!--
Generate BPEL sources
-->
- <target name="generate-bpel-sources" depends="compile" description="Generate the BPEL resources.">
+ <target name="servicegen" depends="compile" description="Generate the BPEL resources.">
<!-- create jbpm process archives -->
<mkdir dir="${tests.output.dir}/libs"/>
<zip destfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip">
@@ -334,7 +279,7 @@
<!--
Generate JAX-RPC sources
-->
- <target name="generate-jaxrpc-sources" depends="compile" description="Generate the JAX-RPC artifacts.">
+ <target name="wstools" depends="compile" description="Generate the JAX-RPC artifacts.">
<!-- Define the JAX-RPC tools task -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
@@ -348,7 +293,6 @@
</taskdef>
<!-- Generate JAX-RPC artifacts -->
- <mkdir dir="${tests.output.dir}/libs"/>
<mkdir dir="${tests.output.dir}/wstools/java"/>
<wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/docstyle/wrapped/wstools-config.xml"/>
<wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/bare/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/docstyle/bare/wstools-config.xml"/>
@@ -390,7 +334,7 @@
<!--
Generate JAX-WS sources
-->
- <target name="generate-jaxws-sources" depends="compile" description="Generate the JAX-WS artifacts.">
+ <target name="wsprovide" depends="compile" description="Provide the JAX-WS contracts.">
<!-- Define the JAX-WS wsprovide task -->
<taskdef name="wsprovide" classname="org.jboss.ws.tools.jaxws.ant.wsprovide">
@@ -400,27 +344,82 @@
<classpath location="${tests.output.dir}/classes"/>
</taskdef>
- <!-- Define the JAX-WS wsconsume task -->
- <taskdef name="wsconsume" classname="org.jboss.ws.tools.jaxws.ant.wsconsume">
- <classpath refid="core.classpath"/>
- <classpath refid="jbossws.classpath"/>
- <classpath location="${thirdparty.dir}/jbossws-wsconsume-impl.jar"/>
- <classpath location="${thirdparty.dir}/jaxb-xjc.jar"/>
- <classpath location="${tests.output.dir}/classes"/>
- </taskdef>
-
- <!-- Generate JAX-RPC artifacts -->
- <mkdir dir="${tests.output.dir}/libs"/>
- <mkdir dir="${tests.output.dir}/wstools/java"/>
-
- <!-- Generate JAX-WS artifacts -->
<wsprovide resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurity" genwsdl="true" sei="org.jboss.test.ws.jaxws.samples.wssecurity.HelloJavaBean"/>
- <wsconsume keep="true" package="org.jboss.test.ws.jaxws.samples.wssecurity" sourcedestdir="${tests.output.dir}/wsconsume/java" wsdl="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurity/HelloService.wsdl"/>
</target>
- <target name="generate-sources" depends="generate-bpel-sources,generate-jaxrpc-sources,generate-jaxws-sources"/>
+ <target name="generate-resources" depends="servicegen,wstools,wsprovide">
+ <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
+ <src path="${tests.output.dir}/wstools/java"/>
+ <exclude name="org/jboss/test/ws/interop/**"/>
+ <classpath refid="javac.classpath"/>
+ </javac>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Compiling -->
+ <!-- ================================================================== -->
+
+ <target name="compile" depends="wsconsume,compile14,compile15" description="Compile sources"/>
+
+ <target name="compile14" depends="init" unless="HAVE_JDK_1.5">
+ <mkdir dir="${tests.output.dir}/classes"/>
+ <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}"
+ failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}">
+ <src path="${tests.java.dir}"/>
+ <exclude name="org/jboss/test/ws/jaxws/**"/>
+ <exclude name="org/jboss/test/ws/tools/jsr181/**"/>
+ <classpath refid="javac.classpath"/>
+ </javac>
+ </target>
+
+ <target name="compile15" depends="init" if="HAVE_JDK_1.5">
+ <mkdir dir="${tests.output.dir}/classes"/>
+ <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}"
+ failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}">
+ <src path="${tests.java.dir}"/>
+ <src path="${tests.output.dir}/wsconsume/java"/>
+ <classpath refid="javac.classpath"/>
+ </javac>
+ </target>
+
+ <!-- Copy resources -->
+ <target name="copy-resources" depends="init" description="Copy the deployment resources.">
+ <copy todir="${tests.output.dir}/classes" file="${tests.etc.dir}/jndi.properties"/>
+ <copy todir="${tests.output.dir}/classes" file="${tests.etc.dir}/log4j.xml"/>
+ <copy todir="${tests.output.dir}/resources">
+ <fileset dir="${tests.resources.dir}">
+ <include name="**/*.wsdl"/>
+ <include name="**/*.xml"/>
+ <exclude name="jaxrpc/samples-override/**"/>
+ </fileset>
+ <filterset>
+ <filter token="jbosstest.host.name" value="${node0}"/>
+ <filter token="wsdl-publish-location" value="${tests.output.dir}/wsdl-publish"/>
+ </filterset>
+ </copy>
+
+ <!-- Copy binary files -->
+ <copy todir="${tests.output.dir}/resources">
+ <fileset dir="${tests.resources.dir}">
+ <exclude name="**/*.wsdl"/>
+ <exclude name="**/*.xml"/>
+ </fileset>
+ </copy>
+ </target>
+
<!-- ================================================================== -->
+ <!-- Building -->
+ <!-- ================================================================== -->
+
+ <target name="main" depends="wsconsume,compile,copy-resources,generate-resources" description="Build the deployments.">
+ <ant antfile="${basedir}/ant-import/build-samples-jaxrpc.xml" target="build-samples-jaxrpc" inheritall="true"/>
+ <ant antfile="${basedir}/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws" inheritall="true"/>
+ <ant antfile="${basedir}/ant-import/build-jars-jaxrpc.xml" target="build-jars-jaxrpc" inheritall="true"/>
+ <ant antfile="${basedir}/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/>
+ </target>
+
+ <!-- ================================================================== -->
<!-- Testing -->
<!-- ================================================================== -->
Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/Hello.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/Hello.java 2007-02-12 17:40:10 UTC (rev 2343)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/Hello.java 2007-02-13 09:48:06 UTC (rev 2344)
@@ -1,40 +0,0 @@
-
-package org.jboss.test.ws.jaxws.samples.wssecurity;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-
-
-/**
- * JBossWS Generated Source
- *
- * Generation Date: Mon Feb 12 18:02:31 CET 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- *
- * JAX-WS Version: 2.0
- *
- */
- at WebService(name = "Hello", targetNamespace = "http://org.jboss.ws/samples/wssecurity")
- at SOAPBinding(style = SOAPBinding.Style.RPC)
-public interface Hello {
-
-
- /**
- *
- * @param user
- * @return
- * returns org.jboss.test.ws.jaxws.samples.wssecurity.UserType
- */
- @WebMethod
- @WebResult(partName = "return")
- public UserType echoUserType(
- @WebParam(name = "user", partName = "user")
- UserType user);
-
-}
Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/UserType.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/UserType.java 2007-02-12 17:40:10 UTC (rev 2343)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/UserType.java 2007-02-13 09:48:06 UTC (rev 2344)
@@ -1,60 +0,0 @@
-
-package org.jboss.test.ws.jaxws.samples.wssecurity;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for UserType complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="UserType">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="msg" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "UserType", propOrder = {
- "msg"
-})
-public class UserType {
-
- protected String msg;
-
- /**
- * Gets the value of the msg property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getMsg() {
- return msg;
- }
-
- /**
- * Sets the value of the msg property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setMsg(String value) {
- this.msg = value;
- }
-
-}
Added: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl (rev 0)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl 2007-02-13 09:48:06 UTC (rev 2344)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='HelloService' targetNamespace='http://org.jboss.ws/samples/wssecurity' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/samples/wssecurity' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <xs:schema targetNamespace='http://org.jboss.ws/samples/wssecurity' version='1.0' xmlns:xs='http://www.w3.org/2001/XMLSchema'>
+ <xs:complexType name='UserType'>
+ <xs:sequence>
+ <xs:element minOccurs='0' name='msg' type='xs:string'/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:schema>
+ </types>
+ <message name='Hello_echoUserType'>
+ <part name='user' type='tns:UserType'/>
+ </message>
+ <message name='Hello_echoUserTypeResponse'>
+ <part name='return' type='tns:UserType'/>
+ </message>
+ <portType name='Hello'>
+ <operation name='echoUserType' parameterOrder='user'>
+ <input message='tns:Hello_echoUserType'/>
+ <output message='tns:Hello_echoUserTypeResponse'/>
+ </operation>
+ </portType>
+ <binding name='HelloBinding' type='tns:Hello'>
+ <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='echoUserType'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body namespace='http://org.jboss.ws/samples/wssecurity' use='literal'/>
+ </input>
+ <output>
+ <soap:body namespace='http://org.jboss.ws/samples/wssecurity' use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='HelloService'>
+ <port binding='tns:HelloBinding' name='HelloPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
More information about the jbossws-commits
mailing list