Author: thomas.diesler(a)jboss.com Date: 2007-05-12 17:35:09 -0400 (Sat, 12 May 2007) New Revision: 3060 Added: trunk/jbossws-core/src/test/resources/tests-jboss42-excludes.txt trunk/jbossws-core/src/test/resources/tests-tomcat-excludes.txt trunk/jbossws-tests/src/resources/dummy-excludes.txt trunk/jbws-jboss42/ant-import/build-testsuite.xml trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/ trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/ManagedServerConfig.java trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/ManagedServerConfigMBean.java trunk/jbws-jboss42/src/test/ trunk/jbws-jboss42/src/test/java/ trunk/jbws-jboss42/src/test/resources/ trunk/jbws-jboss42/src/test/resources/excludes.txt trunk/sunri-jboss50/src/test/java/ Removed: trunk/jbossws-tests/src/resources/tests-jboss42-excludes.txt trunk/jbossws-tests/src/resources/tests-jboss50-excludes.txt trunk/jbossws-tests/src/resources/tests-tomcat-excludes.txt Modified: trunk/build/ant-import/build-testsuite.xml trunk/build/build.xml trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml trunk/build/version.properties trunk/jbossws-core/.classpath trunk/jbossws-core/ant-import/build-testsuite.xml trunk/jbossws-core/ant-import/build-thirdparty.xml trunk/jbossws-core/build.xml trunk/jbossws-core/version.properties trunk/jbossws-spi/.classpath trunk/jbossws-spi/ant-import/build-thirdparty.xml trunk/jbossws-spi/build.xml trunk/jbossws-tests/ trunk/jbossws-tests/.classpath trunk/jbossws-tests/ant-import/build-testsuite.xml trunk/jbossws-tests/build.xml trunk/jbws-jboss42/ trunk/jbws-jboss42/.classpath trunk/jbws-jboss42/ant-import/build-deploy.xml trunk/jbws-jboss42/ant-import/build-release.xml trunk/jbws-jboss42/ant-import/build-thirdparty.xml trunk/jbws-jboss42/build.xml trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/UnifiedDeploymentInfoDeployer.java trunk/jbws-jboss42/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml trunk/jbws-jboss42/version.properties trunk/jbws-jboss50/.classpath trunk/jbws-jboss50/ant-import/build-deploy.xml trunk/jbws-jboss50/ant-import/build-release.xml trunk/jbws-jboss50/ant-import/build-testsuite.xml trunk/jbws-jboss50/ant-import/build-thirdparty.xml trunk/jbws-jboss50/build.xml trunk/sunri-jboss50/.classpath trunk/sunri-jboss50/ant-import/build-testsuite.xml trunk/sunri-jboss50/build.xml Log: Resurect jboss42 integration Modified: trunk/build/ant-import/build-testsuite.xml =================================================================== --- trunk/build/ant-import/build-testsuite.xml 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/build/ant-import/build-testsuite.xml 2007-05-12 21:35:09 UTC (rev 3060) @@ -90,6 +90,46 @@ </target> <!-- ================================================================== --> + <!-- Building --> + <!-- ================================================================== --> + + <macrodef name="copy-test-resources"> + <attribute name="srcdir"/> + <sequential> + <copy todir="${tests.output.dir}/classes" file="${testsuite.dir}/src/etc/jndi.properties"/> + <copy todir="${tests.output.dir}/classes" file="${testsuite.dir}/src/etc/log4j.xml"/> + + <!-- copy handler definitions --> + <copy todir="${tests.output.dir}/classes"> + <fileset dir="@{srcdir}/java"> + <include name="**/*.xml"/> + </fileset> + </copy> + + <!-- copy non binary files --> + <copy todir="${tests.output.dir}/resources"> + <fileset dir="@{srcdir}/resources"> + <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="@{srcdir}/resources"> + <exclude name="**/*.wsdl"/> + <exclude name="**/*.xml"/> + </fileset> + </copy> + </sequential> + </macrodef> + + <!-- ================================================================== --> <!-- Testing --> <!-- ================================================================== --> Modified: trunk/build/build.xml =================================================================== --- trunk/build/build.xml 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/build/build.xml 2007-05-12 21:35:09 UTC (rev 3060) @@ -28,26 +28,45 @@ | Build all jar files. --> <target name="jars" depends="prepare" description="Builds all jar files."> - <ant antfile="${spi.dir}/build.xml" dir="${spi.dir}" target="spi-jars"/> - <ant antfile="${core.dir}/build.xml" dir="${core.dir}" target="core-jars"/> + <ant antfile="${spi.dir}/build.xml" target="spi-jars" inheritall="false"/> + <ant antfile="${core.dir}/build.xml" target="core-jars" inheritall="false"/> </target> + <!-- ================================================================== --> + <!-- Miscellaneous --> + <!-- ================================================================== --> + <target name="clean" depends="prepare" description="Cleans up most generated files."> <ant antfile="${spi.dir}/build.xml" target="clean" inheritall="false"/> <ant antfile="${core.dir}/build.xml" target="clean" inheritall="false"/> - <!--ant antfile="${tests.dir}/build.xml" target="clean" inheritall="false"/--> </target> - <target name="main" description="Executes the default target (most)." depends="most"> + <target name="clobber" depends="prepare" description="Cleans up all generated files."> + <ant antfile="${spi.dir}/build.xml" target="clobber" inheritall="false"/> + <ant antfile="${core.dir}/build.xml" target="clobber" inheritall="false"/> + <ant antfile="${testsuite.dir}/build.xml" target="clobber" inheritall="false"/> + <ant antfile="${jbws.jboss50.dir}/build.xml" target="clobber" inheritall="false"/> + <ant antfile="${jbws.jboss42.dir}/build.xml" target="clobber" inheritall="false"/> + <ant antfile="${sunri.jboss50.dir}/build.xml" target="clobber" inheritall="false"/> + </target> + + <target name="main" description="Executes the default target (most)." depends="jars"> <echo message="***********************************"/> <echo message="* JBossWS core successfully build *"/> <echo message="* ant hudson-setup *"/> <echo message="***********************************"/> </target> - <target name="most" description="Builds almost everything." depends="jars"/> + <target name="most" description="Builds almost everything." depends="prepare"> + <ant antfile="${spi.dir}/build.xml" target="most" inheritall="false"/> + <ant antfile="${core.dir}/build.xml" target="most" inheritall="false"/> + <ant antfile="${testsuite.dir}/build.xml" target="most" inheritall="false"/> + <ant antfile="${jbws.jboss50.dir}/build.xml" target="most" inheritall="false"/> + <ant antfile="${jbws.jboss42.dir}/build.xml" target="most" inheritall="false"/> + <ant antfile="${sunri.jboss50.dir}/build.xml" target="most" inheritall="false"/> + </target> - <target name="all" description="Create a distribution zip file" depends="build-bin-dist,build-src-dist"> + <target name="all" description="Create a distribution zip file" depends="most,build-bin-dist,build-src-dist"> </target> </project> Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml 2007-05-12 21:35:09 UTC (rev 3060) @@ -50,7 +50,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>jbossws/jbossws-tests/output/reports/*.xml</testResults> + <testResults>jbossws/jbossws-core/output-tests/reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; Modified: trunk/build/version.properties =================================================================== --- trunk/build/version.properties 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/build/version.properties 2007-05-12 21:35:09 UTC (rev 3060) @@ -17,7 +17,9 @@ jboss-common-core=2.0.2.GA jboss-common-logging-log4j=2.0.2.GA jboss-common-logging-spi=2.0.2.GA +jboss-javaee=5.0.0-SNAPSHOT jboss-jbossxb=2.0.0.CR2 jboss-microcontainer=2.0.0.Beta3 +junit=3.8.1 sun-jaxws=2.1.1 sun-servlet=2.5 Modified: trunk/jbossws-core/.classpath =================================================================== --- trunk/jbossws-core/.classpath 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbossws-core/.classpath 2007-05-12 21:35:09 UTC (rev 3060) @@ -4,7 +4,6 @@ <classpathentry kind="src" path="output-tests/wsconsume/java"/> <classpathentry excluding="org/jboss/test/ws/benchmark/|org/jboss/test/ws/interop/|org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.java" kind="src" path="src/test/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry combineaccessrules="false" kind="src" path="/jbossws-spi"/> <classpathentry kind="lib" path="thirdparty/ejb3.deployer/jboss-annotations-ejb3.jar"/> <classpathentry kind="lib" path="thirdparty/activation.jar"/> <classpathentry kind="lib" path="thirdparty/getopt.jar"/> @@ -31,8 +30,9 @@ <classpathentry kind="lib" path="thirdparty/qdox.jar"/> <classpathentry kind="lib" path="thirdparty/ant.jar"/> <classpathentry kind="lib" path="thirdparty/policy.jar"/> - <classpathentry kind="lib" path="thirdparty/junit.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/> <classpathentry kind="lib" path="thirdparty/xmlunit1.0.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/jbossws-spi"/> + <classpathentry kind="lib" path="/jbossws-spi/thirdparty/junit.jar"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: trunk/jbossws-core/ant-import/build-testsuite.xml =================================================================== --- trunk/jbossws-core/ant-import/build-testsuite.xml 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbossws-core/ant-import/build-testsuite.xml 2007-05-12 21:35:09 UTC (rev 3060) @@ -248,44 +248,15 @@ </javac> </target> - <!-- Copy resources --> - <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> - <copy todir="${tests.output.dir}/classes" file="${testsuite.dir}/src/etc/jndi.properties"/> - <copy todir="${tests.output.dir}/classes" file="${testsuite.dir}/src/etc/log4j.xml"/> - - <!-- copy handler definitions --> - <copy todir="${tests.output.dir}/classes"> - <fileset dir="${tests.java.dir}"> - <include name="**/*.xml"/> - </fileset> - </copy> - - <!-- copy non binary files --> - <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 --> <!-- ================================================================== --> + <!-- Copy resources --> + <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> + <copy-test-resources srcdir="${basedir}/src/test"/> + </target> + <target name="tests-main" depends="wsconsume,tests-compile,tests-copy-resources,tests-generate-resources" description="Build the deployments."> <ant antfile="${core.dir}/ant-import/build-jars-jaxrpc.xml" target="build-jars-jaxrpc" inheritall="true"/> <ant antfile="${core.dir}/ant-import/build-samples-jaxrpc.xml" target="build-samples-jaxrpc" inheritall="true"/> Modified: trunk/jbossws-core/ant-import/build-thirdparty.xml =================================================================== --- trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-05-12 21:35:09 UTC (rev 3060) @@ -85,7 +85,6 @@ <get src="${jboss.repository}/jboss/security/${jboss-security}/lib/jbosssx-src.zip" dest="${core.thirdparty.dir}/jbosssx-src.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jbossas/core-libs/${jbossas-core-libs}/lib/jboss-j2ee.jar" dest="${core.thirdparty.dir}/jboss-j2ee.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jbpm/bpel/${jbpm-bpel}/lib/jbpm-bpel.sar" dest="${core.thirdparty.dir}/jbpm-bpel.sar" usetimestamp="true" verbose="true" /> - <get src="${jboss.repository}/junit/${junit}/lib/junit.jar" dest="${core.thirdparty.dir}/junit.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/oswego-concurrent/${oswego-concurrent}/lib/concurrent.jar" dest="${core.thirdparty.dir}/concurrent.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/qdox/${qdox}/lib/qdox.jar" dest="${core.thirdparty.dir}/qdox.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/stax-api/${stax-api}/lib/stax-api.jar" dest="${core.thirdparty.dir}/stax-api.jar" usetimestamp="true" verbose="true"/> Modified: trunk/jbossws-core/build.xml =================================================================== --- trunk/jbossws-core/build.xml 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbossws-core/build.xml 2007-05-12 21:35:09 UTC (rev 3060) @@ -215,9 +215,14 @@ <delete dir="${core.output.dir}"/> </target> + <target name="clobber" depends="clean" description="Cleans up all generated files."> + <delete dir="${basedir}/output-tests"/> + <delete dir="${basedir}/thirdparty"/> + </target> + <target name="main" description="Executes the default target (most)." depends="most"/> - <target name="most" description="Builds almost everything." depends="core-jars"/> + <target name="most" description="Builds almost everything." depends="core-jars,tests-main"/> <target name="all" description="Create a distribution zip file" depends="main"> </target> Added: trunk/jbossws-core/src/test/resources/tests-jboss42-excludes.txt =================================================================== --- trunk/jbossws-core/src/test/resources/tests-jboss42-excludes.txt (rev 0) +++ trunk/jbossws-core/src/test/resources/tests-jboss42-excludes.txt 2007-05-12 21:35:09 UTC (rev 3060) @@ -0,0 +1,13 @@ +# Always excludes +org/jboss/test/ws/interop/** +org/jboss/test/ws/benchmark/** + +# EJB3/Injection excludes +org/jboss/test/ws/jaxws/endpoint/** +org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase.* +org/jboss/test/ws/jaxws/samples/webserviceref/** +org/jboss/test/ws/jaxws/jbws1581/** +org/jboss/test/ws/jaxws/serviceref/** + +org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.* +org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.* Property changes on: trunk/jbossws-core/src/test/resources/tests-jboss42-excludes.txt ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/jbossws-core/src/test/resources/tests-tomcat-excludes.txt =================================================================== --- trunk/jbossws-core/src/test/resources/tests-tomcat-excludes.txt (rev 0) +++ trunk/jbossws-core/src/test/resources/tests-tomcat-excludes.txt 2007-05-12 21:35:09 UTC (rev 3060) @@ -0,0 +1,28 @@ +# Always excludes +org/jboss/test/ws/interop/** +org/jboss/test/ws/benchmark/** + +# EJB3/Injection excludes +org/jboss/test/ws/jaxrpc/jbws1011/** +org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*TestCase.* +org/jboss/test/ws/jaxrpc/samples/secureejb/*TestCase.* +org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.* +org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase.* +org/jboss/test/ws/jaxws/samples/jsr181ejb/** +org/jboss/test/ws/jaxws/samples/retail/** +org/jboss/test/ws/jaxws/samples/webservice/JSR181WebServiceEJB3TestCase.* +org/jboss/test/ws/jaxws/samples/webserviceref/** + +# JBoss excludes +org/jboss/test/ws/jaxrpc/jbws723/** +org/jboss/test/ws/jaxrpc/samples/dynamichandler/*TestCase.* +org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.* +org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.* +org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.* +org/jboss/test/ws/jaxws/jbws1581/** +org/jboss/test/ws/jaxws/samples/jaxr/** + +# TODO: Why are these excluded +# [JBWS-1471] - Remove unwanted tomcat excludes +org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.* +org/jboss/test/ws/jaxws/samples/wseventing/** Property changes on: trunk/jbossws-core/src/test/resources/tests-tomcat-excludes.txt ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/jbossws-core/version.properties =================================================================== --- trunk/jbossws-core/version.properties 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbossws-core/version.properties 2007-05-12 21:35:09 UTC (rev 3060) @@ -28,7 +28,6 @@ jboss-security=4.0.5.GA jboss-vfs=2.0.0.Beta2 jbossas-core-libs=4.0.5.GA -junit=3.8.1 oswego-concurrent=1.3.4 qdox=1.4 sun-hudson=1.93 Modified: trunk/jbossws-spi/.classpath =================================================================== --- trunk/jbossws-spi/.classpath 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbossws-spi/.classpath 2007-05-12 21:35:09 UTC (rev 3060) @@ -14,5 +14,6 @@ <classpathentry kind="lib" path="thirdparty/jaxws-api.jar"/> <classpathentry kind="lib" path="thirdparty/jsr181-api.jar"/> <classpathentry kind="lib" path="thirdparty/servlet-api.jar"/> + <classpathentry kind="lib" path="thirdparty/junit.jar"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: trunk/jbossws-spi/ant-import/build-thirdparty.xml =================================================================== --- trunk/jbossws-spi/ant-import/build-thirdparty.xml 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbossws-spi/ant-import/build-thirdparty.xml 2007-05-12 21:35:09 UTC (rev 3060) @@ -44,6 +44,7 @@ <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core-sources.jar" dest="${spi.thirdparty.dir}/jboss-common-core-sources.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/common-logging-log4j/${jboss-common-logging-log4j}/lib/jboss-logging-log4j.jar" dest="${spi.thirdparty.dir}/jboss-logging-log4j.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar" dest="${spi.thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jboss-javaee/${jboss-javaee}/lib/jboss-javaee.jar" dest="${spi.thirdparty.dir}/jboss-javaee.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${spi.thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding-sources.jar" dest="${spi.thirdparty.dir}/jboss-xml-binding-sources.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-container.jar" dest="${spi.thirdparty.dir}/jboss-container.jar" usetimestamp="true" verbose="true"/> @@ -53,6 +54,7 @@ <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers-src.zip" dest="${spi.thirdparty.dir}/jboss-deployers-src.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer.jar" dest="${spi.thirdparty.dir}/jboss-microcontainer.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer-src.zip" dest="${spi.thirdparty.dir}/jboss-microcontainer-src.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/junit/${junit}/lib/junit.jar" dest="${spi.thirdparty.dir}/junit.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-api.jar" dest="${spi.thirdparty.dir}/jaxws-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jsr181-api.jar" dest="${spi.thirdparty.dir}/jsr181-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${spi.thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/> @@ -67,6 +69,7 @@ <pathelement location="${spi.thirdparty.dir}/jboss-common-core.jar"/> <pathelement location="${spi.thirdparty.dir}/jboss-dependency.jar"/> <pathelement location="${spi.thirdparty.dir}/jboss-logging-spi.jar"/> + <pathelement location="${spi.thirdparty.dir}/jboss-javaee.jar"/> <pathelement location="${spi.thirdparty.dir}/jboss-microcontainer.jar"/> <pathelement location="${spi.thirdparty.dir}/jboss-xml-binding.jar"/> <pathelement location="${spi.thirdparty.dir}/jaxws-api.jar"/> Modified: trunk/jbossws-spi/build.xml =================================================================== --- trunk/jbossws-spi/build.xml 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbossws-spi/build.xml 2007-05-12 21:35:09 UTC (rev 3060) @@ -141,6 +141,10 @@ <delete dir="${spi.output.dir}"/> </target> + <target name="clobber" depends="clean" description="Cleans up all generated files."> + <delete dir="${basedir}/thirdparty"/> + </target> + <target name="main" description="Executes the default target (most)." depends="most"/> <target name="most" description="Builds almost everything." depends="spi-jars"/> Property changes on: trunk/jbossws-tests ___________________________________________________________________ Name: svn:ignore - output-eclipse output + output-eclipse output output* Modified: trunk/jbossws-tests/.classpath =================================================================== --- trunk/jbossws-tests/.classpath 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbossws-tests/.classpath 2007-05-12 21:35:09 UTC (rev 3060) @@ -1,17 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="output/wsconsume/java"/> <classpathentry excluding="org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.java" kind="src" path="src/java"/> - <classpathentry kind="src" path="output/wstools/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/> <classpathentry combineaccessrules="false" kind="src" path="/jbossws-spi"/> - <classpathentry combineaccessrules="false" kind="src" path="/sunri-jboss50"/> - <classpathentry kind="lib" path="/jbossws-core/thirdparty/junit.jar"/> <classpathentry kind="lib" path="/sunri-jboss50/thirdparty/jaxb-api.jar"/> <classpathentry kind="lib" path="/sunri-jboss50/thirdparty/jaxws-api.jar"/> <classpathentry kind="lib" path="/sunri-jboss50/thirdparty/jsr181-api.jar"/> <classpathentry kind="lib" path="/sunri-jboss50/thirdparty/saaj-api.jar"/> <classpathentry kind="lib" path="/sunri-jboss50/thirdparty/servlet-api.jar"/> + <classpathentry kind="lib" path="/jbossws-spi/thirdparty/junit.jar"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: trunk/jbossws-tests/ant-import/build-testsuite.xml =================================================================== --- trunk/jbossws-tests/ant-import/build-testsuite.xml 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbossws-tests/ant-import/build-testsuite.xml 2007-05-12 21:35:09 UTC (rev 3060) @@ -1,17 +1,25 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- ============================================================ --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- ============================================================ --> - -<!-- $Id$ --> - <project> - <import file="${basedir}/../build/ant-import/build-testsuite.xml"/> + <property name="tests.dir" value="${testsuite.dir}/src"/> + <import file="${build.dir}/ant-import/build-testsuite.xml"/> + <import file="${testsuite.dir}/ant-import/build-testsuite.xml"/> + + <property name="excludesfile" value="${testsuite.dir}/src/resources/dummy-excludes.txt"/> + + <!-- + Init the various classpaths + --> + <target name="tests-init" depends="tests-prepare,spi-thirdparty"> + + <!-- The combined compile classpath --> + <path id="javac.classpath"> + <pathelement location="${spi.dir}/output/classes"/> + <path refid="spi.thirdparty.classpath"/> + </path> + + </target> + <!-- ================================================================== --> <!-- Compiling --> <!-- ================================================================== --> @@ -27,45 +35,17 @@ </javac> </target> - <!-- Copy resources --> - <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> - <copy todir="${tests.output.dir}/classes" file="${testsuite.dir}/src/etc/jndi.properties"/> - <copy todir="${tests.output.dir}/classes" file="${testsuite.dir}/src/etc/log4j.xml"/> - - <!-- copy handler definitions --> - <copy todir="${tests.output.dir}/classes"> - <fileset dir="${tests.java.dir}"> - <include name="**/*.xml"/> - </fileset> - </copy> - - <!-- copy non binary files --> - <copy todir="${tests.output.dir}/resources"> - <fileset dir="${tests.resources.dir}"> - <include name="**/*.wsdl"/> - <include name="**/*.xml"/> - </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 --> <!-- ================================================================== --> + <!-- Copy resources --> + <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> + <copy-test-resources srcdir="${basedir}/src"/> + </target> + <target name="tests-main" depends="tests-compile,tests-copy-resources" description="Build the deployments."> <ant antfile="${testsuite.dir}/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/> </target> - + </project> Modified: trunk/jbossws-tests/build.xml =================================================================== --- trunk/jbossws-tests/build.xml 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbossws-tests/build.xml 2007-05-12 21:35:09 UTC (rev 3060) @@ -10,558 +10,12 @@ <project default="main" basedir="../jbossws-tests" name="JBossWS-Tests"> - <import file="${basedir}/../build/ant-import/build-deploy.xml"/> - <import file="${basedir}/../build/ant-import/build-thirdparty.xml"/> <import file="${basedir}/../build/ant-import/build-setup.xml"/> - <import file="${basedir}/../jbossws-core/build.xml"/> + <import file="${basedir}/ant-import/build-testsuite.xml"/> + <import file="${spi.dir}/build.xml"/> - <import file="${basedir}/../jbossws-tests/ant-import/build-benchmark.xml"/> - - <property name="core.output.dir" value="${core.dir}/output"/> - <property name="core.output.classes.dir" value="${core.output.dir}/classes"/> - <property name="core.output.classes14.dir" value="${core.output.dir}/classes14"/> - <property name="core.output.lib.dir" value="${core.output.dir}/lib"/> - - <property name="tests.etc.dir" value="${tests.dir}/src/etc"/> - <property name="tests.java.dir" value="${tests.dir}/src/java"/> - <property name="tests.resources.dir" value="${tests.dir}/src/resources"/> - <property name="tests.output.dir" value="${tests.dir}/output"/> <!-- ================================================================== --> - <!-- Setup --> - <!-- ================================================================== --> - - <!-- Use -Ddebug=true for remote debugging --> - <condition property="remote.debug.line" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"> - <isset property="debug"/> - </condition> - <condition property="remote.debug.line" value=""> - <not> - <isset property="debug"/> - </not> - </condition> - - <!-- 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"/> - </condition> - <condition property="jboss.home" value="${jboss42.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> - </condition> - - <!-- Integration Target Server --> - <condition property="jbossws.integration.target.jboss"> - <isset property="jboss.home"/> - </condition> - <condition property="jbossws.integration.target.tomcat"> - <equals arg1="${jbossws.integration.target}" arg2="tomcat"/> - </condition> - - <property name="jboss.client" value="${jboss.home}/client"/> - <property name="jboss.lib" value="${jboss.home}/lib"/> - <property name="jboss.server" value="${jboss.home}/server/${jboss.server.instance}"/> - <property name="jboss.server.lib" value="${jboss.server}/lib"/> - <property name="jboss.server.deploy" value="${jboss.server}/deploy"/> - - <!-- Java Endorsed --> - <condition property="endorsed.dirs" value="${jboss.home}/lib/endorsed"> - <isset property="jbossws.integration.target.jboss"/> - </condition> - <condition property="endorsed.dirs" value="${tomcat.home}/common/endorsed"> - <isset property="jbossws.integration.target.tomcat"/> - </condition> - - <!-- Set a hostname property based on COMPUTERNAME for win32, HOSTNAME - otherwise and initialize the node0/node1 cluster hostnames to localhost - and ${hostname} by default. If you cannot route multicast traffic between - localhost and hostname, then you need to specify node0 and node1 binding - in the local.properties that can in order to be able to run the clustering - tests. - --> - <property environment="env"/> - <condition property="hostname" value="${env.COMPUTERNAME}"> - <os family="windows"/> - </condition> - <condition property="hostname" value="${env.HOSTNAME}"> - <not> - <os family="windows"/> - </not> - </condition> - - <!-- node0 defaults --> - <property name="node0" value="localhost"/> - <property name="node0.http.url" value="http://${node0}:8080"/> - <property name="node0.jndi.url" value="jnp://${node0}:1099"/> - <property name="node0.hajndi.url" value="jnp://${node0}:1100"/> - - <!-- ================================================================== --> - <!-- Initialization --> - <!-- ================================================================== --> - - <target name="prepare"> - - <mkdir dir="${tests.output.dir}/log"/> - <touch file="${tests.output.dir}/log/test.log"/> - - <tstamp> - <format property="build.id" pattern="yyyyMMddHHmm"/> - </tstamp> - - <!-- Define excluded tests --> - <condition property="excludes-short-name" value="tests-${jbossws.integration.target}-excludes.txt"> - <or> - <available file="${jboss.client}/jboss-ejb3-client.jar"/> - <isset property="integration.target.tomcat"/> - </or> - </condition> - <property name="excludes-short-name" value="tests-${jbossws.integration.target}-noejb3-excludes.txt"/> - <property name="excludesfile" value="${tests.resources.dir}/${excludes-short-name}"/> - - <echo/> - <echo message="-----------------------------------------------"/> - <echo message="jboss.home = ${jboss.home}"/> - <echo message="tomcat.home = ${tomcat.home}"/> - <echo message="java.home = ${java.home}"/> - <echo message="endorsed = ${endorsed.dirs}"/> - <echo message="excludesfile = ${excludes-short-name}"/> - <echo message="-----------------------------------------------"/> - - </target> - - <!-- - Init the various classpaths - --> - <target name="init" depends="prepare,jboss-classpath,tomcat-classpath"/> - - <target name="common-classpath" depends="prepare,thirdparty"> - - <path id="jbossws.classpath"> - <pathelement location="${core.output.lib.dir}/jboss-jaxrpc.jar"/> - <pathelement location="${core.output.lib.dir}/jboss-jaxws.jar"/> - <pathelement location="${core.output.lib.dir}/jboss-saaj.jar"/> - <pathelement location="${core.output.lib.dir}/jbossws-core.jar"/> - <pathelement location="${core.output.lib.dir}/jbossws-client.jar"/> - </path> - - <!-- The combined compile classpath --> - <path id="javac.classpath"> - <path refid="core.classpath"/> - <path refid="jbossws.classpath"/> - <pathelement location="${thirdparty.dir}/activation.jar"/> - <pathelement location="${thirdparty.dir}/jboss-vfs.jar"/> - <pathelement location="${thirdparty.dir}/junit.jar"/> - <pathelement location="${thirdparty.dir}/mail.jar"/> - <pathelement location="${thirdparty.dir}/qdox.jar"/> - <pathelement location="${thirdparty.dir}/policy.jar"/> - <pathelement location="${thirdparty.dir}/servlet-api.jar"/> - <pathelement location="${thirdparty.dir}/stax-api.jar"/> - <pathelement location="${thirdparty.dir}/xmlunit1.0.jar"/> - <pathelement location="${thirdparty.dir}/jbossws-jboss50.jar"/> - <pathelement location="${thirdparty.dir}/jbossws-jboss42.jar"/> - <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> - </path> - </target> - - <target name="jboss-classpath" depends="common-classpath" if="jbossws.integration.target.jboss"> - - <!-- The test client classpath --> - <path id="test.client.classpath"> - <path refid="jbossws.classpath"/> - <pathelement location="${jboss.client}/commons-logging.jar"/> - <pathelement location="${jboss.client}/jboss-backport-concurrent.jar"/> - <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> - <pathelement location="${jboss.client}/jboss-aop-jdk50-client.jar"/> - <pathelement location="${jboss.client}/jboss-aspect-jdk50-client.jar"/> - <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-aop-jdk50.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.deploy}/juddi-service.sar/juddi.jar"/> - <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/> - <pathelement location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/> - <path refid="javac.classpath"/> - </path> - - <!-- The jBPM BPEL classpath --> - <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}/commons-collections.jar"/> - <pathelement location="${thirdparty.dir}/commons-logging.jar"/> - <pathelement location="${thirdparty.dir}/dom4j.jar"/> - <pathelement location="${thirdparty.dir}/jaxen.jar"/> - <pathelement location="${thirdparty.dir}/wsdl4j.jar"/> - <pathelement location="${thirdparty.dir}/jboss-logging-log4j.jar"/> - <!-- - <pathelement location="${thirdparty.dir}/log4j.jar"/> - <pathelement location="${tests.etc.dir}"/> - --> - </path> - </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"/> - <path id="test.client.classpath"> - <path refid="jbossws.classpath"/> - <pathelement location="${tomcat.home}/common/lib/jbossws-thirdparty.jar"/> - <path refid="javac.classpath"/> - </path> - </target> - - <!-- ================================================================== --> - <!-- Generating sources --> - <!-- ================================================================== --> - - <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}/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl" package="org.jboss.test.ws.benchmark.jaxws.doclit" sourcedestdir="${tests.output.dir}/wsconsume/java" 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" keep="true"/> - <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" keep="true"/> - <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" keep="true"/> - <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" keep="true"/> - <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" keep="true"/> - <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> - - <!-- - Generate BPEL sources - --> - <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"> - <fileset dir="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/bpel" /> - </zip> - <!-- Copy the BPEL sar --> - <copy file="${thirdparty.dir}/jbpm-bpel.sar" todir="${tests.output.dir}/libs"/> - - <!-- generate wsdl binding and service definitions for bpel processes --> - <taskdef name="servicegen" classname="org.jbpm.bpel.ant.ServiceGeneratorTask"> - <classpath refid="jbpm.bpel.classpath"/> - </taskdef> - <servicegen processfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip" - outputdir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl" - bindingfile="hello-binding-.wsdl" servicefile="hello-service.wsdl" /> - </target> - - <!-- - Generate JAX-RPC sources - --> - <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"> - <classpath refid="core.classpath"/> - <classpath refid="jbossws.classpath"/> - <classpath location="${thirdparty.dir}/jbossretro-rt.jar"/> - <classpath location="${thirdparty.dir}/jboss-backport-concurrent.jar"/> - <classpath location="${thirdparty.dir}/concurrent.jar"/> - <classpath location="${tests.output.dir}/classes"/> - <classpath location="${tests.output.dir}"/> - </taskdef> - - <!-- Generate JAX-RPC artifacts --> - <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"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/dynamichandler/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/dynamichandler/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/exception/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/exception/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/handler/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/handler/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/holder/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/holder/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jmstransport/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jmstransport/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109ejb/doclit/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109ejb/rpclit/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109pojo/doclit/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109pojo/rpclit/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/message/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/message/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/oneway/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/oneway/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/rpcstyle/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/rpcstyle/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/secureejb/META-INF" config="${tests.resources.dir}/jaxrpc/samples/secureejb/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wssecurity/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wssecurity/wstools-config.xml"/> - <move todir="${tests.output.dir}/wstools/java"> - <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/> - </move> - - <!-- Copy generated resources --> - <copy todir="${tests.output.dir}/resources"> - <fileset dir="${tests.output.dir}/wstools/resources"> - <include name="**/*.wsdl"/> - <include name="**/*.xml"/> - </fileset> - </copy> - <!-- Copy resources that cannot (yet) be generated --> - <copy todir="${tests.output.dir}/resources/jaxrpc/samples" overwrite="true"> - <fileset dir="${tests.resources.dir}/jaxrpc/samples-override"/> - <filterset> - <filter token="jbosstest.host.name" value="${node0}"/> - </filterset> - </copy> - </target> - - <!-- - Generate JAX-WS sources - --> - <target name="wsprovide" depends="compile" description="Provide the JAX-WS contracts." if="HAVE_JDK_1.5"> - - <!-- Define the JAX-WS wsprovide task --> - <taskdef name="wsprovide" classname="org.jboss.ws.tools.jaxws.ant.wsprovide"> - <classpath refid="core.classpath"/> - <classpath refid="jbossws.classpath"/> - <classpath location="${thirdparty.dir}/concurrent.jar"/> - <classpath location="${tests.output.dir}/classes"/> - </taskdef> - - <wsprovide resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurity" genwsdl="true" sei="org.jboss.test.ws.jaxws.samples.wssecurity.HelloJavaBean"/> - </target> - - <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,compile15" description="Compile sources"/> - - <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 handler definitions --> - <copy todir="${tests.output.dir}/classes"> - <fileset dir="${tests.java.dir}"> - <include name="**/*.xml"/> - </fileset> - </copy> - - <!-- copy non binary files --> - <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-jars-jaxrpc.xml" target="build-jars-jaxrpc" inheritall="true"/> - <ant antfile="${basedir}/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/> - <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> - - <target name="publish-interop-endpoints" depends="main"> - <copy todir="${jboss.server.deploy}"> - <fileset dir="${tests.output.dir}/libs/"> - <include name="*interop*.war"/> - </fileset> - </copy> - </target> - - <!-- ================================================================== --> - <!-- Testing --> - <!-- ================================================================== --> - - <!-- Run all unit tests and generate a report --> - <target name="tests" depends="main" description="Run all unit tests and generate a report"> - <antcall target="tests-main"> - <param name="include.wildcard" value="org/jboss/test/ws/**/*TestCase.class"/> - <param name="exclude.wildcard" value="no-wildcard-exclude-see-excludesfile"/> - <param name="haltonfailure" value="false"/> - </antcall> - <antcall target="tests-report"/> - </target> - - <!-- Run samples test cases --> - <target name="tests-samples" depends="init" description="Run samples unit tests"> - <antcall target="tests-main"> - <param name="include.wildcard" value="org/jboss/test/ws/*/samples/**/*TestCase.class"/> - <param name="exclude.wildcard" value="org/jboss/test/ws/*/samples/jaxr/**"/> - <!-- - According to our commit policy, haltonfailure MUST be be true for tests-samples. - It is a prerequisite for any commit that this target passes without failure. - --> - <param name="haltonfailure" value="true"/> - </antcall> - <antcall target="tests-report"/> - </target> - - <!-- Run tools test cases --> - <target name="tests-tools" depends="init" description="Run tools unit tests"> - <antcall target="tests-main"> - <param name="include.wildcard" value="org/jboss/test/ws/tools/**/*TestCase.class"/> - <param name="exclude.wildcard" value="no-wildcard-exclude-see-excludesfile"/> - <param name="haltonfailure" value="false"/> - </antcall> - <antcall target="tests-report"/> - </target> - - <!-- - 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"> - <param name="include.wildcard" value="org/jboss/test/ws/${test}/**/*TestCase.class"/> - <param name="exclude.wildcard" value="no-wildcard-exclude-see-excludesfile"/> - <param name="haltonfailure" value="false"/> - </antcall> - </target> - - <!-- Common test target --> - <target name="tests-main" depends="init"> - <mkdir dir="${tests.output.dir}/reports"/> - <junit printsummary="yes" showoutput="yes" dir="${tests.output.dir}" haltonfailure="${haltonfailure}"> - <jvmarg value="-Djava.security.manager"/> - <sysproperty key="build.testlog" value="${tests.output.dir}/log"/> - <sysproperty key="client.scenario" value="${client.scenario}"/> - <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/> - <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/> - <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.virtual.protocol"/> - <sysproperty key="java.security.policy" value="${tests.etc.dir}/tst.policy"/> - <sysproperty key="jboss.home" value="${jboss.home}"/> - <sysproperty key="jbosstest.host.name" value="${node0}"/> - <sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/> - <sysproperty key="tomcat.home" value="${tomcat.home}"/> - <sysproperty key="tomcat.manager.password" value="${tomcat.manager.password}"/> - <sysproperty key="tomcat.manager.username" value="${tomcat.manager.username}"/> - <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.resources.dir}/jaxrpc/samples/wssecurity/wsse.keystore"/> - <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.resources.dir}/jaxrpc/samples/wssecurity/wsse.truststore"/> - <sysproperty key="org.jboss.ws.wsse.keyStorePassword" value="jbossws"/> - <sysproperty key="org.jboss.ws.wsse.trustStorePassword" value="jbossws"/> - <sysproperty key="org.jboss.ws.wsse.keyStoreType" value="jks"/> - <sysproperty key="org.jboss.ws.wsse.trustStoreType" value="jks"/> - <classpath> - <path refid="test.client.classpath"/> - <pathelement location="${tests.output.dir}/classes"/> - </classpath> - <formatter type="plain" usefile="true"/> - <formatter type="xml" usefile="true"/> - <batchtest todir="${tests.output.dir}/reports" fork="true"> - <fileset dir="${tests.output.dir}/classes" includes="${include.wildcard}" excludes="${exclude.wildcard}" excludesfile="${excludesfile}"/> - </batchtest> - </junit> - </target> - - <!-- - 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"/> - <junit printsummary="yes" showoutput="yes" dir="${tests.output.dir}"> - <jvmarg line="${remote.debug.line}"/> - <jvmarg value="-Djava.security.manager"/> - <sysproperty key="build.testlog" value="${tests.output.dir}/log"/> - <sysproperty key="client.scenario" value="${client.scenario}"/> - <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/> - <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/> - <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.virtual.protocol"/> - <sysproperty key="java.security.policy" value="${tests.etc.dir}/tst.policy"/> - <sysproperty key="jboss.home" value="${jboss.home}"/> - <sysproperty key="jbosstest.host.name" value="${node0}"/> - <sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/> - <sysproperty key="tomcat.home" value="${tomcat.home}"/> - <sysproperty key="tomcat.manager.password" value="${tomcat.manager.password}"/> - <sysproperty key="tomcat.manager.username" value="${tomcat.manager.username}"/> - <!-- - http://jira.jboss.com/jira/browse/JBWS-917 - <sysproperty key="javax.net.ssl.keyStore" value="${tests.resources.dir}/jaxrpc/samples/wssecurity/wsse.keystore"/> - <sysproperty key="javax.net.ssl.trustStore" value="${tests.resources.dir}/jaxrpc/samples/wssecurity/wsse.truststore"/> - <sysproperty key="javax.net.ssl.keyStorePassword" value="jbossws"/> - <sysproperty key="javax.net.ssl.trustStorePassword" value="jbossws"/> - <sysproperty key="javax.net.ssl.keyStoreType" value="jks"/> - <sysproperty key="javax.net.ssl.trustStoreType" value="jks"/> - --> - <!-- HTTPS hostname wrong: should be <localhost> --> - <sysproperty key="org.jboss.security.ignoreHttpsHost" value="true"/> - <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.resources.dir}/jaxrpc/samples/wssecurity/wsse.keystore"/> - <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.resources.dir}/jaxrpc/samples/wssecurity/wsse.truststore"/> - <sysproperty key="org.jboss.ws.wsse.keyStorePassword" value="jbossws"/> - <sysproperty key="org.jboss.ws.wsse.trustStorePassword" value="jbossws"/> - <sysproperty key="org.jboss.ws.wsse.keyStoreType" value="jks"/> - <sysproperty key="org.jboss.ws.wsse.trustStoreType" value="jks"/> - <classpath> - <path refid="test.client.classpath"/> - <pathelement location="${tests.output.dir}/classes"/> - </classpath> - <formatter type="plain" usefile="true"/> - <formatter type="xml" usefile="true"/> - <test todir="${tests.output.dir}/reports" name="${test}" fork="true"/> - </junit> - </target> - - <!-- ================================================================== --> - <!-- Reporting --> - <!-- ================================================================== --> - - <!-- Build the tests report --> - <target name="tests-report" depends="init" description="Build the tests report"> - <junitreport todir="${tests.output.dir}/reports"> - <fileset dir="${tests.output.dir}/reports"> - <include name="TEST-*.xml"/> - </fileset> - <report format="frames" todir="${tests.output.dir}/reports/html"/> - </junitreport> - <zip destfile="${tests.output.dir}/test-report-${build.id}.zip"> - <fileset dir="${tests.output.dir}" includes="reports/**"/> - </zip> - </target> - - <!-- ================================================================== --> <!-- Cleaning --> <!-- ================================================================== --> @@ -569,4 +23,8 @@ <delete dir="${tests.output.dir}"/> </target> + <target name="main" description="Builds almost everything." depends="tests-main"/> + + <target name="most" description="Builds almost everything." depends="main"/> + </project> Copied: trunk/jbossws-tests/src/resources/dummy-excludes.txt (from rev 3054, trunk/jbossws-tests/src/resources/tests-jboss42-excludes.txt) =================================================================== --- trunk/jbossws-tests/src/resources/dummy-excludes.txt (rev 0) +++ trunk/jbossws-tests/src/resources/dummy-excludes.txt 2007-05-12 21:35:09 UTC (rev 3060) @@ -0,0 +1,13 @@ +# Always excludes +org/jboss/test/ws/interop/** +org/jboss/test/ws/benchmark/** + +# EJB3/Injection excludes +org/jboss/test/ws/jaxws/endpoint/** +org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase.* +org/jboss/test/ws/jaxws/samples/webserviceref/** +org/jboss/test/ws/jaxws/jbws1581/** +org/jboss/test/ws/jaxws/serviceref/** + +org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.* +org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.* Deleted: trunk/jbossws-tests/src/resources/tests-jboss42-excludes.txt =================================================================== --- trunk/jbossws-tests/src/resources/tests-jboss42-excludes.txt 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbossws-tests/src/resources/tests-jboss42-excludes.txt 2007-05-12 21:35:09 UTC (rev 3060) @@ -1,13 +0,0 @@ -# Always excludes -org/jboss/test/ws/interop/** -org/jboss/test/ws/benchmark/** - -# EJB3/Injection excludes -org/jboss/test/ws/jaxws/endpoint/** -org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase.* -org/jboss/test/ws/jaxws/samples/webserviceref/** -org/jboss/test/ws/jaxws/jbws1581/** -org/jboss/test/ws/jaxws/serviceref/** - -org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.* -org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.* Deleted: trunk/jbossws-tests/src/resources/tests-jboss50-excludes.txt =================================================================== --- trunk/jbossws-tests/src/resources/tests-jboss50-excludes.txt 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbossws-tests/src/resources/tests-jboss50-excludes.txt 2007-05-12 21:35:09 UTC (rev 3060) @@ -1,20 +0,0 @@ -# Always excludes -org/jboss/test/ws/interop/** -org/jboss/test/ws/benchmark/** - -# Fix before JBoss50 goes final -org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase.* -org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase.* -org/jboss/test/ws/jaxrpc/jbws128/JBWS128TestCase.* -org/jboss/test/ws/jaxrpc/jbws153/JBWS153TestCase.* -org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase.* -org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase.* -org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase.* -org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase.* -org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase.* -org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*TestCase.* -org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.* -org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.* -org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.* -org/jboss/test/ws/jaxrpc/wsdlpublish/** - Deleted: trunk/jbossws-tests/src/resources/tests-tomcat-excludes.txt =================================================================== --- trunk/jbossws-tests/src/resources/tests-tomcat-excludes.txt 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbossws-tests/src/resources/tests-tomcat-excludes.txt 2007-05-12 21:35:09 UTC (rev 3060) @@ -1,28 +0,0 @@ -# Always excludes -org/jboss/test/ws/interop/** -org/jboss/test/ws/benchmark/** - -# EJB3/Injection excludes -org/jboss/test/ws/jaxrpc/jbws1011/** -org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*TestCase.* -org/jboss/test/ws/jaxrpc/samples/secureejb/*TestCase.* -org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.* -org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase.* -org/jboss/test/ws/jaxws/samples/jsr181ejb/** -org/jboss/test/ws/jaxws/samples/retail/** -org/jboss/test/ws/jaxws/samples/webservice/JSR181WebServiceEJB3TestCase.* -org/jboss/test/ws/jaxws/samples/webserviceref/** - -# JBoss excludes -org/jboss/test/ws/jaxrpc/jbws723/** -org/jboss/test/ws/jaxrpc/samples/dynamichandler/*TestCase.* -org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.* -org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.* -org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.* -org/jboss/test/ws/jaxws/jbws1581/** -org/jboss/test/ws/jaxws/samples/jaxr/** - -# TODO: Why are these excluded -# [JBWS-1471] - Remove unwanted tomcat excludes -org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.* -org/jboss/test/ws/jaxws/samples/wseventing/** Property changes on: trunk/jbws-jboss42 ___________________________________________________________________ Name: svn:ignore - output* + output* thirdparty version.properties.md5 Modified: trunk/jbws-jboss42/.classpath =================================================================== --- trunk/jbws-jboss42/.classpath 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbws-jboss42/.classpath 2007-05-12 21:35:09 UTC (rev 3060) @@ -3,17 +3,8 @@ <classpathentry excluding="org/jboss/ws/integration/jboss42/jms/" kind="src" path="src/main/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry combineaccessrules="false" kind="src" path="/jbossws-core"/> - <classpathentry kind="lib" path="thirdparty/jaxb-api.jar"/> - <classpathentry kind="lib" path="thirdparty/jaxb-impl.jar"/> - <classpathentry kind="lib" path="thirdparty/jaxb-xjc.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-common-core.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-container.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-dependency.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-logging-spi.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-microcontainer.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-xml-binding.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/jbossws-spi"/> - <classpathentry kind="lib" path="thirdparty/servlet-api.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-4.2.x"/> + <classpathentry kind="lib" path="/jbossws-spi/thirdparty/jboss-xml-binding.jar"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: trunk/jbws-jboss42/ant-import/build-deploy.xml =================================================================== --- trunk/jbws-jboss42/ant-import/build-deploy.xml 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbws-jboss42/ant-import/build-deploy.xml 2007-05-12 21:35:09 UTC (rev 3060) @@ -18,22 +18,18 @@ <!-- ================================================================== --> <!-- Deploy jbossws to jboss42 --> - <target name="deploy" depends="jboss42-jars" description="Deploy jbossws"> + <target name="deploy" depends="jbws42-jars,remove-jbossws,remove-jbwsri" description="Deploy jbossws"> <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> - <copy todir="${jboss42.home}/bin" overwrite="true"> - <fileset dir="${thirdparty.dir}/jbossws-resources"> - <include name="*.bat"/> - <include name="*.sh"/> - </fileset> - </copy> <copy todir="${jboss42.home}/client" overwrite="true"> - <fileset dir="${thirdparty.dir}"> + <fileset dir="${core.dir}/output/lib"> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> <include name="jboss-saaj.jar"/> <include name="jbossws-client.jar"/> + </fileset> + <fileset dir="${core.thirdparty.dir}"> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> <include name="jaxb-xjc.jar"/> @@ -41,16 +37,53 @@ <include name="jbossws-wsconsume-impl.jar"/> </fileset> </copy> + <copy todir="${jboss42.home}/lib" overwrite="true"> + <fileset dir="${spi.dir}/output/lib"> + <include name="jbossws-spi.jar"/> + </fileset> + </copy> <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="${thirdparty.dir}"> + <fileset dir="${core.dir}/output/lib"> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> <include name="jboss-saaj.jar"/> </fileset> </copy> - <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jboss42.output.lib.dir}/jbossws42.sar"/> + <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jbws42.output.lib.dir}/jbossws42.sar"/> </target> + <!-- Remove jbossws from jboss42 --> + <target name="remove-jbossws" depends="prepare" description="Remove jbossws"> + + <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> + + <delete> + <fileset dir="${jboss42.home}/client"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + <include name="wsdl4j.jar"/> + <include name="jbossws-wsconsume-impl.jar"/> + </fileset> + <fileset dir="${jboss42.home}/lib"> + <include name="jbossws-integration.jar"/> + <include name="jbossws-spi.jar"/> + </fileset> + <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </delete> + <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + </target> + + <!-- Remove jbossws/sunri from jboss42 --> + <target name="remove-jbwsri" depends="prepare" description="Remove jbossws/sunri"> + + <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbosswsri.sar"/> + </target> + </project> Modified: trunk/jbws-jboss42/ant-import/build-release.xml =================================================================== --- trunk/jbws-jboss42/ant-import/build-release.xml 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbws-jboss42/ant-import/build-release.xml 2007-05-12 21:35:09 UTC (rev 3060) @@ -14,20 +14,20 @@ <project> <!-- Release to jboss.local.repository --> - <target name="release" depends="jboss42-jars" + <target name="release" depends="jbws42-jars" description="Release to jboss.local.repository"> <!-- jboss/jbossws-jboss42 --> <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/> <mkdir dir="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/lib"/> <copy todir="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/lib" overwrite="true"> - <fileset dir="${jboss42.output.lib.dir}"> + <fileset dir="${jbws42.output.lib.dir}"> <include name="jbossws-jboss42.jar"/> <include name="jbossws42.sar"/> <include name="jbossws42-src.zip"/> </fileset> </copy> - <copy tofile="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/component-info.xml" file="${jboss42.etc.dir}/component-info.xml" filtering="true" overwrite="true"> + <copy tofile="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/component-info.xml" file="${jbws42.etc.dir}/component-info.xml" filtering="true" overwrite="true"> <filterset> <filtersfile file="${basedir}/version.properties"/> </filterset> Added: trunk/jbws-jboss42/ant-import/build-testsuite.xml =================================================================== --- trunk/jbws-jboss42/ant-import/build-testsuite.xml (rev 0) +++ trunk/jbws-jboss42/ant-import/build-testsuite.xml 2007-05-12 21:35:09 UTC (rev 3060) @@ -0,0 +1,87 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ============================================================ --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- ============================================================ --> + +<!-- $Id$ --> + +<project> + + <property name="tests.dir" value="${basedir}/src/test"/> + + <property name="jboss.home" value="${jboss42.home}"/> + <property name="excludesfile" value="${basedir}/src/test/resources/excludes.txt"/> + + <import file="${build.dir}/ant-import/build-testsuite.xml"/> + + <!-- + Init the various classpaths + --> + <target name="tests-init" depends="tests-prepare,spi-thirdparty"> + + <path id="jbossws.classpath"> + <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> + <pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/> + <pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/> + <pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/> + <pathelement location="${core.dir}/output/lib/jbossws-core.jar"/> + <pathelement location="${core.dir}/output/lib/jbossws-client.jar"/> + </path> + + <!-- The combined compile classpath --> + <path id="javac.classpath"> + <path refid="jbossws.classpath"/> + <path refid="spi.thirdparty.classpath"/> + </path> + + <!-- The test client classpath --> + <path id="tests.client.classpath"> + <pathelement location="${jboss.client}/activation.jar"/> + <pathelement location="${jboss.client}/javassist.jar"/> + <pathelement location="${jboss.client}/jaxb-api.jar"/> + <pathelement location="${jboss.client}/jaxb-impl.jar"/> + <pathelement location="${jboss.client}/jboss-xml-binding.jar"/> + <pathelement location="${jboss.client}/mail.jar"/> + <pathelement location="${jboss.client}/wsdl4j.jar"/> + <pathelement location="${jboss.server.lib}/jbosssx.jar"/> + <pathelement location="${jboss.client}/log4j.jar"/> + <pathelement location="${jboss.client}/jbossall-client.jar"/> + <path refid="javac.classpath"/> + </path> + + </target> + + <!-- ================================================================== --> + <!-- Compiling --> + <!-- ================================================================== --> + + <target name="tests-compile" depends="tests-compile15" description="Compile sources"/> + + <target name="tests-compile15" depends="tests-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="${testsuite.dir}/src/java"/> + <src path="${tests.java.dir}"/> + <classpath refid="javac.classpath"/> + </javac> + </target> + + <!-- ================================================================== --> + <!-- Building --> + <!-- ================================================================== --> + + <!-- Copy resources --> + <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> + <copy-test-resources srcdir="${testsuite.dir}/src"/> + <copy-test-resources srcdir="${basedir}/src/test"/> + </target> + + <target name="tests-main" depends="tests-compile,tests-copy-resources" description="Build the deployments."> + <ant antfile="${testsuite.dir}/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/> + </target> + +</project> Property changes on: trunk/jbws-jboss42/ant-import/build-testsuite.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/jbws-jboss42/ant-import/build-thirdparty.xml =================================================================== --- trunk/jbws-jboss42/ant-import/build-thirdparty.xml 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbws-jboss42/ant-import/build-thirdparty.xml 2007-05-12 21:35:09 UTC (rev 3060) @@ -13,81 +13,49 @@ <project> + <property file="${basedir}/version.properties"/> + <!-- ========= --> <!-- Libraries --> <!-- ========= --> - <target name="thirdparty" depends="prepare,jbossws-spi-get,jbossws-core-get,thirdparty-get,thirdparty-classpath"> + <target name="thirdparty" depends="thirdparty-init,thirdparty-get,thirdparty-classpath"> </target> - <!-- - jbossws-spi-get - --> - <target name="jbossws-spi-get" if="force.thirdparty.get" - description="Gets the jbossws-core libraries"> - - <mkdir dir="${thirdparty.dir}/jbossws-spi"/> - <get src="${jboss.repository}/jboss/jbossws-spi/${jboss-jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi/jbossws-spi.jar" usetimestamp="true" verbose="true"/> + <target name="thirdparty-init" depends="prepare"> + <property name="thirdparty.dir" value="${basedir}/thirdparty"/> + <checksum file="${basedir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/> + <condition property="jbws.force.thirdparty.get"> + <or> + <not> + <available file="${thirdparty.dir}" type="dir"/> + </not> + <isfalse value="${checksum.ok}"/> + <isset property="force.thirdparty.get"/> + </or> + </condition> + <echo message="checksum.ok = ${checksum.ok}"/> </target> - + <!-- - jbossws-core-get - --> - <target name="jbossws-core-get" if="force.thirdparty.get" - description="Gets the jbossws-core libraries"> - - <mkdir dir="${thirdparty.dir}/jbossws-core"/> - <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jbossws-client.jar" dest="${thirdparty.dir}/jbossws-core/jbossws-client.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jbossws-core.jar" dest="${thirdparty.dir}/jbossws-core/jbossws-core.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jbossws-resources.zip" dest="${thirdparty.dir}/jbossws-core/jbossws-resources.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jboss-saaj.jar" dest="${thirdparty.dir}/jbossws-core/jboss-saaj.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jboss-jaxrpc.jar" dest="${thirdparty.dir}/jbossws-core/jboss-jaxrpc.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jboss-jaxws.jar" dest="${thirdparty.dir}/jbossws-core/jboss-jaxws.jar" usetimestamp="true" verbose="true"/> - - <mkdir dir="${thirdparty.dir}/jbossws-resources"/> - <unzip dest="${thirdparty.dir}/jbossws-resources" src="${thirdparty.dir}/jbossws-core/jbossws-resources.zip"/> - - </target> - - <!-- thirdpartry-get --> - <target name="thirdparty-get" if="force.thirdparty.get" + <target name="thirdparty-get" if="jbws.force.thirdparty.get" description="Gets the thirdparty libraries"> <mkdir dir="${thirdparty.dir}"/> - <get src="${jboss.repository}/apache-xmlsec/${apache-xmlsec}/lib/xmlsec.jar" dest="${thirdparty.dir}/xmlsec.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j-src.jar" dest="${thirdparty.dir}/wsdl4j-src.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar" dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core-sources.jar" dest="${thirdparty.dir}/jboss-common-core-sources.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/common-logging-log4j/${jboss-common-logging-log4j}/lib/jboss-logging-log4j.jar" dest="${thirdparty.dir}/jboss-logging-log4j.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar" dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jaxr/${jboss-jaxr}/lib/juddi-service.sar" dest="${thirdparty.dir}/juddi-service.sar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-wsconsume-impl/${jbossws-wsconsume-impl}/lib/jbossws-wsconsume-impl.jar" dest="${thirdparty.dir}/jbossws-wsconsume-impl.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding-sources.jar" dest="${thirdparty.dir}/jboss-xml-binding-sources.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-container.jar" dest="${thirdparty.dir}/jboss-container.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency.jar" dest="${thirdparty.dir}/jboss-dependency.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer.jar" dest="${thirdparty.dir}/jboss-microcontainer.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/stax-api/${stax-api}/lib/stax-api.jar" dest="${thirdparty.dir}/stax-api.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-impl.jar" dest="${thirdparty.dir}/jaxb-impl.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-xjc.jar" dest="${thirdparty.dir}/jaxb-xjc.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/wscommons-policy/${wscommons-policy}/lib/policy.jar" dest="${thirdparty.dir}/policy.jar" usetimestamp="true" verbose="true"/> + + <checksum file="${basedir}/version.properties" fileext=".md5"/> </target> - <target name="thirdparty-classpath" > + <target name="thirdparty-classpath" depends="thirdparty-init,core-thirdparty-classpath"> <!-- The compile classpath for jboss42 integration --> - <path id="jboss42.integration.classpath"> - <pathelement location="${thirdparty.dir}/jbossws-spi/jbossws-spi.jar"/> - <pathelement location="${thirdparty.dir}/jbossws-core/jbossws-core.jar"/> - <pathelement location="${thirdparty.dir}/jbossws-core/jboss-jaxrpc.jar"/> - <pathelement location="${thirdparty.dir}/jbossws-core/jboss-jaxws.jar"/> - <pathelement location="${thirdparty.dir}/jbossws-core/jboss-saaj.jar"/> + <path id="jbws42.integration.classpath"> + <pathelement location="${spi.dir}/output/classes"/> + <pathelement location="${core.dir}/output/classes"/> + <pathelement location="${core.dir}/output/classes14"/> <pathelement location="${jboss42.lib}/jboss-jmx.jar"/> <pathelement location="${jboss42.lib}/jboss-system.jar"/> <pathelement location="${jboss42.server.lib}/jboss.jar"/> @@ -97,15 +65,7 @@ <pathelement location="${jboss42.server.deploy}/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/> <pathelement location="${jboss42.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/> <pathelement location="${jboss42.server.deploy}/ejb3.deployer/jboss-ejb3.jar"/> - <pathelement location="${thirdparty.dir}/jaxb-api.jar"/> - <pathelement location="${thirdparty.dir}/jaxb-impl.jar"/> - <pathelement location="${thirdparty.dir}/jaxb-xjc.jar"/> - <pathelement location="${thirdparty.dir}/jboss-common-core.jar"/> - <pathelement location="${thirdparty.dir}/jboss-dependency.jar"/> - <pathelement location="${thirdparty.dir}/jboss-logging-spi.jar"/> - <pathelement location="${thirdparty.dir}/jboss-microcontainer.jar"/> - <pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/> - <pathelement location="${thirdparty.dir}/servlet-api.jar"/> + <path refid="core.thirdparty.classpath"/> </path> </target> Modified: trunk/jbws-jboss42/build.xml =================================================================== --- trunk/jbws-jboss42/build.xml 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbws-jboss42/build.xml 2007-05-12 21:35:09 UTC (rev 3060) @@ -14,31 +14,33 @@ <project default="main" basedir="../jbws-jboss42" name="JBossWS-JBoss42"> <import file="${basedir}/../build/ant-import/build-setup.xml"/> - <import file="${basedir}/../jbossws-core/build.xml"/> <import file="${basedir}/ant-import/build-deploy.xml"/> <import file="${basedir}/ant-import/build-release.xml"/> <import file="${basedir}/ant-import/build-thirdparty.xml"/> + <import file="${basedir}/ant-import/build-testsuite.xml"/> + <import file="${core.dir}/build.xml"/> + <!-- ================================================================== --> <!-- Setup --> <!-- ================================================================== --> - <property name="jboss42.dir" value="${basedir}"/> - <property name="jboss42.src.dir" value="${jboss42.dir}/src/main"/> - <property name="jboss42.etc.dir" value="${jboss42.src.dir}/etc"/> - <property name="jboss42.java.dir" value="${jboss42.src.dir}/java"/> - <property name="jboss42.resources.dir" value="${jboss42.src.dir}/resources"/> - <property name="jboss42.output.dir" value="${jboss42.dir}/output"/> - <property name="jboss42.output.classes.dir" value="${jboss42.output.dir}/classes"/> - <property name="jboss42.output.etc.dir" value="${jboss42.output.dir}/etc"/> - <property name="jboss42.output.lib.dir" value="${jboss42.output.dir}/lib"/> + <property name="jbws42.dir" value="${basedir}"/> + <property name="jbws42.src.dir" value="${jbws42.dir}/src/main"/> + <property name="jbws42.etc.dir" value="${jbws42.src.dir}/etc"/> + <property name="jbws42.java.dir" value="${jbws42.src.dir}/java"/> + <property name="jbws42.resources.dir" value="${jbws42.src.dir}/resources"/> + <property name="jbws42.output.dir" value="${jbws42.dir}/output"/> + <property name="jbws42.output.classes.dir" value="${jbws42.output.dir}/classes"/> + <property name="jbws42.output.etc.dir" value="${jbws42.output.dir}/etc"/> + <property name="jbws42.output.lib.dir" value="${jbws42.output.dir}/lib"/> <!-- ================================================================== --> <!-- Initialization --> <!-- ================================================================== --> - <target name="jboss42-init" depends="prepare, thirdparty"> + <target name="jbws42-init" depends="prepare, thirdparty"> <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> <available file="${jboss42.client}/jboss-ejb3-client.jar" property="jboss42.ejb3.available"/> </target> @@ -55,24 +57,24 @@ | documentation compiles. --> - <target name="jboss42-compile" depends="jboss42-init,core-compile,jboss42-compile-classes,jboss42-compile-etc" description="Compile all source files."/> + <target name="jbws42-compile" depends="jbws42-init,core-compile,jbws42-compile-classes,jbws42-compile-etc" description="Compile all source files."/> <!-- Compile integration java sources --> - <target name="jboss42-compile-classes" depends="jboss42-init"> - <mkdir dir="${jboss42.output.classes.dir}"/> - <javac srcdir="${jboss42.java.dir}" sourcepath="" destdir="${jboss42.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" + <target name="jbws42-compile-classes" depends="jbws42-init"> + <mkdir dir="${jbws42.output.classes.dir}"/> + <javac srcdir="${jbws42.java.dir}" sourcepath="" destdir="${jbws42.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> <exclude name="org/jboss/ws/integration/jboss42/jms/**"/> <include name="org/jboss/ws/integration/jboss42/**"/> - <classpath refid="jboss42.integration.classpath"/> + <classpath refid="jbws42.integration.classpath"/> </javac> </target> <!-- Compile etc files (manifests and such) --> - <target name="jboss42-compile-etc" depends="jboss42-init"> - <mkdir dir="${jboss42.output.etc.dir}"/> - <copy todir="${jboss42.output.etc.dir}" filtering="yes" overwrite="yes"> - <fileset dir="${jboss42.etc.dir}"> + <target name="jbws42-compile-etc" depends="jbws42-init"> + <mkdir dir="${jbws42.output.etc.dir}"/> + <copy todir="${jbws42.output.etc.dir}" filtering="yes" overwrite="yes"> + <fileset dir="${jbws42.etc.dir}"> <include name="component-info.xml"/> <include name="default.mf"/> </fileset> @@ -94,48 +96,48 @@ <!-- | Build all jar files. --> - <target name="jboss42-jars" depends="jboss42-compile,core-jars,jboss42-module-jars" description="Builds all jar files."> + <target name="jbws42-jars" depends="jbws42-compile,core-jars,jbws42-module-jars" description="Builds all jar files."> </target> <!-- | Build all jar files. --> - <target name="jboss42-module-jars" depends="jboss42-init"> + <target name="jbws42-module-jars" depends="jbws42-init"> <!-- Build jbossws-jboss42.jar --> - <mkdir dir="${jboss42.output.lib.dir}"/> - <jar jarfile="${jboss42.output.lib.dir}/jbossws-jboss42.jar" manifest="${jboss42.output.etc.dir}/default.mf"> - <fileset dir="${jboss42.output.classes.dir}"> + <mkdir dir="${jbws42.output.lib.dir}"/> + <jar jarfile="${jbws42.output.lib.dir}/jbossws-jboss42.jar" manifest="${jbws42.output.etc.dir}/default.mf"> + <fileset dir="${jbws42.output.classes.dir}"> <include name="org/jboss/ws/integration/jboss42/**"/> </fileset> - <metainf dir="${jboss42.resources.dir}/jbossws-jboss42.jar/META-INF"/> + <metainf dir="${jbws42.resources.dir}/jbossws-jboss42.jar/META-INF"/> </jar> <!-- Build jbossws-context.war --> - <war warfile="${jboss42.output.lib.dir}/jbossws-context.war" webxml="${jboss42.resources.dir}/jbossws.war/WEB-INF/web.xml"> - <fileset dir="${jboss42.resources.dir}/jbossws.war"> + <war warfile="${jbws42.output.lib.dir}/jbossws-context.war" webxml="${jbws42.resources.dir}/jbossws.war/WEB-INF/web.xml"> + <fileset dir="${jbws42.resources.dir}/jbossws.war"> <include name="index.html"/> <include name="styles.css"/> </fileset> - <webinf dir="${jboss42.resources.dir}/jbossws.war/WEB-INF"> + <webinf dir="${jbws42.resources.dir}/jbossws.war/WEB-INF"> <include name="jboss-web.xml"/> </webinf> </war> <!-- Build jbossws42.sar --> - <jar jarfile="${jboss42.output.lib.dir}/jbossws42.sar" manifest="${jboss42.output.etc.dir}/default.mf"> - <fileset dir="${jboss42.output.lib.dir}"> + <jar jarfile="${jbws42.output.lib.dir}/jbossws42.sar" manifest="${jbws42.output.etc.dir}/default.mf"> + <fileset dir="${jbws42.output.lib.dir}"> <include name="jbossws-jboss42.jar"/> <include name="jbossws-context.war"/> </fileset> - <fileset dir="${thirdparty.dir}/jbossws-spi"> + <fileset dir="${spi.dir}/output/lib"> <include name="jbossws-spi.jar"/> </fileset> - <fileset dir="${thirdparty.dir}/jbossws-core"> + <fileset dir="${core.dir}/output/lib"> <include name="jboss-jaxws.jar"/> <include name="jbossws-core.jar"/> </fileset> - <fileset dir="${thirdparty.dir}"> + <fileset dir="${core.thirdparty.dir}"> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> <include name="policy.jar"/> @@ -143,20 +145,20 @@ <include name="wsdl4j.jar"/> <include name="xmlsec.jar"/> </fileset> - <fileset dir="${jboss42.resources.dir}"> + <fileset dir="${jbws42.resources.dir}"> <include name="jbossws.beans/META-INF/jboss-beans.xml"/> </fileset> - <metainf dir="${thirdparty.dir}/jbossws-resources"> + <metainf dir="${core.dir}/src/main/resources/standard-config"> <include name="standard-*-config.xml"/> </metainf> - <metainf dir="${jboss42.resources.dir}/jbossws.sar/META-INF"> + <metainf dir="${jbws42.resources.dir}/jbossws.sar/META-INF"> <include name="jboss-service.xml"/> </metainf> </jar> <!-- Build jbossws42-src.zip --> - <zip zipfile="${jboss42.output.lib.dir}/jbossws42-src.zip" > - <fileset dir="${jboss42.java.dir}"/> + <zip zipfile="${jbws42.output.lib.dir}/jbossws42-src.zip" > + <fileset dir="${jbws42.java.dir}"/> </zip> </target> @@ -166,12 +168,16 @@ <!-- ================================================================== --> <target name="clean" depends="prepare" description="Cleans up most generated files."> - <delete dir="${jboss42.output.dir}"/> + <delete dir="${jbws42.output.dir}"/> </target> + <target name="clobber" depends="clean" description="Cleans up all generated files."> + <delete dir="${basedir}/output-tests"/> + </target> + <target name="main" description="Executes the default target (most)." depends="most"/> - <target name="most" description="Builds almost everything." depends="jboss42-jars"/> + <target name="most" description="Builds almost everything." depends="jbws42-jars,tests-main"/> <target name="all" description="Create a distribution zip file" depends="main"> </target> Added: trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/ManagedServerConfig.java =================================================================== --- trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/ManagedServerConfig.java (rev 0) +++ trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/ManagedServerConfig.java 2007-05-12 21:35:09 UTC (rev 3060) @@ -0,0 +1,76 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss42.common; + +// $Id$ + +import java.util.ArrayList; + +import javax.management.MBeanServer; +import javax.management.MBeanServerFactory; + +import org.jboss.logging.Logger; +import org.jboss.ws.integration.management.BasicServerConfig; + +/** + * A Service Endpoint Registry + * + * @author Thomas.Diesler(a)jboss.org + * @since 04-May-2007 + */ +public class ManagedServerConfig extends BasicServerConfig implements ManagedServerConfigMBean +{ + // provide logging + private static final Logger log = Logger.getLogger(ManagedServerConfig.class); + + public void create() throws Exception + { + log.debug("WebServiceHost: " + getWebServiceHost()); + log.debug("WebServicePort: " + getWebServicePort()); + log.debug("WebServiceSecurePort: " + getWebServiceSecurePort()); + MBeanServer server = getMBeanServer(); + if (server != null) + { + server.registerMBean(this, OBJECT_NAME); + } + } + + public void destroy() throws Exception + { + MBeanServer server = getMBeanServer(); + if (server != null) + { + server.unregisterMBean(OBJECT_NAME); + } + } + + private MBeanServer getMBeanServer() + { + MBeanServer server = null; + ArrayList servers = MBeanServerFactory.findMBeanServer(null); + if (servers.size() > 0) + { + server = (MBeanServer)servers.get(0); + } + return server; + } +} Property changes on: trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/ManagedServerConfig.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/ManagedServerConfigMBean.java =================================================================== --- trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/ManagedServerConfigMBean.java (rev 0) +++ trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/ManagedServerConfigMBean.java 2007-05-12 21:35:09 UTC (rev 3060) @@ -0,0 +1,32 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss42.common; + +import org.jboss.ws.integration.management.ServerConfig; + +/** + * MBean interface. + * @since 15-April-2004 + */ +public interface ManagedServerConfigMBean extends ServerConfig +{ +} Property changes on: trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/ManagedServerConfigMBean.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/UnifiedDeploymentInfoDeployer.java =================================================================== --- trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/UnifiedDeploymentInfoDeployer.java 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/UnifiedDeploymentInfoDeployer.java 2007-05-12 21:35:09 UTC (rev 3060) @@ -23,26 +23,13 @@ //$Id$ -import java.util.ArrayList; - -import javax.management.MBeanServer; -import javax.management.ObjectName; - import org.jboss.deployment.DeploymentInfo; -import org.jboss.ejb3.Ejb3ModuleMBean; -import org.jboss.ejb3.stateless.StatelessContainer; -import org.jboss.mx.util.MBeanProxy; -import org.jboss.mx.util.MBeanProxyCreationException; -import org.jboss.mx.util.MBeanServerLocator; -import org.jboss.ws.WSException; import org.jboss.ws.integration.deployment.AbstractDeployer; import org.jboss.ws.integration.deployment.Deployment; import org.jboss.ws.integration.deployment.JAXRPCDeployment; import org.jboss.ws.integration.deployment.JAXWSDeployment; import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; import org.jboss.ws.integration.deployment.Deployment.DeploymentType; -import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData; import org.jboss.ws.metadata.webservices.WebservicesMetaData; /** Modified: trunk/jbws-jboss42/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml =================================================================== --- trunk/jbws-jboss42/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbws-jboss42/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml 2007-05-12 21:35:09 UTC (rev 3060) @@ -3,7 +3,7 @@ <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer"> <!-- An abstraction of server configuration aspects. --> - <bean name="WSServerConfig" class="org.jboss.ws.core.server.ManagedServerConfig"> + <bean name="WSServerConfig" class="org.jboss.ws.integration.jboss42.common.ManagedServerConfig"> <!-- The WSDL, that is a required deployment artifact for an endpoint, has a <soap:address> element which points to the location of the endpoint. JBoss supports rewriting of that SOAP address. @@ -118,7 +118,7 @@ --> <bean name="WSClassLoaderInjectionDeployer" class="org.jboss.ws.integration.jboss42.jbossws.ClassLoaderInjectionDeployer"/> <bean name="WSEagerInitializeDeployer" class="org.jboss.ws.core.deployment.EagerInitializeDeployer"/> - <bean name="WSEndpointHandlerDeployer" class="org.jboss.ws.core.deployment.EndpointHandlerDeployer"> + <bean name="WSEndpointHandlerDeployer" class="org.jboss.ws.integration.deployment.EndpointHandlerDeployer"> <property name="requestHandler">org.jboss.ws.core.server.RequestHandlerImpl</property> <property name="lifecycleHandler">org.jboss.ws.core.server.LifecycleHandlerImpl</property> <property name="invocationHandler"> @@ -130,7 +130,7 @@ </map> </property> </bean> - <bean name="WSEndpointLifecycleDeployer" class="org.jboss.ws.core.deployment.EndpointLifecycleDeployer"/> + <bean name="WSEndpointLifecycleDeployer" class="org.jboss.ws.integration.deployment.EndpointLifecycleDeployer"/> <bean name="WSEndpointNameDeployer" class="org.jboss.ws.core.deployment.EndpointNameDeployer"/> <bean name="WSEndpointRegistryDeployer" class="org.jboss.ws.integration.deployment.EndpointRegistryDeployer"/> <bean name="WSEventingDeployer" class="org.jboss.ws.core.deployment.EventingDeployer"/> Added: trunk/jbws-jboss42/src/test/resources/excludes.txt =================================================================== --- trunk/jbws-jboss42/src/test/resources/excludes.txt (rev 0) +++ trunk/jbws-jboss42/src/test/resources/excludes.txt 2007-05-12 21:35:09 UTC (rev 3060) @@ -0,0 +1,2 @@ + +# Nothing to exclude Property changes on: trunk/jbws-jboss42/src/test/resources/excludes.txt ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/jbws-jboss42/version.properties =================================================================== --- trunk/jbws-jboss42/version.properties 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbws-jboss42/version.properties 2007-05-12 21:35:09 UTC (rev 3060) @@ -1,32 +1,4 @@ # $Id: version.properties 2928 2007-04-26 10:53:56Z thomas.diesler(a)jboss.com $ -specification.title=JBossWS -specification.vendor=JBoss (http://www.jboss.org) -specification.version=jbossws-2.1 - -version.id=2.1.0.DEV -repository.id=SNAPSHOT - -implementation.title=JBoss Web Services - JBossWS -implementation.url=http://www.jboss.org/products/jbossws -implementation.vendor=JBoss Inc. -implementation.vendor.id=http://www.jboss.org - -# Thirdparty library versions -apache-xmlsec=1.3.0 -ibm-wsdl4j=1.6.2 -jboss-common-core=2.0.2.GA -jboss-common-logging-log4j=2.0.2.GA -jboss-common-logging-spi=2.0.2.GA -jboss-jaxr=1.2.0.GA -jboss-jbossws=SNAPSHOT -jboss-jbossws-spi=SNAPSHOT -jboss-jbossxb=1.0.0.CR10 -jboss-microcontainer=1.0.2 -jbossws-wsconsume-impl=2.0.0 -stax-api=1.0 -sun-jaxb=2.0.3jboss -sun-servlet=2.4 -wscommons-policy=1.0 - +# No versions different from core \ No newline at end of file Modified: trunk/jbws-jboss50/.classpath =================================================================== --- trunk/jbws-jboss50/.classpath 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbws-jboss50/.classpath 2007-05-12 21:35:09 UTC (rev 3060) @@ -3,16 +3,9 @@ <classpathentry kind="src" path="src/main/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/> - <classpathentry kind="lib" path="thirdparty/jboss-common-core.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-container.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-dependency.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-deployers.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-logging-log4j.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-logging-spi.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-microcontainer.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-xml-binding.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-security-spi.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/jbossws-core"/> <classpathentry combineaccessrules="false" kind="src" path="/jbossws-spi"/> + <classpathentry kind="lib" path="/jbossws-spi/thirdparty/jboss-xml-binding.jar"/> + <classpathentry kind="lib" path="/jbossws-core/thirdparty/jbosssx-client.jar"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: trunk/jbws-jboss50/ant-import/build-deploy.xml =================================================================== --- trunk/jbws-jboss50/ant-import/build-deploy.xml 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbws-jboss50/ant-import/build-deploy.xml 2007-05-12 21:35:09 UTC (rev 3060) @@ -18,7 +18,7 @@ <!-- ================================================================== --> <!-- Deploy jbossws to jboss50 --> - <target name="deploy" depends="jboss50-jars,remove-jbossws,remove-jbosswsri" description="Deploy jbossws"> + <target name="deploy" depends="jbws50-jars,remove-jbossws,remove-jbwsri" description="Deploy jbossws"> <copy todir="${jboss50.home}/client" overwrite="true"> <fileset dir="${core.dir}/output/lib"> @@ -52,10 +52,10 @@ </fileset> </copy> <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> - <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="${jboss50.output.lib.dir}/jbossws50-deployer.zip"/> + <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="${jbws50.output.lib.dir}/jbossws50-deployer.zip"/> <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jboss50.output.lib.dir}/jbossws50.sar"/> - <copy file="${jboss50.output.lib.dir}/jbossws50-context.war" tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" overwrite="true"/> + <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jbws50.output.lib.dir}/jbossws50.sar"/> + <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file="${jbws50.output.lib.dir}/jbossws50-context.war" overwrite="true"/> </target> <!-- Remove jbossws from jboss50 --> @@ -84,7 +84,7 @@ </target> <!-- Remove jbossws/sunri from jboss50 --> - <target name="remove-jbosswsri" depends="prepare" description="Remove jbossws/sunri"> + <target name="remove-jbwsri" depends="prepare" description="Remove jbossws/sunri"> <delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbosswsri.deployer"/> <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbosswsri.sar"/> Modified: trunk/jbws-jboss50/ant-import/build-release.xml =================================================================== --- trunk/jbws-jboss50/ant-import/build-release.xml 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbws-jboss50/ant-import/build-release.xml 2007-05-12 21:35:09 UTC (rev 3060) @@ -14,21 +14,21 @@ <project> <!-- Release to jboss.local.repository --> - <target name="release" depends="jboss50-jars" + <target name="release" depends="jbws50-jars" description="Release to jboss.local.repository"> <!-- jboss/jbossws-jboss50 --> <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/> <mkdir dir="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/lib"/> <copy todir="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/lib" overwrite="true"> - <fileset dir="${jboss50.output.lib.dir}"> + <fileset dir="${jbws50.output.lib.dir}"> <include name="jbossws-jboss50.jar"/> <include name="jbossws50.sar"/> <include name="jbossws50-deployer.zip"/> <include name="jbossws50-src.zip"/> </fileset> </copy> - <copy tofile="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/component-info.xml" file="${jboss50.etc.dir}/component-info.xml" filtering="true" overwrite="true"> + <copy tofile="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/component-info.xml" file="${jbws50.etc.dir}/component-info.xml" filtering="true" overwrite="true"> <filterset> <filtersfile file="${basedir}/version.properties"/> </filterset> Modified: trunk/jbws-jboss50/ant-import/build-testsuite.xml =================================================================== --- trunk/jbws-jboss50/ant-import/build-testsuite.xml 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbws-jboss50/ant-import/build-testsuite.xml 2007-05-12 21:35:09 UTC (rev 3060) @@ -10,19 +10,17 @@ <project> - <property name="tests.dir" value="${testsuite.dir}/src"/> + <property name="tests.dir" value="${basedir}/src/test"/> - <import file="${build.dir}/ant-import/build-testsuite.xml"/> - <import file="${testsuite.dir}/ant-import/build-testsuite.xml"/> - <property name="jboss.home" value="${jboss50.home}"/> - <property name="jbossws.integration.target" value="jboss50"/> <property name="excludesfile" value="${basedir}/src/test/resources/excludes.txt"/> + <import file="${build.dir}/ant-import/build-testsuite.xml"/> + <!-- Init the various classpaths --> - <target name="tests-init" depends="tests-prepare"> + <target name="tests-init" depends="tests-prepare,spi-thirdparty"> <path id="jbossws.classpath"> <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> @@ -36,15 +34,11 @@ <!-- The combined compile classpath --> <path id="javac.classpath"> <path refid="jbossws.classpath"/> - <pathelement location="${core.dir}/thirdparty/junit.jar"/> - <pathelement location="${jboss.client}/jboss-common-core.jar"/> - <pathelement location="${jboss.client}/jboss-logging-spi.jar"/> - <pathelement location="${jboss.client}/jboss-javaee.jar"/> + <path refid="spi.thirdparty.classpath"/> </path> <!-- The test client classpath --> <path id="tests.client.classpath"> - <path refid="jbossws.classpath"/> <pathelement location="${jboss.client}/activation.jar"/> <pathelement location="${jboss.client}/javassist.jar"/> <pathelement location="${jboss.client}/jaxb-api.jar"/> @@ -60,4 +54,34 @@ </target> + <!-- ================================================================== --> + <!-- Compiling --> + <!-- ================================================================== --> + + <target name="tests-compile" depends="tests-compile15" description="Compile sources"/> + + <target name="tests-compile15" depends="tests-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="${testsuite.dir}/src/java"/> + <src path="${tests.java.dir}"/> + <classpath refid="javac.classpath"/> + </javac> + </target> + + <!-- ================================================================== --> + <!-- Building --> + <!-- ================================================================== --> + + <!-- Copy resources --> + <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> + <copy-test-resources srcdir="${testsuite.dir}/src"/> + <copy-test-resources srcdir="${basedir}/src/test"/> + </target> + + <target name="tests-main" depends="tests-compile,tests-copy-resources" description="Build the deployments."> + <ant antfile="${testsuite.dir}/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/> + </target> + </project> Modified: trunk/jbws-jboss50/ant-import/build-thirdparty.xml =================================================================== --- trunk/jbws-jboss50/ant-import/build-thirdparty.xml 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbws-jboss50/ant-import/build-thirdparty.xml 2007-05-12 21:35:09 UTC (rev 3060) @@ -52,7 +52,7 @@ <target name="thirdparty-classpath" depends="thirdparty-init,core-thirdparty-classpath"> <!-- The compile classpath for jboss50 integration --> - <path id="jboss50.integration.classpath"> + <path id="jbws50.integration.classpath"> <pathelement location="${spi.dir}/output/classes"/> <pathelement location="${core.dir}/output/classes"/> <pathelement location="${core.dir}/output/classes14"/> Modified: trunk/jbws-jboss50/build.xml =================================================================== --- trunk/jbws-jboss50/build.xml 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbws-jboss50/build.xml 2007-05-12 21:35:09 UTC (rev 3060) @@ -26,21 +26,21 @@ <!-- Setup --> <!-- ================================================================== --> - <property name="jboss50.dir" value="${basedir}"/> - <property name="jboss50.src.dir" value="${jboss50.dir}/src/main"/> - <property name="jboss50.etc.dir" value="${jboss50.src.dir}/etc"/> - <property name="jboss50.java.dir" value="${jboss50.src.dir}/java"/> - <property name="jboss50.resources.dir" value="${jboss50.src.dir}/resources"/> - <property name="jboss50.output.dir" value="${jboss50.dir}/output"/> - <property name="jboss50.output.classes.dir" value="${jboss50.output.dir}/classes"/> - <property name="jboss50.output.etc.dir" value="${jboss50.output.dir}/etc"/> - <property name="jboss50.output.lib.dir" value="${jboss50.output.dir}/lib"/> + <property name="jbws50.dir" value="${basedir}"/> + <property name="jbws50.src.dir" value="${jbws50.dir}/src/main"/> + <property name="jbws50.etc.dir" value="${jbws50.src.dir}/etc"/> + <property name="jbws50.java.dir" value="${jbws50.src.dir}/java"/> + <property name="jbws50.resources.dir" value="${jbws50.src.dir}/resources"/> + <property name="jbws50.output.dir" value="${jbws50.dir}/output"/> + <property name="jbws50.output.classes.dir" value="${jbws50.output.dir}/classes"/> + <property name="jbws50.output.etc.dir" value="${jbws50.output.dir}/etc"/> + <property name="jbws50.output.lib.dir" value="${jbws50.output.dir}/lib"/> <!-- ================================================================== --> <!-- Initialization --> <!-- ================================================================== --> - <target name="jboss50-init" depends="prepare,thirdparty"> + <target name="jbws50-init" depends="prepare,thirdparty"> <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> </target> @@ -56,23 +56,23 @@ | documentation compiles. --> - <target name="jboss50-compile" depends="jboss50-init,core-compile,jboss50-compile-classes,jboss50-compile-etc" description="Compile all source files."/> + <target name="jbws50-compile" depends="jbws50-init,core-compile,jbws50-compile-classes,jbws50-compile-etc" description="Compile all source files."/> <!-- Compile java sources --> - <target name="jboss50-compile-classes" depends="jboss50-init"> - <mkdir dir="${jboss50.output.classes.dir}"/> - <javac srcdir="${jboss50.java.dir}" sourcepath="" destdir="${jboss50.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" + <target name="jbws50-compile-classes" depends="jbws50-init"> + <mkdir dir="${jbws50.output.classes.dir}"/> + <javac srcdir="${jbws50.java.dir}" sourcepath="" destdir="${jbws50.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> <include name="org/jboss/ws/integration/jboss50/**"/> - <classpath refid="jboss50.integration.classpath"/> + <classpath refid="jbws50.integration.classpath"/> </javac> </target> <!-- Compile etc files (manifests and such) --> - <target name="jboss50-compile-etc" depends="jboss50-init"> - <mkdir dir="${jboss50.output.etc.dir}"/> - <copy todir="${jboss50.output.etc.dir}" filtering="yes" overwrite="yes"> - <fileset dir="${jboss50.etc.dir}"> + <target name="jbws50-compile-etc" depends="jbws50-init"> + <mkdir dir="${jbws50.output.etc.dir}"/> + <copy todir="${jbws50.output.etc.dir}" filtering="yes" overwrite="yes"> + <fileset dir="${jbws50.etc.dir}"> <include name="component-info.xml"/> <include name="default.mf"/> </fileset> @@ -94,38 +94,38 @@ <!-- | Build all jar files. --> - <target name="jboss50-jars" depends="jboss50-compile,core-jars,jboss50-module-jars" description="Builds all jar files."> + <target name="jbws50-jars" depends="jbws50-compile,core-jars,jbws50-module-jars" description="Builds all jar files."> </target> <!-- | Build all jar files. --> - <target name="jboss50-module-jars" depends="jboss50-init"> + <target name="jbws50-module-jars" depends="jbws50-init"> <!-- Build jbossws-jboss50.jar --> - <mkdir dir="${jboss50.output.lib.dir}"/> - <jar jarfile="${jboss50.output.lib.dir}/jbossws-jboss50.jar" manifest="${jboss50.output.etc.dir}/default.mf"> - <fileset dir="${jboss50.output.classes.dir}"> + <mkdir dir="${jbws50.output.lib.dir}"/> + <jar jarfile="${jbws50.output.lib.dir}/jbossws-jboss50.jar" manifest="${jbws50.output.etc.dir}/default.mf"> + <fileset dir="${jbws50.output.classes.dir}"> <include name="org/jboss/ws/integration/jboss50/**"/> </fileset> - <metainf dir="${jboss50.resources.dir}/jbossws-jboss50.jar/META-INF"/> + <metainf dir="${jbws50.resources.dir}/jbossws-jboss50.jar/META-INF"/> </jar> <!-- Build jbossws-context.war --> - <war warfile="${jboss50.output.lib.dir}/jbossws50-context.war" webxml="${jboss50.resources.dir}/jbossws-context.war/WEB-INF/web.xml"> - <fileset dir="${jboss50.resources.dir}/jbossws-context.war"> + <war warfile="${jbws50.output.lib.dir}/jbossws50-context.war" webxml="${jbws50.resources.dir}/jbossws-context.war/WEB-INF/web.xml"> + <fileset dir="${jbws50.resources.dir}/jbossws-context.war"> <include name="index.html"/> <include name="styles.css"/> </fileset> - <webinf dir="${jboss50.resources.dir}/jbossws-context.war/WEB-INF"> + <webinf dir="${jbws50.resources.dir}/jbossws-context.war/WEB-INF"> <include name="jboss-web.xml"/> </webinf> </war> <!-- Build jbossws50.sar --> - <jar jarfile="${jboss50.output.lib.dir}/jbossws50.sar" manifest="${jboss50.output.etc.dir}/default.mf"> + <jar jarfile="${jbws50.output.lib.dir}/jbossws50.sar" manifest="${jbws50.output.etc.dir}/default.mf"> <!-- [JBAS-4379] MC beans deployed twice because of jacc service - <fileset dir="${jboss50.output.lib.dir}"> + <fileset dir="${jbws50.output.lib.dir}"> <include name="jbossws-context.war"/> </fileset> --> @@ -140,24 +140,24 @@ <metainf dir="${core.dir}/src/main/resources/standard-config"> <include name="standard-*-config.xml"/> </metainf> - <metainf dir="${jboss50.resources.dir}/jbossws.sar/META-INF"> + <metainf dir="${jbws50.resources.dir}/jbossws.sar/META-INF"> <include name="jbossws-beans.xml"/> </metainf> </jar> <!-- Build jbossws50.deployer --> - <zip zipfile="${jboss50.output.lib.dir}/jbossws50-deployer.zip"> - <fileset dir="${jboss50.output.lib.dir}"> + <zip zipfile="${jbws50.output.lib.dir}/jbossws50-deployer.zip"> + <fileset dir="${jbws50.output.lib.dir}"> <include name="jbossws-jboss50.jar"/> </fileset> - <fileset dir="${jboss50.resources.dir}/jbossws.deployer"> + <fileset dir="${jbws50.resources.dir}/jbossws.deployer"> <include name="META-INF/jbossws-deployer-beans.xml"/> </fileset> </zip> <!-- Build jbossws50-src.zip --> - <zip zipfile="${jboss50.output.lib.dir}/jbossws50-src.zip" > - <fileset dir="${jboss50.java.dir}"/> + <zip zipfile="${jbws50.output.lib.dir}/jbossws50-src.zip" > + <fileset dir="${jbws50.java.dir}"/> </zip> </target> @@ -167,12 +167,16 @@ <!-- ================================================================== --> <target name="clean" depends="prepare" description="Cleans up most generated files."> - <delete dir="${jboss50.output.dir}"/> + <delete dir="${jbws50.output.dir}"/> </target> + <target name="clobber" depends="clean" description="Cleans up all generated files."> + <delete dir="${basedir}/output-tests"/> + </target> + <target name="main" description="Executes the default target (most)." depends="most"/> - <target name="most" description="Builds almost everything." depends="jboss50-jars"/> + <target name="most" description="Builds almost everything." depends="jbws50-jars,tests-main"/> <target name="all" description="Create a distribution zip file" depends="main"> </target> Modified: trunk/sunri-jboss50/.classpath =================================================================== --- trunk/sunri-jboss50/.classpath 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/sunri-jboss50/.classpath 2007-05-12 21:35:09 UTC (rev 3060) @@ -30,6 +30,5 @@ <classpathentry kind="lib" path="thirdparty/sjsxp.jar"/> <classpathentry kind="lib" path="thirdparty/stax-ex.jar"/> <classpathentry kind="lib" path="thirdparty/streambuffer.jar"/> - <classpathentry kind="lib" path="/jbossws-core/thirdparty/junit.jar"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: trunk/sunri-jboss50/ant-import/build-testsuite.xml =================================================================== --- trunk/sunri-jboss50/ant-import/build-testsuite.xml 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/sunri-jboss50/ant-import/build-testsuite.xml 2007-05-12 21:35:09 UTC (rev 3060) @@ -10,19 +10,21 @@ <project> - <property name="tests.dir" value="${testsuite.dir}/src"/> + <property name="tests.dir" value="${basedir}/src/test"/> - <import file="${build.dir}/ant-import/build-testsuite.xml"/> - <import file="${testsuite.dir}/ant-import/build-testsuite.xml"/> - <property name="jboss.home" value="${jboss50.home}"/> - <property name="jbossws.integration.target" value="jboss50"/> <property name="excludesfile" value="${basedir}/src/test/resources/excludes.txt"/> + <import file="${build.dir}/ant-import/build-testsuite.xml"/> + + <!-- ================================================================== --> + <!-- Initialization --> + <!-- ================================================================== --> + <!-- Init the various classpaths --> - <target name="tests-init" depends="tests-prepare"> + <target name="tests-init" depends="tests-prepare,spi-thirdparty,thirdparty"> <path id="sunri.classpath"> <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> @@ -45,15 +47,13 @@ <!-- The combined compile classpath --> <path id="javac.classpath"> <path refid="sunri.classpath"/> - <pathelement location="${core.dir}/thirdparty/junit.jar"/> - <pathelement location="${jboss.client}/jboss-common-core.jar"/> - <pathelement location="${jboss.client}/jboss-logging-spi.jar"/> - <pathelement location="${jboss.client}/jboss-javaee.jar"/> + <path refid="spi.thirdparty.classpath"/> </path> <!-- The test client classpath --> <path id="tests.client.classpath"> <path refid="sunri.classpath"/> + <path refid="spi.thirdparty.classpath"/> <pathelement location="${jboss.client}/activation.jar"/> <pathelement location="${jboss.client}/jaxb-api.jar"/> <pathelement location="${jboss.client}/jaxb-impl.jar"/> @@ -61,9 +61,38 @@ <pathelement location="${jboss.server.lib}/jbosssx.jar"/> <pathelement location="${jboss.client}/log4j.jar"/> <pathelement location="${jboss.client}/jbossall-client.jar"/> - <path refid="javac.classpath"/> </path> </target> + <!-- ================================================================== --> + <!-- Compiling --> + <!-- ================================================================== --> + + <target name="tests-compile" depends="tests-compile15" description="Compile sources"/> + + <target name="tests-compile15" depends="tests-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="${testsuite.dir}/src/java"/> + <src path="${tests.java.dir}"/> + <classpath refid="javac.classpath"/> + </javac> + </target> + + <!-- ================================================================== --> + <!-- Building --> + <!-- ================================================================== --> + + <!-- Copy resources --> + <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> + <copy-test-resources srcdir="${testsuite.dir}/src"/> + <copy-test-resources srcdir="${basedir}/src/test"/> + </target> + + <target name="tests-main" depends="tests-compile,tests-copy-resources" description="Build the deployments."> + <ant antfile="${testsuite.dir}/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/> + </target> + </project> Modified: trunk/sunri-jboss50/build.xml =================================================================== --- trunk/sunri-jboss50/build.xml 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/sunri-jboss50/build.xml 2007-05-12 21:35:09 UTC (rev 3060) @@ -174,9 +174,14 @@ <delete dir="${sunri50.output.dir}"/> </target> + <target name="clobber" depends="clean" description="Cleans up all generated files."> + <delete dir="${basedir}/output-tests"/> + <delete dir="${basedir}/thirdparty"/> + </target> + <target name="main" description="Executes the default target (most)." depends="most"/> - <target name="most" description="Builds almost everything." depends="sunri50-jars"/> + <target name="most" description="Builds almost everything." depends="sunri50-jars,tests-main"/> <target name="all" description="Create a distribution zip file" depends="main"> </target>