May 2007 - jbossws-commits - Jboss List Archives

JBossWS SVN: r3095 - in branches/tdiesler/trunk: integration and 38 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-15 01:13:16 -0400 (Tue, 15 May 2007) New Revision: 3095 Added: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerHook.java branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptor.java branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB21.java branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB21MBean.java branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3.java branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3MBean.java branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSE.java branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSEMBean.java branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorMBean.java branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/ManagedServerConfig.java branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/ManagedServerConfigMBean.java branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ModifyWebMetaDataDeployer.java branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointGeneratorEJB21.java branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointGeneratorEJB3.java branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebAppDeployerDeployer.java branches/tdiesler/trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.ws.integration.invocation.SecurityAssociationAdaptor branches/tdiesler/trunk/integration/jbws-jboss42/ branches/tdiesler/trunk/integration/jbws-jboss42/.classpath branches/tdiesler/trunk/integration/jbws-jboss42/.project branches/tdiesler/trunk/integration/jbws-jboss42/ant-import/ branches/tdiesler/trunk/integration/jbws-jboss42/build.xml branches/tdiesler/trunk/integration/jbws-jboss42/src/ branches/tdiesler/trunk/integration/jbws-jboss50/ branches/tdiesler/trunk/integration/jbws-jboss50/.classpath branches/tdiesler/trunk/integration/jbws-jboss50/.project branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/ branches/tdiesler/trunk/integration/jbws-jboss50/build.xml branches/tdiesler/trunk/integration/jbws-jboss50/src/ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/core/utils/IOUtils.java branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/SecurityRolesHandler.java branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/ServiceEndpointPublisher.java branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/invocation/SecurityAssociationAdaptor.java branches/tdiesler/trunk/integration/sunri-jboss50/ branches/tdiesler/trunk/integration/sunri-jboss50/.classpath branches/tdiesler/trunk/integration/sunri-jboss50/.project branches/tdiesler/trunk/integration/sunri-jboss50/IntegrationIssues.txt branches/tdiesler/trunk/integration/sunri-jboss50/ant-import/ branches/tdiesler/trunk/integration/sunri-jboss50/build.xml branches/tdiesler/trunk/integration/sunri-jboss50/src/ branches/tdiesler/trunk/integration/sunri-jboss50/version.properties Removed: branches/tdiesler/trunk/integration/jboss42/ant-import/build-deploy.xml branches/tdiesler/trunk/integration/jboss42/ant-import/build-release.xml branches/tdiesler/trunk/integration/jboss42/ant-import/build-testsuite.xml branches/tdiesler/trunk/integration/jboss42/src/main/etc/ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/jms/ branches/tdiesler/trunk/integration/jboss42/src/main/resources/jbossws.beans/ branches/tdiesler/trunk/integration/jboss42/src/main/resources/jbossws.sar/ branches/tdiesler/trunk/integration/jboss42/src/main/resources/jbossws.war/ branches/tdiesler/trunk/integration/jboss42/src/test/ branches/tdiesler/trunk/integration/jboss50/ant-import/build-deploy.xml branches/tdiesler/trunk/integration/jboss50/ant-import/build-release.xml branches/tdiesler/trunk/integration/jboss50/ant-import/build-testsuite.xml branches/tdiesler/trunk/integration/jboss50/src/main/etc/ branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/jbossws/ branches/tdiesler/trunk/integration/jboss50/src/main/resources/jbossws-context.war/ branches/tdiesler/trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.ws.extensions.security.SecurityAssociationAdaptorFactory branches/tdiesler/trunk/integration/jboss50/src/main/resources/jbossws.deployer/ branches/tdiesler/trunk/integration/jboss50/src/main/resources/jbossws.sar/ branches/tdiesler/trunk/integration/jboss50/src/test/ branches/tdiesler/trunk/integration/jbws-jboss42/.classpath branches/tdiesler/trunk/integration/jbws-jboss42/.project branches/tdiesler/trunk/integration/jbws-jboss42/ant-import/ branches/tdiesler/trunk/integration/jbws-jboss42/build.xml branches/tdiesler/trunk/integration/jbws-jboss42/src/ branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/ branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/SecurityAssociationAdaptorFactoryImpl.java branches/tdiesler/trunk/integration/jbws-jboss42/src/main/resources/jbossws-jboss42.jar/ branches/tdiesler/trunk/integration/jbws-jboss50/.classpath branches/tdiesler/trunk/integration/jbws-jboss50/.project branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/ branches/tdiesler/trunk/integration/jbws-jboss50/build.xml branches/tdiesler/trunk/integration/jbws-jboss50/src/ branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployerHook.java branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployerHookEJB.java branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployerHookJSE.java branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractWebServiceDeployer.java branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptor.java branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptorEJB3.java branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ArchiveDeployerHook.java branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/DeployerHook.java branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/DeploymentInfoAdapter.java branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerHookEJB21.java branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerHookJSE.java branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerHookEJB3.java branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerHookJSE.java branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/MainDeployerHook.java branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ManagedServerConfig.java branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ManagedServerConfigMBean.java branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/UnifiedDeploymentInfoDeployer.java branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/VirtualFileAdaptor.java branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebMetaDataAdaptor.java branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceDeployerEJB.java branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceDeployerJSE.java branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceMainDeployer.java branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/jbossws/ModifyWebMetaDataDeployer.java branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/jbossws/SecurityAssociationAdaptorFactoryImpl.java branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/jbossws/ServiceEndpointGeneratorEJB21.java branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/jbossws/ServiceEndpointGeneratorEJB3.java branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/jbossws/WebAppDeployerDeployer.java branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/jbossws/WebAppGeneratorDeployer.java branches/tdiesler/trunk/integration/jbws-jboss50/src/main/resources/jbossws-jboss50.jar/ branches/tdiesler/trunk/integration/sunri-jboss50/.classpath branches/tdiesler/trunk/integration/sunri-jboss50/.project branches/tdiesler/trunk/integration/sunri-jboss50/IntegrationIssues.txt branches/tdiesler/trunk/integration/sunri-jboss50/ant-import/ branches/tdiesler/trunk/integration/sunri-jboss50/build.xml branches/tdiesler/trunk/integration/sunri-jboss50/src/ branches/tdiesler/trunk/integration/sunri-jboss50/version.properties branches/tdiesler/trunk/integration/sunri/ branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/TestDeployerTomcat.java Modified: branches/tdiesler/trunk/build/ant-import/build-setup.xml branches/tdiesler/trunk/build/ant-import/build-testsuite.xml branches/tdiesler/trunk/integration/jboss42/.classpath branches/tdiesler/trunk/integration/jboss42/.project branches/tdiesler/trunk/integration/jboss42/ant-import/build-thirdparty.xml branches/tdiesler/trunk/integration/jboss42/build.xml branches/tdiesler/trunk/integration/jboss50/.classpath branches/tdiesler/trunk/integration/jboss50/.project branches/tdiesler/trunk/integration/jboss50/ant-import/build-thirdparty.xml branches/tdiesler/trunk/integration/jboss50/build.xml branches/tdiesler/trunk/integration/jbws-jboss42/ant-import/build-deploy.xml branches/tdiesler/trunk/integration/jbws-jboss42/ant-import/build-release.xml branches/tdiesler/trunk/integration/jbws-jboss42/ant-import/build-testsuite.xml branches/tdiesler/trunk/integration/jbws-jboss42/ant-import/build-thirdparty.xml branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/AbstractDeployerHook.java branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/ModifyWebMetaDataDeployer.java branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/WebAppDeployerDeployer.java branches/tdiesler/trunk/integration/jbws-jboss42/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml branches/tdiesler/trunk/integration/jbws-jboss42/src/main/resources/jbossws.sar/META-INF/jboss-service.xml branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/build-deploy.xml branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/build-testsuite.xml branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/build-thirdparty.xml branches/tdiesler/trunk/integration/jbws-jboss50/src/main/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml branches/tdiesler/trunk/integration/jbws-jboss50/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml branches/tdiesler/trunk/integration/spi/.classpath branches/tdiesler/trunk/integration/sunri-jboss50/ant-import/build-deploy.xml branches/tdiesler/trunk/integration/sunri-jboss50/ant-import/build-release.xml branches/tdiesler/trunk/integration/sunri-jboss50/ant-import/build-testsuite.xml branches/tdiesler/trunk/integration/sunri-jboss50/ant-import/build-thirdparty.xml branches/tdiesler/trunk/integration/sunri-jboss50/src/main/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml branches/tdiesler/trunk/integration/sunri-jboss50/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml branches/tdiesler/trunk/testsuite/.classpath branches/tdiesler/trunk/testsuite/ant-import/build-testsuite.xml branches/tdiesler/trunk/testsuite/build.xml branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTestHelper.java Log: restructure Modified: branches/tdiesler/trunk/build/ant-import/build-setup.xml =================================================================== --- branches/tdiesler/trunk/build/ant-import/build-setup.xml 2007-05-15 05:10:13 UTC (rev 3094) +++ branches/tdiesler/trunk/build/ant-import/build-setup.xml 2007-05-15 05:13:16 UTC (rev 3095) @@ -21,9 +21,12 @@ <property name="spi.dir" value="${basedir}/integration/spi"/> <property name="core.dir" value="${basedir}/jbossws"/> <property name="testsuite.dir" value="${basedir}/testsuite"/> + <property name="int.jboss50.dir" value="${basedir}/integration/jboss50"/> <property name="int.jboss42.dir" value="${basedir}/integration/jboss42"/> - <property name="int.jboss50.dir" value="${basedir}/integration/jboss50"/> - <property name="int.sunri.dir" value="${basedir}/integration/sunri"/> + <property name="int.jbws50.dir" value="${basedir}/integration/jbws-jboss50"/> + <property name="int.jbws42.dir" value="${basedir}/integration/jbws-jboss42"/> + <property name="int.sunri50.dir" value="${basedir}/integration/sunri-jboss50"/> + <property name="int.sunri42.dir" value="${basedir}/integration/sunri-jboss42"/> <property file="${build.dir}/ant.properties"/> <property file="${build.dir}/version.properties"/> Modified: branches/tdiesler/trunk/build/ant-import/build-testsuite.xml =================================================================== --- branches/tdiesler/trunk/build/ant-import/build-testsuite.xml 2007-05-15 05:10:13 UTC (rev 3094) +++ branches/tdiesler/trunk/build/ant-import/build-testsuite.xml 2007-05-15 05:13:16 UTC (rev 3095) @@ -13,7 +13,6 @@ <property name="tests.etc.dir" value="${tests.dir}/etc"/> <property name="tests.java.dir" value="${tests.dir}/java"/> <property name="tests.resources.dir" value="${tests.dir}/resources"/> - <property name="tests.output.dir" value="${basedir}/output-tests"/>   @@ -132,7 +131,7 @@  <target name="tests" depends="tests-jars" description="Run all unit tests and generate a report"> - <antcall target="test-main-local"> + <antcall target="tests-run-internal"> <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"/> @@ -142,7 +141,7 @@  <target name="tests-samples" depends="tests-init" description="Run samples unit tests"> - <antcall target="test-main-local"> + <antcall target="tests-run-internal"> <param name="include.wildcard" value="org/jboss/test/ws/*/samples/**/*TestCase.class"/> <param name="exclude.wildcard" value="org/jboss/test/ws/*/samples/jaxr/**"/>  <target name="test" depends="tests-init" if="test" description="Run all unit tests in a given directory"> - <antcall target="test-main-local"> + <antcall target="tests-run-internal"> <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"/> @@ -167,7 +166,7 @@ </target>  - <target name="test-main-local" depends="tests-init"> + <target name="tests-run-internal" depends="tests-init"> <mkdir dir="${tests.output.dir}/reports"/> <junit printsummary="yes" showoutput="yes" dir="${tests.output.dir}" haltonfailure="${haltonfailure}"> <jvmarg value="-Djava.security.manager"/> Modified: branches/tdiesler/trunk/integration/jboss42/.classpath =================================================================== --- branches/tdiesler/trunk/integration/jboss42/.classpath 2007-05-15 05:10:13 UTC (rev 3094) +++ branches/tdiesler/trunk/integration/jboss42/.classpath 2007-05-15 05:13:16 UTC (rev 3095) @@ -2,9 +2,7 @@ <classpath> <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 combineaccessrules="false" kind="src" path="/jbossws-spi"/> <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 combineaccessrules="false" kind="src" path="/spi"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: branches/tdiesler/trunk/integration/jboss42/.project =================================================================== --- branches/tdiesler/trunk/integration/jboss42/.project 2007-05-15 05:10:13 UTC (rev 3094) +++ branches/tdiesler/trunk/integration/jboss42/.project 2007-05-15 05:13:16 UTC (rev 3095) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>integration-jboss42</name> + <name>jboss42</name> <comment></comment> <projects> </projects> Deleted: branches/tdiesler/trunk/integration/jboss42/ant-import/build-deploy.xml =================================================================== --- branches/tdiesler/trunk/integration/jboss42/ant-import/build-deploy.xml 2007-05-15 05:10:13 UTC (rev 3094) +++ branches/tdiesler/trunk/integration/jboss42/ant-import/build-deploy.xml 2007-05-15 05:13:16 UTC (rev 3095) @@ -1,89 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - - - - -<project> - -  -  -  - -  - <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}/client" overwrite="true"> - <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"/> - <include name="wsdl4j.jar"/> - <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="${core.dir}/output/lib"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> - </copy> - <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jbws42.output.lib.dir}/jbossws42.sar"/> - </target> - -  - <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> - -  - <target name="remove-jbwsri" depends="prepare" description="Remove jbossws/sunri"> - - <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbosswsri.sar"/> - </target> - -</project> Deleted: branches/tdiesler/trunk/integration/jboss42/ant-import/build-release.xml =================================================================== --- branches/tdiesler/trunk/integration/jboss42/ant-import/build-release.xml 2007-05-15 05:10:13 UTC (rev 3094) +++ branches/tdiesler/trunk/integration/jboss42/ant-import/build-release.xml 2007-05-15 05:13:16 UTC (rev 3095) @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - - - - -<project> - -  - <target name="release" depends="jbws42-jars" - description="Release to jboss.local.repository"> - -  - <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="${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="${jbws42.etc.dir}/component-info.xml" filtering="true" overwrite="true"> - <filterset> - <filtersfile file="${basedir}/version.properties"/> - </filterset> - </copy> - - </target> - -</project> Deleted: branches/tdiesler/trunk/integration/jboss42/ant-import/build-testsuite.xml =================================================================== --- branches/tdiesler/trunk/integration/jboss42/ant-import/build-testsuite.xml 2007-05-15 05:10:13 UTC (rev 3094) +++ branches/tdiesler/trunk/integration/jboss42/ant-import/build-testsuite.xml 2007-05-15 05:13:16 UTC (rev 3095) @@ -1,87 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - -<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"/> - -  - <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> - -  - <path id="javac.classpath"> - <path refid="jbossws.classpath"/> - <path refid="spi.thirdparty.classpath"/> - </path> - -  - <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> - -  -  -  - - <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> - -  -  -  - -  - <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: branches/tdiesler/trunk/integration/jboss42/ant-import/build-thirdparty.xml =================================================================== --- branches/tdiesler/trunk/integration/jboss42/ant-import/build-thirdparty.xml 2007-05-15 05:10:13 UTC (rev 3094) +++ branches/tdiesler/trunk/integration/jboss42/ant-import/build-thirdparty.xml 2007-05-15 05:13:16 UTC (rev 3095) @@ -28,15 +28,12 @@ <target name="thirdparty-get" depends="thirdparty-init" description="Gets the thirdparty libraries"/> - <target name="thirdparty-classpath" depends="thirdparty-init,core-jars"> + <target name="thirdparty-classpath" depends="thirdparty-init">  <path id="jbws42.integration.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="${jboss42.lib}/jboss-common.jar"/> <pathelement location="${jboss42.lib}/jboss-jmx.jar"/> <pathelement location="${jboss42.lib}/jboss-system.jar"/> <pathelement location="${jboss42.server.lib}/jboss.jar"/> @@ -46,7 +43,6 @@ <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"/> - <path refid="core.thirdparty.classpath"/> </path> </target> Modified: branches/tdiesler/trunk/integration/jboss42/build.xml =================================================================== --- branches/tdiesler/trunk/integration/jboss42/build.xml 2007-05-15 05:10:13 UTC (rev 3094) +++ branches/tdiesler/trunk/integration/jboss42/build.xml 2007-05-15 05:13:16 UTC (rev 3095) @@ -11,22 +11,17 @@  -<project default="main" basedir="../jbws-jboss42" name="JBossWS-JBoss42"> +<project default="main" basedir="../.." name="JBossWS-JBoss42"> - <import file="${basedir}/../build/ant-import/build-setup.xml"/> + <import file="${basedir}/build/ant-import/build-setup.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="${int.jboss42.dir}/ant-import/build-thirdparty.xml"/> - <import file="${core.dir}/build.xml"/> -    - <property name="jbws42.dir" value="${basedir}"/> + <property name="jbws42.dir" value="${int.jboss42.dir}"/> <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"/> @@ -40,9 +35,9 @@   - <target name="jbws42-init" depends="prepare, thirdparty"> + <target name="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"/> + <ant antfile="${spi.dir}/build.xml" target="main" inheritall="false"/> </target>  @@ -57,26 +52,22 @@ | documentation compiles. --> - <target name="jbws42-compile" depends="jbws42-init,core-compile,jbws42-compile-classes,jbws42-compile-etc" description="Compile all source files."/> + <target name="compile" depends="init,compile-classes,compile-etc" description="Compile all source files."/>  - <target name="jbws42-compile-classes" depends="jbws42-init"> + <target name="compile-classes" depends="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="jbws42.integration.classpath"/> </javac> </target>  - <target name="jbws42-compile-etc" depends="jbws42-init"> + <target name="compile-etc" depends="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"/> - </fileset> <fileset dir="${build.dir}/etc"> <include name="default.mf"/> </fileset> @@ -97,13 +88,13 @@  - <target name="jbws42-jars" depends="jbws42-compile,core-jars,jbws42-module-jars" description="Builds all jar files."> + <target name="jars" depends="compile,module-jars" description="Builds all jar files."> </target>  - <target name="jbws42-module-jars" depends="jbws42-init"> + <target name="module-jars" depends="init">  <mkdir dir="${jbws42.output.lib.dir}"/> @@ -114,51 +105,8 @@ <metainf dir="${jbws42.resources.dir}/jbossws-jboss42.jar/META-INF"/> </jar> -  - <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="${jbws42.resources.dir}/jbossws.war/WEB-INF"> - <include name="jboss-web.xml"/> - </webinf> - </war> - -  - <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="${spi.dir}/output/lib"> - <include name="jbossws-spi.jar"/> - </fileset> - <fileset dir="${core.dir}/output/lib"> - <include name="jboss-jaxws.jar"/> - <include name="jbossws-core.jar"/> - </fileset> - <fileset dir="${core.thirdparty.dir}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="policy.jar"/> - <include name="stax-api.jar"/> - <include name="wsdl4j.jar"/> - <include name="xmlsec.jar"/> - </fileset> - <fileset dir="${jbws42.resources.dir}"> - <include name="jbossws.beans/META-INF/jboss-beans.xml"/> - </fileset> - <metainf dir="${core.dir}/src/main/resources/standard-config"> - <include name="standard-*-config.xml"/> - </metainf> - <metainf dir="${jbws42.resources.dir}/jbossws.sar/META-INF"> - <include name="jboss-service.xml"/> - </metainf> - </jar> -  - <zip zipfile="${jbws42.output.lib.dir}/jbossws42-src.zip" > + <zip zipfile="${jbws42.output.lib.dir}/jbossws-jboss42-src.zip" > <fileset dir="${jbws42.java.dir}"/> </zip> @@ -173,12 +121,11 @@ </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="jbws42-jars,tests-main"/> + <target name="most" description="Builds almost everything." depends="jars"/> <target name="all" description="Create a distribution zip file" depends="main"> </target> Copied: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerHook.java (from rev 3086, branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerHook.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerHook.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerHook.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -0,0 +1,41 @@ +/* + * 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; + +import org.jboss.deployment.DeploymentException; +import org.jboss.deployment.DeploymentInfo; + +//$Id$ + + +/** + * An interface for all web service deployer hooks + * + * @author Thomas.Diesler(a)jboss.org + * @since 24-Apr-2007 + */ +public interface DeployerHook +{ + void deploy(DeploymentInfo unit) throws DeploymentException; + + void undeploy(DeploymentInfo unit); +} Copied: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptor.java (from rev 3086, branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerInterceptor.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptor.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptor.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -0,0 +1,153 @@ +/* + * 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; + +//$Id$ + +import java.util.LinkedList; +import java.util.List; + +import org.jboss.deployment.DeploymentInfo; +import org.jboss.deployment.MainDeployerMBean; +import org.jboss.deployment.SubDeployerInterceptorSupport; +import org.jboss.mx.server.Invocation; +import org.jboss.mx.util.MBeanProxy; + +/** + * A deployer service that manages WS4EE compliant Web Services + * + * @author Thomas.Diesler(a)jboss.org + * @since 03-May-2007 + */ +public abstract class DeployerInterceptor extends SubDeployerInterceptorSupport implements DeployerInterceptorMBean +{ + // The main deployer + private MainDeployerMBean mainDeployer; + + private List<DeployerHook> phaseOneHooks = new LinkedList<DeployerHook>(); + private List<DeployerHook> phaseTwoHooks = new LinkedList<DeployerHook>(); + + public void addPhaseOneHook(DeployerHook hook) + { + log.debug("Add phase-one deployer hook: " + hook); + phaseOneHooks.add(hook); + } + + public void removePhaseOneHook(DeployerHook hook) + { + log.debug("Remove phase-one deployer hook: " + hook); + phaseOneHooks.remove(hook); + } + + public void addPhaseTwoHook(DeployerHook hook) + { + log.debug("Add phase-two deployer hook: " + hook); + phaseTwoHooks.add(hook); + } + + public void removePhaseTwoHook(DeployerHook hook) + { + log.debug("Remove phase-two deployer hook: " + hook); + phaseTwoHooks.remove(hook); + } + + @Override + protected final Object create(Invocation invocation, DeploymentInfo unit) throws Throwable + { + Object retn = invokeNext(invocation); + + for (DeployerHook deployer : phaseOneHooks) + deployer.deploy(unit); + + return retn; + } + + @Override + protected final Object start(Invocation invocation, DeploymentInfo unit) throws Throwable + { + Object retn = invokeNext(invocation); + + for (DeployerHook deployer : phaseTwoHooks) + deployer.deploy(unit); + + return retn; + } + + @Override + protected final Object stop(Invocation invocation, DeploymentInfo unit) throws Throwable + { + Object retn = invokeNext(invocation); + + for (DeployerHook deployer : phaseTwoHooks) + deployer.undeploy(unit); + + return retn; + } + + @Override + protected final Object destroy(Invocation invocation, DeploymentInfo unit) throws Throwable + { + Object retn = invokeNext(invocation); + + for (DeployerHook deployer : phaseOneHooks) + deployer.undeploy(unit); + + return retn; + } + + /** Create the deployer service + */ + protected void createService() throws Exception + { + mainDeployer = (MainDeployerMBean)MBeanProxy.get(MainDeployerMBean.class, MainDeployerMBean.OBJECT_NAME, server); + super.attach(); + } + + /** Destroy the deployer service + */ + protected void destroyService() + { + super.detach(); + } + + /** + * Handle all webservice deployment exceptions. + * You can either simply log the problem and keep the EJB/WAR module + * alive or undeploy properly. + */ + protected void handleStartupException(DeploymentInfo di, Throwable th) + { + log.error("Cannot startup webservice for: " + di.shortName, th); + mainDeployer.undeploy(di); + } + + /** + * Handle all webservice deployment exceptions. + * + * You can either simply logs the problem and keep the EJB/WAR module + * alive or undeploy properly. + */ + protected void handleShutdownException(String moduleName, Throwable th) + { + log.error("Cannot shutdown webservice for: " + moduleName, th); + } +} Copied: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB21.java (from rev 3086, branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerInterceptorEJB21.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB21.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB21.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -0,0 +1,35 @@ +/* + * 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; + +//$Id$ + +/** + * A deployer service that manages WS4EE compliant Web-Services for EJB-2.1 Endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 15-Jan-2005 + */ +public class DeployerInterceptorEJB21 extends DeployerInterceptor implements DeployerInterceptorEJB21MBean +{ + +} Copied: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB21MBean.java (from rev 3086, branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerInterceptorEJB21MBean.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB21MBean.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB21MBean.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -0,0 +1,36 @@ +/* + * 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; + +import javax.management.ObjectName; + +import org.jboss.ws.utils.ObjectNameFactory; + +/** + * MBean interface. + * @since 19-Jan-2005 + */ +public interface DeployerInterceptorEJB21MBean extends DeployerInterceptorMBean +{ + //default object name + public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=WebServiceDeployerEJB21"); +} Copied: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3.java (from rev 3086, branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerInterceptorEJB3.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -0,0 +1,34 @@ +/* + * 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; + +// $Id$ + +/** + * A deployer service that manages WS4EE compliant Web-Services for EJB3 Endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 10-May-2005 + */ +public class DeployerInterceptorEJB3 extends DeployerInterceptor implements DeployerInterceptorEJB3MBean +{ +} Copied: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3MBean.java (from rev 3086, branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerInterceptorEJB3MBean.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3MBean.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3MBean.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -0,0 +1,36 @@ +/* + * 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; + +import javax.management.ObjectName; + +import org.jboss.ws.utils.ObjectNameFactory; + +/** + * MBean interface. + * @since 19-Jan-2005 + */ +public interface DeployerInterceptorEJB3MBean extends DeployerInterceptorMBean +{ + //default object name + public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=WebServiceDeployerEJB3"); +} Copied: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSE.java (from rev 3086, branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerInterceptorJSE.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSE.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSE.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -0,0 +1,34 @@ +/* + * 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; + +// $Id$ + +/** + * A deployer service that manages WS4EE compliant Web Services for WAR + * + * @author Thomas.Diesler(a)jboss.org + * @since 15-Jan-2005 + */ +public class DeployerInterceptorJSE extends DeployerInterceptor implements DeployerInterceptorJSEMBean +{ +} Copied: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSEMBean.java (from rev 3086, branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerInterceptorJSEMBean.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSEMBean.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSEMBean.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -0,0 +1,36 @@ +/* +* 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; + +import javax.management.ObjectName; + +import org.jboss.ws.utils.ObjectNameFactory; + +/** + * MBean interface. + * @since 19-Jan-2005 + */ +public interface DeployerInterceptorJSEMBean extends DeployerInterceptorMBean +{ + //default object name + public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=WebServiceDeployerJSE"); +} Copied: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorMBean.java (from rev 3086, branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerInterceptorMBean.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorMBean.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorMBean.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -0,0 +1,39 @@ +/* + * 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; + +import org.jboss.deployment.SubDeployerInterceptorMBean; + +/** + * MBean interface. + * @since 19-Jan-2005 + */ +public interface DeployerInterceptorMBean extends SubDeployerInterceptorMBean +{ + void addPhaseOneHook(DeployerHook deployer); + + void removePhaseOneHook(DeployerHook deployer); + + void addPhaseTwoHook(DeployerHook deployer); + + void removePhaseTwoHook(DeployerHook deployer); +} Copied: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/ManagedServerConfig.java (from rev 3086, branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/ManagedServerConfig.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/ManagedServerConfig.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/ManagedServerConfig.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -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; + +// $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; + } +} Copied: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/ManagedServerConfigMBean.java (from rev 3086, branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/ManagedServerConfigMBean.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/ManagedServerConfigMBean.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/ManagedServerConfigMBean.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -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; + +import org.jboss.ws.integration.management.ServerConfig; + +/** + * MBean interface. + * @since 15-April-2004 + */ +public interface ManagedServerConfigMBean extends ServerConfig +{ +} Modified: branches/tdiesler/trunk/integration/jboss50/.classpath =================================================================== --- branches/tdiesler/trunk/integration/jboss50/.classpath 2007-05-15 05:10:13 UTC (rev 3094) +++ branches/tdiesler/trunk/integration/jboss50/.classpath 2007-05-15 05:13:16 UTC (rev 3095) @@ -3,9 +3,8 @@ <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 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 combineaccessrules="false" kind="src" path="/spi"/> + <classpathentry kind="lib" path="/spi/thirdparty/jaxws-api.jar"/> + <classpathentry kind="lib" path="/spi/thirdparty/jsr181-api.jar"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: branches/tdiesler/trunk/integration/jboss50/.project =================================================================== --- branches/tdiesler/trunk/integration/jboss50/.project 2007-05-15 05:10:13 UTC (rev 3094) +++ branches/tdiesler/trunk/integration/jboss50/.project 2007-05-15 05:13:16 UTC (rev 3095) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>integration-jboss50</name> + <name>jboss50</name> <comment></comment> <projects> </projects> Deleted: branches/tdiesler/trunk/integration/jboss50/ant-import/build-deploy.xml =================================================================== --- branches/tdiesler/trunk/integration/jboss50/ant-import/build-deploy.xml 2007-05-15 05:10:13 UTC (rev 3094) +++ branches/tdiesler/trunk/integration/jboss50/ant-import/build-deploy.xml 2007-05-15 05:13:16 UTC (rev 3095) @@ -1,93 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - - - - -<project> - -  -  -  - -  - <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"> - <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"/> - <include name="wsdl4j.jar"/> - <include name="jbossws-wsconsume-impl.jar"/> - </fileset> - </copy> - <copy todir="${jboss50.home}/lib" overwrite="true"> - <fileset dir="${core.thirdparty.dir}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - </fileset> - </copy> - <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="${spi.dir}/output/lib"> - <include name="jbossws-spi.jar"/> - </fileset> - <fileset dir="${core.dir}/output/lib"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - </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="${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="${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> - -  - <target name="remove-jbossws" depends="prepare" description="Remove jbossws"> - - <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> - - <delete> - <fileset dir="${jboss50.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="${jboss50.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="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> - <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <delete file="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war"/> - </target> - -  - <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"/> - </target> - -</project> Deleted: branches/tdiesler/trunk/integration/jboss50/ant-import/build-release.xml =================================================================== --- branches/tdiesler/trunk/integration/jboss50/ant-import/build-release.xml 2007-05-15 05:10:13 UTC (rev 3094) +++ branches/tdiesler/trunk/integration/jboss50/ant-import/build-release.xml 2007-05-15 05:13:16 UTC (rev 3095) @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - - - - -<project> - -  - <target name="release" depends="jbws50-jars" - description="Release to jboss.local.repository"> - -  - <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="${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="${jbws50.etc.dir}/component-info.xml" filtering="true" overwrite="true"> - <filterset> - <filtersfile file="${basedir}/version.properties"/> - </filterset> - </copy> - - </target> - -</project> Deleted: branches/tdiesler/trunk/integration/jboss50/ant-import/build-testsuite.xml =================================================================== --- branches/tdiesler/trunk/integration/jboss50/ant-import/build-testsuite.xml 2007-05-15 05:10:13 UTC (rev 3094) +++ branches/tdiesler/trunk/integration/jboss50/ant-import/build-testsuite.xml 2007-05-15 05:13:16 UTC (rev 3095) @@ -1,87 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - -<project> - - <property name="tests.dir" value="${basedir}/src/test"/> - - <property name="jboss.home" value="${jboss50.home}"/> - <property name="excludesfile" value="${basedir}/src/test/resources/excludes.txt"/> - - <import file="${build.dir}/ant-import/build-testsuite.xml"/> - -  - <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> - -  - <path id="javac.classpath"> - <path refid="jbossws.classpath"/> - <path refid="spi.thirdparty.classpath"/> - </path> - -  - <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> - -  -  -  - - <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> - -  -  -  - -  - <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: branches/tdiesler/trunk/integration/jboss50/ant-import/build-thirdparty.xml =================================================================== --- branches/tdiesler/trunk/integration/jboss50/ant-import/build-thirdparty.xml 2007-05-15 05:10:13 UTC (rev 3094) +++ branches/tdiesler/trunk/integration/jboss50/ant-import/build-thirdparty.xml 2007-05-15 05:13:16 UTC (rev 3095) @@ -33,27 +33,18 @@  <path id="jbws50.integration.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="${spi.dir}/thirdparty/jaxws-api.jar"/> + <pathelement location="${spi.dir}/thirdparty/jsr181-api.jar"/> <pathelement location="${jboss50.lib}/jboss-aop-jdk50.jar"/> <pathelement location="${jboss50.lib}/jboss-common-core.jar"/> - <pathelement location="${jboss50.lib}/jboss-logging-spi.jar"/> <pathelement location="${jboss50.lib}/jboss-deployers.jar"/> - <pathelement location="${jboss50.lib}/jboss-j2se.jar"/> - <pathelement location="${jboss50.lib}/jboss-system.jar"/> - <pathelement location="${jboss50.lib}/jboss-system-jmx.jar"/> + <pathelement location="${jboss50.lib}/jboss-logging-spi.jar"/> <pathelement location="${jboss50.lib}/jboss-vfs.jar"/> <pathelement location="${jboss50.lib}/jboss-xml-binding.jar"/> <pathelement location="${jboss50.server.lib}/jboss.jar"/> <pathelement location="${jboss50.server.lib}/jboss-javaee.jar"/> - <pathelement location="${jboss50.server.lib}/jbosssx.jar"/> - <pathelement location="${jboss50.server.lib}/jnpserver.jar"/> - <pathelement location="${jboss50.server.deployers}/jboss-aop-jboss5.deployer/jboss-aspect-library-jdk50.jar"/> - <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-annotations-ejb3.jar"/> <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-ejb3.jar"/> - <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-ejb3x.jar"/> + </path> </target> Modified: branches/tdiesler/trunk/integration/jboss50/build.xml =================================================================== --- branches/tdiesler/trunk/integration/jboss50/build.xml 2007-05-15 05:10:13 UTC (rev 3094) +++ branches/tdiesler/trunk/integration/jboss50/build.xml 2007-05-15 05:13:16 UTC (rev 3095) @@ -37,7 +37,7 @@ <target name="init" depends="prepare,thirdparty"> <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> - <ant antfile="${core.dir}/build.xml" target="main" inheritall="false"/> + <ant antfile="${spi.dir}/build.xml" target="main" inheritall="false"/> </target>  @@ -68,9 +68,6 @@ <target name="compile-etc" depends="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"/> - </fileset> <fileset dir="${build.dir}/etc"> <include name="default.mf"/> </fileset> @@ -108,52 +105,8 @@ <metainf dir="${jbws50.resources.dir}/jbossws-jboss50.jar/META-INF"/> </jar> -  - <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="${jbws50.resources.dir}/jbossws-context.war/WEB-INF"> - <include name="jboss-web.xml"/> - </webinf> - </war> - -  - <jar jarfile="${jbws50.output.lib.dir}/jbossws50.sar" manifest="${jbws50.output.etc.dir}/default.mf"> -  - <fileset dir="${core.dir}/output/lib"> - <include name="jbossws-core.jar"/> - </fileset> - <fileset dir="${core.dir}/thirdparty"> - <include name="policy.jar"/> - <include name="wsdl4j.jar"/> - <include name="xmlsec.jar"/> - </fileset> - <metainf dir="${core.dir}/src/main/resources/standard-config"> - <include name="standard-*-config.xml"/> - </metainf> - <metainf dir="${jbws50.resources.dir}/jbossws.sar/META-INF"> - <include name="jbossws-beans.xml"/> - </metainf> - </jar> - -  - <zip zipfile="${jbws50.output.lib.dir}/jbossws50-deployer.zip"> - <fileset dir="${jbws50.output.lib.dir}"> - <include name="jbossws-jboss50.jar"/> - </fileset> - <fileset dir="${jbws50.resources.dir}/jbossws.deployer"> - <include name="META-INF/jbossws-deployer-beans.xml"/> - </fileset> - </zip> -  - <zip zipfile="${jbws50.output.lib.dir}/jbossws50-src.zip" > + <zip zipfile="${jbws50.output.lib.dir}/jbossws-jboss50-src.zip" > <fileset dir="${jbws50.java.dir}"/> </zip> Added: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ModifyWebMetaDataDeployer.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ModifyWebMetaDataDeployer.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ModifyWebMetaDataDeployer.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -0,0 +1,111 @@ +/* + * 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.jboss50; + +//$Id$ + +import java.util.Iterator; + +import org.jboss.metadata.NameValuePair; +import org.jboss.metadata.WebMetaData; +import org.jboss.metadata.web.Servlet; +import org.jboss.ws.integration.Endpoint; +import org.jboss.ws.integration.deployment.AbstractDeployer; +import org.jboss.ws.integration.deployment.Deployment; + +/** + * A deployer that modifies the web.xml meta data + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class ModifyWebMetaDataDeployer extends AbstractDeployer +{ + private String servletClass; + + public void setServletClass(String servletClass) + { + this.servletClass = servletClass; + } + + @Override + public void create(Deployment dep) + { + WebMetaData webMetaData = dep.getContext().getAttachment(WebMetaData.class); + if (webMetaData != null) + { + for (Servlet servlet : webMetaData.getServlets()) + { + String orgServletClass = servlet.getServletClass(); + + // JSP + if (orgServletClass == null || orgServletClass.length() == 0) + { + log.debug("Innore servlet class: " + orgServletClass); + continue; + } + + // Nothing to do if we have an <init-param> + if (!isAlreadyModified(servlet) && !isJavaxServlet(orgServletClass, dep.getClassLoader())) + { + servlet.setServletClass(servletClass); + NameValuePair initParam = new NameValuePair(Endpoint.SEPID_DOMAIN_ENDPOINT, orgServletClass); + servlet.addInitParam(initParam); + } + } + } + } + + private boolean isJavaxServlet(String orgServletClass, ClassLoader loader) + { + boolean isServlet = false; + if (loader != null) + { + try + { + Class servletClass = loader.loadClass(orgServletClass); + isServlet = javax.servlet.Servlet.class.isAssignableFrom(servletClass); + if (isServlet == true) + { + log.info("Ignore servlet: " + orgServletClass); + } + } + catch (ClassNotFoundException e) + { + log.warn("Cannot load servlet class: " + orgServletClass); + } + } + return isServlet; + } + + private boolean isAlreadyModified(Servlet servlet) + { + Iterator itParams = servlet.getInitParams().iterator(); + while (itParams.hasNext()) + { + NameValuePair pair = (NameValuePair)itParams.next(); + if (Endpoint.SEPID_DOMAIN_ENDPOINT.equals(pair.getName())) + return true; + } + return false; + } +} \ No newline at end of file Property changes on: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ModifyWebMetaDataDeployer.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointGeneratorEJB21.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointGeneratorEJB21.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointGeneratorEJB21.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -0,0 +1,70 @@ +/* + * 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.jboss50; + +//$Id$ + +import java.util.Iterator; +import java.util.Map; + +import org.jboss.logging.Logger; +import org.jboss.metadata.ApplicationMetaData; +import org.jboss.metadata.AssemblyDescriptorMetaData; +import org.jboss.ws.integration.deployment.SecurityRolesHandler; +import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; +import org.jboss.ws.utils.DOMUtils; +import org.w3c.dom.Element; + +/** + * Generate a service endpoint deployment for EJB endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 12-May-2006 + */ +public class ServiceEndpointGeneratorEJB21 implements SecurityRolesHandler +{ + // logging support + protected Logger log = Logger.getLogger(ServiceEndpointGeneratorEJB21.class); + + /** Add the roles from ejb-jar.xml to the security roles + */ + public void addSecurityRoles(Element webApp, UnifiedDeploymentInfo udi) + { + // Fix: http://jira.jboss.org/jira/browse/JBWS-309 + ApplicationMetaData applMetaData = (ApplicationMetaData)udi.getAttachment(ApplicationMetaData.class); + AssemblyDescriptorMetaData assemblyDescriptor = applMetaData.getAssemblyDescriptor(); + if (assemblyDescriptor != null) + { + Map securityRoles = assemblyDescriptor.getSecurityRoles(); + if (securityRoles != null) + { + Iterator it = securityRoles.keySet().iterator(); + while (it.hasNext()) + { + Element securityRole = (Element)webApp.appendChild(DOMUtils.createElement("security-role")); + Element roleName = (Element)securityRole.appendChild(DOMUtils.createElement("role-name")); + roleName.appendChild(DOMUtils.createTextNode((String)it.next())); + } + } + } + } +} Property changes on: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointGeneratorEJB21.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointGeneratorEJB3.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointGeneratorEJB3.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointGeneratorEJB3.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -0,0 +1,73 @@ +/* + * 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.jboss50; + +//$Id$ + +import java.util.Iterator; + +import javax.annotation.security.RolesAllowed; + +import org.jboss.ejb3.EJBContainer; +import org.jboss.ejb3.Ejb3Deployment; +import org.jboss.logging.Logger; +import org.jboss.ws.integration.deployment.SecurityRolesHandler; +import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; +import org.jboss.ws.utils.DOMUtils; +import org.w3c.dom.Element; + +/** + * Generate a service endpoint deployment for EJB endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 12-May-2006 + */ +public class ServiceEndpointGeneratorEJB3 implements SecurityRolesHandler +{ + // logging support + protected Logger log = Logger.getLogger(ServiceEndpointGeneratorEJB3.class); + + /** Add the roles from ejb-jar.xml to the security roles + */ + public void addSecurityRoles(Element webApp, UnifiedDeploymentInfo udi) + { + Ejb3Deployment ejb3Deployment = udi.getAttachment(Ejb3Deployment.class); + if (ejb3Deployment != null) + { + Iterator it = ejb3Deployment.getEjbContainers().values().iterator(); + while (it.hasNext()) + { + EJBContainer container = (EJBContainer)it.next(); + RolesAllowed anRolesAllowed = (RolesAllowed)container.resolveAnnotation(RolesAllowed.class); + if (anRolesAllowed != null) + { + for (String role : anRolesAllowed.value()) + { + Element securityRole = (Element)webApp.appendChild(DOMUtils.createElement("security-role")); + Element roleName = (Element)securityRole.appendChild(DOMUtils.createElement("role-name")); + roleName.appendChild(DOMUtils.createTextNode(role)); + } + } + } + } + } +} Property changes on: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointGeneratorEJB3.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebAppDeployerDeployer.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebAppDeployerDeployer.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebAppDeployerDeployer.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -0,0 +1,138 @@ +/* + * 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.jboss50; + +// $Id$ + +import java.net.URL; +import java.util.HashMap; +import java.util.Map; + +import org.jboss.deployers.plugins.structure.AbstractDeploymentContext; +import org.jboss.deployers.spi.deployment.MainDeployer; +import org.jboss.deployers.spi.structure.DeploymentContext; +import org.jboss.deployers.spi.structure.DeploymentState; +import org.jboss.logging.Logger; +import org.jboss.virtual.VFS; +import org.jboss.virtual.VirtualFile; +import org.jboss.ws.integration.deployment.Deployer; +import org.jboss.ws.integration.deployment.Deployment; +import org.jboss.ws.integration.deployment.ServiceEndpointPublisher; +import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; +import org.jboss.ws.integration.deployment.WSDeploymentException; + +/** + * Publish the HTTP service endpoint to Tomcat + * + * @author Thomas.Diesler(a)jboss.org + * @since 12-May-2006 + */ +public class WebAppDeployerDeployer implements Deployer +{ + // provide logging + private static Logger log = Logger.getLogger(WebAppDeployerDeployer.class); + + private MainDeployer mainDeployer; + private ServiceEndpointPublisher serviceEndpointPublisher; + private Map<String, DeploymentContext> contextMap = new HashMap<String, DeploymentContext>(); + + public void setMainDeployer(MainDeployer mainDeployer) + { + this.mainDeployer = mainDeployer; + } + + public void setServiceEndpointPublisher(ServiceEndpointPublisher serviceEndpointPublisher) + { + this.serviceEndpointPublisher = serviceEndpointPublisher; + } + + public void create(Deployment dep) + { + UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); + if (udi == null) + throw new IllegalStateException("Cannot obtain unified deployement info"); + + URL warURL = udi.webappURL; + + log.debug("publishServiceEndpoint: " + warURL); + try + { + serviceEndpointPublisher.rewriteWebXml(udi); + DeploymentContext context = createDeploymentContext(warURL); + + mainDeployer.addDeploymentContext(context); + mainDeployer.process(); + + contextMap.put(warURL.toExternalForm(), context); + } + catch (Exception ex) + { + WSDeploymentException.rethrow(ex); + } + } + + public void destroy(Deployment dep) + { + UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); + if (udi == null) + throw new IllegalStateException("Cannot obtain unified deployement info"); + + URL warURL = udi.webappURL; + if (warURL == null) + { + log.error("Cannot obtain warURL for: " + udi.name); + return; + } + + log.debug("destroyServiceEndpoint: " + warURL); + try + { + DeploymentContext context = contextMap.get(warURL.toExternalForm()); + if (context != null) + { + context.setState(DeploymentState.UNDEPLOYING); + mainDeployer.process(); + mainDeployer.removeDeploymentContext(context.getName()); + + contextMap.remove(warURL.toExternalForm()); + } + } + catch (Exception ex) + { + WSDeploymentException.rethrow(ex); + } + } + + private DeploymentContext createDeploymentContext(URL warURL) throws Exception + { + VirtualFile file = VFS.getRoot(warURL); + return new AbstractDeploymentContext(file); + } + + public void start(Deployment dep) + { + } + + public void stop(Deployment dep) + { + } +} Property changes on: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebAppDeployerDeployer.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: branches/tdiesler/trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.ws.extensions.security.SecurityAssociationAdaptorFactory =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.ws.extensions.security.SecurityAssociationAdaptorFactory 2007-05-15 05:10:13 UTC (rev 3094) +++ branches/tdiesler/trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.ws.extensions.security.SecurityAssociationAdaptorFactory 2007-05-15 05:13:16 UTC (rev 3095) @@ -1 +0,0 @@ -org.jboss.ws.integration.jboss50.jbossws.SecurityAssociationAdaptorFactoryImpl \ No newline at end of file Added: branches/tdiesler/trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.ws.integration.invocation.SecurityAssociationAdaptor =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.ws.integration.invocation.SecurityAssociationAdaptor (rev 0) +++ branches/tdiesler/trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.ws.integration.invocation.SecurityAssociationAdaptor 2007-05-15 05:13:16 UTC (rev 3095) @@ -0,0 +1 @@ +org.jboss.ws.integration.jboss50.SecurityAssociationAdaptorFactoryImpl \ No newline at end of file Copied: branches/tdiesler/trunk/integration/jbws-jboss42 (from rev 3086, branches/tdiesler/trunk/integration/jboss42) Deleted: branches/tdiesler/trunk/integration/jbws-jboss42/.classpath =================================================================== --- branches/tdiesler/trunk/integration/jboss42/.classpath 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/integration/jbws-jboss42/.classpath 2007-05-15 05:13:16 UTC (rev 3095) @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <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 combineaccessrules="false" kind="src" path="/jbossws-spi"/> - <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> Copied: branches/tdiesler/trunk/integration/jbws-jboss42/.classpath (from rev 3093, branches/tdiesler/trunk/integration/jboss42/.classpath) =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss42/.classpath (rev 0) +++ branches/tdiesler/trunk/integration/jbws-jboss42/.classpath 2007-05-15 05:13:16 UTC (rev 3095) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <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 kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-4.2.x"/> + <classpathentry combineaccessrules="false" kind="src" path="/jbossws"/> + <classpathentry combineaccessrules="false" kind="src" path="/spi"/> + <classpathentry combineaccessrules="false" kind="src" path="/jboss42"/> + <classpathentry kind="output" path="output-eclipse"/> +</classpath> Deleted: branches/tdiesler/trunk/integration/jbws-jboss42/.project =================================================================== --- branches/tdiesler/trunk/integration/jboss42/.project 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/integration/jbws-jboss42/.project 2007-05-15 05:13:16 UTC (rev 3095) @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>jbws-jboss42</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> Copied: branches/tdiesler/trunk/integration/jbws-jboss42/.project (from rev 3093, branches/tdiesler/trunk/integration/jboss42/.project) =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss42/.project (rev 0) +++ branches/tdiesler/trunk/integration/jbws-jboss42/.project 2007-05-15 05:13:16 UTC (rev 3095) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>jbws-jboss42</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Copied: branches/tdiesler/trunk/integration/jbws-jboss42/ant-import (from rev 3093, branches/tdiesler/trunk/integration/jboss42/ant-import) Modified: branches/tdiesler/trunk/integration/jbws-jboss42/ant-import/build-deploy.xml =================================================================== --- branches/tdiesler/trunk/integration/jboss42/ant-import/build-deploy.xml 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/integration/jbws-jboss42/ant-import/build-deploy.xml 2007-05-15 05:13:16 UTC (rev 3095) @@ -18,7 +18,7 @@   - <target name="deploy" depends="jbws42-jars,remove-jbossws,remove-jbwsri" description="Deploy jbossws"> + <target name="deploy" depends="jars,undeploy" description="Deploy jbossws"> <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> @@ -29,7 +29,7 @@ <include name="jboss-saaj.jar"/> <include name="jbossws-client.jar"/> </fileset> - <fileset dir="${core.thirdparty.dir}"> + <fileset dir="${core.dir}/thirdparty"> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> <include name="jaxb-xjc.jar"/> @@ -50,11 +50,11 @@ </fileset> </copy> <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jbws42.output.lib.dir}/jbossws42.sar"/> + <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jbws42.output.lib.dir}/jbossws-jbws42.sar"/> </target>  - <target name="remove-jbossws" depends="prepare" description="Remove jbossws"> + <target name="undeploy" depends="prepare" description="Remove jbossws"> <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> @@ -68,7 +68,7 @@ <include name="jbossws-wsconsume-impl.jar"/> </fileset> <fileset dir="${jboss42.home}/lib"> - <include name="jbossws-integration.jar"/> + <include name="jbossws-integration.jar"/>  <include name="jbossws-spi.jar"/> </fileset> <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib"> @@ -80,10 +80,4 @@ <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> </target> -  - <target name="remove-jbwsri" depends="prepare" description="Remove jbossws/sunri"> - - <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbosswsri.sar"/> - </target> - </project> Modified: branches/tdiesler/trunk/integration/jbws-jboss42/ant-import/build-release.xml =================================================================== --- branches/tdiesler/trunk/integration/jboss42/ant-import/build-release.xml 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/integration/jbws-jboss42/ant-import/build-release.xml 2007-05-15 05:13:16 UTC (rev 3095) @@ -14,7 +14,7 @@ <project>  - <target name="release" depends="jbws42-jars" + <target name="release" depends="jars" description="Release to jboss.local.repository">  @@ -29,7 +29,7 @@ </copy> <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"/> + <filtersfile file="${int.jbws42.dir}/version.properties"/> </filterset> </copy> Modified: branches/tdiesler/trunk/integration/jbws-jboss42/ant-import/build-testsuite.xml =================================================================== --- branches/tdiesler/trunk/integration/jboss42/ant-import/build-testsuite.xml 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/integration/jbws-jboss42/ant-import/build-testsuite.xml 2007-05-15 05:13:16 UTC (rev 3095) @@ -10,17 +10,18 @@ <project> - <property name="tests.dir" value="${basedir}/src/test"/> + <property name="tests.dir" value="${int.jbws42.dir}/src/test"/> + <property name="tests.output.dir" value="${int.jbws42.dir}/output-tests"/> <property name="jboss.home" value="${jboss42.home}"/> - <property name="excludesfile" value="${basedir}/src/test/resources/excludes.txt"/> + <property name="excludesfile" value="${int.jbws42.dir}/src/test/resources/excludes.txt"/> <import file="${build.dir}/ant-import/build-testsuite.xml"/>  - <target name="tests-init" depends="tests-prepare,spi-thirdparty"> + <target name="tests-init" depends="tests-prepare"> <path id="jbossws.classpath"> <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> @@ -34,7 +35,8 @@  <path id="javac.classpath"> <path refid="jbossws.classpath"/> - <path refid="spi.thirdparty.classpath"/> + <pathelement location="${jboss.client}/jboss-common-client.jar"/> + <pathelement location="${jboss.client}/jboss-ejb3x.jar"/> </path>  @@ -58,9 +60,7 @@   - <target name="tests-compile" depends="tests-compile15" description="Compile sources"/> - - <target name="tests-compile15" depends="tests-init" if="HAVE_JDK_1.5"> + <target name="tests-compile" depends="tests-init" description="Compile sources"> <mkdir dir="${tests.output.dir}/classes"/> <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}"> @@ -77,11 +77,13 @@  <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"/> + <copy-test-resources srcdir="${int.jbws42.dir}/src/test"/> </target> - <target name="tests-main" depends="tests-compile,tests-copy-resources" description="Build the deployments."> + <target name="tests-jars" 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> + <target name="tests-main" depends="tests-jars" description="Build the deployments."/> + </project> Modified: branches/tdiesler/trunk/integration/jbws-jboss42/ant-import/build-thirdparty.xml =================================================================== --- branches/tdiesler/trunk/integration/jboss42/ant-import/build-thirdparty.xml 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/integration/jbws-jboss42/ant-import/build-thirdparty.xml 2007-05-15 05:13:16 UTC (rev 3095) @@ -28,7 +28,7 @@ <target name="thirdparty-get" depends="thirdparty-init" description="Gets the thirdparty libraries"/> - <target name="thirdparty-classpath" depends="thirdparty-init,core-jars"> + <target name="thirdparty-classpath" depends="thirdparty-init">  <path id="jbws42.integration.classpath"> @@ -37,16 +37,22 @@ <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="${int.jboss42.dir}/output/lib/jbossws-jboss42.jar"/> + + <pathelement location="${jboss42.lib}/jboss-common.jar"/> <pathelement location="${jboss42.lib}/jboss-jmx.jar"/> <pathelement location="${jboss42.lib}/jboss-system.jar"/> + <pathelement location="${jboss42.lib}/jboss-xml-binding.jar"/> <pathelement location="${jboss42.server.lib}/jboss.jar"/> <pathelement location="${jboss42.server.lib}/jboss-j2ee.jar"/> <pathelement location="${jboss42.server.lib}/jboss-ejb3x.jar"/> <pathelement location="${jboss42.server.lib}/jbosssx.jar"/> + <pathelement location="${jboss42.server.lib}/servlet-api.jar"/> <pathelement location="${jboss42.server.deploy}/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/> + <pathelement location="${jboss42.server.deploy}/jboss-bean.deployer/jboss-dependency.jar"/> + <pathelement location="${jboss42.server.deploy}/jboss-bean.deployer/jboss-microcontainer.jar"/> <pathelement location="${jboss42.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/> <pathelement location="${jboss42.server.deploy}/ejb3.deployer/jboss-ejb3.jar"/> - <path refid="core.thirdparty.classpath"/> </path> </target> Deleted: branches/tdiesler/trunk/integration/jbws-jboss42/build.xml =================================================================== --- branches/tdiesler/trunk/integration/jboss42/build.xml 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/integration/jbws-jboss42/build.xml 2007-05-15 05:13:16 UTC (rev 3095) @@ -1,186 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - - - - -<project default="main" basedir="../jbws-jboss42" name="JBossWS-JBoss42"> - - <import file="${basedir}/../build/ant-import/build-setup.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"/> - -  -  -  - - <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"/> - -  -  -  - - <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> - -  -  -  - -  - - <target name="jbws42-compile" depends="jbws42-init,core-compile,jbws42-compile-classes,jbws42-compile-etc" description="Compile all source files."/> - -  - <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="jbws42.integration.classpath"/> - </javac> - </target> - -  - <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"/> - </fileset> - <fileset dir="${build.dir}/etc"> - <include name="default.mf"/> - </fileset> - <filterset> - <filter token="java.vm.version" value="${java.vm.version}"/> - <filter token="java.vm.vendor" value="${java.vm.vendor}"/> - <filter token="build.id" value="${build.id}"/> - <filter token="implementation.version" value="jbossws-${version.id}"/> - <filtersfile file="${build.dir}/version.properties"/> - </filterset> - </copy> - </target> - -  -  -  - -  - <target name="jbws42-jars" depends="jbws42-compile,core-jars,jbws42-module-jars" description="Builds all jar files."> - </target> - -  - <target name="jbws42-module-jars" depends="jbws42-init"> - -  - <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="${jbws42.resources.dir}/jbossws-jboss42.jar/META-INF"/> - </jar> - -  - <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="${jbws42.resources.dir}/jbossws.war/WEB-INF"> - <include name="jboss-web.xml"/> - </webinf> - </war> - -  - <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="${spi.dir}/output/lib"> - <include name="jbossws-spi.jar"/> - </fileset> - <fileset dir="${core.dir}/output/lib"> - <include name="jboss-jaxws.jar"/> - <include name="jbossws-core.jar"/> - </fileset> - <fileset dir="${core.thirdparty.dir}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="policy.jar"/> - <include name="stax-api.jar"/> - <include name="wsdl4j.jar"/> - <include name="xmlsec.jar"/> - </fileset> - <fileset dir="${jbws42.resources.dir}"> - <include name="jbossws.beans/META-INF/jboss-beans.xml"/> - </fileset> - <metainf dir="${core.dir}/src/main/resources/standard-config"> - <include name="standard-*-config.xml"/> - </metainf> - <metainf dir="${jbws42.resources.dir}/jbossws.sar/META-INF"> - <include name="jboss-service.xml"/> - </metainf> - </jar> - -  - <zip zipfile="${jbws42.output.lib.dir}/jbossws42-src.zip" > - <fileset dir="${jbws42.java.dir}"/> - </zip> - - </target> - -  -  -  - - <target name="clean" depends="prepare" description="Cleans up most generated files."> - <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="jbws42-jars,tests-main"/> - - <target name="all" description="Create a distribution zip file" depends="main"> - </target> - -</project> Copied: branches/tdiesler/trunk/integration/jbws-jboss42/build.xml (from rev 3093, branches/tdiesler/trunk/integration/jboss42/build.xml) =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss42/build.xml (rev 0) +++ branches/tdiesler/trunk/integration/jbws-jboss42/build.xml 2007-05-15 05:13:16 UTC (rev 3095) @@ -0,0 +1,187 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project default="main" basedir="../.." name="JBossWS-JBoss42"> + + <import file="${basedir}/build/ant-import/build-setup.xml"/> + + <import file="${int.jbws42.dir}/ant-import/build-deploy.xml"/> + <import file="${int.jbws42.dir}/ant-import/build-release.xml"/> + <import file="${int.jbws42.dir}/ant-import/build-thirdparty.xml"/> + <import file="${int.jbws42.dir}/ant-import/build-testsuite.xml"/> + +  +  +  + + <property name="jbws42.dir" value="${int.jbws42.dir}"/> + <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"/> + +  +  +  + + <target name="init" depends="prepare, thirdparty"> + <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> + <ant antfile="${int.jboss42.dir}/build.xml" target="main" inheritall="false"/> + <ant antfile="${core.dir}/build.xml" target="main" inheritall="false"/> + </target> + +  +  +  + +  + + <target name="compile" depends="init,compile-classes,compile-etc" description="Compile all source files."/> + +  + <target name="compile-classes" depends="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="jbws42.integration.classpath"/> + </javac> + </target> + +  + <target name="compile-etc" depends="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"/> + </fileset> + <fileset dir="${build.dir}/etc"> + <include name="default.mf"/> + </fileset> + <filterset> + <filter token="java.vm.version" value="${java.vm.version}"/> + <filter token="java.vm.vendor" value="${java.vm.vendor}"/> + <filter token="build.id" value="${build.id}"/> + <filter token="implementation.version" value="jbossws-${version.id}"/> + <filtersfile file="${build.dir}/version.properties"/> + </filterset> + </copy> + </target> + +  +  +  + +  + <target name="jars" depends="compile,module-jars" description="Builds all jar files."> + </target> + +  + <target name="module-jars" depends="init"> + +  + <mkdir dir="${jbws42.output.lib.dir}"/> + <jar jarfile="${jbws42.output.lib.dir}/jbossws-jbws42.jar" manifest="${jbws42.output.etc.dir}/default.mf"> + <fileset dir="${jbws42.output.classes.dir}"> + <include name="org/jboss/ws/integration/jboss42/**"/> + </fileset> + </jar> + +  + <war warfile="${jbws42.output.lib.dir}/jbossws-jbws42-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="${jbws42.resources.dir}/jbossws.war/WEB-INF"> + <include name="jboss-web.xml"/> + </webinf> + </war> + +  + <jar jarfile="${jbws42.output.lib.dir}/jbossws-jbws42.sar" manifest="${jbws42.output.etc.dir}/default.mf"> + <fileset dir="${int.jboss42.dir}/output/lib"> + <include name="jbossws-jboss42.jar"/> + </fileset> + <fileset dir="${jbws42.output.lib.dir}"> + <include name="jbossws-jbws42.jar"/> + <include name="jbossws-context.war"/> + </fileset> + <fileset dir="${spi.dir}/output/lib"> + <include name="jbossws-spi.jar"/> + </fileset> + <fileset dir="${core.dir}/output/lib"> + <include name="jboss-jaxws.jar"/> + <include name="jbossws-core.jar"/> + </fileset> + <fileset dir="${core.dir}/thirdparty"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="policy.jar"/> + <include name="stax-api.jar"/> + <include name="wsdl4j.jar"/> + <include name="xmlsec.jar"/> + </fileset> + <fileset dir="${jbws42.resources.dir}"> + <include name="jbossws.beans/META-INF/jboss-beans.xml"/> + </fileset> + <metainf dir="${core.dir}/src/main/resources/standard-config"> + <include name="standard-*-config.xml"/> + </metainf> + <metainf dir="${jbws42.resources.dir}/jbossws.sar/META-INF"> + <include name="jboss-service.xml"/> + </metainf> + </jar> + +  + <zip zipfile="${jbws42.output.lib.dir}/jbossws-jbws42-src.zip" > + <fileset dir="${jbws42.java.dir}"/> + </zip> + + </target> + +  +  +  + + <target name="clean" depends="prepare" description="Cleans up most generated files."> + <delete dir="${jbws42.output.dir}"/> + </target> + + <target name="clobber" depends="clean" description="Cleans up all generated files."> + <delete dir="${int.jbws42.dir}/output-tests"/> + </target> + + <target name="main" description="Executes the default target (most)." depends="most"/> + + <target name="most" description="Builds almost everything." depends="jars"/> + + <target name="all" description="Create a distribution zip file" depends="main,tests-main"> + </target> + +</project> Copied: branches/tdiesler/trunk/integration/jbws-jboss42/src (from rev 3093, branches/tdiesler/trunk/integration/jboss42/src) Modified: branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/AbstractDeployerHook.java =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/AbstractDeployerHook.java 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/AbstractDeployerHook.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -35,8 +35,8 @@ import org.jboss.mx.util.MBeanServerLocator; import org.jboss.ws.integration.deployment.DeployerManager; import org.jboss.ws.integration.deployment.WSDeploymentException; -import org.jboss.ws.integration.jboss42.common.DeployerHook; -import org.jboss.ws.integration.jboss42.common.DeployerInterceptorMBean; +import org.jboss.ws.integration.jboss42.DeployerHook; +import org.jboss.ws.integration.jboss42.DeployerInterceptorMBean; /** * An abstract web service deployer. Modified: branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/ModifyWebMetaDataDeployer.java =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/ModifyWebMetaDataDeployer.java 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/ModifyWebMetaDataDeployer.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -23,12 +23,12 @@ //$Id$ -import org.jboss.ws.core.deployment.ServiceEndpointPublisher; -import org.jboss.ws.core.deployment.ServiceEndpointPublisher.RewriteResults; import org.jboss.ws.integration.Endpoint; import org.jboss.ws.integration.deployment.AbstractDeployer; import org.jboss.ws.integration.deployment.Deployment; +import org.jboss.ws.integration.deployment.ServiceEndpointPublisher; import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; +import org.jboss.ws.integration.deployment.ServiceEndpointPublisher.RewriteResults; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; /** Deleted: branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/SecurityAssociationAdaptorFactoryImpl.java =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/SecurityAssociationAdaptorFactoryImpl.java 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/SecurityAssociationAdaptorFactoryImpl.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -1,57 +0,0 @@ -/* - * 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.jbossws; - -// $Id$ - -import java.security.Principal; - -import org.jboss.security.SecurityAssociation; -import org.jboss.ws.extensions.security.SecurityAssociationAdaptor; -import org.jboss.ws.extensions.security.SecurityAssociationAdaptorFactory; - -/** - * A JBoss specific SecurityAdaptorFactory - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class SecurityAssociationAdaptorFactoryImpl implements SecurityAssociationAdaptorFactory -{ - public SecurityAssociationAdaptor getSecurityAssociationAdaptor() - { - return new SecurityAccociationAdaptorImpl(); - } - - public class SecurityAccociationAdaptorImpl implements SecurityAssociationAdaptor - { - public void setPrincipal(Principal pricipal) - { - SecurityAssociation.setPrincipal(pricipal); - } - - public void setCredential(Object credential) - { - SecurityAssociation.setCredential(credential); - } - } -} Modified: branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/WebAppDeployerDeployer.java =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/WebAppDeployerDeployer.java 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/WebAppDeployerDeployer.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -33,9 +33,9 @@ import org.jboss.mx.util.MBeanProxy; import org.jboss.mx.util.MBeanProxyCreationException; import org.jboss.mx.util.MBeanServerLocator; -import org.jboss.ws.core.deployment.ServiceEndpointPublisher; import org.jboss.ws.integration.deployment.Deployer; import org.jboss.ws.integration.deployment.Deployment; +import org.jboss.ws.integration.deployment.ServiceEndpointPublisher; import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; import org.jboss.ws.integration.deployment.WSDeploymentException; Modified: branches/tdiesler/trunk/integration/jbws-jboss42/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/integration/jbws-jboss42/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml 2007-05-15 05:13:16 UTC (rev 3095) @@ -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">  - <bean name="WSServerConfig" class="org.jboss.ws.integration.jboss42.common.ManagedServerConfig"> + <bean name="WSServerConfig" class="org.jboss.ws.integration.jboss42.ManagedServerConfig">  - <mbean name="jboss.ws:service=DeployerInterceptorJSE" code="org.jboss.ws.integration.jboss42.common.DeployerInterceptorJSE"> + <mbean name="jboss.ws:service=DeployerInterceptorJSE" code="org.jboss.ws.integration.jboss42.DeployerInterceptorJSE"> <depends-list optional-attribute-name="Interceptables"> <depends-list-element>jboss.web:service=WebServer</depends-list-element> </depends-list> @@ -16,7 +16,7 @@  - <mbean name="jboss.ws:service=DeployerInterceptorEJB21" code="org.jboss.ws.integration.jboss42.common.DeployerInterceptorEJB21"> + <mbean name="jboss.ws:service=DeployerInterceptorEJB21" code="org.jboss.ws.integration.jboss42.DeployerInterceptorEJB21"> <depends-list optional-attribute-name="Interceptables"> <depends-list-element>jboss.ejb:service=EJBDeployer</depends-list-element> </depends-list> @@ -25,7 +25,7 @@  - <mbean name="jboss.ws:service=DeployerInterceptorEJB3" code="org.jboss.ws.integration.jboss42.common.DeployerInterceptorEJB3"> + <mbean name="jboss.ws:service=DeployerInterceptorEJB3" code="org.jboss.ws.integration.jboss42.DeployerInterceptorEJB3"> <depends-list optional-attribute-name="Interceptables"> <depends-list-element>jboss.ejb3:service=EJB3Deployer</depends-list-element> </depends-list> Copied: branches/tdiesler/trunk/integration/jbws-jboss50 (from rev 3086, branches/tdiesler/trunk/integration/jboss50) Deleted: branches/tdiesler/trunk/integration/jbws-jboss50/.classpath =================================================================== --- branches/tdiesler/trunk/integration/jboss50/.classpath 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/integration/jbws-jboss50/.classpath 2007-05-15 05:13:16 UTC (rev 3095) @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <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 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> Copied: branches/tdiesler/trunk/integration/jbws-jboss50/.classpath (from rev 3093, branches/tdiesler/trunk/integration/jboss50/.classpath) =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss50/.classpath (rev 0) +++ branches/tdiesler/trunk/integration/jbws-jboss50/.classpath 2007-05-15 05:13:16 UTC (rev 3095) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <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 combineaccessrules="false" kind="src" path="/jbossws"/> + <classpathentry combineaccessrules="false" kind="src" path="/spi"/> + <classpathentry combineaccessrules="false" kind="src" path="/jboss50"/> + <classpathentry kind="output" path="output-eclipse"/> +</classpath> Deleted: branches/tdiesler/trunk/integration/jbws-jboss50/.project =================================================================== --- branches/tdiesler/trunk/integration/jboss50/.project 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/integration/jbws-jboss50/.project 2007-05-15 05:13:16 UTC (rev 3095) @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>jbws-jboss50</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> Copied: branches/tdiesler/trunk/integration/jbws-jboss50/.project (from rev 3093, branches/tdiesler/trunk/integration/jboss50/.project) =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss50/.project (rev 0) +++ branches/tdiesler/trunk/integration/jbws-jboss50/.project 2007-05-15 05:13:16 UTC (rev 3095) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>jbws-jboss50</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Copied: branches/tdiesler/trunk/integration/jbws-jboss50/ant-import (from rev 3093, branches/tdiesler/trunk/integration/jboss50/ant-import) Modified: branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/build-deploy.xml =================================================================== --- branches/tdiesler/trunk/integration/jboss50/ant-import/build-deploy.xml 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/build-deploy.xml 2007-05-15 05:13:16 UTC (rev 3095) @@ -18,7 +18,7 @@   - <target name="deploy" depends="jbws50-jars,remove-jbossws,remove-jbwsri" description="Deploy jbossws"> + <target name="deploy" depends="jars,undeploy" description="Deploy jbossws"> <copy todir="${jboss50.home}/client" overwrite="true"> <fileset dir="${core.dir}/output/lib"> @@ -27,7 +27,7 @@ <include name="jboss-saaj.jar"/> <include name="jbossws-client.jar"/> </fileset> - <fileset dir="${core.thirdparty.dir}"> + <fileset dir="${core.dir}/thirdparty"> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> <include name="jaxb-xjc.jar"/> @@ -36,7 +36,7 @@ </fileset> </copy> <copy todir="${jboss50.home}/lib" overwrite="true"> - <fileset dir="${core.thirdparty.dir}"> + <fileset dir="${core.dir}/thirdparty"> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> </fileset> @@ -52,17 +52,19 @@ </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="${jbws50.output.lib.dir}/jbossws50-deployer.zip"/> + <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="${jbws50.output.lib.dir}/jbossws-jbws50-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="${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"/> + <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jbws50.output.lib.dir}/jbossws-jbws50.sar"/> + <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file="${jbws50.output.lib.dir}/jbossws-jbws50-context.war" overwrite="true"/> </target>  - <target name="remove-jbossws" depends="prepare" description="Remove jbossws"> + <target name="undeploy" depends="prepare" description="Remove jbossws"> <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> + <ant antfile="${int.sunri50.dir}/build.xml" target="undeploy" inheritall="false"/> + <delete> <fileset dir="${jboss50.home}/client"> <include name="jboss-jaxrpc.jar"/> @@ -83,11 +85,4 @@ <delete file="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war"/> </target> -  - <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"/> - </target> - </project> Modified: branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/build-testsuite.xml =================================================================== --- branches/tdiesler/trunk/integration/jboss50/ant-import/build-testsuite.xml 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/build-testsuite.xml 2007-05-15 05:13:16 UTC (rev 3095) @@ -10,17 +10,18 @@ <project> - <property name="tests.dir" value="${basedir}/src/test"/> + <property name="tests.dir" value="${int.jbws50.dir}/src/test"/> + <property name="tests.output.dir" value="${int.jbws50.dir}/output-tests"/> <property name="jboss.home" value="${jboss50.home}"/> - <property name="excludesfile" value="${basedir}/src/test/resources/excludes.txt"/> + <property name="excludesfile" value="${int.jbws50.dir}/src/test/resources/excludes.txt"/> <import file="${build.dir}/ant-import/build-testsuite.xml"/>  - <target name="tests-init" depends="tests-prepare,spi-thirdparty"> + <target name="tests-init" depends="tests-prepare"> <path id="jbossws.classpath"> <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> @@ -34,7 +35,9 @@  <path id="javac.classpath"> <path refid="jbossws.classpath"/> - <path refid="spi.thirdparty.classpath"/> + <pathelement location="${jboss.client}/jboss-common-core.jar"/> + <pathelement location="${jboss.client}/jboss-logging-spi.jar"/> + <pathelement location="${jboss.server.lib}/jboss-javaee.jar"/> </path>  @@ -58,9 +61,7 @@   - <target name="tests-compile" depends="tests-compile15" description="Compile sources"/> - - <target name="tests-compile15" depends="tests-init" if="HAVE_JDK_1.5"> + <target name="tests-compile" depends="tests-init" description="Compile sources"> <mkdir dir="${tests.output.dir}/classes"/> <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}"> @@ -77,11 +78,13 @@  <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"/> + <copy-test-resources srcdir="${int.jbws50.dir}/src/test"/> </target> - <target name="tests-main" depends="tests-compile,tests-copy-resources" description="Build the deployments."> + <target name="tests-jars" 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> + <target name="tests-main" depends="tests-jars" description="Build the deployments."/> + </project> Modified: branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/build-thirdparty.xml =================================================================== --- branches/tdiesler/trunk/integration/jboss50/ant-import/build-thirdparty.xml 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/build-thirdparty.xml 2007-05-15 05:13:16 UTC (rev 3095) @@ -37,6 +37,8 @@ <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="${int.jboss50.dir}/output/lib/jbossws-jboss50.jar"/> + <pathelement location="${jboss50.lib}/jboss-aop-jdk50.jar"/> <pathelement location="${jboss50.lib}/jboss-common-core.jar"/> <pathelement location="${jboss50.lib}/jboss-logging-spi.jar"/> Deleted: branches/tdiesler/trunk/integration/jbws-jboss50/build.xml =================================================================== --- branches/tdiesler/trunk/integration/jboss50/build.xml 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/integration/jbws-jboss50/build.xml 2007-05-15 05:13:16 UTC (rev 3095) @@ -1,185 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - - - - -<project default="main" basedir="../jbws-jboss50" name="JBossWS-JBoss50"> - - <import file="${basedir}/../build/ant-import/build-setup.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"/> - -  -  -  - - <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"/> - -  -  -  - - <target name="jbws50-init" depends="prepare,thirdparty"> - <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> - </target> - -  -  -  - -  - - <target name="jbws50-compile" depends="jbws50-init,core-compile,jbws50-compile-classes,jbws50-compile-etc" description="Compile all source files."/> - -  - <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="jbws50.integration.classpath"/> - </javac> - </target> - -  - <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"/> - </fileset> - <fileset dir="${build.dir}/etc"> - <include name="default.mf"/> - </fileset> - <filterset> - <filter token="java.vm.version" value="${java.vm.version}"/> - <filter token="java.vm.vendor" value="${java.vm.vendor}"/> - <filter token="build.id" value="${build.id}"/> - <filter token="implementation.version" value="jbossws-${version.id}"/> - <filtersfile file="${build.dir}/version.properties"/> - </filterset> - </copy> - </target> - -  -  -  - -  - <target name="jbws50-jars" depends="jbws50-compile,core-jars,jbws50-module-jars" description="Builds all jar files."> - </target> - -  - <target name="jbws50-module-jars" depends="jbws50-init"> - -  - <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="${jbws50.resources.dir}/jbossws-jboss50.jar/META-INF"/> - </jar> - -  - <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="${jbws50.resources.dir}/jbossws-context.war/WEB-INF"> - <include name="jboss-web.xml"/> - </webinf> - </war> - -  - <jar jarfile="${jbws50.output.lib.dir}/jbossws50.sar" manifest="${jbws50.output.etc.dir}/default.mf"> -  - <fileset dir="${core.dir}/output/lib"> - <include name="jbossws-core.jar"/> - </fileset> - <fileset dir="${core.thirdparty.dir}"> - <include name="policy.jar"/> - <include name="wsdl4j.jar"/> - <include name="xmlsec.jar"/> - </fileset> - <metainf dir="${core.dir}/src/main/resources/standard-config"> - <include name="standard-*-config.xml"/> - </metainf> - <metainf dir="${jbws50.resources.dir}/jbossws.sar/META-INF"> - <include name="jbossws-beans.xml"/> - </metainf> - </jar> - -  - <zip zipfile="${jbws50.output.lib.dir}/jbossws50-deployer.zip"> - <fileset dir="${jbws50.output.lib.dir}"> - <include name="jbossws-jboss50.jar"/> - </fileset> - <fileset dir="${jbws50.resources.dir}/jbossws.deployer"> - <include name="META-INF/jbossws-deployer-beans.xml"/> - </fileset> - </zip> - -  - <zip zipfile="${jbws50.output.lib.dir}/jbossws50-src.zip" > - <fileset dir="${jbws50.java.dir}"/> - </zip> - - </target> - -  -  -  - - <target name="clean" depends="prepare" description="Cleans up most generated files."> - <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="jbws50-jars,tests-main"/> - - <target name="all" description="Create a distribution zip file" depends="main"> - </target> - -</project> Copied: branches/tdiesler/trunk/integration/jbws-jboss50/build.xml (from rev 3093, branches/tdiesler/trunk/integration/jboss50/build.xml) =================================================================== --- branches/tdiesler/trunk/integration/jbws-jboss50/build.xml (rev 0) +++ branches/tdiesler/trunk/integration/jbws-jboss50/build.xml 2007-05-15 05:13:16 UTC (rev 3095) @@ -0,0 +1,186 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project default="main" basedir="../.." name="Integration-JBoss50"> + + <import file="${basedir}/build/ant-import/build-setup.xml"/> + + <import file="${int.jbws50.dir}/ant-import/build-deploy.xml"/> + <import file="${int.jbws50.dir}/ant-import/build-testsuite.xml"/> + <import file="${int.jbws50.dir}/ant-import/build-thirdparty.xml"/> + +  +  +  + + <property name="jbws50.dir" value="${int.jbws50.dir}"/> + <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"/> + +  +  +  + + <target name="init" depends="prepare,thirdparty"> + <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> + <ant antfile="${core.dir}/build.xml" target="main" inheritall="false"/> + <ant antfile="${int.jboss50.dir}/build.xml" target="main" inheritall="false"/> + </target> + +  +  +  + +  + + <target name="compile" depends="init,compile-classes,compile-etc" description="Compile all source files."/> + +  + <target name="compile-classes" depends="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="jbws50.integration.classpath"/> + </javac> + </target> + +  + <target name="compile-etc" depends="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"/> + </fileset> + <fileset dir="${build.dir}/etc"> + <include name="default.mf"/> + </fileset> + <filterset> + <filter token="java.vm.version" value="${java.vm.version}"/> + <filter token="java.vm.vendor" value="${java.vm.vendor}"/> + <filter token="build.id" value="${build.id}"/> + <filter token="implementation.version" value="jbossws-${version.id}"/> + <filtersfile file="${build.dir}/version.properties"/> + </filterset> + </copy> + </target> + +  +  +  + +  + <target name="jars" depends="compile,module-jars" description="Builds all jar files."> + </target> + +  + <target name="module-jars" depends="init"> + +  + <mkdir dir="${jbws50.output.lib.dir}"/> + <jar jarfile="${jbws50.output.lib.dir}/jbossws-jbws50.jar" manifest="${jbws50.output.etc.dir}/default.mf"> + <fileset dir="${jbws50.output.classes.dir}"> + <include name="org/jboss/ws/integration/jboss50/**"/> + </fileset> + </jar> + +  + <war warfile="${jbws50.output.lib.dir}/jbossws-jbws50-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="${jbws50.resources.dir}/jbossws-context.war/WEB-INF"> + <include name="jboss-web.xml"/> + </webinf> + </war> + +  + <jar jarfile="${jbws50.output.lib.dir}/jbossws-jbws50.sar" manifest="${jbws50.output.etc.dir}/default.mf"> +  + <fileset dir="${core.dir}/output/lib"> + <include name="jbossws-core.jar"/> + </fileset> + <fileset dir="${core.dir}/thirdparty"> + <include name="policy.jar"/> + <include name="wsdl4j.jar"/> + <include name="xmlsec.jar"/> + </fileset> + <metainf dir="${core.dir}/src/main/resources/standard-config"> + <include name="standard-*-config.xml"/> + </metainf> + <metainf dir="${jbws50.resources.dir}/jbossws.sar/META-INF"> + <include name="jbossws-beans.xml"/> + </metainf> + </jar> + +  + <zip zipfile="${jbws50.output.lib.dir}/jbossws-jbws50-deployer.zip"> + <fileset dir="${int.jboss50.dir}/output/lib"> + <include name="jbossws-jboss50.jar"/> + </fileset> + <fileset dir="${jbws50.output.lib.dir}"> + <include name="jbossws-jbws50.jar"/> + </fileset> + <fileset dir="${jbws50.resources.dir}/jbossws.deployer"> + <include name="META-INF/jbossws-deployer-beans.xml"/> + </fileset> + </zip> + +  + <zip zipfile="${jbws50.output.lib.dir}/jbossws-jbws50-src.zip" > + <fileset dir="${jbws50.java.dir}"/> + </zip> + + </target> + +  +  +  + + <target name="clean" depends="prepare" description="Cleans up most generated files."> + <delete dir="${jbws50.output.dir}"/> + </target> + + <target name="clobber" depends="clean" description="Cleans up all generated files."> + <delete dir="${int.jbws50.dir}/output-tests"/> + </target> + + <target name="main" description="Executes the default target (most)." depends="most"/> + + <target name="most" description="Builds almost everything." depends="jars"/> + + <target name="all" description="Create a distribution zip file" depends="most"> + </target> + +</project> Copied: branches/tdiesler/trunk/integration/jbws-jboss50/src (from rev 3093, branches/tdiesler/trunk/integration/jboss50/src) Deleted: branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployerHook.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployerHook.java 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployerHook.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -1,60 +0,0 @@ -/* - * 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.jboss50; - -//$Id$ - -import org.jboss.deployers.spi.deployer.DeploymentUnit; -import org.jboss.logging.Logger; -import org.jboss.ws.integration.deployment.DeployerManager; - -/** - * An abstract web service deployer. - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public abstract class AbstractDeployerHook implements DeployerHook -{ - // provide logging - protected final Logger log = Logger.getLogger(getClass()); - - protected DeployerManager deployerManager; - - public DeployerManager getDeployerManager() - { - return deployerManager; - } - - public void setDeployerManager(DeployerManager deploymentManager) - { - this.deployerManager = deploymentManager; - } - - /** Return true if this deployment should be ignored - */ - public boolean ignoreDeployment(DeploymentUnit unit) - { - String name = unit.getName(); - return (name.startsWith("jboss:id=") && name.indexOf("service=jacc") > 0); - } -} Deleted: branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployerHookEJB.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployerHookEJB.java 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployerHookEJB.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -1,34 +0,0 @@ -/* - * 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.jboss50; - -//$Id$ - -/** - * An abstract deployer for EJB Endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public abstract class AbstractDeployerHookEJB extends ArchiveDeployerHook -{ -} Deleted: branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployerHookJSE.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployerHookJSE.java 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployerHookJSE.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -1,44 +0,0 @@ -/* - * 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.jboss50; - -import org.jboss.deployers.spi.deployer.DeploymentUnit; -import org.jboss.metadata.WebMetaData; - -//$Id$ - -/** - * An abstract deployer for JSE Endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public abstract class AbstractDeployerHookJSE extends ArchiveDeployerHook -{ - public boolean isWebServiceDeployment(DeploymentUnit unit) - { - if (unit.getAttachment(WebMetaData.class) == null) - return false; - - return true; - } -} Deleted: branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractWebServiceDeployer.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractWebServiceDeployer.java 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractWebServiceDeployer.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -1,72 +0,0 @@ -/* - * 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.jboss50; - -import java.util.LinkedList; -import java.util.List; - -import org.jboss.deployers.plugins.deployer.AbstractSimpleDeployer; -import org.jboss.deployers.spi.DeploymentException; -import org.jboss.deployers.spi.deployer.DeploymentUnit; -import org.jboss.logging.Logger; - -//$Id$ - -/** - * This deployer that calls the registered DeployerHooks - * - * @author Thomas.Diesler(a)jboss.org - * @since 24-Apr-2007 - */ -public abstract class AbstractWebServiceDeployer extends AbstractSimpleDeployer -{ - // provide logging - private static final Logger log = Logger.getLogger(AbstractWebServiceDeployer.class); - - private List<DeployerHook> deployerHooks = new LinkedList<DeployerHook>(); - - public void addDeployerHook(DeployerHook deployer) - { - log.debug("Add deployer hook: " + deployer); - deployerHooks.add(deployer); - } - - public void removeDeployerHook(DeployerHook deployer) - { - log.debug("Remove deployer hook: " + deployer); - deployerHooks.remove(deployer); - } - - @Override - public void deploy(DeploymentUnit unit) throws DeploymentException - { - for (DeployerHook deployer : deployerHooks) - deployer.deploy(unit); - } - - @Override - public void undeploy(DeploymentUnit unit) - { - for (DeployerHook deployer : deployerHooks) - deployer.undeploy(unit); - } -} Deleted: branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptor.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptor.java 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptor.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -1,163 +0,0 @@ -/* - * 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.jboss50; - -// $Id$ - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import org.jboss.deployers.spi.deployer.DeploymentUnit; -import org.jboss.logging.Logger; -import org.jboss.metadata.ApplicationMetaData; -import org.jboss.metadata.BeanMetaData; -import org.jboss.metadata.EjbPortComponentMetaData; -import org.jboss.metadata.MessageDrivenMetaData; -import org.jboss.metadata.SessionMetaData; -import org.jboss.metadata.ApplicationMetaData.WebserviceDescription; -import org.jboss.metadata.ApplicationMetaData.Webservices; -import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; -import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedEjbPortComponentMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedMessageDrivenMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedSessionMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData.PublishLocationAdapter; - -/** - * Build container independent application meta data - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class ApplicationMetaDataAdaptor -{ - // logging support - private static Logger log = Logger.getLogger(ApplicationMetaDataAdaptor.class); - - public static UnifiedApplicationMetaData buildUnifiedApplicationMetaData(UnifiedDeploymentInfo udi, DeploymentUnit unit) - { - ApplicationMetaData appMetaData = unit.getAttachment(ApplicationMetaData.class); - udi.addAttachment(ApplicationMetaData.class, appMetaData); - - UnifiedApplicationMetaData umd = new UnifiedApplicationMetaData(); - buildUnifiedBeanMetaData(umd, appMetaData); - buildWebservicesMetaData(umd, appMetaData); - umd.setSecurityDomain(appMetaData.getSecurityDomain()); - return umd; - } - - private static void buildWebservicesMetaData(UnifiedApplicationMetaData umd, ApplicationMetaData apmd) - { - Webservices webservices = apmd.getWebservices(); - if (webservices != null) - { - String contextRoot = webservices.getContextRoot(); - umd.setPublishLocationAdapter(getPublishLocationAdpater(webservices)); - - List<WebserviceDescription> wsDescriptions = webservices.getWebserviceDescriptions(); - if (wsDescriptions.size() > 1) - log.warn("Multiple <webservice-description> elements not supported"); - - if (wsDescriptions.size() > 0) - { - WebserviceDescription wsd = wsDescriptions.get(0); - umd.setConfigName(wsd.getConfigName()); - umd.setConfigFile(wsd.getConfigFile()); - } - - umd.setWebServiceContextRoot(contextRoot); - } - } - - private static PublishLocationAdapter getPublishLocationAdpater(final Webservices webservices) - { - return new PublishLocationAdapter() - { - public String getWsdlPublishLocationByName(String name) - { - String wsdlPublishLocation = null; - for (WebserviceDescription wsd : webservices.getWebserviceDescriptions()) - { - if (wsd.getDescriptionName().equals(name)) - { - wsdlPublishLocation = wsd.getWsdlPublishLocation(); - } - } - return wsdlPublishLocation; - } - }; - } - - private static void buildUnifiedBeanMetaData(UnifiedApplicationMetaData umd, ApplicationMetaData appMetaData) - { - List<UnifiedBeanMetaData> beans = new ArrayList<UnifiedBeanMetaData>(); - Iterator it = appMetaData.getEnterpriseBeans(); - while (it.hasNext()) - { - BeanMetaData bmd = (BeanMetaData)it.next(); - buildUnifiedBeanMetaData(beans, bmd); - } - umd.setEnterpriseBeans(beans); - } - - private static UnifiedBeanMetaData buildUnifiedBeanMetaData(List<UnifiedBeanMetaData> beans, BeanMetaData bmd) - { - UnifiedBeanMetaData ubmd = null; - if (bmd instanceof SessionMetaData) - { - ubmd = new UnifiedSessionMetaData(); - } - else if (bmd instanceof MessageDrivenMetaData) - { - ubmd = new UnifiedMessageDrivenMetaData(); - ((UnifiedMessageDrivenMetaData)ubmd).setDestinationJndiName(((MessageDrivenMetaData)bmd).getDestinationJndiName()); - } - - if (ubmd != null) - { - ubmd.setEjbName(bmd.getEjbName()); - ubmd.setEjbClass(bmd.getEjbClass()); - ubmd.setServiceEndpointInterface(bmd.getServiceEndpoint()); - ubmd.setHome(bmd.getHome()); - ubmd.setLocalHome(bmd.getLocalHome()); - ubmd.setJndiName(bmd.getJndiName()); - ubmd.setLocalJndiName(bmd.getLocalJndiName()); - - EjbPortComponentMetaData pcmd = bmd.getPortComponent(); - if (pcmd != null) - { - UnifiedEjbPortComponentMetaData upcmd = new UnifiedEjbPortComponentMetaData(); - upcmd.setPortComponentName(pcmd.getPortComponentName()); - upcmd.setPortComponentURI(pcmd.getPortComponentURI()); - upcmd.setAuthMethod(pcmd.getAuthMethod()); - upcmd.setTransportGuarantee(pcmd.getTransportGuarantee()); - upcmd.setSecureWSDLAccess(pcmd.getSecureWSDLAccess()); - ubmd.setPortComponent(upcmd); - } - - beans.add(ubmd); - } - return ubmd; - } -} Deleted: branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptorEJB3.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptorEJB3.java 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptorEJB3.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -1,167 +0,0 @@ -/* - * 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.jboss50; - -// $Id$ - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import org.jboss.deployers.spi.deployer.DeploymentUnit; -import org.jboss.ejb3.Container; -import org.jboss.ejb3.EJBContainer; -import org.jboss.ejb3.Ejb3Deployment; -import org.jboss.ejb3.SessionContainer; -import org.jboss.ejb3.mdb.MessagingContainer; -import org.jboss.ejb3.metamodel.Ejb3PortComponent; -import org.jboss.ejb3.metamodel.EjbJarDD; -import org.jboss.ejb3.metamodel.EnterpriseBean; -import org.jboss.ejb3.metamodel.WebserviceDescription; -import org.jboss.ejb3.metamodel.Webservices; -import org.jboss.logging.Logger; -import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; -import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedEjbPortComponentMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedMessageDrivenMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedSessionMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData.PublishLocationAdapter; - -/** - * Build container independent application meta data - * - * @author Thomas.Diesler(a)jboss.org - * @since 14-Apr-2007 - */ -public class ApplicationMetaDataAdaptorEJB3 -{ - // logging support - private static Logger log = Logger.getLogger(ApplicationMetaDataAdaptorEJB3.class); - - public static UnifiedApplicationMetaData buildUnifiedApplicationMetaData(UnifiedDeploymentInfo udi, DeploymentUnit unit) - { - Ejb3Deployment ejb3Deployment = unit.getAttachment(Ejb3Deployment.class); - udi.addAttachment(Ejb3Deployment.class, ejb3Deployment); - - EjbJarDD jarDD = unit.getAttachment(EjbJarDD.class); - UnifiedApplicationMetaData umd = new UnifiedApplicationMetaData(); - buildUnifiedBeanMetaData(umd, ejb3Deployment); - buildWebservicesMetaData(umd, jarDD); - return umd; - } - - private static void buildWebservicesMetaData(UnifiedApplicationMetaData umd, EjbJarDD jarDD) - { - // nothing to do - if (jarDD == null) - return; - - Webservices webservices = jarDD.getWebservices(); - if (webservices != null) - { - String contextRoot = webservices.getContextRoot(); - umd.setPublishLocationAdapter(getPublishLocationAdpater(webservices)); - - List<WebserviceDescription> wsDescriptions = webservices.getWebserviceDescriptions(); - if (wsDescriptions.size() > 1) - log.warn("Multiple <webservice-description> elements not supported"); - - if (wsDescriptions.size() > 0) - { - WebserviceDescription wsd = wsDescriptions.get(0); - umd.setConfigName(wsd.getConfigName()); - umd.setConfigFile(wsd.getConfigFile()); - - // com/sun/ts/tests/webservices12/ejb/annotations/WSEjbWebServiceRefTest1 - // WSEjbWebServiceRefTest1VerifyTargetEndpointAddress - if (contextRoot == null) - contextRoot = "/" + wsd.getDescriptionName(); - } - - umd.setWebServiceContextRoot(contextRoot); - } - } - - private static void buildUnifiedBeanMetaData(UnifiedApplicationMetaData umd, Ejb3Deployment ejb3Deployment) - { - List<UnifiedBeanMetaData> ubmdList = new ArrayList<UnifiedBeanMetaData>(); - Iterator<Container> it = ejb3Deployment.getEjbContainers().values().iterator(); - while (it.hasNext()) - { - EJBContainer container = (EJBContainer)it.next(); - UnifiedBeanMetaData ubmd = null; - if (container instanceof SessionContainer) - { - ubmd = new UnifiedSessionMetaData(); - } - else if (container instanceof MessagingContainer) - { - ubmd = new UnifiedMessageDrivenMetaData(); - log.warn("No implemented: initialize MDB destination"); - //((UnifiedMessageDrivenMetaData)ubmd).setDestinationJndiName(((MessagingContainer)container).getDestination()); - } - - if (ubmd != null) - { - ubmd.setEjbName(container.getEjbName()); - ubmd.setEjbClass(container.getBeanClassName()); - - EnterpriseBean bean = container.getXml(); - Ejb3PortComponent pcMetaData = (bean != null ? bean.getPortComponent() : null); - if (pcMetaData != null) - { - UnifiedEjbPortComponentMetaData ejbPortComp = new UnifiedEjbPortComponentMetaData(); - ejbPortComp.setPortComponentName(pcMetaData.getPortComponentName()); - ejbPortComp.setPortComponentURI(pcMetaData.getPortComponentURI()); - ejbPortComp.setAuthMethod(pcMetaData.getAuthMethod()); - ejbPortComp.setTransportGuarantee(pcMetaData.getTransportGuarantee()); - ejbPortComp.setSecureWSDLAccess(pcMetaData.getSecureWSDLAccess()); - - ubmd.setPortComponent(ejbPortComp); - } - - ubmdList.add(ubmd); - } - } - umd.setEnterpriseBeans(ubmdList); - } - - private static PublishLocationAdapter getPublishLocationAdpater(final Webservices webservices) - { - return new PublishLocationAdapter() - { - public String getWsdlPublishLocationByName(String name) - { - String wsdlPublishLocation = null; - for (WebserviceDescription wsd : webservices.getWebserviceDescriptions()) - { - if (wsd.getDescriptionName().equals(name)) - { - wsdlPublishLocation = wsd.getWsdlPublishLocation(); - } - } - return wsdlPublishLocation; - } - }; - } -} Deleted: branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ArchiveDeployerHook.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ArchiveDeployerHook.java 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ArchiveDeployerHook.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -1,150 +0,0 @@ -/* - * 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.jboss50; - -//$Id$ - -import java.net.URL; - -import org.jboss.deployers.spi.DeploymentException; -import org.jboss.deployers.spi.deployer.DeploymentUnit; -import org.jboss.virtual.VirtualFile; -import org.jboss.ws.integration.UnifiedVirtualFile; -import org.jboss.ws.integration.deployment.Deployment; -import org.jboss.ws.integration.deployment.WSDeploymentException; -import org.jboss.ws.integration.deployment.Deployment.DeploymentType; -import org.jboss.ws.integration.jboss50.AbstractDeployerHook; -import org.jboss.ws.metadata.webservices.WebservicesFactory; -import org.jboss.ws.metadata.webservices.WebservicesMetaData; -import org.jboss.ws.utils.DOMUtils; -import org.jboss.xb.binding.ObjectModelFactory; -import org.jboss.xb.binding.Unmarshaller; -import org.jboss.xb.binding.UnmarshallerFactory; -import org.w3c.dom.Element; - -/** - * An abstract web service deployer. - * - * deploy(unit) - * if(isWebServiceDeployment) - * dep = createDeployment(unit) - * deploy(dep) - * - * undeploy(unit) - * dep = getDeployment(unit) - * undeploy(dep) - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public abstract class ArchiveDeployerHook extends AbstractDeployerHook -{ - /** Get the deployemnt type this deployer can handle - */ - public abstract DeploymentType getDeploymentType(); - - /** Depending on the type of deployment, this method should return true - * if the deployment contains web service endpoints. - */ - public abstract boolean isWebServiceDeployment(DeploymentUnit unit); - - /** Create the Deployment for a given DeploymentUnit - */ - public abstract Deployment createDeployment(DeploymentUnit unit); - - /** Get the Deployment for a given DeploymentUnit - */ - public Deployment getDeployment(DeploymentUnit unit) - { - Deployment dep = unit.getAttachment(Deployment.class); - return (dep != null && dep.getType() == getDeploymentType() ? dep : null); - } - - public void deploy(DeploymentUnit unit) throws DeploymentException - { - if (ignoreDeployment(unit)) - return; - - if (isWebServiceDeployment(unit)) - { - log.debug("deploy: " + unit.getName()); - Deployment dep = getDeployment(unit); - if (dep == null) - { - dep = createDeployment(unit); - dep.getContext().addAttachment(DeploymentUnit.class, unit); - } - - deployerManager.deploy(dep); - unit.addAttachment(Deployment.class, dep); - } - } - - public void undeploy(DeploymentUnit unit) - { - if (ignoreDeployment(unit)) - return; - - Deployment dep = getDeployment(unit); - if (dep != null) - { - log.debug("undeploy: " + unit.getName()); - deployerManager.undeploy(dep); - unit.removeAttachment(Deployment.class); - } - } - - /** Unmrashall the webservices.xml if there is one - */ - protected WebservicesMetaData getWebservicesMetaData(DeploymentUnit unit) - { - WebservicesMetaData wsMetaData = unit.getAttachment(WebservicesMetaData.class); - UnifiedVirtualFile vfWebservices = getWebservicesFile(unit); - if (wsMetaData == null && vfWebservices != null) - { - try - { - URL wsURL = vfWebservices.toURL(); - Element root = DOMUtils.parse(wsURL.openStream()); - String namespaceURI = root.getNamespaceURI(); - if (namespaceURI.equals("http://java.sun.com/xml/ns/j2ee")) - { - Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); - ObjectModelFactory factory = new WebservicesFactory(wsURL); - wsMetaData = (WebservicesMetaData)unmarshaller.unmarshal(wsURL.openStream(), factory, null); - unit.addAttachment(WebservicesMetaData.class, wsMetaData); - } - } - catch (Exception ex) - { - throw new WSDeploymentException(ex); - } - } - return wsMetaData; - } - - private UnifiedVirtualFile getWebservicesFile(DeploymentUnit unit) - { - VirtualFile vf = unit.getMetaDataFile("webservices.xml"); - return (vf != null ? new VirtualFileAdaptor(vf) : null); - } -} Deleted: branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/DeployerHook.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/DeployerHook.java 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/DeployerHook.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -1,40 +0,0 @@ -/* - * 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.jboss50; - -//$Id$ - -import org.jboss.deployers.spi.DeploymentException; -import org.jboss.deployers.spi.deployer.DeploymentUnit; - -/** - * An interface for all web service deployer hooks - * - * @author Thomas.Diesler(a)jboss.org - * @since 24-Apr-2007 - */ -public interface DeployerHook -{ - void deploy(DeploymentUnit unit) throws DeploymentException; - - void undeploy(DeploymentUnit unit); -} Deleted: branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/DeploymentInfoAdapter.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/DeploymentInfoAdapter.java 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/DeploymentInfoAdapter.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -1,100 +0,0 @@ -/* - * 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.jboss50; - -import java.net.URL; -import java.net.URLClassLoader; - -import org.jboss.deployers.spi.deployer.DeploymentUnit; -import org.jboss.ejb3.Ejb3Deployment; -import org.jboss.logging.Logger; -import org.jboss.metadata.ApplicationMetaData; -import org.jboss.metadata.WebMetaData; -import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; - -// $Id$ - -/** - * Build container independent deployment info. - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class DeploymentInfoAdapter -{ - // logging support - private static Logger log = Logger.getLogger(DeploymentInfoAdapter.class); - - public static void buildDeploymentInfo(UnifiedDeploymentInfo udi, DeploymentUnit unit) - { - udi.addAttachment(DeploymentUnit.class, unit); - - try - { - if (unit.getDeploymentContext().getParent() != null) - { - udi.parent = new UnifiedDeploymentInfo(null); - buildDeploymentInfo(udi.parent, unit.getDeploymentContext().getParent().getDeploymentUnit()); - } - - udi.vfRoot = new VirtualFileAdaptor(unit.getDeploymentContext().getRoot()); - - udi.name = unit.getName(); - udi.simpleName = unit.getSimpleName(); - udi.url = udi.vfRoot.toURL(); - - buildMetaData(udi, unit); - - // Since we create temporary classes, we need to create a delegate loader - // This prevents CCE problems where the parent loader is available at deploy time, - // and a child loader is available at start time. - udi.classLoader = new URLClassLoader(new URL[] {}, unit.getClassLoader()); - - log.debug("UnifiedDeploymentInfo:\n" + udi); - } - catch (RuntimeException rte) - { - throw rte; - } - catch (Exception ex) - { - throw new IllegalStateException(ex); - } - } - - private static void buildMetaData(UnifiedDeploymentInfo udi, DeploymentUnit unit) throws Exception - { - if (unit.getAttachment(Ejb3Deployment.class) != null) - { - udi.metaData = ApplicationMetaDataAdaptorEJB3.buildUnifiedApplicationMetaData(udi, unit); - } - else if (unit.getAttachment(ApplicationMetaData.class) != null) - { - udi.metaData = ApplicationMetaDataAdaptor.buildUnifiedApplicationMetaData(udi, unit); - } - else if (unit.getAttachment(WebMetaData.class) != null) - { - udi.metaData = WebMetaDataAdaptor.buildUnifiedWebMetaData(udi, unit); - udi.webappURL = udi.vfRoot.toURL(); - } - } -} Deleted: branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerHookEJB21.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerHookEJB21.java 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerHookEJB21.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -1,116 +0,0 @@ -/* - * 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.jboss50; - -//$Id$ - -import org.jboss.deployers.spi.deployer.DeploymentUnit; -import org.jboss.metadata.ApplicationMetaData; -import org.jboss.metadata.BeanMetaData; -import org.jboss.ws.integration.Endpoint; -import org.jboss.ws.integration.BasicEndpoint; -import org.jboss.ws.integration.Service; -import org.jboss.ws.integration.deployment.Deployment; -import org.jboss.ws.integration.deployment.BasicDeploymentImpl; -import org.jboss.ws.integration.deployment.Deployment.DeploymentType; -import org.jboss.ws.metadata.webservices.PortComponentMetaData; -import org.jboss.ws.metadata.webservices.WebserviceDescriptionMetaData; -import org.jboss.ws.metadata.webservices.WebservicesMetaData; -import org.jboss.ws.utils.ObjectNameFactory; - -/** - * A deployer JAXRPC EJB21 Endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class JAXRPCDeployerHookEJB21 extends AbstractDeployerHookEJB -{ - /** Get the deployemnt type this deployer can handle - */ - public DeploymentType getDeploymentType() - { - return DeploymentType.JAXRPC_EJB21; - } - - @Override - public Deployment createDeployment(DeploymentUnit unit) - { - Deployment dep = new BasicDeploymentImpl(); - dep.setType(getDeploymentType()); - dep.setClassLoader(unit.getClassLoader()); - - Service service = dep.getService(); - - ApplicationMetaData appmd = unit.getAttachment(ApplicationMetaData.class); - if (appmd == null) - throw new IllegalStateException("Deployment unit does not contain application meta data"); - - WebservicesMetaData wsMetaData = getWebservicesMetaData(unit); - if (wsMetaData == null) - throw new IllegalStateException("Deployment unit does not contain webservices meta data"); - - // Copy the attachments - dep.getContext().addAttachment(WebservicesMetaData.class, wsMetaData); - dep.getContext().addAttachment(ApplicationMetaData.class, appmd); - - for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions()) - { - for (PortComponentMetaData pcmd : wsd.getPortComponents()) - { - String ejbLink = pcmd.getEjbLink(); - if (ejbLink == null) - throw new IllegalStateException("ejb-link cannot be null"); - - BeanMetaData beanMetaData = appmd.getBeanByEjbName(ejbLink); - if (beanMetaData == null) - throw new IllegalStateException("Cannot obtain bean meta data for: " + ejbLink); - - String ejbClass = beanMetaData.getEjbClass(); - try - { - ClassLoader loader = unit.getClassLoader(); - Class<?> epBean = loader.loadClass(ejbClass.trim()); - - // Create the endpoint - Endpoint endpoint = new BasicEndpoint(service, epBean); - String nameStr = Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + ejbLink; - endpoint.setName(ObjectNameFactory.create(nameStr)); - - service.addEndpoint(endpoint); - } - catch (ClassNotFoundException ex) - { - log.warn("Cannot load servlet class: " + ejbClass); - } - } - } - return dep; - } - - @Override - public boolean isWebServiceDeployment(DeploymentUnit unit) - { - WebservicesMetaData wsMetaData = getWebservicesMetaData(unit); - return wsMetaData != null && unit.getAllMetaData(ApplicationMetaData.class).size() > 0; - } -} \ No newline at end of file Deleted: branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerHookJSE.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerHookJSE.java 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerHookJSE.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -1,133 +0,0 @@ -/* - * 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.jboss50; - -//$Id$ - -import org.jboss.deployers.spi.deployer.DeploymentUnit; -import org.jboss.metadata.WebMetaData; -import org.jboss.metadata.web.Servlet; -import org.jboss.ws.integration.BasicEndpoint; -import org.jboss.ws.integration.Endpoint; -import org.jboss.ws.integration.Service; -import org.jboss.ws.integration.deployment.BasicDeploymentImpl; -import org.jboss.ws.integration.deployment.Deployment; -import org.jboss.ws.integration.deployment.Deployment.DeploymentType; -import org.jboss.ws.metadata.webservices.PortComponentMetaData; -import org.jboss.ws.metadata.webservices.WebserviceDescriptionMetaData; -import org.jboss.ws.metadata.webservices.WebservicesMetaData; -import org.jboss.ws.utils.ObjectNameFactory; - -/** - * A deployer JAXRPC JSE Endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class JAXRPCDeployerHookJSE extends AbstractDeployerHookJSE -{ - /** Get the deployemnt type this deployer can handle - */ - public DeploymentType getDeploymentType() - { - return DeploymentType.JAXRPC_JSE; - } - - /** - * Create an endpoint for every servlet-link in webservices.xml - */ - @Override - public Deployment createDeployment(DeploymentUnit unit) - { - Deployment dep = new BasicDeploymentImpl(); - dep.setType(getDeploymentType()); - dep.setClassLoader(unit.getClassLoader()); - - Service service = dep.getService(); - - WebMetaData webMetaData = unit.getAttachment(WebMetaData.class); - if (webMetaData == null) - throw new IllegalStateException("Deployment unit does not contain web meta data"); - - WebservicesMetaData wsMetaData = getWebservicesMetaData(unit); - if (wsMetaData == null) - throw new IllegalStateException("Deployment unit does not contain webservices meta data"); - - // Copy the attachments - dep.getContext().addAttachment(WebservicesMetaData.class, wsMetaData); - dep.getContext().addAttachment(WebMetaData.class, webMetaData); - - for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions()) - { - for (PortComponentMetaData pcmd : wsd.getPortComponents()) - { - String servletLink = pcmd.getServletLink(); - if (servletLink == null) - throw new IllegalStateException("servlet-link cannot be null"); - - Servlet servlet = getServletForName(webMetaData, servletLink); - String servletClass = servlet.getServletClass(); - - try - { - ClassLoader loader = unit.getClassLoader(); - Class<?> epBean = loader.loadClass(servletClass.trim()); - - // Create the endpoint - Endpoint endpoint = new BasicEndpoint(service, epBean); - String nameStr = Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + servletLink; - endpoint.setName(ObjectNameFactory.create(nameStr)); - - service.addEndpoint(endpoint); - } - catch (ClassNotFoundException ex) - { - log.warn("Cannot load servlet class: " + servletClass); - } - } - } - - return dep; - } - - private Servlet getServletForName(WebMetaData wmd, String servletLink) - { - for (Servlet servlet : wmd.getServlets()) - { - if (servletLink.equals(servlet.getName())) - { - return servlet; - } - } - throw new IllegalStateException("Cannot find servlet for link: " + servletLink); - } - - @Override - public boolean isWebServiceDeployment(DeploymentUnit unit) - { - if (super.isWebServiceDeployment(unit) == false) - return false; - - WebservicesMetaData wsMetaData = getWebservicesMetaData(unit); - return wsMetaData != null; - } -} Deleted: branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerHookEJB3.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerHookEJB3.java 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerHookEJB3.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -1,129 +0,0 @@ -/* - * 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.jboss50; - -//$Id$ - -import java.util.Iterator; - -import javax.jws.WebService; -import javax.xml.ws.WebServiceProvider; - -import org.jboss.deployers.spi.deployer.DeploymentUnit; -import org.jboss.ejb3.EJBContainer; -import org.jboss.ejb3.Ejb3Deployment; -import org.jboss.ejb3.stateless.StatelessContainer; -import org.jboss.ws.integration.BasicEndpoint; -import org.jboss.ws.integration.Endpoint; -import org.jboss.ws.integration.Service; -import org.jboss.ws.integration.deployment.BasicDeploymentImpl; -import org.jboss.ws.integration.deployment.Deployment; -import org.jboss.ws.integration.deployment.Deployment.DeploymentType; -import org.jboss.ws.utils.ObjectNameFactory; - -/** - * A deployer JAXWS EJB3 Endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class JAXWSDeployerHookEJB3 extends AbstractDeployerHookEJB -{ - /** Get the deployemnt type this deployer can handle - */ - public DeploymentType getDeploymentType() - { - return DeploymentType.JAXWS_EJB3; - } - - @Override - public Deployment createDeployment(DeploymentUnit unit) - { - Deployment dep = new BasicDeploymentImpl(); - dep.setType(getDeploymentType()); - dep.setClassLoader(unit.getClassLoader()); - - Service service = dep.getService(); - - Ejb3Deployment ejb3Deployment = unit.getAttachment(Ejb3Deployment.class); - if (ejb3Deployment == null) - throw new IllegalStateException("Deployment unit does not contain ejb3 deployment"); - - // Copy the attachments - dep.getContext().addAttachment(Ejb3Deployment.class, ejb3Deployment); - - Iterator it = ejb3Deployment.getEjbContainers().values().iterator(); - while (it.hasNext()) - { - EJBContainer container = (EJBContainer)it.next(); - if (isWebServiceBean(container)) - { - String ejbName = container.getEjbName(); - Class epBean = container.getBeanClass(); - - // Create the endpoint - Endpoint endpoint = new BasicEndpoint(service, epBean); - String nameStr = Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + ejbName; - endpoint.setName(ObjectNameFactory.create(nameStr)); - - service.addEndpoint(endpoint); - } - } - - return dep; - } - - @Override - public boolean isWebServiceDeployment(DeploymentUnit unit) - { - Ejb3Deployment ejb3Deployment = unit.getAttachment(Ejb3Deployment.class); - if (ejb3Deployment == null) - return false; - - boolean isWebServiceDeployment = false; - - Iterator it = ejb3Deployment.getEjbContainers().values().iterator(); - while (it.hasNext()) - { - EJBContainer container = (EJBContainer)it.next(); - if (isWebServiceBean(container)) - { - isWebServiceDeployment = true; - break; - } - } - - return isWebServiceDeployment; - } - - private boolean isWebServiceBean(EJBContainer container) - { - boolean isWebServiceBean = false; - if (container instanceof StatelessContainer) - { - boolean isWebService = container.resolveAnnotation(WebService.class) != null; - boolean isWebServiceProvider = container.resolveAnnotation(WebServiceProvider.class) != null; - isWebServiceBean = isWebService || isWebServiceProvider; - } - return isWebServiceBean; - } -} \ No newline at end of file Deleted: branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerHookJSE.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerHookJSE.java 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerHookJSE.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -1,150 +0,0 @@ -/* - * 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.jboss50; - -//$Id$ - -import java.util.ArrayList; -import java.util.List; - -import javax.jws.WebService; -import javax.xml.ws.WebServiceProvider; - -import org.jboss.deployers.spi.deployer.DeploymentUnit; -import org.jboss.metadata.WebMetaData; -import org.jboss.metadata.web.Servlet; -import org.jboss.ws.integration.BasicEndpoint; -import org.jboss.ws.integration.Endpoint; -import org.jboss.ws.integration.Service; -import org.jboss.ws.integration.deployment.BasicDeploymentImpl; -import org.jboss.ws.integration.deployment.Deployment; -import org.jboss.ws.integration.deployment.Deployment.DeploymentType; -import org.jboss.ws.utils.ObjectNameFactory; - -/** - * A deployer JAXWS JSE Endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class JAXWSDeployerHookJSE extends AbstractDeployerHookJSE -{ - /** Get the deployemnt type this deployer can handle - */ - public DeploymentType getDeploymentType() - { - return DeploymentType.JAXWS_JSE; - } - - @Override - public Deployment createDeployment(DeploymentUnit unit) - { - Deployment dep = new BasicDeploymentImpl(); - dep.setType(getDeploymentType()); - dep.setClassLoader(unit.getClassLoader()); - - Service service = dep.getService(); - - WebMetaData webMetaData = unit.getAttachment(WebMetaData.class); - if (webMetaData == null) - throw new IllegalStateException("Deployment unit does not contain web meta data"); - - // Copy the attachments - dep.getContext().addAttachment(WebMetaData.class, webMetaData); - - List<Servlet> servlets = getRelevantServlets(webMetaData, unit.getClassLoader()); - for (Servlet servlet : servlets) - { - String servletName = servlet.getName(); - String servletClass = servlet.getServletClass(); - - try - { - ClassLoader loader = unit.getClassLoader(); - Class<?> epBean = loader.loadClass(servletClass.trim()); - - // Create the endpoint - Endpoint endpoint = new BasicEndpoint(service, epBean); - String nameStr = Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + servletName; - endpoint.setName(ObjectNameFactory.create(nameStr)); - - service.addEndpoint(endpoint); - } - catch (ClassNotFoundException ex) - { - log.warn("Cannot load servlet class: " + servletClass); - continue; - } - } - - return dep; - } - - @Override - public boolean isWebServiceDeployment(DeploymentUnit unit) - { - if (super.isWebServiceDeployment(unit) == false) - return false; - - boolean isWebServiceDeployment = false; - try - { - WebMetaData webMetaData = unit.getAttachment(WebMetaData.class); - List<Servlet> servlets = getRelevantServlets(webMetaData, unit.getClassLoader()); - isWebServiceDeployment = servlets.size() > 0; - } - catch (Exception ex) - { - log.error("Cannot process web deployment", ex); - } - - return isWebServiceDeployment; - } - - private List<Servlet> getRelevantServlets(WebMetaData webMetaData, ClassLoader loader) - { - List<Servlet> servlets = new ArrayList<Servlet>(); - for (Servlet servlet : webMetaData.getServlets()) - { - String servletClassName = servlet.getServletClass(); - - // Skip JSPs - if (servletClassName == null || servletClassName.length() == 0) - continue; - - try - { - Class<?> servletClass = loader.loadClass(servletClassName.trim()); - boolean isWebService = servletClass.isAnnotationPresent(WebService.class); - boolean isWebServiceProvider = servletClass.isAnnotationPresent(WebServiceProvider.class); - if (isWebService || isWebServiceProvider) - servlets.add(servlet); - } - catch (ClassNotFoundException ex) - { - log.warn("Cannot load servlet class: " + servletClassName); - continue; - } - } - return servlets; - } -} \ No newline at end of file Deleted: branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/MainDeployerHook.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/MainDeployerHook.java 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/MainDeployerHook.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -1,62 +0,0 @@ -/* - * 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.jboss50; - -//$Id$ - -import org.jboss.deployers.spi.DeploymentException; -import org.jboss.deployers.spi.deployer.DeploymentUnit; -import org.jboss.ws.integration.deployment.Deployment; -import org.jboss.ws.integration.jboss50.AbstractDeployerHook; - -/** - * A basic hook that delegates a deployment manger. - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class MainDeployerHook extends AbstractDeployerHook -{ - public void deploy(DeploymentUnit unit) throws DeploymentException - { - if (ignoreDeployment(unit)) - return; - - Deployment dep = unit.getAttachment(Deployment.class); - if (dep != null) - { - deployerManager.deploy(dep); - } - } - - public void undeploy(DeploymentUnit unit) - { - if (ignoreDeployment(unit)) - return; - - Deployment dep = unit.getAttachment(Deployment.class); - if (dep != null) - { - deployerManager.undeploy(dep); - } - } -} Deleted: branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ManagedServerConfig.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ManagedServerConfig.java 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ManagedServerConfig.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -1,76 +0,0 @@ -/* - * 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.jboss50; - -// $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; - } -} Deleted: branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ManagedServerConfigMBean.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ManagedServerConfigMBean.java 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ManagedServerConfigMBean.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -1,32 +0,0 @@ -/* - * 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.jboss50; - -import org.jboss.ws.integration.management.ServerConfig; - -/** - * MBean interface. - * @since 15-April-2004 - */ -public interface ManagedServerConfigMBean extends ServerConfig -{ -} Deleted: branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/UnifiedDeploymentInfoDeployer.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/UnifiedDeploymentInfoDeployer.java 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/UnifiedDeploymentInfoDeployer.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -1,69 +0,0 @@ -/* - * 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.jboss50; - -//$Id$ - -import org.jboss.deployers.spi.deployer.DeploymentUnit; -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.webservices.WebservicesMetaData; - -/** - * A deployer that builds the UnifiedDeploymentInfo - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class UnifiedDeploymentInfoDeployer extends AbstractDeployer -{ - @Override - public void create(Deployment dep) - { - UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); - if (udi == null) - { - DeploymentUnit unit = dep.getContext().getAttachment(DeploymentUnit.class); - if (unit == null) - throw new IllegalStateException("Cannot obtain deployment unit"); - - DeploymentType type = dep.getType(); - if (type.toString().startsWith("JAXWS")) - { - udi = new JAXWSDeployment(type); - DeploymentInfoAdapter.buildDeploymentInfo(udi, unit); - } - else - { - WebservicesMetaData wsMetaData = dep.getContext().getAttachment(WebservicesMetaData.class); - udi = new JAXRPCDeployment(type, wsMetaData); - DeploymentInfoAdapter.buildDeploymentInfo(udi, unit); - } - - dep.getContext().addAttachment(UnifiedDeploymentInfo.class, udi); - } - } -} \ No newline at end of file Deleted: branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/VirtualFileAdaptor.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/VirtualFileAdaptor.java 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/VirtualFileAdaptor.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -1,66 +0,0 @@ -/* - * 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.jboss50; - -import java.io.IOException; -import java.net.URL; - -import org.jboss.virtual.VirtualFile; -import org.jboss.ws.integration.UnifiedVirtualFile; - -// $Id$ - -/** - * A JBoss50 VirtualFile adaptor - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class VirtualFileAdaptor implements UnifiedVirtualFile -{ - private static final long serialVersionUID = 6547394037548338042L; - - private VirtualFile root; - - public VirtualFileAdaptor(VirtualFile root) - { - this.root = root; - } - - public UnifiedVirtualFile findChild(String child) throws IOException - { - VirtualFile vf = root.findChild(child); - return new VirtualFileAdaptor(vf); - } - - public URL toURL() - { - try - { - return root.toURL(); - } - catch (Exception e) - { - return null; - } - } -} Deleted: branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebMetaDataAdaptor.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebMetaDataAdaptor.java 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebMetaDataAdaptor.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -1,136 +0,0 @@ -/* - * 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.jboss50; - -// $Id$ - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import org.jboss.deployers.spi.deployer.DeploymentUnit; -import org.jboss.metadata.WebMetaData; -import org.jboss.metadata.WebSecurityMetaData; -import org.jboss.metadata.WebSecurityMetaData.WebResourceCollection; -import org.jboss.metadata.web.Servlet; -import org.jboss.metadata.web.ServletMapping; -import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; -import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData.PublishLocationAdapter; -import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData.UnifiedWebResourceCollection; - -/** - * Build container independent web meta data - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class WebMetaDataAdaptor -{ - public static UnifiedWebMetaData buildUnifiedWebMetaData(UnifiedDeploymentInfo udi, DeploymentUnit unit) - { - WebMetaData wmd = unit.getAttachment(WebMetaData.class); - udi.addAttachment(WebMetaData.class, wmd); - - UnifiedWebMetaData umd = new UnifiedWebMetaData(); - umd.setContextRoot(wmd.getContextRoot()); - umd.setServletMappings(getServletMappings(wmd)); - umd.setServletClassNames(getServletClassMap(wmd)); - umd.setConfigName(wmd.getConfigName()); - umd.setConfigFile(wmd.getConfigFile()); - umd.setSecurityDomain(wmd.getSecurityDomain()); - umd.setPublishLocationAdapter(getPublishLocationAdpater(wmd)); - umd.setSecurityMetaData(getSecurityMetaData(wmd.getSecurityContraints())); - - return umd; - } - - private static PublishLocationAdapter getPublishLocationAdpater(final WebMetaData wmd) - { - return new PublishLocationAdapter() - { - public String getWsdlPublishLocationByName(String name) - { - return wmd.getWsdlPublishLocationByName(name); - } - }; - } - - protected static List<UnifiedWebSecurityMetaData> getSecurityMetaData(final Iterator securityConstraints) - { - ArrayList<UnifiedWebSecurityMetaData> unifiedsecurityMetaData = new ArrayList<UnifiedWebSecurityMetaData>(); - - while (securityConstraints.hasNext()) - { - WebSecurityMetaData securityMetaData = (WebSecurityMetaData)securityConstraints.next(); - - UnifiedWebSecurityMetaData current = new UnifiedWebSecurityMetaData(); - unifiedsecurityMetaData.add(current); - - current.setTransportGuarantee(securityMetaData.getTransportGuarantee()); - - Map<String, WebResourceCollection> resources = securityMetaData.getWebResources(); - for (WebResourceCollection webResource : resources.values()) - { - UnifiedWebResourceCollection currentResource = current.addWebResource(webResource.getName()); - for (String currentPattern : webResource.getUrlPatterns()) - { - currentResource.addPattern(currentPattern); - } - } - } - - return unifiedsecurityMetaData; - } - - private static Map<String, String> getServletMappings(WebMetaData wmd) - { - Map<String, String> mappings = new HashMap<String, String>(); - Iterator it = wmd.getServletMappings().iterator(); - while (it.hasNext()) - { - ServletMapping sm = (ServletMapping)it.next(); - // FIXME - Add support for multiple mappings - mappings.put(sm.getName(), sm.getUrlPatterns().get(0)); - } - return mappings; - } - - private static Map<String, String> getServletClassMap(WebMetaData wmd) - { - Map<String, String> mappings = new HashMap<String, String>(); - Iterator it = wmd.getServlets().iterator(); - while (it.hasNext()) - { - Servlet servlet = (Servlet)it.next(); - // Skip JSPs - if (servlet.getServletClass() == null || servlet.getServletClass().length() == 0) - continue; - - mappings.put(servlet.getName(), servlet.getServletClass()); - } - return mappings; - } -} Deleted: branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceDeployerEJB.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceDeployerEJB.java 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceDeployerEJB.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -1,53 +0,0 @@ -/* - * 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.jboss50; - -//$Id$ - -/** - * This web service deployer for EJB - * - * @author Thomas.Diesler(a)jboss.org - * @since 24-Apr-2007 - */ -public class WebServiceDeployerEJB extends AbstractWebServiceDeployer -{ - private int relOrderEJB2x; - private int relOrderEJB3; - - public void setRelOrderEJB2x(int relOrderEJB2x) - { - this.relOrderEJB2x = relOrderEJB2x; - } - - public void setRelOrderEJB3(int relOrderEJB3) - { - this.relOrderEJB3 = relOrderEJB3; - } - - @Override - public int getRelativeOrder() - { - return Math.max(relOrderEJB2x, relOrderEJB3) + 1; - } - -} Deleted: branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceDeployerJSE.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceDeployerJSE.java 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceDeployerJSE.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -1,46 +0,0 @@ -/* - * 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.jboss50; - -//$Id$ - -/** - * This web service deployer for JSE - * - * @author Thomas.Diesler(a)jboss.org - * @since 24-Apr-2007 - */ -public class WebServiceDeployerJSE extends AbstractWebServiceDeployer -{ - private int relOrderWar; - - public void setRelOrderWar(int relOrderWar) - { - this.relOrderWar = relOrderWar; - } - - @Override - public int getRelativeOrder() - { - return relOrderWar - 1; - } -} Deleted: branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceMainDeployer.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceMainDeployer.java 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceMainDeployer.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -1,52 +0,0 @@ -/* - * 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.jboss50; - -//$Id$ - -/** - * The main web service deployer - * - * @author Thomas.Diesler(a)jboss.org - * @since 24-Apr-2007 - */ -public class WebServiceMainDeployer extends AbstractWebServiceDeployer -{ - private int relOrderJSE; - private int relOrderEJB; - - public void setRelOrderEJB(int relOrderEJB) - { - this.relOrderEJB = relOrderEJB; - } - - public void setRelOrderJSE(int relOrderJSE) - { - this.relOrderJSE = relOrderJSE; - } - - @Override - public int getRelativeOrder() - { - return Math.max(relOrderEJB, relOrderJSE) + 1; - } -} Deleted: branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/jbossws/ModifyWebMetaDataDeployer.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/jbossws/ModifyWebMetaDataDeployer.java 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/jbossws/ModifyWebMetaDataDeployer.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -1,113 +0,0 @@ -/* - * 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.jboss50.jbossws; - -//$Id$ - -import java.util.Iterator; - -import org.jboss.metadata.NameValuePair; -import org.jboss.metadata.WebMetaData; -import org.jboss.metadata.web.Servlet; -import org.jboss.ws.core.deployment.ServiceEndpointPublisher; -import org.jboss.ws.core.utils.JavaUtils; -import org.jboss.ws.integration.Endpoint; -import org.jboss.ws.integration.deployment.AbstractDeployer; -import org.jboss.ws.integration.deployment.Deployment; - -/** - * A deployer that modifies the web.xml meta data - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class ModifyWebMetaDataDeployer extends AbstractDeployer -{ - private ServiceEndpointPublisher serviceEndpointPublisher; - - public void setServiceEndpointPublisher(ServiceEndpointPublisher serviceEndpointPublisher) - { - this.serviceEndpointPublisher = serviceEndpointPublisher; - } - - @Override - public void create(Deployment dep) - { - WebMetaData webMetaData = dep.getContext().getAttachment(WebMetaData.class); - if (webMetaData != null) - { - for (Servlet servlet : webMetaData.getServlets()) - { - String orgServletClass = servlet.getServletClass(); - - // JSP - if (orgServletClass == null || orgServletClass.length() == 0) - { - log.debug("Innore servlet class: " + orgServletClass); - continue; - } - - // Nothing to do if we have an <init-param> - if (!isAlreadyModified(servlet) && !isJavaxServlet(orgServletClass, dep.getClassLoader())) - { - servlet.setServletClass(serviceEndpointPublisher.getServletClass()); - NameValuePair initParam = new NameValuePair(Endpoint.SEPID_DOMAIN_ENDPOINT, orgServletClass); - servlet.addInitParam(initParam); - } - } - } - } - - private boolean isJavaxServlet(String orgServletClass, ClassLoader loader) - { - boolean isServlet = false; - if (loader != null) - { - try - { - Class servletClass = loader.loadClass(orgServletClass); - isServlet = JavaUtils.isAssignableFrom(javax.servlet.Servlet.class, servletClass); - if (isServlet == true) - { - log.info("Ignore servlet: " + orgServletClass); - } - } - catch (ClassNotFoundException e) - { - log.warn("Cannot load servlet class: " + orgServletClass); - } - } - return isServlet; - } - - private boolean isAlreadyModified(Servlet servlet) - { - Iterator itParams = servlet.getInitParams().iterator(); - while (itParams.hasNext()) - { - NameValuePair pair = (NameValuePair)itParams.next(); - if (Endpoint.SEPID_DOMAIN_ENDPOINT.equals(pair.getName())) - return true; - } - return false; - } -} \ No newline at end of file Deleted: branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/jbossws/SecurityAssociationAdaptorFactoryImpl.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/jbossws/SecurityAssociationAdaptorFactoryImpl.java 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/jbossws/SecurityAssociationAdaptorFactoryImpl.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -1,57 +0,0 @@ -/* - * 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.jboss50.jbossws; - -// $Id$ - -import java.security.Principal; - -import org.jboss.security.SecurityAssociation; -import org.jboss.ws.extensions.security.SecurityAssociationAdaptor; -import org.jboss.ws.extensions.security.SecurityAssociationAdaptorFactory; - -/** - * A JBoss specific SecurityAdaptorFactory - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class SecurityAssociationAdaptorFactoryImpl implements SecurityAssociationAdaptorFactory -{ - public SecurityAssociationAdaptor getSecurityAssociationAdaptor() - { - return new SecurityAccociationAdaptorImpl(); - } - - public class SecurityAccociationAdaptorImpl implements SecurityAssociationAdaptor - { - public void setPrincipal(Principal pricipal) - { - SecurityAssociation.setPrincipal(pricipal); - } - - public void setCredential(Object credential) - { - SecurityAssociation.setCredential(credential); - } - } -} Deleted: branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/jbossws/ServiceEndpointGeneratorEJB21.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/jbossws/ServiceEndpointGeneratorEJB21.java 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/jbossws/ServiceEndpointGeneratorEJB21.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -1,70 +0,0 @@ -/* - * 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.jboss50.jbossws; - -//$Id$ - -import java.util.Iterator; -import java.util.Map; - -import org.jboss.logging.Logger; -import org.jboss.metadata.ApplicationMetaData; -import org.jboss.metadata.AssemblyDescriptorMetaData; -import org.jboss.ws.core.server.ServiceEndpointGeneratorEJB; -import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; -import org.jboss.ws.utils.DOMUtils; -import org.w3c.dom.Element; - -/** - * Generate a service endpoint deployment for EJB endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 12-May-2006 - */ -public class ServiceEndpointGeneratorEJB21 extends ServiceEndpointGeneratorEJB -{ - // logging support - protected Logger log = Logger.getLogger(ServiceEndpointGeneratorEJB21.class); - - /** Add the roles from ejb-jar.xml to the security roles - */ - protected void addEJBSecurityRoles(Element webApp, UnifiedDeploymentInfo udi) - { - // Fix: http://jira.jboss.org/jira/browse/JBWS-309 - ApplicationMetaData applMetaData = (ApplicationMetaData)udi.getAttachment(ApplicationMetaData.class); - AssemblyDescriptorMetaData assemblyDescriptor = applMetaData.getAssemblyDescriptor(); - if (assemblyDescriptor != null) - { - Map securityRoles = assemblyDescriptor.getSecurityRoles(); - if (securityRoles != null) - { - Iterator it = securityRoles.keySet().iterator(); - while (it.hasNext()) - { - Element securityRole = (Element)webApp.appendChild(DOMUtils.createElement("security-role")); - Element roleName = (Element)securityRole.appendChild(DOMUtils.createElement("role-name")); - roleName.appendChild(DOMUtils.createTextNode((String)it.next())); - } - } - } - } -} Deleted: branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/jbossws/ServiceEndpointGeneratorEJB3.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/jbossws/ServiceEndpointGeneratorEJB3.java 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/jbossws/ServiceEndpointGeneratorEJB3.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -1,73 +0,0 @@ -/* - * 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.jboss50.jbossws; - -//$Id$ - -import java.util.Iterator; - -import javax.annotation.security.RolesAllowed; - -import org.jboss.ejb3.EJBContainer; -import org.jboss.ejb3.Ejb3Deployment; -import org.jboss.logging.Logger; -import org.jboss.ws.core.server.ServiceEndpointGeneratorEJB; -import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; -import org.jboss.ws.utils.DOMUtils; -import org.w3c.dom.Element; - -/** - * Generate a service endpoint deployment for EJB endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 12-May-2006 - */ -public class ServiceEndpointGeneratorEJB3 extends ServiceEndpointGeneratorEJB -{ - // logging support - protected Logger log = Logger.getLogger(ServiceEndpointGeneratorEJB3.class); - - /** Add the roles from ejb-jar.xml to the security roles - */ - protected void addEJBSecurityRoles(Element webApp, UnifiedDeploymentInfo udi) - { - Ejb3Deployment ejb3Deployment = udi.getAttachment(Ejb3Deployment.class); - if (ejb3Deployment != null) - { - Iterator it = ejb3Deployment.getEjbContainers().values().iterator(); - while (it.hasNext()) - { - EJBContainer container = (EJBContainer)it.next(); - RolesAllowed anRolesAllowed = (RolesAllowed)container.resolveAnnotation(RolesAllowed.class); - if (anRolesAllowed != null) - { - for (String role : anRolesAllowed.value()) - { - Element securityRole = (Element)webApp.appendChild(DOMUtils.createElement("security-role")); - Element roleName = (Element)securityRole.appendChild(DOMUtils.createElement("role-name")); - roleName.appendChild(DOMUtils.createTextNode(role)); - } - } - } - } - } -} Deleted: branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/jbossws/WebAppDeployerDeployer.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/jbossws/WebAppDeployerDeployer.java 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/jbossws/WebAppDeployerDeployer.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -1,138 +0,0 @@ -/* - * 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.jboss50.jbossws; - -// $Id$ - -import java.net.URL; -import java.util.HashMap; -import java.util.Map; - -import org.jboss.deployers.plugins.structure.AbstractDeploymentContext; -import org.jboss.deployers.spi.deployment.MainDeployer; -import org.jboss.deployers.spi.structure.DeploymentContext; -import org.jboss.deployers.spi.structure.DeploymentState; -import org.jboss.logging.Logger; -import org.jboss.virtual.VFS; -import org.jboss.virtual.VirtualFile; -import org.jboss.ws.core.deployment.ServiceEndpointPublisher; -import org.jboss.ws.integration.deployment.Deployer; -import org.jboss.ws.integration.deployment.Deployment; -import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; -import org.jboss.ws.integration.deployment.WSDeploymentException; - -/** - * Publish the HTTP service endpoint to Tomcat - * - * @author Thomas.Diesler(a)jboss.org - * @since 12-May-2006 - */ -public class WebAppDeployerDeployer implements Deployer -{ - // provide logging - private static Logger log = Logger.getLogger(WebAppDeployerDeployer.class); - - private MainDeployer mainDeployer; - private ServiceEndpointPublisher serviceEndpointPublisher; - private Map<String, DeploymentContext> contextMap = new HashMap<String, DeploymentContext>(); - - public void setMainDeployer(MainDeployer mainDeployer) - { - this.mainDeployer = mainDeployer; - } - - public void setServiceEndpointPublisher(ServiceEndpointPublisher serviceEndpointPublisher) - { - this.serviceEndpointPublisher = serviceEndpointPublisher; - } - - public void create(Deployment dep) - { - UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); - if (udi == null) - throw new IllegalStateException("Cannot obtain unified deployement info"); - - URL warURL = udi.webappURL; - - log.debug("publishServiceEndpoint: " + warURL); - try - { - serviceEndpointPublisher.rewriteWebXml(udi); - DeploymentContext context = createDeploymentContext(warURL); - - mainDeployer.addDeploymentContext(context); - mainDeployer.process(); - - contextMap.put(warURL.toExternalForm(), context); - } - catch (Exception ex) - { - WSDeploymentException.rethrow(ex); - } - } - - public void destroy(Deployment dep) - { - UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); - if (udi == null) - throw new IllegalStateException("Cannot obtain unified deployement info"); - - URL warURL = udi.webappURL; - if (warURL == null) - { - log.error("Cannot obtain warURL for: " + udi.name); - return; - } - - log.debug("destroyServiceEndpoint: " + warURL); - try - { - DeploymentContext context = contextMap.get(warURL.toExternalForm()); - if (context != null) - { - context.setState(DeploymentState.UNDEPLOYING); - mainDeployer.process(); - mainDeployer.removeDeploymentContext(context.getName()); - - contextMap.remove(warURL.toExternalForm()); - } - } - catch (Exception ex) - { - WSDeploymentException.rethrow(ex); - } - } - - private DeploymentContext createDeploymentContext(URL warURL) throws Exception - { - VirtualFile file = VFS.getRoot(warURL); - return new AbstractDeploymentContext(file); - } - - public void start(Deployment dep) - { - } - - public void stop(Deployment dep) - { - } -} Deleted: branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/jbossws/WebAppGeneratorDeployer.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/jbossws/WebAppGeneratorDeployer.java 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/jbossws/WebAppGeneratorDeployer.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -1,61 +0,0 @@ -/* - * 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.jboss50.jbossws; - -//$Id$ - -import org.jboss.ws.integration.deployment.AbstractDeployer; -import org.jboss.ws.integration.deployment.Deployment; -import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; -import org.jboss.ws.metadata.umdm.UnifiedMetaData; - -/** - * A deployer that generates a webapp for an EJB endpoint - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class WebAppGeneratorDeployer extends AbstractDeployer -{ - @Override - public void create(Deployment dep) - { - UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); - if (udi == null) - throw new IllegalStateException("Cannot obtain unified deployement info"); - - UnifiedMetaData umd = dep.getContext().getAttachment(UnifiedMetaData.class); - if (umd == null) - throw new IllegalStateException("Cannot obtain unified meta data"); - - if (dep.getType().toString().endsWith("EJB21")) - { - ServiceEndpointGeneratorEJB21 generator = new ServiceEndpointGeneratorEJB21(); - udi.webappURL = generator.generatWebDeployment(umd, udi); - } - else if (dep.getType().toString().endsWith("EJB3")) - { - ServiceEndpointGeneratorEJB3 generator = new ServiceEndpointGeneratorEJB3(); - udi.webappURL = generator.generatWebDeployment(umd, udi); - } - } -} \ No newline at end of file Modified: branches/tdiesler/trunk/integration/jbws-jboss50/src/main/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/integration/jbws-jboss50/src/main/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml 2007-05-15 05:13:16 UTC (rev 3095) @@ -5,7 +5,7 @@  - <bean name="WebServiceDeployerEJB" class="org.jboss.ws.integration.jboss50.common.WebServiceDeployerEJB"> + <bean name="WebServiceDeployerEJB" class="org.jboss.ws.integration.jboss50.WebServiceDeployerEJB"> <property name="relOrderEJB2x"><inject bean="EJB2xDeployer" property="relativeOrder"/></property> <property name="relOrderEJB3"><inject bean="EJBRegistrationDeployer" property="relativeOrder"/></property> <install bean="MainDeployer" method="addDeployer"> @@ -25,7 +25,7 @@  - <bean name="WebServiceDeployerJSE" class="org.jboss.ws.integration.jboss50.common.WebServiceDeployerJSE"> + <bean name="WebServiceDeployerJSE" class="org.jboss.ws.integration.jboss50.WebServiceDeployerJSE"> <property name="relOrderWar"><inject bean="WarDeployer" property="relativeOrder"/></property> <install bean="MainDeployer" method="addDeployer"> <parameter> @@ -43,7 +43,7 @@  - <bean name="WebServiceMainDeployer" class="org.jboss.ws.integration.jboss50.common.WebServiceMainDeployer"> + <bean name="WebServiceMainDeployer" class="org.jboss.ws.integration.jboss50.WebServiceMainDeployer"> <property name="relOrderJSE"><inject bean="WebServiceDeployerJSE" property="relativeOrder"/></property> <property name="relOrderEJB"><inject bean="WebServiceDeployerEJB" property="relativeOrder"/></property> <install bean="MainDeployer" method="addDeployer"> Modified: branches/tdiesler/trunk/integration/jbws-jboss50/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/integration/jbws-jboss50/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml 2007-05-15 05:13:16 UTC (rev 3095) @@ -3,7 +3,7 @@ <deployment xmlns="urn:jboss:bean-deployer:2.0">  - <bean name="WSServerConfig" class="org.jboss.ws.integration.jboss50.common.ManagedServerConfig"> + <bean name="WSServerConfig" class="org.jboss.ws.integration.jboss50.ManagedServerConfig">  - <bean name="WSDeployerHook_JAXRPC_JSE" class="org.jboss.ws.integration.jboss50.common.JAXRPCDeployerHookJSE"> + <bean name="WSDeployerHook_JAXRPC_JSE" class="org.jboss.ws.integration.jboss50.JAXRPCDeployerHookJSE"> <property name="deployerManager"><inject bean="WSDeployerManagerJSE"/></property> <install bean="WebServiceDeployerJSE" method="addDeployerHook"> <parameter> @@ -181,7 +181,7 @@ </uninstall> <depends>WebServiceDeployerJSE</depends> </bean> - <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.ws.integration.jboss50.common.JAXRPCDeployerHookEJB21"> + <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.ws.integration.jboss50.JAXRPCDeployerHookEJB21"> <property name="deployerManager"><inject bean="WSDeployerManagerEJB"/></property> <install bean="WebServiceDeployerEJB" method="addDeployerHook"> <parameter> @@ -195,7 +195,7 @@ </uninstall> <depends>WebServiceDeployerEJB</depends> </bean> - <bean name="WSDeployerHook_JAXWS_JSE" class="org.jboss.ws.integration.jboss50.common.JAXWSDeployerHookJSE"> + <bean name="WSDeployerHook_JAXWS_JSE" class="org.jboss.ws.integration.jboss50.JAXWSDeployerHookJSE"> <property name="deployerManager"><inject bean="WSDeployerManagerJSE"/></property> <install bean="WebServiceDeployerJSE" method="addDeployerHook"> <parameter> @@ -209,7 +209,7 @@ </uninstall> <depends>WebServiceDeployerJSE</depends> </bean> - <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.ws.integration.jboss50.common.JAXWSDeployerHookEJB3"> + <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.ws.integration.jboss50.JAXWSDeployerHookEJB3"> <property name="deployerManager"><inject bean="WSDeployerManagerEJB"/></property> <install bean="WebServiceDeployerEJB" method="addDeployerHook"> <parameter> @@ -223,7 +223,7 @@ </uninstall> <depends>WebServiceDeployerEJB</depends> </bean> - <bean name="WSMainDeployerHook" class="org.jboss.ws.integration.jboss50.common.MainDeployerHook"> + <bean name="WSMainDeployerHook" class="org.jboss.ws.integration.jboss50.MainDeployerHook"> <property name="deployerManager"><inject bean="WSMainDeployerManager"/></property> <install bean="WebServiceMainDeployer" method="addDeployerHook"> <parameter> Modified: branches/tdiesler/trunk/integration/spi/.classpath =================================================================== --- branches/tdiesler/trunk/integration/spi/.classpath 2007-05-15 05:10:13 UTC (rev 3094) +++ branches/tdiesler/trunk/integration/spi/.classpath 2007-05-15 05:13:16 UTC (rev 3095) @@ -15,5 +15,6 @@ <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="lib" path="thirdparty/activation.jar"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Copied: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/core/utils/IOUtils.java (from rev 3086, branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/utils/IOUtils.java) =================================================================== --- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/core/utils/IOUtils.java (rev 0) +++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/core/utils/IOUtils.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -0,0 +1,142 @@ +/* + * 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.core.utils; + +// $Id$ + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.io.Reader; +import java.io.Writer; + +import javax.activation.DataHandler; +import javax.xml.ws.WebServiceException; + +import org.jboss.logging.Logger; +import org.jboss.ws.integration.management.ServerConfig; +import org.jboss.ws.integration.management.ServerConfigFactory; + +/** + * IO utilites + * + * @author Thomas.Diesler(a)jboss.org + */ +public final class IOUtils +{ + private static Logger log = Logger.getLogger(IOUtils.class); + + // Hide the constructor + private IOUtils() + { + } + + public static Writer getCharsetFileWriter(File file, String charset) throws IOException + { + return new OutputStreamWriter(new FileOutputStream(file), charset); + } + + /** Copy the input stream to the output stream + */ + public static void copyStream(OutputStream outs, InputStream ins) throws IOException + { + byte[] bytes = new byte[1024]; + int r = ins.read(bytes); + while (r > 0) + { + outs.write(bytes, 0, r); + r = ins.read(bytes); + } + } + + /** Copy the reader to the output stream + */ + public static void copyReader(OutputStream outs, Reader reader) throws IOException + { + OutputStreamWriter writer = new OutputStreamWriter(outs); + char[] bytes = new char[1024]; + int r = reader.read(bytes); + while (r > 0) + { + writer.write(bytes, 0, r); + r = reader.read(bytes); + } + } + + public static byte[] convertToBytes(DataHandler dh) + { + try + { + ByteArrayOutputStream buffOS= new ByteArrayOutputStream(); + dh.writeTo(buffOS); + return buffOS.toByteArray(); + } + catch (IOException e) + { + throw new WebServiceException("Unable to convert DataHandler to byte[]: " + e.getMessage()); + } + } + + /** + * Transform a Reader to an InputStream + * Background is that DocumentBuilder.parse() cannot take the Reader directly + */ + public static InputStream transformReader(Reader reader) throws IOException + { + int capacity = 1024; + char[] charBuffer = new char[capacity]; + StringBuffer strBuffer = new StringBuffer(capacity); + + int len = reader.read(charBuffer, 0, capacity); + while (len > 0) + { + strBuffer.append(charBuffer, 0, len); + len = reader.read(charBuffer, 0, capacity); + } + return new ByteArrayInputStream(strBuffer.toString().getBytes()); + } + + public static File createTempDirectory() throws IOException + { + File tmpdir = null; + + try + { + ServerConfigFactory factory = ServerConfigFactory.getInstance(); + ServerConfig config = factory.getServerConfig(); + + tmpdir = new File(config.getServerTempDir().getCanonicalPath() + "/jbossws"); + tmpdir.mkdirs(); + } + catch (Throwable t) + { + // Use the Java temp directory if there is no server config (the client) + } + + return tmpdir; + } +} Added: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/SecurityRolesHandler.java =================================================================== --- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/SecurityRolesHandler.java (rev 0) +++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/SecurityRolesHandler.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -0,0 +1,10 @@ +package org.jboss.ws.integration.deployment; + +import org.w3c.dom.Element; + +public interface SecurityRolesHandler +{ + /** Add the roles from ejb-jar.xml to the security roles + */ + void addSecurityRoles(Element webApp, UnifiedDeploymentInfo udi); +} Property changes on: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/SecurityRolesHandler.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/ServiceEndpointPublisher.java (from rev 3086, branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/deployment/ServiceEndpointPublisher.java) =================================================================== --- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/ServiceEndpointPublisher.java (rev 0) +++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/ServiceEndpointPublisher.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -0,0 +1,262 @@ +/* + * 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.deployment; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.InputStream; +import java.net.URL; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +import javax.xml.ws.WebServiceException; + +import org.jboss.logging.Logger; +import org.jboss.ws.core.utils.DOMWriter; +import org.jboss.ws.core.utils.IOUtils; +import org.jboss.ws.integration.Endpoint; +import org.jboss.ws.utils.DOMUtils; +import org.w3c.dom.Element; + +/** + * The publisher for web service endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 12-May-2006 + */ +public class ServiceEndpointPublisher +{ + // logging support + private static Logger log = Logger.getLogger(ServiceEndpointPublisher.class); + + // The configured service endpoint servlet + private String servletClass; + + // The results of the URL rewriting + public class RewriteResults + { + // The URL to the rewrittn web.xml + public URL webXML; + // Maps the servlet name to the target bean + public Map<String, String> sepTargetMap = new HashMap<String, String>(); + } + + public String getServletClass() + { + return servletClass; + } + + public void setServletClass(String servletClass) + { + this.servletClass = servletClass; + } + + public RewriteResults rewriteWebXml(UnifiedDeploymentInfo udi) + { + URL warURL = udi.webappURL; + File warFile = new File(warURL.getFile()); + if (warFile.isDirectory() == false) + throw new WebServiceException("Expected a war directory: " + warURL); + + File webXML = new File(warURL.getFile() + "/WEB-INF/web.xml"); + if (webXML.isFile() == false) + throw new WebServiceException("Cannot find web.xml: " + webXML); + + try + { + // After redeployment there might be a stale copy of the original web.xml.org, we delete it + File orgWebXML = new File(webXML.getCanonicalPath() + ".org"); + orgWebXML.delete(); + + // Rename the web.xml + if (webXML.renameTo(orgWebXML) == false) + throw new WebServiceException("Cannot rename web.xml: " + orgWebXML); + + FileInputStream stream = new FileInputStream(orgWebXML); + return rewriteWebXml(stream, webXML, udi.classLoader); + } + catch (RuntimeException rte) + { + throw rte; + } + catch (Exception e) + { + throw new WebServiceException(e); + } + } + + public RewriteResults rewriteWebXml(InputStream source, File dest, ClassLoader loader) throws Exception + { + if (dest == null) + { + dest = File.createTempFile("jbossws-alt-web", "xml", IOUtils.createTempDirectory()); + dest.deleteOnExit(); + } + + Element root = DOMUtils.parse(source); + RewriteResults results = modifyServletConfig(root, loader); + results.webXML = dest.toURL(); + + FileOutputStream fos = new FileOutputStream(dest); + new DOMWriter(fos).setPrettyprint(true).print(root); + fos.flush(); + fos.close(); + + return results; + } + + private RewriteResults modifyServletConfig(Element root, ClassLoader loader) throws ClassNotFoundException + { + RewriteResults results = new RewriteResults(); + Iterator itServlets = DOMUtils.getChildElements(root, "servlet"); + while (itServlets.hasNext()) + { + Element servletElement = (Element)itServlets.next(); + String linkName = DOMUtils.getTextContent(DOMUtils.getFirstChildElement(servletElement, "servlet-name")); + + // find the servlet-class + Element classElement = DOMUtils.getFirstChildElement(servletElement, "servlet-class"); + + // JSP + if (classElement == null) + continue; + + String orgServletClassName = DOMUtils.getTextContent(classElement).trim(); + + // Get the servlet class + Class orgServletClass = null; + if (loader != null) + { + try + { + orgServletClass = loader.loadClass(orgServletClassName); + } + catch (ClassNotFoundException ex) + { + log.warn("Cannot load servlet class: " + orgServletClassName); + } + } + + String targetBeanName = null; + + // Nothing to do if we have an <init-param> + if (isAlreadyModified(servletElement)) + { + Iterator itParams = DOMUtils.getChildElements(servletElement, "init-param"); + while (itParams.hasNext()) + { + Element elParam = (Element)itParams.next(); + Element elParamName = DOMUtils.getFirstChildElement(elParam, "param-name"); + Element elParamValue = DOMUtils.getFirstChildElement(elParam, "param-value"); + if (Endpoint.SEPID_DOMAIN_ENDPOINT.equals(DOMUtils.getTextContent(elParamName))) + { + targetBeanName = DOMUtils.getTextContent(elParamValue); + } + } + } + else + { + // Check if it is a real servlet that we can ignore + if (orgServletClass != null && javax.servlet.Servlet.class.isAssignableFrom(orgServletClass)) + { + log.info("Ignore servlet: " + orgServletClassName); + continue; + } + else if (orgServletClassName.endsWith("Servlet")) + { + log.info("Ignore <servlet-class> that ends with 'Servlet': " + orgServletClassName); + continue; + } + + // build a list of detached elements that come after <servlet-class> + boolean startDetach = false; + List<Element> detachedElements = new ArrayList<Element>(); + Iterator itDetached = DOMUtils.getChildElements(servletElement); + while (itDetached.hasNext()) + { + Element el = (Element)itDetached.next(); + if (startDetach == true) + { + detachedElements.add(el); + servletElement.removeChild(el); + } + if (el.equals(classElement)) + { + servletElement.removeChild(el); + startDetach = true; + } + } + + // replace the class name + classElement = (Element)DOMUtils.createElement("servlet-class"); + classElement.appendChild(DOMUtils.createTextNode(servletClass)); + classElement = (Element)servletElement.getOwnerDocument().importNode(classElement, true); + servletElement.appendChild(classElement); + + // add additional init params + if (orgServletClassName.equals(servletClass) == false) + { + Element paramElement = DOMUtils.createElement("init-param"); + paramElement.appendChild(DOMUtils.createElement("param-name")).appendChild(DOMUtils.createTextNode(Endpoint.SEPID_DOMAIN_ENDPOINT)); + paramElement.appendChild(DOMUtils.createElement("param-value")).appendChild(DOMUtils.createTextNode(orgServletClassName)); + paramElement = (Element)servletElement.getOwnerDocument().importNode(paramElement, true); + servletElement.appendChild(paramElement); + targetBeanName = orgServletClassName; + } + + // reattach the elements + itDetached = detachedElements.iterator(); + while (itDetached.hasNext()) + { + Element el = (Element)itDetached.next(); + servletElement.appendChild(el); + } + } + + if (targetBeanName == null) + throw new IllegalStateException("Cannot obtain service endpoint bean for: " + linkName); + + // remember the target bean name + results.sepTargetMap.put(linkName, targetBeanName.trim()); + } + + return results; + } + + // Return true if the web.xml is already modified + private boolean isAlreadyModified(Element servletElement) + { + Iterator itParams = DOMUtils.getChildElements(servletElement, "init-param"); + while (itParams.hasNext()) + { + Element elParam = (Element)itParams.next(); + Element elParamName = DOMUtils.getFirstChildElement(elParam, "param-name"); + if (Endpoint.SEPID_DOMAIN_ENDPOINT.equals(DOMUtils.getTextContent(elParamName))) + return true; + } + return false; + } +} \ No newline at end of file Copied: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/invocation/SecurityAssociationAdaptor.java (from rev 3086, branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/extensions/security/SecurityAssociationAdaptor.java) =================================================================== --- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/invocation/SecurityAssociationAdaptor.java (rev 0) +++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/invocation/SecurityAssociationAdaptor.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -0,0 +1,38 @@ +/* +* 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.invocation; + +// $Id$ + +import java.security.Principal; + +/** + * A container idependent security adaptor + * + * @author Thomas.Diesler(a)jboss.org + * @since 10-May-2005 + */ +public interface SecurityAssociationAdaptor +{ + void setPrincipal(Principal pricipal); + void setCredential(Object credential); +} Copied: branches/tdiesler/trunk/integration/sunri-jboss50 (from rev 3086, branches/tdiesler/trunk/integration/sunri) Deleted: branches/tdiesler/trunk/integration/sunri-jboss50/.classpath =================================================================== --- branches/tdiesler/trunk/integration/sunri/.classpath 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/integration/sunri-jboss50/.classpath 2007-05-15 05:13:16 UTC (rev 3095) @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <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-spi"/> - <classpathentry kind="lib" path="thirdparty/jaxws-api.jar"/> - <classpathentry kind="lib" path="thirdparty/jsr181-api.jar"/> - <classpathentry kind="lib" path="thirdparty/FastInfoset.jar"/> - <classpathentry kind="lib" path="thirdparty/http.jar"/> - <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/jaxws-rt.jar" sourcepath="thirdparty/jaxws-ri-src.jar"/> - <classpathentry kind="lib" path="thirdparty/jaxws-tools.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-common-core-sources.jar"/> - <classpathentry kind="lib" path="thirdparty/jsr173_api.jar"/> - <classpathentry kind="lib" path="thirdparty/jsr250-api.jar"/> - <classpathentry kind="lib" path="thirdparty/saaj-api.jar"/> - <classpathentry kind="lib" path="thirdparty/saaj-impl.jar"/> - <classpathentry kind="lib" path="thirdparty/sjsxp.jar"/> - <classpathentry kind="lib" path="thirdparty/stax-ex.jar"/> - <classpathentry kind="lib" path="thirdparty/streambuffer.jar"/> - <classpathentry kind="output" path="output-eclipse"/> -</classpath> Copied: branches/tdiesler/trunk/integration/sunri-jboss50/.classpath (from rev 3093, branches/tdiesler/trunk/integration/sunri/.classpath) =================================================================== --- branches/tdiesler/trunk/integration/sunri-jboss50/.classpath (rev 0) +++ branches/tdiesler/trunk/integration/sunri-jboss50/.classpath 2007-05-15 05:13:16 UTC (rev 3095) @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <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/jaxws-api.jar"/> + <classpathentry kind="lib" path="thirdparty/jsr181-api.jar"/> + <classpathentry kind="lib" path="thirdparty/FastInfoset.jar"/> + <classpathentry kind="lib" path="thirdparty/http.jar"/> + <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/jaxws-rt.jar" sourcepath="thirdparty/jaxws-ri-src.jar"/> + <classpathentry kind="lib" path="thirdparty/jaxws-tools.jar"/> + <classpathentry kind="lib" path="thirdparty/jsr173_api.jar"/> + <classpathentry kind="lib" path="thirdparty/jsr250-api.jar"/> + <classpathentry kind="lib" path="thirdparty/saaj-api.jar"/> + <classpathentry kind="lib" path="thirdparty/saaj-impl.jar"/> + <classpathentry kind="lib" path="thirdparty/sjsxp.jar"/> + <classpathentry kind="lib" path="thirdparty/stax-ex.jar"/> + <classpathentry kind="lib" path="thirdparty/streambuffer.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/spi"/> + <classpathentry kind="lib" path="thirdparty/servlet-api.jar"/> + <classpathentry kind="output" path="output-eclipse"/> +</classpath> Deleted: branches/tdiesler/trunk/integration/sunri-jboss50/.project =================================================================== --- branches/tdiesler/trunk/integration/sunri/.project 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/integration/sunri-jboss50/.project 2007-05-15 05:13:16 UTC (rev 3095) @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>sunri-jboss50</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> Copied: branches/tdiesler/trunk/integration/sunri-jboss50/.project (from rev 3093, branches/tdiesler/trunk/integration/sunri/.project) =================================================================== --- branches/tdiesler/trunk/integration/sunri-jboss50/.project (rev 0) +++ branches/tdiesler/trunk/integration/sunri-jboss50/.project 2007-05-15 05:13:16 UTC (rev 3095) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>sunri-jboss50</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Deleted: branches/tdiesler/trunk/integration/sunri-jboss50/IntegrationIssues.txt =================================================================== --- branches/tdiesler/trunk/integration/sunri/IntegrationIssues.txt 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/integration/sunri-jboss50/IntegrationIssues.txt 2007-05-15 05:13:16 UTC (rev 3095) @@ -1,11 +0,0 @@ -# $Id$ - -* WSServletContextListener is final and loads sun-jaxws.xml from context classloader. -We need to provide sun-jaxws.xml dynamically. - -* WSServletException is package protected - -* WSServlet is final - -* WSServletDelegate is final - Copied: branches/tdiesler/trunk/integration/sunri-jboss50/IntegrationIssues.txt (from rev 3093, branches/tdiesler/trunk/integration/sunri/IntegrationIssues.txt) =================================================================== --- branches/tdiesler/trunk/integration/sunri-jboss50/IntegrationIssues.txt (rev 0) +++ branches/tdiesler/trunk/integration/sunri-jboss50/IntegrationIssues.txt 2007-05-15 05:13:16 UTC (rev 3095) @@ -0,0 +1,11 @@ +# $Id$ + +* WSServletContextListener is final and loads sun-jaxws.xml from context classloader. +We need to provide sun-jaxws.xml dynamically. + +* WSServletException is package protected + +* WSServlet is final + +* WSServletDelegate is final + Copied: branches/tdiesler/trunk/integration/sunri-jboss50/ant-import (from rev 3093, branches/tdiesler/trunk/integration/sunri/ant-import) Modified: branches/tdiesler/trunk/integration/sunri-jboss50/ant-import/build-deploy.xml =================================================================== --- branches/tdiesler/trunk/integration/sunri/ant-import/build-deploy.xml 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/integration/sunri-jboss50/ant-import/build-deploy.xml 2007-05-15 05:13:16 UTC (rev 3095) @@ -18,8 +18,10 @@   - <target name="deploy" depends="sunri50-jars,remove-jbossws" description="Deploy jbossws"> + <target name="deploy" depends="jars,undeploy" description="Deploy jbossws"> + <ant antfile="${int.jbws50.dir}/build.xml" target="undeploy" inheritall="false"/> + <copy todir="${jboss50.home}/client" overwrite="true"> <fileset dir="${thirdparty.dir}"> <include name="jaxb-api.jar"/> @@ -38,36 +40,16 @@ <include name="jbossws-spi.jar"/> </fileset> </copy> - <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbosswsri.deployer"/> - <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbosswsri.deployer" src="${sunri50.output.lib.dir}/jbosswsri50-deployer.zip"/> - <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbosswsri.sar"/> - <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbosswsri.sar" src="${sunri50.output.lib.dir}/jbosswsri50.sar"/> - <copy file="${sunri50.output.lib.dir}/jbosswsri50-context.war" tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" overwrite="true"/> + <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> + <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="${sunri50.output.lib.dir}/jbossws-sunri50-deployer.zip"/> + <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> + <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src="${sunri50.output.lib.dir}/jbossws-sunri50.sar"/> + <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file="${sunri50.output.lib.dir}/jbossws-sunri50-context.war" overwrite="true"/> </target> -  - <target name="remove-jbossws" depends="prepare" description="Remove jbossws"> - - <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> - - <delete> - <fileset dir="${jboss50.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="${jboss50.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="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> - <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <delete file="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war"/> +  + <target name="undeploy" depends="prepare" description="Remove jbossws/sunri"> + <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> </target> </project> Modified: branches/tdiesler/trunk/integration/sunri-jboss50/ant-import/build-release.xml =================================================================== --- branches/tdiesler/trunk/integration/sunri/ant-import/build-release.xml 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/integration/sunri-jboss50/ant-import/build-release.xml 2007-05-15 05:13:16 UTC (rev 3095) @@ -14,7 +14,7 @@ <project>  - <target name="release" depends="sunri50-jars" + <target name="release" depends="jars" description="Release to jboss.local.repository"> Modified: branches/tdiesler/trunk/integration/sunri-jboss50/ant-import/build-testsuite.xml =================================================================== --- branches/tdiesler/trunk/integration/sunri/ant-import/build-testsuite.xml 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/integration/sunri-jboss50/ant-import/build-testsuite.xml 2007-05-15 05:13:16 UTC (rev 3095) @@ -10,10 +10,11 @@ <project> - <property name="tests.dir" value="${basedir}/src/test"/> + <property name="tests.dir" value="${int.sunri50.dir}/src/test"/> + <property name="tests.output.dir" value="${int.sunri50.dir}/output-tests"/> <property name="jboss.home" value="${jboss50.home}"/> - <property name="excludesfile" value="${basedir}/src/test/resources/excludes.txt"/> + <property name="excludesfile" value="${int.sunri50.dir}/src/test/resources/excludes.txt"/> <import file="${build.dir}/ant-import/build-testsuite.xml"/> @@ -24,10 +25,9 @@  - <target name="tests-init" depends="tests-prepare,spi-thirdparty,thirdparty"> + <target name="tests-init" depends="tests-prepare,thirdparty"> <path id="sunri.classpath"> - <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> <pathelement location="${thirdparty.dir}/FastInfoset.jar"/> <pathelement location="${thirdparty.dir}/http.jar"/> <pathelement location="${thirdparty.dir}/jaxws-api.jar"/> @@ -47,13 +47,15 @@  <path id="javac.classpath"> <path refid="sunri.classpath"/> - <path refid="spi.thirdparty.classpath"/> + <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> + <pathelement location="${jboss.client}/jboss-common-core.jar"/> + <pathelement location="${jboss.client}/jboss-logging-spi.jar"/> + <pathelement location="${jboss.server.lib}/jboss-javaee.jar"/> </path>  <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"/> @@ -69,9 +71,7 @@   - <target name="tests-compile" depends="tests-compile15" description="Compile sources"/> - - <target name="tests-compile15" depends="tests-init" if="HAVE_JDK_1.5"> + <target name="tests-compile" depends="tests-init" description="Compile sources"> <mkdir dir="${tests.output.dir}/classes"/> <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}"> @@ -88,11 +88,13 @@  <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"/> + <copy-test-resources srcdir="${int.sunri50.dir}/src/test"/> </target> - <target name="tests-main" depends="tests-compile,tests-copy-resources" description="Build the deployments."> + <target name="tests-jars" 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> + <target name="tests-main" depends="tests-jars" description="Build the deployments."/> + </project> Modified: branches/tdiesler/trunk/integration/sunri-jboss50/ant-import/build-thirdparty.xml =================================================================== --- branches/tdiesler/trunk/integration/sunri/ant-import/build-thirdparty.xml 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/integration/sunri-jboss50/ant-import/build-thirdparty.xml 2007-05-15 05:13:16 UTC (rev 3095) @@ -13,7 +13,7 @@ <project> - <property file="${basedir}/version.properties"/> + <property file="${int.sunri50.dir}/version.properties"/>   @@ -23,8 +23,8 @@ </target> <target name="thirdparty-init" depends="prepare"> - <property name="thirdparty.dir" value="${basedir}/thirdparty"/> - <checksum file="${basedir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/> + <property name="thirdparty.dir" value="${int.sunri50.dir}/thirdparty"/> + <checksum file="${int.sunri50.dir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/> <condition property="force.thirdparty.get"> <or> <not> @@ -42,21 +42,7 @@ description="Gets the thirdparty libraries"> <mkdir dir="${thirdparty.dir}"/> - <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/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-dependency-src.zip" dest="${thirdparty.dir}/jboss-dependency-src.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers.jar" dest="${thirdparty.dir}/jboss-deployers.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers-src.zip" dest="${thirdparty.dir}/jboss-deployers-src.zip" 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}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer-src.zip" dest="${thirdparty.dir}/jboss-microcontainer-src.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/security-spi/${jboss-security-spi}/lib/jboss-security-spi.jar" dest="${thirdparty.dir}/jboss-security-spi.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"/> @@ -77,23 +63,28 @@ <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-ri-src.jar" dest="${thirdparty.dir}/jaxws-ri-src.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"/> - <checksum file="${basedir}/version.properties" fileext=".md5"/> + <checksum file="${int.sunri50.dir}/version.properties" fileext=".md5"/> </target> - <target name="thirdparty-classpath" depends="thirdparty-init,spi-jars"> + <target name="thirdparty-classpath" depends="thirdparty-init">  <path id="sunri50.integration.classpath"> - <path refid="spi.thirdparty.classpath"/> <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> <pathelement location="${jboss50.lib}/jboss-aop-jdk50.jar"/> + <pathelement location="${jboss50.lib}/jboss-common-core.jar"/> + <pathelement location="${jboss50.lib}/jboss-dependency.jar"/> <pathelement location="${jboss50.lib}/jboss-deployers.jar"/> <pathelement location="${jboss50.lib}/jboss-j2se.jar"/> + <pathelement location="${jboss50.lib}/jboss-logging-spi.jar"/> + <pathelement location="${jboss50.lib}/jboss-microcontainer.jar"/> <pathelement location="${jboss50.lib}/jboss-system.jar"/> <pathelement location="${jboss50.lib}/jboss-system-jmx.jar"/> <pathelement location="${jboss50.lib}/jboss-vfs.jar"/> + <pathelement location="${jboss50.lib}/jboss-xml-binding.jar"/> <pathelement location="${jboss50.server.lib}/jboss.jar"/> <pathelement location="${jboss50.server.lib}/jboss-javaee.jar"/> + <pathelement location="${jboss50.server.lib}/jboss-security-spi.jar"/> <pathelement location="${jboss50.server.lib}/jnpserver.jar"/> <pathelement location="${jboss50.server.deployers}/jboss-aop-jboss5.deployer/jboss-aspect-library-jdk50.jar"/> <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-annotations-ejb3.jar"/> @@ -105,12 +96,6 @@ <pathelement location="${thirdparty.dir}/jaxb-xjc.jar"/> <pathelement location="${thirdparty.dir}/jaxws-api.jar"/> <pathelement location="${thirdparty.dir}/jaxws-rt.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-security-spi.jar"/> - <pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/> <pathelement location="${thirdparty.dir}/jsr181-api.jar"/> <pathelement location="${thirdparty.dir}/servlet-api.jar"/> </path> Deleted: branches/tdiesler/trunk/integration/sunri-jboss50/build.xml =================================================================== --- branches/tdiesler/trunk/integration/sunri/build.xml 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/integration/sunri-jboss50/build.xml 2007-05-15 05:13:16 UTC (rev 3095) @@ -1,191 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - - - - -<project default="main" basedir="../sunri-jboss50" name="JBossWS-SunRI-JBoss50"> - - <import file="${basedir}/../build/ant-import/build-setup.xml"/> - - <import file="${basedir}/ant-import/build-deploy.xml"/> - <import file="${basedir}/ant-import/build-release.xml"/> - <import file="${basedir}/ant-import/build-testsuite.xml"/> - <import file="${basedir}/ant-import/build-thirdparty.xml"/> - - <import file="${spi.dir}/build.xml"/> - -  -  -  - - <property name="sunri50.dir" value="${basedir}"/> - <property name="sunri50.src.dir" value="${sunri50.dir}/src/main"/> - <property name="sunri50.etc.dir" value="${sunri50.src.dir}/etc"/> - <property name="sunri50.java.dir" value="${sunri50.src.dir}/java"/> - <property name="sunri50.resources.dir" value="${sunri50.src.dir}/resources"/> - <property name="sunri50.output.dir" value="${sunri50.dir}/output"/> - <property name="sunri50.output.classes.dir" value="${sunri50.output.dir}/classes"/> - <property name="sunri50.output.etc.dir" value="${sunri50.output.dir}/etc"/> - <property name="sunri50.output.lib.dir" value="${sunri50.output.dir}/lib"/> - -  -  -  - - <target name="sunri50-init" depends="prepare,thirdparty"> - <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> - </target> - -  -  -  - -  - - <target name="sunri50-compile" depends="sunri50-init,spi-compile,sunri50-compile-classes,sunri50-compile-etc" description="Compile all source files."/> - -  - <target name="sunri50-compile-classes" depends="sunri50-init"> - <mkdir dir="${sunri50.output.classes.dir}"/> - <javac srcdir="${sunri50.java.dir}" sourcepath="" destdir="${sunri50.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="sunri50.integration.classpath"/> - </javac> - </target> - -  - <target name="sunri50-compile-etc" depends="sunri50-init"> - <mkdir dir="${sunri50.output.etc.dir}"/> - <copy todir="${sunri50.output.etc.dir}" filtering="yes" overwrite="yes"> - <fileset dir="${sunri50.etc.dir}"> - <include name="component-info.xml"/> - </fileset> - <fileset dir="${build.dir}/etc"> - <include name="default.mf"/> - </fileset> - <filterset> - <filter token="java.vm.version" value="${java.vm.version}"/> - <filter token="java.vm.vendor" value="${java.vm.vendor}"/> - <filter token="build.id" value="${build.id}"/> - <filter token="implementation.version" value="jbossws-sunri-${version.id}"/> - <filtersfile file="${build.dir}/version.properties"/> - <filtersfile file="${basedir}/version.properties"/> - </filterset> - </copy> - </target> - -  -  -  - -  - <target name="sunri50-jars" depends="sunri50-compile,spi-jars,sunri50-module-jars" description="Builds all jar files."> - </target> - -  - <target name="sunri50-module-jars" depends="sunri50-init"> - -  - <mkdir dir="${sunri50.output.lib.dir}"/> - <jar jarfile="${sunri50.output.lib.dir}/jbosswsri50.jar" manifest="${sunri50.output.etc.dir}/default.mf"> - <fileset dir="${sunri50.output.classes.dir}"> - <include name="org/jboss/ws/integration/jboss50/**"/> - </fileset> - </jar> - -  - <war warfile="${sunri50.output.lib.dir}/jbosswsri50-context.war" webxml="${sunri50.resources.dir}/jbossws-context.war/WEB-INF/web.xml"> - <fileset dir="${sunri50.resources.dir}/jbossws-context.war"> - <include name="index.html"/> - <include name="styles.css"/> - </fileset> - <webinf dir="${sunri50.resources.dir}/jbossws-context.war/WEB-INF"> - <include name="jboss-web.xml"/> - </webinf> - </war> - -  - <jar jarfile="${sunri50.output.lib.dir}/jbosswsri50.sar" manifest="${sunri50.output.etc.dir}/default.mf"> -  - <fileset dir="${thirdparty.dir}"> - <include name="FastInfoset.jar"/> - <include name="http.jar"/> - <include name="jaxws-api.jar"/> - <include name="jaxws-rt.jar"/> - <include name="jaxws-tools.jar"/> - <include name="jsr173_api.jar"/> - <include name="jsr181-api.jar"/> - <include name="jsr250-api.jar"/> - <include name="resolver.jar"/> - <include name="saaj-api.jar"/> - <include name="saaj-impl.jar"/> - <include name="sjsxp.jar"/> - <include name="stax-ex.jar"/> - <include name="streambuffer.jar"/> - </fileset> - <metainf dir="${sunri50.resources.dir}/jbossws.sar/META-INF"> - <include name="jbossws-beans.xml"/> - </metainf> - </jar> - -  - <zip zipfile="${sunri50.output.lib.dir}/jbosswsri50-deployer.zip"> - <fileset dir="${sunri50.output.lib.dir}"> - <include name="jbosswsri50.jar"/> - </fileset> - <fileset dir="${sunri50.resources.dir}/jbossws.deployer"> - <include name="META-INF/jbossws-deployer-beans.xml"/> - </fileset> - </zip> - -  - <zip zipfile="${sunri50.output.lib.dir}/jbosswsri50-src.zip" > - <fileset dir="${sunri50.java.dir}"/> - </zip> - - </target> - -  -  -  - - <target name="clean" depends="prepare" description="Cleans up most generated files."> - <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,tests-main"/> - - <target name="all" description="Create a distribution zip file" depends="main"> - </target> - -</project> Copied: branches/tdiesler/trunk/integration/sunri-jboss50/build.xml (from rev 3093, branches/tdiesler/trunk/integration/sunri/build.xml) =================================================================== --- branches/tdiesler/trunk/integration/sunri-jboss50/build.xml (rev 0) +++ branches/tdiesler/trunk/integration/sunri-jboss50/build.xml 2007-05-15 05:13:16 UTC (rev 3095) @@ -0,0 +1,193 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project default="main" basedir="../.." name="JBossWS-SunRI-JBoss50"> + + <import file="${basedir}/build/ant-import/build-setup.xml"/> + + <import file="${int.sunri50.dir}/ant-import/build-deploy.xml"/> + <import file="${int.sunri50.dir}/ant-import/build-release.xml"/> + <import file="${int.sunri50.dir}/ant-import/build-testsuite.xml"/> + <import file="${int.sunri50.dir}/ant-import/build-thirdparty.xml"/> + +  +  +  + + <property name="sunri50.dir" value="${int.sunri50.dir}"/> + <property name="sunri50.src.dir" value="${sunri50.dir}/src/main"/> + <property name="sunri50.etc.dir" value="${sunri50.src.dir}/etc"/> + <property name="sunri50.java.dir" value="${sunri50.src.dir}/java"/> + <property name="sunri50.resources.dir" value="${sunri50.src.dir}/resources"/> + <property name="sunri50.output.dir" value="${sunri50.dir}/output"/> + <property name="sunri50.output.classes.dir" value="${sunri50.output.dir}/classes"/> + <property name="sunri50.output.etc.dir" value="${sunri50.output.dir}/etc"/> + <property name="sunri50.output.lib.dir" value="${sunri50.output.dir}/lib"/> + +  +  +  + + <target name="init" depends="prepare,thirdparty"> + <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> + <ant antfile="${int.jboss50.dir}/build.xml" target="main" inheritall="false"/> + </target> + +  +  +  + +  + + <target name="compile" depends="init,compile-classes,compile-etc" description="Compile all source files."/> + +  + <target name="compile-classes" depends="init"> + <mkdir dir="${sunri50.output.classes.dir}"/> + <javac srcdir="${sunri50.java.dir}" sourcepath="" destdir="${sunri50.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="sunri50.integration.classpath"/> + </javac> + </target> + +  + <target name="compile-etc" depends="init"> + <mkdir dir="${sunri50.output.etc.dir}"/> + <copy todir="${sunri50.output.etc.dir}" filtering="yes" overwrite="yes"> + <fileset dir="${sunri50.etc.dir}"> + <include name="component-info.xml"/> + </fileset> + <fileset dir="${build.dir}/etc"> + <include name="default.mf"/> + </fileset> + <filterset> + <filter token="java.vm.version" value="${java.vm.version}"/> + <filter token="java.vm.vendor" value="${java.vm.vendor}"/> + <filter token="build.id" value="${build.id}"/> + <filter token="implementation.version" value="jbossws-sunri-${version.id}"/> + <filtersfile file="${build.dir}/version.properties"/> + <filtersfile file="${int.sunri50.dir}/version.properties"/> + </filterset> + </copy> + </target> + +  +  +  + +  + <target name="jars" depends="compile,module-jars" description="Builds all jar files."> + </target> + +  + <target name="module-jars" depends="init"> + +  + <mkdir dir="${sunri50.output.lib.dir}"/> + <jar jarfile="${sunri50.output.lib.dir}/jbossws-sunri50.jar" manifest="${sunri50.output.etc.dir}/default.mf"> + <fileset dir="${sunri50.output.classes.dir}"> + <include name="org/jboss/ws/integration/jboss50/**"/> + </fileset> + </jar> + +  + <war warfile="${sunri50.output.lib.dir}/jbossws-sunri50-context.war" webxml="${sunri50.resources.dir}/jbossws-context.war/WEB-INF/web.xml"> + <fileset dir="${sunri50.resources.dir}/jbossws-context.war"> + <include name="index.html"/> + <include name="styles.css"/> + </fileset> + <webinf dir="${sunri50.resources.dir}/jbossws-context.war/WEB-INF"> + <include name="jboss-web.xml"/> + </webinf> + </war> + +  + <jar jarfile="${sunri50.output.lib.dir}/jbossws-sunri50.sar" manifest="${sunri50.output.etc.dir}/default.mf"> +  + <fileset dir="${thirdparty.dir}"> + <include name="FastInfoset.jar"/> + <include name="http.jar"/> + <include name="jaxws-api.jar"/> + <include name="jaxws-rt.jar"/> + <include name="jaxws-tools.jar"/> + <include name="jsr173_api.jar"/> + <include name="jsr181-api.jar"/> + <include name="jsr250-api.jar"/> + <include name="resolver.jar"/> + <include name="saaj-api.jar"/> + <include name="saaj-impl.jar"/> + <include name="sjsxp.jar"/> + <include name="stax-ex.jar"/> + <include name="streambuffer.jar"/> + </fileset> + <metainf dir="${sunri50.resources.dir}/jbossws.sar/META-INF"> + <include name="jbossws-beans.xml"/> + </metainf> + </jar> + +  + <zip zipfile="${sunri50.output.lib.dir}/jbossws-sunri50-deployer.zip"> + <fileset dir="${int.jboss50.dir}/output/lib"> + <include name="jbossws-jboss50.jar"/> + </fileset> + <fileset dir="${sunri50.output.lib.dir}"> + <include name="jbossws-sunri50.jar"/> + </fileset> + <fileset dir="${sunri50.resources.dir}/jbossws.deployer"> + <include name="META-INF/jbossws-deployer-beans.xml"/> + </fileset> + </zip> + +  + <zip zipfile="${sunri50.output.lib.dir}/jbossws-sunri50-src.zip" > + <fileset dir="${sunri50.java.dir}"/> + </zip> + + </target> + +  +  +  + + <target name="clean" depends="prepare" description="Cleans up most generated files."> + <delete dir="${sunri50.output.dir}"/> + </target> + + <target name="clobber" depends="clean" description="Cleans up all generated files."> + <delete dir="${int.sunri50.dir}/output-tests"/> + <delete dir="${int.sunri50.dir}/thirdparty"/> + </target> + + <target name="main" description="Executes the default target (most)." depends="most"/> + + <target name="most" description="Builds almost everything." depends="jars"/> + + <target name="all" description="Create a distribution zip file" depends="most,tests-main"> + </target> + +</project> Copied: branches/tdiesler/trunk/integration/sunri-jboss50/src (from rev 3093, branches/tdiesler/trunk/integration/sunri/src) Modified: branches/tdiesler/trunk/integration/sunri-jboss50/src/main/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/integration/sunri-jboss50/src/main/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml 2007-05-15 05:13:16 UTC (rev 3095) @@ -5,7 +5,7 @@  - <bean name="WebServiceDeployerEJB" class="org.jboss.ws.integration.jboss50.common.WebServiceDeployerEJB"> + <bean name="WebServiceDeployerEJB" class="org.jboss.ws.integration.jboss50.WebServiceDeployerEJB"> <property name="relOrderEJB2x"><inject bean="EJB2xDeployer" property="relativeOrder"/></property> <property name="relOrderEJB3"><inject bean="EJBRegistrationDeployer" property="relativeOrder"/></property> <install bean="MainDeployer" method="addDeployer"> @@ -25,7 +25,7 @@  - <bean name="WebServiceDeployerJSE" class="org.jboss.ws.integration.jboss50.common.WebServiceDeployerJSE"> + <bean name="WebServiceDeployerJSE" class="org.jboss.ws.integration.jboss50.WebServiceDeployerJSE"> <property name="relOrderWar"><inject bean="WarDeployer" property="relativeOrder"/></property> <install bean="MainDeployer" method="addDeployer"> <parameter> @@ -43,7 +43,7 @@  - <bean name="WebServiceMainDeployer" class="org.jboss.ws.integration.jboss50.common.WebServiceMainDeployer"> + <bean name="WebServiceMainDeployer" class="org.jboss.ws.integration.jboss50.WebServiceMainDeployer"> <property name="relOrderJSE"><inject bean="WebServiceDeployerJSE" property="relativeOrder"/></property> <property name="relOrderEJB"><inject bean="WebServiceDeployerEJB" property="relativeOrder"/></property> <install bean="MainDeployer" method="addDeployer"> Modified: branches/tdiesler/trunk/integration/sunri-jboss50/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/integration/sunri-jboss50/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml 2007-05-15 05:13:16 UTC (rev 3095) @@ -3,7 +3,7 @@ <deployment xmlns="urn:jboss:bean-deployer:2.0">  - <bean name="WSServerConfig" class="org.jboss.ws.integration.jboss50.common.ManagedServerConfig"> + <bean name="WSServerConfig" class="org.jboss.ws.integration.jboss50.ManagedServerConfig">  - <bean name="WSDeployerHook_JAXRPC_JSE" class="org.jboss.ws.integration.jboss50.common.JAXRPCDeployerHookJSE"> + <bean name="WSDeployerHook_JAXRPC_JSE" class="org.jboss.ws.integration.jboss50.JAXRPCDeployerHookJSE"> <property name="deployerManager"><inject bean="WSDeployerManagerJSE"/></property> <install bean="WebServiceDeployerJSE" method="addDeployerHook"> <parameter> @@ -152,7 +152,7 @@ </uninstall> <depends>WebServiceDeployerJSE</depends> </bean> - <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.ws.integration.jboss50.common.JAXRPCDeployerHookEJB21"> + <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.ws.integration.jboss50.JAXRPCDeployerHookEJB21"> <property name="deployerManager"><inject bean="WSDeployerManagerEJB"/></property> <install bean="WebServiceDeployerEJB" method="addDeployerHook"> <parameter> @@ -166,7 +166,7 @@ </uninstall> <depends>WebServiceDeployerEJB</depends> </bean> - <bean name="WSDeployerHook_JAXWS_JSE" class="org.jboss.ws.integration.jboss50.common.JAXWSDeployerHookJSE"> + <bean name="WSDeployerHook_JAXWS_JSE" class="org.jboss.ws.integration.jboss50.JAXWSDeployerHookJSE"> <property name="deployerManager"><inject bean="WSDeployerManagerJSE"/></property> <install bean="WebServiceDeployerJSE" method="addDeployerHook"> <parameter> @@ -180,7 +180,7 @@ </uninstall> <depends>WebServiceDeployerJSE</depends> </bean> - <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.ws.integration.jboss50.common.JAXWSDeployerHookEJB3"> + <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.ws.integration.jboss50.JAXWSDeployerHookEJB3"> <property name="deployerManager"><inject bean="WSDeployerManagerEJB"/></property> <install bean="WebServiceDeployerEJB" method="addDeployerHook"> <parameter> @@ -194,7 +194,7 @@ </uninstall> <depends>WebServiceDeployerEJB</depends> </bean> - <bean name="WSMainDeployerHook" class="org.jboss.ws.integration.jboss50.common.MainDeployerHook"> + <bean name="WSMainDeployerHook" class="org.jboss.ws.integration.jboss50.MainDeployerHook"> <property name="deployerManager"><inject bean="WSMainDeployerManager"/></property> <install bean="WebServiceMainDeployer" method="addDeployerHook"> <parameter> Deleted: branches/tdiesler/trunk/integration/sunri-jboss50/version.properties =================================================================== --- branches/tdiesler/trunk/integration/sunri/version.properties 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/integration/sunri-jboss50/version.properties 2007-05-15 05:13:16 UTC (rev 3095) @@ -1,13 +0,0 @@ - -# $Id: version.properties 2928 2007-04-26 10:53:56Z thomas.diesler(a)jboss.com $ - -sunri.implementation.title=JBoss Web Services - JBossWS/SunRI - -# Thirdparty library versions -jboss-jaxr=1.2.0.GA -jboss-jbossws-spi=SNAPSHOT -jboss-security-spi=2.0.0.Beta -sun-jaxb=2.1.3 -sun-jaxws=2.1.1 -sun-servlet=2.5 - Copied: branches/tdiesler/trunk/integration/sunri-jboss50/version.properties (from rev 3093, branches/tdiesler/trunk/integration/sunri/version.properties) =================================================================== --- branches/tdiesler/trunk/integration/sunri-jboss50/version.properties (rev 0) +++ branches/tdiesler/trunk/integration/sunri-jboss50/version.properties 2007-05-15 05:13:16 UTC (rev 3095) @@ -0,0 +1,13 @@ + +# $Id: version.properties 2928 2007-04-26 10:53:56Z thomas.diesler(a)jboss.com $ + +sunri.implementation.title=JBoss Web Services - JBossWS/SunRI + +# Thirdparty library versions +jboss-jaxr=1.2.0.GA +jboss-jbossws-spi=SNAPSHOT +jboss-security-spi=2.0.0.Beta +sun-jaxb=2.1.3 +sun-jaxws=2.1.1 +sun-servlet=2.5 + Modified: branches/tdiesler/trunk/testsuite/.classpath =================================================================== --- branches/tdiesler/trunk/testsuite/.classpath 2007-05-15 05:10:13 UTC (rev 3094) +++ branches/tdiesler/trunk/testsuite/.classpath 2007-05-15 05:13:16 UTC (rev 3095) @@ -3,12 +3,11 @@ <classpathentry excluding="org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.java" kind="src" path="src/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 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 combineaccessrules="false" kind="src" path="/spi"/> + <classpathentry kind="lib" path="/spi/thirdparty/junit.jar"/> + <classpathentry kind="lib" path="/spi/thirdparty/jaxws-api.jar"/> + <classpathentry kind="lib" path="/spi/thirdparty/jboss-logging-spi.jar"/> + <classpathentry kind="lib" path="/spi/thirdparty/jsr181-api.jar"/> + <classpathentry kind="lib" path="/spi/thirdparty/servlet-api.jar"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: branches/tdiesler/trunk/testsuite/ant-import/build-testsuite.xml =================================================================== --- branches/tdiesler/trunk/testsuite/ant-import/build-testsuite.xml 2007-05-15 05:10:13 UTC (rev 3094) +++ branches/tdiesler/trunk/testsuite/ant-import/build-testsuite.xml 2007-05-15 05:13:16 UTC (rev 3095) @@ -1,9 +1,9 @@ <project> <property name="tests.dir" value="${testsuite.dir}/src"/> + <property name="tests.output.dir" value="${testsuite.dir}/output-tests"/> <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"/> Modified: branches/tdiesler/trunk/testsuite/build.xml =================================================================== --- branches/tdiesler/trunk/testsuite/build.xml 2007-05-15 05:10:13 UTC (rev 3094) +++ branches/tdiesler/trunk/testsuite/build.xml 2007-05-15 05:13:16 UTC (rev 3095) @@ -8,19 +8,18 @@  -<project default="main" basedir="../jbossws-tests" name="JBossWS-Tests"> +<project default="main" basedir=".." name="JBossWS-Tests"> - <import file="${basedir}/../build/ant-import/build-setup.xml"/> - <import file="${basedir}/ant-import/build-testsuite.xml"/> - <import file="${spi.dir}/build.xml"/> + <import file="${basedir}/build/ant-import/build-setup.xml"/> + <import file="${testsuite.dir}/ant-import/build-testsuite.xml"/>    <target name="clean" description="Delete all generated test files."> - <delete dir="${tests.output.dir}"/> + <delete dir="${testsuite.dir}/output-tests"/> </target> <target name="main" description="Builds almost everything." depends="tests-main"/> Modified: branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTestHelper.java =================================================================== --- branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTestHelper.java 2007-05-15 05:10:13 UTC (rev 3094) +++ branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTestHelper.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -135,7 +135,7 @@ { String username = System.getProperty("tomcat.manager.username"); String password = System.getProperty("tomcat.manager.password"); - return new TestDeployerTomcat(username, password); + return null; //new TestDeployerTomcat(username, password); } else { Deleted: branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/TestDeployerTomcat.java =================================================================== --- branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/TestDeployerTomcat.java 2007-05-15 05:10:13 UTC (rev 3094) +++ branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/TestDeployerTomcat.java 2007-05-15 05:13:16 UTC (rev 3095) @@ -1,129 +0,0 @@ -/* - * 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.test.ws; - -import java.io.BufferedReader; -import java.io.File; -import java.io.IOException; -import java.io.InputStreamReader; -import java.lang.reflect.Method; -import java.net.HttpURLConnection; -import java.net.MalformedURLException; -import java.net.ProtocolException; -import java.net.URL; -import java.util.HashMap; -import java.util.Map; - -import org.jboss.util.Base64; - -/** - * A deployer that deploys to Tomcat - * - * @author Thomas.Diesler(a)jboss.org - * @since 16-May-2006 - */ -public class TestDeployerTomcat implements TestDeployer -{ - private String username, password; - - // Map<String,String> of URL to context path - private static Map pathMap = new HashMap(); - - public TestDeployerTomcat(String username, String password) - { - this.username = username; - this.password = password; - } - - public void deploy(URL url) throws Exception - { - File destDir = new File(new File(url.getFile()).getParent() + "/wspublish"); - destDir.mkdirs(); - - // Use reflection to invoke wspublish.process() from the tomcat integration layer - ClassLoader loader = Thread.currentThread().getContextClassLoader(); - Class wspublishClass = loader.loadClass("org.jboss.ws.integration.tomcat.wspublish"); - Method process = wspublishClass.getMethod("process", new Class[]{URL.class, File.class, String.class}); - URL warURL = (URL)process.invoke(wspublishClass.newInstance(), new Object[]{url, destDir, null}); - - String path = warURL.toExternalForm(); - path = path.substring(path.lastIndexOf("/")); - if (path.endsWith(".war")) - path = path.substring(0, path.length() - 4); - - URL managerURL = new URL(getManagerPath() + "/deploy?path=" + path + "&war=" + warURL.toExternalForm()); - HttpURLConnection con = getURLConnection(managerURL); - - con.connect(); - - BufferedReader br = new BufferedReader(new InputStreamReader(con.getInputStream())); - String status = br.readLine(); - - if (status == null) - throw new IllegalStateException("Cannot obtain deploy status"); - - if (status.startsWith("OK") == false) - throw new IllegalStateException("Cannot deploy application: " + status); - - path = status.substring(status.indexOf("/")); - pathMap.put(url.toExternalForm(), path); - } - - public void undeploy(URL url) throws Exception - { - String path = (String) pathMap.get(url.toExternalForm()); - if (path != null) - { - URL managerURL = new URL(getManagerPath() + "/undeploy?path=" + path); - HttpURLConnection con = getURLConnection(managerURL); - - con.connect(); - - BufferedReader br = new BufferedReader(new InputStreamReader(con.getInputStream())); - String status = br.readLine(); - - if (status == null) - throw new IllegalStateException("Cannot obtain undeploy status"); - - if (status.startsWith("OK") == false) - throw new IllegalStateException("Cannot undeploy application: " + status); - } - } - - private String getManagerPath() throws MalformedURLException - { - String hostName = System.getProperty("jbosstest.server.host", "localhost"); - return "http://" + hostName + ":8080/manager"; - } - - private HttpURLConnection getURLConnection(URL managerURL) throws IOException, ProtocolException - { - HttpURLConnection con = (HttpURLConnection)managerURL.openConnection(); - con.setRequestMethod("GET"); - con.setDoInput(true); - - String authorization = username + ":" + password; - authorization = Base64.encodeBytes(authorization.getBytes()); - con.setRequestProperty("Authorization", "Basic " + authorization); - return con; - } -}

17 years, 1 month

1
0
0 / 0

JBossWS SVN: r3094 - in branches/tdiesler/trunk/jbossws: ant-import and 5 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-15 01:10:13 -0400 (Tue, 15 May 2007) New Revision: 3094 Added: branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/deployment/WebAppGeneratorDeployer.java Removed: branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/deployment/ServiceEndpointPublisher.java branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/utils/IOUtils.java branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/extensions/security/SecurityAssociationAdaptor.java branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/extensions/security/SecurityAssociationAdaptorFactory.java Modified: branches/tdiesler/trunk/jbossws/.classpath branches/tdiesler/trunk/jbossws/ant-import-tests/build-testsuite.xml branches/tdiesler/trunk/jbossws/ant-import/build-deploy.xml branches/tdiesler/trunk/jbossws/build.xml branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/server/ServiceEndpointGeneratorEJB.java branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/extensions/security/ReceiveUsernameOperation.java Log: restructure Modified: branches/tdiesler/trunk/jbossws/.classpath =================================================================== --- branches/tdiesler/trunk/jbossws/.classpath 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/jbossws/.classpath 2007-05-15 05:10:13 UTC (rev 3094) @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src/main/java"/> + <classpathentry excluding="org/jboss/test/ws/jaxrpc/samples/jmstransport/" kind="src" path="src/test/java"/> <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 kind="lib" path="thirdparty/ejb3.deployer/jboss-annotations-ejb3.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/spi"/> <classpathentry kind="lib" path="thirdparty/activation.jar"/> <classpathentry kind="lib" path="thirdparty/getopt.jar"/> <classpathentry kind="lib" path="thirdparty/javassist.jar"/> @@ -27,12 +27,11 @@ <classpathentry kind="lib" path="thirdparty/xalan.jar"/> <classpathentry kind="lib" path="thirdparty/xercesImpl.jar"/> <classpathentry kind="lib" path="thirdparty/xmlsec.jar"/> - <classpathentry kind="lib" path="thirdparty/qdox.jar"/> <classpathentry kind="lib" path="thirdparty/ant.jar"/> + <classpathentry kind="lib" path="thirdparty/qdox.jar"/> + <classpathentry kind="lib" path="thirdparty/xmlunit1.0.jar"/> + <classpathentry kind="lib" path="/spi/thirdparty/junit.jar"/> <classpathentry kind="lib" path="thirdparty/policy.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: branches/tdiesler/trunk/jbossws/ant-import/build-deploy.xml =================================================================== --- branches/tdiesler/trunk/jbossws/ant-import/build-deploy.xml 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/jbossws/ant-import/build-deploy.xml 2007-05-15 05:10:13 UTC (rev 3094) @@ -15,17 +15,12 @@  <target name="deploy-jboss50" depends="prepare" description="Deploy jbossws"> - <ant antfile="${jbws.jboss50.dir}/build.xml" target="deploy" inheritall="false"/> + <ant antfile="${int.jbws50.dir}/build.xml" target="deploy" inheritall="false"/> </target>  <target name="deploy-jboss42" depends="prepare" description="Deploy jbossws"> - <ant antfile="${jbws.jboss42.dir}/build.xml" target="deploy" inheritall="false"/> + <ant antfile="${int.jbws42.dir}/build.xml" target="deploy" inheritall="false"/> </target> -  - <target name="deploy-jboss40" depends="prepare" description="Deploy jbossws"> - <ant antfile="${jbws.jboss40.dir}/build.xml" target="deploy" inheritall="false"/> - </target> - </project> Modified: branches/tdiesler/trunk/jbossws/ant-import-tests/build-testsuite.xml =================================================================== --- branches/tdiesler/trunk/jbossws/ant-import-tests/build-testsuite.xml 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/jbossws/ant-import-tests/build-testsuite.xml 2007-05-15 05:10:13 UTC (rev 3094) @@ -11,6 +11,7 @@ <project> <property name="tests.dir" value="${core.dir}/src/test"/> + <property name="tests.output.dir" value="${core.dir}/output-tests"/> <import file="${build.dir}/ant-import/build-testsuite.xml"/> @@ -24,7 +25,7 @@  - <target name="tests-init" depends="tests-prepare,thirdparty-classpath"> + <target name="tests-init" depends="jars,tests-prepare"> <path id="jbossws.classpath"> <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> Modified: branches/tdiesler/trunk/jbossws/build.xml =================================================================== --- branches/tdiesler/trunk/jbossws/build.xml 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/jbossws/build.xml 2007-05-15 05:10:13 UTC (rev 3094) @@ -219,8 +219,8 @@ </target> <target name="clobber" depends="clean" description="Cleans up all generated files."> - <delete dir="${basedir}/output-tests"/> - <delete dir="${basedir}/thirdparty"/> + <delete dir="${core.dir}/output-tests"/> + <delete dir="${core.dir}/thirdparty"/> </target> <target name="main" description="Executes the default target (most)." depends="most"/> Deleted: branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/deployment/ServiceEndpointPublisher.java =================================================================== --- branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/deployment/ServiceEndpointPublisher.java 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/deployment/ServiceEndpointPublisher.java 2007-05-15 05:10:13 UTC (rev 3094) @@ -1,265 +0,0 @@ -/* - * 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.core.deployment; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.InputStream; -import java.net.URL; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import javax.servlet.Servlet; - -import org.jboss.logging.Logger; -import org.jboss.ws.WSException; -import org.jboss.ws.core.utils.DOMWriter; -import org.jboss.ws.core.utils.IOUtils; -import org.jboss.ws.core.utils.JavaUtils; -import org.jboss.ws.integration.Endpoint; -import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; -import org.jboss.ws.utils.DOMUtils; -import org.w3c.dom.Element; - -/** - * The publisher for web service endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 12-May-2006 - */ -public class ServiceEndpointPublisher -{ - // logging support - private static Logger log = Logger.getLogger(ServiceEndpointPublisher.class); - - // The configured service endpoint servlet - private String servletClass; - - // The results of the URL rewriting - public class RewriteResults - { - // The URL to the rewrittn web.xml - public URL webXML; - // Maps the servlet name to the target bean - public Map<String, String> sepTargetMap = new HashMap<String, String>(); - } - - public String getServletClass() - { - return servletClass; - } - - public void setServletClass(String servletClass) - { - this.servletClass = servletClass; - } - - public RewriteResults rewriteWebXml(UnifiedDeploymentInfo udi) - { - URL warURL = udi.webappURL; - File warFile = new File(warURL.getFile()); - if (warFile.isDirectory() == false) - throw new WSException("Expected a war directory: " + warURL); - - File webXML = new File(warURL.getFile() + "/WEB-INF/web.xml"); - if (webXML.isFile() == false) - throw new WSException("Cannot find web.xml: " + webXML); - - try - { - // After redeployment there might be a stale copy of the original web.xml.org, we delete it - File orgWebXML = new File(webXML.getCanonicalPath() + ".org"); - orgWebXML.delete(); - - // Rename the web.xml - if (webXML.renameTo(orgWebXML) == false) - throw new WSException("Cannot rename web.xml: " + orgWebXML); - - FileInputStream stream = new FileInputStream(orgWebXML); - return rewriteWebXml(stream, webXML, udi.classLoader); - } - catch (RuntimeException rte) - { - throw rte; - } - catch (Exception e) - { - throw new WSException(e); - } - } - - public RewriteResults rewriteWebXml(InputStream source, File dest, ClassLoader loader) throws Exception - { - if (dest == null) - { - dest = File.createTempFile("jbossws-alt-web", "xml", IOUtils.createTempDirectory()); - dest.deleteOnExit(); - } - - Element root = DOMUtils.parse(source); - RewriteResults results = modifyServletConfig(root, loader); - results.webXML = dest.toURL(); - - FileOutputStream fos = new FileOutputStream(dest); - new DOMWriter(fos).setPrettyprint(true).print(root); - fos.flush(); - fos.close(); - - return results; - } - - private RewriteResults modifyServletConfig(Element root, ClassLoader loader) throws ClassNotFoundException - { - RewriteResults results = new RewriteResults(); - Iterator itServlets = DOMUtils.getChildElements(root, "servlet"); - while (itServlets.hasNext()) - { - Element servletElement = (Element)itServlets.next(); - String linkName = DOMUtils.getTextContent(DOMUtils.getFirstChildElement(servletElement, "servlet-name")); - - // find the servlet-class - Element classElement = DOMUtils.getFirstChildElement(servletElement, "servlet-class"); - - // JSP - if (classElement == null) - continue; - - String orgServletClassName = DOMUtils.getTextContent(classElement).trim(); - - // Get the servlet class - Class orgServletClass = null; - if (loader != null) - { - try - { - orgServletClass = loader.loadClass(orgServletClassName); - } - catch (ClassNotFoundException ex) - { - log.warn("Cannot load servlet class: " + orgServletClassName); - } - } - - String targetBeanName = null; - - // Nothing to do if we have an <init-param> - if (isAlreadyModified(servletElement)) - { - Iterator itParams = DOMUtils.getChildElements(servletElement, "init-param"); - while (itParams.hasNext()) - { - Element elParam = (Element)itParams.next(); - Element elParamName = DOMUtils.getFirstChildElement(elParam, "param-name"); - Element elParamValue = DOMUtils.getFirstChildElement(elParam, "param-value"); - if (Endpoint.SEPID_DOMAIN_ENDPOINT.equals(DOMUtils.getTextContent(elParamName))) - { - targetBeanName = DOMUtils.getTextContent(elParamValue); - } - } - } - else - { - // Check if it is a real servlet that we can ignore - if (orgServletClass != null && JavaUtils.isAssignableFrom(Servlet.class, orgServletClass)) - { - log.info("Ignore servlet: " + orgServletClassName); - continue; - } - else if (orgServletClassName.endsWith("Servlet")) - { - log.info("Ignore <servlet-class> that ends with 'Servlet': " + orgServletClassName); - continue; - } - - // build a list of detached elements that come after <servlet-class> - boolean startDetach = false; - List<Element> detachedElements = new ArrayList<Element>(); - Iterator itDetached = DOMUtils.getChildElements(servletElement); - while (itDetached.hasNext()) - { - Element el = (Element)itDetached.next(); - if (startDetach == true) - { - detachedElements.add(el); - servletElement.removeChild(el); - } - if (el.equals(classElement)) - { - servletElement.removeChild(el); - startDetach = true; - } - } - - // replace the class name - classElement = (Element)DOMUtils.createElement("servlet-class"); - classElement.appendChild(DOMUtils.createTextNode(servletClass)); - classElement = (Element)servletElement.getOwnerDocument().importNode(classElement, true); - servletElement.appendChild(classElement); - - // add additional init params - if (orgServletClassName.equals(servletClass) == false) - { - Element paramElement = DOMUtils.createElement("init-param"); - paramElement.appendChild(DOMUtils.createElement("param-name")).appendChild(DOMUtils.createTextNode(Endpoint.SEPID_DOMAIN_ENDPOINT)); - paramElement.appendChild(DOMUtils.createElement("param-value")).appendChild(DOMUtils.createTextNode(orgServletClassName)); - paramElement = (Element)servletElement.getOwnerDocument().importNode(paramElement, true); - servletElement.appendChild(paramElement); - targetBeanName = orgServletClassName; - } - - // reattach the elements - itDetached = detachedElements.iterator(); - while (itDetached.hasNext()) - { - Element el = (Element)itDetached.next(); - servletElement.appendChild(el); - } - } - - if (targetBeanName == null) - throw new IllegalStateException("Cannot obtain service endpoint bean for: " + linkName); - - // remember the target bean name - results.sepTargetMap.put(linkName, targetBeanName.trim()); - } - - return results; - } - - // Return true if the web.xml is already modified - private boolean isAlreadyModified(Element servletElement) - { - Iterator itParams = DOMUtils.getChildElements(servletElement, "init-param"); - while (itParams.hasNext()) - { - Element elParam = (Element)itParams.next(); - Element elParamName = DOMUtils.getFirstChildElement(elParam, "param-name"); - if (Endpoint.SEPID_DOMAIN_ENDPOINT.equals(DOMUtils.getTextContent(elParamName))) - return true; - } - return false; - } -} \ No newline at end of file Added: branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/deployment/WebAppGeneratorDeployer.java =================================================================== --- branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/deployment/WebAppGeneratorDeployer.java (rev 0) +++ branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/deployment/WebAppGeneratorDeployer.java 2007-05-15 05:10:13 UTC (rev 3094) @@ -0,0 +1,55 @@ +/* + * 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.core.deployment; + +//$Id$ + +import org.jboss.ws.core.server.ServiceEndpointGeneratorEJB; +import org.jboss.ws.integration.deployment.AbstractDeployer; +import org.jboss.ws.integration.deployment.Deployment; +import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; +import org.jboss.ws.metadata.umdm.UnifiedMetaData; + +/** + * A deployer that generates a webapp for an EJB endpoint + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class WebAppGeneratorDeployer extends AbstractDeployer +{ + private ServiceEndpointGeneratorEJB serviceEndpointGenerator; + + @Override + public void create(Deployment dep) + { + UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); + if (udi == null) + throw new IllegalStateException("Cannot obtain unified deployement info"); + + UnifiedMetaData umd = dep.getContext().getAttachment(UnifiedMetaData.class); + if (umd == null) + throw new IllegalStateException("Cannot obtain unified meta data"); + + udi.webappURL = serviceEndpointGenerator.generatWebDeployment(umd, udi); + } +} \ No newline at end of file Property changes on: branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/deployment/WebAppGeneratorDeployer.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/server/ServiceEndpointGeneratorEJB.java =================================================================== --- branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/server/ServiceEndpointGeneratorEJB.java 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/server/ServiceEndpointGeneratorEJB.java 2007-05-15 05:10:13 UTC (rev 3094) @@ -34,6 +34,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; import org.jboss.ws.core.utils.DOMWriter; +import org.jboss.ws.integration.deployment.SecurityRolesHandler; import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; import org.jboss.ws.integration.management.ServerConfig; import org.jboss.ws.integration.management.ServerConfigFactory; @@ -50,11 +51,13 @@ * @author Thomas.Diesler(a)jboss.org * @since 12-May-2006 */ -public abstract class ServiceEndpointGeneratorEJB +public class ServiceEndpointGeneratorEJB { // logging support protected Logger log = Logger.getLogger(ServiceEndpointGeneratorEJB.class); + private SecurityRolesHandler securityRolesHandler; + public URL generatWebDeployment(UnifiedMetaData wsMetaData, UnifiedDeploymentInfo udi) { // Collect the list of ServerEndpointMetaData @@ -117,7 +120,7 @@ Element servlet = (Element)webApp.appendChild(DOMUtils.createElement("servlet")); Element servletName = (Element)servlet.appendChild(DOMUtils.createElement("servlet-name")); servletName.appendChild(DOMUtils.createTextNode(ejbName)); - + Element servletClass = (Element)servlet.appendChild(DOMUtils.createElement("servlet-class")); String implName = sepMetaData.getServiceEndpointImplName(); String seiName = sepMetaData.getServiceEndpointInterfaceName(); @@ -147,7 +150,7 @@ } if (urlPatters.contains(urlPattern)) - throw new IllegalArgumentException("Cannot use the same url-pattern with different endpoints, " + "check your <port-component-uri> in jboss.xml"); + throw new IllegalArgumentException("Cannot use the same url-pattern with different endpoints, check your <port-component-uri> in jboss.xml"); urlPatternElement.appendChild(DOMUtils.createTextNode(urlPattern)); urlPatters.add(urlPattern); @@ -220,7 +223,7 @@ Element realm = (Element)loginConfig.appendChild(DOMUtils.createElement("realm-name")); realm.appendChild(DOMUtils.createTextNode("EJBServiceEndpointServlet Realm")); - addEJBSecurityRoles(webApp, udi); + securityRolesHandler.addSecurityRoles(webApp, udi); } return webApp; @@ -300,8 +303,4 @@ return jbossWeb; } - - /** Add the roles from ejb-jar.xml to the security roles - */ - protected abstract void addEJBSecurityRoles(Element webApp, UnifiedDeploymentInfo udi); } Deleted: branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/utils/IOUtils.java =================================================================== --- branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/utils/IOUtils.java 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/utils/IOUtils.java 2007-05-15 05:10:13 UTC (rev 3094) @@ -1,142 +0,0 @@ -/* - * 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.core.utils; - -// $Id$ - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.OutputStreamWriter; -import java.io.Reader; -import java.io.Writer; - -import javax.activation.DataHandler; - -import org.jboss.logging.Logger; -import org.jboss.ws.WSException; -import org.jboss.ws.integration.management.ServerConfig; -import org.jboss.ws.integration.management.ServerConfigFactory; - -/** - * IO utilites - * - * @author Thomas.Diesler(a)jboss.org - */ -public final class IOUtils -{ - private static Logger log = Logger.getLogger(IOUtils.class); - - // Hide the constructor - private IOUtils() - { - } - - public static Writer getCharsetFileWriter(File file, String charset) throws IOException - { - return new OutputStreamWriter(new FileOutputStream(file), charset); - } - - /** Copy the input stream to the output stream - */ - public static void copyStream(OutputStream outs, InputStream ins) throws IOException - { - byte[] bytes = new byte[1024]; - int r = ins.read(bytes); - while (r > 0) - { - outs.write(bytes, 0, r); - r = ins.read(bytes); - } - } - - /** Copy the reader to the output stream - */ - public static void copyReader(OutputStream outs, Reader reader) throws IOException - { - OutputStreamWriter writer = new OutputStreamWriter(outs); - char[] bytes = new char[1024]; - int r = reader.read(bytes); - while (r > 0) - { - writer.write(bytes, 0, r); - r = reader.read(bytes); - } - } - - public static byte[] convertToBytes(DataHandler dh) - { - try - { - ByteArrayOutputStream buffOS= new ByteArrayOutputStream(); - dh.writeTo(buffOS); - return buffOS.toByteArray(); - } - catch (IOException e) - { - throw new WSException("Unable to convert DataHandler to byte[]: " + e.getMessage()); - } - } - - /** - * Transform a Reader to an InputStream - * Background is that DocumentBuilder.parse() cannot take the Reader directly - */ - public static InputStream transformReader(Reader reader) throws IOException - { - int capacity = 1024; - char[] charBuffer = new char[capacity]; - StringBuffer strBuffer = new StringBuffer(capacity); - - int len = reader.read(charBuffer, 0, capacity); - while (len > 0) - { - strBuffer.append(charBuffer, 0, len); - len = reader.read(charBuffer, 0, capacity); - } - return new ByteArrayInputStream(strBuffer.toString().getBytes()); - } - - public static File createTempDirectory() throws IOException - { - File tmpdir = null; - - try - { - ServerConfigFactory factory = ServerConfigFactory.getInstance(); - ServerConfig config = factory.getServerConfig(); - - tmpdir = new File(config.getServerTempDir().getCanonicalPath() + "/jbossws"); - tmpdir.mkdirs(); - } - catch (Throwable t) - { - // Use the Java temp directory if there is no server config (the client) - } - - return tmpdir; - } -} Modified: branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/extensions/security/ReceiveUsernameOperation.java =================================================================== --- branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/extensions/security/ReceiveUsernameOperation.java 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/extensions/security/ReceiveUsernameOperation.java 2007-05-15 05:10:13 UTC (rev 3094) @@ -28,6 +28,7 @@ import org.jboss.ws.extensions.security.element.SecurityHeader; import org.jboss.ws.extensions.security.element.Token; import org.jboss.ws.extensions.security.element.UsernameToken; +import org.jboss.ws.integration.invocation.SecurityAssociationAdaptor; import org.w3c.dom.Document; public class ReceiveUsernameOperation implements TokenOperation @@ -44,12 +45,12 @@ public void process(Document message, Token token) throws WSSecurityException { UsernameToken user = (UsernameToken)token; - String propName = SecurityAssociationAdaptorFactory.class.getName(); - SecurityAssociationAdaptorFactory factory = (SecurityAssociationAdaptorFactory)FactoryLoader.loadFactory(propName, null); - if (factory == null) + String propName = SecurityAssociationAdaptor.class.getName(); + + SecurityAssociationAdaptor securityAdaptor = (SecurityAssociationAdaptor)FactoryLoader.loadFactory(propName, null); + if (securityAdaptor == null) throw new WSSecurityException("Cannot load: " + propName); - SecurityAssociationAdaptor securityAdaptor = factory.getSecurityAssociationAdaptor(); securityAdaptor.setPrincipal(new SimplePrincipal(user.getUsername())); securityAdaptor.setCredential(user.getPassword()); } Deleted: branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/extensions/security/SecurityAssociationAdaptor.java =================================================================== --- branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/extensions/security/SecurityAssociationAdaptor.java 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/extensions/security/SecurityAssociationAdaptor.java 2007-05-15 05:10:13 UTC (rev 3094) @@ -1,38 +0,0 @@ -/* -* 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.extensions.security; - -// $Id$ - -import java.security.Principal; - -/** - * A container idependent security adaptor - * - * @author Thomas.Diesler(a)jboss.org - * @since 10-May-2005 - */ -public interface SecurityAssociationAdaptor -{ - void setPrincipal(Principal pricipal); - void setCredential(Object credential); -} Deleted: branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/extensions/security/SecurityAssociationAdaptorFactory.java =================================================================== --- branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/extensions/security/SecurityAssociationAdaptorFactory.java 2007-05-14 21:45:21 UTC (rev 3093) +++ branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/extensions/security/SecurityAssociationAdaptorFactory.java 2007-05-15 05:10:13 UTC (rev 3094) @@ -1,36 +0,0 @@ -/* -* 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.extensions.security; - -// $Id$ - - -/** - * A container idependent security adaptor factory - * - * @author Thomas.Diesler(a)jboss.org - * @since 10-May-2005 - */ -public interface SecurityAssociationAdaptorFactory -{ - SecurityAssociationAdaptor getSecurityAssociationAdaptor(); -}

17 years, 1 month

1
0
0 / 0

JBossWS SVN: r3093 - branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecurityAnnotatedpolicy.

by jbossws-commits＠lists.jboss.org

Author: maeste Date: 2007-05-14 17:45:21 -0400 (Mon, 14 May 2007) New Revision: 3093 Removed: branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecurityAnnotatedpolicy/simple-sign/ Log: deleted unused resorces

17 years, 1 month

1
0
0 / 0

JBossWS SVN: r3092 - in branches/JBWS-856: jbossws-core/src/java/org/jboss/ws/annotation and 21 other directories.

by jbossws-commits＠lists.jboss.org

Author: maeste Date: 2007-05-14 17:44:06 -0400 (Mon, 14 May 2007) New Revision: 3092 Added: branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/annotation/PolicyWsdlFragment.java branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/annotation/ branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/annotation/Policy.java branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/annotation/PolicyAttachment.java branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/ branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/HelloJavaBean.java branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/SimpleEncryptTestCase.java branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecurityAnnotatedpolicy/ branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecurityAnnotatedpolicy/META-INF/ branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecurityAnnotatedpolicy/META-INF/wsdl/ branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecurityAnnotatedpolicy/META-INF/wsdl/HelloService.wsdl branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecurityAnnotatedpolicy/Policy.xml branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecurityAnnotatedpolicy/WEB-INF/ branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecurityAnnotatedpolicy/WEB-INF/web.xml branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecurityAnnotatedpolicy/simple-encrypt/ branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecurityAnnotatedpolicy/simple-encrypt/META-INF/ branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecurityAnnotatedpolicy/simple-encrypt/META-INF/jboss-wsse-client.xml branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecurityAnnotatedpolicy/simple-encrypt/WEB-INF/ branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecurityAnnotatedpolicy/simple-sign/ branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecurityAnnotatedpolicy/simple-sign/META-INF/ branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecurityAnnotatedpolicy/simple-sign/META-INF/jboss-wsse-client.xml branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecurityAnnotatedpolicy/simple-sign/WEB-INF/ branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecurityAnnotatedpolicy/wsse.keystore branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecurityAnnotatedpolicy/wsse.truststore Removed: branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/annotation/Policy.java branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleSignTestCase.java branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/simple-sign/ Modified: branches/JBWS-856/integration-jboss42/build.xml branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/deployer/PolicyDeployer.java branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/deployer/WSSecurityAssertionDeployer.java branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/deployer/util/PrimitiveAssertionWriter.java branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java branches/JBWS-856/jbossws-tests/ant-import/build-samples-jaxws.xml branches/JBWS-856/jbossws-tests/build.xml branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/HelloJavaBean.java branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/PolicyAttachmentFragment.wsdl Log: Annotated policy implementation Modified: branches/JBWS-856/integration-jboss42/build.xml =================================================================== --- branches/JBWS-856/integration-jboss42/build.xml 2007-05-14 14:34:24 UTC (rev 3091) +++ branches/JBWS-856/integration-jboss42/build.xml 2007-05-14 21:44:06 UTC (rev 3092) @@ -138,6 +138,7 @@ <include name="stax-api.jar"/> <include name="wsdl4j.jar"/> <include name="xmlsec.jar"/> + <include name="wstx.jar"/> </fileset> <fileset dir="${jboss42.resources.dir}"> <include name="jbossws.beans/META-INF/jboss-beans.xml"/> Deleted: branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/annotation/Policy.java =================================================================== --- branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/annotation/Policy.java 2007-05-14 14:34:24 UTC (rev 3091) +++ branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/annotation/Policy.java 2007-05-14 21:44:06 UTC (rev 3092) @@ -1,47 +0,0 @@ -/* -* 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.annotation; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * Defines a policy attachment. - * - * @author Alessio Soldano, <alessio.soldano(a)javalinux.it> - * @since 25-Apr-2007 - */ -@Retention(value = RetentionPolicy.RUNTIME) -@Target(value = { ElementType.TYPE, ElementType.METHOD}) -public @interface Policy { - - /** - * The location of a pre-defined policy expression. - * The policyLocation is a URL (relative or absolute) that refers to a file containing - * WSLD fragment in which one or more policy expression(s) are provided and attached. - * - */ - String wsdlFragmentLocation(); - -} Copied: branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/annotation/PolicyWsdlFragment.java (from rev 3038, branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/annotation/Policy.java) =================================================================== --- branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/annotation/PolicyWsdlFragment.java (rev 0) +++ branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/annotation/PolicyWsdlFragment.java 2007-05-14 21:44:06 UTC (rev 3092) @@ -0,0 +1,47 @@ +/* +* 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.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Defines a policy attachment. + * + * @author Alessio Soldano, <alessio.soldano(a)javalinux.it> + * @since 25-Apr-2007 + */ +@Retention(value = RetentionPolicy.RUNTIME) +@Target(value = { ElementType.TYPE, ElementType.METHOD}) +public @interface PolicyWsdlFragment { + + /** + * The location of a pre-defined policy expression. + * The policyLocation is a URL (relative or absolute) that refers to a file containing + * WSLD fragment in which one or more policy expression(s) are provided and attached. + * + */ + String wsdlFragmentLocation(); + +} Added: branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/annotation/Policy.java =================================================================== --- branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/annotation/Policy.java (rev 0) +++ branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/annotation/Policy.java 2007-05-14 21:44:06 UTC (rev 3092) @@ -0,0 +1,40 @@ +/* + * 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.extensions.policy.annotation; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +import org.jboss.ws.extensions.policy.PolicyScopeLevel; + +/** + * @author Stefano Maestri <mailto:stefano.maestri@javalinux.it> + * + * since 11/05/2007 + */ +(a)Retention(RetentionPolicy.RUNTIME) +public @interface Policy { + + public String policyFileLocation(); + + public PolicyScopeLevel scope(); +} Added: branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/annotation/PolicyAttachment.java =================================================================== --- branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/annotation/PolicyAttachment.java (rev 0) +++ branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/annotation/PolicyAttachment.java 2007-05-14 21:44:06 UTC (rev 3092) @@ -0,0 +1,38 @@ +/* + * 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.extensions.policy.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * @author Stefano Maestri <mailto:stefano.maestri@javalinux.it> + * + * since 11/05/2007 + */ +(a)Target(ElementType.TYPE) +(a)Retention(RetentionPolicy.RUNTIME) +public @interface PolicyAttachment { + Policy[] value(); +} Modified: branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/deployer/PolicyDeployer.java =================================================================== --- branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/deployer/PolicyDeployer.java 2007-05-14 14:34:24 UTC (rev 3091) +++ branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/deployer/PolicyDeployer.java 2007-05-14 21:44:06 UTC (rev 3092) @@ -89,12 +89,6 @@ public Policy deployServerside(Policy policy, ExtensibleMetaData extMetaData) throws UnsupportedPolicy { -// ByteArrayOutputStream stream = new ByteArrayOutputStream(); -// PolicyWriter writer = -// PolicyFactory.getPolicyWriter(PolicyFactory.StAX_POLICY_WRITER); -// -// writer.writePolicy(policy, stream ); -// log.debug(stream.toString()); List<Assertion> returnedPolicyTerms = new LinkedList<Assertion>(); Modified: branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/deployer/WSSecurityAssertionDeployer.java =================================================================== --- branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/deployer/WSSecurityAssertionDeployer.java 2007-05-14 14:34:24 UTC (rev 3091) +++ branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/deployer/WSSecurityAssertionDeployer.java 2007-05-14 21:44:06 UTC (rev 3092) @@ -1,5 +1,6 @@ package org.jboss.ws.extensions.policy.deployer; +import java.io.ByteArrayOutputStream; import java.io.StringReader; import java.io.StringWriter; @@ -7,6 +8,7 @@ import javax.xml.stream.XMLStreamWriter; import org.apache.ws.policy.PrimitiveAssertion; +import org.jboss.logging.Logger; import org.jboss.ws.extensions.policy.PolicyAssertion; import org.jboss.ws.extensions.policy.deployer.exceptions.UnsupportedAssertion; import org.jboss.ws.extensions.policy.deployer.util.PrimitiveAssertionWriter; @@ -19,10 +21,11 @@ public class WSSecurityAssertionDeployer implements AssertionDeployer { - + private final static Logger log = Logger.getLogger(PolicyDeployer.class); + public void deploy(PrimitiveAssertion assertion, ExtensibleMetaData extMetaData) throws UnsupportedAssertion { - StringWriter writer = new StringWriter(); + ByteArrayOutputStream stream = new ByteArrayOutputStream(); if (extMetaData instanceof EndpointMetaData) { EndpointMetaData ep = (EndpointMetaData) extMetaData; @@ -31,10 +34,9 @@ try { //GET XML of security assertion - PrimitiveAssertionWriter.newInstance().writePrimitiveAssertion(assertion, writer); + PrimitiveAssertionWriter.newInstance().writePrimitiveAssertion(assertion, stream); + StringReader reader = new StringReader(stream.toString()); - StringReader reader = new StringReader(writer.toString()); - //Set security configuration securityConfiguration = WSSecurityOMFactory.newInstance().parse(reader); WSSecurityConfigFactory.newInstance().initKeystorePath(ep.getRootFile(), securityConfiguration); Modified: branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/deployer/util/PrimitiveAssertionWriter.java =================================================================== --- branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/deployer/util/PrimitiveAssertionWriter.java 2007-05-14 14:34:24 UTC (rev 3091) +++ branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/deployer/util/PrimitiveAssertionWriter.java 2007-05-14 21:44:06 UTC (rev 3092) @@ -1,5 +1,6 @@ package org.jboss.ws.extensions.policy.deployer.util; +import java.io.ByteArrayOutputStream; import java.io.StringWriter; import java.util.Hashtable; import java.util.Iterator; @@ -27,17 +28,15 @@ return new PrimitiveAssertionWriter(); } - public void writePrimitiveAssertion(PrimitiveAssertion assertion, StringWriter stringWriter) throws XMLStreamException + public void writePrimitiveAssertion(PrimitiveAssertion assertion, ByteArrayOutputStream stream) throws XMLStreamException { - XMLStreamWriter writer = XMLOutputFactory.newInstance().createXMLStreamWriter(stringWriter); + XMLStreamWriter writer = XMLOutputFactory.newInstance().createXMLStreamWriter(stream); writePrimitiveAssertion(assertion, writer); } public void writePrimitiveAssertion(PrimitiveAssertion assertion, XMLStreamWriter writer) throws XMLStreamException { - - QName qname = assertion.getName(); String writerPrefix = writer.getPrefix(qname.getNamespaceURI()); @@ -68,6 +67,7 @@ writeTerms(terms, writer); writer.writeEndElement(); + writer.flush(); } private void writeTerms(List terms, XMLStreamWriter writer) throws XMLStreamException Modified: branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java =================================================================== --- branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-05-14 14:34:24 UTC (rev 3091) +++ branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-05-14 21:44:06 UTC (rev 3092) @@ -23,7 +23,9 @@ // $Id$ +import java.io.FileInputStream; import java.io.IOException; +import java.io.InputStream; import java.net.MalformedURLException; import java.net.URI; import java.net.URISyntaxException; @@ -63,6 +65,7 @@ import org.jboss.ws.extensions.eventing.deployment.EventingEndpoint; import org.jboss.ws.extensions.eventing.metadata.EventingEpMetaExt; import org.jboss.ws.extensions.policy.PolicyScopeLevel; +import org.jboss.ws.extensions.policy.annotation.PolicyAttachment; import org.jboss.ws.extensions.policy.deployer.PolicyDeployer; import org.jboss.ws.extensions.policy.deployer.exceptions.UnsupportedPolicy; import org.jboss.ws.extensions.policy.metadata.PolicyMetaExtension; @@ -469,6 +472,37 @@ } } + protected void processPolicyAnnotation(EndpointMetaData epMetaData, Class<?> sepClass, UnifiedDeploymentInfo udi) + { + for (org.jboss.ws.extensions.policy.annotation.Policy policy : sepClass.getAnnotation(PolicyAttachment.class).value()) + { + Policy normPolicy; + InputStream is = null; + try + { + DOMPolicyReader reader = (DOMPolicyReader) PolicyFactory.getPolicyReader(PolicyFactory.DOM_POLICY_READER); + is = udi.getMetaDataFileURL(policy.policyFileLocation()).openStream(); + Policy unnormalizedPolicy = reader.readPolicy(is); + normPolicy = (Policy)unnormalizedPolicy.normalize(); + log.info("++++++++++++++ Deploying Annotated Policy="+policy.policyFileLocation()); + deployPolicy(normPolicy, policy.scope(), epMetaData); + } + catch (Exception e) + { + e.printStackTrace(); + } finally + { + try + { + is.close(); + } catch (Exception e) {} + } + + } + + + } + protected void processPolicyMetaDataExtension(EndpointMetaData epMetaData, WSDLDefinitions wsdlDefinitions) { //Collect all policies defined in our wsdl definitions Modified: branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java =================================================================== --- branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-05-14 14:34:24 UTC (rev 3091) +++ branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-05-14 21:44:06 UTC (rev 3092) @@ -34,9 +34,10 @@ import org.jboss.ws.Constants; import org.jboss.ws.WSException; -import org.jboss.ws.annotation.Policy; +import org.jboss.ws.annotation.PolicyWsdlFragment; import org.jboss.ws.core.server.UnifiedDeploymentInfo; import org.jboss.ws.core.utils.IOUtils; +import org.jboss.ws.extensions.policy.annotation.PolicyAttachment; import org.jboss.ws.metadata.builder.MetaDataBuilder; import org.jboss.ws.metadata.umdm.*; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; @@ -107,9 +108,6 @@ sepMetaData.setServiceEndpointImplName(sepClass.getName()); sepMetaData.setServiceEndpointInterfaceName(seiClass.getName()); - //maeste - //TODO: use this 4 lines in asserion deployer - // Assign the WS-Security configuration, WSSecurityConfigFactory wsseConfFactory = WSSecurityConfigFactory.newInstance(); WSSecurityConfiguration securityConfiguration = wsseConfFactory.createConfiguration( wsMetaData.getRootFile(), WSSecurityOMFactory.SERVER_RESOURCE_NAME @@ -162,6 +160,11 @@ else if (seiClass.isAnnotationPresent(HandlerChain.class)) processHandlerChain(sepMetaData, seiClass); +// Process an optional @PolicyAttachment annotation + if (sepClass.isAnnotationPresent(PolicyAttachment.class)) + processPolicyAnnotation(sepMetaData, sepClass, udi); + + // process webservices.xml contributions processWSDDContribution(sepMetaData); @@ -334,7 +337,7 @@ wsMetaData.addService(result.serviceMetaData); //Check for policy attachment file - Policy anPolicy = sepClass.getAnnotation(Policy.class); + PolicyWsdlFragment anPolicy = sepClass.getAnnotation(PolicyWsdlFragment.class); if (anPolicy!=null) { String policyLocation = anPolicy.wsdlFragmentLocation(); Modified: branches/JBWS-856/jbossws-tests/ant-import/build-samples-jaxws.xml =================================================================== --- branches/JBWS-856/jbossws-tests/ant-import/build-samples-jaxws.xml 2007-05-14 14:34:24 UTC (rev 3091) +++ branches/JBWS-856/jbossws-tests/ant-import/build-samples-jaxws.xml 2007-05-14 21:44:06 UTC (rev 3092) @@ -470,6 +470,19 @@ <include name="PolicyAttachmentFragment.wsdl"/> </webinf> </war> +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-wssecurityAnnotatedpolicy-encrypt.war" webxml="${tests.output.dir}/resources/jaxws/samples/wssecurityAnnotatedpolicy/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/Hello.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/HelloJavaBean.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/UserType.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/wssecurityAnnotatedpolicy"> + <include name="wsse.keystore"/> + <include name="wsse.truststore"/> + <include name="Policy.xml"/> + </webinf> + </war>  <war jarfile="${tests.output.dir}/libs/jaxws-samples-xop-doclit.war" webxml="${tests.output.dir}/resources/jaxws/samples/xop/doclit/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> Modified: branches/JBWS-856/jbossws-tests/build.xml =================================================================== --- branches/JBWS-856/jbossws-tests/build.xml 2007-05-14 14:34:24 UTC (rev 3091) +++ branches/JBWS-856/jbossws-tests/build.xml 2007-05-14 21:44:06 UTC (rev 3092) @@ -262,6 +262,8 @@ <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"/> <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecuritypolicy/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecuritypolicy" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true"/> + <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurityAnnotatedpolicy/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true"/> + </target> <!-- @@ -354,7 +356,9 @@ </taskdef> <wsprovide resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurity" genwsdl="true" sei="org.jboss.test.ws.jaxws.samples.wssecurity.HelloJavaBean"/> - <wsprovide resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecuritypolicy" genwsdl="true" sei="org.jboss.test.ws.jaxws.samples.wssecuritypolicy.HelloJavaBean"/> + <wsprovide resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecuritypolicy" genwsdl="true" sei="org.jboss.test.ws.jaxws.samples.wssecuritypolicy.HelloJavaBean"/> + <wsprovide resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurityAnnotatedpolicy" genwsdl="true" sei="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy.HelloJavaBean"/> + </target> <target name="generate-resources" depends="servicegen,wstools,wsprovide"> Added: branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/HelloJavaBean.java =================================================================== --- branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/HelloJavaBean.java (rev 0) +++ branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/HelloJavaBean.java 2007-05-14 21:44:06 UTC (rev 3092) @@ -0,0 +1,49 @@ +/* + * 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.test.ws.jaxws.samples.wssecurityAnnotatedpolicy; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +import org.jboss.logging.Logger; +import org.jboss.ws.annotation.EndpointConfig; +import org.jboss.ws.extensions.policy.PolicyScopeLevel; +import org.jboss.ws.extensions.policy.annotation.Policy; +import org.jboss.ws.extensions.policy.annotation.PolicyAttachment; + + +@WebService(name = "Hello", targetNamespace = "http://org.jboss.ws/samples/wssecurityAnnotatedpolicy") +@PolicyAttachment({@Policy( policyFileLocation="WEB-INF/Policy.xml", scope = PolicyScopeLevel.WSDL_PORT ) }) +@SOAPBinding(style = SOAPBinding.Style.RPC) +public class HelloJavaBean +{ + private Logger log = Logger.getLogger(HelloJavaBean.class); + + @WebMethod + public UserType echoUserType(@WebParam(name = "user") UserType in0) + { + log.info(in0); + return in0; + } +} Added: branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/SimpleEncryptTestCase.java =================================================================== --- branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/SimpleEncryptTestCase.java (rev 0) +++ branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/SimpleEncryptTestCase.java 2007-05-14 21:44:06 UTC (rev 3092) @@ -0,0 +1,86 @@ +/* + * 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.test.ws.jaxws.samples.wssecurityAnnotatedpolicy; + +import java.io.File; +import java.net.URL; +import java.util.Map; + +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.core.StubExt; +import org.jboss.ws.core.jaxws.client.ServiceExt; + +/** + * Test WS-Security with RPC/Literal + * + * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> + * @version $Revision: 2385 $ + */ +public class SimpleEncryptTestCase extends JBossWSTest +{ + /** Construct the test case with a given name + */ + + /** Deploy the test */ + public static Test suite() throws Exception + { + return JBossWSTestSetup.newTestSetup(SimpleEncryptTestCase.class, "jaxws-samples-wssecurityAnnotatedpolicy-encrypt.war"); + } + + /** + * Test JSE endpoint + */ + public void testEndpoint() throws Exception + { + Hello hello = getPort(); + + UserType in0 = new UserType(); + in0.setMsg("Kermit"); + UserType retObj = hello.echoUserType(in0); + assertEquals("Kermit", retObj.getMsg()); + } + + private Hello getPort() throws Exception + { + URL wsdlURL = new File("wsprovide/resources/jaxws/samples/wssecurityAnnotatedpolicy/HelloService.wsdl").toURL(); + URL securityURL = new File("resources/jaxws/samples/wssecurityAnnotatedpolicy/simple-encrypt/META-INF/jboss-wsse-client.xml").toURL(); + QName serviceName = new QName("http://org.jboss.ws/samples/wssecurityAnnotatedpolicy", "HelloService"); + + Service service = Service.create(wsdlURL, serviceName); + ((ServiceExt)service).setSecurityConfig(securityURL.toExternalForm()); + + Hello port = (Hello)service.getPort(Hello.class); + ((StubExt)port).setConfigName("Standard WSSecurity Client"); + + Map<String, Object> reqContext = ((BindingProvider)port).getRequestContext(); + reqContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxws-samples-wssecurityAnnotatedpolicy-encrypt"); + + return port; + } +} \ No newline at end of file Modified: branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/HelloJavaBean.java =================================================================== --- branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/HelloJavaBean.java 2007-05-14 14:34:24 UTC (rev 3091) +++ branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/HelloJavaBean.java 2007-05-14 21:44:06 UTC (rev 3092) @@ -28,10 +28,10 @@ import org.jboss.logging.Logger; import org.jboss.ws.annotation.EndpointConfig; -import org.jboss.ws.annotation.Policy; +import org.jboss.ws.annotation.PolicyWsdlFragment; @WebService(name = "Hello", targetNamespace = "http://org.jboss.ws/samples/wssecuritypolicy") -@Policy(wsdlFragmentLocation="WEB-INF/PolicyAttachmentFragment.wsdl") +@PolicyWsdlFragment(wsdlFragmentLocation="WEB-INF/PolicyAttachmentFragment.wsdl") @SOAPBinding(style = SOAPBinding.Style.RPC) public class HelloJavaBean { Deleted: branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleSignTestCase.java =================================================================== --- branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleSignTestCase.java 2007-05-14 14:34:24 UTC (rev 3091) +++ branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleSignTestCase.java 2007-05-14 21:44:06 UTC (rev 3092) @@ -1,82 +0,0 @@ -/* - * 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.test.ws.jaxws.samples.wssecuritypolicy; - -import java.io.File; -import java.net.URL; -import java.util.Map; - -import javax.xml.namespace.QName; -import javax.xml.ws.BindingProvider; -import javax.xml.ws.Service; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.core.StubExt; -import org.jboss.ws.core.jaxws.client.ServiceExt; - -/** - * Test WS-Security with RPC/Literal - * - * @author Thomas.Diesler(a)jboss.com - */ -public class SimpleSignTestCase extends JBossWSTest -{ - /** Deploy the test */ - public static Test suite() throws Exception - { - return JBossWSTestSetup.newTestSetup(SimpleSignTestCase.class, "jaxws-samples-wssecurity-sign.war"); - } - - /** - * Test JSE endpoint - */ - public void testEndpoint() throws Exception - { - Hello hello = getPort(); - - UserType in0 = new UserType(); - in0.setMsg("Kermit"); - UserType retObj = hello.echoUserType(in0); - assertEquals("Kermit", retObj.getMsg()); - } - - private Hello getPort() throws Exception - { - URL wsdlURL = new File("wsprovide/resources/jaxws/samples/wssecurity/HelloService.wsdl").toURL(); - URL securityURL = new File("resources/jaxws/samples/wssecurity/simple-sign/META-INF/jboss-wsse-client.xml").toURL(); - QName serviceName = new QName("http://org.jboss.ws/samples/wssecurity", "HelloService"); - - Service service = Service.create(wsdlURL, serviceName); - ((ServiceExt)service).setSecurityConfig(securityURL.toExternalForm()); - - Hello port = (Hello)service.getPort(Hello.class); - ((StubExt)port).setConfigName("Standard WSSecurity Client"); - - Map<String, Object> reqContext = ((BindingProvider)port).getRequestContext(); - reqContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxws-samples-wssecurity-sign"); - - return port; - } -} Added: branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecurityAnnotatedpolicy/META-INF/wsdl/HelloService.wsdl =================================================================== --- branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecurityAnnotatedpolicy/META-INF/wsdl/HelloService.wsdl (rev 0) +++ branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecurityAnnotatedpolicy/META-INF/wsdl/HelloService.wsdl 2007-05-14 21:44:06 UTC (rev 3092) @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='HelloService' targetNamespace='http://org.jboss.ws/samples/wssecurity' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/samples/wssecurity' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <xs:schema targetNamespace='http://org.jboss.ws/samples/wssecurity' version='1.0' xmlns:xs='http://www.w3.org/2001/XMLSchema'> + <xs:complexType name='UserType'> + <xs:sequence> + <xs:element minOccurs='0' name='msg' type='xs:string'/> + </xs:sequence> + </xs:complexType> + </xs:schema> + </types> + <message name='Hello_echoUserType'> + <part name='user' type='tns:UserType'/> + </message> + <message name='Hello_echoUserTypeResponse'> + <part name='return' type='tns:UserType'/> + </message> + <portType name='Hello'> + <operation name='echoUserType' parameterOrder='user'> + <input message='tns:Hello_echoUserType'/> + <output message='tns:Hello_echoUserTypeResponse'/> + </operation> + </portType> + <binding name='HelloBinding' type='tns:Hello'> + <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='echoUserType'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://org.jboss.ws/samples/wssecurity' use='literal'/> + </input> + <output> + <soap:body namespace='http://org.jboss.ws/samples/wssecurity' use='literal'/> + </output> + </operation> + </binding> + <service name='HelloService'> + <port binding='tns:HelloBinding' name='HelloPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Added: branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecurityAnnotatedpolicy/Policy.xml =================================================================== --- branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecurityAnnotatedpolicy/Policy.xml (rev 0) +++ branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecurityAnnotatedpolicy/Policy.xml 2007-05-14 21:44:06 UTC (rev 3092) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<wsp:Policy wsu:Id="X509EndpointPolicy" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" + xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."> + <wsp:ExactlyOne> + <wsp:All> + <sp:jboss-ws-security xmlns:sp="http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd"> + <sp:key-store-file>WEB-INF/wsse.keystore</sp:key-store-file> + <sp:key-store-password>jbossws</sp:key-store-password> + <sp:trust-store-file>WEB-INF/wsse.truststore</sp:trust-store-file> + <sp:trust-store-password>jbossws</sp:trust-store-password> + <sp:config> + <sp:encrypt type="x509v3" alias="wsse"/> + <sp:requires> + <sp:encryption/> + </sp:requires> + </sp:config> + </sp:jboss-ws-security> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> + Added: branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecurityAnnotatedpolicy/WEB-INF/web.xml =================================================================== --- branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecurityAnnotatedpolicy/WEB-INF/web.xml (rev 0) +++ branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecurityAnnotatedpolicy/WEB-INF/web.xml 2007-05-14 21:44:06 UTC (rev 3092) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + + <servlet> + <servlet-name>HelloService</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy.HelloJavaBean</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>HelloService</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> +</web-app> + Added: branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecurityAnnotatedpolicy/simple-encrypt/META-INF/jboss-wsse-client.xml =================================================================== --- branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecurityAnnotatedpolicy/simple-encrypt/META-INF/jboss-wsse-client.xml (rev 0) +++ branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecurityAnnotatedpolicy/simple-encrypt/META-INF/jboss-wsse-client.xml 2007-05-14 21:44:06 UTC (rev 3092) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd"> + <config> + <encrypt type="x509v3" alias="wsse"/> + <requires> + <encryption/> + </requires> + </config> +</jboss-ws-security> \ No newline at end of file Added: branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecurityAnnotatedpolicy/simple-sign/META-INF/jboss-wsse-client.xml =================================================================== --- branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecurityAnnotatedpolicy/simple-sign/META-INF/jboss-wsse-client.xml (rev 0) +++ branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecurityAnnotatedpolicy/simple-sign/META-INF/jboss-wsse-client.xml 2007-05-14 21:44:06 UTC (rev 3092) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd"> + <config> + <sign type="x509v3" alias="wsse"/> + <requires> + <signature/> + </requires> + </config> +</jboss-ws-security> \ No newline at end of file Added: branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecurityAnnotatedpolicy/wsse.keystore =================================================================== (Binary files differ) Property changes on: branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecurityAnnotatedpolicy/wsse.keystore ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecurityAnnotatedpolicy/wsse.truststore =================================================================== (Binary files differ) Property changes on: branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecurityAnnotatedpolicy/wsse.truststore ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/PolicyAttachmentFragment.wsdl =================================================================== --- branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/PolicyAttachmentFragment.wsdl 2007-05-14 14:34:24 UTC (rev 3091) +++ branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/PolicyAttachmentFragment.wsdl 2007-05-14 21:44:06 UTC (rev 3092) @@ -12,7 +12,7 @@ <wsp:Policy wsu:Id="X509EndpointPolicy"> <wsp:ExactlyOne> <wsp:All> - <sp:jboss-ws-security xmlns:sp="mynamespace"> + <sp:jboss-ws-security xmlns:sp="http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd"> <sp:key-store-file>WEB-INF/wsse.keystore</sp:key-store-file> <sp:key-store-password>jbossws</sp:key-store-password> <sp:trust-store-file>WEB-INF/wsse.truststore</sp:trust-store-file>

17 years, 1 month

1
0
0 / 0

JBossWS SVN: r3091 - branches/dlofthouse.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-05-14 10:34:24 -0400 (Mon, 14 May 2007) New Revision: 3091 Added: branches/dlofthouse/JBWS-1647/ Log: Branch for JBWS-1647 Copied: branches/dlofthouse/JBWS-1647 (from rev 3090, branches/jbossws-2.0)

17 years, 1 month

1
0
0 / 0

JBossWS SVN: r3090 - in branches/dlofthouse: archive and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-05-14 10:32:43 -0400 (Mon, 14 May 2007) New Revision: 3090 Added: branches/dlofthouse/archive/JBWS-1647/ Removed: branches/dlofthouse/JBWS-1647/ Log: Move to archive to make space for the actual fix. Copied: branches/dlofthouse/archive/JBWS-1647 (from rev 3089, branches/dlofthouse/JBWS-1647)

17 years, 1 month

1
0
0 / 0

JBossWS SVN: r3089 - in branches/dlofthouse: archive and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-05-14 10:32:12 -0400 (Mon, 14 May 2007) New Revision: 3089 Added: branches/dlofthouse/archive/JBWS-1648/ Removed: branches/dlofthouse/JBWS-1648/ Log: Move to archive to make space for the actual fix. Copied: branches/dlofthouse/archive/JBWS-1648 (from rev 3088, branches/dlofthouse/JBWS-1648)

17 years, 1 month

1
0
0 / 0

JBossWS SVN: r3088 - branches/dlofthouse.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-05-14 10:30:39 -0400 (Mon, 14 May 2007) New Revision: 3088 Added: branches/dlofthouse/archive/ Log: Archive to hold current tasks.

17 years, 1 month

1
0
0 / 0

JBossWS SVN: r3087 - in branches/tdiesler/trunk: build/ant-import and 12 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-13 14:06:04 -0400 (Sun, 13 May 2007) New Revision: 3087 Added: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployerHook.java branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployerHookEJB.java branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployerHookJSE.java branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractWebServiceDeployer.java branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptor.java branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptorEJB3.java branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ArchiveDeployerHook.java branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/DeployerHook.java branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/DeploymentInfoAdapter.java branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerHookEJB21.java branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerHookJSE.java branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerHookEJB3.java branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerHookJSE.java branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/MainDeployerHook.java branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ManagedServerConfig.java branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ManagedServerConfigMBean.java branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/UnifiedDeploymentInfoDeployer.java branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/VirtualFileAdaptor.java branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebMetaDataAdaptor.java branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceDeployerEJB.java branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceDeployerJSE.java branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceMainDeployer.java branches/tdiesler/trunk/jbossws/ant-import-tests/ branches/tdiesler/trunk/jbossws/ant-import-tests/build-benchmark.xml branches/tdiesler/trunk/jbossws/ant-import-tests/build-interop-jars.xml branches/tdiesler/trunk/jbossws/ant-import-tests/build-interop.xml branches/tdiesler/trunk/jbossws/ant-import-tests/build-jars-jaxrpc.xml branches/tdiesler/trunk/jbossws/ant-import-tests/build-jars-jaxws.xml branches/tdiesler/trunk/jbossws/ant-import-tests/build-samples-jaxrpc.xml branches/tdiesler/trunk/jbossws/ant-import-tests/build-samples-jaxws.xml branches/tdiesler/trunk/jbossws/ant-import-tests/build-testsuite-artifacts.xml branches/tdiesler/trunk/jbossws/ant-import-tests/build-testsuite.xml Removed: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/AbstractDeployerHook.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/AbstractDeployerHookEJB.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/AbstractDeployerHookJSE.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/AbstractWebServiceDeployer.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/ApplicationMetaDataAdaptor.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/ApplicationMetaDataAdaptorEJB3.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/ArchiveDeployerHook.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/DeployerHook.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/DeploymentInfoAdapter.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/JAXRPCDeployerHookEJB21.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/JAXRPCDeployerHookJSE.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/JAXWSDeployerHookEJB3.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/JAXWSDeployerHookJSE.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/MainDeployerHook.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/ManagedServerConfig.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/ManagedServerConfigMBean.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/UnifiedDeploymentInfoDeployer.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/VirtualFileAdaptor.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/WebMetaDataAdaptor.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/WebServiceDeployerEJB.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/WebServiceDeployerJSE.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/WebServiceMainDeployer.java branches/tdiesler/trunk/jbossws/ant-import/build-benchmark.xml branches/tdiesler/trunk/jbossws/ant-import/build-interop-jars.xml branches/tdiesler/trunk/jbossws/ant-import/build-interop.xml branches/tdiesler/trunk/jbossws/ant-import/build-jars-jaxrpc.xml branches/tdiesler/trunk/jbossws/ant-import/build-jars-jaxws.xml branches/tdiesler/trunk/jbossws/ant-import/build-samples-jaxrpc.xml branches/tdiesler/trunk/jbossws/ant-import/build-samples-jaxws.xml branches/tdiesler/trunk/jbossws/ant-import/build-testsuite-artifacts.xml branches/tdiesler/trunk/jbossws/ant-import/build-testsuite.xml Modified: branches/tdiesler/trunk/build/ant-import/build-hudson.xml branches/tdiesler/trunk/build/ant-import/build-setup.xml branches/tdiesler/trunk/build/ant-import/build-testsuite.xml branches/tdiesler/trunk/build/ant.properties.example branches/tdiesler/trunk/build/build.xml branches/tdiesler/trunk/integration/jboss42/.project branches/tdiesler/trunk/integration/jboss50/.project branches/tdiesler/trunk/integration/jboss50/ant-import/build-thirdparty.xml branches/tdiesler/trunk/integration/jboss50/build.xml branches/tdiesler/trunk/integration/spi/.project branches/tdiesler/trunk/integration/spi/ant-import/build-release.xml branches/tdiesler/trunk/integration/spi/ant-import/build-thirdparty.xml branches/tdiesler/trunk/integration/spi/build.xml branches/tdiesler/trunk/integration/sunri/.project branches/tdiesler/trunk/jbossws/.project branches/tdiesler/trunk/jbossws/ant-import/build-thirdparty.xml branches/tdiesler/trunk/jbossws/build.xml branches/tdiesler/trunk/testsuite/.project Log: restructure Modified: branches/tdiesler/trunk/build/ant-import/build-hudson.xml =================================================================== --- branches/tdiesler/trunk/build/ant-import/build-hudson.xml 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/build/ant-import/build-hudson.xml 2007-05-13 18:06:04 UTC (rev 3087) @@ -13,8 +13,6 @@ <project> - <import file="${basedir}/ant-import/build-setup.xml"/> - <target name="init-hudson" depends="prepare"> <property name="hudson.tomcat" value="${hudson.root}/jbossws-hudson-${version.id}/apache-tomcat"/> Modified: branches/tdiesler/trunk/build/ant-import/build-setup.xml =================================================================== --- branches/tdiesler/trunk/build/ant-import/build-setup.xml 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/build/ant-import/build-setup.xml 2007-05-13 18:06:04 UTC (rev 3087) @@ -17,24 +17,17 @@   - <property name="build.dir" value="${basedir}/../build"/> - <property name="spi.dir" value="${basedir}/../jbossws-spi"/> - <property name="core.dir" value="${basedir}/../jbossws-core"/> - <property name="testsuite.dir" value="${basedir}/../jbossws-tests"/> + <property name="build.dir" value="${basedir}/build"/> + <property name="spi.dir" value="${basedir}/integration/spi"/> + <property name="core.dir" value="${basedir}/jbossws"/> + <property name="testsuite.dir" value="${basedir}/testsuite"/> + <property name="int.jboss42.dir" value="${basedir}/integration/jboss42"/> + <property name="int.jboss50.dir" value="${basedir}/integration/jboss50"/> + <property name="int.sunri.dir" value="${basedir}/integration/sunri"/> <property file="${build.dir}/ant.properties"/> <property file="${build.dir}/version.properties"/> - <property name="jbws.jboss50.dir" value="${basedir}/../jbws-jboss50"/> - <property name="jbws.jboss42.dir" value="${basedir}/../jbws-jboss42"/> - <property name="jbws.jboss40.dir" value="${basedir}/../jbws-jboss40"/> - <property name="sunri.jboss50.dir" value="${basedir}/../sunri-jboss50"/> - <property name="sunri.jboss42.dir" value="${basedir}/../sunri-jboss42"/> - <property name="sunri.jboss40.dir" value="${basedir}/../sunri-jboss40"/> - <property name="xfire.jboss50.dir" value="${basedir}/../xfire-jboss50"/> - <property name="xfire.jboss42.dir" value="${basedir}/../xfire-jboss42"/> - <property name="xfire.jboss40.dir" value="${basedir}/../xfire-jboss40"/> - <property name="jboss50.lib" value="${jboss50.home}/lib"/> <property name="jboss50.client" value="${jboss50.home}/client"/> <property name="jboss50.server" value="${jboss50.home}/server/${jboss.server.instance}"/> @@ -50,20 +43,11 @@ <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/> <property name="jboss42.thirdparty" value="${jboss42.home}/../../../thirdparty"/> - <property name="jboss40.lib" value="${jboss40.home}/lib"/> - <property name="jboss40.client" value="${jboss40.home}/client"/> - <property name="jboss40.server" value="${jboss40.home}/server/${jboss.server.instance}"/> - <property name="jboss40.server.lib" value="${jboss40.server}/lib"/> - <property name="jboss40.server.deploy" value="${jboss40.server}/deploy"/> - <property name="jboss40.thirdparty" value="${jboss40.home}/../../../thirdparty"/> - <property name="jboss50.available.file" value="${jboss50.client}/jboss-ejb3-client.jar"/> <property name="jboss42.available.file" value="${jboss42.client}/jboss-client.jar"/> - <property name="jboss40.available.file" value="${jboss40.client}/jboss-client.jar"/> <available property="jboss50.available" file="${jboss50.available.file}"/> <available property="jboss42.available" file="${jboss42.available.file}"/> - <available property="jboss40.available" file="${jboss40.available.file}"/> <available property="jbossws.portal.content.available" file="${jbossws.portal.content}" type="dir"/> @@ -74,19 +58,14 @@ <condition property="jboss.home" value="${jboss42.home}"> <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> </condition> - <condition property="jboss.home" value="${jboss40.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss40"/> - </condition> -  - <available classname="java.lang.StackTraceElement" property="HAVE_JDK_1.4"/> - <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/> -    <target name="prepare"> + + <echo message="jboss.home = ${jboss.home}"/> <tstamp> <format property="build.id" pattern="yyyyMMddHHmm"/> Modified: branches/tdiesler/trunk/build/ant-import/build-testsuite.xml =================================================================== --- branches/tdiesler/trunk/build/ant-import/build-testsuite.xml 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/build/ant-import/build-testsuite.xml 2007-05-13 18:06:04 UTC (rev 3087) @@ -76,7 +76,7 @@ <echo/> <echo message="-----------------------------------------------"/> - <echo message="test.target = ${jbossws.integration.target}"/> + <echo message="jboss.home = ${jboss.home}"/> <echo message="java.home = ${java.home}"/> <echo message="excludesfile = ${excludesfile}"/> <echo message="-----------------------------------------------"/> @@ -131,7 +131,7 @@   - <target name="tests" depends="tests-main" description="Run all unit tests and generate a report"> + <target name="tests" depends="tests-jars" description="Run all unit tests and generate a report"> <antcall target="test-main-local"> <param name="include.wildcard" value="org/jboss/test/ws/**/*TestCase.class"/> <param name="exclude.wildcard" value="no-wildcard-exclude-see-excludesfile"/> Modified: branches/tdiesler/trunk/build/ant.properties.example =================================================================== --- branches/tdiesler/trunk/build/ant.properties.example 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/build/ant.properties.example 2007-05-13 18:06:04 UTC (rev 3087) @@ -6,9 +6,8 @@ # Optional JBoss Home #jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3 #jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA -#jboss40.home=/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3 -# The JBoss server under test. This can be [jboss50|jboss42|jboss40] +# The JBoss server under test. This can be [jboss50|jboss42] jbossws.integration.target=jboss50 # The JBoss server instance @@ -27,6 +26,7 @@ hudson.port=8180 hudson.jdk15=/usr/java/jdk1.5 +hudson.jdk14=/usr/java/jdk1.4 hudson.jboss50.url=https://svn.jboss.org/repos/jbossas/trunk hudson.jboss50.build=jboss-5.0.0.Beta3 @@ -36,10 +36,6 @@ hudson.jboss42.build=jboss-4.2.0.GA hudson.jboss42.rev=HEAD -hudson.jboss40.url=https://svn.jboss.org/repos/jbossas/branches/Branch_4_0 -hudson.jboss40.build=jboss-4.0.5.SP1 -hudson.jboss40.rev=HEAD - hudson.mail.recipients=thomas.diesler(a)jboss.com, heiko.braun(a)jboss.com hudson.smtp.host=mail.navisite.com Modified: branches/tdiesler/trunk/build/build.xml =================================================================== --- branches/tdiesler/trunk/build/build.xml 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/build/build.xml 2007-05-13 18:06:04 UTC (rev 3087) @@ -11,12 +11,12 @@  -<project default="main" basedir="../build" name="JBossWS-Build"> +<project default="main" basedir=".." name="JBossWS-Build"> - <import file="${basedir}/ant-import/build-setup.xml"/> - <import file="${basedir}/ant-import/build-release.xml"/> - <import file="${basedir}/ant-import/build-samples.xml"/> - <import file="${basedir}/ant-import/build-hudson.xml"/> + <import file="${basedir}/build/ant-import/build-setup.xml"/> + <import file="${basedir}/build/ant-import/build-release.xml"/> + <import file="${basedir}/build/ant-import/build-samples.xml"/> + <import file="${basedir}/build/ant-import/build-hudson.xml"/> <property name="build.output.dir" value="${build.dir}/output"/> @@ -28,8 +28,8 @@ | Build all jar files. --> <target name="jars" depends="prepare" description="Builds all jar files."> - <ant antfile="${spi.dir}/build.xml" target="spi-jars" inheritall="false"/> - <ant antfile="${core.dir}/build.xml" target="core-jars" inheritall="false"/> + <ant antfile="${spi.dir}/build.xml" target="jars" inheritall="false"/> + <ant antfile="${core.dir}/build.xml" target="jars" inheritall="false"/> </target>  @@ -39,16 +39,19 @@ <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="${testsuite.dir}/build.xml" target="clean" inheritall="false"/> + <ant antfile="${int.jboss50.dir}/build.xml" target="clean" inheritall="false"/> + <ant antfile="${int.jboss42.dir}/build.xml" target="clean" inheritall="false"/> + <ant antfile="${int.sunri.dir}/build.xml" target="clean" inheritall="false"/> </target> <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="${jbws.jboss40.dir}/build.xml" target="clobber" inheritall="false"/> - <ant antfile="${sunri.jboss50.dir}/build.xml" target="clobber" inheritall="false"/> + <ant antfile="${int.jboss50.dir}/build.xml" target="clobber" inheritall="false"/> + <ant antfile="${int.jboss42.dir}/build.xml" target="clobber" inheritall="false"/> + <ant antfile="${int.sunri.dir}/build.xml" target="clobber" inheritall="false"/> </target> <target name="main" description="Executes the default target (most)." depends="jars"> @@ -62,10 +65,9 @@ <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="${jbws.jboss40.dir}/build.xml" target="most" inheritall="false"/> - <ant antfile="${sunri.jboss50.dir}/build.xml" target="most" inheritall="false"/> + <ant antfile="${int.jboss50.dir}/build.xml" target="most" inheritall="false"/> + <ant antfile="${int.jboss42.dir}/build.xml" target="most" inheritall="false"/> + <ant antfile="${int.sunri.dir}/build.xml" target="most" inheritall="false"/> </target> <target name="all" description="Create a distribution zip file" depends="most,build-bin-dist,build-src-dist"> Modified: branches/tdiesler/trunk/integration/jboss42/.project =================================================================== --- branches/tdiesler/trunk/integration/jboss42/.project 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/integration/jboss42/.project 2007-05-13 18:06:04 UTC (rev 3087) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>jbws-jboss42</name> + <name>integration-jboss42</name> <comment></comment> <projects> </projects> Modified: branches/tdiesler/trunk/integration/jboss50/.project =================================================================== --- branches/tdiesler/trunk/integration/jboss50/.project 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/integration/jboss50/.project 2007-05-13 18:06:04 UTC (rev 3087) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>jbws-jboss50</name> + <name>integration-jboss50</name> <comment></comment> <projects> </projects> Modified: branches/tdiesler/trunk/integration/jboss50/ant-import/build-thirdparty.xml =================================================================== --- branches/tdiesler/trunk/integration/jboss50/ant-import/build-thirdparty.xml 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/integration/jboss50/ant-import/build-thirdparty.xml 2007-05-13 18:06:04 UTC (rev 3087) @@ -28,7 +28,7 @@ <target name="thirdparty-get" depends="thirdparty-init" description="Gets the thirdparty libraries"/> - <target name="thirdparty-classpath" depends="thirdparty-init,core-jars"> + <target name="thirdparty-classpath" depends="thirdparty-init">  <path id="jbws50.integration.classpath"> @@ -38,19 +38,22 @@ <pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/> <pathelement location="${core.dir}/output/lib/jbossws-core.jar"/> <pathelement location="${jboss50.lib}/jboss-aop-jdk50.jar"/> + <pathelement location="${jboss50.lib}/jboss-common-core.jar"/> + <pathelement location="${jboss50.lib}/jboss-logging-spi.jar"/> <pathelement location="${jboss50.lib}/jboss-deployers.jar"/> <pathelement location="${jboss50.lib}/jboss-j2se.jar"/> <pathelement location="${jboss50.lib}/jboss-system.jar"/> <pathelement location="${jboss50.lib}/jboss-system-jmx.jar"/> <pathelement location="${jboss50.lib}/jboss-vfs.jar"/> + <pathelement location="${jboss50.lib}/jboss-xml-binding.jar"/> <pathelement location="${jboss50.server.lib}/jboss.jar"/> <pathelement location="${jboss50.server.lib}/jboss-javaee.jar"/> + <pathelement location="${jboss50.server.lib}/jbosssx.jar"/> <pathelement location="${jboss50.server.lib}/jnpserver.jar"/> <pathelement location="${jboss50.server.deployers}/jboss-aop-jboss5.deployer/jboss-aspect-library-jdk50.jar"/> <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-annotations-ejb3.jar"/> <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-ejb3.jar"/> <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-ejb3x.jar"/> - <path refid="core.thirdparty.classpath"/> </path> </target> Modified: branches/tdiesler/trunk/integration/jboss50/build.xml =================================================================== --- branches/tdiesler/trunk/integration/jboss50/build.xml 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/integration/jboss50/build.xml 2007-05-13 18:06:04 UTC (rev 3087) @@ -11,22 +11,17 @@  -<project default="main" basedir="../jbws-jboss50" name="JBossWS-JBoss50"> +<project default="main" basedir="../.." name="Integration-JBoss50"> - <import file="${basedir}/../build/ant-import/build-setup.xml"/> + <import file="${basedir}/build/ant-import/build-setup.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="${int.jboss50.dir}/ant-import/build-thirdparty.xml"/> - <import file="${core.dir}/build.xml"/> -    - <property name="jbws50.dir" value="${basedir}"/> + <property name="jbws50.dir" value="${int.jboss50.dir}"/> <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"/> @@ -40,8 +35,9 @@   - <target name="jbws50-init" depends="prepare,thirdparty"> + <target name="init" depends="prepare,thirdparty"> <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> + <ant antfile="${core.dir}/build.xml" target="main" inheritall="false"/> </target>  @@ -56,10 +52,10 @@ | documentation compiles. --> - <target name="jbws50-compile" depends="jbws50-init,core-compile,jbws50-compile-classes,jbws50-compile-etc" description="Compile all source files."/> + <target name="compile" depends="init,compile-classes,compile-etc" description="Compile all source files."/>  - <target name="jbws50-compile-classes" depends="jbws50-init"> + <target name="compile-classes" depends="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}"> @@ -69,7 +65,7 @@ </target>  - <target name="jbws50-compile-etc" depends="jbws50-init"> + <target name="compile-etc" depends="init"> <mkdir dir="${jbws50.output.etc.dir}"/> <copy todir="${jbws50.output.etc.dir}" filtering="yes" overwrite="yes"> <fileset dir="${jbws50.etc.dir}"> @@ -95,13 +91,13 @@  - <target name="jbws50-jars" depends="jbws50-compile,core-jars,jbws50-module-jars" description="Builds all jar files."> + <target name="jars" depends="compile,module-jars" description="Builds all jar files."> </target>  - <target name="jbws50-module-jars" depends="jbws50-init"> + <target name="module-jars" depends="init">  <mkdir dir="${jbws50.output.lib.dir}"/> @@ -133,7 +129,7 @@ <fileset dir="${core.dir}/output/lib"> <include name="jbossws-core.jar"/> </fileset> - <fileset dir="${core.thirdparty.dir}"> + <fileset dir="${core.dir}/thirdparty"> <include name="policy.jar"/> <include name="wsdl4j.jar"/> <include name="xmlsec.jar"/> @@ -172,14 +168,14 @@ </target> <target name="clobber" depends="clean" description="Cleans up all generated files."> - <delete dir="${basedir}/output-tests"/> + <delete dir="${int.jboss50.dir}/output-tests"/> </target> <target name="main" description="Executes the default target (most)." depends="most"/> - <target name="most" description="Builds almost everything." depends="jbws50-jars,tests-main"/> + <target name="most" description="Builds almost everything." depends="jars"/> - <target name="all" description="Create a distribution zip file" depends="main"> + <target name="all" description="Create a distribution zip file" depends="most"> </target> </project> Copied: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployerHook.java (from rev 3086, branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/AbstractDeployerHook.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployerHook.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployerHook.java 2007-05-13 18:06:04 UTC (rev 3087) @@ -0,0 +1,60 @@ +/* + * 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.jboss50; + +//$Id$ + +import org.jboss.deployers.spi.deployer.DeploymentUnit; +import org.jboss.logging.Logger; +import org.jboss.ws.integration.deployment.DeployerManager; + +/** + * An abstract web service deployer. + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public abstract class AbstractDeployerHook implements DeployerHook +{ + // provide logging + protected final Logger log = Logger.getLogger(getClass()); + + protected DeployerManager deployerManager; + + public DeployerManager getDeployerManager() + { + return deployerManager; + } + + public void setDeployerManager(DeployerManager deploymentManager) + { + this.deployerManager = deploymentManager; + } + + /** Return true if this deployment should be ignored + */ + public boolean ignoreDeployment(DeploymentUnit unit) + { + String name = unit.getName(); + return (name.startsWith("jboss:id=") && name.indexOf("service=jacc") > 0); + } +} Copied: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployerHookEJB.java (from rev 3086, branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/AbstractDeployerHookEJB.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployerHookEJB.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployerHookEJB.java 2007-05-13 18:06:04 UTC (rev 3087) @@ -0,0 +1,34 @@ +/* + * 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.jboss50; + +//$Id$ + +/** + * An abstract deployer for EJB Endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public abstract class AbstractDeployerHookEJB extends ArchiveDeployerHook +{ +} Copied: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployerHookJSE.java (from rev 3086, branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/AbstractDeployerHookJSE.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployerHookJSE.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployerHookJSE.java 2007-05-13 18:06:04 UTC (rev 3087) @@ -0,0 +1,44 @@ +/* + * 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.jboss50; + +import org.jboss.deployers.spi.deployer.DeploymentUnit; +import org.jboss.metadata.WebMetaData; + +//$Id$ + +/** + * An abstract deployer for JSE Endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public abstract class AbstractDeployerHookJSE extends ArchiveDeployerHook +{ + public boolean isWebServiceDeployment(DeploymentUnit unit) + { + if (unit.getAttachment(WebMetaData.class) == null) + return false; + + return true; + } +} Copied: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractWebServiceDeployer.java (from rev 3086, branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/AbstractWebServiceDeployer.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractWebServiceDeployer.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractWebServiceDeployer.java 2007-05-13 18:06:04 UTC (rev 3087) @@ -0,0 +1,72 @@ +/* + * 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.jboss50; + +import java.util.LinkedList; +import java.util.List; + +import org.jboss.deployers.plugins.deployer.AbstractSimpleDeployer; +import org.jboss.deployers.spi.DeploymentException; +import org.jboss.deployers.spi.deployer.DeploymentUnit; +import org.jboss.logging.Logger; + +//$Id$ + +/** + * This deployer that calls the registered DeployerHooks + * + * @author Thomas.Diesler(a)jboss.org + * @since 24-Apr-2007 + */ +public abstract class AbstractWebServiceDeployer extends AbstractSimpleDeployer +{ + // provide logging + private static final Logger log = Logger.getLogger(AbstractWebServiceDeployer.class); + + private List<DeployerHook> deployerHooks = new LinkedList<DeployerHook>(); + + public void addDeployerHook(DeployerHook deployer) + { + log.debug("Add deployer hook: " + deployer); + deployerHooks.add(deployer); + } + + public void removeDeployerHook(DeployerHook deployer) + { + log.debug("Remove deployer hook: " + deployer); + deployerHooks.remove(deployer); + } + + @Override + public void deploy(DeploymentUnit unit) throws DeploymentException + { + for (DeployerHook deployer : deployerHooks) + deployer.deploy(unit); + } + + @Override + public void undeploy(DeploymentUnit unit) + { + for (DeployerHook deployer : deployerHooks) + deployer.undeploy(unit); + } +} Copied: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptor.java (from rev 3086, branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/ApplicationMetaDataAdaptor.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptor.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptor.java 2007-05-13 18:06:04 UTC (rev 3087) @@ -0,0 +1,163 @@ +/* + * 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.jboss50; + +// $Id$ + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import org.jboss.deployers.spi.deployer.DeploymentUnit; +import org.jboss.logging.Logger; +import org.jboss.metadata.ApplicationMetaData; +import org.jboss.metadata.BeanMetaData; +import org.jboss.metadata.EjbPortComponentMetaData; +import org.jboss.metadata.MessageDrivenMetaData; +import org.jboss.metadata.SessionMetaData; +import org.jboss.metadata.ApplicationMetaData.WebserviceDescription; +import org.jboss.metadata.ApplicationMetaData.Webservices; +import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; +import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedEjbPortComponentMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedMessageDrivenMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedSessionMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData.PublishLocationAdapter; + +/** + * Build container independent application meta data + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class ApplicationMetaDataAdaptor +{ + // logging support + private static Logger log = Logger.getLogger(ApplicationMetaDataAdaptor.class); + + public static UnifiedApplicationMetaData buildUnifiedApplicationMetaData(UnifiedDeploymentInfo udi, DeploymentUnit unit) + { + ApplicationMetaData appMetaData = unit.getAttachment(ApplicationMetaData.class); + udi.addAttachment(ApplicationMetaData.class, appMetaData); + + UnifiedApplicationMetaData umd = new UnifiedApplicationMetaData(); + buildUnifiedBeanMetaData(umd, appMetaData); + buildWebservicesMetaData(umd, appMetaData); + umd.setSecurityDomain(appMetaData.getSecurityDomain()); + return umd; + } + + private static void buildWebservicesMetaData(UnifiedApplicationMetaData umd, ApplicationMetaData apmd) + { + Webservices webservices = apmd.getWebservices(); + if (webservices != null) + { + String contextRoot = webservices.getContextRoot(); + umd.setPublishLocationAdapter(getPublishLocationAdpater(webservices)); + + List<WebserviceDescription> wsDescriptions = webservices.getWebserviceDescriptions(); + if (wsDescriptions.size() > 1) + log.warn("Multiple <webservice-description> elements not supported"); + + if (wsDescriptions.size() > 0) + { + WebserviceDescription wsd = wsDescriptions.get(0); + umd.setConfigName(wsd.getConfigName()); + umd.setConfigFile(wsd.getConfigFile()); + } + + umd.setWebServiceContextRoot(contextRoot); + } + } + + private static PublishLocationAdapter getPublishLocationAdpater(final Webservices webservices) + { + return new PublishLocationAdapter() + { + public String getWsdlPublishLocationByName(String name) + { + String wsdlPublishLocation = null; + for (WebserviceDescription wsd : webservices.getWebserviceDescriptions()) + { + if (wsd.getDescriptionName().equals(name)) + { + wsdlPublishLocation = wsd.getWsdlPublishLocation(); + } + } + return wsdlPublishLocation; + } + }; + } + + private static void buildUnifiedBeanMetaData(UnifiedApplicationMetaData umd, ApplicationMetaData appMetaData) + { + List<UnifiedBeanMetaData> beans = new ArrayList<UnifiedBeanMetaData>(); + Iterator it = appMetaData.getEnterpriseBeans(); + while (it.hasNext()) + { + BeanMetaData bmd = (BeanMetaData)it.next(); + buildUnifiedBeanMetaData(beans, bmd); + } + umd.setEnterpriseBeans(beans); + } + + private static UnifiedBeanMetaData buildUnifiedBeanMetaData(List<UnifiedBeanMetaData> beans, BeanMetaData bmd) + { + UnifiedBeanMetaData ubmd = null; + if (bmd instanceof SessionMetaData) + { + ubmd = new UnifiedSessionMetaData(); + } + else if (bmd instanceof MessageDrivenMetaData) + { + ubmd = new UnifiedMessageDrivenMetaData(); + ((UnifiedMessageDrivenMetaData)ubmd).setDestinationJndiName(((MessageDrivenMetaData)bmd).getDestinationJndiName()); + } + + if (ubmd != null) + { + ubmd.setEjbName(bmd.getEjbName()); + ubmd.setEjbClass(bmd.getEjbClass()); + ubmd.setServiceEndpointInterface(bmd.getServiceEndpoint()); + ubmd.setHome(bmd.getHome()); + ubmd.setLocalHome(bmd.getLocalHome()); + ubmd.setJndiName(bmd.getJndiName()); + ubmd.setLocalJndiName(bmd.getLocalJndiName()); + + EjbPortComponentMetaData pcmd = bmd.getPortComponent(); + if (pcmd != null) + { + UnifiedEjbPortComponentMetaData upcmd = new UnifiedEjbPortComponentMetaData(); + upcmd.setPortComponentName(pcmd.getPortComponentName()); + upcmd.setPortComponentURI(pcmd.getPortComponentURI()); + upcmd.setAuthMethod(pcmd.getAuthMethod()); + upcmd.setTransportGuarantee(pcmd.getTransportGuarantee()); + upcmd.setSecureWSDLAccess(pcmd.getSecureWSDLAccess()); + ubmd.setPortComponent(upcmd); + } + + beans.add(ubmd); + } + return ubmd; + } +} Copied: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptorEJB3.java (from rev 3086, branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/ApplicationMetaDataAdaptorEJB3.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptorEJB3.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptorEJB3.java 2007-05-13 18:06:04 UTC (rev 3087) @@ -0,0 +1,167 @@ +/* + * 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.jboss50; + +// $Id$ + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import org.jboss.deployers.spi.deployer.DeploymentUnit; +import org.jboss.ejb3.Container; +import org.jboss.ejb3.EJBContainer; +import org.jboss.ejb3.Ejb3Deployment; +import org.jboss.ejb3.SessionContainer; +import org.jboss.ejb3.mdb.MessagingContainer; +import org.jboss.ejb3.metamodel.Ejb3PortComponent; +import org.jboss.ejb3.metamodel.EjbJarDD; +import org.jboss.ejb3.metamodel.EnterpriseBean; +import org.jboss.ejb3.metamodel.WebserviceDescription; +import org.jboss.ejb3.metamodel.Webservices; +import org.jboss.logging.Logger; +import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; +import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedEjbPortComponentMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedMessageDrivenMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedSessionMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData.PublishLocationAdapter; + +/** + * Build container independent application meta data + * + * @author Thomas.Diesler(a)jboss.org + * @since 14-Apr-2007 + */ +public class ApplicationMetaDataAdaptorEJB3 +{ + // logging support + private static Logger log = Logger.getLogger(ApplicationMetaDataAdaptorEJB3.class); + + public static UnifiedApplicationMetaData buildUnifiedApplicationMetaData(UnifiedDeploymentInfo udi, DeploymentUnit unit) + { + Ejb3Deployment ejb3Deployment = unit.getAttachment(Ejb3Deployment.class); + udi.addAttachment(Ejb3Deployment.class, ejb3Deployment); + + EjbJarDD jarDD = unit.getAttachment(EjbJarDD.class); + UnifiedApplicationMetaData umd = new UnifiedApplicationMetaData(); + buildUnifiedBeanMetaData(umd, ejb3Deployment); + buildWebservicesMetaData(umd, jarDD); + return umd; + } + + private static void buildWebservicesMetaData(UnifiedApplicationMetaData umd, EjbJarDD jarDD) + { + // nothing to do + if (jarDD == null) + return; + + Webservices webservices = jarDD.getWebservices(); + if (webservices != null) + { + String contextRoot = webservices.getContextRoot(); + umd.setPublishLocationAdapter(getPublishLocationAdpater(webservices)); + + List<WebserviceDescription> wsDescriptions = webservices.getWebserviceDescriptions(); + if (wsDescriptions.size() > 1) + log.warn("Multiple <webservice-description> elements not supported"); + + if (wsDescriptions.size() > 0) + { + WebserviceDescription wsd = wsDescriptions.get(0); + umd.setConfigName(wsd.getConfigName()); + umd.setConfigFile(wsd.getConfigFile()); + + // com/sun/ts/tests/webservices12/ejb/annotations/WSEjbWebServiceRefTest1 + // WSEjbWebServiceRefTest1VerifyTargetEndpointAddress + if (contextRoot == null) + contextRoot = "/" + wsd.getDescriptionName(); + } + + umd.setWebServiceContextRoot(contextRoot); + } + } + + private static void buildUnifiedBeanMetaData(UnifiedApplicationMetaData umd, Ejb3Deployment ejb3Deployment) + { + List<UnifiedBeanMetaData> ubmdList = new ArrayList<UnifiedBeanMetaData>(); + Iterator<Container> it = ejb3Deployment.getEjbContainers().values().iterator(); + while (it.hasNext()) + { + EJBContainer container = (EJBContainer)it.next(); + UnifiedBeanMetaData ubmd = null; + if (container instanceof SessionContainer) + { + ubmd = new UnifiedSessionMetaData(); + } + else if (container instanceof MessagingContainer) + { + ubmd = new UnifiedMessageDrivenMetaData(); + log.warn("No implemented: initialize MDB destination"); + //((UnifiedMessageDrivenMetaData)ubmd).setDestinationJndiName(((MessagingContainer)container).getDestination()); + } + + if (ubmd != null) + { + ubmd.setEjbName(container.getEjbName()); + ubmd.setEjbClass(container.getBeanClassName()); + + EnterpriseBean bean = container.getXml(); + Ejb3PortComponent pcMetaData = (bean != null ? bean.getPortComponent() : null); + if (pcMetaData != null) + { + UnifiedEjbPortComponentMetaData ejbPortComp = new UnifiedEjbPortComponentMetaData(); + ejbPortComp.setPortComponentName(pcMetaData.getPortComponentName()); + ejbPortComp.setPortComponentURI(pcMetaData.getPortComponentURI()); + ejbPortComp.setAuthMethod(pcMetaData.getAuthMethod()); + ejbPortComp.setTransportGuarantee(pcMetaData.getTransportGuarantee()); + ejbPortComp.setSecureWSDLAccess(pcMetaData.getSecureWSDLAccess()); + + ubmd.setPortComponent(ejbPortComp); + } + + ubmdList.add(ubmd); + } + } + umd.setEnterpriseBeans(ubmdList); + } + + private static PublishLocationAdapter getPublishLocationAdpater(final Webservices webservices) + { + return new PublishLocationAdapter() + { + public String getWsdlPublishLocationByName(String name) + { + String wsdlPublishLocation = null; + for (WebserviceDescription wsd : webservices.getWebserviceDescriptions()) + { + if (wsd.getDescriptionName().equals(name)) + { + wsdlPublishLocation = wsd.getWsdlPublishLocation(); + } + } + return wsdlPublishLocation; + } + }; + } +} Copied: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ArchiveDeployerHook.java (from rev 3086, branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/ArchiveDeployerHook.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ArchiveDeployerHook.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ArchiveDeployerHook.java 2007-05-13 18:06:04 UTC (rev 3087) @@ -0,0 +1,150 @@ +/* + * 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.jboss50; + +//$Id$ + +import java.net.URL; + +import org.jboss.deployers.spi.DeploymentException; +import org.jboss.deployers.spi.deployer.DeploymentUnit; +import org.jboss.virtual.VirtualFile; +import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.ws.integration.deployment.Deployment; +import org.jboss.ws.integration.deployment.WSDeploymentException; +import org.jboss.ws.integration.deployment.Deployment.DeploymentType; +import org.jboss.ws.integration.jboss50.AbstractDeployerHook; +import org.jboss.ws.metadata.webservices.WebservicesFactory; +import org.jboss.ws.metadata.webservices.WebservicesMetaData; +import org.jboss.ws.utils.DOMUtils; +import org.jboss.xb.binding.ObjectModelFactory; +import org.jboss.xb.binding.Unmarshaller; +import org.jboss.xb.binding.UnmarshallerFactory; +import org.w3c.dom.Element; + +/** + * An abstract web service deployer. + * + * deploy(unit) + * if(isWebServiceDeployment) + * dep = createDeployment(unit) + * deploy(dep) + * + * undeploy(unit) + * dep = getDeployment(unit) + * undeploy(dep) + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public abstract class ArchiveDeployerHook extends AbstractDeployerHook +{ + /** Get the deployemnt type this deployer can handle + */ + public abstract DeploymentType getDeploymentType(); + + /** Depending on the type of deployment, this method should return true + * if the deployment contains web service endpoints. + */ + public abstract boolean isWebServiceDeployment(DeploymentUnit unit); + + /** Create the Deployment for a given DeploymentUnit + */ + public abstract Deployment createDeployment(DeploymentUnit unit); + + /** Get the Deployment for a given DeploymentUnit + */ + public Deployment getDeployment(DeploymentUnit unit) + { + Deployment dep = unit.getAttachment(Deployment.class); + return (dep != null && dep.getType() == getDeploymentType() ? dep : null); + } + + public void deploy(DeploymentUnit unit) throws DeploymentException + { + if (ignoreDeployment(unit)) + return; + + if (isWebServiceDeployment(unit)) + { + log.debug("deploy: " + unit.getName()); + Deployment dep = getDeployment(unit); + if (dep == null) + { + dep = createDeployment(unit); + dep.getContext().addAttachment(DeploymentUnit.class, unit); + } + + deployerManager.deploy(dep); + unit.addAttachment(Deployment.class, dep); + } + } + + public void undeploy(DeploymentUnit unit) + { + if (ignoreDeployment(unit)) + return; + + Deployment dep = getDeployment(unit); + if (dep != null) + { + log.debug("undeploy: " + unit.getName()); + deployerManager.undeploy(dep); + unit.removeAttachment(Deployment.class); + } + } + + /** Unmrashall the webservices.xml if there is one + */ + protected WebservicesMetaData getWebservicesMetaData(DeploymentUnit unit) + { + WebservicesMetaData wsMetaData = unit.getAttachment(WebservicesMetaData.class); + UnifiedVirtualFile vfWebservices = getWebservicesFile(unit); + if (wsMetaData == null && vfWebservices != null) + { + try + { + URL wsURL = vfWebservices.toURL(); + Element root = DOMUtils.parse(wsURL.openStream()); + String namespaceURI = root.getNamespaceURI(); + if (namespaceURI.equals("http://java.sun.com/xml/ns/j2ee")) + { + Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); + ObjectModelFactory factory = new WebservicesFactory(wsURL); + wsMetaData = (WebservicesMetaData)unmarshaller.unmarshal(wsURL.openStream(), factory, null); + unit.addAttachment(WebservicesMetaData.class, wsMetaData); + } + } + catch (Exception ex) + { + throw new WSDeploymentException(ex); + } + } + return wsMetaData; + } + + private UnifiedVirtualFile getWebservicesFile(DeploymentUnit unit) + { + VirtualFile vf = unit.getMetaDataFile("webservices.xml"); + return (vf != null ? new VirtualFileAdaptor(vf) : null); + } +} Copied: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/DeployerHook.java (from rev 3086, branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/DeployerHook.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/DeployerHook.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/DeployerHook.java 2007-05-13 18:06:04 UTC (rev 3087) @@ -0,0 +1,40 @@ +/* + * 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.jboss50; + +//$Id$ + +import org.jboss.deployers.spi.DeploymentException; +import org.jboss.deployers.spi.deployer.DeploymentUnit; + +/** + * An interface for all web service deployer hooks + * + * @author Thomas.Diesler(a)jboss.org + * @since 24-Apr-2007 + */ +public interface DeployerHook +{ + void deploy(DeploymentUnit unit) throws DeploymentException; + + void undeploy(DeploymentUnit unit); +} Copied: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/DeploymentInfoAdapter.java (from rev 3086, branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/DeploymentInfoAdapter.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/DeploymentInfoAdapter.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/DeploymentInfoAdapter.java 2007-05-13 18:06:04 UTC (rev 3087) @@ -0,0 +1,100 @@ +/* + * 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.jboss50; + +import java.net.URL; +import java.net.URLClassLoader; + +import org.jboss.deployers.spi.deployer.DeploymentUnit; +import org.jboss.ejb3.Ejb3Deployment; +import org.jboss.logging.Logger; +import org.jboss.metadata.ApplicationMetaData; +import org.jboss.metadata.WebMetaData; +import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; + +// $Id$ + +/** + * Build container independent deployment info. + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class DeploymentInfoAdapter +{ + // logging support + private static Logger log = Logger.getLogger(DeploymentInfoAdapter.class); + + public static void buildDeploymentInfo(UnifiedDeploymentInfo udi, DeploymentUnit unit) + { + udi.addAttachment(DeploymentUnit.class, unit); + + try + { + if (unit.getDeploymentContext().getParent() != null) + { + udi.parent = new UnifiedDeploymentInfo(null); + buildDeploymentInfo(udi.parent, unit.getDeploymentContext().getParent().getDeploymentUnit()); + } + + udi.vfRoot = new VirtualFileAdaptor(unit.getDeploymentContext().getRoot()); + + udi.name = unit.getName(); + udi.simpleName = unit.getSimpleName(); + udi.url = udi.vfRoot.toURL(); + + buildMetaData(udi, unit); + + // Since we create temporary classes, we need to create a delegate loader + // This prevents CCE problems where the parent loader is available at deploy time, + // and a child loader is available at start time. + udi.classLoader = new URLClassLoader(new URL[] {}, unit.getClassLoader()); + + log.debug("UnifiedDeploymentInfo:\n" + udi); + } + catch (RuntimeException rte) + { + throw rte; + } + catch (Exception ex) + { + throw new IllegalStateException(ex); + } + } + + private static void buildMetaData(UnifiedDeploymentInfo udi, DeploymentUnit unit) throws Exception + { + if (unit.getAttachment(Ejb3Deployment.class) != null) + { + udi.metaData = ApplicationMetaDataAdaptorEJB3.buildUnifiedApplicationMetaData(udi, unit); + } + else if (unit.getAttachment(ApplicationMetaData.class) != null) + { + udi.metaData = ApplicationMetaDataAdaptor.buildUnifiedApplicationMetaData(udi, unit); + } + else if (unit.getAttachment(WebMetaData.class) != null) + { + udi.metaData = WebMetaDataAdaptor.buildUnifiedWebMetaData(udi, unit); + udi.webappURL = udi.vfRoot.toURL(); + } + } +} Copied: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerHookEJB21.java (from rev 3086, branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/JAXRPCDeployerHookEJB21.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerHookEJB21.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerHookEJB21.java 2007-05-13 18:06:04 UTC (rev 3087) @@ -0,0 +1,116 @@ +/* + * 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.jboss50; + +//$Id$ + +import org.jboss.deployers.spi.deployer.DeploymentUnit; +import org.jboss.metadata.ApplicationMetaData; +import org.jboss.metadata.BeanMetaData; +import org.jboss.ws.integration.Endpoint; +import org.jboss.ws.integration.BasicEndpoint; +import org.jboss.ws.integration.Service; +import org.jboss.ws.integration.deployment.Deployment; +import org.jboss.ws.integration.deployment.BasicDeploymentImpl; +import org.jboss.ws.integration.deployment.Deployment.DeploymentType; +import org.jboss.ws.metadata.webservices.PortComponentMetaData; +import org.jboss.ws.metadata.webservices.WebserviceDescriptionMetaData; +import org.jboss.ws.metadata.webservices.WebservicesMetaData; +import org.jboss.ws.utils.ObjectNameFactory; + +/** + * A deployer JAXRPC EJB21 Endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class JAXRPCDeployerHookEJB21 extends AbstractDeployerHookEJB +{ + /** Get the deployemnt type this deployer can handle + */ + public DeploymentType getDeploymentType() + { + return DeploymentType.JAXRPC_EJB21; + } + + @Override + public Deployment createDeployment(DeploymentUnit unit) + { + Deployment dep = new BasicDeploymentImpl(); + dep.setType(getDeploymentType()); + dep.setClassLoader(unit.getClassLoader()); + + Service service = dep.getService(); + + ApplicationMetaData appmd = unit.getAttachment(ApplicationMetaData.class); + if (appmd == null) + throw new IllegalStateException("Deployment unit does not contain application meta data"); + + WebservicesMetaData wsMetaData = getWebservicesMetaData(unit); + if (wsMetaData == null) + throw new IllegalStateException("Deployment unit does not contain webservices meta data"); + + // Copy the attachments + dep.getContext().addAttachment(WebservicesMetaData.class, wsMetaData); + dep.getContext().addAttachment(ApplicationMetaData.class, appmd); + + for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions()) + { + for (PortComponentMetaData pcmd : wsd.getPortComponents()) + { + String ejbLink = pcmd.getEjbLink(); + if (ejbLink == null) + throw new IllegalStateException("ejb-link cannot be null"); + + BeanMetaData beanMetaData = appmd.getBeanByEjbName(ejbLink); + if (beanMetaData == null) + throw new IllegalStateException("Cannot obtain bean meta data for: " + ejbLink); + + String ejbClass = beanMetaData.getEjbClass(); + try + { + ClassLoader loader = unit.getClassLoader(); + Class<?> epBean = loader.loadClass(ejbClass.trim()); + + // Create the endpoint + Endpoint endpoint = new BasicEndpoint(service, epBean); + String nameStr = Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + ejbLink; + endpoint.setName(ObjectNameFactory.create(nameStr)); + + service.addEndpoint(endpoint); + } + catch (ClassNotFoundException ex) + { + log.warn("Cannot load servlet class: " + ejbClass); + } + } + } + return dep; + } + + @Override + public boolean isWebServiceDeployment(DeploymentUnit unit) + { + WebservicesMetaData wsMetaData = getWebservicesMetaData(unit); + return wsMetaData != null && unit.getAllMetaData(ApplicationMetaData.class).size() > 0; + } +} \ No newline at end of file Copied: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerHookJSE.java (from rev 3086, branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/JAXRPCDeployerHookJSE.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerHookJSE.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerHookJSE.java 2007-05-13 18:06:04 UTC (rev 3087) @@ -0,0 +1,133 @@ +/* + * 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.jboss50; + +//$Id$ + +import org.jboss.deployers.spi.deployer.DeploymentUnit; +import org.jboss.metadata.WebMetaData; +import org.jboss.metadata.web.Servlet; +import org.jboss.ws.integration.BasicEndpoint; +import org.jboss.ws.integration.Endpoint; +import org.jboss.ws.integration.Service; +import org.jboss.ws.integration.deployment.BasicDeploymentImpl; +import org.jboss.ws.integration.deployment.Deployment; +import org.jboss.ws.integration.deployment.Deployment.DeploymentType; +import org.jboss.ws.metadata.webservices.PortComponentMetaData; +import org.jboss.ws.metadata.webservices.WebserviceDescriptionMetaData; +import org.jboss.ws.metadata.webservices.WebservicesMetaData; +import org.jboss.ws.utils.ObjectNameFactory; + +/** + * A deployer JAXRPC JSE Endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class JAXRPCDeployerHookJSE extends AbstractDeployerHookJSE +{ + /** Get the deployemnt type this deployer can handle + */ + public DeploymentType getDeploymentType() + { + return DeploymentType.JAXRPC_JSE; + } + + /** + * Create an endpoint for every servlet-link in webservices.xml + */ + @Override + public Deployment createDeployment(DeploymentUnit unit) + { + Deployment dep = new BasicDeploymentImpl(); + dep.setType(getDeploymentType()); + dep.setClassLoader(unit.getClassLoader()); + + Service service = dep.getService(); + + WebMetaData webMetaData = unit.getAttachment(WebMetaData.class); + if (webMetaData == null) + throw new IllegalStateException("Deployment unit does not contain web meta data"); + + WebservicesMetaData wsMetaData = getWebservicesMetaData(unit); + if (wsMetaData == null) + throw new IllegalStateException("Deployment unit does not contain webservices meta data"); + + // Copy the attachments + dep.getContext().addAttachment(WebservicesMetaData.class, wsMetaData); + dep.getContext().addAttachment(WebMetaData.class, webMetaData); + + for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions()) + { + for (PortComponentMetaData pcmd : wsd.getPortComponents()) + { + String servletLink = pcmd.getServletLink(); + if (servletLink == null) + throw new IllegalStateException("servlet-link cannot be null"); + + Servlet servlet = getServletForName(webMetaData, servletLink); + String servletClass = servlet.getServletClass(); + + try + { + ClassLoader loader = unit.getClassLoader(); + Class<?> epBean = loader.loadClass(servletClass.trim()); + + // Create the endpoint + Endpoint endpoint = new BasicEndpoint(service, epBean); + String nameStr = Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + servletLink; + endpoint.setName(ObjectNameFactory.create(nameStr)); + + service.addEndpoint(endpoint); + } + catch (ClassNotFoundException ex) + { + log.warn("Cannot load servlet class: " + servletClass); + } + } + } + + return dep; + } + + private Servlet getServletForName(WebMetaData wmd, String servletLink) + { + for (Servlet servlet : wmd.getServlets()) + { + if (servletLink.equals(servlet.getName())) + { + return servlet; + } + } + throw new IllegalStateException("Cannot find servlet for link: " + servletLink); + } + + @Override + public boolean isWebServiceDeployment(DeploymentUnit unit) + { + if (super.isWebServiceDeployment(unit) == false) + return false; + + WebservicesMetaData wsMetaData = getWebservicesMetaData(unit); + return wsMetaData != null; + } +} Copied: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerHookEJB3.java (from rev 3086, branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/JAXWSDeployerHookEJB3.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerHookEJB3.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerHookEJB3.java 2007-05-13 18:06:04 UTC (rev 3087) @@ -0,0 +1,129 @@ +/* + * 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.jboss50; + +//$Id$ + +import java.util.Iterator; + +import javax.jws.WebService; +import javax.xml.ws.WebServiceProvider; + +import org.jboss.deployers.spi.deployer.DeploymentUnit; +import org.jboss.ejb3.EJBContainer; +import org.jboss.ejb3.Ejb3Deployment; +import org.jboss.ejb3.stateless.StatelessContainer; +import org.jboss.ws.integration.BasicEndpoint; +import org.jboss.ws.integration.Endpoint; +import org.jboss.ws.integration.Service; +import org.jboss.ws.integration.deployment.BasicDeploymentImpl; +import org.jboss.ws.integration.deployment.Deployment; +import org.jboss.ws.integration.deployment.Deployment.DeploymentType; +import org.jboss.ws.utils.ObjectNameFactory; + +/** + * A deployer JAXWS EJB3 Endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class JAXWSDeployerHookEJB3 extends AbstractDeployerHookEJB +{ + /** Get the deployemnt type this deployer can handle + */ + public DeploymentType getDeploymentType() + { + return DeploymentType.JAXWS_EJB3; + } + + @Override + public Deployment createDeployment(DeploymentUnit unit) + { + Deployment dep = new BasicDeploymentImpl(); + dep.setType(getDeploymentType()); + dep.setClassLoader(unit.getClassLoader()); + + Service service = dep.getService(); + + Ejb3Deployment ejb3Deployment = unit.getAttachment(Ejb3Deployment.class); + if (ejb3Deployment == null) + throw new IllegalStateException("Deployment unit does not contain ejb3 deployment"); + + // Copy the attachments + dep.getContext().addAttachment(Ejb3Deployment.class, ejb3Deployment); + + Iterator it = ejb3Deployment.getEjbContainers().values().iterator(); + while (it.hasNext()) + { + EJBContainer container = (EJBContainer)it.next(); + if (isWebServiceBean(container)) + { + String ejbName = container.getEjbName(); + Class epBean = container.getBeanClass(); + + // Create the endpoint + Endpoint endpoint = new BasicEndpoint(service, epBean); + String nameStr = Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + ejbName; + endpoint.setName(ObjectNameFactory.create(nameStr)); + + service.addEndpoint(endpoint); + } + } + + return dep; + } + + @Override + public boolean isWebServiceDeployment(DeploymentUnit unit) + { + Ejb3Deployment ejb3Deployment = unit.getAttachment(Ejb3Deployment.class); + if (ejb3Deployment == null) + return false; + + boolean isWebServiceDeployment = false; + + Iterator it = ejb3Deployment.getEjbContainers().values().iterator(); + while (it.hasNext()) + { + EJBContainer container = (EJBContainer)it.next(); + if (isWebServiceBean(container)) + { + isWebServiceDeployment = true; + break; + } + } + + return isWebServiceDeployment; + } + + private boolean isWebServiceBean(EJBContainer container) + { + boolean isWebServiceBean = false; + if (container instanceof StatelessContainer) + { + boolean isWebService = container.resolveAnnotation(WebService.class) != null; + boolean isWebServiceProvider = container.resolveAnnotation(WebServiceProvider.class) != null; + isWebServiceBean = isWebService || isWebServiceProvider; + } + return isWebServiceBean; + } +} \ No newline at end of file Copied: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerHookJSE.java (from rev 3086, branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/JAXWSDeployerHookJSE.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerHookJSE.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerHookJSE.java 2007-05-13 18:06:04 UTC (rev 3087) @@ -0,0 +1,150 @@ +/* + * 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.jboss50; + +//$Id$ + +import java.util.ArrayList; +import java.util.List; + +import javax.jws.WebService; +import javax.xml.ws.WebServiceProvider; + +import org.jboss.deployers.spi.deployer.DeploymentUnit; +import org.jboss.metadata.WebMetaData; +import org.jboss.metadata.web.Servlet; +import org.jboss.ws.integration.BasicEndpoint; +import org.jboss.ws.integration.Endpoint; +import org.jboss.ws.integration.Service; +import org.jboss.ws.integration.deployment.BasicDeploymentImpl; +import org.jboss.ws.integration.deployment.Deployment; +import org.jboss.ws.integration.deployment.Deployment.DeploymentType; +import org.jboss.ws.utils.ObjectNameFactory; + +/** + * A deployer JAXWS JSE Endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class JAXWSDeployerHookJSE extends AbstractDeployerHookJSE +{ + /** Get the deployemnt type this deployer can handle + */ + public DeploymentType getDeploymentType() + { + return DeploymentType.JAXWS_JSE; + } + + @Override + public Deployment createDeployment(DeploymentUnit unit) + { + Deployment dep = new BasicDeploymentImpl(); + dep.setType(getDeploymentType()); + dep.setClassLoader(unit.getClassLoader()); + + Service service = dep.getService(); + + WebMetaData webMetaData = unit.getAttachment(WebMetaData.class); + if (webMetaData == null) + throw new IllegalStateException("Deployment unit does not contain web meta data"); + + // Copy the attachments + dep.getContext().addAttachment(WebMetaData.class, webMetaData); + + List<Servlet> servlets = getRelevantServlets(webMetaData, unit.getClassLoader()); + for (Servlet servlet : servlets) + { + String servletName = servlet.getName(); + String servletClass = servlet.getServletClass(); + + try + { + ClassLoader loader = unit.getClassLoader(); + Class<?> epBean = loader.loadClass(servletClass.trim()); + + // Create the endpoint + Endpoint endpoint = new BasicEndpoint(service, epBean); + String nameStr = Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + servletName; + endpoint.setName(ObjectNameFactory.create(nameStr)); + + service.addEndpoint(endpoint); + } + catch (ClassNotFoundException ex) + { + log.warn("Cannot load servlet class: " + servletClass); + continue; + } + } + + return dep; + } + + @Override + public boolean isWebServiceDeployment(DeploymentUnit unit) + { + if (super.isWebServiceDeployment(unit) == false) + return false; + + boolean isWebServiceDeployment = false; + try + { + WebMetaData webMetaData = unit.getAttachment(WebMetaData.class); + List<Servlet> servlets = getRelevantServlets(webMetaData, unit.getClassLoader()); + isWebServiceDeployment = servlets.size() > 0; + } + catch (Exception ex) + { + log.error("Cannot process web deployment", ex); + } + + return isWebServiceDeployment; + } + + private List<Servlet> getRelevantServlets(WebMetaData webMetaData, ClassLoader loader) + { + List<Servlet> servlets = new ArrayList<Servlet>(); + for (Servlet servlet : webMetaData.getServlets()) + { + String servletClassName = servlet.getServletClass(); + + // Skip JSPs + if (servletClassName == null || servletClassName.length() == 0) + continue; + + try + { + Class<?> servletClass = loader.loadClass(servletClassName.trim()); + boolean isWebService = servletClass.isAnnotationPresent(WebService.class); + boolean isWebServiceProvider = servletClass.isAnnotationPresent(WebServiceProvider.class); + if (isWebService || isWebServiceProvider) + servlets.add(servlet); + } + catch (ClassNotFoundException ex) + { + log.warn("Cannot load servlet class: " + servletClassName); + continue; + } + } + return servlets; + } +} \ No newline at end of file Copied: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/MainDeployerHook.java (from rev 3086, branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/MainDeployerHook.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/MainDeployerHook.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/MainDeployerHook.java 2007-05-13 18:06:04 UTC (rev 3087) @@ -0,0 +1,62 @@ +/* + * 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.jboss50; + +//$Id$ + +import org.jboss.deployers.spi.DeploymentException; +import org.jboss.deployers.spi.deployer.DeploymentUnit; +import org.jboss.ws.integration.deployment.Deployment; +import org.jboss.ws.integration.jboss50.AbstractDeployerHook; + +/** + * A basic hook that delegates a deployment manger. + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class MainDeployerHook extends AbstractDeployerHook +{ + public void deploy(DeploymentUnit unit) throws DeploymentException + { + if (ignoreDeployment(unit)) + return; + + Deployment dep = unit.getAttachment(Deployment.class); + if (dep != null) + { + deployerManager.deploy(dep); + } + } + + public void undeploy(DeploymentUnit unit) + { + if (ignoreDeployment(unit)) + return; + + Deployment dep = unit.getAttachment(Deployment.class); + if (dep != null) + { + deployerManager.undeploy(dep); + } + } +} Copied: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ManagedServerConfig.java (from rev 3086, branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/ManagedServerConfig.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ManagedServerConfig.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ManagedServerConfig.java 2007-05-13 18:06:04 UTC (rev 3087) @@ -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.jboss50; + +// $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; + } +} Copied: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ManagedServerConfigMBean.java (from rev 3086, branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/ManagedServerConfigMBean.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ManagedServerConfigMBean.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ManagedServerConfigMBean.java 2007-05-13 18:06:04 UTC (rev 3087) @@ -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.jboss50; + +import org.jboss.ws.integration.management.ServerConfig; + +/** + * MBean interface. + * @since 15-April-2004 + */ +public interface ManagedServerConfigMBean extends ServerConfig +{ +} Copied: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/UnifiedDeploymentInfoDeployer.java (from rev 3086, branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/UnifiedDeploymentInfoDeployer.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/UnifiedDeploymentInfoDeployer.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/UnifiedDeploymentInfoDeployer.java 2007-05-13 18:06:04 UTC (rev 3087) @@ -0,0 +1,69 @@ +/* + * 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.jboss50; + +//$Id$ + +import org.jboss.deployers.spi.deployer.DeploymentUnit; +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.webservices.WebservicesMetaData; + +/** + * A deployer that builds the UnifiedDeploymentInfo + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class UnifiedDeploymentInfoDeployer extends AbstractDeployer +{ + @Override + public void create(Deployment dep) + { + UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); + if (udi == null) + { + DeploymentUnit unit = dep.getContext().getAttachment(DeploymentUnit.class); + if (unit == null) + throw new IllegalStateException("Cannot obtain deployment unit"); + + DeploymentType type = dep.getType(); + if (type.toString().startsWith("JAXWS")) + { + udi = new JAXWSDeployment(type); + DeploymentInfoAdapter.buildDeploymentInfo(udi, unit); + } + else + { + WebservicesMetaData wsMetaData = dep.getContext().getAttachment(WebservicesMetaData.class); + udi = new JAXRPCDeployment(type, wsMetaData); + DeploymentInfoAdapter.buildDeploymentInfo(udi, unit); + } + + dep.getContext().addAttachment(UnifiedDeploymentInfo.class, udi); + } + } +} \ No newline at end of file Copied: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/VirtualFileAdaptor.java (from rev 3086, branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/VirtualFileAdaptor.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/VirtualFileAdaptor.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/VirtualFileAdaptor.java 2007-05-13 18:06:04 UTC (rev 3087) @@ -0,0 +1,66 @@ +/* + * 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.jboss50; + +import java.io.IOException; +import java.net.URL; + +import org.jboss.virtual.VirtualFile; +import org.jboss.ws.integration.UnifiedVirtualFile; + +// $Id$ + +/** + * A JBoss50 VirtualFile adaptor + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class VirtualFileAdaptor implements UnifiedVirtualFile +{ + private static final long serialVersionUID = 6547394037548338042L; + + private VirtualFile root; + + public VirtualFileAdaptor(VirtualFile root) + { + this.root = root; + } + + public UnifiedVirtualFile findChild(String child) throws IOException + { + VirtualFile vf = root.findChild(child); + return new VirtualFileAdaptor(vf); + } + + public URL toURL() + { + try + { + return root.toURL(); + } + catch (Exception e) + { + return null; + } + } +} Copied: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebMetaDataAdaptor.java (from rev 3086, branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/WebMetaDataAdaptor.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebMetaDataAdaptor.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebMetaDataAdaptor.java 2007-05-13 18:06:04 UTC (rev 3087) @@ -0,0 +1,136 @@ +/* + * 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.jboss50; + +// $Id$ + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +import org.jboss.deployers.spi.deployer.DeploymentUnit; +import org.jboss.metadata.WebMetaData; +import org.jboss.metadata.WebSecurityMetaData; +import org.jboss.metadata.WebSecurityMetaData.WebResourceCollection; +import org.jboss.metadata.web.Servlet; +import org.jboss.metadata.web.ServletMapping; +import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; +import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData.PublishLocationAdapter; +import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData.UnifiedWebResourceCollection; + +/** + * Build container independent web meta data + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class WebMetaDataAdaptor +{ + public static UnifiedWebMetaData buildUnifiedWebMetaData(UnifiedDeploymentInfo udi, DeploymentUnit unit) + { + WebMetaData wmd = unit.getAttachment(WebMetaData.class); + udi.addAttachment(WebMetaData.class, wmd); + + UnifiedWebMetaData umd = new UnifiedWebMetaData(); + umd.setContextRoot(wmd.getContextRoot()); + umd.setServletMappings(getServletMappings(wmd)); + umd.setServletClassNames(getServletClassMap(wmd)); + umd.setConfigName(wmd.getConfigName()); + umd.setConfigFile(wmd.getConfigFile()); + umd.setSecurityDomain(wmd.getSecurityDomain()); + umd.setPublishLocationAdapter(getPublishLocationAdpater(wmd)); + umd.setSecurityMetaData(getSecurityMetaData(wmd.getSecurityContraints())); + + return umd; + } + + private static PublishLocationAdapter getPublishLocationAdpater(final WebMetaData wmd) + { + return new PublishLocationAdapter() + { + public String getWsdlPublishLocationByName(String name) + { + return wmd.getWsdlPublishLocationByName(name); + } + }; + } + + protected static List<UnifiedWebSecurityMetaData> getSecurityMetaData(final Iterator securityConstraints) + { + ArrayList<UnifiedWebSecurityMetaData> unifiedsecurityMetaData = new ArrayList<UnifiedWebSecurityMetaData>(); + + while (securityConstraints.hasNext()) + { + WebSecurityMetaData securityMetaData = (WebSecurityMetaData)securityConstraints.next(); + + UnifiedWebSecurityMetaData current = new UnifiedWebSecurityMetaData(); + unifiedsecurityMetaData.add(current); + + current.setTransportGuarantee(securityMetaData.getTransportGuarantee()); + + Map<String, WebResourceCollection> resources = securityMetaData.getWebResources(); + for (WebResourceCollection webResource : resources.values()) + { + UnifiedWebResourceCollection currentResource = current.addWebResource(webResource.getName()); + for (String currentPattern : webResource.getUrlPatterns()) + { + currentResource.addPattern(currentPattern); + } + } + } + + return unifiedsecurityMetaData; + } + + private static Map<String, String> getServletMappings(WebMetaData wmd) + { + Map<String, String> mappings = new HashMap<String, String>(); + Iterator it = wmd.getServletMappings().iterator(); + while (it.hasNext()) + { + ServletMapping sm = (ServletMapping)it.next(); + // FIXME - Add support for multiple mappings + mappings.put(sm.getName(), sm.getUrlPatterns().get(0)); + } + return mappings; + } + + private static Map<String, String> getServletClassMap(WebMetaData wmd) + { + Map<String, String> mappings = new HashMap<String, String>(); + Iterator it = wmd.getServlets().iterator(); + while (it.hasNext()) + { + Servlet servlet = (Servlet)it.next(); + // Skip JSPs + if (servlet.getServletClass() == null || servlet.getServletClass().length() == 0) + continue; + + mappings.put(servlet.getName(), servlet.getServletClass()); + } + return mappings; + } +} Copied: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceDeployerEJB.java (from rev 3086, branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/WebServiceDeployerEJB.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceDeployerEJB.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceDeployerEJB.java 2007-05-13 18:06:04 UTC (rev 3087) @@ -0,0 +1,53 @@ +/* + * 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.jboss50; + +//$Id$ + +/** + * This web service deployer for EJB + * + * @author Thomas.Diesler(a)jboss.org + * @since 24-Apr-2007 + */ +public class WebServiceDeployerEJB extends AbstractWebServiceDeployer +{ + private int relOrderEJB2x; + private int relOrderEJB3; + + public void setRelOrderEJB2x(int relOrderEJB2x) + { + this.relOrderEJB2x = relOrderEJB2x; + } + + public void setRelOrderEJB3(int relOrderEJB3) + { + this.relOrderEJB3 = relOrderEJB3; + } + + @Override + public int getRelativeOrder() + { + return Math.max(relOrderEJB2x, relOrderEJB3) + 1; + } + +} Copied: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceDeployerJSE.java (from rev 3086, branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/WebServiceDeployerJSE.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceDeployerJSE.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceDeployerJSE.java 2007-05-13 18:06:04 UTC (rev 3087) @@ -0,0 +1,46 @@ +/* + * 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.jboss50; + +//$Id$ + +/** + * This web service deployer for JSE + * + * @author Thomas.Diesler(a)jboss.org + * @since 24-Apr-2007 + */ +public class WebServiceDeployerJSE extends AbstractWebServiceDeployer +{ + private int relOrderWar; + + public void setRelOrderWar(int relOrderWar) + { + this.relOrderWar = relOrderWar; + } + + @Override + public int getRelativeOrder() + { + return relOrderWar - 1; + } +} Copied: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceMainDeployer.java (from rev 3086, branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/WebServiceMainDeployer.java) =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceMainDeployer.java (rev 0) +++ branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceMainDeployer.java 2007-05-13 18:06:04 UTC (rev 3087) @@ -0,0 +1,52 @@ +/* + * 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.jboss50; + +//$Id$ + +/** + * The main web service deployer + * + * @author Thomas.Diesler(a)jboss.org + * @since 24-Apr-2007 + */ +public class WebServiceMainDeployer extends AbstractWebServiceDeployer +{ + private int relOrderJSE; + private int relOrderEJB; + + public void setRelOrderEJB(int relOrderEJB) + { + this.relOrderEJB = relOrderEJB; + } + + public void setRelOrderJSE(int relOrderJSE) + { + this.relOrderJSE = relOrderJSE; + } + + @Override + public int getRelativeOrder() + { + return Math.max(relOrderEJB, relOrderJSE) + 1; + } +} Modified: branches/tdiesler/trunk/integration/spi/.project =================================================================== --- branches/tdiesler/trunk/integration/spi/.project 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/integration/spi/.project 2007-05-13 18:06:04 UTC (rev 3087) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>jbossws-spi</name> + <name>spi</name> <comment></comment> <projects> </projects> Modified: branches/tdiesler/trunk/integration/spi/ant-import/build-release.xml =================================================================== --- branches/tdiesler/trunk/integration/spi/ant-import/build-release.xml 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/integration/spi/ant-import/build-release.xml 2007-05-13 18:06:04 UTC (rev 3087) @@ -14,7 +14,7 @@ <project>  - <target name="release" depends="spi-jars" + <target name="release" depends="jars" description="Release to jboss.local.repository">  @@ -28,7 +28,7 @@ </copy> <copy tofile="${jboss.repository.dir}/jbossws-spi/${repository.id}/component-info.xml" file="${spi.etc.dir}/component-info.xml" filtering="true" overwrite="true"> <filterset> - <filtersfile file="${basedir}/version.properties"/> + <filtersfile file="${spi.dir}/version.properties"/> </filterset> </copy> Modified: branches/tdiesler/trunk/integration/spi/ant-import/build-thirdparty.xml =================================================================== --- branches/tdiesler/trunk/integration/spi/ant-import/build-thirdparty.xml 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/integration/spi/ant-import/build-thirdparty.xml 2007-05-13 18:06:04 UTC (rev 3087) @@ -17,64 +17,61 @@   - <target name="spi-thirdparty" depends="spi-thirdparty-init,spi-thirdparty-get,spi-thirdparty-classpath"> - </target> - - <target name="spi-thirdparty-init" depends="prepare"> + <target name="thirdparty-init" depends="prepare"> - <property name="spi.thirdparty.dir" value="${spi.dir}/thirdparty"/> - <checksum file="${build.dir}/version.properties" fileext=".md5" verifyproperty="spi.checksum.ok"/> - <condition property="spi.force.thirdparty"> + <property name="thirdparty.dir" value="${spi.dir}/thirdparty"/> + <checksum file="${build.dir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/> + <condition property="force.thirdparty"> <or> <not> - <available file="${spi.thirdparty.dir}" type="dir"/> + <available file="${thirdparty.dir}" type="dir"/> </not> - <isfalse value="${spi.checksum.ok}"/> + <isfalse value="${checksum.ok}"/> <isset property="force.thirdparty.get"/> </or> </condition> - <echo message="checksum.ok = ${spi.checksum.ok}"/> + <echo message="checksum.ok = ${checksum.ok}"/> </target> - <target name="spi-thirdparty-get" depends="spi-thirdparty-init" if="spi.force.thirdparty" + <target name="thirdparty-get" depends="thirdparty-init" if="force.thirdparty" description="Gets the thirdparty libraries"> - <mkdir dir="${spi.thirdparty.dir}"/> - <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar" dest="${spi.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="${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"/> - <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency.jar" dest="${spi.thirdparty.dir}/jboss-dependency.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency-src.zip" dest="${spi.thirdparty.dir}/jboss-dependency-src.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers.jar" dest="${spi.thirdparty.dir}/jboss-deployers.jar" usetimestamp="true" verbose="true"/> - <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"/> + <mkdir dir="${thirdparty.dir}"/> + <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/jboss-javaee/${jboss-javaee}/lib/jboss-javaee.jar" dest="${thirdparty.dir}/jboss-javaee.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-dependency-src.zip" dest="${thirdparty.dir}/jboss-dependency-src.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers.jar" dest="${thirdparty.dir}/jboss-deployers.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers-src.zip" dest="${thirdparty.dir}/jboss-deployers-src.zip" 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}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer-src.zip" dest="${thirdparty.dir}/jboss-microcontainer-src.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/junit/${junit}/lib/junit.jar" dest="${thirdparty.dir}/junit.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-api.jar" dest="${thirdparty.dir}/jaxws-api.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jsr181-api.jar" dest="${thirdparty.dir}/jsr181-api.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"/> <checksum file="${build.dir}/version.properties" fileext=".md5"/> </target> - <target name="spi-thirdparty-classpath" depends="spi-thirdparty-init"> + <target name="thirdparty-classpath" depends="thirdparty-get">  - <path id="spi.thirdparty.classpath"> - <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"/> - <pathelement location="${spi.thirdparty.dir}/jsr181-api.jar"/> - <pathelement location="${spi.thirdparty.dir}/servlet-api.jar"/> + <path id="thirdparty.classpath"> + <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-javaee.jar"/> + <pathelement location="${thirdparty.dir}/jboss-microcontainer.jar"/> + <pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/> + <pathelement location="${thirdparty.dir}/jaxws-api.jar"/> + <pathelement location="${thirdparty.dir}/jsr181-api.jar"/> + <pathelement location="${thirdparty.dir}/servlet-api.jar"/> </path> </target> Modified: branches/tdiesler/trunk/integration/spi/build.xml =================================================================== --- branches/tdiesler/trunk/integration/spi/build.xml 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/integration/spi/build.xml 2007-05-13 18:06:04 UTC (rev 3087) @@ -11,9 +11,9 @@  -<project default="main" basedir="../jbossws-spi"> +<project default="main" basedir="../.."> - <import file="${basedir}/../build/ant-import/build-setup.xml"/> + <import file="${basedir}/build/ant-import/build-setup.xml"/> <import file="${spi.dir}/ant-import/build-release.xml"/> <import file="${spi.dir}/ant-import/build-thirdparty.xml"/> @@ -36,7 +36,7 @@   - <target name="spi-init" depends="prepare,spi-thirdparty"> + <target name="init" depends="prepare,thirdparty-classpath"> </target>  @@ -51,23 +51,23 @@ | documentation compiles. --> - <target name="spi-compile" depends="spi-init,spi-compile-classes,spi-compile-etc" + <target name="compile" depends="init,compile-classes,compile-etc" description="Compile all source files."/>  - <target name="spi-compile-classes" depends="spi-init"> + <target name="compile-classes" depends="init">  <mkdir dir="${spi.output.classes.dir}"/> <javac srcdir="${spi.java.dir}" sourcepath="" destdir="${spi.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}" source="1.5" target="1.5"> <include name="org/jboss/ws/**"/> - <classpath refid="spi.thirdparty.classpath"/> + <classpath refid="thirdparty.classpath"/> </javac> </target>  - <target name="spi-compile-etc" depends="spi-init"> + <target name="compile-etc" depends="init"> <mkdir dir="${spi.output.etc.dir}"/> <copy todir="${spi.output.etc.dir}" filtering="yes" overwrite="yes"> <fileset dir="${spi.etc.dir}"> @@ -80,7 +80,7 @@ <filter token="java.vm.version" value="${java.vm.version}"/> <filter token="java.vm.vendor" value="${java.vm.vendor}"/> <filter token="build.id" value="${build.id}"/> - <filter token="implementation.version" value="jbossws-spi-${version.id}"/> + <filter token="implementation.version" value="jbossws-${version.id}"/> <filtersfile file="${build.dir}/version.properties"/> </filterset> </copy> @@ -93,13 +93,13 @@  - <target name="spi-jars" depends="spi-compile,spi-module-jars" description="Builds all jar files."> + <target name="jars" depends="compile,module-jars" description="Builds all jar files."> </target>  - <target name="spi-module-jars"> + <target name="module-jars">  <mkdir dir="${spi.output.lib.dir}"/> @@ -109,8 +109,8 @@ </fileset> </jar> -  - <zip zipfile="${spi.output.lib.dir}/jbossws-spi-src.zip" > +  + <zip zipfile="${spi.output.lib.dir}/jbossws-src.zip" > <fileset dir="${spi.java.dir}"/> </zip> @@ -121,7 +121,7 @@   - <target name="spi-javadoc" depends="spi-init" description="Generate the Javadoc"> + <target name="javadoc" depends="init" description="Generate the Javadoc"> <mkdir dir="${spi.output.apidocs.dir}"/> <javadoc destdir="${spi.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API"> @@ -144,12 +144,12 @@ </target> <target name="clobber" depends="clean" description="Cleans up all generated files."> - <delete dir="${basedir}/thirdparty"/> + <delete dir="${spi.dir}/thirdparty"/> </target> <target name="main" description="Executes the default target (most)." depends="most"/> - <target name="most" description="Builds almost everything." depends="spi-jars"/> + <target name="most" description="Builds almost everything." depends="jars"/> <target name="all" description="Create a distribution zip file" depends="main"> </target> Modified: branches/tdiesler/trunk/integration/sunri/.project =================================================================== --- branches/tdiesler/trunk/integration/sunri/.project 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/integration/sunri/.project 2007-05-13 18:06:04 UTC (rev 3087) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>sunri-jboss50</name> + <name>integration-sunri</name> <comment></comment> <projects> </projects> Deleted: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/AbstractDeployerHook.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/AbstractDeployerHook.java 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/AbstractDeployerHook.java 2007-05-13 18:06:04 UTC (rev 3087) @@ -1,60 +0,0 @@ -/* - * 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.jboss50.common; - -//$Id$ - -import org.jboss.deployers.spi.deployer.DeploymentUnit; -import org.jboss.logging.Logger; -import org.jboss.ws.integration.deployment.DeployerManager; - -/** - * An abstract web service deployer. - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public abstract class AbstractDeployerHook implements DeployerHook -{ - // provide logging - protected final Logger log = Logger.getLogger(getClass()); - - protected DeployerManager deployerManager; - - public DeployerManager getDeployerManager() - { - return deployerManager; - } - - public void setDeployerManager(DeployerManager deploymentManager) - { - this.deployerManager = deploymentManager; - } - - /** Return true if this deployment should be ignored - */ - public boolean ignoreDeployment(DeploymentUnit unit) - { - String name = unit.getName(); - return (name.startsWith("jboss:id=") && name.indexOf("service=jacc") > 0); - } -} Deleted: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/AbstractDeployerHookEJB.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/AbstractDeployerHookEJB.java 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/AbstractDeployerHookEJB.java 2007-05-13 18:06:04 UTC (rev 3087) @@ -1,34 +0,0 @@ -/* - * 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.jboss50.common; - -//$Id$ - -/** - * An abstract deployer for EJB Endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public abstract class AbstractDeployerHookEJB extends ArchiveDeployerHook -{ -} Deleted: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/AbstractDeployerHookJSE.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/AbstractDeployerHookJSE.java 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/AbstractDeployerHookJSE.java 2007-05-13 18:06:04 UTC (rev 3087) @@ -1,44 +0,0 @@ -/* - * 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.jboss50.common; - -import org.jboss.deployers.spi.deployer.DeploymentUnit; -import org.jboss.metadata.WebMetaData; - -//$Id$ - -/** - * An abstract deployer for JSE Endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public abstract class AbstractDeployerHookJSE extends ArchiveDeployerHook -{ - public boolean isWebServiceDeployment(DeploymentUnit unit) - { - if (unit.getAttachment(WebMetaData.class) == null) - return false; - - return true; - } -} Deleted: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/AbstractWebServiceDeployer.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/AbstractWebServiceDeployer.java 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/AbstractWebServiceDeployer.java 2007-05-13 18:06:04 UTC (rev 3087) @@ -1,72 +0,0 @@ -/* - * 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.jboss50.common; - -import java.util.LinkedList; -import java.util.List; - -import org.jboss.deployers.plugins.deployer.AbstractSimpleDeployer; -import org.jboss.deployers.spi.DeploymentException; -import org.jboss.deployers.spi.deployer.DeploymentUnit; -import org.jboss.logging.Logger; - -//$Id$ - -/** - * This deployer that calls the registered DeployerHooks - * - * @author Thomas.Diesler(a)jboss.org - * @since 24-Apr-2007 - */ -public abstract class AbstractWebServiceDeployer extends AbstractSimpleDeployer -{ - // provide logging - private static final Logger log = Logger.getLogger(AbstractWebServiceDeployer.class); - - private List<DeployerHook> deployerHooks = new LinkedList<DeployerHook>(); - - public void addDeployerHook(DeployerHook deployer) - { - log.debug("Add deployer hook: " + deployer); - deployerHooks.add(deployer); - } - - public void removeDeployerHook(DeployerHook deployer) - { - log.debug("Remove deployer hook: " + deployer); - deployerHooks.remove(deployer); - } - - @Override - public void deploy(DeploymentUnit unit) throws DeploymentException - { - for (DeployerHook deployer : deployerHooks) - deployer.deploy(unit); - } - - @Override - public void undeploy(DeploymentUnit unit) - { - for (DeployerHook deployer : deployerHooks) - deployer.undeploy(unit); - } -} Deleted: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/ApplicationMetaDataAdaptor.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/ApplicationMetaDataAdaptor.java 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/ApplicationMetaDataAdaptor.java 2007-05-13 18:06:04 UTC (rev 3087) @@ -1,163 +0,0 @@ -/* - * 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.jboss50.common; - -// $Id$ - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import org.jboss.deployers.spi.deployer.DeploymentUnit; -import org.jboss.logging.Logger; -import org.jboss.metadata.ApplicationMetaData; -import org.jboss.metadata.BeanMetaData; -import org.jboss.metadata.EjbPortComponentMetaData; -import org.jboss.metadata.MessageDrivenMetaData; -import org.jboss.metadata.SessionMetaData; -import org.jboss.metadata.ApplicationMetaData.WebserviceDescription; -import org.jboss.metadata.ApplicationMetaData.Webservices; -import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; -import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedEjbPortComponentMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedMessageDrivenMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedSessionMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData.PublishLocationAdapter; - -/** - * Build container independent application meta data - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class ApplicationMetaDataAdaptor -{ - // logging support - private static Logger log = Logger.getLogger(ApplicationMetaDataAdaptor.class); - - public static UnifiedApplicationMetaData buildUnifiedApplicationMetaData(UnifiedDeploymentInfo udi, DeploymentUnit unit) - { - ApplicationMetaData appMetaData = unit.getAttachment(ApplicationMetaData.class); - udi.addAttachment(ApplicationMetaData.class, appMetaData); - - UnifiedApplicationMetaData umd = new UnifiedApplicationMetaData(); - buildUnifiedBeanMetaData(umd, appMetaData); - buildWebservicesMetaData(umd, appMetaData); - umd.setSecurityDomain(appMetaData.getSecurityDomain()); - return umd; - } - - private static void buildWebservicesMetaData(UnifiedApplicationMetaData umd, ApplicationMetaData apmd) - { - Webservices webservices = apmd.getWebservices(); - if (webservices != null) - { - String contextRoot = webservices.getContextRoot(); - umd.setPublishLocationAdapter(getPublishLocationAdpater(webservices)); - - List<WebserviceDescription> wsDescriptions = webservices.getWebserviceDescriptions(); - if (wsDescriptions.size() > 1) - log.warn("Multiple <webservice-description> elements not supported"); - - if (wsDescriptions.size() > 0) - { - WebserviceDescription wsd = wsDescriptions.get(0); - umd.setConfigName(wsd.getConfigName()); - umd.setConfigFile(wsd.getConfigFile()); - } - - umd.setWebServiceContextRoot(contextRoot); - } - } - - private static PublishLocationAdapter getPublishLocationAdpater(final Webservices webservices) - { - return new PublishLocationAdapter() - { - public String getWsdlPublishLocationByName(String name) - { - String wsdlPublishLocation = null; - for (WebserviceDescription wsd : webservices.getWebserviceDescriptions()) - { - if (wsd.getDescriptionName().equals(name)) - { - wsdlPublishLocation = wsd.getWsdlPublishLocation(); - } - } - return wsdlPublishLocation; - } - }; - } - - private static void buildUnifiedBeanMetaData(UnifiedApplicationMetaData umd, ApplicationMetaData appMetaData) - { - List<UnifiedBeanMetaData> beans = new ArrayList<UnifiedBeanMetaData>(); - Iterator it = appMetaData.getEnterpriseBeans(); - while (it.hasNext()) - { - BeanMetaData bmd = (BeanMetaData)it.next(); - buildUnifiedBeanMetaData(beans, bmd); - } - umd.setEnterpriseBeans(beans); - } - - private static UnifiedBeanMetaData buildUnifiedBeanMetaData(List<UnifiedBeanMetaData> beans, BeanMetaData bmd) - { - UnifiedBeanMetaData ubmd = null; - if (bmd instanceof SessionMetaData) - { - ubmd = new UnifiedSessionMetaData(); - } - else if (bmd instanceof MessageDrivenMetaData) - { - ubmd = new UnifiedMessageDrivenMetaData(); - ((UnifiedMessageDrivenMetaData)ubmd).setDestinationJndiName(((MessageDrivenMetaData)bmd).getDestinationJndiName()); - } - - if (ubmd != null) - { - ubmd.setEjbName(bmd.getEjbName()); - ubmd.setEjbClass(bmd.getEjbClass()); - ubmd.setServiceEndpointInterface(bmd.getServiceEndpoint()); - ubmd.setHome(bmd.getHome()); - ubmd.setLocalHome(bmd.getLocalHome()); - ubmd.setJndiName(bmd.getJndiName()); - ubmd.setLocalJndiName(bmd.getLocalJndiName()); - - EjbPortComponentMetaData pcmd = bmd.getPortComponent(); - if (pcmd != null) - { - UnifiedEjbPortComponentMetaData upcmd = new UnifiedEjbPortComponentMetaData(); - upcmd.setPortComponentName(pcmd.getPortComponentName()); - upcmd.setPortComponentURI(pcmd.getPortComponentURI()); - upcmd.setAuthMethod(pcmd.getAuthMethod()); - upcmd.setTransportGuarantee(pcmd.getTransportGuarantee()); - upcmd.setSecureWSDLAccess(pcmd.getSecureWSDLAccess()); - ubmd.setPortComponent(upcmd); - } - - beans.add(ubmd); - } - return ubmd; - } -} Deleted: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/ApplicationMetaDataAdaptorEJB3.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/ApplicationMetaDataAdaptorEJB3.java 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/ApplicationMetaDataAdaptorEJB3.java 2007-05-13 18:06:04 UTC (rev 3087) @@ -1,167 +0,0 @@ -/* - * 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.jboss50.common; - -// $Id$ - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import org.jboss.deployers.spi.deployer.DeploymentUnit; -import org.jboss.ejb3.Container; -import org.jboss.ejb3.EJBContainer; -import org.jboss.ejb3.Ejb3Deployment; -import org.jboss.ejb3.SessionContainer; -import org.jboss.ejb3.mdb.MessagingContainer; -import org.jboss.ejb3.metamodel.Ejb3PortComponent; -import org.jboss.ejb3.metamodel.EjbJarDD; -import org.jboss.ejb3.metamodel.EnterpriseBean; -import org.jboss.ejb3.metamodel.WebserviceDescription; -import org.jboss.ejb3.metamodel.Webservices; -import org.jboss.logging.Logger; -import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; -import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedEjbPortComponentMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedMessageDrivenMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedSessionMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData.PublishLocationAdapter; - -/** - * Build container independent application meta data - * - * @author Thomas.Diesler(a)jboss.org - * @since 14-Apr-2007 - */ -public class ApplicationMetaDataAdaptorEJB3 -{ - // logging support - private static Logger log = Logger.getLogger(ApplicationMetaDataAdaptorEJB3.class); - - public static UnifiedApplicationMetaData buildUnifiedApplicationMetaData(UnifiedDeploymentInfo udi, DeploymentUnit unit) - { - Ejb3Deployment ejb3Deployment = unit.getAttachment(Ejb3Deployment.class); - udi.addAttachment(Ejb3Deployment.class, ejb3Deployment); - - EjbJarDD jarDD = unit.getAttachment(EjbJarDD.class); - UnifiedApplicationMetaData umd = new UnifiedApplicationMetaData(); - buildUnifiedBeanMetaData(umd, ejb3Deployment); - buildWebservicesMetaData(umd, jarDD); - return umd; - } - - private static void buildWebservicesMetaData(UnifiedApplicationMetaData umd, EjbJarDD jarDD) - { - // nothing to do - if (jarDD == null) - return; - - Webservices webservices = jarDD.getWebservices(); - if (webservices != null) - { - String contextRoot = webservices.getContextRoot(); - umd.setPublishLocationAdapter(getPublishLocationAdpater(webservices)); - - List<WebserviceDescription> wsDescriptions = webservices.getWebserviceDescriptions(); - if (wsDescriptions.size() > 1) - log.warn("Multiple <webservice-description> elements not supported"); - - if (wsDescriptions.size() > 0) - { - WebserviceDescription wsd = wsDescriptions.get(0); - umd.setConfigName(wsd.getConfigName()); - umd.setConfigFile(wsd.getConfigFile()); - - // com/sun/ts/tests/webservices12/ejb/annotations/WSEjbWebServiceRefTest1 - // WSEjbWebServiceRefTest1VerifyTargetEndpointAddress - if (contextRoot == null) - contextRoot = "/" + wsd.getDescriptionName(); - } - - umd.setWebServiceContextRoot(contextRoot); - } - } - - private static void buildUnifiedBeanMetaData(UnifiedApplicationMetaData umd, Ejb3Deployment ejb3Deployment) - { - List<UnifiedBeanMetaData> ubmdList = new ArrayList<UnifiedBeanMetaData>(); - Iterator<Container> it = ejb3Deployment.getEjbContainers().values().iterator(); - while (it.hasNext()) - { - EJBContainer container = (EJBContainer)it.next(); - UnifiedBeanMetaData ubmd = null; - if (container instanceof SessionContainer) - { - ubmd = new UnifiedSessionMetaData(); - } - else if (container instanceof MessagingContainer) - { - ubmd = new UnifiedMessageDrivenMetaData(); - log.warn("No implemented: initialize MDB destination"); - //((UnifiedMessageDrivenMetaData)ubmd).setDestinationJndiName(((MessagingContainer)container).getDestination()); - } - - if (ubmd != null) - { - ubmd.setEjbName(container.getEjbName()); - ubmd.setEjbClass(container.getBeanClassName()); - - EnterpriseBean bean = container.getXml(); - Ejb3PortComponent pcMetaData = (bean != null ? bean.getPortComponent() : null); - if (pcMetaData != null) - { - UnifiedEjbPortComponentMetaData ejbPortComp = new UnifiedEjbPortComponentMetaData(); - ejbPortComp.setPortComponentName(pcMetaData.getPortComponentName()); - ejbPortComp.setPortComponentURI(pcMetaData.getPortComponentURI()); - ejbPortComp.setAuthMethod(pcMetaData.getAuthMethod()); - ejbPortComp.setTransportGuarantee(pcMetaData.getTransportGuarantee()); - ejbPortComp.setSecureWSDLAccess(pcMetaData.getSecureWSDLAccess()); - - ubmd.setPortComponent(ejbPortComp); - } - - ubmdList.add(ubmd); - } - } - umd.setEnterpriseBeans(ubmdList); - } - - private static PublishLocationAdapter getPublishLocationAdpater(final Webservices webservices) - { - return new PublishLocationAdapter() - { - public String getWsdlPublishLocationByName(String name) - { - String wsdlPublishLocation = null; - for (WebserviceDescription wsd : webservices.getWebserviceDescriptions()) - { - if (wsd.getDescriptionName().equals(name)) - { - wsdlPublishLocation = wsd.getWsdlPublishLocation(); - } - } - return wsdlPublishLocation; - } - }; - } -} Deleted: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/ArchiveDeployerHook.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/ArchiveDeployerHook.java 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/ArchiveDeployerHook.java 2007-05-13 18:06:04 UTC (rev 3087) @@ -1,150 +0,0 @@ -/* - * 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.jboss50.common; - -//$Id$ - -import java.net.URL; - -import org.jboss.deployers.spi.DeploymentException; -import org.jboss.deployers.spi.deployer.DeploymentUnit; -import org.jboss.virtual.VirtualFile; -import org.jboss.ws.integration.UnifiedVirtualFile; -import org.jboss.ws.integration.deployment.Deployment; -import org.jboss.ws.integration.deployment.WSDeploymentException; -import org.jboss.ws.integration.deployment.Deployment.DeploymentType; -import org.jboss.ws.integration.jboss50.common.AbstractDeployerHook; -import org.jboss.ws.metadata.webservices.WebservicesFactory; -import org.jboss.ws.metadata.webservices.WebservicesMetaData; -import org.jboss.ws.utils.DOMUtils; -import org.jboss.xb.binding.ObjectModelFactory; -import org.jboss.xb.binding.Unmarshaller; -import org.jboss.xb.binding.UnmarshallerFactory; -import org.w3c.dom.Element; - -/** - * An abstract web service deployer. - * - * deploy(unit) - * if(isWebServiceDeployment) - * dep = createDeployment(unit) - * deploy(dep) - * - * undeploy(unit) - * dep = getDeployment(unit) - * undeploy(dep) - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public abstract class ArchiveDeployerHook extends AbstractDeployerHook -{ - /** Get the deployemnt type this deployer can handle - */ - public abstract DeploymentType getDeploymentType(); - - /** Depending on the type of deployment, this method should return true - * if the deployment contains web service endpoints. - */ - public abstract boolean isWebServiceDeployment(DeploymentUnit unit); - - /** Create the Deployment for a given DeploymentUnit - */ - public abstract Deployment createDeployment(DeploymentUnit unit); - - /** Get the Deployment for a given DeploymentUnit - */ - public Deployment getDeployment(DeploymentUnit unit) - { - Deployment dep = unit.getAttachment(Deployment.class); - return (dep != null && dep.getType() == getDeploymentType() ? dep : null); - } - - public void deploy(DeploymentUnit unit) throws DeploymentException - { - if (ignoreDeployment(unit)) - return; - - if (isWebServiceDeployment(unit)) - { - log.debug("deploy: " + unit.getName()); - Deployment dep = getDeployment(unit); - if (dep == null) - { - dep = createDeployment(unit); - dep.getContext().addAttachment(DeploymentUnit.class, unit); - } - - deployerManager.deploy(dep); - unit.addAttachment(Deployment.class, dep); - } - } - - public void undeploy(DeploymentUnit unit) - { - if (ignoreDeployment(unit)) - return; - - Deployment dep = getDeployment(unit); - if (dep != null) - { - log.debug("undeploy: " + unit.getName()); - deployerManager.undeploy(dep); - unit.removeAttachment(Deployment.class); - } - } - - /** Unmrashall the webservices.xml if there is one - */ - protected WebservicesMetaData getWebservicesMetaData(DeploymentUnit unit) - { - WebservicesMetaData wsMetaData = unit.getAttachment(WebservicesMetaData.class); - UnifiedVirtualFile vfWebservices = getWebservicesFile(unit); - if (wsMetaData == null && vfWebservices != null) - { - try - { - URL wsURL = vfWebservices.toURL(); - Element root = DOMUtils.parse(wsURL.openStream()); - String namespaceURI = root.getNamespaceURI(); - if (namespaceURI.equals("http://java.sun.com/xml/ns/j2ee")) - { - Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); - ObjectModelFactory factory = new WebservicesFactory(wsURL); - wsMetaData = (WebservicesMetaData)unmarshaller.unmarshal(wsURL.openStream(), factory, null); - unit.addAttachment(WebservicesMetaData.class, wsMetaData); - } - } - catch (Exception ex) - { - throw new WSDeploymentException(ex); - } - } - return wsMetaData; - } - - private UnifiedVirtualFile getWebservicesFile(DeploymentUnit unit) - { - VirtualFile vf = unit.getMetaDataFile("webservices.xml"); - return (vf != null ? new VirtualFileAdaptor(vf) : null); - } -} Deleted: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/DeployerHook.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/DeployerHook.java 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/DeployerHook.java 2007-05-13 18:06:04 UTC (rev 3087) @@ -1,40 +0,0 @@ -/* - * 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.jboss50.common; - -//$Id$ - -import org.jboss.deployers.spi.DeploymentException; -import org.jboss.deployers.spi.deployer.DeploymentUnit; - -/** - * An interface for all web service deployer hooks - * - * @author Thomas.Diesler(a)jboss.org - * @since 24-Apr-2007 - */ -public interface DeployerHook -{ - void deploy(DeploymentUnit unit) throws DeploymentException; - - void undeploy(DeploymentUnit unit); -} Deleted: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/DeploymentInfoAdapter.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/DeploymentInfoAdapter.java 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/DeploymentInfoAdapter.java 2007-05-13 18:06:04 UTC (rev 3087) @@ -1,100 +0,0 @@ -/* - * 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.jboss50.common; - -import java.net.URL; -import java.net.URLClassLoader; - -import org.jboss.deployers.spi.deployer.DeploymentUnit; -import org.jboss.ejb3.Ejb3Deployment; -import org.jboss.logging.Logger; -import org.jboss.metadata.ApplicationMetaData; -import org.jboss.metadata.WebMetaData; -import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; - -// $Id$ - -/** - * Build container independent deployment info. - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class DeploymentInfoAdapter -{ - // logging support - private static Logger log = Logger.getLogger(DeploymentInfoAdapter.class); - - public static void buildDeploymentInfo(UnifiedDeploymentInfo udi, DeploymentUnit unit) - { - udi.addAttachment(DeploymentUnit.class, unit); - - try - { - if (unit.getDeploymentContext().getParent() != null) - { - udi.parent = new UnifiedDeploymentInfo(null); - buildDeploymentInfo(udi.parent, unit.getDeploymentContext().getParent().getDeploymentUnit()); - } - - udi.vfRoot = new VirtualFileAdaptor(unit.getDeploymentContext().getRoot()); - - udi.name = unit.getName(); - udi.simpleName = unit.getSimpleName(); - udi.url = udi.vfRoot.toURL(); - - buildMetaData(udi, unit); - - // Since we create temporary classes, we need to create a delegate loader - // This prevents CCE problems where the parent loader is available at deploy time, - // and a child loader is available at start time. - udi.classLoader = new URLClassLoader(new URL[] {}, unit.getClassLoader()); - - log.debug("UnifiedDeploymentInfo:\n" + udi); - } - catch (RuntimeException rte) - { - throw rte; - } - catch (Exception ex) - { - throw new IllegalStateException(ex); - } - } - - private static void buildMetaData(UnifiedDeploymentInfo udi, DeploymentUnit unit) throws Exception - { - if (unit.getAttachment(Ejb3Deployment.class) != null) - { - udi.metaData = ApplicationMetaDataAdaptorEJB3.buildUnifiedApplicationMetaData(udi, unit); - } - else if (unit.getAttachment(ApplicationMetaData.class) != null) - { - udi.metaData = ApplicationMetaDataAdaptor.buildUnifiedApplicationMetaData(udi, unit); - } - else if (unit.getAttachment(WebMetaData.class) != null) - { - udi.metaData = WebMetaDataAdaptor.buildUnifiedWebMetaData(udi, unit); - udi.webappURL = udi.vfRoot.toURL(); - } - } -} Deleted: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/JAXRPCDeployerHookEJB21.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/JAXRPCDeployerHookEJB21.java 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/JAXRPCDeployerHookEJB21.java 2007-05-13 18:06:04 UTC (rev 3087) @@ -1,116 +0,0 @@ -/* - * 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.jboss50.common; - -//$Id$ - -import org.jboss.deployers.spi.deployer.DeploymentUnit; -import org.jboss.metadata.ApplicationMetaData; -import org.jboss.metadata.BeanMetaData; -import org.jboss.ws.integration.Endpoint; -import org.jboss.ws.integration.BasicEndpoint; -import org.jboss.ws.integration.Service; -import org.jboss.ws.integration.deployment.Deployment; -import org.jboss.ws.integration.deployment.BasicDeploymentImpl; -import org.jboss.ws.integration.deployment.Deployment.DeploymentType; -import org.jboss.ws.metadata.webservices.PortComponentMetaData; -import org.jboss.ws.metadata.webservices.WebserviceDescriptionMetaData; -import org.jboss.ws.metadata.webservices.WebservicesMetaData; -import org.jboss.ws.utils.ObjectNameFactory; - -/** - * A deployer JAXRPC EJB21 Endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class JAXRPCDeployerHookEJB21 extends AbstractDeployerHookEJB -{ - /** Get the deployemnt type this deployer can handle - */ - public DeploymentType getDeploymentType() - { - return DeploymentType.JAXRPC_EJB21; - } - - @Override - public Deployment createDeployment(DeploymentUnit unit) - { - Deployment dep = new BasicDeploymentImpl(); - dep.setType(getDeploymentType()); - dep.setClassLoader(unit.getClassLoader()); - - Service service = dep.getService(); - - ApplicationMetaData appmd = unit.getAttachment(ApplicationMetaData.class); - if (appmd == null) - throw new IllegalStateException("Deployment unit does not contain application meta data"); - - WebservicesMetaData wsMetaData = getWebservicesMetaData(unit); - if (wsMetaData == null) - throw new IllegalStateException("Deployment unit does not contain webservices meta data"); - - // Copy the attachments - dep.getContext().addAttachment(WebservicesMetaData.class, wsMetaData); - dep.getContext().addAttachment(ApplicationMetaData.class, appmd); - - for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions()) - { - for (PortComponentMetaData pcmd : wsd.getPortComponents()) - { - String ejbLink = pcmd.getEjbLink(); - if (ejbLink == null) - throw new IllegalStateException("ejb-link cannot be null"); - - BeanMetaData beanMetaData = appmd.getBeanByEjbName(ejbLink); - if (beanMetaData == null) - throw new IllegalStateException("Cannot obtain bean meta data for: " + ejbLink); - - String ejbClass = beanMetaData.getEjbClass(); - try - { - ClassLoader loader = unit.getClassLoader(); - Class<?> epBean = loader.loadClass(ejbClass.trim()); - - // Create the endpoint - Endpoint endpoint = new BasicEndpoint(service, epBean); - String nameStr = Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + ejbLink; - endpoint.setName(ObjectNameFactory.create(nameStr)); - - service.addEndpoint(endpoint); - } - catch (ClassNotFoundException ex) - { - log.warn("Cannot load servlet class: " + ejbClass); - } - } - } - return dep; - } - - @Override - public boolean isWebServiceDeployment(DeploymentUnit unit) - { - WebservicesMetaData wsMetaData = getWebservicesMetaData(unit); - return wsMetaData != null && unit.getAllMetaData(ApplicationMetaData.class).size() > 0; - } -} \ No newline at end of file Deleted: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/JAXRPCDeployerHookJSE.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/JAXRPCDeployerHookJSE.java 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/JAXRPCDeployerHookJSE.java 2007-05-13 18:06:04 UTC (rev 3087) @@ -1,133 +0,0 @@ -/* - * 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.jboss50.common; - -//$Id$ - -import org.jboss.deployers.spi.deployer.DeploymentUnit; -import org.jboss.metadata.WebMetaData; -import org.jboss.metadata.web.Servlet; -import org.jboss.ws.integration.BasicEndpoint; -import org.jboss.ws.integration.Endpoint; -import org.jboss.ws.integration.Service; -import org.jboss.ws.integration.deployment.BasicDeploymentImpl; -import org.jboss.ws.integration.deployment.Deployment; -import org.jboss.ws.integration.deployment.Deployment.DeploymentType; -import org.jboss.ws.metadata.webservices.PortComponentMetaData; -import org.jboss.ws.metadata.webservices.WebserviceDescriptionMetaData; -import org.jboss.ws.metadata.webservices.WebservicesMetaData; -import org.jboss.ws.utils.ObjectNameFactory; - -/** - * A deployer JAXRPC JSE Endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class JAXRPCDeployerHookJSE extends AbstractDeployerHookJSE -{ - /** Get the deployemnt type this deployer can handle - */ - public DeploymentType getDeploymentType() - { - return DeploymentType.JAXRPC_JSE; - } - - /** - * Create an endpoint for every servlet-link in webservices.xml - */ - @Override - public Deployment createDeployment(DeploymentUnit unit) - { - Deployment dep = new BasicDeploymentImpl(); - dep.setType(getDeploymentType()); - dep.setClassLoader(unit.getClassLoader()); - - Service service = dep.getService(); - - WebMetaData webMetaData = unit.getAttachment(WebMetaData.class); - if (webMetaData == null) - throw new IllegalStateException("Deployment unit does not contain web meta data"); - - WebservicesMetaData wsMetaData = getWebservicesMetaData(unit); - if (wsMetaData == null) - throw new IllegalStateException("Deployment unit does not contain webservices meta data"); - - // Copy the attachments - dep.getContext().addAttachment(WebservicesMetaData.class, wsMetaData); - dep.getContext().addAttachment(WebMetaData.class, webMetaData); - - for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions()) - { - for (PortComponentMetaData pcmd : wsd.getPortComponents()) - { - String servletLink = pcmd.getServletLink(); - if (servletLink == null) - throw new IllegalStateException("servlet-link cannot be null"); - - Servlet servlet = getServletForName(webMetaData, servletLink); - String servletClass = servlet.getServletClass(); - - try - { - ClassLoader loader = unit.getClassLoader(); - Class<?> epBean = loader.loadClass(servletClass.trim()); - - // Create the endpoint - Endpoint endpoint = new BasicEndpoint(service, epBean); - String nameStr = Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + servletLink; - endpoint.setName(ObjectNameFactory.create(nameStr)); - - service.addEndpoint(endpoint); - } - catch (ClassNotFoundException ex) - { - log.warn("Cannot load servlet class: " + servletClass); - } - } - } - - return dep; - } - - private Servlet getServletForName(WebMetaData wmd, String servletLink) - { - for (Servlet servlet : wmd.getServlets()) - { - if (servletLink.equals(servlet.getName())) - { - return servlet; - } - } - throw new IllegalStateException("Cannot find servlet for link: " + servletLink); - } - - @Override - public boolean isWebServiceDeployment(DeploymentUnit unit) - { - if (super.isWebServiceDeployment(unit) == false) - return false; - - WebservicesMetaData wsMetaData = getWebservicesMetaData(unit); - return wsMetaData != null; - } -} Deleted: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/JAXWSDeployerHookEJB3.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/JAXWSDeployerHookEJB3.java 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/JAXWSDeployerHookEJB3.java 2007-05-13 18:06:04 UTC (rev 3087) @@ -1,129 +0,0 @@ -/* - * 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.jboss50.common; - -//$Id$ - -import java.util.Iterator; - -import javax.jws.WebService; -import javax.xml.ws.WebServiceProvider; - -import org.jboss.deployers.spi.deployer.DeploymentUnit; -import org.jboss.ejb3.EJBContainer; -import org.jboss.ejb3.Ejb3Deployment; -import org.jboss.ejb3.stateless.StatelessContainer; -import org.jboss.ws.integration.BasicEndpoint; -import org.jboss.ws.integration.Endpoint; -import org.jboss.ws.integration.Service; -import org.jboss.ws.integration.deployment.BasicDeploymentImpl; -import org.jboss.ws.integration.deployment.Deployment; -import org.jboss.ws.integration.deployment.Deployment.DeploymentType; -import org.jboss.ws.utils.ObjectNameFactory; - -/** - * A deployer JAXWS EJB3 Endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class JAXWSDeployerHookEJB3 extends AbstractDeployerHookEJB -{ - /** Get the deployemnt type this deployer can handle - */ - public DeploymentType getDeploymentType() - { - return DeploymentType.JAXWS_EJB3; - } - - @Override - public Deployment createDeployment(DeploymentUnit unit) - { - Deployment dep = new BasicDeploymentImpl(); - dep.setType(getDeploymentType()); - dep.setClassLoader(unit.getClassLoader()); - - Service service = dep.getService(); - - Ejb3Deployment ejb3Deployment = unit.getAttachment(Ejb3Deployment.class); - if (ejb3Deployment == null) - throw new IllegalStateException("Deployment unit does not contain ejb3 deployment"); - - // Copy the attachments - dep.getContext().addAttachment(Ejb3Deployment.class, ejb3Deployment); - - Iterator it = ejb3Deployment.getEjbContainers().values().iterator(); - while (it.hasNext()) - { - EJBContainer container = (EJBContainer)it.next(); - if (isWebServiceBean(container)) - { - String ejbName = container.getEjbName(); - Class epBean = container.getBeanClass(); - - // Create the endpoint - Endpoint endpoint = new BasicEndpoint(service, epBean); - String nameStr = Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + ejbName; - endpoint.setName(ObjectNameFactory.create(nameStr)); - - service.addEndpoint(endpoint); - } - } - - return dep; - } - - @Override - public boolean isWebServiceDeployment(DeploymentUnit unit) - { - Ejb3Deployment ejb3Deployment = unit.getAttachment(Ejb3Deployment.class); - if (ejb3Deployment == null) - return false; - - boolean isWebServiceDeployment = false; - - Iterator it = ejb3Deployment.getEjbContainers().values().iterator(); - while (it.hasNext()) - { - EJBContainer container = (EJBContainer)it.next(); - if (isWebServiceBean(container)) - { - isWebServiceDeployment = true; - break; - } - } - - return isWebServiceDeployment; - } - - private boolean isWebServiceBean(EJBContainer container) - { - boolean isWebServiceBean = false; - if (container instanceof StatelessContainer) - { - boolean isWebService = container.resolveAnnotation(WebService.class) != null; - boolean isWebServiceProvider = container.resolveAnnotation(WebServiceProvider.class) != null; - isWebServiceBean = isWebService || isWebServiceProvider; - } - return isWebServiceBean; - } -} \ No newline at end of file Deleted: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/JAXWSDeployerHookJSE.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/JAXWSDeployerHookJSE.java 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/JAXWSDeployerHookJSE.java 2007-05-13 18:06:04 UTC (rev 3087) @@ -1,150 +0,0 @@ -/* - * 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.jboss50.common; - -//$Id$ - -import java.util.ArrayList; -import java.util.List; - -import javax.jws.WebService; -import javax.xml.ws.WebServiceProvider; - -import org.jboss.deployers.spi.deployer.DeploymentUnit; -import org.jboss.metadata.WebMetaData; -import org.jboss.metadata.web.Servlet; -import org.jboss.ws.integration.BasicEndpoint; -import org.jboss.ws.integration.Endpoint; -import org.jboss.ws.integration.Service; -import org.jboss.ws.integration.deployment.BasicDeploymentImpl; -import org.jboss.ws.integration.deployment.Deployment; -import org.jboss.ws.integration.deployment.Deployment.DeploymentType; -import org.jboss.ws.utils.ObjectNameFactory; - -/** - * A deployer JAXWS JSE Endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class JAXWSDeployerHookJSE extends AbstractDeployerHookJSE -{ - /** Get the deployemnt type this deployer can handle - */ - public DeploymentType getDeploymentType() - { - return DeploymentType.JAXWS_JSE; - } - - @Override - public Deployment createDeployment(DeploymentUnit unit) - { - Deployment dep = new BasicDeploymentImpl(); - dep.setType(getDeploymentType()); - dep.setClassLoader(unit.getClassLoader()); - - Service service = dep.getService(); - - WebMetaData webMetaData = unit.getAttachment(WebMetaData.class); - if (webMetaData == null) - throw new IllegalStateException("Deployment unit does not contain web meta data"); - - // Copy the attachments - dep.getContext().addAttachment(WebMetaData.class, webMetaData); - - List<Servlet> servlets = getRelevantServlets(webMetaData, unit.getClassLoader()); - for (Servlet servlet : servlets) - { - String servletName = servlet.getName(); - String servletClass = servlet.getServletClass(); - - try - { - ClassLoader loader = unit.getClassLoader(); - Class<?> epBean = loader.loadClass(servletClass.trim()); - - // Create the endpoint - Endpoint endpoint = new BasicEndpoint(service, epBean); - String nameStr = Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + servletName; - endpoint.setName(ObjectNameFactory.create(nameStr)); - - service.addEndpoint(endpoint); - } - catch (ClassNotFoundException ex) - { - log.warn("Cannot load servlet class: " + servletClass); - continue; - } - } - - return dep; - } - - @Override - public boolean isWebServiceDeployment(DeploymentUnit unit) - { - if (super.isWebServiceDeployment(unit) == false) - return false; - - boolean isWebServiceDeployment = false; - try - { - WebMetaData webMetaData = unit.getAttachment(WebMetaData.class); - List<Servlet> servlets = getRelevantServlets(webMetaData, unit.getClassLoader()); - isWebServiceDeployment = servlets.size() > 0; - } - catch (Exception ex) - { - log.error("Cannot process web deployment", ex); - } - - return isWebServiceDeployment; - } - - private List<Servlet> getRelevantServlets(WebMetaData webMetaData, ClassLoader loader) - { - List<Servlet> servlets = new ArrayList<Servlet>(); - for (Servlet servlet : webMetaData.getServlets()) - { - String servletClassName = servlet.getServletClass(); - - // Skip JSPs - if (servletClassName == null || servletClassName.length() == 0) - continue; - - try - { - Class<?> servletClass = loader.loadClass(servletClassName.trim()); - boolean isWebService = servletClass.isAnnotationPresent(WebService.class); - boolean isWebServiceProvider = servletClass.isAnnotationPresent(WebServiceProvider.class); - if (isWebService || isWebServiceProvider) - servlets.add(servlet); - } - catch (ClassNotFoundException ex) - { - log.warn("Cannot load servlet class: " + servletClassName); - continue; - } - } - return servlets; - } -} \ No newline at end of file Deleted: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/MainDeployerHook.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/MainDeployerHook.java 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/MainDeployerHook.java 2007-05-13 18:06:04 UTC (rev 3087) @@ -1,62 +0,0 @@ -/* - * 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.jboss50.common; - -//$Id$ - -import org.jboss.deployers.spi.DeploymentException; -import org.jboss.deployers.spi.deployer.DeploymentUnit; -import org.jboss.ws.integration.deployment.Deployment; -import org.jboss.ws.integration.jboss50.common.AbstractDeployerHook; - -/** - * A basic hook that delegates a deployment manger. - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class MainDeployerHook extends AbstractDeployerHook -{ - public void deploy(DeploymentUnit unit) throws DeploymentException - { - if (ignoreDeployment(unit)) - return; - - Deployment dep = unit.getAttachment(Deployment.class); - if (dep != null) - { - deployerManager.deploy(dep); - } - } - - public void undeploy(DeploymentUnit unit) - { - if (ignoreDeployment(unit)) - return; - - Deployment dep = unit.getAttachment(Deployment.class); - if (dep != null) - { - deployerManager.undeploy(dep); - } - } -} Deleted: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/ManagedServerConfig.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/ManagedServerConfig.java 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/ManagedServerConfig.java 2007-05-13 18:06:04 UTC (rev 3087) @@ -1,76 +0,0 @@ -/* - * 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.jboss50.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; - } -} Deleted: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/ManagedServerConfigMBean.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/ManagedServerConfigMBean.java 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/ManagedServerConfigMBean.java 2007-05-13 18:06:04 UTC (rev 3087) @@ -1,32 +0,0 @@ -/* - * 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.jboss50.common; - -import org.jboss.ws.integration.management.ServerConfig; - -/** - * MBean interface. - * @since 15-April-2004 - */ -public interface ManagedServerConfigMBean extends ServerConfig -{ -} Deleted: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/UnifiedDeploymentInfoDeployer.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/UnifiedDeploymentInfoDeployer.java 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/UnifiedDeploymentInfoDeployer.java 2007-05-13 18:06:04 UTC (rev 3087) @@ -1,69 +0,0 @@ -/* - * 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.jboss50.common; - -//$Id$ - -import org.jboss.deployers.spi.deployer.DeploymentUnit; -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.webservices.WebservicesMetaData; - -/** - * A deployer that builds the UnifiedDeploymentInfo - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class UnifiedDeploymentInfoDeployer extends AbstractDeployer -{ - @Override - public void create(Deployment dep) - { - UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); - if (udi == null) - { - DeploymentUnit unit = dep.getContext().getAttachment(DeploymentUnit.class); - if (unit == null) - throw new IllegalStateException("Cannot obtain deployment unit"); - - DeploymentType type = dep.getType(); - if (type.toString().startsWith("JAXWS")) - { - udi = new JAXWSDeployment(type); - DeploymentInfoAdapter.buildDeploymentInfo(udi, unit); - } - else - { - WebservicesMetaData wsMetaData = dep.getContext().getAttachment(WebservicesMetaData.class); - udi = new JAXRPCDeployment(type, wsMetaData); - DeploymentInfoAdapter.buildDeploymentInfo(udi, unit); - } - - dep.getContext().addAttachment(UnifiedDeploymentInfo.class, udi); - } - } -} \ No newline at end of file Deleted: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/VirtualFileAdaptor.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/VirtualFileAdaptor.java 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/VirtualFileAdaptor.java 2007-05-13 18:06:04 UTC (rev 3087) @@ -1,66 +0,0 @@ -/* - * 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.jboss50.common; - -import java.io.IOException; -import java.net.URL; - -import org.jboss.virtual.VirtualFile; -import org.jboss.ws.integration.UnifiedVirtualFile; - -// $Id$ - -/** - * A JBoss50 VirtualFile adaptor - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class VirtualFileAdaptor implements UnifiedVirtualFile -{ - private static final long serialVersionUID = 6547394037548338042L; - - private VirtualFile root; - - public VirtualFileAdaptor(VirtualFile root) - { - this.root = root; - } - - public UnifiedVirtualFile findChild(String child) throws IOException - { - VirtualFile vf = root.findChild(child); - return new VirtualFileAdaptor(vf); - } - - public URL toURL() - { - try - { - return root.toURL(); - } - catch (Exception e) - { - return null; - } - } -} Deleted: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/WebMetaDataAdaptor.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/WebMetaDataAdaptor.java 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/WebMetaDataAdaptor.java 2007-05-13 18:06:04 UTC (rev 3087) @@ -1,136 +0,0 @@ -/* - * 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.jboss50.common; - -// $Id$ - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import org.jboss.deployers.spi.deployer.DeploymentUnit; -import org.jboss.metadata.WebMetaData; -import org.jboss.metadata.WebSecurityMetaData; -import org.jboss.metadata.WebSecurityMetaData.WebResourceCollection; -import org.jboss.metadata.web.Servlet; -import org.jboss.metadata.web.ServletMapping; -import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; -import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData.PublishLocationAdapter; -import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData.UnifiedWebResourceCollection; - -/** - * Build container independent web meta data - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class WebMetaDataAdaptor -{ - public static UnifiedWebMetaData buildUnifiedWebMetaData(UnifiedDeploymentInfo udi, DeploymentUnit unit) - { - WebMetaData wmd = unit.getAttachment(WebMetaData.class); - udi.addAttachment(WebMetaData.class, wmd); - - UnifiedWebMetaData umd = new UnifiedWebMetaData(); - umd.setContextRoot(wmd.getContextRoot()); - umd.setServletMappings(getServletMappings(wmd)); - umd.setServletClassNames(getServletClassMap(wmd)); - umd.setConfigName(wmd.getConfigName()); - umd.setConfigFile(wmd.getConfigFile()); - umd.setSecurityDomain(wmd.getSecurityDomain()); - umd.setPublishLocationAdapter(getPublishLocationAdpater(wmd)); - umd.setSecurityMetaData(getSecurityMetaData(wmd.getSecurityContraints())); - - return umd; - } - - private static PublishLocationAdapter getPublishLocationAdpater(final WebMetaData wmd) - { - return new PublishLocationAdapter() - { - public String getWsdlPublishLocationByName(String name) - { - return wmd.getWsdlPublishLocationByName(name); - } - }; - } - - protected static List<UnifiedWebSecurityMetaData> getSecurityMetaData(final Iterator securityConstraints) - { - ArrayList<UnifiedWebSecurityMetaData> unifiedsecurityMetaData = new ArrayList<UnifiedWebSecurityMetaData>(); - - while (securityConstraints.hasNext()) - { - WebSecurityMetaData securityMetaData = (WebSecurityMetaData)securityConstraints.next(); - - UnifiedWebSecurityMetaData current = new UnifiedWebSecurityMetaData(); - unifiedsecurityMetaData.add(current); - - current.setTransportGuarantee(securityMetaData.getTransportGuarantee()); - - Map<String, WebResourceCollection> resources = securityMetaData.getWebResources(); - for (WebResourceCollection webResource : resources.values()) - { - UnifiedWebResourceCollection currentResource = current.addWebResource(webResource.getName()); - for (String currentPattern : webResource.getUrlPatterns()) - { - currentResource.addPattern(currentPattern); - } - } - } - - return unifiedsecurityMetaData; - } - - private static Map<String, String> getServletMappings(WebMetaData wmd) - { - Map<String, String> mappings = new HashMap<String, String>(); - Iterator it = wmd.getServletMappings().iterator(); - while (it.hasNext()) - { - ServletMapping sm = (ServletMapping)it.next(); - // FIXME - Add support for multiple mappings - mappings.put(sm.getName(), sm.getUrlPatterns().get(0)); - } - return mappings; - } - - private static Map<String, String> getServletClassMap(WebMetaData wmd) - { - Map<String, String> mappings = new HashMap<String, String>(); - Iterator it = wmd.getServlets().iterator(); - while (it.hasNext()) - { - Servlet servlet = (Servlet)it.next(); - // Skip JSPs - if (servlet.getServletClass() == null || servlet.getServletClass().length() == 0) - continue; - - mappings.put(servlet.getName(), servlet.getServletClass()); - } - return mappings; - } -} Deleted: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/WebServiceDeployerEJB.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/WebServiceDeployerEJB.java 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/WebServiceDeployerEJB.java 2007-05-13 18:06:04 UTC (rev 3087) @@ -1,53 +0,0 @@ -/* - * 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.jboss50.common; - -//$Id$ - -/** - * This web service deployer for EJB - * - * @author Thomas.Diesler(a)jboss.org - * @since 24-Apr-2007 - */ -public class WebServiceDeployerEJB extends AbstractWebServiceDeployer -{ - private int relOrderEJB2x; - private int relOrderEJB3; - - public void setRelOrderEJB2x(int relOrderEJB2x) - { - this.relOrderEJB2x = relOrderEJB2x; - } - - public void setRelOrderEJB3(int relOrderEJB3) - { - this.relOrderEJB3 = relOrderEJB3; - } - - @Override - public int getRelativeOrder() - { - return Math.max(relOrderEJB2x, relOrderEJB3) + 1; - } - -} Deleted: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/WebServiceDeployerJSE.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/WebServiceDeployerJSE.java 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/WebServiceDeployerJSE.java 2007-05-13 18:06:04 UTC (rev 3087) @@ -1,46 +0,0 @@ -/* - * 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.jboss50.common; - -//$Id$ - -/** - * This web service deployer for JSE - * - * @author Thomas.Diesler(a)jboss.org - * @since 24-Apr-2007 - */ -public class WebServiceDeployerJSE extends AbstractWebServiceDeployer -{ - private int relOrderWar; - - public void setRelOrderWar(int relOrderWar) - { - this.relOrderWar = relOrderWar; - } - - @Override - public int getRelativeOrder() - { - return relOrderWar - 1; - } -} Deleted: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/WebServiceMainDeployer.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/WebServiceMainDeployer.java 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/common/WebServiceMainDeployer.java 2007-05-13 18:06:04 UTC (rev 3087) @@ -1,52 +0,0 @@ -/* - * 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.jboss50.common; - -//$Id$ - -/** - * The main web service deployer - * - * @author Thomas.Diesler(a)jboss.org - * @since 24-Apr-2007 - */ -public class WebServiceMainDeployer extends AbstractWebServiceDeployer -{ - private int relOrderJSE; - private int relOrderEJB; - - public void setRelOrderEJB(int relOrderEJB) - { - this.relOrderEJB = relOrderEJB; - } - - public void setRelOrderJSE(int relOrderJSE) - { - this.relOrderJSE = relOrderJSE; - } - - @Override - public int getRelativeOrder() - { - return Math.max(relOrderEJB, relOrderJSE) + 1; - } -} Modified: branches/tdiesler/trunk/jbossws/.project =================================================================== --- branches/tdiesler/trunk/jbossws/.project 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/jbossws/.project 2007-05-13 18:06:04 UTC (rev 3087) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>jbossws-core</name> + <name>jbossws</name> <comment></comment> <projects> </projects> Deleted: branches/tdiesler/trunk/jbossws/ant-import/build-benchmark.xml =================================================================== --- branches/tdiesler/trunk/jbossws/ant-import/build-benchmark.xml 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/jbossws/ant-import/build-benchmark.xml 2007-05-13 18:06:04 UTC (rev 3087) @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - -<project name="JBossWS Benchamrks"> - -  -  -  - - <target name="build-benchmark" depends="main"> - <ant antfile="src/test/ant/build-benchmark-jars.xml" target="build-benchmark-jars" inheritall="true"/> - </target> - -  -  -  - -  - <target name="tests-benchmark" depends="init" description="Run benchmark unit tests"> - <antcall target="tests-main"> - <param name="include.wildcard" value="org/jboss/test/ws/benchmark/**/*TestCase.class"/> - </antcall> - <antcall target="tests-report"/> - </target> - -</project> Deleted: branches/tdiesler/trunk/jbossws/ant-import/build-interop-jars.xml =================================================================== --- branches/tdiesler/trunk/jbossws/ant-import/build-interop-jars.xml 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/jbossws/ant-import/build-interop-jars.xml 2007-05-13 18:06:04 UTC (rev 3087) @@ -1,343 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - -<project name="JBossWS"> - - <description>JBossWS test archive builder</description> - -  -  -  - - <target name="build-interop-jars"> - - <mkdir dir="${build.tests.dir}/libs/"/> - -  - <war warfile="${build.test.dir}/libs/jbossws-interop-root.war" - webxml="${test.resources.dir}/interop/microsoft/root/WEB-INF/web.xml"> - <webinf dir="${test.resources.dir}/interop/microsoft/root/WEB-INF"> - <include name="jboss-web.xml"/> - </webinf> - <fileset dir="${test.resources.dir}/interop/microsoft/root"> - <include name="*.*"/> - </fileset> - </war> - -  - <jar jarfile="${build.tests.dir}/libs/jbossws-interop-BaseDataTypesDocLitB-client.jar"> - <fileset dir="${build.tests.dir}/classes"> - <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/BaseDataTypesDocLitB/**/*.class"/> - <include name="org/jboss/test/ws/interop/microsoft/*.class"/> - </fileset> - <metainf dir="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesDocLitB/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**.*"/> - </metainf> - <metainf dir="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesDocLitB/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="scenarios.xml"/> - </metainf> - </jar> - -  - <war warfile="${build.tests.dir}/libs/jbossws-interop-BaseDataTypesDocLitB_Service.war" - webxml="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesDocLitB_Service/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> - <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/BaseDataTypesDocLitB_Service/**/*.class"/> - <include name="org/jboss/test/ws/interop/microsoft/*.class"/> - </classes> - <webinf dir="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesDocLitB_Service/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**.*"/> - <include name="jboss-web.xml"/> - <include name="scenarios.xml"/> - </webinf> - <fileset dir="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesDocLitB_Service"> - <include name="*.*"/> - </fileset> - </war> - -  - <jar jarfile="${build.tests.dir}/libs/jbossws-interop-BaseDataTypesDocLitW-client.jar"> - <fileset dir="${build.tests.dir}/classes"> - <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/BaseDataTypesDocLitW/**/*.class"/> - <include name="org/jboss/test/ws/interop/microsoft/*.class"/> - </fileset> - <metainf dir="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesDocLitW/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - <metainf dir="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesDocLitW/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="scenarios.xml"/> - </metainf> - </jar> - -  - <jar jarfile="${build.tests.dir}/libs/jbossws-interop-BaseDataTypesRpcLit-client.jar"> - <fileset dir="${build.tests.dir}/classes"> - <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/BaseDataTypesRpcLit/**/*.class"/> - <include name="org/jboss/test/ws/interop/microsoft/*.class"/> - </fileset> - <metainf dir="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesRpcLit/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - <metainf dir="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesRpcLit/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="scenarios.xml"/> - </metainf> - </jar> - -  - <jar jarfile="${build.tests.dir}/libs/jbossws-interop-ComplexDataTypesDocLitB-client.jar"> - <fileset dir="${build.tests.dir}/classes"> - <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesDocLitB/**/*.class"/> - <include name="org/jboss/test/ws/interop/microsoft/*.class"/> - </fileset> - <metainf dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesDocLitB/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - <metainf dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesDocLitB/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="scenarios.xml"/> - </metainf> - </jar> - -  - <jar jarfile="${build.tests.dir}/libs/jbossws-interop-ComplexDataTypesDocLitW-client.jar"> - <fileset dir="${build.tests.dir}/classes"> - <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesDocLitW/**/*.class"/> - <include name="org/jboss/test/ws/interop/microsoft/*.class"/> - </fileset> - <metainf dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesDocLitW/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - <metainf dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesDocLitW/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="scenarios.xml"/> - </metainf> - </jar> - -  - <jar jarfile="${build.tests.dir}/libs/jbossws-interop-ComplexDataTypesRpcLit-client.jar"> - <fileset dir="${build.tests.dir}/classes"> - <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesRpcLit/**/*.class"/> - <include name="org/jboss/test/ws/interop/microsoft/*.class"/> - </fileset> - <metainf dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesRpcLit/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - <metainf dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesRpcLit/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="scenarios.xml"/> - </metainf> - </jar> - -  - <war warfile="${build.tests.dir}/libs/jbossws-interop-BaseDataTypesDocLitW_Service.war" - webxml="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesDocLitW_Service/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> - <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/BaseDataTypesDocLitW_Service/**/*.class"/> - <include name="org/jboss/test/ws/interop/microsoft/*.class"/> - </classes> - <webinf dir="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesDocLitW_Service/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - <include name="jboss-web.xml"/> - <include name="scenarios.xml"/> - </webinf> - <fileset dir="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesDocLitW_Service"> - <include name="*.*"/> - </fileset> - </war> - -  - <war warfile="${build.tests.dir}/libs/jbossws-interop-BaseDataTypesRpcLit_Service.war" - webxml="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesRpcLit_Service/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> - <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/BaseDataTypesRpcLit_Service/**/*.class"/> - <include name="org/jboss/test/ws/interop/microsoft/*.class"/> - </classes> - <webinf dir="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesRpcLit_Service/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - <include name="jboss-web.xml"/> - <include name="scenarios.xml"/> - </webinf> - <fileset dir="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesRpcLit_Service"> - <include name="*.*"/> - </fileset> - </war> - -  - <war warfile="${build.tests.dir}/libs/jbossws-interop-ComplexDataTypesDocLitB_Service.war" - webxml="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesDocLitB_Service/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> - <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesDocLitB_Service/**/*.class"/> - <include name="org/jboss/test/ws/interop/microsoft/*.class"/> - </classes> - <classes dir="${build.tests.dir}/classes"> - <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesShared/**/*.class"/> - </classes> - <webinf dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesDocLitB_Service/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - <include name="jboss-web.xml"/> - <include name="scenarios.xml"/> - </webinf> - <fileset dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesDocLitB_Service"> - <include name="*.*"/> - </fileset> - </war> - -  - <war warfile="${build.tests.dir}/libs/jbossws-interop-ComplexDataTypesDocLitW_Service.war" - webxml="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesDocLitW_Service/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> - <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesDocLitW_Service/**/*.class"/> - <include name="org/jboss/test/ws/interop/microsoft/*.class"/> - </classes> - <classes dir="${build.tests.dir}/classes"> - <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesShared/**/*.class"/> - </classes> - <webinf dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesDocLitW_Service/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - <include name="jboss-web.xml"/> - <include name="scenarios.xml"/> - </webinf> - <fileset dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesDocLitW_Service"> - <include name="*.*"/> - </fileset> - </war> - -  - <war warfile="${build.tests.dir}/libs/jbossws-interop-ComplexDataTypesRpcLit_Service.war" - webxml="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesRpcLit_Service/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> - <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesRpcLit_Service/**/*.class"/> - <include name="org/jboss/test/ws/interop/microsoft/*.class"/> - </classes> - <classes dir="${build.tests.dir}/classes"> - <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesShared/**/*.class"/> - </classes> - <webinf dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesRpcLit_Service/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - <include name="jboss-web.xml"/> - <include name="scenarios.xml"/> - </webinf> - <fileset dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesRpcLit_Service"> - <include name="*.*"/> - </fileset> - </war> - -  - <war warfile="${build.tests.dir}/libs/jbossws-interop-mtomUTF8.war" - webxml="${test.resources.dir}/interop/microsoft/mtom/utf8/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> - <include name="org/jboss/test/ws/interop/microsoft/mtom/utf8/**/*.class"/> - <include name="org/jboss/test/ws/interop/microsoft/*.class"/> - </classes> - <webinf dir="${test.resources.dir}/interop/microsoft/mtom/utf8/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**.*"/> - <include name="jboss-web.xml"/> - </webinf> - <fileset dir="${test.resources.dir}/interop/microsoft/mtom/utf8"> - <include name="*.*"/> - </fileset> - </war> - -  - <jar jarfile="${build.tests.dir}/libs/jbossws-interop-mtomUTF8-client.jar"> - <fileset dir="${build.tests.dir}/classes"> - <include name="org/jboss/test/ws/interop/microsoft/mtom/utf8/**/*.class"/> - <include name="org/jboss/test/ws/interop/microsoft/*.class"/> - </fileset> - <metainf dir="${test.resources.dir}/interop/microsoft/mtom/utf8/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - <metainf dir="${test.resources.dir}/interop/microsoft/mtom/utf8/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="scenarios.xml"/> - </metainf> - </jar> -  - <war warfile="${build.test.dir}/libs/jbossws-interop-mtomUTF8_wsse.war" - webxml="${test.resources.dir}/interop/microsoft/mtom/utf8/wsse/WEB-INF/web.xml"> - <classes dir="${build.test.dir}/classes"> - <include name="org/jboss/test/ws/interop/microsoft/mtom/utf8/**/*.class"/> - <include name="org/jboss/test/ws/interop/microsoft/*.class"/> - </classes> - - <webinf dir="${test.resources.dir}/interop/microsoft/mtom/utf8/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**.*"/> - </webinf> - <webinf dir="${test.resources.dir}/interop/microsoft/security/wsse10Shared/META-INF"> - <include name="alice.jks"/> - <include name="wsse10.truststore"/> - </webinf> - - <webinf dir="${test.resources.dir}/interop/microsoft/mtom/utf8/wsse/WEB-INF"> - <include name="jboss-wsse-server.xml"/> - <include name="jboss-web.xml"/> - </webinf> - <fileset dir="${test.resources.dir}/interop/microsoft/mtom/utf8"> - <include name="*.*"/> - </fileset> - </war> - -  - <jar jarfile="${build.test.dir}/libs/jbossws-interop-mtomUTF8_wsse-client.jar"> - <fileset dir="${build.test.dir}/classes"> - <include name="org/jboss/test/ws/interop/microsoft/mtom/utf8/**/*.class"/> - <include name="org/jboss/test/ws/interop/microsoft/*.class"/> - </fileset> - <metainf dir="${test.resources.dir}/interop/microsoft/mtom/utf8/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - <metainf dir="${test.resources.dir}/interop/microsoft/security/wsse10Shared/META-INF"> - <include name="alice.jks"/> - <include name="wsse10.truststore"/> - </metainf> - <metainf dir="${test.resources.dir}/interop/microsoft/mtom/utf8/wsse/META-INF"> - <include name="jboss-client.xml"/> - <include name="jboss-wsse-client.xml"/> - <include name="application-client.xml"/> - <include name="scenarios.xml"/> - </metainf> - </jar> - </target> - -</project> \ No newline at end of file Deleted: branches/tdiesler/trunk/jbossws/ant-import/build-interop.xml =================================================================== --- branches/tdiesler/trunk/jbossws/ant-import/build-interop.xml 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/jbossws/ant-import/build-interop.xml 2007-05-13 18:06:04 UTC (rev 3087) @@ -1,401 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - -<project name="JBossWS-Interop" default="interop.build" basedir="../"> - - <import file="../build.xml"/> - - <property name="jwsdp.home" value="C:/dev/env/jwsdp-1.6"/> - <property name="wsdl.update.marker" value="${test.resources.dir}/interop/wsdl.update"/> - <property name="jbossws.client.jar" value="jbossws-client.jar"/> - - <property name="test.java.dir" value="src/main/java"/> - <property name="test.resources.dir" value="src/main/resources"/> - <property name="build.tests.dir" value="output"/> - <property name="build.test.dir" value="output"/> - - <path id="jwsdp.classpath"> -  - </path> - - <path id="wscompile.tools.classpath"> - <fileset dir="${env.JAVA_HOME}/lib"> - <include name="*.jar"/> - </fileset> - </path> - - <path id="build.classpath"> - <path refid="javac.classpath"/> - </path> - -  - -  - - <macrodef name="create-client"> - - <attribute name="company"/> - <attribute name="module"/> - <attribute name="features"/> - <attribute name="config" default="config.xml"/> - <attribute name="verbose" default="false"/> - - <sequential> - - <echo>Generating interop/@{company}/@{module}</echo> - - <mkdir dir="${test.resources.dir}/interop/@{company}/@{module}/META-INF"/> - - <wscompile - keep="true" - client="true" - base="${build.test.dir}/classes" - sourceBase="${test.java.dir}" - nonClassDir="${test.java.dir}/org/jboss/test/ws/interop/@{company}/@{module}" - mapping="${test.resources.dir}/interop/@{company}/(a){module}/WEB-INF/jaxrpc-mapping.xml" - features="@{features}" - xPrintStackTrace="true" - fork="true" - verbose="@{verbose}" - debug="true" - config="${test.resources.dir}/interop/@{company}/@{module}/@{config}"> - - <classpath> - <path refid="wscompile.tools.classpath"/> - <path refid="jwsdp.classpath"/> - <path refid="build.classpath"/> - </classpath> - </wscompile> - </sequential> - </macrodef> - - <macrodef name="create-server"> - - <attribute name="company"/> - <attribute name="module"/> - <attribute name="features"/> - <attribute name="config" default="config.xml"/> - <attribute name="verbose" default="false"/> - - <attribute name="import" default="true"/> - <attribute name="server" default="false"/> - - <sequential> - - <echo>Generating interop/@{company}/@{module}</echo> - - <wscompile - keep="true" - import="@{import}" - server="@{server}" - base="${build.test.dir}/classes" - sourceBase="${test.java.dir}" - nonClassDir="${test.java.dir}/org/jboss/test/ws/interop/@{company}/@{module}" - mapping="${test.resources.dir}/interop/@{company}/(a){module}/WEB-INF/jaxrpc-mapping.xml" - features="@{features}" - xPrintStackTrace="true" - fork="true" - verbose="@{verbose}" - debug="true" - config="${test.resources.dir}/interop/@{company}/@{module}/@{config}"> - - <classpath> - <path refid="wscompile.tools.classpath"/> - <path refid="jwsdp.classpath"/> - <path refid="build.classpath"/> - </classpath> - </wscompile> - - </sequential> - </macrodef> - - <macrodef name="fetch-wsdl"> - <attribute name="company"/> - <attribute name="module"/> - <attribute name="source"/> - <attribute name="localName" default="service.wsdl"/> - - <sequential> - - <mkdir dir="${test.resources.dir}/interop/@{company}/@{module}/WEB-INF"/> - <mkdir dir="${test.resources.dir}/interop/@{company}/@{module}/WEB-INF/wsdl"/> - - <get src="@{source}" - dest="${test.resources.dir}/interop/@{company}/@{module}/WEB-INF/wsdl/@{localName}" - verbose="true" - usetimestamp="true"/> - </sequential> - </macrodef> - -  - <target name="interop.prepare"> - <mkdir dir="${build.test.dir}/libs/"/> - <mkdir dir="${build.test.dir}/classes/"/> - <mkdir dir="${build.test.dir}/reports/"/> - - <uptodate property="create.required" targetfile="${wsdl.update.marker}" > - <srcfiles dir= "${test.resources.dir}/interop" includes="**/WEB-INF/jaxrpc-mapping.xml"/> - </uptodate> - </target> - - <target name="sync-wsdl-files" description="sync the local WSDL copies"> - <fetch-wsdl - source="http://131.107.72.15/SoapWsdl_BaseDataTypes_XmlFormatter_Service_Indigo/B..." - module="soapwsdl/BaseDataTypesDocLitB" - company="microsoft"/> - - <fetch-wsdl - source="http://131.107.72.15/SoapWsdl_BaseDataTypes_XmlFormatter_Service_Indigo/B..." - module="soapwsdl/BaseDataTypesDocLitW" - company="microsoft"/> - - <fetch-wsdl - source="http://131.107.72.15/SoapWsdl_BaseDataTypes_XmlFormatter_Service_Indigo/B..." - module="soapwsdl/BaseDataTypesRPCLit" - company="microsoft"/> - - <fetch-wsdl - source="http://131.107.72.15/SoapWsdl_ComplexDataTypes_XmlFormatter_Service_Indig..." - module="soapwsdl/ComplexDataTypesDocLitB" - company="microsoft"/> - - <fetch-wsdl - source="http://131.107.72.15/SoapWsdl_ComplexDataTypes_XmlFormatter_Service_Indig..." - module="soapwsdl/ComplexDataTypesDocLitW" - company="microsoft"/> - - <fetch-wsdl - source="http://131.107.72.15/SoapWsdl_ComplexDataTypes_XmlFormatter_Service_Indig..." - module="soapwsdl/ComplexDataTypesRpcLit" - company="microsoft"/> - -  - <fetch-wsdl source="http://131.107.72.15/WSAddressingCR_Service_WCF/WSAddressing10.svc?wsdl" - module="addressing/wsa10" - company="microsoft"/> - -  - <touch file="${wsdl.update.marker}"/> - - </target> - - <target name="create-all" depends="interop.prepare, create-client, create-server, create-not-required"/> - - <target name="create-not-required" unless="create.required"> - <echo>Local WSDL copies seem to be uptodate. No build required.</echo> - </target> - - <target name="re-create-all"> - <property name="create.required" value="true"/> - <antcall target="create-all"/> - </target> - - <target name="create-client" if="create.required" description="create the client side artifacts"> - -  - - </target> - - <target name="create-server" description="create the server side artifacts"> - -  - - </target> - - <target name="create-addressing" description="create the addressing artifcats"> -  - <wstools dest="${test.resources.dir}/interop/microsoft/addressing/sep06/wsa10/WEB-INF" - config="${test.resources.dir}/interop/microsoft/addressing/sep06/wsa10/wstools-config.xml"/> - </target> - - <target name="create-security"> -  - - <wstools dest="${test.resources.dir}/interop/microsoft/security/sep06/wsse10/WEB-INF" - config="${test.resources.dir}/interop/microsoft/security/sep06/wsse10/wstools-config.xml"/> - - <wstools dest="${test.resources.dir}/interop/microsoft/security/sep06/wsse10Encrypt/WEB-INF" - config="${test.resources.dir}/interop/microsoft/security/sep06/wsse10Encrypt/wstools-config.xml"/> - - </target> - - <target name="create-mtom"> -  - - </target> -  - - <target name="interop.build" depends="interop.prepare, copy-resources, interop.compile" - description="Compiles and builds the interop clients and endpoints"> - <ant antfile="ant-import/build-interop-jars.xml" target="build-interop-jars"/> - </target> - - <target name="interop.compile" depends="interop.prepare, init" description="Compiles the interop clients and endpoints"> - <mkdir dir="${build.test.dir}/classes"/> - <javac srcdir="${test.java.dir}" destdir="${build.test.dir}/classes" - classpathref="build.classpath" - source="1.5" - nowarn="off" - debug="on" - fork="yes"> - <classpath refid="jwsdp.classpath"/> - <classpath refid="javac.classpath"/> - <include name="org/jboss/test/ws/interop/**/*"/> - </javac> - </target> - - <target name="interop.deploy" depends="interop.prepare" description="Deploy the test endpoints locally"> - <antcall target="deploy-root"/> - <antcall target="deploy-soapwsdl"/> - <antcall target="deploy-addressing"/> - <antcall target="deploy-security"/> - <antcall target="deploy-mtom"/> - </target> - - <target name="deploy-root"> - <copy todir="${jboss.home}/server/default/deploy/"> - <fileset dir="${build.test.dir}/libs"> - <include name="*interop-root.war"/> - </fileset> - </copy> - </target> - - <target name="deploy-soapwsdl"> - <copy todir="${jboss.home}/server/default/deploy/"> - <fileset dir="${build.test.dir}/libs"> - <include name="*interop*_Service.war"/> - </fileset> - </copy> - </target> - - <target name="deploy-addressing"> - <copy todir="${jboss.home}/server/default/deploy/"> - <fileset dir="${build.test.dir}/libs"> - <include name="*interop-wsa10*.war"/> - </fileset> - </copy> - </target> - - <target name="deploy-security"> - <copy todir="${jboss.home}/server/default/deploy/"> - <fileset dir="${build.test.dir}/libs"> - <include name="*interop-wsse*.war"/> - </fileset> - </copy> - </target> - - <target name="deploy-mtom"> - <copy todir="${jboss.home}/server/default/deploy/"> - <fileset dir="${build.test.dir}/libs"> - <include name="*interop-mtom*.war"/> - </fileset> - </copy> - </target> - - <target name="interop.undeploy" description="Undeploy the local test endpoints"> - <delete> - <fileset dir="${jboss.home}/server/default/deploy/"> - <include name="*interop*.war"/> - </fileset> - </delete> - </target> - - <target name="interop.clean" description="Clean local build artifacts"> - <delete> - <fileset dir="${build.test.dir}/classes"> - <include name="**/interop/**/*"/> - </fileset> - </delete> - - <delete> - <fileset dir="${build.test.dir}/libs"> - <include name="*interop*"/> - </fileset> - </delete> - </target> - -</project> Deleted: branches/tdiesler/trunk/jbossws/ant-import/build-jars-jaxrpc.xml =================================================================== --- branches/tdiesler/trunk/jbossws/ant-import/build-jars-jaxrpc.xml 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/jbossws/ant-import/build-jars-jaxrpc.xml 2007-05-13 18:06:04 UTC (rev 3087) @@ -1,3124 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - -<project> - - <description>JBossWS test archive builder</description> - -  -  -  - - <target name="build-jars-jaxrpc" description="Build the jaxrpc deployments"> - - <mkdir dir="${tests.output.dir}/libs"/> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-anonymous.war" webxml="${tests.output.dir}/resources/jaxrpc/anonymous/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestService.class"/> - <include name="org/jboss/test/ws/jaxrpc/anonymous/ComplexTypeRoot.class"/> - <include name="org/jboss/test/ws/jaxrpc/anonymous/ElementTypeRoot.class"/> - <include name="org/jboss/test/ws/jaxrpc/anonymous/ElementTypeInside.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/anonymous/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-anonymous-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestService.class"/> - <include name="org/jboss/test/ws/jaxrpc/anonymous/ComplexTypeRoot.class"/> - <include name="org/jboss/test/ws/jaxrpc/anonymous/ElementTypeRoot.class"/> - <include name="org/jboss/test/ws/jaxrpc/anonymous/ElementTypeInside.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/anonymous/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/anonymous/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-benchmark-rpclit.war" webxml="${tests.output.dir}/resources/benchmark/jaxrpc/rpclit/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/benchmark/jaxrpc/**"/> - <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*_*.class"/> - <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*EJBEndpoint.class"/> - <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*TestCase.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/benchmark/jaxrpc/rpclit/WEB-INF"> - <include name="jboss-web.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-benchmark-rpclit.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/benchmark/jaxrpc/**"/> - <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*_*.class"/> - <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*JSEEndpoint.class"/> - <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*TestCase.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/benchmark/jaxrpc/rpclit/META-INF"> - <include name="ejb-jar.xml"/> - <include name="jboss.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-benchmark-rpclit-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/benchmark/jaxrpc/**"/> - <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*_*.class"/> - <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*JSEEndpoint.class"/> - <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*EJBEndpoint.class"/> - <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*TestCase.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/benchmark/jaxrpc/rpclit/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <war warfile="${tests.output.dir}/libs/jaxrpc-benchmark-doclit.war" webxml="${tests.output.dir}/resources/benchmark/jaxrpc/doclit/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/benchmark/jaxrpc/**"/> - <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*_arr*/**"/> - <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*EJBEndpoint.class"/> - <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*TestCase.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/benchmark/jaxrpc/doclit/WEB-INF"> - <include name="jboss-web.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-benchmark-doclit.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/benchmark/jaxrpc/**"/> - <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*_arr*/**"/> - <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*JSEEndpoint.class"/> - <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*TestCase.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/benchmark/jaxrpc/doclit/META-INF"> - <include name="ejb-jar.xml"/> - <include name="jboss.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-benchmark-doclit-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/benchmark/jaxrpc/**"/> - <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*_arr*/**"/> - <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*JSEEndpoint.class"/> - <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*EJBEndpoint.class"/> - <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*TestCase.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/benchmark/jaxrpc/doclit/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-encoded-href.war" webxml="${tests.output.dir}/resources/jaxrpc/encoded/href/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/encoded/href/MarshallTestImpl.class"/> - <include name="org/jboss/test/ws/jaxrpc/encoded/href/MarshallTest.class"/> - <include name="org/jboss/test/ws/jaxrpc/encoded/href/HRefHandler.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/encoded/href/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-encoded-href-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/encoded/href/MarshallTest.class"/> - <include name="org/jboss/test/ws/jaxrpc/encoded/href/HRefHandler.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/encoded/href/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/encoded/href/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-encoded-marshalltest.war" webxml="${tests.output.dir}/resources/jaxrpc/encoded/marshalltest/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/encoded/marshalltest/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/encoded/marshalltest/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-encoded-marshalltest-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/encoded/marshalltest/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestImpl.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/encoded/marshalltest/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/encoded/marshalltest/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-encoded-parametermode.war" webxml="${tests.output.dir}/resources/jaxrpc/encoded/parametermode/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/encoded/parametermode/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/encoded/parametermode/holders/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestCase.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/encoded/parametermode/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-encoded-parametermode-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/encoded/parametermode/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/encoded/parametermode/holders/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestImpl.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestCase.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/encoded/parametermode/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/encoded/parametermode/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-enventry.war" webxml="${tests.output.dir}/resources/jaxrpc/enventry/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/enventry/EnvEntryTestService.class"/> - <include name="org/jboss/test/ws/jaxrpc/enventry/EnvEntryBeanJSE.class"/> - <include name="org/jboss/test/ws/jaxrpc/enventry/ServerSideHandler.class"/> - <include name="org/jboss/test/ws/jaxrpc/enventry/EnvEntryHandler.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/enventry/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-enventry.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/enventry/EnvEntryTestService.class"/> - <include name="org/jboss/test/ws/jaxrpc/enventry/EnvEntryBeanEJB.class"/> - <include name="org/jboss/test/ws/jaxrpc/enventry/ServerSideHandler.class"/> - <include name="org/jboss/test/ws/jaxrpc/enventry/EnvEntryHandler.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/enventry/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/enventry/META-INF"> - <include name="ejb-jar.xml"/> - <include name="jboss.xml"/> - <include name="webservices.xml"/> - </metainf> - </jar> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-enventry-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/enventry/EnvEntryTestService.class"/> - <include name="org/jboss/test/ws/jaxrpc/enventry/ClientSideHandler.class"/> - <include name="org/jboss/test/ws/jaxrpc/enventry/EnvEntryHandler.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/enventry/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/enventry/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - </jar> - -  - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbas897.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbas897/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbas897/HelloSLSB.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbas897/META-INF"> - <include name="ejb-jar.xml"/> - <include name="jboss.xml"/> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbas897-fail.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbas897/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbas897/HelloSLSB.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbas897/META-INF"> - <include name="jboss.xml"/> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbas897/META-INF-FAIL"> - <include name="ejb-jar.xml"/> - </metainf> - </jar> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbas897.war" webxml="${tests.output.dir}/resources/jaxrpc/jbas897/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbas897/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbas897/HelloJavaBean.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbas897/META-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbas897/WEB-INF"> - <include name="webservices.xml"/> - </webinf> - </war> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbas897-fail.war" webxml="${tests.output.dir}/resources/jaxrpc/jbas897/WEB-INF/web-fail.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbas897/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbas897/HelloJavaBean.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbas897/META-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbas897/WEB-INF"> - <include name="webservices.xml"/> - </webinf> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws64.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws64/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws64/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws64/HelloJavaBean.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws64/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws68.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws68/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws68/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws68/HelloJavaBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws68/UserType.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws68/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws68-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws68/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws68/UserType.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws68/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws68/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws70.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws70/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws70/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws70/HelloJavaBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws70/*_RequestStruct.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws70/*_ResponseStruct.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws70/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws70-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws70/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws70/*_RequestStruct.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws70/*_ResponseStruct.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws70/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws70/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws71-types.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws71/UserType.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws71/*_RequestStruct.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws71/*_ResponseStruct.class"/> - </fileset> - </jar> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws71.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws71/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws71/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws71/HelloJavaBean.class"/> - </classes> - <lib dir="${tests.output.dir}/libs"> - <include name="jaxrpc-jbws71-types.jar"/> - </lib> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws71/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws71-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws71/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws71/UserType.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws71/*_RequestStruct.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws71/*_ResponseStruct.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws71/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws71/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws79.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws79/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws79/HelloOne.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws79/HelloTwo.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws79/HelloOneJavaBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws79/HelloTwoJavaBean.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws79/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping-one.xml"/> - <include name="jaxrpc-mapping-two.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws79-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws79/HelloOne.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws79/HelloTwo.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws79/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws79/WEB-INF"> - <include name="jaxrpc-mapping-one.xml"/> - <include name="jaxrpc-mapping-two.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws82.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws82/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws82/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws82/HelloJavaBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws82/UserType.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws82/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws82-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws82/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws82/UserType.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws82/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws82/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws83.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws83/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws83/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws83/HelloJavaBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws83/UserType.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws83/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws83-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws83/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws83/UserType.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws83/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws83/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws84.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws84/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws84/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws84/*TestCase.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws84/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/*.wsdl"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws84-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws84/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws84/*JavaBean.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws84/*TestCase.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws84/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws84/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/*.wsdl"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws124.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws124/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws124/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws124/HelloJavaBean.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws124/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws124-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws124/Hello.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws124/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws124/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws128-service.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws128/WEB-INF-service/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws128/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws128/HelloJavaBean.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws128/WEB-INF-service"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws128-client.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws128/WEB-INF-client/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws128/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws128/HelloClientServlet.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws128/WEB-INF-client"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <ear destfile="${tests.output.dir}/libs/jaxrpc-jbws128.ear" appxml="${tests.output.dir}/resources/jaxrpc/jbws128/META-INF/application.xml"> - <fileset dir="${tests.output.dir}/libs"> - <include name="jaxrpc-jbws128-service.war"/> - <include name="jaxrpc-jbws128-client.war"/> - </fileset> - </ear> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws153.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws153/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws153/Order.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws153/OrderJavaBean.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws153/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="jaxrpc-deployment.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws153-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws153/Order.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws153/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws153/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="jaxrpc-deployment.xml"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws163.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws163/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws163/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws163/HelloJavaBean.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws163/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws163-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws163/Hello.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws163/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws163/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <jar jarfile="${tests.output.dir}/libs/jaxrpc-jbws165-none.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws165/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws165/HelloEJB.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws165/META-INF-none"> - <include name="webservices.xml"/> - <include name="ejb-jar.xml"/> - <include name="jboss.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-jbws165-pcuri.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws165/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws165/HelloEJB.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws165/META-INF-pcuri"> - <include name="webservices.xml"/> - <include name="ejb-jar.xml"/> - <include name="jboss.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-jbws165-ctxroot.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws165/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws165/HelloEJB.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws165/META-INF-ctxroot"> - <include name="webservices.xml"/> - <include name="ejb-jar.xml"/> - <include name="jboss.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-jbws165-both.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws165/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws165/HelloEJB.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws165/META-INF-both"> - <include name="webservices.xml"/> - <include name="ejb-jar.xml"/> - <include name="jboss.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws165-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws165/Hello.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws165/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jaxrpc-mapping.xml"/> - </metainf> - </jar> - <ear destfile="${tests.output.dir}/libs/jaxrpc-jbws165.ear" appxml="${tests.output.dir}/resources/jaxrpc/jbws165/META-INF/application.xml"> - <fileset dir="${tests.output.dir}/libs"> - <include name="jaxrpc-jbws165-none.jar"/> - <include name="jaxrpc-jbws165-pcuri.jar"/> - <include name="jaxrpc-jbws165-ctxroot.jar"/> - <include name="jaxrpc-jbws165-both.jar"/> - <include name="jaxrpc-jbws165-client.jar"/> - </fileset> - </ear> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws167.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws167/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws167/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws167/HelloJavaBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws167/HeaderHandler.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws167/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws168.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws168/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws168/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws168/HelloJavaBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws168/UserType.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws168/HelloHandler.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws168/*RequestStruct.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws168/*ResponseStruct.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws168/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="jaxrpc-deployment.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws168-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws168/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws168/UserType.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws168/*RequestStruct.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws168/*ResponseStruct.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws168/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws168/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="jaxrpc-deployment.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws217.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws217/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws217/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws217/HelloJavaBean.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws217/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws217-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws217/Hello.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws217/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws217/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws231.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws231/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws231/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws231/TestEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws231/EyeColorType.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws231/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws231-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws231/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws231/EyeColorType.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws231/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws231/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws251.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws251/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws251/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws251/HelloJavaBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws251/BaseException.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws251/UserExceptionOne.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws251/UserExceptionTwo.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws251/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws251-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws251/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws251/BaseException.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws251/UserExceptionOne.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws251/UserExceptionTwo.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws251/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws251/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <copy todir="${tests.output.dir}/resources/META-INF" file="${tests.output.dir}/resources/jaxrpc/jbws413/WEB-INF/jaxrpc-mapping.xml"/> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws316.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws316/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws316/BinDataDTO.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws316/TestBusinessFacadeBF*.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws316/WEB-INF"> - <include name="webservices.xml"/> - <include name="TestBusinessFacadeMapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws316-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws316/BinDataDTO.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws316/TestBusinessFacadeBF*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws316/TestBusinessFacadeBFBean.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws316/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws316/WEB-INF"> - <include name="TestBusinessFacadeMapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws331-ws.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws331/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws331/HelloEndpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws331/WS-META-INF"> - <include name="ejb-jar.xml"/> - <include name="jboss.xml"/> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws331-ejb.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws331/HelloHome.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws331/HelloRemote.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws331/HelloSLSB.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws331/EJB-META-INF"> - <include name="ejb-jar.xml"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws331-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws331/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws331/HelloHome.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws331/HelloRemote.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws331/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws331/WS-META-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <ear destfile="${tests.output.dir}/libs/jaxrpc-jbws331.ear" appxml="${tests.output.dir}/resources/jaxrpc/jbws331/META-INF/application.xml"> - <fileset dir="${tests.output.dir}/libs"> - <include name="jaxrpc-jbws331-ejb.jar"/> - <include name="jaxrpc-jbws331-ws.jar"/> - <include name="jaxrpc-jbws331-client.jar"/> - </fileset> - </ear> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws349.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws349/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws349/*"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws349/*TestCase.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws349/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws349-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws349/*"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws349/*EndpointImpl.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws349/*TestCase.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws349/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws349/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws358.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws358/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws358/HelloBean.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws358/META-INF"> - <include name="ejb-jar.xml"/> - <include name="jboss.xml"/> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws358-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws358/Hello.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws358/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws358.ear/jaxrpc-jbws358.jar"/> - <unjar dest="${tests.output.dir}/libs/jaxrpc-jbws358.ear/jaxrpc-jbws358.jar" src="${tests.output.dir}/libs/jaxrpc-jbws358.jar"/> - <copy todir="${tests.output.dir}/libs/jaxrpc-jbws358.ear"> - <fileset dir="${tests.output.dir}/resources/jaxrpc/jbws358"> - <include name="META-INF/application.xml"/> - </fileset> - <fileset dir="${tests.output.dir}/libs"> - <include name="jaxrpc-jbws358-client.jar"/> - </fileset> - </copy> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws377.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws377/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws377/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws377/HelloJavaBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws377/UserType.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws377/*_RequestStruct.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws377/*_ResponseStruct.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws377/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws377-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws377/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws377/UserType.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws377/*_RequestStruct.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws377/*_ResponseStruct.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws377/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws377/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws381.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws381/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws381/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws381/JBWS381TestCase.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws381/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws381-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws381/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws381/WeatherForecastSoapImpl.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws381/JBWS381TestCase.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws381/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws381/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws383.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws383/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws383/TestSEI.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws383/TestJavaBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws383/JavaType.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws383/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws383-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws383/TestSEI.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws383/JavaType.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws383/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws383/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws413.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws413/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws413/TestSEI.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws413/TestJavaBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws413/JavaType.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws413/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws413-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws413/TestSEI.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws413/JavaType.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws413/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws413/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws414.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws414/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws414/TestSEI.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws414/TestJavaBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws414/St.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws414/RefType.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws414/Interface.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws414/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="jaxrpc-deployment.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws414-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws414/TestSEI.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws414/St.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws414/RefType.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws414/Interface.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws414/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws414/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="jaxrpc-deployment.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws423.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws423/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws423/DemoEndpoint.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws423/DemoBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws423/ValueObj.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws423/_arrays/**"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws423/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws423-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws423/DemoEndpoint.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws423/ValueObj.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws423/_arrays/**"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws423/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws423/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws424.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws424/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws424/TestSEI.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws424/TestJavaBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws424/PrivateException.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws424/Exception2.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws424/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws424-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws424/TestSEI.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws424/PrivateException.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws424/Exception2.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws424/TestHandler.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws424/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws424/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws425.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws425/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws425/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws425/HelloJavaBean.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws425/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws425-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws425/Hello.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws425/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws425/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws434.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws434/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws434/TestServiceEndpoint.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws434/TestServiceEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws434/ArrayOfAny*.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws434/TypeOfAny*.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws434/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws434-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws434/TestServiceEndpoint.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws434/ArrayOfAny*.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws434/TypeOfAny*.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws434/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws434/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws456.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws456/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws456/TestSEI.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws456/TestJavaBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws456/JavaType.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws456/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws456-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws456/TestSEI.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws456/JavaType.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws456/TestHandler.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws456/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws456/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws463.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws463/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws463/TestSEI.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws463/TestJavaBean.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws463/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws463-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws463/TestSEI.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws463/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws463/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws464.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws464/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws464/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws464/HelloJavaBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws464/SAAJTestHandler.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws464/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws464-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws464/Hello.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws464/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws464/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws484.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws484/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws484/*"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws484/JBWS484TestCase.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws484/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws484-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws484/*"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws484/TestServiceBean.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws484/JBWS484TestCase.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws484/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws484/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <jar jarfile="${tests.output.dir}/libs/jaxrpc-jbws626.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws626/DemoEndpoint.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws626/ServerHandler.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws626/DemoBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws626/ValueObj.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws626/_arrays/**"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws626/META-INF"> - <include name="ejb-jar.xml"/> - <include name="jboss.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/TestService.wsdl"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws626-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws626/DemoEndpoint.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws626/ValueObj.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws626/_arrays/**"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws626/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <ear destfile="${tests.output.dir}/libs/jaxrpc-jbws626.ear" appxml="${tests.output.dir}/resources/jaxrpc/jbws626/META-INF/application.xml"> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws626/META-INF"> - <include name="jboss-app.xml"/> - </metainf> - <fileset dir="${tests.output.dir}/libs"> - <include name="jaxrpc-jbws626.jar"/> - <include name="jaxrpc-jbws626-client.jar"/> - </fileset> - </ear> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws632.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws632/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws632/TestSEI.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws632/TestJavaBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws632/_arrays/**"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws632/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws632-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws632/TestSEI.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws632/_arrays/**"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws632/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws632/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws637-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws637/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws637/*TestCase.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws637/META-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws643.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws643/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws643/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws643/*TestCase.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws643/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws643-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws643/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws643/*TestCase.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws643/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws643/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws663b.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws663b/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws663/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws663/holders/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws663/*TestCase.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws663b/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws663b-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws663/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws663/holders/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws663/*TestCase.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws663b/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws663b/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws663bb.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws663bb/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws663/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws663/holders/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws663/*TestCase.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws663bb/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws663bb-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws663/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws663/holders/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws663/*TestCase.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws663bb/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws663bb/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws663w.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws663w/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws663/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws663/holders/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws663/*TestCase.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws663w/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws663w-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws663/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws663/holders/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws663/*TestCase.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws663w/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws663w/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws663wb.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws663wb/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws663/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws663/holders/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws663/*TestCase.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws663wb/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws663wb-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws663/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws663/holders/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws663/*TestCase.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws663wb/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws663wb/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws706.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws706/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws706/**"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws706/ClientHandler.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws706/JBWS706TestCase.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws706/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws706-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws706/**"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws706/DemoServicePortTypeImpl.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws706/JBWS706TestCase.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws706/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws706/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws707.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws707/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws707/UserType.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws707/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws707/TestEndpointImpl.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws707/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws707-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws707/UserType.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws707/TestEndpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws707/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws707/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws710.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws710/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws710/**"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws710/JBWS710TestCase.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws710/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws710-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws710/**"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws710/HelloBean.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws710/JBWS710TestCase.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws710/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws710/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws720.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws720/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws720/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws720/*TestCase.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws720/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws720-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws720/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws720/*Impl.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws720/*TestCase.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws720/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws720/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <jar jarfile="${tests.output.dir}/libs/jaxrpc-jbws723.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationService.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationHome.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationRemote.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationImpl.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws723/META-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="ejb-jar.xml"/> - <include name="jboss.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-jbws723-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationService.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationHome.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationRemote.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws723/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws732.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws732/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws732/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws732/*TestCase.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws732/WEB-INF"> - <include name="bare-mapping.xml"/> - <include name="wrapped-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws732-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws732/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws732/*TestCase.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws732/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws732/WEB-INF"> - <include name="bare-mapping.xml"/> - <include name="wrapped-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws751.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws751/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws751/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws751/*TestCase.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws751/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws751-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws751/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws751/*Impl.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws751/*TestCase.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws751/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws751/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws772-endpoint.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws772/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws772/HelloSLSB.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws772/META-INF-ONE"> - <include name="ejb-jar.xml"/> - <include name="jboss.xml"/> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws772-remote.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws772/HelloHome.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws772/HelloRemote.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws772/HelloSLSB.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws772/META-INF-TWO"> - <include name="ejb-jar.xml"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws772-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws772/Hello.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws772/META-INF-ONE"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <ear destfile="${tests.output.dir}/libs/jaxrpc-jbws772.ear" appxml="${tests.output.dir}/resources/jaxrpc/jbws772/META-INF-ONE/application.xml"> - <fileset dir="${tests.output.dir}/libs"> - <include name="jaxrpc-jbws772-endpoint.jar"/> - <include name="jaxrpc-jbws772-remote.jar"/> - <include name="jaxrpc-jbws772-client.jar"/> - </fileset> - </ear> - -  - <war destfile="${tests.output.dir}/libs/jaxrpc-jbws775.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws775/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws775/*"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws775/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws775-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws775/*"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws775/*Impl.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws775/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws775/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws801.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws801/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws801/LargeAttachmentImpl.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws801/LargeAttachment.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws801/WEB-INF"> - <include name="wsdl/LargeAttachment.wsdl"/> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - </webinf> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws807.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws807/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws807/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws807/*TestCase.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws807/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws807-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws807/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws807/*TestCase.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws807/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws807/WEB-INF"> - <include name="wsdl/**"/> - <include name="jaxrpc-mapping.xml"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws812.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws812/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws812/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws812/TestEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws812/ServerHandler.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws812/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws812-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws812/TestEndpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws812/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws812/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws950.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws950/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws950/TestEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws950/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws950/UserType.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws950/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws956.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws956/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws956/TestEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws956/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws956/StringArray.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws956/StringArrayArray.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws956/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1010.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1010/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws1010/InheritenceChildInterface.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws1010/InheritenceParentInterface.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws1010/TestEndpointImpl.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1010/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1010-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws1010/InheritenceChildInterface.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws1010/InheritenceParentInterface.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1010/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1010/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1011.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws1011/SimpleEntityLocal.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws1011/SimpleEntityHome.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws1011/SimpleEntityBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws1011/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws1011/TestEndpointBean.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1011/META-INF"> - <include name="ejb-jar.xml"/> - <include name="jboss.xml"/> - <include name="jbosscmp-jdbc.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/TestService.wsdl"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1011-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws1011/TestEndpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1011/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1093.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1093/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws1093/ServletTest.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws1093/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws1093/TestEndpointImpl.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1093/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1093-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jbws1093/TestEndpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1093/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1093/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1107.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1107/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws1107/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws1107/TestEndpointImpl.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1107/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1107-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws1107/TestEndpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1107/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1107/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war destfile="${tests.output.dir}/libs/jaxrpc-jbws1121.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1121/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws1121/HelloWorld.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws1121/HelloWorldBean.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1121/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="jboss-wsse-server.xml"/> - <include name="wsdl/*"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1121"> - <include name="wsse.keystore"/> - <include name="wsse.truststore"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1121-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws1121/HelloWorld.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1121/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jboss-wsse-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1121/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/*"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1121"> - <include name="wsse.keystore"/> - <include name="wsse.truststore"/> - </metainf> - </jar> - <ear destfile="${tests.output.dir}/libs/jaxrpc-jbws1121.ear" - appxml="${tests.output.dir}/resources/jaxrpc/jbws1121/META-INF/application.xml"> - <fileset dir="${tests.output.dir}/libs"> - <include name="jaxrpc-jbws1121-client.jar"/> - <include name="jaxrpc-jbws1121.war"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1121/META-INF"> - <include name="jboss-app.xml"/> - </metainf> - </ear> - -  - <copy todir="${tests.output.dir}/resources" overwrite="true"> - <fileset dir="${tests.resources.dir}"> - <include name="jaxrpc/jbws1124/META-INF/jboss-client.xml"/> - <include name="jaxrpc/jbws1124/WEB-INF/test-resource.txt"/> - <include name="jaxrpc/jbws1124/WEB-INF/jboss-web.xml"/> - </fileset> - <filterset> - <filter token="jbws1124.domain" value="jbws1124one"/> - </filterset> - </copy> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1124one.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1124/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws1124/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws1124/TestEndpointImpl.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1124/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="test-resource.txt"/> - <include name="jboss-web.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> -  - <copy todir="${tests.output.dir}/resources" overwrite="true"> - <fileset dir="${tests.resources.dir}"> - <include name="jaxrpc/jbws1124/META-INF/jboss-client.xml"/> - <include name="jaxrpc/jbws1124/WEB-INF/test-resource.txt"/> - <include name="jaxrpc/jbws1124/WEB-INF/jboss-web.xml"/> - </fileset> - <filterset> - <filter token="jbws1124.domain" value="jbws1124two"/> - </filterset> - </copy> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1124two.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1124/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws1124/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws1124/TestEndpointImpl.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1124/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="test-resource.txt"/> - <include name="jboss-web.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1125.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1125/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws1125/TestEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws1125/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws1125/*RequestStruct.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws1125/*ResponseStruct.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1125/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1125-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws1125/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws1125/*RequestStruct.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws1125/*ResponseStruct.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1125/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1125/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1148.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1148/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws1148/TestEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws1148/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws1148/TelephoneNumber.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1148/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-jbws1148-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws1148/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws1148/TelephoneNumber.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1148/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1148/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1179.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1179/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws1179/TestEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1179/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1179-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1179/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1179/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1186.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1186/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws1186/TestEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws1186/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws1186/ServerHandler.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws1186/UserType.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1186/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1190.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1190/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws1190/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl$1.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpoint.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190Exception.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1190/WEB-INF"> - <include name="webservices.xml"/> - <include name="test-mapping.xml"/> - <include name="confidential-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-jbws1190-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws1190/TestEndpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1190/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1190/WEB-INF"> - <include name="test-mapping.xml"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1205-simple.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint_echo_RequestStruct.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint_echo_ResponseStruct.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF"> - <include name="webservices.xml"/> - <include name="simple-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1205-test.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws1205/TestEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws1205/TestEndpointImpl$*.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws1205/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws1205/TestException.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint_echo_RequestStruct.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint_echo_ResponseStruct.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF"> - <include name="webservices.xml"/> - <include name="test-mapping.xml"/> - <include name="wsdl/**"/> - <include name="jboss-web.xml"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF"> - <include name="simple-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-jbws1205-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws1205/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws1205/TestException.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1205/Client/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF"> - <include name="test-mapping.xml"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1303.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1303/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws1303/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws1303/*TestCase.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1303/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1303-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws1303/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws1303/*TestCase.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1303/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1303/WEB-INF"> - <include name="wsdl/**"/> - <include name="jaxrpc-mapping.xml"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1378.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1378/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws1378/**"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws1378/*TestCase.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1378/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1384.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1384/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws1384/**"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws1384/*TestCase.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1384/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1386.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1386/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws1386/**"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws1386/*TestCase.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1386/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1410.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1410/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws1410/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws1410/TestEndpointImpl.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1410/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - -  - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1427.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws1427/**"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws1427/*TestCase.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1427/META-INF"> - <include name="webservices.xml"/> - <include name="ejb-jar.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1619.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1619/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws1619/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws1619/TestEndpointImpl.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1619/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1619-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jbws1619/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jbws1619/ClientHandler.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1619/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1619/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-marshall-doclit.war" webxml="${tests.output.dir}/resources/jaxrpc/marshall-doclit/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypes.class"/> - <include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypesBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/marshall/*RequestStruct.class"/> - <include name="org/jboss/test/ws/jaxrpc/marshall/*ResponseStruct.class"/> - <include name="org/jboss/test/ws/jaxrpc/marshall/types/**"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/marshall-doclit/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-marshall-doclit-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypes.class"/> - <include name="org/jboss/test/ws/jaxrpc/marshall/types/**"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/marshall-doclit/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/marshall-doclit/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-marshall-rpclit.war" webxml="${tests.output.dir}/resources/jaxrpc/marshall-rpclit/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypes.class"/> - <include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypesBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/marshall/types/JavaBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/marshall/types/JavaBean2.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/marshall-rpclit/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-marshall-rpclit-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypes.class"/> - <include name="org/jboss/test/ws/jaxrpc/marshall/types/JavaBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/marshall/types/JavaBean2.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/marshall-rpclit/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/marshall-rpclit/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-outparam.war" webxml="${tests.output.dir}/resources/jaxrpc/outparam/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/outparam/*Service.class"/> - <include name="org/jboss/test/ws/jaxrpc/outparam/*ServiceBean.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/outparam/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-overloaded.war" webxml="${tests.output.dir}/resources/jaxrpc/overloaded/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/overloaded/Overloaded.class"/> - <include name="org/jboss/test/ws/jaxrpc/overloaded/OverloadedBean.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/overloaded/WEB-INF"> - <include name="jboss-web.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-overloaded-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/overloaded/Overloaded.class"/> - <include name="org/jboss/test/ws/jaxrpc/overloaded/OverloadedBean.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/overloaded/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/overloaded/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-serviceref.war" webxml="${tests.output.dir}/resources/jaxrpc/serviceref/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/serviceref/TestEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxrpc/serviceref/TestEndpoint.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/serviceref/META-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/jaxrpc/serviceref/WEB-INF"> - <include name="webservices.xml"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-serviceref-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/serviceref/ApplicationClient.class"/> - <include name="org/jboss/test/ws/jaxrpc/serviceref/TestEndpointService.class"/> - <include name="org/jboss/test/ws/jaxrpc/serviceref/TestEndpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/serviceref/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <war destfile="${tests.output.dir}/libs/jaxrpc-serviceref-servlet-client.war" webxml="${tests.output.dir}/resources/jaxrpc/serviceref/servlet-client/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/serviceref/ServletClient.class"/> - <include name="org/jboss/test/ws/jaxrpc/serviceref/TestEndpointService.class"/> - <include name="org/jboss/test/ws/jaxrpc/serviceref/TestEndpoint.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/serviceref/META-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-serviceref-ejb-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/serviceref/EJBClient.class"/> - <include name="org/jboss/test/ws/jaxrpc/serviceref/EJBRemote.class"/> - <include name="org/jboss/test/ws/jaxrpc/serviceref/EJBRemoteHome.class"/> - <include name="org/jboss/test/ws/jaxrpc/serviceref/TestEndpointService.class"/> - <include name="org/jboss/test/ws/jaxrpc/serviceref/TestEndpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/serviceref/META-INF"> - <include name="ejb-jar.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-utf16.war" webxml="${tests.output.dir}/resources/jaxrpc/utf16/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/utf16/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/utf16/HelloJavaBean.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/utf16/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-utf16-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/utf16/Hello.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/utf16/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/utf16/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-wsdlpublish.war" webxml="${tests.output.dir}/resources/jaxrpc/wsdlpublish/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/wsdlpublish/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsdlpublish/TestEndpointImpl.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/wsdlpublish/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="jboss-web.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-wsse-account-signup.war" webxml="${tests.output.dir}/resources/jaxrpc/wsse/account-signup/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountInfo.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignup.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupImpl.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignup_signup_RequestStruct.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignup_signup_ResponseStruct.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/signup/Address.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/signup/CreditCardInfo.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse/account-signup/WEB-INF"> - <include name="jboss-web.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="jboss-wsse-server.xml"/> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse"> - <include name="wsse.keystore"/> - <include name="wsse.truststore"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-wsse-account-signup-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountInfo.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignup.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/signup/Address.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/signup/CreditCardInfo.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/account-signup/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jboss-wsse-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/account-signup/WEB-INF"> - <include name="wsdl/**"/> - <include name="jaxrpc-mapping.xml"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-wsse-rpc.war" webxml="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/HelloJavaBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF"> - <include name="jboss-web.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="jboss-wsse-server.xml"/> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse"> - <include name="wsse.keystore"/> - <include name="wsse.truststore"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-wsse-rpc-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jboss-wsse-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF"> - <include name="wsdl/**"/> - <include name="jaxrpc-mapping.xml"/> - </metainf> - </jar> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-wsse-rpc-none-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/META-INF"> - <include name="application-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/META-INF-no-wsse"> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF"> - <include name="wsdl/**"/> - <include name="jaxrpc-mapping.xml"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-wsse-simple-sign-encrypt.war" webxml="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/HelloJavaBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="jboss-web.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse/simple-sign-encrypt"> - <include name="jboss-wsse-server.xml"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse"> - <include name="wsse.keystore"/> - <include name="wsse.truststore"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-wsse-simple-sign-encrypt-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/simple-sign-encrypt"> - <include name="jboss-wsse-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF"> - <include name="wsdl/**"/> - <include name="jaxrpc-mapping.xml"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-wsse-sign-fault.war" webxml="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/HelloJavaBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="jboss-web.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse/sign-fault"> - <include name="jboss-wsse-server.xml"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse"> - <include name="wsse.keystore"/> - <include name="wsse.truststore"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-wsse-sign-fault-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/sign-fault"> - <include name="jboss-wsse-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF"> - <include name="wsdl/**"/> - <include name="jaxrpc-mapping.xml"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-wsse-sign-encrypt-fault.war" webxml="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/HelloJavaBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="jboss-web.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse/sign-encrypt-fault"> - <include name="jboss-wsse-server.xml"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse"> - <include name="wsse.keystore"/> - <include name="wsse.truststore"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-wsse-sign-encrypt-fault-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/sign-encrypt-fault"> - <include name="jboss-wsse-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF"> - <include name="wsdl/**"/> - <include name="jaxrpc-mapping.xml"/> - </metainf> - </jar> - -  - <replace file="${tests.output.dir}/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml" token="${buildpath}" value="${tests.output.dir}"/> - <war warfile="${tests.output.dir}/libs/jaxrpc-wsse-store-pass-encrypt-class-cmd.war" webxml="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/HelloJavaBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/PasswordUtil.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="jboss-web.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd"> - <include name="jboss-wsse-server.xml"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse"> - <include name="wsse.keystore"/> - <include name="wsse.truststore"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-wsse-store-pass-encrypt-class-cmd-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd"> - <include name="jboss-wsse-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF"> - <include name="wsdl/**"/> - <include name="jaxrpc-mapping.xml"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-wsse-web-client.war" webxml="${tests.output.dir}/resources/jaxrpc/wsse/webclient/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/HelloJavaBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/RpcTestClientServlet.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="jboss-wsse-server.xml"/> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse/webclient/WEB-INF"> - <include name="jboss-web.xml"/> - <include name="jboss-wsse-client.xml"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse"> - <include name="wsse.keystore"/> - <include name="wsse.truststore"/> - </webinf> - </war> - -  - <jar jarfile="${tests.output.dir}/libs/jaxrpc-wsse-username.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/wsse/*Type.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/*Service.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/*Struct.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/*EJBEndpoint.class"/> - </fileset> - <fileset dir="${tests.output.dir}/resources"> - <include name="*.properties"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/username/META-INF"> - <include name="ejb-jar.xml"/> - <include name="jboss.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="jboss-wsse-server.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse"> - <include name="wsse.keystore"/> - <include name="wsse.truststore"/> - </metainf> - </jar> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-wsse-username-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/wsse/username/*Type.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/username/*Struct.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/username/*Service.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/username/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="jboss-wsse-client.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-xop-doclit.war" webxml="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-xop-doclit-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF"> - <include name="wsdl/**"/> - <include name="jaxrpc-mapping.xml"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-xop-doclit_handler.war" webxml="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF"> - <include name="webservices.xml"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-xop-doclit_handler-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/handlerconfig/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF"> - <include name="wsdl/**"/> - <include name="jaxrpc-mapping.xml"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-xop-rpclit.war" webxml="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-xop-rpclit-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF"> - <include name="wsdl/**"/> - <include name="jaxrpc-mapping.xml"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-xop-rpclit_handler.war" webxml="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF"> - <include name="webservices.xml"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-xop-rpclit_handler-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF"> - <include name="wsdl/**"/> - <include name="jaxrpc-mapping.xml"/> - </metainf> - </jar> - -  - - </target> - -</project> Deleted: branches/tdiesler/trunk/jbossws/ant-import/build-jars-jaxws.xml =================================================================== --- branches/tdiesler/trunk/jbossws/ant-import/build-jars-jaxws.xml 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/jbossws/ant-import/build-jars-jaxws.xml 2007-05-13 18:06:04 UTC (rev 3087) @@ -1,405 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - -<project> - - <description>JBossWS test archive builder</description> - -  -  -  - - <target name="build-jars-jaxws" description="Build the deployments."> - - <mkdir dir="${tests.output.dir}/libs"/> - -  - <war warfile="${tests.output.dir}/libs/jaxws-anonymous.war" webxml="${tests.output.dir}/resources/jaxws/anonymous/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/anonymous/Anonymous.class"/> - <include name="org/jboss/test/ws/jaxws/anonymous/AnonymousRequest.class"/> - <include name="org/jboss/test/ws/jaxws/anonymous/AnonymousResponse.class"/> - <include name="org/jboss/test/ws/jaxws/anonymous/AnonymousImpl.class"/> - </classes> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxws-benchmark-doclit.war" webxml="${tests.output.dir}/resources/benchmark/jaxws/doclit/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/benchmark/jaxws/**/*.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/benchmark/jaxws/doclit/WEB-INF"> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/benchmark/jaxws/doclit/WEB-INF"> - <include name="handlers.xml"/> - </webinf> - </war> - - <war warfile="${tests.output.dir}/libs/ri-benchmark-doclit.war" webxml="${tests.output.dir}/resources/benchmark/jaxws/doclit/ri/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/benchmark/jaxws/**/*.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/benchmark/jaxws/doclit/ri/WEB-INF"> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/benchmark/jaxws/doclit/ri/WEB-INF"> - <include name="handlers.xml"/> - <include name="sun-jaxws.xml"/> - </webinf> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxws-binding.war" webxml="${tests.output.dir}/resources/jaxws/binding/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/binding/SOAPEndpointBean.class"/> - <include name="org/jboss/test/ws/jaxws/binding/SOAPEndpoint.class"/> - </classes> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxws-complex.war" webxml="${tests.output.dir}/resources/jaxws/complex/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/complex/*.class"/> - <include name="org/jboss/test/ws/jaxws/complex/extra/*.class"/> - <include name="org/jboss/test/ws/jaxws/complex/types/*.class"/> - <exclude name="org/jboss/test/ws/jaxws/complex/*TestCase.class"/> - </classes> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxws-endpoint-servlet.war" webxml="${tests.output.dir}/resources/jaxws/endpoint/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/endpoint/EndpointServlet.class"/> - <include name="org/jboss/test/ws/jaxws/endpoint/EndpointBean.class"/> - <include name="org/jboss/test/ws/jaxws/endpoint/EndpointInterface.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/endpoint/WEB-INF"> - <include name="wsdl/**"/> - </webinf> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxws-handlerlifecycle.war" webxml="${tests.output.dir}/resources/jaxws/handlerlifecycle/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpointBean.class"/> - <include name="org/jboss/test/ws/jaxws/handlerlifecycle/TrackerEndpointBean.class"/> - <include name="org/jboss/test/ws/jaxws/handlerlifecycle/LifecycleHandler.class"/> - <include name="org/jboss/test/ws/jaxws/handlerlifecycle/ServerHandler*.class"/> - <include name="org/jboss/test/ws/jaxws/handlerlifecycle/PreServerHandler*.class"/> - <include name="org/jboss/test/ws/jaxws/handlerlifecycle/PostServerHandler*.class"/> - <include name="org/jboss/test/ws/jaxws/handlerlifecycle/HandlerTracker.class"/> - <include name="org/jboss/test/ws/jaxws/handlerlifecycle/jaxws-server-handlers.xml"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/handlerlifecycle/WEB-INF"> - <include name="jaxws-endpoint-config.xml"/> - </webinf> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxws-handlerscope.war" webxml="${tests.output.dir}/resources/jaxws/handlerscope/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/handlerscope/SOAPEndpointBean.class"/> - <include name="org/jboss/test/ws/jaxws/handlerscope/SOAPEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/handlerscope/ProtocolHandler.class"/> - <include name="org/jboss/test/ws/jaxws/handlerscope/jaxws-server-handlers.xml"/> - </classes> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxws-jbws860.war" webxml="${tests.output.dir}/resources/jaxws/jbws860/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws860/*.class"/> - <exclude name="org/jboss/test/ws/jaxws/jbws860/*TestCase.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/jbws860/WEB-INF"> - <include name="jboss-web.xml"/> - </webinf> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxws-jbws871-rpc.war" webxml="${tests.output.dir}/resources/jaxws/jbws871/WEB-INF-rpc/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpointImpl.class"/> - </classes> - </war> - <jar destfile="${tests.output.dir}/libs/jaxws-jbws871-rpc-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws871/IntegerArray.class"/> - <include name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpointService.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws871/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <jar jarfile="${tests.output.dir}/libs/jaxws-jbws944.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.class"/> - <include name="org/jboss/test/ws/jaxws/jbws944/EJB3RemoteInterface.class"/> - <include name="org/jboss/test/ws/jaxws/jbws944/EJB3RemoteHome.class"/> - </fileset> - </jar> - -  - <jar destfile="${tests.output.dir}/libs/jaxws-jbws981.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws981/EJB3Bean.class"/> - <include name="org/jboss/test/ws/jaxws/jbws981/EJB3RemoteInterface.class"/> - <include name="org/jboss/test/ws/jaxws/jbws981/EndpointInterface.class"/> - </fileset> - </jar> - -  - <war destfile="${tests.output.dir}/libs/jaxws-jbws1178.war" webxml="${tests.output.dir}/resources/jaxws/jbws1178/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1178/TestEndpoint.class"/> - </classes> - </war> - -  - <war destfile="${tests.output.dir}/libs/jaxws-jbws1190.war" webxml="${tests.output.dir}/resources/jaxws/jbws1190/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl*.class"/> - <include name="org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.class"/> - </classes> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxws-jbws1357.war" webxml="${tests.output.dir}/resources/jaxws/jbws1357/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1357/JBWS1357.class"/> - <include name="org/jboss/test/ws/jaxws/jbws1357/JBWS1357Impl.class"/> - </classes> - <fileset dir="${tests.output.dir}/resources/jaxws/jbws1357"> - <include name="hello.jsp"/> - </fileset> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxws-jbws1529.war" webxml="${tests.output.dir}/resources/jaxws/jbws1529/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1529/UserException.class"/> - <include name="org/jboss/test/ws/jaxws/jbws1529/JBWS1529.class"/> - <include name="org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.class"/> - </classes> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxws-jbws1581.war" webxml="${tests.output.dir}/resources/jaxws/jbws1581/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointBean.class"/> - <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/jbws1581/WEB-INF"> - <include name="jboss-web.xml"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1581.ear"> - <fileset dir="${tests.output.dir}/libs"> - <include name="jaxws-jbws1581.war"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1581/META-INF"> - <include name="application.xml"/> - <include name="jboss-app.xml"/> - </metainf> - </jar> - <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1581.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1581/EJB3Bean.class"/> - <include name="org/jboss/test/ws/jaxws/jbws1581/EJB3Remote.class"/> - <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1581/META-INF"> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxws-metadata.war" webxml="${tests.output.dir}/resources/jaxws/metadata/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/metadata/*.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/metadata/WEB-INF"> - <include name="jboss-web.xml"/> - <include name="wsdl/*"/> - </webinf> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxws-serviceref.war" webxml="${tests.output.dir}/resources/jaxws/serviceref/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/serviceref/TestEndpointImpl.class"/> - </classes> - </war> - <jar destfile="${tests.output.dir}/libs/jaxws-serviceref-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/serviceref/ApplicationClient.class"/> - <include name="org/jboss/test/ws/jaxws/serviceref/TestEndpointService.class"/> - <include name="org/jboss/test/ws/jaxws/serviceref/TestEndpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/serviceref/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <war destfile="${tests.output.dir}/libs/jaxws-serviceref-servlet-client.war" webxml="${tests.output.dir}/resources/jaxws/serviceref/servlet-client/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/serviceref/ServletClient.class"/> - <include name="org/jboss/test/ws/jaxws/serviceref/TestEndpointService.class"/> - <include name="org/jboss/test/ws/jaxws/serviceref/TestEndpoint.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/serviceref/META-INF"> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/jaxws/serviceref/servlet-client/WEB-INF"> - <include name="jboss-web.xml"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxws-serviceref-ejb-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/serviceref/EJBClient.class"/> - <include name="org/jboss/test/ws/jaxws/serviceref/EJBRemote.class"/> - <include name="org/jboss/test/ws/jaxws/serviceref/TestEndpointService.class"/> - <include name="org/jboss/test/ws/jaxws/serviceref/TestEndpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/serviceref/META-INF"> - <include name="ejb-jar.xml"/> - <include name="jboss.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxws-wrapped-accessor.war" webxml="${tests.output.dir}/resources/jaxws/wrapped/accessor/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/wrapped/accessor/Accessor.class"/> - <include name="org/jboss/test/ws/jaxws/wrapped/accessor/AccessorImpl.class"/> - <include name="org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/*"/> - </classes> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxws-holder.war" webxml="${tests.output.dir}/resources/jaxws/holder/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/holder/HolderServiceImpl.class"/> - </classes> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxws-wsdd.war" - webxml="${tests.output.dir}/resources/jaxws/wsdd/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/wsdd/*.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/wsdd/WEB-INF"> - <include name="webservices.xml"/> - </webinf> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxws-wsaddressing-action-rpc.war" webxml="${tests.output.dir}/resources/jaxws/wsaddressing/action/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/wsaddressing/action/ActionRpcEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxws/wsaddressing/action/ActionEndpoint.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/wsaddressing/action/META-INF"> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxws-wsaddressing-action-rpc-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/wsaddressing/action/ActionEndpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/wsaddressing/action/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jbossws-client-config.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxws-wsaddressing-initial.war" webxml="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/Initial-WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_RequestStruct.class"/> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_ResponseStruct.class"/> - </classes> - </war> - <jar destfile="${tests.output.dir}/libs/jaxws-wsaddressing-initial-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_RequestStruct.class"/> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_ResponseStruct.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/Initial-META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jaxws-jbossws-client-config.xml"/> - <include name="jaxrpc-mapping.xml"/> - </metainf> - </jar> - <war warfile="${tests.output.dir}/libs/jaxws-wsaddressing-replyto.war" webxml="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/ReplyTo-WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_RequestStruct.class"/> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_ResponseStruct.class"/> - </classes> - </war> - <jar destfile="${tests.output.dir}/libs/jaxws-wsaddressing-replyto-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_RequestStruct.class"/> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_ResponseStruct.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jbossws-client-config.xml"/> - <include name="jaxrpc-mapping.xml"/> - </metainf> - </jar> - <war warfile="${tests.output.dir}/libs/jaxws-wsaddressing-faultto.war" webxml="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/FaultTo-WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultType.class"/> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpoint.class"/> - </classes> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxws-wseventing.war" webxml="${tests.output.dir}/resources/jaxws/wseventing/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/ws/eventing/*.class"/> - <include name="org/jboss/test/ws/jaxws/wseventing/*.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/wseventing/WEB-INF"> - <include name="wsdl/**"/> - </webinf> - </war> - -  - - </target> - -</project> Deleted: branches/tdiesler/trunk/jbossws/ant-import/build-samples-jaxrpc.xml =================================================================== --- branches/tdiesler/trunk/jbossws/ant-import/build-samples-jaxrpc.xml 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/jbossws/ant-import/build-samples-jaxrpc.xml 2007-05-13 18:06:04 UTC (rev 3087) @@ -1,635 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - -<project> - -  -  -  - - <target name="build-samples-jaxrpc" description="Build the jaxrpc samples deployments"> - - <mkdir dir="${tests.output.dir}/libs"/> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-samples-docstyle-bare.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialEndpointJSE.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialService.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrder.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrderResponse.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-docstyle-bare-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialService.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrder.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrderResponse.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/docstyle/bare/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-samples-docstyle-wrapped.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialEndpointJSE.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*RequestStruct.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*ResponseStruct.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-docstyle-wrapped-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*RequestStruct.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*ResponseStruct.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/docstyle/wrapped/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-samples-dynamichandler.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Service.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*ServiceBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Handler.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-dynamichandler-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Service.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Handler.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/dynamichandler/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - </jar> - -  - <war destfile="${tests.output.dir}/libs/jaxrpc-samples-exception.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/exception/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/exception/*Exception.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/exception/ServerHandler.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/exception/ExceptionServiceInterface.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/exception/ExceptionBeanImpl.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/exception/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-exception-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/exception/*Exception.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/exception/ExceptionServiceInterface.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/exception/ExceptionService.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/exception/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/exception/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-samples-handler.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/handler/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/handler/*Service.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/handler/*ServiceBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/handler/ServerSideHandler.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/handler/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-handler-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/handler/*Service.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/handler/ClientSideHandler.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/handler/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/handler/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-samples-holder.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/holder/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/holder/*Service.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/holder/*ServiceBean.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/holder/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-holder-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/holder/*Service.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/holder/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/holder/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - </jar> - -  - <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jmstransport.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/jmstransport/Organization.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jmstransport/META-INF"> - <include name="ejb-jar.xml"/> - <include name="jboss.xml"/> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jmstransport.sar"> - <fileset dir="${tests.output.dir}/libs"> - <include name="jaxrpc-samples-jmstransport.jar"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jmstransport/META-INF"> - <include name="jboss-service.xml"/> - </metainf> - </jar> - -  - <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109ejb-rpc.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*EJBEndpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF"> - <include name="ejb-jar.xml"/> - <include name="jboss.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109ejb-rpc-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109ejb-doc.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Struct.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*EJBEndpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF"> - <include name="ejb-jar.xml"/> - <include name="jboss.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109ejb-doc-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Struct.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109pojo-rpc.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*JSEEndpoint.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="jboss-web.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109pojo-rpc-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109pojo-doc.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Struct.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*JSEEndpoint.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109pojo-doc-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Struct.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-samples-message.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/message/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/message/*Service.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/message/*ServiceBean.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/message/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-message-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/message/*Service.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/message/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/message/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-samples-mtom.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/mtom/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/mtom/**"/> - <exclude name="org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/mtom/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-mtom-client.jar"> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/mtom/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/mtom/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-samples-oneway.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/oneway/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/oneway/*Service.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/oneway/*ServiceBean.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/oneway/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-oneway-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/oneway/*Service.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/oneway/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/oneway/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-samples-rpcstyle.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialEndpointJSE.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialService.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-rpcstyle-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialService.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/rpcstyle/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-secureejb.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationService.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationHome.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationRemote.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationImpl.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/secureejb/META-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="ejb-jar.xml"/> - <include name="jboss.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-secureejb-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationService.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationHome.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationRemote.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/secureejb/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-samples-swa.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/swa/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/swa/AttachmentImpl.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/swa/Attachment.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/swa/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-swa-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/swa/Attachment.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/swa/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/swa/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <replace file="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/jboss-wsse-server.xml" token="${buildpath}" value="${tests.output.dir}"/> - <war warfile="${tests.output.dir}/libs/jaxrpc-samples-store-pass-encrypt.war" - webxml="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/HelloJavaBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/PasswordUtil.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt"> - <include name="jboss-wsse-server.xml"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity"> - <include name="wsse.keystore"/> - <include name="wsse.truststore"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-store-pass-encrypt-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jboss-wsse-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF"> - <include name="wsdl/**"/> - <include name="jaxrpc-mapping.xml"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/HelloWorldService.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter_Impl.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wsbpel/hello/WEB-INF"> - <include name="webservices.xml"/> - <include name="classes/bpel-application.xml"/> - </webinf> - <webinf dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/HelloWorldService.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wsbpel/hello/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-samples-wssecurity-sign.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/HelloJavaBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/simple-sign"> - <include name="jboss-wsse-server.xml"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity"> - <include name="wsse.keystore"/> - <include name="wsse.truststore"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-wssecurity-sign-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/simple-sign/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jboss-wsse-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxrpc-samples-wssecurity-encrypt.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/HelloJavaBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/simple-encrypt"> - <include name="jboss-wsse-server.xml"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity"> - <include name="wsse.keystore"/> - <include name="wsse.truststore"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-wssecurity-encrypt-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/simple-encrypt/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jboss-wsse-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - - </target> - -</project> Deleted: branches/tdiesler/trunk/jbossws/ant-import/build-samples-jaxws.xml =================================================================== --- branches/tdiesler/trunk/jbossws/ant-import/build-samples-jaxws.xml 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/jbossws/ant-import/build-samples-jaxws.xml 2007-05-13 18:06:04 UTC (rev 3087) @@ -1,472 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - -<project> - -  -  -  - - <target name="build-samples-jaxws" description="Build the jaxws sample deployments."> - - <mkdir dir="${tests.output.dir}/libs"/> - -  - <war warfile="${tests.output.dir}/libs/jaxws-samples-asynchronous.war" webxml="${tests.output.dir}/resources/jaxws/samples/asynchronous/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpointBean.class"/> - </classes> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxws-samples-context.war" webxml="${tests.output.dir}/resources/jaxws/samples/context/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/context/EndpointJSE.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/context/WEB-INF"> - <include name="jboss-web.xml"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxws-samples-context.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/context/EndpointEJB.class"/> - </fileset> - </jar> - <jar jarfile="${tests.output.dir}/libs/jaxws-samples-context-jboss4x.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/context/EndpointNoInjectEJB.class"/> - </fileset> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxws-samples-exception.war" webxml="${tests.output.dir}/resources/jaxws/samples/exception/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/exception/UserException.class"/> - </classes> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxws-samples-handlerchain.war" webxml="${tests.output.dir}/resources/jaxws/samples/handlerchain/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/handlerchain/EndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/handlerchain/Endpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/handlerchain/*Handler.class"/> - <include name="org/jboss/test/ws/jaxws/samples/handlerchain/jaxws-handlers-server.xml"/> - </classes> - </war> - <jar destfile="${tests.output.dir}/libs/jaxws-samples-handlerchain-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/handlerchain/Endpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/handlerchain/*Handler.class"/> - <include name="org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClient.class"/> - <include name="org/jboss/test/ws/jaxws/samples/handlerchain/jaxws-handlers-client.xml"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/handlerchain/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.handlerchain.HandlerChainClient"/> - </manifest> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxws-samples-httpbinding-jaxb.war" webxml="${tests.output.dir}/resources/jaxws/samples/httpbinding/jaxb/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/httpbinding/ProviderBeanJAXB.class"/> - <include name="org/jboss/test/ws/jaxws/samples/httpbinding/WebServiceEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/httpbinding/UserType.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/httpbinding/shared"> - <include name="wsdl/HttpBinding.wsdl"/> - </webinf> - </war> - <war warfile="${tests.output.dir}/libs/jaxws-samples-httpbinding-payload.war" webxml="${tests.output.dir}/resources/jaxws/samples/httpbinding/payload/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/httpbinding/ProviderBeanPayload.class"/> - <include name="org/jboss/test/ws/jaxws/samples/httpbinding/LogicalSourceHandler.class"/> - <include name="org/jboss/test/ws/jaxws/samples/httpbinding/httpbinding-handlers.xml"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/httpbinding/shared"> - <include name="wsdl/HttpBinding.wsdl"/> - </webinf> - </war> - -  - <jar jarfile="${tests.output.dir}/libs/jaxws-samples-jsr181ejb.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3Bean01.class"/> - <include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3RemoteInterface.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/jsr181ejb/META-INF"> - <include name="jboss-wsse-server.xml"/> - <include name="wsse.*"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxws-samples-jsr181pojo.war" webxml="${tests.output.dir}/resources/jaxws/samples/jsr181pojo/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/JSEBean01.class"/> - </classes> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxws-samples-jsr181pojo-docwrapped.war" - webxml="${tests.output.dir}/resources/jaxws/samples/jsr181pojo/docwrapped/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/JSEBean01.class"/> - </classes> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxws-samples-jsr181pojo-docwrapped-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/EndpointInterface.class"/> - <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/Concat.class"/> - <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/ConcatResponse.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/jsr181pojo/docwrapped/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxws-samples-logicalhandler-source.war" - webxml="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF/web-source.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceDocImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceRpcImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalSourceHandler.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/ProtocolHandler.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/Echo.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/EchoResponse.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-source-handlers.xml"/> - </classes> - </war> - <war warfile="${tests.output.dir}/libs/jaxws-samples-logicalhandler-jaxb.war" - webxml="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF/web-jaxb.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXBImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXB.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalJAXBHandler.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/ProtocolHandler.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/Echo.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/EchoResponse.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/ObjectFactory.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-jaxb-handlers.xml"/> - </classes> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxws-samples-oneway.war" webxml="${tests.output.dir}/resources/jaxws/samples/oneway/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/oneway/PingEndpointImpl.class"/> - </classes> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-jaxb.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/jaxb/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanJAXB.class"/> - <include name="org/jboss/test/ws/jaxws/samples/provider/WebServiceEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/provider/UserType.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/shared"> - <include name="wsdl/Provider.wsdl"/> - </webinf> - </war> - <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-message.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/message/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanMessage.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/shared"> - <include name="wsdl/Provider.wsdl"/> - </webinf> - </war> - <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-payload.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/payload/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanPayload.class"/> - <include name="org/jboss/test/ws/jaxws/samples/provider/LogicalSourceHandler.class"/> - <include name="org/jboss/test/ws/jaxws/samples/provider/provider-handlers.xml"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/shared"> - <include name="wsdl/Provider.wsdl"/> - </webinf> - </war> - -  - <jar jarfile="${tests.output.dir}/libs/jaxws-samples-retail.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/retail/**/*.class"/> - <include name="org/jboss/test/ws/jaxws/samples/retail/jaxws-handler.xml"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/retail/META-INF"> - <include name="wsdl/*"/> - </metainf> - </jar> - <jar jarfile="${tests.output.dir}/libs/jaxws-samples-retail-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/retail/**/*.class"/> - <exclude name="org/jboss/test/ws/jaxws/samples/retail/**/*Bean.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/retail/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxws-samples-soapbinding.war" webxml="${tests.output.dir}/resources/jaxws/samples/soapbinding/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocWrapped.class"/> - <include name="org/jboss/test/ws/jaxws/samples/soapbinding/ExampleSEI.class"/> - <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocBareServiceImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocWrappedServiceImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/soapbinding/ExampleServiceImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/soapbinding/SubmitBareRequest.class"/> - <include name="org/jboss/test/ws/jaxws/samples/soapbinding/SubmitBareResponse.class"/> - <include name="org/jboss/test/ws/jaxws/samples/soapbinding/PurchaseOrder.class"/> - <include name="org/jboss/test/ws/jaxws/samples/soapbinding/PurchaseOrderAck.class"/> - </classes> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxws-samples-webmethod.war" webxml="${tests.output.dir}/resources/jaxws/samples/webmethod/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webmethod/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webmethod/TestEndpointImpl.class"/> - </classes> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxws-samples-webparam.war" webxml="${tests.output.dir}/resources/jaxws/samples/webparam/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webparam/PingServiceImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webparam/PingDocument.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webparam/SecurityHeader.class"/> - </classes> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxws-samples-webresult.war" webxml="${tests.output.dir}/resources/jaxws/samples/webresult/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webresult/CustomerServiceImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webresult/CustomerRecord.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webresult/USAddress.class"/> - </classes> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice01-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF01/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean01.class"/> - </classes> - </war> - <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice02-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF02/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean02.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF02"> - <include name="wsdl/**"/> - </webinf> - </war> - <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice03-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF03/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean03.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.class"/> - </classes> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxws-samples-webservice01-ejb3.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean01.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/> - </fileset> - </jar> - <jar jarfile="${tests.output.dir}/libs/jaxws-samples-webservice02-ejb3.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean02.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/webservice/META-INF02"> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar jarfile="${tests.output.dir}/libs/jaxws-samples-webservice03-ejb3.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean03.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.class"/> - </fileset> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxws-samples-webserviceref.war" webxml="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointImpl.class"/> - </classes> - </war> - <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientOne.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="wsdl/**"/> - </metainf> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientOne"/> - </manifest> - </jar> - <war destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-servlet-client.war" - webxml="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF-client/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/ServletClient.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EchoResponse.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/Echo.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF"> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF-client"> - <include name="jboss-web.xml"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-ejb3-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Client.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Remote.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EchoResponse.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/Echo.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF"> - <include name="jboss.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-secure.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointImpl.class"/> - </fileset> - </jar> - <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-secure-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointClient.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointService.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF-secure"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.SecureEndpointClient"/> - </manifest> - </jar> - <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-override-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientTwo.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF-override"> - <include name="jbossws-client-config.xml"/> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF"> - <include name="wsdl/**"/> - </metainf> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientTwo"/> - </manifest> - </jar> - -  - <war warfile="${tests.output.dir}/libs/jaxws-samples-wsaddressing.war" webxml="${tests.output.dir}/resources/jaxws/samples/wsaddressing/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/jaxws-handlers.xml"/> - </classes> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxws-samples-wseventing.war" webxml="${tests.output.dir}/resources/jaxws/samples/wseventing/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/wseventing/*.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/wseventing/WEB-INF"> - <include name="wsdl/jboss-web.xml"/> - <include name="wsdl/sysmon.wsdl"/> - <include name="wsdl/ws-eventing.wsdl"/> - <include name="wsdl/ws-eventing.xsd"/> - <include name="wsdl/ws-addr.xsd"/> - </webinf> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxws-samples-wssecurity-encrypt.war" webxml="${tests.output.dir}/resources/jaxws/samples/wssecurity/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/wssecurity/Hello.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wssecurity/HelloJavaBean.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wssecurity/UserType.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/wssecurity/simple-encrypt/WEB-INF"> - <include name="jboss-wsse-server.xml"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/wssecurity"> - <include name="wsse.keystore"/> - <include name="wsse.truststore"/> - </webinf> - </war> - -  - <war warfile="${tests.output.dir}/libs/jaxws-samples-wssecurity-sign.war" webxml="${tests.output.dir}/resources/jaxws/samples/wssecurity/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/wssecurity/Hello.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wssecurity/HelloJavaBean.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wssecurity/UserType.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/wssecurity/simple-sign/WEB-INF"> - <include name="jboss-wsse-server.xml"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/wssecurity"> - <include name="wsse.keystore"/> - <include name="wsse.truststore"/> - </webinf> - </war> - -  - <war jarfile="${tests.output.dir}/libs/jaxws-samples-xop-doclit.war" webxml="${tests.output.dir}/resources/jaxws/samples/xop/doclit/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/xop/doclit/*.class"/> - <exclude name="org/jboss/test/ws/jaxws/samples/xop/doclit/*TestCase.class"/> - </classes> - </war> - -  - - </target> - -</project> \ No newline at end of file Deleted: branches/tdiesler/trunk/jbossws/ant-import/build-testsuite-artifacts.xml =================================================================== --- branches/tdiesler/trunk/jbossws/ant-import/build-testsuite-artifacts.xml 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/jbossws/ant-import/build-testsuite-artifacts.xml 2007-05-13 18:06:04 UTC (rev 3087) @@ -1,214 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - -<project name="JBossWS-Tools" default="build-tools-artifacts" basedir="../.."> - - <description>JBossWS testsuite artifacts builder</description> - - <import file="build.xml"/> - <path id="tools.classpath"> - <path refid="jbossws.client.classpath"/> - <pathelement location="${jboss.testsuite}/output/classes"/> - </path> - -  - <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools" - classpathref="tools.classpath"/> - - <target name="build-tools-artifacts" description="Build the deployments."> -  - <echo>Working on jbws64-config.xml</echo> - <wstools dest="${build.test.resources.dir}/testsuite/jbws64/WEB-INF" - config="${test.resources.dir}/tools/testsuite-configs/jbws64-config.xml"/> - - <echo>Working on jbws68-config.xml</echo> - <wstools dest="${build.test.resources.dir}/testsuite/jbws68/WEB-INF" - config="${test.resources.dir}/tools/testsuite-configs/jbws68-config.xml"/> - - <echo>Working on jbws70-config.xml</echo> - <wstools dest="${build.test.resources.dir}/testsuite/jbws70/WEB-INF" - config="${test.resources.dir}/tools/testsuite-configs/jbws70-config.xml"/> - - <echo>Working on jbws71-config.xml</echo> - <wstools dest="${build.test.resources.dir}/testsuite/jbws71/WEB-INF" - config="${test.resources.dir}/tools/testsuite-configs/jbws71-config.xml"/> - - <echo>Working on jbws82-config.xml</echo> - <wstools dest="${build.test.resources.dir}/testsuite/jbws82/WEB-INF" - config="${test.resources.dir}/tools/testsuite-configs/jbws82-config.xml"/> - - <echo>Working on jbws124-config.xml</echo> - <wstools dest="${build.test.resources.dir}/testsuite/jbws124/WEB-INF" - config="${test.resources.dir}/tools/testsuite-configs/jbws124-config.xml"/> - - <echo>Working on jbws128-config.xml</echo> - <wstools dest="${build.test.resources.dir}/testsuite/jbws128/WEB-INF" - config="${test.resources.dir}/tools/testsuite-configs/jbws128-config.xml"/> - - <echo>Working on jbws163-config.xml</echo> - <wstools dest="${build.test.resources.dir}/testsuite/jbws163/WEB-INF" - config="${test.resources.dir}/tools/testsuite-configs/jbws163-config.xml"/> - <echo>Working on jbws165-config.xml</echo> - <wstools dest="${build.test.resources.dir}/testsuite/jbws165/META-INF-both" - config="${test.resources.dir}/tools/testsuite-configs/jbws165-config.xml"/> - - <echo>Working on jbws167-config.xml</echo> - <wstools dest="${build.test.resources.dir}/testsuite/jbws167/WEB-INF" - config="${test.resources.dir}/tools/testsuite-configs/jbws167-config.xml"/> - - <echo>Working on jbws251-config.xml</echo> - <wstools dest="${build.test.resources.dir}/testsuite/jbws251/WEB-INF" - config="${test.resources.dir}/tools/testsuite-configs/jbws251-config.xml"/> - - <echo>Working on jbws309-config.xml</echo> - <wstools dest="${build.test.resources.dir}/testsuite/jbws309/META-INF" - config="${test.resources.dir}/tools/testsuite-configs/jbws309-config.xml"/> - - <echo>Working on jbws316-config.xml</echo> - <wstools dest="${build.test.resources.dir}/testsuite/jbws316/WEB-INF" - config="${test.resources.dir}/tools/testsuite-configs/jbws316-config.xml"/> - - <echo>Working on jbws331-config.xml</echo> - <wstools dest="${build.test.resources.dir}/testsuite/jbws331/WS-META-INF" - config="${test.resources.dir}/tools/testsuite-configs/jbws331-config.xml"/> - - <echo>Working on jbws358-config.xml</echo> - <wstools dest="${build.test.resources.dir}/testsuite/jbws358/META-INF" - config="${test.resources.dir}/tools/testsuite-configs/jbws358-config.xml"/> - - <echo>Working on jbws377-config.xml</echo> - <wstools dest="${build.test.resources.dir}/testsuite/jbws377/WEB-INF" - config="${test.resources.dir}/tools/testsuite-configs/jbws377-config.xml"/> - - <echo>Working on jbws383-config.xml</echo> - <wstools dest="${build.test.resources.dir}/testsuite/jbws383/WEB-INF" - config="${test.resources.dir}/tools/testsuite-configs/jbws383-config.xml"/> - - <echo>Working on jbws423-config.xml</echo> - <wstools dest="${build.test.resources.dir}/testsuite/jbws423/WEB-INF" - config="${test.resources.dir}/tools/testsuite-configs/jbws423-config.xml"/> - - <echo>Working on jbws424-config.xml</echo> - <wstools dest="${build.test.resources.dir}/testsuite/jbws424/WEB-INF" - config="${test.resources.dir}/tools/testsuite-configs/jbws424-config.xml"/> - - <echo>Working on jbws425-config.xml</echo> - <wstools dest="${build.test.resources.dir}/testsuite/jbws425/WEB-INF" - config="${test.resources.dir}/tools/testsuite-configs/jbws425-config.xml"/> - - <echo>Working on jbws456-config.xml</echo> - <wstools dest="${build.test.resources.dir}/testsuite/jbws456/WEB-INF" - config="${test.resources.dir}/tools/testsuite-configs/jbws456-config.xml"/> - - <echo>Working on jbws463-config.xml</echo> - <wstools dest="${build.test.resources.dir}/testsuite/jbws463/WEB-INF" - config="${test.resources.dir}/tools/testsuite-configs/jbws463-config.xml"/> - - <echo>Working on jbws464-config.xml</echo> - <wstools dest="${build.test.resources.dir}/testsuite/jbws464/WEB-INF" - config="${test.resources.dir}/tools/testsuite-configs/jbws464-config.xml"/> - - <echo>Working on addressrewrite</echo> - <wstools dest="${build.test.resources.dir}/testsuite/addressrewrite/WEB-INF" - config="${test.resources.dir}/tools/testsuite-configs/addressrewrite-config.xml"/> - - <echo>Working on admindevel</echo> - <wstools dest="${build.test.resources.dir}/testsuite/admindevel/META-INF" - config="${test.resources.dir}/tools/testsuite-configs/admindevel-config.xml"/> - - - <echo>Working on encstyle/document</echo> - <wstools dest="${build.test.resources.dir}/testsuite/encstyle/document/WEB-INF" - config="${test.resources.dir}/tools/testsuite-configs/encstyle-document-config.xml"/> - - <echo>Working on encstyle/rpc</echo> - <wstools dest="${build.test.resources.dir}/testsuite/encstyle/rpc/WEB-INF" - config="${test.resources.dir}/tools/testsuite-configs/encstyle-rpc-config.xml"/> - - - <echo>Working on exception</echo> - <wstools dest="${build.test.resources.dir}/testsuite/exception/META-INF" - config="${test.resources.dir}/tools/testsuite-configs/exception-config.xml"/> - - <echo>Working on handlerflow</echo> - <wstools dest="${build.test.resources.dir}/testsuite/handlerflow/WEB-INF" - config="${test.resources.dir}/tools/testsuite-configs/handlerflow-config.xml"/> - - <echo>Working on marshalltest-doclit</echo> - <wstools dest="${build.test.resources.dir}/testsuite/marshalltest-doclit/META-INF" - config="${test.resources.dir}/tools/testsuite-configs/marshalltest-doclit-config.xml"/> - - <echo>Working on marshalltest-rpclit</echo> - <wstools dest="${build.test.resources.dir}/testsuite/marshalltest-rpclit/META-INF" - config="${test.resources.dir}/tools/testsuite-configs/marshalltest-rpclit-config.xml"/> - - <echo>Working on message</echo> - <wstools dest="${build.test.resources.dir}/testsuite/message/WEB-INF" - config="${test.resources.dir}/tools/testsuite-configs/message-config.xml"/> - - <echo>Working on samples/common</echo> - <wstools dest="${build.test.resources.dir}/testsuite/samples/common/META-INF" - config="${test.resources.dir}/tools/testsuite-configs/samples-common-config.xml"/> - - <echo>Working on samples2/rpclit</echo> - <wstools dest="${build.test.resources.dir}/testsuite/samples2/rpclit" - config="${test.resources.dir}/tools/testsuite-configs/samples2-rpclit-config.xml"/> - - <echo>Working on samples2/doclit</echo> - <wstools dest="${build.test.resources.dir}/testsuite/samples2/doclit" - config="${test.resources.dir}/tools/testsuite-configs/samples2-doclit-config.xml"/> - - <echo>Working on samples2/doclit-bare</echo> - <wstools dest="${build.test.resources.dir}/testsuite/samples2/doclit-bare" - config="${test.resources.dir}/tools/testsuite-configs/samples2-doclit-bare-config.xml"/> - - <echo>Working on utf16</echo> - <wstools dest="${build.test.resources.dir}/testsuite/utf16/WEB-INF" - config="${test.resources.dir}/tools/testsuite-configs/utf16-config.xml"/> - - <echo>Working on ws4eesimple</echo> - <wstools dest="${build.test.resources.dir}/testsuite/ws4eesimple/WEB-INF" - config="${test.resources.dir}/tools/testsuite-configs/ws4eesimple-config.xml"/> - - <echo/> - <echo>WSDL->Java</echo> - <echo>----------</echo> - <echo>Working on ws4eesimple-client</echo> - <wstools dest="${build.test.resources.dir}/testsuite/ws4eesimple-client" - config="${test.resources.dir}/tools/testsuite-configs/ws4eesimple-client-config.xml"/> - - - <echo>Working on jbws-349</echo> - <wstools dest="${build.test.resources.dir}/testsuite/jbws349" - config="${test.resources.dir}/tools/testsuite-configs/jbws349-config.xml"/> - - - <echo>Working on jbws381</echo> - <wstools dest="${build.test.resources.dir}/testsuite/jbws381" - config="${test.resources.dir}/tools/testsuite-configs/jbws381-config.xml"/> - - <echo>Working on jbws484</echo> - <wstools dest="${build.test.resources.dir}/testsuite/jbws484" - config="${test.resources.dir}/tools/testsuite-configs/jbws484-config.xml"/> - - <echo>Working on jbws153</echo> - <wstools dest="${build.test.resources.dir}/testsuite/jbws153" - config="${test.resources.dir}/tools/testsuite-configs/jbws153-config.xml"/> - - <echo>Working on samples/client-appl</echo> - <wstools dest="${build.test.resources.dir}/testsuite/samples/client-appl" - config="${test.resources.dir}/tools/testsuite-configs/samples-client-config.xml"/> - </target> -</project> Deleted: branches/tdiesler/trunk/jbossws/ant-import/build-testsuite.xml =================================================================== --- branches/tdiesler/trunk/jbossws/ant-import/build-testsuite.xml 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/jbossws/ant-import/build-testsuite.xml 2007-05-13 18:06:04 UTC (rev 3087) @@ -1,249 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - -<project> - - <property name="tests.dir" value="${basedir}/src/test"/> - - <import file="${build.dir}/ant-import/build-testsuite.xml"/> - -  - <property name="integration.target.${jbossws.integration.target}" value="true"/> - -  - <property name="excludes-short-name" value="tests-${jbossws.integration.target}-excludes.txt"/> - <property name="excludesfile" value="${tests.resources.dir}/${excludes-short-name}"/> - -  - <target name="tests-init" depends="tests-prepare,core-thirdparty-classpath"> - - <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"/> - <pathelement location="${core.dir}/../jbws-${jbossws.integration.target}/output/lib/jbossws-${jbossws.integration.target}.jar"/> - </path> - -  - <path id="javac.classpath"> - <path refid="jbossws.classpath"/> - <path refid="core.thirdparty.classpath"/> - <pathelement location="${core.thirdparty.dir}/jboss-vfs.jar"/> - <pathelement location="${core.thirdparty.dir}/junit.jar"/> - <pathelement location="${core.thirdparty.dir}/qdox.jar"/> - <pathelement location="${core.thirdparty.dir}/policy.jar"/> - <pathelement location="${core.thirdparty.dir}/xmlunit1.0.jar"/> - <pathelement location="${jboss.home}/client/jboss-ejb3-client.jar"/> - </path> - -  - <path id="tests.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.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> - -  - <path id="jbpm.bpel.classpath"> - <path refid="jbossws.classpath"/> - <pathelement location="${core.thirdparty.dir}/jbpm-bpel"/>  - <pathelement location="${core.thirdparty.dir}/jbpm-bpel/jbpm-bpel.jar" /> - <pathelement location="${core.thirdparty.dir}/jbpm-bpel/jbpm-jpdl.jar" /> - <pathelement location="${core.thirdparty.dir}/jbpm-bpel/commons-lang.jar" /> - <pathelement location="${core.thirdparty.dir}/commons-collections.jar"/> - <pathelement location="${core.thirdparty.dir}/commons-logging.jar"/> - <pathelement location="${core.thirdparty.dir}/dom4j.jar"/> - <pathelement location="${core.thirdparty.dir}/jaxen.jar"/> - <pathelement location="${core.thirdparty.dir}/wsdl4j.jar"/> - <pathelement location="${core.thirdparty.dir}/jboss-logging-log4j.jar"/> -  - </path> - - </target> - -  -  -  - - <target name="wsconsume" depends="tests-init" description="Consume JAX-WS contracts" if="HAVE_JDK_1.5"> - -  - <taskdef name="wsconsume" classname="org.jboss.ws.tools.jaxws.ant.wsconsume"> - <classpath refid="jbossws.classpath"/> - <classpath location="${core.thirdparty.dir}/jbossws-wsconsume-impl.jar"/> - <classpath location="${core.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> - -  - <target name="servicegen" depends="tests-compile" description="Generate the BPEL resources."> -  - <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 file="${core.thirdparty.dir}/jbpm-bpel.sar" todir="${tests.output.dir}/libs"/> - -  - <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> - -  - <target name="wstools" depends="tests-compile" description="Generate the JAX-RPC artifacts."> - -  - <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools"> - <classpath refid="jbossws.classpath"/> - <classpath refid="core.thirdparty.classpath"/> - <classpath location="${core.thirdparty.dir}/jbossretro-rt.jar"/> - <classpath location="${core.thirdparty.dir}/jboss-backport-concurrent.jar"/> - <classpath location="${core.thirdparty.dir}/concurrent.jar"/> - <classpath location="${tests.output.dir}/classes"/> - <classpath location="${tests.output.dir}"/> - </taskdef> - -  - <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 todir="${tests.output.dir}/resources"> - <fileset dir="${tests.output.dir}/wstools/resources"> - <include name="**/*.wsdl"/> - <include name="**/*.xml"/> - </fileset> - </copy> -  - <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> - -  - <target name="wsprovide" depends="tests-compile" - description="Provide the JAX-WS contracts." if="HAVE_JDK_1.5"> - -  - <taskdef name="wsprovide" classname="org.jboss.ws.tools.jaxws.ant.wsprovide"> - <classpath refid="jbossws.classpath"/> - <classpath refid="core.thirdparty.classpath"/> - <classpath location="${core.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="tests-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> - -  -  -  - - <target name="tests-compile" depends="wsconsume,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="${tests.java.dir}"/> - <src path="${tests.output.dir}/wsconsume/java"/> - <classpath refid="javac.classpath"/> - </javac> - </target> - -  -  -  - -  - <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"/> - <ant antfile="${core.dir}/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/> - <ant antfile="${core.dir}/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws" inheritall="true"/> - </target> - -</project> Modified: branches/tdiesler/trunk/jbossws/ant-import/build-thirdparty.xml =================================================================== --- branches/tdiesler/trunk/jbossws/ant-import/build-thirdparty.xml 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/jbossws/ant-import/build-thirdparty.xml 2007-05-13 18:06:04 UTC (rev 3087) @@ -19,122 +19,118 @@   - <target name="core-thirdparty" depends="core-thirdparty-init,core-thirdparty-get,core-thirdparty-classpath"> - </target> - - <target name="core-thirdparty-init" depends="prepare"> + <target name="thirdparty-init" depends="prepare"> - <property name="core.thirdparty.dir" value="${core.dir}/thirdparty"/> - <checksum file="${core.dir}/version.properties" fileext=".md5" verifyproperty="core.checksum.ok"/> - <condition property="core.force.thirdparty"> + <property name="thirdparty.dir" value="${core.dir}/thirdparty"/> + <checksum file="${core.dir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/> + <condition property="force.thirdparty"> <or> <not> - <available file="${core.thirdparty.dir}" type="dir"/> + <available file="${thirdparty.dir}" type="dir"/> </not> - <isfalse value="${core.checksum.ok}"/> + <isfalse value="${checksum.ok}"/> <isset property="force.thirdparty.get"/> </or> </condition> - <echo message="checksum.ok = ${core.checksum.ok}"/> + <echo message="checksum.ok = ${checksum.ok}"/> </target>  - <target name="core-thirdparty-get" depends="core-thirdparty-init" if="core.force.thirdparty" + <target name="thirdparty-get" depends="thirdparty-init" if="force.thirdparty" description="Gets the thirdparty libraries"> - <mkdir dir="${core.thirdparty.dir}"/> - <get src="${jboss.repository}/apache-ant/${apache-ant}/lib/ant.jar" dest="${core.thirdparty.dir}/ant.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/apache-collections/${apache-collections}/lib/commons-collections.jar" dest="${core.thirdparty.dir}/commons-collections.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/apache-log4j/${apache-log4j}/lib/log4j.jar" dest="${core.thirdparty.dir}/log4j.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/apache-logging/${apache-logging}/lib/commons-logging.jar" dest="${core.thirdparty.dir}/commons-logging.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/apache-xalan/${apache-xalan}/lib/serializer.jar" dest="${core.thirdparty.dir}/serializer.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/apache-xalan/${apache-xalan}/lib/xalan.jar" dest="${core.thirdparty.dir}/xalan.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/resolver.jar" dest="${core.thirdparty.dir}/resolver.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/xercesImpl.jar" dest="${core.thirdparty.dir}/xercesImpl.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/xml-apis.jar" dest="${core.thirdparty.dir}/xml-apis.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/apache-xmlsec/${apache-xmlsec}/lib/xmlsec.jar" dest="${core.thirdparty.dir}/xmlsec.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/dom4j/${dom4j}/lib/dom4j.jar" dest="${core.thirdparty.dir}/dom4j.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/gnu-getopt/${gnu-getopt}/lib/getopt.jar" dest="${core.thirdparty.dir}/getopt.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/hibernate/${hibernate}/lib/hibernate3.jar" dest="${core.thirdparty.dir}/hibernate3.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${core.thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j-src.jar" dest="${core.thirdparty.dir}/wsdl4j-src.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jaxen/${jaxen}/lib/jaxen.jar" dest="${core.thirdparty.dir}/jaxen.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/javassist/${javassist}/lib/javassist.jar" dest="${core.thirdparty.dir}/javassist.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar" dest="${core.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="${core.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="${core.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="${core.thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/ejb3/${jboss-ejb3}/bin/ejb3.deployer" dest="${core.thirdparty.dir}/ejb3.deployer.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jaxr/${jboss-jaxr}/lib/juddi-service.sar" dest="${core.thirdparty.dir}/juddi-service.sar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jboss-vfs/${jboss-vfs}/lib/jboss-vfs.jar" dest="${core.thirdparty.dir}/jboss-vfs.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jboss-vfs/${jboss-vfs}/lib/jboss-vfs-sources.jar" dest="${core.thirdparty.dir}/jboss-vfs-sources.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-wsconsume-impl/${jbossws-wsconsume-impl}/lib/jbossws-wsconsume-impl.jar" dest="${core.thirdparty.dir}/jbossws-wsconsume-impl.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${core.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="${core.thirdparty.dir}/jboss-xml-binding-sources.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-container.jar" dest="${core.thirdparty.dir}/jboss-container.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency.jar" dest="${core.thirdparty.dir}/jboss-dependency.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers.jar" dest="${core.thirdparty.dir}/jboss-deployers.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer.jar" dest="${core.thirdparty.dir}/jboss-microcontainer.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency-src.zip" dest="${core.thirdparty.dir}/jboss-dependency-src.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers-src.zip" dest="${core.thirdparty.dir}/jboss-deployers-src.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer-src.zip" dest="${core.thirdparty.dir}/jboss-microcontainer-src.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/remoting/${jboss-remoting}/lib/jboss-remoting.jar" dest="${core.thirdparty.dir}/jboss-remoting.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/security/${jboss-security}/lib/jbosssx-client.jar" dest="${core.thirdparty.dir}/jbosssx-client.jar" usetimestamp="true" verbose="true"/> - <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}/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"/> - <get src="${jboss.repository}/sun-jaf/${sun-jaf}/lib/activation.jar" dest="${core.thirdparty.dir}/activation.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-javamail/${sun-javamail}/lib/mail.jar" dest="${core.thirdparty.dir}/mail.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${core.thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-impl.jar" dest="${core.thirdparty.dir}/jaxb-impl.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-xjc.jar" dest="${core.thirdparty.dir}/jaxb-xjc.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${core.thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/xmlunit-xmlunit/${xmlunit}/lib/xmlunit1.0.jar" dest="${core.thirdparty.dir}/xmlunit1.0.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/wscommons-policy/${wscommons-policy}/lib/policy.jar" dest="${core.thirdparty.dir}/policy.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/woodstox/${woodstox}/lib/wstx.jar" dest="${core.thirdparty.dir}/wstx.jar" usetimestamp="true" verbose="true"/> + <mkdir dir="${thirdparty.dir}"/> + <get src="${jboss.repository}/apache-ant/${apache-ant}/lib/ant.jar" dest="${thirdparty.dir}/ant.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/apache-collections/${apache-collections}/lib/commons-collections.jar" dest="${thirdparty.dir}/commons-collections.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/apache-log4j/${apache-log4j}/lib/log4j.jar" dest="${thirdparty.dir}/log4j.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/apache-logging/${apache-logging}/lib/commons-logging.jar" dest="${thirdparty.dir}/commons-logging.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/apache-xalan/${apache-xalan}/lib/serializer.jar" dest="${thirdparty.dir}/serializer.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/apache-xalan/${apache-xalan}/lib/xalan.jar" dest="${thirdparty.dir}/xalan.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/resolver.jar" dest="${thirdparty.dir}/resolver.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/xercesImpl.jar" dest="${thirdparty.dir}/xercesImpl.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/xml-apis.jar" dest="${thirdparty.dir}/xml-apis.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/apache-xmlsec/${apache-xmlsec}/lib/xmlsec.jar" dest="${thirdparty.dir}/xmlsec.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/dom4j/${dom4j}/lib/dom4j.jar" dest="${thirdparty.dir}/dom4j.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/gnu-getopt/${gnu-getopt}/lib/getopt.jar" dest="${thirdparty.dir}/getopt.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/hibernate/${hibernate}/lib/hibernate3.jar" dest="${thirdparty.dir}/hibernate3.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}/jaxen/${jaxen}/lib/jaxen.jar" dest="${thirdparty.dir}/jaxen.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/javassist/${javassist}/lib/javassist.jar" dest="${thirdparty.dir}/javassist.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/ejb3/${jboss-ejb3}/bin/ejb3.deployer" dest="${thirdparty.dir}/ejb3.deployer.zip" 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/jboss-vfs/${jboss-vfs}/lib/jboss-vfs.jar" dest="${thirdparty.dir}/jboss-vfs.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jboss-vfs/${jboss-vfs}/lib/jboss-vfs-sources.jar" dest="${thirdparty.dir}/jboss-vfs-sources.jar" 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-deployers.jar" dest="${thirdparty.dir}/jboss-deployers.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}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency-src.zip" dest="${thirdparty.dir}/jboss-dependency-src.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers-src.zip" dest="${thirdparty.dir}/jboss-deployers-src.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer-src.zip" dest="${thirdparty.dir}/jboss-microcontainer-src.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/remoting/${jboss-remoting}/lib/jboss-remoting.jar" dest="${thirdparty.dir}/jboss-remoting.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/security/${jboss-security}/lib/jbosssx-client.jar" dest="${thirdparty.dir}/jbosssx-client.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/security/${jboss-security}/lib/jbosssx-src.zip" dest="${thirdparty.dir}/jbosssx-src.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jbossas/core-libs/${jbossas-core-libs}/lib/jboss-j2ee.jar" dest="${thirdparty.dir}/jboss-j2ee.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jbpm/bpel/${jbpm-bpel}/lib/jbpm-bpel.sar" dest="${thirdparty.dir}/jbpm-bpel.sar" usetimestamp="true" verbose="true" /> + <get src="${jboss.repository}/oswego-concurrent/${oswego-concurrent}/lib/concurrent.jar" dest="${thirdparty.dir}/concurrent.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/qdox/${qdox}/lib/qdox.jar" dest="${thirdparty.dir}/qdox.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-jaf/${sun-jaf}/lib/activation.jar" dest="${thirdparty.dir}/activation.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-javamail/${sun-javamail}/lib/mail.jar" dest="${thirdparty.dir}/mail.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}/xmlunit-xmlunit/${xmlunit}/lib/xmlunit1.0.jar" dest="${thirdparty.dir}/xmlunit1.0.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"/> + <get src="${jboss.repository}/woodstox/${woodstox}/lib/wstx.jar" dest="${thirdparty.dir}/wstx.jar" usetimestamp="true" verbose="true"/> - <mkdir dir="${core.thirdparty.dir}/jbpm-bpel"/> - <unzip dest="${core.thirdparty.dir}/jbpm-bpel" src="${core.thirdparty.dir}/jbpm-bpel.sar"/> - <unzip dest="${core.thirdparty.dir}" src="${core.thirdparty.dir}/ejb3.deployer.zip"/> + <mkdir dir="${thirdparty.dir}/jbpm-bpel"/> + <unzip dest="${thirdparty.dir}/jbpm-bpel" src="${thirdparty.dir}/jbpm-bpel.sar"/> + <unzip dest="${thirdparty.dir}" src="${thirdparty.dir}/ejb3.deployer.zip"/> <checksum file="${core.dir}/version.properties" fileext=".md5"/> </target> - <target name="core-thirdparty-classpath" depends="core-thirdparty-init,spi-jars"> + <target name="thirdparty-classpath" depends="thirdparty-get">  - <path id="core.thirdparty.classpath"> - <path refid="spi.thirdparty.classpath"/> + <path id="thirdparty.classpath"> <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> - <pathelement location="${core.thirdparty.dir}/ejb3.deployer/jboss-annotations-ejb3.jar"/> - <pathelement location="${core.thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/> - <pathelement location="${core.thirdparty.dir}/activation.jar"/> - <pathelement location="${core.thirdparty.dir}/getopt.jar"/> - <pathelement location="${core.thirdparty.dir}/javassist.jar"/> - <pathelement location="${core.thirdparty.dir}/jaxb-api.jar"/> - <pathelement location="${core.thirdparty.dir}/jaxb-impl.jar"/> - <pathelement location="${core.thirdparty.dir}/jaxb-xjc.jar"/> - <pathelement location="${core.thirdparty.dir}/jboss-common-core.jar"/> - <pathelement location="${core.thirdparty.dir}/jboss-dependency.jar"/> - <pathelement location="${core.thirdparty.dir}/jboss-j2ee.jar"/> - <pathelement location="${core.thirdparty.dir}/jboss-logging-spi.jar"/> - <pathelement location="${core.thirdparty.dir}/jboss-microcontainer.jar"/> - <pathelement location="${core.thirdparty.dir}/jboss-remoting.jar"/> - <pathelement location="${core.thirdparty.dir}/jboss-xml-binding.jar"/> - <pathelement location="${core.thirdparty.dir}/jbosssx-client.jar"/> - <pathelement location="${core.thirdparty.dir}/mail.jar"/> - <pathelement location="${core.thirdparty.dir}/servlet-api.jar"/> - <pathelement location="${core.thirdparty.dir}/stax-api.jar"/> - <pathelement location="${core.thirdparty.dir}/wsdl4j.jar"/> - <pathelement location="${core.thirdparty.dir}/wstx.jar"/> - <pathelement location="${core.thirdparty.dir}/xmlsec.jar"/> - <pathelement location="${core.thirdparty.dir}/xercesImpl.jar"/> - <pathelement location="${core.thirdparty.dir}/xalan.jar"/> + <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-annotations-ejb3.jar"/> + <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/> + <pathelement location="${thirdparty.dir}/activation.jar"/> + <pathelement location="${thirdparty.dir}/getopt.jar"/> + <pathelement location="${thirdparty.dir}/javassist.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-j2ee.jar"/> + <pathelement location="${thirdparty.dir}/jboss-logging-spi.jar"/> + <pathelement location="${thirdparty.dir}/jboss-microcontainer.jar"/> + <pathelement location="${thirdparty.dir}/jboss-remoting.jar"/> + <pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/> + <pathelement location="${thirdparty.dir}/jbosssx-client.jar"/> + <pathelement location="${thirdparty.dir}/mail.jar"/> + <pathelement location="${thirdparty.dir}/servlet-api.jar"/> + <pathelement location="${thirdparty.dir}/stax-api.jar"/> + <pathelement location="${thirdparty.dir}/wsdl4j.jar"/> + <pathelement location="${thirdparty.dir}/wstx.jar"/> + <pathelement location="${thirdparty.dir}/xmlsec.jar"/> + <pathelement location="${thirdparty.dir}/xercesImpl.jar"/> + <pathelement location="${thirdparty.dir}/xalan.jar"/> </path> Copied: branches/tdiesler/trunk/jbossws/ant-import-tests/build-benchmark.xml (from rev 3086, branches/tdiesler/trunk/jbossws/ant-import/build-benchmark.xml) =================================================================== --- branches/tdiesler/trunk/jbossws/ant-import-tests/build-benchmark.xml (rev 0) +++ branches/tdiesler/trunk/jbossws/ant-import-tests/build-benchmark.xml 2007-05-13 18:06:04 UTC (rev 3087) @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + +<project name="JBossWS Benchamrks"> + +  +  +  + + <target name="build-benchmark" depends="main"> + <ant antfile="src/test/ant/build-benchmark-jars.xml" target="build-benchmark-jars" inheritall="true"/> + </target> + +  +  +  + +  + <target name="tests-benchmark" depends="init" description="Run benchmark unit tests"> + <antcall target="tests-main"> + <param name="include.wildcard" value="org/jboss/test/ws/benchmark/**/*TestCase.class"/> + </antcall> + <antcall target="tests-report"/> + </target> + +</project> Copied: branches/tdiesler/trunk/jbossws/ant-import-tests/build-interop-jars.xml (from rev 3086, branches/tdiesler/trunk/jbossws/ant-import/build-interop-jars.xml) =================================================================== --- branches/tdiesler/trunk/jbossws/ant-import-tests/build-interop-jars.xml (rev 0) +++ branches/tdiesler/trunk/jbossws/ant-import-tests/build-interop-jars.xml 2007-05-13 18:06:04 UTC (rev 3087) @@ -0,0 +1,343 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + +<project name="JBossWS"> + + <description>JBossWS test archive builder</description> + +  +  +  + + <target name="build-interop-jars"> + + <mkdir dir="${build.tests.dir}/libs/"/> + +  + <war warfile="${build.test.dir}/libs/jbossws-interop-root.war" + webxml="${test.resources.dir}/interop/microsoft/root/WEB-INF/web.xml"> + <webinf dir="${test.resources.dir}/interop/microsoft/root/WEB-INF"> + <include name="jboss-web.xml"/> + </webinf> + <fileset dir="${test.resources.dir}/interop/microsoft/root"> + <include name="*.*"/> + </fileset> + </war> + +  + <jar jarfile="${build.tests.dir}/libs/jbossws-interop-BaseDataTypesDocLitB-client.jar"> + <fileset dir="${build.tests.dir}/classes"> + <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/BaseDataTypesDocLitB/**/*.class"/> + <include name="org/jboss/test/ws/interop/microsoft/*.class"/> + </fileset> + <metainf dir="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesDocLitB/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**.*"/> + </metainf> + <metainf dir="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesDocLitB/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="scenarios.xml"/> + </metainf> + </jar> + +  + <war warfile="${build.tests.dir}/libs/jbossws-interop-BaseDataTypesDocLitB_Service.war" + webxml="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesDocLitB_Service/WEB-INF/web.xml"> + <classes dir="${build.tests.dir}/classes"> + <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/BaseDataTypesDocLitB_Service/**/*.class"/> + <include name="org/jboss/test/ws/interop/microsoft/*.class"/> + </classes> + <webinf dir="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesDocLitB_Service/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="webservices.xml"/> + <include name="wsdl/**.*"/> + <include name="jboss-web.xml"/> + <include name="scenarios.xml"/> + </webinf> + <fileset dir="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesDocLitB_Service"> + <include name="*.*"/> + </fileset> + </war> + +  + <jar jarfile="${build.tests.dir}/libs/jbossws-interop-BaseDataTypesDocLitW-client.jar"> + <fileset dir="${build.tests.dir}/classes"> + <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/BaseDataTypesDocLitW/**/*.class"/> + <include name="org/jboss/test/ws/interop/microsoft/*.class"/> + </fileset> + <metainf dir="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesDocLitW/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + <metainf dir="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesDocLitW/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="scenarios.xml"/> + </metainf> + </jar> + +  + <jar jarfile="${build.tests.dir}/libs/jbossws-interop-BaseDataTypesRpcLit-client.jar"> + <fileset dir="${build.tests.dir}/classes"> + <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/BaseDataTypesRpcLit/**/*.class"/> + <include name="org/jboss/test/ws/interop/microsoft/*.class"/> + </fileset> + <metainf dir="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesRpcLit/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + <metainf dir="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesRpcLit/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="scenarios.xml"/> + </metainf> + </jar> + +  + <jar jarfile="${build.tests.dir}/libs/jbossws-interop-ComplexDataTypesDocLitB-client.jar"> + <fileset dir="${build.tests.dir}/classes"> + <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesDocLitB/**/*.class"/> + <include name="org/jboss/test/ws/interop/microsoft/*.class"/> + </fileset> + <metainf dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesDocLitB/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + <metainf dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesDocLitB/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="scenarios.xml"/> + </metainf> + </jar> + +  + <jar jarfile="${build.tests.dir}/libs/jbossws-interop-ComplexDataTypesDocLitW-client.jar"> + <fileset dir="${build.tests.dir}/classes"> + <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesDocLitW/**/*.class"/> + <include name="org/jboss/test/ws/interop/microsoft/*.class"/> + </fileset> + <metainf dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesDocLitW/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + <metainf dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesDocLitW/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="scenarios.xml"/> + </metainf> + </jar> + +  + <jar jarfile="${build.tests.dir}/libs/jbossws-interop-ComplexDataTypesRpcLit-client.jar"> + <fileset dir="${build.tests.dir}/classes"> + <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesRpcLit/**/*.class"/> + <include name="org/jboss/test/ws/interop/microsoft/*.class"/> + </fileset> + <metainf dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesRpcLit/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + <metainf dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesRpcLit/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="scenarios.xml"/> + </metainf> + </jar> + +  + <war warfile="${build.tests.dir}/libs/jbossws-interop-BaseDataTypesDocLitW_Service.war" + webxml="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesDocLitW_Service/WEB-INF/web.xml"> + <classes dir="${build.tests.dir}/classes"> + <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/BaseDataTypesDocLitW_Service/**/*.class"/> + <include name="org/jboss/test/ws/interop/microsoft/*.class"/> + </classes> + <webinf dir="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesDocLitW_Service/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="webservices.xml"/> + <include name="wsdl/**"/> + <include name="jboss-web.xml"/> + <include name="scenarios.xml"/> + </webinf> + <fileset dir="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesDocLitW_Service"> + <include name="*.*"/> + </fileset> + </war> + +  + <war warfile="${build.tests.dir}/libs/jbossws-interop-BaseDataTypesRpcLit_Service.war" + webxml="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesRpcLit_Service/WEB-INF/web.xml"> + <classes dir="${build.tests.dir}/classes"> + <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/BaseDataTypesRpcLit_Service/**/*.class"/> + <include name="org/jboss/test/ws/interop/microsoft/*.class"/> + </classes> + <webinf dir="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesRpcLit_Service/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="webservices.xml"/> + <include name="wsdl/**"/> + <include name="jboss-web.xml"/> + <include name="scenarios.xml"/> + </webinf> + <fileset dir="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesRpcLit_Service"> + <include name="*.*"/> + </fileset> + </war> + +  + <war warfile="${build.tests.dir}/libs/jbossws-interop-ComplexDataTypesDocLitB_Service.war" + webxml="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesDocLitB_Service/WEB-INF/web.xml"> + <classes dir="${build.tests.dir}/classes"> + <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesDocLitB_Service/**/*.class"/> + <include name="org/jboss/test/ws/interop/microsoft/*.class"/> + </classes> + <classes dir="${build.tests.dir}/classes"> + <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesShared/**/*.class"/> + </classes> + <webinf dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesDocLitB_Service/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="webservices.xml"/> + <include name="wsdl/**"/> + <include name="jboss-web.xml"/> + <include name="scenarios.xml"/> + </webinf> + <fileset dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesDocLitB_Service"> + <include name="*.*"/> + </fileset> + </war> + +  + <war warfile="${build.tests.dir}/libs/jbossws-interop-ComplexDataTypesDocLitW_Service.war" + webxml="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesDocLitW_Service/WEB-INF/web.xml"> + <classes dir="${build.tests.dir}/classes"> + <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesDocLitW_Service/**/*.class"/> + <include name="org/jboss/test/ws/interop/microsoft/*.class"/> + </classes> + <classes dir="${build.tests.dir}/classes"> + <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesShared/**/*.class"/> + </classes> + <webinf dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesDocLitW_Service/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="webservices.xml"/> + <include name="wsdl/**"/> + <include name="jboss-web.xml"/> + <include name="scenarios.xml"/> + </webinf> + <fileset dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesDocLitW_Service"> + <include name="*.*"/> + </fileset> + </war> + +  + <war warfile="${build.tests.dir}/libs/jbossws-interop-ComplexDataTypesRpcLit_Service.war" + webxml="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesRpcLit_Service/WEB-INF/web.xml"> + <classes dir="${build.tests.dir}/classes"> + <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesRpcLit_Service/**/*.class"/> + <include name="org/jboss/test/ws/interop/microsoft/*.class"/> + </classes> + <classes dir="${build.tests.dir}/classes"> + <include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesShared/**/*.class"/> + </classes> + <webinf dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesRpcLit_Service/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="webservices.xml"/> + <include name="wsdl/**"/> + <include name="jboss-web.xml"/> + <include name="scenarios.xml"/> + </webinf> + <fileset dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesRpcLit_Service"> + <include name="*.*"/> + </fileset> + </war> + +  + <war warfile="${build.tests.dir}/libs/jbossws-interop-mtomUTF8.war" + webxml="${test.resources.dir}/interop/microsoft/mtom/utf8/WEB-INF/web.xml"> + <classes dir="${build.tests.dir}/classes"> + <include name="org/jboss/test/ws/interop/microsoft/mtom/utf8/**/*.class"/> + <include name="org/jboss/test/ws/interop/microsoft/*.class"/> + </classes> + <webinf dir="${test.resources.dir}/interop/microsoft/mtom/utf8/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="webservices.xml"/> + <include name="wsdl/**.*"/> + <include name="jboss-web.xml"/> + </webinf> + <fileset dir="${test.resources.dir}/interop/microsoft/mtom/utf8"> + <include name="*.*"/> + </fileset> + </war> + +  + <jar jarfile="${build.tests.dir}/libs/jbossws-interop-mtomUTF8-client.jar"> + <fileset dir="${build.tests.dir}/classes"> + <include name="org/jboss/test/ws/interop/microsoft/mtom/utf8/**/*.class"/> + <include name="org/jboss/test/ws/interop/microsoft/*.class"/> + </fileset> + <metainf dir="${test.resources.dir}/interop/microsoft/mtom/utf8/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + <metainf dir="${test.resources.dir}/interop/microsoft/mtom/utf8/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="scenarios.xml"/> + </metainf> + </jar> +  + <war warfile="${build.test.dir}/libs/jbossws-interop-mtomUTF8_wsse.war" + webxml="${test.resources.dir}/interop/microsoft/mtom/utf8/wsse/WEB-INF/web.xml"> + <classes dir="${build.test.dir}/classes"> + <include name="org/jboss/test/ws/interop/microsoft/mtom/utf8/**/*.class"/> + <include name="org/jboss/test/ws/interop/microsoft/*.class"/> + </classes> + + <webinf dir="${test.resources.dir}/interop/microsoft/mtom/utf8/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="webservices.xml"/> + <include name="wsdl/**.*"/> + </webinf> + <webinf dir="${test.resources.dir}/interop/microsoft/security/wsse10Shared/META-INF"> + <include name="alice.jks"/> + <include name="wsse10.truststore"/> + </webinf> + + <webinf dir="${test.resources.dir}/interop/microsoft/mtom/utf8/wsse/WEB-INF"> + <include name="jboss-wsse-server.xml"/> + <include name="jboss-web.xml"/> + </webinf> + <fileset dir="${test.resources.dir}/interop/microsoft/mtom/utf8"> + <include name="*.*"/> + </fileset> + </war> + +  + <jar jarfile="${build.test.dir}/libs/jbossws-interop-mtomUTF8_wsse-client.jar"> + <fileset dir="${build.test.dir}/classes"> + <include name="org/jboss/test/ws/interop/microsoft/mtom/utf8/**/*.class"/> + <include name="org/jboss/test/ws/interop/microsoft/*.class"/> + </fileset> + <metainf dir="${test.resources.dir}/interop/microsoft/mtom/utf8/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + <metainf dir="${test.resources.dir}/interop/microsoft/security/wsse10Shared/META-INF"> + <include name="alice.jks"/> + <include name="wsse10.truststore"/> + </metainf> + <metainf dir="${test.resources.dir}/interop/microsoft/mtom/utf8/wsse/META-INF"> + <include name="jboss-client.xml"/> + <include name="jboss-wsse-client.xml"/> + <include name="application-client.xml"/> + <include name="scenarios.xml"/> + </metainf> + </jar> + </target> + +</project> \ No newline at end of file Copied: branches/tdiesler/trunk/jbossws/ant-import-tests/build-interop.xml (from rev 3086, branches/tdiesler/trunk/jbossws/ant-import/build-interop.xml) =================================================================== --- branches/tdiesler/trunk/jbossws/ant-import-tests/build-interop.xml (rev 0) +++ branches/tdiesler/trunk/jbossws/ant-import-tests/build-interop.xml 2007-05-13 18:06:04 UTC (rev 3087) @@ -0,0 +1,401 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + +<project name="JBossWS-Interop" default="interop.build" basedir="../"> + + <import file="../build.xml"/> + + <property name="jwsdp.home" value="C:/dev/env/jwsdp-1.6"/> + <property name="wsdl.update.marker" value="${test.resources.dir}/interop/wsdl.update"/> + <property name="jbossws.client.jar" value="jbossws-client.jar"/> + + <property name="test.java.dir" value="src/main/java"/> + <property name="test.resources.dir" value="src/main/resources"/> + <property name="build.tests.dir" value="output"/> + <property name="build.test.dir" value="output"/> + + <path id="jwsdp.classpath"> +  + </path> + + <path id="wscompile.tools.classpath"> + <fileset dir="${env.JAVA_HOME}/lib"> + <include name="*.jar"/> + </fileset> + </path> + + <path id="build.classpath"> + <path refid="javac.classpath"/> + </path> + +  + +  + + <macrodef name="create-client"> + + <attribute name="company"/> + <attribute name="module"/> + <attribute name="features"/> + <attribute name="config" default="config.xml"/> + <attribute name="verbose" default="false"/> + + <sequential> + + <echo>Generating interop/@{company}/@{module}</echo> + + <mkdir dir="${test.resources.dir}/interop/@{company}/@{module}/META-INF"/> + + <wscompile + keep="true" + client="true" + base="${build.test.dir}/classes" + sourceBase="${test.java.dir}" + nonClassDir="${test.java.dir}/org/jboss/test/ws/interop/@{company}/@{module}" + mapping="${test.resources.dir}/interop/@{company}/(a){module}/WEB-INF/jaxrpc-mapping.xml" + features="@{features}" + xPrintStackTrace="true" + fork="true" + verbose="@{verbose}" + debug="true" + config="${test.resources.dir}/interop/@{company}/@{module}/@{config}"> + + <classpath> + <path refid="wscompile.tools.classpath"/> + <path refid="jwsdp.classpath"/> + <path refid="build.classpath"/> + </classpath> + </wscompile> + </sequential> + </macrodef> + + <macrodef name="create-server"> + + <attribute name="company"/> + <attribute name="module"/> + <attribute name="features"/> + <attribute name="config" default="config.xml"/> + <attribute name="verbose" default="false"/> + + <attribute name="import" default="true"/> + <attribute name="server" default="false"/> + + <sequential> + + <echo>Generating interop/@{company}/@{module}</echo> + + <wscompile + keep="true" + import="@{import}" + server="@{server}" + base="${build.test.dir}/classes" + sourceBase="${test.java.dir}" + nonClassDir="${test.java.dir}/org/jboss/test/ws/interop/@{company}/@{module}" + mapping="${test.resources.dir}/interop/@{company}/(a){module}/WEB-INF/jaxrpc-mapping.xml" + features="@{features}" + xPrintStackTrace="true" + fork="true" + verbose="@{verbose}" + debug="true" + config="${test.resources.dir}/interop/@{company}/@{module}/@{config}"> + + <classpath> + <path refid="wscompile.tools.classpath"/> + <path refid="jwsdp.classpath"/> + <path refid="build.classpath"/> + </classpath> + </wscompile> + + </sequential> + </macrodef> + + <macrodef name="fetch-wsdl"> + <attribute name="company"/> + <attribute name="module"/> + <attribute name="source"/> + <attribute name="localName" default="service.wsdl"/> + + <sequential> + + <mkdir dir="${test.resources.dir}/interop/@{company}/@{module}/WEB-INF"/> + <mkdir dir="${test.resources.dir}/interop/@{company}/@{module}/WEB-INF/wsdl"/> + + <get src="@{source}" + dest="${test.resources.dir}/interop/@{company}/@{module}/WEB-INF/wsdl/@{localName}" + verbose="true" + usetimestamp="true"/> + </sequential> + </macrodef> + +  + <target name="interop.prepare"> + <mkdir dir="${build.test.dir}/libs/"/> + <mkdir dir="${build.test.dir}/classes/"/> + <mkdir dir="${build.test.dir}/reports/"/> + + <uptodate property="create.required" targetfile="${wsdl.update.marker}" > + <srcfiles dir= "${test.resources.dir}/interop" includes="**/WEB-INF/jaxrpc-mapping.xml"/> + </uptodate> + </target> + + <target name="sync-wsdl-files" description="sync the local WSDL copies"> + <fetch-wsdl + source="http://131.107.72.15/SoapWsdl_BaseDataTypes_XmlFormatter_Service_Indigo/B..." + module="soapwsdl/BaseDataTypesDocLitB" + company="microsoft"/> + + <fetch-wsdl + source="http://131.107.72.15/SoapWsdl_BaseDataTypes_XmlFormatter_Service_Indigo/B..." + module="soapwsdl/BaseDataTypesDocLitW" + company="microsoft"/> + + <fetch-wsdl + source="http://131.107.72.15/SoapWsdl_BaseDataTypes_XmlFormatter_Service_Indigo/B..." + module="soapwsdl/BaseDataTypesRPCLit" + company="microsoft"/> + + <fetch-wsdl + source="http://131.107.72.15/SoapWsdl_ComplexDataTypes_XmlFormatter_Service_Indig..." + module="soapwsdl/ComplexDataTypesDocLitB" + company="microsoft"/> + + <fetch-wsdl + source="http://131.107.72.15/SoapWsdl_ComplexDataTypes_XmlFormatter_Service_Indig..." + module="soapwsdl/ComplexDataTypesDocLitW" + company="microsoft"/> + + <fetch-wsdl + source="http://131.107.72.15/SoapWsdl_ComplexDataTypes_XmlFormatter_Service_Indig..." + module="soapwsdl/ComplexDataTypesRpcLit" + company="microsoft"/> + +  + <fetch-wsdl source="http://131.107.72.15/WSAddressingCR_Service_WCF/WSAddressing10.svc?wsdl" + module="addressing/wsa10" + company="microsoft"/> + +  + <touch file="${wsdl.update.marker}"/> + + </target> + + <target name="create-all" depends="interop.prepare, create-client, create-server, create-not-required"/> + + <target name="create-not-required" unless="create.required"> + <echo>Local WSDL copies seem to be uptodate. No build required.</echo> + </target> + + <target name="re-create-all"> + <property name="create.required" value="true"/> + <antcall target="create-all"/> + </target> + + <target name="create-client" if="create.required" description="create the client side artifacts"> + +  + + </target> + + <target name="create-server" description="create the server side artifacts"> + +  + + </target> + + <target name="create-addressing" description="create the addressing artifcats"> +  + <wstools dest="${test.resources.dir}/interop/microsoft/addressing/sep06/wsa10/WEB-INF" + config="${test.resources.dir}/interop/microsoft/addressing/sep06/wsa10/wstools-config.xml"/> + </target> + + <target name="create-security"> +  + + <wstools dest="${test.resources.dir}/interop/microsoft/security/sep06/wsse10/WEB-INF" + config="${test.resources.dir}/interop/microsoft/security/sep06/wsse10/wstools-config.xml"/> + + <wstools dest="${test.resources.dir}/interop/microsoft/security/sep06/wsse10Encrypt/WEB-INF" + config="${test.resources.dir}/interop/microsoft/security/sep06/wsse10Encrypt/wstools-config.xml"/> + + </target> + + <target name="create-mtom"> +  + + </target> +  + + <target name="interop.build" depends="interop.prepare, copy-resources, interop.compile" + description="Compiles and builds the interop clients and endpoints"> + <ant antfile="ant-import/build-interop-jars.xml" target="build-interop-jars"/> + </target> + + <target name="interop.compile" depends="interop.prepare, init" description="Compiles the interop clients and endpoints"> + <mkdir dir="${build.test.dir}/classes"/> + <javac srcdir="${test.java.dir}" destdir="${build.test.dir}/classes" + classpathref="build.classpath" + source="1.5" + nowarn="off" + debug="on" + fork="yes"> + <classpath refid="jwsdp.classpath"/> + <classpath refid="javac.classpath"/> + <include name="org/jboss/test/ws/interop/**/*"/> + </javac> + </target> + + <target name="interop.deploy" depends="interop.prepare" description="Deploy the test endpoints locally"> + <antcall target="deploy-root"/> + <antcall target="deploy-soapwsdl"/> + <antcall target="deploy-addressing"/> + <antcall target="deploy-security"/> + <antcall target="deploy-mtom"/> + </target> + + <target name="deploy-root"> + <copy todir="${jboss.home}/server/default/deploy/"> + <fileset dir="${build.test.dir}/libs"> + <include name="*interop-root.war"/> + </fileset> + </copy> + </target> + + <target name="deploy-soapwsdl"> + <copy todir="${jboss.home}/server/default/deploy/"> + <fileset dir="${build.test.dir}/libs"> + <include name="*interop*_Service.war"/> + </fileset> + </copy> + </target> + + <target name="deploy-addressing"> + <copy todir="${jboss.home}/server/default/deploy/"> + <fileset dir="${build.test.dir}/libs"> + <include name="*interop-wsa10*.war"/> + </fileset> + </copy> + </target> + + <target name="deploy-security"> + <copy todir="${jboss.home}/server/default/deploy/"> + <fileset dir="${build.test.dir}/libs"> + <include name="*interop-wsse*.war"/> + </fileset> + </copy> + </target> + + <target name="deploy-mtom"> + <copy todir="${jboss.home}/server/default/deploy/"> + <fileset dir="${build.test.dir}/libs"> + <include name="*interop-mtom*.war"/> + </fileset> + </copy> + </target> + + <target name="interop.undeploy" description="Undeploy the local test endpoints"> + <delete> + <fileset dir="${jboss.home}/server/default/deploy/"> + <include name="*interop*.war"/> + </fileset> + </delete> + </target> + + <target name="interop.clean" description="Clean local build artifacts"> + <delete> + <fileset dir="${build.test.dir}/classes"> + <include name="**/interop/**/*"/> + </fileset> + </delete> + + <delete> + <fileset dir="${build.test.dir}/libs"> + <include name="*interop*"/> + </fileset> + </delete> + </target> + +</project> Copied: branches/tdiesler/trunk/jbossws/ant-import-tests/build-jars-jaxrpc.xml (from rev 3086, branches/tdiesler/trunk/jbossws/ant-import/build-jars-jaxrpc.xml) =================================================================== --- branches/tdiesler/trunk/jbossws/ant-import-tests/build-jars-jaxrpc.xml (rev 0) +++ branches/tdiesler/trunk/jbossws/ant-import-tests/build-jars-jaxrpc.xml 2007-05-13 18:06:04 UTC (rev 3087) @@ -0,0 +1,3124 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + +<project> + + <description>JBossWS test archive builder</description> + +  +  +  + + <target name="build-jars-jaxrpc" description="Build the jaxrpc deployments"> + + <mkdir dir="${tests.output.dir}/libs"/> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-anonymous.war" webxml="${tests.output.dir}/resources/jaxrpc/anonymous/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestBean.class"/> + <include name="org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestService.class"/> + <include name="org/jboss/test/ws/jaxrpc/anonymous/ComplexTypeRoot.class"/> + <include name="org/jboss/test/ws/jaxrpc/anonymous/ElementTypeRoot.class"/> + <include name="org/jboss/test/ws/jaxrpc/anonymous/ElementTypeInside.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/anonymous/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="webservices.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-anonymous-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestService.class"/> + <include name="org/jboss/test/ws/jaxrpc/anonymous/ComplexTypeRoot.class"/> + <include name="org/jboss/test/ws/jaxrpc/anonymous/ElementTypeRoot.class"/> + <include name="org/jboss/test/ws/jaxrpc/anonymous/ElementTypeInside.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/anonymous/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/anonymous/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-benchmark-rpclit.war" webxml="${tests.output.dir}/resources/benchmark/jaxrpc/rpclit/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/benchmark/jaxrpc/**"/> + <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*_*.class"/> + <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*EJBEndpoint.class"/> + <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/benchmark/jaxrpc/rpclit/WEB-INF"> + <include name="jboss-web.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="webservices.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-benchmark-rpclit.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/benchmark/jaxrpc/**"/> + <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*_*.class"/> + <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*JSEEndpoint.class"/> + <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*TestCase.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/benchmark/jaxrpc/rpclit/META-INF"> + <include name="ejb-jar.xml"/> + <include name="jboss.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="webservices.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-benchmark-rpclit-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/benchmark/jaxrpc/**"/> + <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*_*.class"/> + <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*JSEEndpoint.class"/> + <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*EJBEndpoint.class"/> + <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*TestCase.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/benchmark/jaxrpc/rpclit/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + <war warfile="${tests.output.dir}/libs/jaxrpc-benchmark-doclit.war" webxml="${tests.output.dir}/resources/benchmark/jaxrpc/doclit/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/benchmark/jaxrpc/**"/> + <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*_arr*/**"/> + <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*EJBEndpoint.class"/> + <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/benchmark/jaxrpc/doclit/WEB-INF"> + <include name="jboss-web.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="webservices.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-benchmark-doclit.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/benchmark/jaxrpc/**"/> + <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*_arr*/**"/> + <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*JSEEndpoint.class"/> + <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*TestCase.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/benchmark/jaxrpc/doclit/META-INF"> + <include name="ejb-jar.xml"/> + <include name="jboss.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="webservices.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-benchmark-doclit-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/benchmark/jaxrpc/**"/> + <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*_arr*/**"/> + <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*JSEEndpoint.class"/> + <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*EJBEndpoint.class"/> + <exclude name="org/jboss/test/ws/benchmark/jaxrpc/*TestCase.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/benchmark/jaxrpc/doclit/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-encoded-href.war" webxml="${tests.output.dir}/resources/jaxrpc/encoded/href/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/encoded/href/MarshallTestImpl.class"/> + <include name="org/jboss/test/ws/jaxrpc/encoded/href/MarshallTest.class"/> + <include name="org/jboss/test/ws/jaxrpc/encoded/href/HRefHandler.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/encoded/href/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="webservices.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-encoded-href-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/encoded/href/MarshallTest.class"/> + <include name="org/jboss/test/ws/jaxrpc/encoded/href/HRefHandler.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/encoded/href/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/encoded/href/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-encoded-marshalltest.war" webxml="${tests.output.dir}/resources/jaxrpc/encoded/marshalltest/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/encoded/marshalltest/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/encoded/marshalltest/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="webservices.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-encoded-marshalltest-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/encoded/marshalltest/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestImpl.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/encoded/marshalltest/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/encoded/marshalltest/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-encoded-parametermode.war" webxml="${tests.output.dir}/resources/jaxrpc/encoded/parametermode/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/encoded/parametermode/*.class"/> + <include name="org/jboss/test/ws/jaxrpc/encoded/parametermode/holders/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/encoded/parametermode/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="webservices.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-encoded-parametermode-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/encoded/parametermode/*.class"/> + <include name="org/jboss/test/ws/jaxrpc/encoded/parametermode/holders/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestImpl.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestCase.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/encoded/parametermode/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/encoded/parametermode/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-enventry.war" webxml="${tests.output.dir}/resources/jaxrpc/enventry/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/enventry/EnvEntryTestService.class"/> + <include name="org/jboss/test/ws/jaxrpc/enventry/EnvEntryBeanJSE.class"/> + <include name="org/jboss/test/ws/jaxrpc/enventry/ServerSideHandler.class"/> + <include name="org/jboss/test/ws/jaxrpc/enventry/EnvEntryHandler.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/enventry/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="webservices.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-enventry.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/enventry/EnvEntryTestService.class"/> + <include name="org/jboss/test/ws/jaxrpc/enventry/EnvEntryBeanEJB.class"/> + <include name="org/jboss/test/ws/jaxrpc/enventry/ServerSideHandler.class"/> + <include name="org/jboss/test/ws/jaxrpc/enventry/EnvEntryHandler.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/enventry/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/enventry/META-INF"> + <include name="ejb-jar.xml"/> + <include name="jboss.xml"/> + <include name="webservices.xml"/> + </metainf> + </jar> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-enventry-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/enventry/EnvEntryTestService.class"/> + <include name="org/jboss/test/ws/jaxrpc/enventry/ClientSideHandler.class"/> + <include name="org/jboss/test/ws/jaxrpc/enventry/EnvEntryHandler.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/enventry/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/enventry/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + </jar> + +  + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbas897.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbas897/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbas897/HelloSLSB.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbas897/META-INF"> + <include name="ejb-jar.xml"/> + <include name="jboss.xml"/> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbas897-fail.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbas897/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbas897/HelloSLSB.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbas897/META-INF"> + <include name="jboss.xml"/> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbas897/META-INF-FAIL"> + <include name="ejb-jar.xml"/> + </metainf> + </jar> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbas897.war" webxml="${tests.output.dir}/resources/jaxrpc/jbas897/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbas897/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbas897/HelloJavaBean.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbas897/META-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbas897/WEB-INF"> + <include name="webservices.xml"/> + </webinf> + </war> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbas897-fail.war" webxml="${tests.output.dir}/resources/jaxrpc/jbas897/WEB-INF/web-fail.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbas897/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbas897/HelloJavaBean.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbas897/META-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbas897/WEB-INF"> + <include name="webservices.xml"/> + </webinf> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws64.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws64/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws64/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws64/HelloJavaBean.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws64/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws68.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws68/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws68/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws68/HelloJavaBean.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws68/UserType.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws68/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws68-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws68/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws68/UserType.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws68/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws68/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws70.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws70/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws70/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws70/HelloJavaBean.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws70/*_RequestStruct.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws70/*_ResponseStruct.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws70/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws70-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws70/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws70/*_RequestStruct.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws70/*_ResponseStruct.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws70/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws70/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws71-types.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws71/UserType.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws71/*_RequestStruct.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws71/*_ResponseStruct.class"/> + </fileset> + </jar> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws71.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws71/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws71/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws71/HelloJavaBean.class"/> + </classes> + <lib dir="${tests.output.dir}/libs"> + <include name="jaxrpc-jbws71-types.jar"/> + </lib> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws71/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws71-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws71/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws71/UserType.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws71/*_RequestStruct.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws71/*_ResponseStruct.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws71/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws71/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws79.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws79/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws79/HelloOne.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws79/HelloTwo.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws79/HelloOneJavaBean.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws79/HelloTwoJavaBean.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws79/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping-one.xml"/> + <include name="jaxrpc-mapping-two.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws79-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws79/HelloOne.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws79/HelloTwo.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws79/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws79/WEB-INF"> + <include name="jaxrpc-mapping-one.xml"/> + <include name="jaxrpc-mapping-two.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws82.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws82/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws82/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws82/HelloJavaBean.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws82/UserType.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws82/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws82-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws82/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws82/UserType.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws82/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws82/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws83.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws83/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws83/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws83/HelloJavaBean.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws83/UserType.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws83/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws83-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws83/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws83/UserType.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws83/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws83/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws84.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws84/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws84/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws84/*TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws84/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="webservices.xml"/> + <include name="wsdl/*.wsdl"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws84-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws84/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws84/*JavaBean.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws84/*TestCase.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws84/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws84/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/*.wsdl"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws124.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws124/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws124/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws124/HelloJavaBean.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws124/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws124-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws124/Hello.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws124/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws124/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws128-service.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws128/WEB-INF-service/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws128/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws128/HelloJavaBean.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws128/WEB-INF-service"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws128-client.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws128/WEB-INF-client/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws128/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws128/HelloClientServlet.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws128/WEB-INF-client"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <ear destfile="${tests.output.dir}/libs/jaxrpc-jbws128.ear" appxml="${tests.output.dir}/resources/jaxrpc/jbws128/META-INF/application.xml"> + <fileset dir="${tests.output.dir}/libs"> + <include name="jaxrpc-jbws128-service.war"/> + <include name="jaxrpc-jbws128-client.war"/> + </fileset> + </ear> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws153.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws153/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws153/Order.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws153/OrderJavaBean.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws153/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="jaxrpc-deployment.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws153-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws153/Order.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws153/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws153/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="jaxrpc-deployment.xml"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws163.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws163/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws163/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws163/HelloJavaBean.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws163/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws163-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws163/Hello.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws163/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws163/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <jar jarfile="${tests.output.dir}/libs/jaxrpc-jbws165-none.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws165/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws165/HelloEJB.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws165/META-INF-none"> + <include name="webservices.xml"/> + <include name="ejb-jar.xml"/> + <include name="jboss.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-jbws165-pcuri.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws165/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws165/HelloEJB.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws165/META-INF-pcuri"> + <include name="webservices.xml"/> + <include name="ejb-jar.xml"/> + <include name="jboss.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-jbws165-ctxroot.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws165/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws165/HelloEJB.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws165/META-INF-ctxroot"> + <include name="webservices.xml"/> + <include name="ejb-jar.xml"/> + <include name="jboss.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-jbws165-both.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws165/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws165/HelloEJB.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws165/META-INF-both"> + <include name="webservices.xml"/> + <include name="ejb-jar.xml"/> + <include name="jboss.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws165-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws165/Hello.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws165/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="jaxrpc-mapping.xml"/> + </metainf> + </jar> + <ear destfile="${tests.output.dir}/libs/jaxrpc-jbws165.ear" appxml="${tests.output.dir}/resources/jaxrpc/jbws165/META-INF/application.xml"> + <fileset dir="${tests.output.dir}/libs"> + <include name="jaxrpc-jbws165-none.jar"/> + <include name="jaxrpc-jbws165-pcuri.jar"/> + <include name="jaxrpc-jbws165-ctxroot.jar"/> + <include name="jaxrpc-jbws165-both.jar"/> + <include name="jaxrpc-jbws165-client.jar"/> + </fileset> + </ear> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws167.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws167/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws167/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws167/HelloJavaBean.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws167/HeaderHandler.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws167/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws168.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws168/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws168/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws168/HelloJavaBean.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws168/UserType.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws168/HelloHandler.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws168/*RequestStruct.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws168/*ResponseStruct.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws168/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="jaxrpc-deployment.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws168-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws168/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws168/UserType.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws168/*RequestStruct.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws168/*ResponseStruct.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws168/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws168/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="jaxrpc-deployment.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws217.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws217/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws217/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws217/HelloJavaBean.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws217/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws217-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws217/Hello.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws217/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws217/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws231.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws231/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws231/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws231/TestEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws231/EyeColorType.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws231/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws231-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws231/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws231/EyeColorType.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws231/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws231/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws251.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws251/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws251/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws251/HelloJavaBean.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws251/BaseException.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws251/UserExceptionOne.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws251/UserExceptionTwo.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws251/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws251-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws251/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws251/BaseException.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws251/UserExceptionOne.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws251/UserExceptionTwo.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws251/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws251/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <copy todir="${tests.output.dir}/resources/META-INF" file="${tests.output.dir}/resources/jaxrpc/jbws413/WEB-INF/jaxrpc-mapping.xml"/> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws316.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws316/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws316/BinDataDTO.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws316/TestBusinessFacadeBF*.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws316/WEB-INF"> + <include name="webservices.xml"/> + <include name="TestBusinessFacadeMapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws316-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws316/BinDataDTO.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws316/TestBusinessFacadeBF*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws316/TestBusinessFacadeBFBean.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws316/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws316/WEB-INF"> + <include name="TestBusinessFacadeMapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws331-ws.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws331/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws331/HelloEndpoint.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws331/WS-META-INF"> + <include name="ejb-jar.xml"/> + <include name="jboss.xml"/> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws331-ejb.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws331/HelloHome.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws331/HelloRemote.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws331/HelloSLSB.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws331/EJB-META-INF"> + <include name="ejb-jar.xml"/> + </metainf> + </jar> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws331-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws331/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws331/HelloHome.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws331/HelloRemote.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws331/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws331/WS-META-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + <ear destfile="${tests.output.dir}/libs/jaxrpc-jbws331.ear" appxml="${tests.output.dir}/resources/jaxrpc/jbws331/META-INF/application.xml"> + <fileset dir="${tests.output.dir}/libs"> + <include name="jaxrpc-jbws331-ejb.jar"/> + <include name="jaxrpc-jbws331-ws.jar"/> + <include name="jaxrpc-jbws331-client.jar"/> + </fileset> + </ear> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws349.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws349/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws349/*"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws349/*TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws349/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws349-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws349/*"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws349/*EndpointImpl.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws349/*TestCase.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws349/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws349/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws358.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws358/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws358/HelloBean.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws358/META-INF"> + <include name="ejb-jar.xml"/> + <include name="jboss.xml"/> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws358-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws358/Hello.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws358/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws358.ear/jaxrpc-jbws358.jar"/> + <unjar dest="${tests.output.dir}/libs/jaxrpc-jbws358.ear/jaxrpc-jbws358.jar" src="${tests.output.dir}/libs/jaxrpc-jbws358.jar"/> + <copy todir="${tests.output.dir}/libs/jaxrpc-jbws358.ear"> + <fileset dir="${tests.output.dir}/resources/jaxrpc/jbws358"> + <include name="META-INF/application.xml"/> + </fileset> + <fileset dir="${tests.output.dir}/libs"> + <include name="jaxrpc-jbws358-client.jar"/> + </fileset> + </copy> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws377.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws377/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws377/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws377/HelloJavaBean.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws377/UserType.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws377/*_RequestStruct.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws377/*_ResponseStruct.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws377/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws377-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws377/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws377/UserType.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws377/*_RequestStruct.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws377/*_ResponseStruct.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws377/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws377/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws381.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws381/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws381/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws381/JBWS381TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws381/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws381-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws381/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws381/WeatherForecastSoapImpl.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws381/JBWS381TestCase.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws381/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws381/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws383.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws383/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws383/TestSEI.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws383/TestJavaBean.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws383/JavaType.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws383/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws383-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws383/TestSEI.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws383/JavaType.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws383/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws383/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws413.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws413/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws413/TestSEI.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws413/TestJavaBean.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws413/JavaType.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws413/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws413-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws413/TestSEI.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws413/JavaType.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws413/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws413/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws414.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws414/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws414/TestSEI.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws414/TestJavaBean.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws414/St.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws414/RefType.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws414/Interface.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws414/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="jaxrpc-deployment.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws414-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws414/TestSEI.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws414/St.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws414/RefType.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws414/Interface.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws414/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws414/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="jaxrpc-deployment.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws423.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws423/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws423/DemoEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws423/DemoBean.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws423/ValueObj.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws423/_arrays/**"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws423/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws423-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws423/DemoEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws423/ValueObj.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws423/_arrays/**"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws423/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws423/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws424.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws424/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws424/TestSEI.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws424/TestJavaBean.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws424/PrivateException.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws424/Exception2.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws424/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws424-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws424/TestSEI.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws424/PrivateException.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws424/Exception2.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws424/TestHandler.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws424/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws424/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws425.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws425/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws425/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws425/HelloJavaBean.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws425/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws425-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws425/Hello.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws425/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws425/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws434.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws434/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws434/TestServiceEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws434/TestServiceEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws434/ArrayOfAny*.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws434/TypeOfAny*.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws434/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="webservices.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws434-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws434/TestServiceEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws434/ArrayOfAny*.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws434/TypeOfAny*.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws434/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws434/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws456.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws456/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws456/TestSEI.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws456/TestJavaBean.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws456/JavaType.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws456/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws456-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws456/TestSEI.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws456/JavaType.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws456/TestHandler.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws456/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws456/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws463.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws463/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws463/TestSEI.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws463/TestJavaBean.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws463/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws463-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws463/TestSEI.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws463/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws463/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws464.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws464/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws464/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws464/HelloJavaBean.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws464/SAAJTestHandler.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws464/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws464-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws464/Hello.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws464/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws464/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws484.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws484/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws484/*"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws484/JBWS484TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws484/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws484-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws484/*"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws484/TestServiceBean.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws484/JBWS484TestCase.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws484/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws484/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <jar jarfile="${tests.output.dir}/libs/jaxrpc-jbws626.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws626/DemoEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws626/ServerHandler.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws626/DemoBean.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws626/ValueObj.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws626/_arrays/**"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws626/META-INF"> + <include name="ejb-jar.xml"/> + <include name="jboss.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="webservices.xml"/> + <include name="wsdl/TestService.wsdl"/> + </metainf> + </jar> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws626-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws626/DemoEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws626/ValueObj.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws626/_arrays/**"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws626/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + <ear destfile="${tests.output.dir}/libs/jaxrpc-jbws626.ear" appxml="${tests.output.dir}/resources/jaxrpc/jbws626/META-INF/application.xml"> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws626/META-INF"> + <include name="jboss-app.xml"/> + </metainf> + <fileset dir="${tests.output.dir}/libs"> + <include name="jaxrpc-jbws626.jar"/> + <include name="jaxrpc-jbws626-client.jar"/> + </fileset> + </ear> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws632.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws632/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws632/TestSEI.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws632/TestJavaBean.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws632/_arrays/**"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws632/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws632-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws632/TestSEI.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws632/_arrays/**"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws632/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws632/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws637-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws637/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws637/*TestCase.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws637/META-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws643.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws643/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws643/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws643/*TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws643/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws643-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws643/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws643/*TestCase.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws643/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws643/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws663b.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws663b/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws663/*.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws663/holders/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws663/*TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws663b/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws663b-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws663/*.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws663/holders/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws663/*TestCase.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws663b/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws663b/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws663bb.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws663bb/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws663/*.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws663/holders/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws663/*TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws663bb/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws663bb-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws663/*.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws663/holders/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws663/*TestCase.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws663bb/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws663bb/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws663w.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws663w/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws663/*.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws663/holders/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws663/*TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws663w/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws663w-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws663/*.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws663/holders/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws663/*TestCase.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws663w/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws663w/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws663wb.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws663wb/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws663/*.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws663/holders/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws663/*TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws663wb/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws663wb-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws663/*.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws663/holders/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws663/*TestCase.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws663wb/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws663wb/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws706.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws706/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws706/**"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws706/ClientHandler.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws706/JBWS706TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws706/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws706-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws706/**"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws706/DemoServicePortTypeImpl.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws706/JBWS706TestCase.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws706/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws706/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws707.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws707/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws707/UserType.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws707/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws707/TestEndpointImpl.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws707/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws707-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws707/UserType.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws707/TestEndpoint.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws707/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws707/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws710.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws710/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws710/**"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws710/JBWS710TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws710/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws710-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws710/**"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws710/HelloBean.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws710/JBWS710TestCase.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws710/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws710/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws720.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws720/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws720/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws720/*TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws720/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws720-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws720/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws720/*Impl.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws720/*TestCase.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws720/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws720/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <jar jarfile="${tests.output.dir}/libs/jaxrpc-jbws723.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationService.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationHome.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationRemote.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationImpl.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws723/META-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="webservices.xml"/> + <include name="ejb-jar.xml"/> + <include name="jboss.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-jbws723-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationService.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationHome.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationRemote.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws723/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws732.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws732/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws732/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws732/*TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws732/WEB-INF"> + <include name="bare-mapping.xml"/> + <include name="wrapped-mapping.xml"/> + <include name="webservices.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws732-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws732/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws732/*TestCase.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws732/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws732/WEB-INF"> + <include name="bare-mapping.xml"/> + <include name="wrapped-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws751.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws751/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws751/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws751/*TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws751/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws751-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws751/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws751/*Impl.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws751/*TestCase.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws751/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws751/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws772-endpoint.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws772/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws772/HelloSLSB.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws772/META-INF-ONE"> + <include name="ejb-jar.xml"/> + <include name="jboss.xml"/> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws772-remote.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws772/HelloHome.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws772/HelloRemote.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws772/HelloSLSB.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws772/META-INF-TWO"> + <include name="ejb-jar.xml"/> + </metainf> + </jar> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws772-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws772/Hello.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws772/META-INF-ONE"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + <ear destfile="${tests.output.dir}/libs/jaxrpc-jbws772.ear" appxml="${tests.output.dir}/resources/jaxrpc/jbws772/META-INF-ONE/application.xml"> + <fileset dir="${tests.output.dir}/libs"> + <include name="jaxrpc-jbws772-endpoint.jar"/> + <include name="jaxrpc-jbws772-remote.jar"/> + <include name="jaxrpc-jbws772-client.jar"/> + </fileset> + </ear> + +  + <war destfile="${tests.output.dir}/libs/jaxrpc-jbws775.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws775/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws775/*"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws775/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws775-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws775/*"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws775/*Impl.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws775/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws775/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws801.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws801/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws801/LargeAttachmentImpl.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws801/LargeAttachment.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws801/WEB-INF"> + <include name="wsdl/LargeAttachment.wsdl"/> + <include name="jaxrpc-mapping.xml"/> + <include name="webservices.xml"/> + </webinf> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws807.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws807/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws807/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws807/*TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws807/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws807-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws807/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws807/*TestCase.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws807/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws807/WEB-INF"> + <include name="wsdl/**"/> + <include name="jaxrpc-mapping.xml"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws812.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws812/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws812/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws812/TestEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws812/ServerHandler.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws812/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws812-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws812/TestEndpoint.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws812/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws812/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws950.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws950/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws950/TestEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws950/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws950/UserType.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws950/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws956.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws956/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws956/TestEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws956/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws956/StringArray.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws956/StringArrayArray.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws956/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1010.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1010/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1010/InheritenceChildInterface.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1010/InheritenceParentInterface.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1010/TestEndpointImpl.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1010/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1010-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1010/InheritenceChildInterface.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1010/InheritenceParentInterface.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1010/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1010/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1011.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1011/SimpleEntityLocal.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1011/SimpleEntityHome.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1011/SimpleEntityBean.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1011/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1011/TestEndpointBean.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1011/META-INF"> + <include name="ejb-jar.xml"/> + <include name="jboss.xml"/> + <include name="jbosscmp-jdbc.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="webservices.xml"/> + <include name="wsdl/TestService.wsdl"/> + </metainf> + </jar> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1011-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1011/TestEndpoint.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1011/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1093.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1093/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1093/ServletTest.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1093/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1093/TestEndpointImpl.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1093/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1093-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jbws1093/TestEndpoint.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1093/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1093/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1107.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1107/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1107/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1107/TestEndpointImpl.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1107/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1107-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1107/TestEndpoint.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1107/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1107/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war destfile="${tests.output.dir}/libs/jaxrpc-jbws1121.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1121/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1121/HelloWorld.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1121/HelloWorldBean.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1121/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="jboss-wsse-server.xml"/> + <include name="wsdl/*"/> + </webinf> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1121"> + <include name="wsse.keystore"/> + <include name="wsse.truststore"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1121-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1121/HelloWorld.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1121/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="jboss-wsse-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1121/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/*"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1121"> + <include name="wsse.keystore"/> + <include name="wsse.truststore"/> + </metainf> + </jar> + <ear destfile="${tests.output.dir}/libs/jaxrpc-jbws1121.ear" + appxml="${tests.output.dir}/resources/jaxrpc/jbws1121/META-INF/application.xml"> + <fileset dir="${tests.output.dir}/libs"> + <include name="jaxrpc-jbws1121-client.jar"/> + <include name="jaxrpc-jbws1121.war"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1121/META-INF"> + <include name="jboss-app.xml"/> + </metainf> + </ear> + +  + <copy todir="${tests.output.dir}/resources" overwrite="true"> + <fileset dir="${tests.resources.dir}"> + <include name="jaxrpc/jbws1124/META-INF/jboss-client.xml"/> + <include name="jaxrpc/jbws1124/WEB-INF/test-resource.txt"/> + <include name="jaxrpc/jbws1124/WEB-INF/jboss-web.xml"/> + </fileset> + <filterset> + <filter token="jbws1124.domain" value="jbws1124one"/> + </filterset> + </copy> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1124one.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1124/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1124/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1124/TestEndpointImpl.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1124/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="test-resource.txt"/> + <include name="jboss-web.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> +  + <copy todir="${tests.output.dir}/resources" overwrite="true"> + <fileset dir="${tests.resources.dir}"> + <include name="jaxrpc/jbws1124/META-INF/jboss-client.xml"/> + <include name="jaxrpc/jbws1124/WEB-INF/test-resource.txt"/> + <include name="jaxrpc/jbws1124/WEB-INF/jboss-web.xml"/> + </fileset> + <filterset> + <filter token="jbws1124.domain" value="jbws1124two"/> + </filterset> + </copy> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1124two.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1124/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1124/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1124/TestEndpointImpl.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1124/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="test-resource.txt"/> + <include name="jboss-web.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1125.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1125/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1125/TestEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1125/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1125/*RequestStruct.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1125/*ResponseStruct.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1125/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1125-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1125/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1125/*RequestStruct.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1125/*ResponseStruct.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1125/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1125/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1148.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1148/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1148/TestEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1148/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1148/TelephoneNumber.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1148/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-jbws1148-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1148/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1148/TelephoneNumber.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1148/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1148/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1179.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1179/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1179/TestEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1179/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1179-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1179/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1179/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1186.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1186/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1186/TestEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1186/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1186/ServerHandler.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1186/UserType.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1186/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1190.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1190/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1190/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl$1.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190Exception.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1190/WEB-INF"> + <include name="webservices.xml"/> + <include name="test-mapping.xml"/> + <include name="confidential-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-jbws1190-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1190/TestEndpoint.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1190/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1190/WEB-INF"> + <include name="test-mapping.xml"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1205-simple.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint_echo_RequestStruct.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint_echo_ResponseStruct.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF"> + <include name="webservices.xml"/> + <include name="simple-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1205-test.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1205/TestEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1205/TestEndpointImpl$*.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1205/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1205/TestException.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint_echo_RequestStruct.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint_echo_ResponseStruct.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF"> + <include name="webservices.xml"/> + <include name="test-mapping.xml"/> + <include name="wsdl/**"/> + <include name="jboss-web.xml"/> + </webinf> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF"> + <include name="simple-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-jbws1205-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1205/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1205/TestException.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1205/Client/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF"> + <include name="test-mapping.xml"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1303.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1303/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1303/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws1303/*TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1303/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1303-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1303/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws1303/*TestCase.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1303/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1303/WEB-INF"> + <include name="wsdl/**"/> + <include name="jaxrpc-mapping.xml"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1378.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1378/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1378/**"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws1378/*TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1378/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1384.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1384/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1384/**"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws1384/*TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1384/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1386.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1386/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1386/**"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws1386/*TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1386/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1410.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1410/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1410/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1410/TestEndpointImpl.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1410/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + +  + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1427.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1427/**"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws1427/*TestCase.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1427/META-INF"> + <include name="webservices.xml"/> + <include name="ejb-jar.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1619.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1619/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1619/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1619/TestEndpointImpl.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1619/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1619-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jbws1619/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jbws1619/ClientHandler.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1619/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1619/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-marshall-doclit.war" webxml="${tests.output.dir}/resources/jaxrpc/marshall-doclit/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypes.class"/> + <include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypesBean.class"/> + <include name="org/jboss/test/ws/jaxrpc/marshall/*RequestStruct.class"/> + <include name="org/jboss/test/ws/jaxrpc/marshall/*ResponseStruct.class"/> + <include name="org/jboss/test/ws/jaxrpc/marshall/types/**"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/marshall-doclit/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="webservices.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-marshall-doclit-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypes.class"/> + <include name="org/jboss/test/ws/jaxrpc/marshall/types/**"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/marshall-doclit/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/marshall-doclit/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-marshall-rpclit.war" webxml="${tests.output.dir}/resources/jaxrpc/marshall-rpclit/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypes.class"/> + <include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypesBean.class"/> + <include name="org/jboss/test/ws/jaxrpc/marshall/types/JavaBean.class"/> + <include name="org/jboss/test/ws/jaxrpc/marshall/types/JavaBean2.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/marshall-rpclit/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="webservices.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-marshall-rpclit-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypes.class"/> + <include name="org/jboss/test/ws/jaxrpc/marshall/types/JavaBean.class"/> + <include name="org/jboss/test/ws/jaxrpc/marshall/types/JavaBean2.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/marshall-rpclit/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/marshall-rpclit/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-outparam.war" webxml="${tests.output.dir}/resources/jaxrpc/outparam/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/outparam/*Service.class"/> + <include name="org/jboss/test/ws/jaxrpc/outparam/*ServiceBean.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/outparam/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="webservices.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-overloaded.war" webxml="${tests.output.dir}/resources/jaxrpc/overloaded/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/overloaded/Overloaded.class"/> + <include name="org/jboss/test/ws/jaxrpc/overloaded/OverloadedBean.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/overloaded/WEB-INF"> + <include name="jboss-web.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="webservices.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-overloaded-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/overloaded/Overloaded.class"/> + <include name="org/jboss/test/ws/jaxrpc/overloaded/OverloadedBean.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/overloaded/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/overloaded/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-serviceref.war" webxml="${tests.output.dir}/resources/jaxrpc/serviceref/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/serviceref/TestEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxrpc/serviceref/TestEndpoint.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/serviceref/META-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + <webinf dir="${tests.output.dir}/resources/jaxrpc/serviceref/WEB-INF"> + <include name="webservices.xml"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-serviceref-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/serviceref/ApplicationClient.class"/> + <include name="org/jboss/test/ws/jaxrpc/serviceref/TestEndpointService.class"/> + <include name="org/jboss/test/ws/jaxrpc/serviceref/TestEndpoint.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/serviceref/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + <war destfile="${tests.output.dir}/libs/jaxrpc-serviceref-servlet-client.war" webxml="${tests.output.dir}/resources/jaxrpc/serviceref/servlet-client/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/serviceref/ServletClient.class"/> + <include name="org/jboss/test/ws/jaxrpc/serviceref/TestEndpointService.class"/> + <include name="org/jboss/test/ws/jaxrpc/serviceref/TestEndpoint.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/serviceref/META-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-serviceref-ejb-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/serviceref/EJBClient.class"/> + <include name="org/jboss/test/ws/jaxrpc/serviceref/EJBRemote.class"/> + <include name="org/jboss/test/ws/jaxrpc/serviceref/EJBRemoteHome.class"/> + <include name="org/jboss/test/ws/jaxrpc/serviceref/TestEndpointService.class"/> + <include name="org/jboss/test/ws/jaxrpc/serviceref/TestEndpoint.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/serviceref/META-INF"> + <include name="ejb-jar.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-utf16.war" webxml="${tests.output.dir}/resources/jaxrpc/utf16/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/utf16/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/utf16/HelloJavaBean.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/utf16/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-utf16-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/utf16/Hello.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/utf16/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/utf16/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-wsdlpublish.war" webxml="${tests.output.dir}/resources/jaxrpc/wsdlpublish/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/wsdlpublish/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsdlpublish/TestEndpointImpl.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/wsdlpublish/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="jboss-web.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-wsse-account-signup.war" webxml="${tests.output.dir}/resources/jaxrpc/wsse/account-signup/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountInfo.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignup.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupImpl.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignup_signup_RequestStruct.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignup_signup_ResponseStruct.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/signup/Address.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/signup/CreditCardInfo.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse/account-signup/WEB-INF"> + <include name="jboss-web.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="webservices.xml"/> + <include name="jboss-wsse-server.xml"/> + <include name="wsdl/**"/> + </webinf> + <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse"> + <include name="wsse.keystore"/> + <include name="wsse.truststore"/> + </webinf> + </war> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-wsse-account-signup-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountInfo.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignup.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/signup/Address.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/signup/CreditCardInfo.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/account-signup/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="jboss-wsse-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/account-signup/WEB-INF"> + <include name="wsdl/**"/> + <include name="jaxrpc-mapping.xml"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-wsse-rpc.war" webxml="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/HelloJavaBean.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF"> + <include name="jboss-web.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="webservices.xml"/> + <include name="jboss-wsse-server.xml"/> + <include name="wsdl/**"/> + </webinf> + <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse"> + <include name="wsse.keystore"/> + <include name="wsse.truststore"/> + </webinf> + </war> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-wsse-rpc-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="jboss-wsse-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF"> + <include name="wsdl/**"/> + <include name="jaxrpc-mapping.xml"/> + </metainf> + </jar> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-wsse-rpc-none-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/META-INF"> + <include name="application-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/META-INF-no-wsse"> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF"> + <include name="wsdl/**"/> + <include name="jaxrpc-mapping.xml"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-wsse-simple-sign-encrypt.war" webxml="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/HelloJavaBean.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="jboss-web.xml"/> + <include name="webservices.xml"/> + <include name="wsdl/**"/> + </webinf> + <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse/simple-sign-encrypt"> + <include name="jboss-wsse-server.xml"/> + </webinf> + <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse"> + <include name="wsse.keystore"/> + <include name="wsse.truststore"/> + </webinf> + </war> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-wsse-simple-sign-encrypt-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/simple-sign-encrypt"> + <include name="jboss-wsse-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF"> + <include name="wsdl/**"/> + <include name="jaxrpc-mapping.xml"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-wsse-sign-fault.war" webxml="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/HelloJavaBean.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="jboss-web.xml"/> + <include name="webservices.xml"/> + <include name="wsdl/**"/> + </webinf> + <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse/sign-fault"> + <include name="jboss-wsse-server.xml"/> + </webinf> + <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse"> + <include name="wsse.keystore"/> + <include name="wsse.truststore"/> + </webinf> + </war> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-wsse-sign-fault-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/sign-fault"> + <include name="jboss-wsse-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF"> + <include name="wsdl/**"/> + <include name="jaxrpc-mapping.xml"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-wsse-sign-encrypt-fault.war" webxml="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/HelloJavaBean.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="jboss-web.xml"/> + <include name="webservices.xml"/> + <include name="wsdl/**"/> + </webinf> + <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse/sign-encrypt-fault"> + <include name="jboss-wsse-server.xml"/> + </webinf> + <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse"> + <include name="wsse.keystore"/> + <include name="wsse.truststore"/> + </webinf> + </war> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-wsse-sign-encrypt-fault-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/sign-encrypt-fault"> + <include name="jboss-wsse-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF"> + <include name="wsdl/**"/> + <include name="jaxrpc-mapping.xml"/> + </metainf> + </jar> + +  + <replace file="${tests.output.dir}/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml" token="${buildpath}" value="${tests.output.dir}"/> + <war warfile="${tests.output.dir}/libs/jaxrpc-wsse-store-pass-encrypt-class-cmd.war" webxml="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/HelloJavaBean.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/PasswordUtil.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="jboss-web.xml"/> + <include name="webservices.xml"/> + <include name="wsdl/**"/> + </webinf> + <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd"> + <include name="jboss-wsse-server.xml"/> + </webinf> + <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse"> + <include name="wsse.keystore"/> + <include name="wsse.truststore"/> + </webinf> + </war> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-wsse-store-pass-encrypt-class-cmd-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd"> + <include name="jboss-wsse-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF"> + <include name="wsdl/**"/> + <include name="jaxrpc-mapping.xml"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-wsse-web-client.war" webxml="${tests.output.dir}/resources/jaxrpc/wsse/webclient/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/HelloJavaBean.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/RpcTestClientServlet.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="webservices.xml"/> + <include name="jboss-wsse-server.xml"/> + <include name="wsdl/**"/> + </webinf> + <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse/webclient/WEB-INF"> + <include name="jboss-web.xml"/> + <include name="jboss-wsse-client.xml"/> + </webinf> + <webinf dir="${tests.output.dir}/resources/jaxrpc/wsse"> + <include name="wsse.keystore"/> + <include name="wsse.truststore"/> + </webinf> + </war> + +  + <jar jarfile="${tests.output.dir}/libs/jaxrpc-wsse-username.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/wsse/*Type.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/*Service.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/*Struct.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/*EJBEndpoint.class"/> + </fileset> + <fileset dir="${tests.output.dir}/resources"> + <include name="*.properties"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/username/META-INF"> + <include name="ejb-jar.xml"/> + <include name="jboss.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="jboss-wsse-server.xml"/> + <include name="webservices.xml"/> + <include name="wsdl/**"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse"> + <include name="wsse.keystore"/> + <include name="wsse.truststore"/> + </metainf> + </jar> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-wsse-username-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/wsse/username/*Type.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/username/*Struct.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/username/*Service.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/wsse/username/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="jboss-wsse-client.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-xop-doclit.war" webxml="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-xop-doclit-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF"> + <include name="wsdl/**"/> + <include name="jaxrpc-mapping.xml"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-xop-doclit_handler.war" webxml="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF"> + <include name="webservices.xml"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-xop-doclit_handler-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/handlerconfig/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF"> + <include name="wsdl/**"/> + <include name="jaxrpc-mapping.xml"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-xop-rpclit.war" webxml="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-xop-rpclit-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF"> + <include name="wsdl/**"/> + <include name="jaxrpc-mapping.xml"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-xop-rpclit_handler.war" webxml="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF"> + <include name="webservices.xml"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-xop-rpclit_handler-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF"> + <include name="wsdl/**"/> + <include name="jaxrpc-mapping.xml"/> + </metainf> + </jar> + +  + + </target> + +</project> Copied: branches/tdiesler/trunk/jbossws/ant-import-tests/build-jars-jaxws.xml (from rev 3086, branches/tdiesler/trunk/jbossws/ant-import/build-jars-jaxws.xml) =================================================================== --- branches/tdiesler/trunk/jbossws/ant-import-tests/build-jars-jaxws.xml (rev 0) +++ branches/tdiesler/trunk/jbossws/ant-import-tests/build-jars-jaxws.xml 2007-05-13 18:06:04 UTC (rev 3087) @@ -0,0 +1,405 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + +<project> + + <description>JBossWS test archive builder</description> + +  +  +  + + <target name="build-jars-jaxws" description="Build the deployments."> + + <mkdir dir="${tests.output.dir}/libs"/> + +  + <war warfile="${tests.output.dir}/libs/jaxws-anonymous.war" webxml="${tests.output.dir}/resources/jaxws/anonymous/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/anonymous/Anonymous.class"/> + <include name="org/jboss/test/ws/jaxws/anonymous/AnonymousRequest.class"/> + <include name="org/jboss/test/ws/jaxws/anonymous/AnonymousResponse.class"/> + <include name="org/jboss/test/ws/jaxws/anonymous/AnonymousImpl.class"/> + </classes> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-benchmark-doclit.war" webxml="${tests.output.dir}/resources/benchmark/jaxws/doclit/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/benchmark/jaxws/**/*.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/benchmark/jaxws/doclit/WEB-INF"> + <include name="wsdl/**"/> + </webinf> + <webinf dir="${tests.output.dir}/resources/benchmark/jaxws/doclit/WEB-INF"> + <include name="handlers.xml"/> + </webinf> + </war> + + <war warfile="${tests.output.dir}/libs/ri-benchmark-doclit.war" webxml="${tests.output.dir}/resources/benchmark/jaxws/doclit/ri/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/benchmark/jaxws/**/*.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/benchmark/jaxws/doclit/ri/WEB-INF"> + <include name="wsdl/**"/> + </webinf> + <webinf dir="${tests.output.dir}/resources/benchmark/jaxws/doclit/ri/WEB-INF"> + <include name="handlers.xml"/> + <include name="sun-jaxws.xml"/> + </webinf> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-binding.war" webxml="${tests.output.dir}/resources/jaxws/binding/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/binding/SOAPEndpointBean.class"/> + <include name="org/jboss/test/ws/jaxws/binding/SOAPEndpoint.class"/> + </classes> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-complex.war" webxml="${tests.output.dir}/resources/jaxws/complex/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/complex/*.class"/> + <include name="org/jboss/test/ws/jaxws/complex/extra/*.class"/> + <include name="org/jboss/test/ws/jaxws/complex/types/*.class"/> + <exclude name="org/jboss/test/ws/jaxws/complex/*TestCase.class"/> + </classes> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-endpoint-servlet.war" webxml="${tests.output.dir}/resources/jaxws/endpoint/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/endpoint/EndpointServlet.class"/> + <include name="org/jboss/test/ws/jaxws/endpoint/EndpointBean.class"/> + <include name="org/jboss/test/ws/jaxws/endpoint/EndpointInterface.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/endpoint/WEB-INF"> + <include name="wsdl/**"/> + </webinf> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-handlerlifecycle.war" webxml="${tests.output.dir}/resources/jaxws/handlerlifecycle/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpointBean.class"/> + <include name="org/jboss/test/ws/jaxws/handlerlifecycle/TrackerEndpointBean.class"/> + <include name="org/jboss/test/ws/jaxws/handlerlifecycle/LifecycleHandler.class"/> + <include name="org/jboss/test/ws/jaxws/handlerlifecycle/ServerHandler*.class"/> + <include name="org/jboss/test/ws/jaxws/handlerlifecycle/PreServerHandler*.class"/> + <include name="org/jboss/test/ws/jaxws/handlerlifecycle/PostServerHandler*.class"/> + <include name="org/jboss/test/ws/jaxws/handlerlifecycle/HandlerTracker.class"/> + <include name="org/jboss/test/ws/jaxws/handlerlifecycle/jaxws-server-handlers.xml"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/handlerlifecycle/WEB-INF"> + <include name="jaxws-endpoint-config.xml"/> + </webinf> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-handlerscope.war" webxml="${tests.output.dir}/resources/jaxws/handlerscope/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/handlerscope/SOAPEndpointBean.class"/> + <include name="org/jboss/test/ws/jaxws/handlerscope/SOAPEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/handlerscope/ProtocolHandler.class"/> + <include name="org/jboss/test/ws/jaxws/handlerscope/jaxws-server-handlers.xml"/> + </classes> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-jbws860.war" webxml="${tests.output.dir}/resources/jaxws/jbws860/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws860/*.class"/> + <exclude name="org/jboss/test/ws/jaxws/jbws860/*TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/jbws860/WEB-INF"> + <include name="jboss-web.xml"/> + </webinf> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-jbws871-rpc.war" webxml="${tests.output.dir}/resources/jaxws/jbws871/WEB-INF-rpc/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpointImpl.class"/> + </classes> + </war> + <jar destfile="${tests.output.dir}/libs/jaxws-jbws871-rpc-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws871/IntegerArray.class"/> + <include name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpointService.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/jbws871/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <jar jarfile="${tests.output.dir}/libs/jaxws-jbws944.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.class"/> + <include name="org/jboss/test/ws/jaxws/jbws944/EJB3RemoteInterface.class"/> + <include name="org/jboss/test/ws/jaxws/jbws944/EJB3RemoteHome.class"/> + </fileset> + </jar> + +  + <jar destfile="${tests.output.dir}/libs/jaxws-jbws981.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws981/EJB3Bean.class"/> + <include name="org/jboss/test/ws/jaxws/jbws981/EJB3RemoteInterface.class"/> + <include name="org/jboss/test/ws/jaxws/jbws981/EndpointInterface.class"/> + </fileset> + </jar> + +  + <war destfile="${tests.output.dir}/libs/jaxws-jbws1178.war" webxml="${tests.output.dir}/resources/jaxws/jbws1178/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1178/TestEndpoint.class"/> + </classes> + </war> + +  + <war destfile="${tests.output.dir}/libs/jaxws-jbws1190.war" webxml="${tests.output.dir}/resources/jaxws/jbws1190/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl*.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.class"/> + </classes> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-jbws1357.war" webxml="${tests.output.dir}/resources/jaxws/jbws1357/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1357/JBWS1357.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1357/JBWS1357Impl.class"/> + </classes> + <fileset dir="${tests.output.dir}/resources/jaxws/jbws1357"> + <include name="hello.jsp"/> + </fileset> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-jbws1529.war" webxml="${tests.output.dir}/resources/jaxws/jbws1529/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1529/UserException.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1529/JBWS1529.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1529/JBWS1529Impl.class"/> + </classes> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-jbws1581.war" webxml="${tests.output.dir}/resources/jaxws/jbws1581/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointBean.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/jbws1581/WEB-INF"> + <include name="jboss-web.xml"/> + </webinf> + </war> + <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1581.ear"> + <fileset dir="${tests.output.dir}/libs"> + <include name="jaxws-jbws1581.war"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/jbws1581/META-INF"> + <include name="application.xml"/> + <include name="jboss-app.xml"/> + </metainf> + </jar> + <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1581.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1581/EJB3Bean.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1581/EJB3Remote.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/jbws1581/META-INF"> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxws-metadata.war" webxml="${tests.output.dir}/resources/jaxws/metadata/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/metadata/*.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/metadata/WEB-INF"> + <include name="jboss-web.xml"/> + <include name="wsdl/*"/> + </webinf> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-serviceref.war" webxml="${tests.output.dir}/resources/jaxws/serviceref/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/serviceref/TestEndpointImpl.class"/> + </classes> + </war> + <jar destfile="${tests.output.dir}/libs/jaxws-serviceref-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/serviceref/ApplicationClient.class"/> + <include name="org/jboss/test/ws/jaxws/serviceref/TestEndpointService.class"/> + <include name="org/jboss/test/ws/jaxws/serviceref/TestEndpoint.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/serviceref/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + <war destfile="${tests.output.dir}/libs/jaxws-serviceref-servlet-client.war" webxml="${tests.output.dir}/resources/jaxws/serviceref/servlet-client/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/serviceref/ServletClient.class"/> + <include name="org/jboss/test/ws/jaxws/serviceref/TestEndpointService.class"/> + <include name="org/jboss/test/ws/jaxws/serviceref/TestEndpoint.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/serviceref/META-INF"> + <include name="wsdl/**"/> + </webinf> + <webinf dir="${tests.output.dir}/resources/jaxws/serviceref/servlet-client/WEB-INF"> + <include name="jboss-web.xml"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxws-serviceref-ejb-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/serviceref/EJBClient.class"/> + <include name="org/jboss/test/ws/jaxws/serviceref/EJBRemote.class"/> + <include name="org/jboss/test/ws/jaxws/serviceref/TestEndpointService.class"/> + <include name="org/jboss/test/ws/jaxws/serviceref/TestEndpoint.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/serviceref/META-INF"> + <include name="ejb-jar.xml"/> + <include name="jboss.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxws-wrapped-accessor.war" webxml="${tests.output.dir}/resources/jaxws/wrapped/accessor/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/wrapped/accessor/Accessor.class"/> + <include name="org/jboss/test/ws/jaxws/wrapped/accessor/AccessorImpl.class"/> + <include name="org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/*"/> + </classes> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-holder.war" webxml="${tests.output.dir}/resources/jaxws/holder/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/holder/HolderServiceImpl.class"/> + </classes> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-wsdd.war" + webxml="${tests.output.dir}/resources/jaxws/wsdd/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/wsdd/*.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/wsdd/WEB-INF"> + <include name="webservices.xml"/> + </webinf> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-wsaddressing-action-rpc.war" webxml="${tests.output.dir}/resources/jaxws/wsaddressing/action/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/wsaddressing/action/ActionRpcEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxws/wsaddressing/action/ActionEndpoint.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/wsaddressing/action/META-INF"> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxws-wsaddressing-action-rpc-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/wsaddressing/action/ActionEndpoint.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/wsaddressing/action/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="jbossws-client-config.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxws-wsaddressing-initial.war" webxml="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/Initial-WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_RequestStruct.class"/> + <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_ResponseStruct.class"/> + </classes> + </war> + <jar destfile="${tests.output.dir}/libs/jaxws-wsaddressing-initial-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_RequestStruct.class"/> + <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_ResponseStruct.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/Initial-META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="jaxws-jbossws-client-config.xml"/> + <include name="jaxrpc-mapping.xml"/> + </metainf> + </jar> + <war warfile="${tests.output.dir}/libs/jaxws-wsaddressing-replyto.war" webxml="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/ReplyTo-WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_RequestStruct.class"/> + <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_ResponseStruct.class"/> + </classes> + </war> + <jar destfile="${tests.output.dir}/libs/jaxws-wsaddressing-replyto-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_RequestStruct.class"/> + <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_ResponseStruct.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="jbossws-client-config.xml"/> + <include name="jaxrpc-mapping.xml"/> + </metainf> + </jar> + <war warfile="${tests.output.dir}/libs/jaxws-wsaddressing-faultto.war" webxml="${tests.output.dir}/resources/jaxws/wsaddressing/replyto/FaultTo-WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultType.class"/> + <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpoint.class"/> + </classes> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-wseventing.war" webxml="${tests.output.dir}/resources/jaxws/wseventing/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/ws/eventing/*.class"/> + <include name="org/jboss/test/ws/jaxws/wseventing/*.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/wseventing/WEB-INF"> + <include name="wsdl/**"/> + </webinf> + </war> + +  + + </target> + +</project> Copied: branches/tdiesler/trunk/jbossws/ant-import-tests/build-samples-jaxrpc.xml (from rev 3086, branches/tdiesler/trunk/jbossws/ant-import/build-samples-jaxrpc.xml) =================================================================== --- branches/tdiesler/trunk/jbossws/ant-import-tests/build-samples-jaxrpc.xml (rev 0) +++ branches/tdiesler/trunk/jbossws/ant-import-tests/build-samples-jaxrpc.xml 2007-05-13 18:06:04 UTC (rev 3087) @@ -0,0 +1,635 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + +<project> + +  +  +  + + <target name="build-samples-jaxrpc" description="Build the jaxrpc samples deployments"> + + <mkdir dir="${tests.output.dir}/libs"/> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-samples-docstyle-bare.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialEndpointJSE.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialService.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrder.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrderResponse.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="webservices.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-docstyle-bare-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialService.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrder.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrderResponse.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/docstyle/bare/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-samples-docstyle-wrapped.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialEndpointJSE.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*RequestStruct.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*ResponseStruct.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="webservices.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-docstyle-wrapped-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*RequestStruct.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*ResponseStruct.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/docstyle/wrapped/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-samples-dynamichandler.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Service.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*ServiceBean.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Handler.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="webservices.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-dynamichandler-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Service.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Handler.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/dynamichandler/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + </jar> + +  + <war destfile="${tests.output.dir}/libs/jaxrpc-samples-exception.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/exception/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/exception/*Exception.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/exception/ServerHandler.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/exception/ExceptionServiceInterface.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/exception/ExceptionBeanImpl.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/exception/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="webservices.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-exception-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/exception/*Exception.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/exception/ExceptionServiceInterface.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/exception/ExceptionService.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/exception/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/exception/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-samples-handler.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/handler/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/handler/*Service.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/handler/*ServiceBean.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/handler/ServerSideHandler.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/handler/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="webservices.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-handler-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/handler/*Service.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/handler/ClientSideHandler.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/handler/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/handler/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-samples-holder.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/holder/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/holder/*Service.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/holder/*ServiceBean.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/holder/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="webservices.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-holder-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/holder/*Service.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/holder/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/holder/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + </jar> + +  + <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jmstransport.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/jmstransport/Organization.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jmstransport/META-INF"> + <include name="ejb-jar.xml"/> + <include name="jboss.xml"/> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jmstransport.sar"> + <fileset dir="${tests.output.dir}/libs"> + <include name="jaxrpc-samples-jmstransport.jar"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jmstransport/META-INF"> + <include name="jboss-service.xml"/> + </metainf> + </jar> + +  + <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109ejb-rpc.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*EJBEndpoint.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF"> + <include name="ejb-jar.xml"/> + <include name="jboss.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="webservices.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109ejb-rpc-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109ejb-doc.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Struct.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*EJBEndpoint.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF"> + <include name="ejb-jar.xml"/> + <include name="jboss.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="webservices.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109ejb-doc-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Struct.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109pojo-rpc.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*JSEEndpoint.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="webservices.xml"/> + <include name="jboss-web.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109pojo-rpc-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109pojo-doc.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Struct.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*JSEEndpoint.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="webservices.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109pojo-doc-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Struct.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-samples-message.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/message/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/message/*Service.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/message/*ServiceBean.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/message/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="webservices.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-message-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/message/*Service.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/message/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/message/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-samples-mtom.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/mtom/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/mtom/**"/> + <exclude name="org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/mtom/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="webservices.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-mtom-client.jar"> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/mtom/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/mtom/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-samples-oneway.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/oneway/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/oneway/*Service.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/oneway/*ServiceBean.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/oneway/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="webservices.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-oneway-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/oneway/*Service.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/oneway/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/oneway/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-samples-rpcstyle.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialEndpointJSE.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialService.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="webservices.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-rpcstyle-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialService.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/rpcstyle/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-secureejb.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationService.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationHome.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationRemote.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationImpl.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/secureejb/META-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="webservices.xml"/> + <include name="ejb-jar.xml"/> + <include name="jboss.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-secureejb-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationService.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationHome.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationRemote.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/secureejb/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-samples-swa.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/swa/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/swa/AttachmentImpl.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/swa/Attachment.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/swa/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="webservices.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-swa-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/swa/Attachment.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/swa/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/swa/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <replace file="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/jboss-wsse-server.xml" token="${buildpath}" value="${tests.output.dir}"/> + <war warfile="${tests.output.dir}/libs/jaxrpc-samples-store-pass-encrypt.war" + webxml="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/HelloJavaBean.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/PasswordUtil.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="webservices.xml"/> + <include name="wsdl/**"/> + </webinf> + <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt"> + <include name="jboss-wsse-server.xml"/> + </webinf> + <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity"> + <include name="wsse.keystore"/> + <include name="wsse.truststore"/> + </webinf> + </war> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-store-pass-encrypt-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="jboss-wsse-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF"> + <include name="wsdl/**"/> + <include name="jaxrpc-mapping.xml"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/HelloWorldService.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter_Impl.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wsbpel/hello/WEB-INF"> + <include name="webservices.xml"/> + <include name="classes/bpel-application.xml"/> + </webinf> + <webinf dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/HelloWorldService.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wsbpel/hello/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-samples-wssecurity-sign.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/HelloJavaBean.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="webservices.xml"/> + <include name="wsdl/**"/> + </webinf> + <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/simple-sign"> + <include name="jboss-wsse-server.xml"/> + </webinf> + <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity"> + <include name="wsse.keystore"/> + <include name="wsse.truststore"/> + </webinf> + </war> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-wssecurity-sign-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/simple-sign/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="jboss-wsse-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxrpc-samples-wssecurity-encrypt.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/HelloJavaBean.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/simple-encrypt"> + <include name="jboss-wsse-server.xml"/> + </webinf> + <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity"> + <include name="wsse.keystore"/> + <include name="wsse.truststore"/> + </webinf> + </war> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-wssecurity-encrypt-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/simple-encrypt/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="jboss-wsse-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + + </target> + +</project> Copied: branches/tdiesler/trunk/jbossws/ant-import-tests/build-samples-jaxws.xml (from rev 3086, branches/tdiesler/trunk/jbossws/ant-import/build-samples-jaxws.xml) =================================================================== --- branches/tdiesler/trunk/jbossws/ant-import-tests/build-samples-jaxws.xml (rev 0) +++ branches/tdiesler/trunk/jbossws/ant-import-tests/build-samples-jaxws.xml 2007-05-13 18:06:04 UTC (rev 3087) @@ -0,0 +1,472 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + +<project> + +  +  +  + + <target name="build-samples-jaxws" description="Build the jaxws sample deployments."> + + <mkdir dir="${tests.output.dir}/libs"/> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-asynchronous.war" webxml="${tests.output.dir}/resources/jaxws/samples/asynchronous/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpointBean.class"/> + </classes> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-context.war" webxml="${tests.output.dir}/resources/jaxws/samples/context/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/context/EndpointJSE.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/context/WEB-INF"> + <include name="jboss-web.xml"/> + </webinf> + </war> + <jar jarfile="${tests.output.dir}/libs/jaxws-samples-context.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/context/EndpointEJB.class"/> + </fileset> + </jar> + <jar jarfile="${tests.output.dir}/libs/jaxws-samples-context-jboss4x.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/context/EndpointNoInjectEJB.class"/> + </fileset> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-exception.war" webxml="${tests.output.dir}/resources/jaxws/samples/exception/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/exception/UserException.class"/> + </classes> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-handlerchain.war" webxml="${tests.output.dir}/resources/jaxws/samples/handlerchain/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/handlerchain/EndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/handlerchain/Endpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/handlerchain/*Handler.class"/> + <include name="org/jboss/test/ws/jaxws/samples/handlerchain/jaxws-handlers-server.xml"/> + </classes> + </war> + <jar destfile="${tests.output.dir}/libs/jaxws-samples-handlerchain-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/handlerchain/Endpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/handlerchain/*Handler.class"/> + <include name="org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClient.class"/> + <include name="org/jboss/test/ws/jaxws/samples/handlerchain/jaxws-handlers-client.xml"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/handlerchain/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.handlerchain.HandlerChainClient"/> + </manifest> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-httpbinding-jaxb.war" webxml="${tests.output.dir}/resources/jaxws/samples/httpbinding/jaxb/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/httpbinding/ProviderBeanJAXB.class"/> + <include name="org/jboss/test/ws/jaxws/samples/httpbinding/WebServiceEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/httpbinding/UserType.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/httpbinding/shared"> + <include name="wsdl/HttpBinding.wsdl"/> + </webinf> + </war> + <war warfile="${tests.output.dir}/libs/jaxws-samples-httpbinding-payload.war" webxml="${tests.output.dir}/resources/jaxws/samples/httpbinding/payload/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/httpbinding/ProviderBeanPayload.class"/> + <include name="org/jboss/test/ws/jaxws/samples/httpbinding/LogicalSourceHandler.class"/> + <include name="org/jboss/test/ws/jaxws/samples/httpbinding/httpbinding-handlers.xml"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/httpbinding/shared"> + <include name="wsdl/HttpBinding.wsdl"/> + </webinf> + </war> + +  + <jar jarfile="${tests.output.dir}/libs/jaxws-samples-jsr181ejb.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3Bean01.class"/> + <include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3RemoteInterface.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/jsr181ejb/META-INF"> + <include name="jboss-wsse-server.xml"/> + <include name="wsse.*"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-jsr181pojo.war" webxml="${tests.output.dir}/resources/jaxws/samples/jsr181pojo/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/JSEBean01.class"/> + </classes> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-jsr181pojo-docwrapped.war" + webxml="${tests.output.dir}/resources/jaxws/samples/jsr181pojo/docwrapped/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/JSEBean01.class"/> + </classes> + </war> + <jar jarfile="${tests.output.dir}/libs/jaxws-samples-jsr181pojo-docwrapped-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/EndpointInterface.class"/> + <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/Concat.class"/> + <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/ConcatResponse.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/jsr181pojo/docwrapped/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-logicalhandler-source.war" + webxml="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF/web-source.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceDocImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceRpcImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalSourceHandler.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/ProtocolHandler.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/Echo.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/EchoResponse.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-source-handlers.xml"/> + </classes> + </war> + <war warfile="${tests.output.dir}/libs/jaxws-samples-logicalhandler-jaxb.war" + webxml="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF/web-jaxb.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXBImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXB.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalJAXBHandler.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/ProtocolHandler.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/Echo.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/EchoResponse.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/ObjectFactory.class"/> + <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/jaxws-server-jaxb-handlers.xml"/> + </classes> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-oneway.war" webxml="${tests.output.dir}/resources/jaxws/samples/oneway/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/oneway/PingEndpointImpl.class"/> + </classes> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-jaxb.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/jaxb/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanJAXB.class"/> + <include name="org/jboss/test/ws/jaxws/samples/provider/WebServiceEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/provider/UserType.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/shared"> + <include name="wsdl/Provider.wsdl"/> + </webinf> + </war> + <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-message.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/message/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanMessage.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/shared"> + <include name="wsdl/Provider.wsdl"/> + </webinf> + </war> + <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-payload.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/payload/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanPayload.class"/> + <include name="org/jboss/test/ws/jaxws/samples/provider/LogicalSourceHandler.class"/> + <include name="org/jboss/test/ws/jaxws/samples/provider/provider-handlers.xml"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/shared"> + <include name="wsdl/Provider.wsdl"/> + </webinf> + </war> + +  + <jar jarfile="${tests.output.dir}/libs/jaxws-samples-retail.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/retail/**/*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/retail/jaxws-handler.xml"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/retail/META-INF"> + <include name="wsdl/*"/> + </metainf> + </jar> + <jar jarfile="${tests.output.dir}/libs/jaxws-samples-retail-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/retail/**/*.class"/> + <exclude name="org/jboss/test/ws/jaxws/samples/retail/**/*Bean.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/retail/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-soapbinding.war" webxml="${tests.output.dir}/resources/jaxws/samples/soapbinding/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocWrapped.class"/> + <include name="org/jboss/test/ws/jaxws/samples/soapbinding/ExampleSEI.class"/> + <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocBareServiceImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocWrappedServiceImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/soapbinding/ExampleServiceImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/soapbinding/SubmitBareRequest.class"/> + <include name="org/jboss/test/ws/jaxws/samples/soapbinding/SubmitBareResponse.class"/> + <include name="org/jboss/test/ws/jaxws/samples/soapbinding/PurchaseOrder.class"/> + <include name="org/jboss/test/ws/jaxws/samples/soapbinding/PurchaseOrderAck.class"/> + </classes> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-webmethod.war" webxml="${tests.output.dir}/resources/jaxws/samples/webmethod/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webmethod/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webmethod/TestEndpointImpl.class"/> + </classes> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-webparam.war" webxml="${tests.output.dir}/resources/jaxws/samples/webparam/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webparam/PingServiceImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webparam/PingDocument.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webparam/SecurityHeader.class"/> + </classes> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-webresult.war" webxml="${tests.output.dir}/resources/jaxws/samples/webresult/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webresult/CustomerServiceImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webresult/CustomerRecord.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webresult/USAddress.class"/> + </classes> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice01-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF01/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean01.class"/> + </classes> + </war> + <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice02-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF02/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean02.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF02"> + <include name="wsdl/**"/> + </webinf> + </war> + <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice03-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF03/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean03.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.class"/> + </classes> + </war> + <jar jarfile="${tests.output.dir}/libs/jaxws-samples-webservice01-ejb3.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean01.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/> + </fileset> + </jar> + <jar jarfile="${tests.output.dir}/libs/jaxws-samples-webservice02-ejb3.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean02.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/webservice/META-INF02"> + <include name="wsdl/**"/> + </metainf> + </jar> + <jar jarfile="${tests.output.dir}/libs/jaxws-samples-webservice03-ejb3.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean03.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.class"/> + </fileset> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-webserviceref.war" webxml="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointImpl.class"/> + </classes> + </war> + <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientOne.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="wsdl/**"/> + </metainf> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientOne"/> + </manifest> + </jar> + <war destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-servlet-client.war" + webxml="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF-client/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/ServletClient.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EchoResponse.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/Echo.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF"> + <include name="wsdl/**"/> + </webinf> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF-client"> + <include name="jboss-web.xml"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-ejb3-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Client.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Remote.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EchoResponse.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/Echo.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF"> + <include name="jboss.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-secure.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointImpl.class"/> + </fileset> + </jar> + <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-secure-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointClient.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointService.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpoint.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF-secure"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.SecureEndpointClient"/> + </manifest> + </jar> + <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-override-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientTwo.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/> + <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF-override"> + <include name="jbossws-client-config.xml"/> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF"> + <include name="wsdl/**"/> + </metainf> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientTwo"/> + </manifest> + </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-wsaddressing.war" webxml="${tests.output.dir}/resources/jaxws/samples/wsaddressing/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/jaxws-handlers.xml"/> + </classes> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-wseventing.war" webxml="${tests.output.dir}/resources/jaxws/samples/wseventing/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/wseventing/*.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/wseventing/WEB-INF"> + <include name="wsdl/jboss-web.xml"/> + <include name="wsdl/sysmon.wsdl"/> + <include name="wsdl/ws-eventing.wsdl"/> + <include name="wsdl/ws-eventing.xsd"/> + <include name="wsdl/ws-addr.xsd"/> + </webinf> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-wssecurity-encrypt.war" webxml="${tests.output.dir}/resources/jaxws/samples/wssecurity/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/wssecurity/Hello.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wssecurity/HelloJavaBean.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wssecurity/UserType.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/wssecurity/simple-encrypt/WEB-INF"> + <include name="jboss-wsse-server.xml"/> + </webinf> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/wssecurity"> + <include name="wsse.keystore"/> + <include name="wsse.truststore"/> + </webinf> + </war> + +  + <war warfile="${tests.output.dir}/libs/jaxws-samples-wssecurity-sign.war" webxml="${tests.output.dir}/resources/jaxws/samples/wssecurity/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/wssecurity/Hello.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wssecurity/HelloJavaBean.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wssecurity/UserType.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/wssecurity/simple-sign/WEB-INF"> + <include name="jboss-wsse-server.xml"/> + </webinf> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/wssecurity"> + <include name="wsse.keystore"/> + <include name="wsse.truststore"/> + </webinf> + </war> + +  + <war jarfile="${tests.output.dir}/libs/jaxws-samples-xop-doclit.war" webxml="${tests.output.dir}/resources/jaxws/samples/xop/doclit/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/xop/doclit/*.class"/> + <exclude name="org/jboss/test/ws/jaxws/samples/xop/doclit/*TestCase.class"/> + </classes> + </war> + +  + + </target> + +</project> \ No newline at end of file Copied: branches/tdiesler/trunk/jbossws/ant-import-tests/build-testsuite-artifacts.xml (from rev 3086, branches/tdiesler/trunk/jbossws/ant-import/build-testsuite-artifacts.xml) =================================================================== --- branches/tdiesler/trunk/jbossws/ant-import-tests/build-testsuite-artifacts.xml (rev 0) +++ branches/tdiesler/trunk/jbossws/ant-import-tests/build-testsuite-artifacts.xml 2007-05-13 18:06:04 UTC (rev 3087) @@ -0,0 +1,214 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + +<project name="JBossWS-Tools" default="build-tools-artifacts" basedir="../.."> + + <description>JBossWS testsuite artifacts builder</description> + + <import file="build.xml"/> + <path id="tools.classpath"> + <path refid="jbossws.client.classpath"/> + <pathelement location="${jboss.testsuite}/output/classes"/> + </path> + +  + <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools" + classpathref="tools.classpath"/> + + <target name="build-tools-artifacts" description="Build the deployments."> +  + <echo>Working on jbws64-config.xml</echo> + <wstools dest="${build.test.resources.dir}/testsuite/jbws64/WEB-INF" + config="${test.resources.dir}/tools/testsuite-configs/jbws64-config.xml"/> + + <echo>Working on jbws68-config.xml</echo> + <wstools dest="${build.test.resources.dir}/testsuite/jbws68/WEB-INF" + config="${test.resources.dir}/tools/testsuite-configs/jbws68-config.xml"/> + + <echo>Working on jbws70-config.xml</echo> + <wstools dest="${build.test.resources.dir}/testsuite/jbws70/WEB-INF" + config="${test.resources.dir}/tools/testsuite-configs/jbws70-config.xml"/> + + <echo>Working on jbws71-config.xml</echo> + <wstools dest="${build.test.resources.dir}/testsuite/jbws71/WEB-INF" + config="${test.resources.dir}/tools/testsuite-configs/jbws71-config.xml"/> + + <echo>Working on jbws82-config.xml</echo> + <wstools dest="${build.test.resources.dir}/testsuite/jbws82/WEB-INF" + config="${test.resources.dir}/tools/testsuite-configs/jbws82-config.xml"/> + + <echo>Working on jbws124-config.xml</echo> + <wstools dest="${build.test.resources.dir}/testsuite/jbws124/WEB-INF" + config="${test.resources.dir}/tools/testsuite-configs/jbws124-config.xml"/> + + <echo>Working on jbws128-config.xml</echo> + <wstools dest="${build.test.resources.dir}/testsuite/jbws128/WEB-INF" + config="${test.resources.dir}/tools/testsuite-configs/jbws128-config.xml"/> + + <echo>Working on jbws163-config.xml</echo> + <wstools dest="${build.test.resources.dir}/testsuite/jbws163/WEB-INF" + config="${test.resources.dir}/tools/testsuite-configs/jbws163-config.xml"/> + <echo>Working on jbws165-config.xml</echo> + <wstools dest="${build.test.resources.dir}/testsuite/jbws165/META-INF-both" + config="${test.resources.dir}/tools/testsuite-configs/jbws165-config.xml"/> + + <echo>Working on jbws167-config.xml</echo> + <wstools dest="${build.test.resources.dir}/testsuite/jbws167/WEB-INF" + config="${test.resources.dir}/tools/testsuite-configs/jbws167-config.xml"/> + + <echo>Working on jbws251-config.xml</echo> + <wstools dest="${build.test.resources.dir}/testsuite/jbws251/WEB-INF" + config="${test.resources.dir}/tools/testsuite-configs/jbws251-config.xml"/> + + <echo>Working on jbws309-config.xml</echo> + <wstools dest="${build.test.resources.dir}/testsuite/jbws309/META-INF" + config="${test.resources.dir}/tools/testsuite-configs/jbws309-config.xml"/> + + <echo>Working on jbws316-config.xml</echo> + <wstools dest="${build.test.resources.dir}/testsuite/jbws316/WEB-INF" + config="${test.resources.dir}/tools/testsuite-configs/jbws316-config.xml"/> + + <echo>Working on jbws331-config.xml</echo> + <wstools dest="${build.test.resources.dir}/testsuite/jbws331/WS-META-INF" + config="${test.resources.dir}/tools/testsuite-configs/jbws331-config.xml"/> + + <echo>Working on jbws358-config.xml</echo> + <wstools dest="${build.test.resources.dir}/testsuite/jbws358/META-INF" + config="${test.resources.dir}/tools/testsuite-configs/jbws358-config.xml"/> + + <echo>Working on jbws377-config.xml</echo> + <wstools dest="${build.test.resources.dir}/testsuite/jbws377/WEB-INF" + config="${test.resources.dir}/tools/testsuite-configs/jbws377-config.xml"/> + + <echo>Working on jbws383-config.xml</echo> + <wstools dest="${build.test.resources.dir}/testsuite/jbws383/WEB-INF" + config="${test.resources.dir}/tools/testsuite-configs/jbws383-config.xml"/> + + <echo>Working on jbws423-config.xml</echo> + <wstools dest="${build.test.resources.dir}/testsuite/jbws423/WEB-INF" + config="${test.resources.dir}/tools/testsuite-configs/jbws423-config.xml"/> + + <echo>Working on jbws424-config.xml</echo> + <wstools dest="${build.test.resources.dir}/testsuite/jbws424/WEB-INF" + config="${test.resources.dir}/tools/testsuite-configs/jbws424-config.xml"/> + + <echo>Working on jbws425-config.xml</echo> + <wstools dest="${build.test.resources.dir}/testsuite/jbws425/WEB-INF" + config="${test.resources.dir}/tools/testsuite-configs/jbws425-config.xml"/> + + <echo>Working on jbws456-config.xml</echo> + <wstools dest="${build.test.resources.dir}/testsuite/jbws456/WEB-INF" + config="${test.resources.dir}/tools/testsuite-configs/jbws456-config.xml"/> + + <echo>Working on jbws463-config.xml</echo> + <wstools dest="${build.test.resources.dir}/testsuite/jbws463/WEB-INF" + config="${test.resources.dir}/tools/testsuite-configs/jbws463-config.xml"/> + + <echo>Working on jbws464-config.xml</echo> + <wstools dest="${build.test.resources.dir}/testsuite/jbws464/WEB-INF" + config="${test.resources.dir}/tools/testsuite-configs/jbws464-config.xml"/> + + <echo>Working on addressrewrite</echo> + <wstools dest="${build.test.resources.dir}/testsuite/addressrewrite/WEB-INF" + config="${test.resources.dir}/tools/testsuite-configs/addressrewrite-config.xml"/> + + <echo>Working on admindevel</echo> + <wstools dest="${build.test.resources.dir}/testsuite/admindevel/META-INF" + config="${test.resources.dir}/tools/testsuite-configs/admindevel-config.xml"/> + + + <echo>Working on encstyle/document</echo> + <wstools dest="${build.test.resources.dir}/testsuite/encstyle/document/WEB-INF" + config="${test.resources.dir}/tools/testsuite-configs/encstyle-document-config.xml"/> + + <echo>Working on encstyle/rpc</echo> + <wstools dest="${build.test.resources.dir}/testsuite/encstyle/rpc/WEB-INF" + config="${test.resources.dir}/tools/testsuite-configs/encstyle-rpc-config.xml"/> + + + <echo>Working on exception</echo> + <wstools dest="${build.test.resources.dir}/testsuite/exception/META-INF" + config="${test.resources.dir}/tools/testsuite-configs/exception-config.xml"/> + + <echo>Working on handlerflow</echo> + <wstools dest="${build.test.resources.dir}/testsuite/handlerflow/WEB-INF" + config="${test.resources.dir}/tools/testsuite-configs/handlerflow-config.xml"/> + + <echo>Working on marshalltest-doclit</echo> + <wstools dest="${build.test.resources.dir}/testsuite/marshalltest-doclit/META-INF" + config="${test.resources.dir}/tools/testsuite-configs/marshalltest-doclit-config.xml"/> + + <echo>Working on marshalltest-rpclit</echo> + <wstools dest="${build.test.resources.dir}/testsuite/marshalltest-rpclit/META-INF" + config="${test.resources.dir}/tools/testsuite-configs/marshalltest-rpclit-config.xml"/> + + <echo>Working on message</echo> + <wstools dest="${build.test.resources.dir}/testsuite/message/WEB-INF" + config="${test.resources.dir}/tools/testsuite-configs/message-config.xml"/> + + <echo>Working on samples/common</echo> + <wstools dest="${build.test.resources.dir}/testsuite/samples/common/META-INF" + config="${test.resources.dir}/tools/testsuite-configs/samples-common-config.xml"/> + + <echo>Working on samples2/rpclit</echo> + <wstools dest="${build.test.resources.dir}/testsuite/samples2/rpclit" + config="${test.resources.dir}/tools/testsuite-configs/samples2-rpclit-config.xml"/> + + <echo>Working on samples2/doclit</echo> + <wstools dest="${build.test.resources.dir}/testsuite/samples2/doclit" + config="${test.resources.dir}/tools/testsuite-configs/samples2-doclit-config.xml"/> + + <echo>Working on samples2/doclit-bare</echo> + <wstools dest="${build.test.resources.dir}/testsuite/samples2/doclit-bare" + config="${test.resources.dir}/tools/testsuite-configs/samples2-doclit-bare-config.xml"/> + + <echo>Working on utf16</echo> + <wstools dest="${build.test.resources.dir}/testsuite/utf16/WEB-INF" + config="${test.resources.dir}/tools/testsuite-configs/utf16-config.xml"/> + + <echo>Working on ws4eesimple</echo> + <wstools dest="${build.test.resources.dir}/testsuite/ws4eesimple/WEB-INF" + config="${test.resources.dir}/tools/testsuite-configs/ws4eesimple-config.xml"/> + + <echo/> + <echo>WSDL->Java</echo> + <echo>----------</echo> + <echo>Working on ws4eesimple-client</echo> + <wstools dest="${build.test.resources.dir}/testsuite/ws4eesimple-client" + config="${test.resources.dir}/tools/testsuite-configs/ws4eesimple-client-config.xml"/> + + + <echo>Working on jbws-349</echo> + <wstools dest="${build.test.resources.dir}/testsuite/jbws349" + config="${test.resources.dir}/tools/testsuite-configs/jbws349-config.xml"/> + + + <echo>Working on jbws381</echo> + <wstools dest="${build.test.resources.dir}/testsuite/jbws381" + config="${test.resources.dir}/tools/testsuite-configs/jbws381-config.xml"/> + + <echo>Working on jbws484</echo> + <wstools dest="${build.test.resources.dir}/testsuite/jbws484" + config="${test.resources.dir}/tools/testsuite-configs/jbws484-config.xml"/> + + <echo>Working on jbws153</echo> + <wstools dest="${build.test.resources.dir}/testsuite/jbws153" + config="${test.resources.dir}/tools/testsuite-configs/jbws153-config.xml"/> + + <echo>Working on samples/client-appl</echo> + <wstools dest="${build.test.resources.dir}/testsuite/samples/client-appl" + config="${test.resources.dir}/tools/testsuite-configs/samples-client-config.xml"/> + </target> +</project> Copied: branches/tdiesler/trunk/jbossws/ant-import-tests/build-testsuite.xml (from rev 3086, branches/tdiesler/trunk/jbossws/ant-import/build-testsuite.xml) =================================================================== --- branches/tdiesler/trunk/jbossws/ant-import-tests/build-testsuite.xml (rev 0) +++ branches/tdiesler/trunk/jbossws/ant-import-tests/build-testsuite.xml 2007-05-13 18:06:04 UTC (rev 3087) @@ -0,0 +1,248 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + +<project> + + <property name="tests.dir" value="${core.dir}/src/test"/> + + <import file="${build.dir}/ant-import/build-testsuite.xml"/> + +  + <property name="integration.target.${jbossws.integration.target}" value="true"/> + +  + <property name="excludes-short-name" value="tests-${jbossws.integration.target}-excludes.txt"/> + <property name="excludesfile" value="${tests.resources.dir}/${excludes-short-name}"/> + +  + <target name="tests-init" depends="tests-prepare,thirdparty-classpath"> + + <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"/> + <pathelement location="${core.dir}/../jbws-${jbossws.integration.target}/output/lib/jbossws-${jbossws.integration.target}.jar"/> + </path> + +  + <path id="javac.classpath"> + <path refid="jbossws.classpath"/> + <path refid="thirdparty.classpath"/> + <pathelement location="${thirdparty.dir}/jboss-vfs.jar"/> + <pathelement location="${thirdparty.dir}/junit.jar"/> + <pathelement location="${thirdparty.dir}/qdox.jar"/> + <pathelement location="${thirdparty.dir}/policy.jar"/> + <pathelement location="${thirdparty.dir}/xmlunit1.0.jar"/> + <pathelement location="${jboss.home}/client/jboss-ejb3-client.jar"/> + </path> + +  + <path id="tests.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.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> + +  + <path id="jbpm.bpel.classpath"> + <path refid="jbossws.classpath"/> + <pathelement location="${thirdparty.dir}/jbpm-bpel"/>  + <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"/> +  + </path> + + </target> + +  +  +  + + <target name="wsconsume" depends="tests-init" description="Consume JAX-WS contracts"> + +  + <taskdef name="wsconsume" classname="org.jboss.ws.tools.jaxws.ant.wsconsume"> + <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> + +  + <target name="servicegen" depends="tests-compile" description="Generate the BPEL resources."> +  + <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 file="${thirdparty.dir}/jbpm-bpel.sar" todir="${tests.output.dir}/libs"/> + +  + <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> + +  + <target name="wstools" depends="tests-compile" description="Generate the JAX-RPC artifacts."> + +  + <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools"> + <classpath refid="jbossws.classpath"/> + <classpath refid="thirdparty.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> + +  + <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 todir="${tests.output.dir}/resources"> + <fileset dir="${tests.output.dir}/wstools/resources"> + <include name="**/*.wsdl"/> + <include name="**/*.xml"/> + </fileset> + </copy> +  + <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> + +  + <target name="wsprovide" depends="tests-compile" description="Provide the JAX-WS contracts."> + +  + <taskdef name="wsprovide" classname="org.jboss.ws.tools.jaxws.ant.wsprovide"> + <classpath refid="jbossws.classpath"/> + <classpath refid="thirdparty.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="tests-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> + +  +  +  + + <target name="tests-compile" depends="wsconsume" description="Compile sources"> + <mkdir dir="${tests.output.dir}/classes"/> + <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" + failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}"> + <src path="${tests.java.dir}"/> + <src path="${tests.output.dir}/wsconsume/java"/> + <classpath refid="javac.classpath"/> + </javac> + </target> + +  +  +  + +  + <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> + <copy-test-resources srcdir="${tests.dir}"/> + </target> + + <target name="tests-jars" depends="wsconsume,tests-compile,tests-copy-resources,tests-generate-resources" description="Build the deployments."> + <ant antfile="${core.dir}/ant-import-tests/build-jars-jaxrpc.xml" target="build-jars-jaxrpc"/> + <ant antfile="${core.dir}/ant-import-tests/build-samples-jaxrpc.xml" target="build-samples-jaxrpc"/> + <ant antfile="${core.dir}/ant-import-tests/build-jars-jaxws.xml" target="build-jars-jaxws"/> + <ant antfile="${core.dir}/ant-import-tests/build-samples-jaxws.xml" target="build-samples-jaxws"/> + </target> + + <target name="tests-main" depends="tests-jars" description="Build the deployments."/> + +</project> Modified: branches/tdiesler/trunk/jbossws/build.xml =================================================================== --- branches/tdiesler/trunk/jbossws/build.xml 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/jbossws/build.xml 2007-05-13 18:06:04 UTC (rev 3087) @@ -11,14 +11,13 @@  -<project default="main" basedir="../jbossws-core"> +<project default="main" basedir=".."> - <import file="${basedir}/../build/ant-import/build-setup.xml"/> + <import file="${basedir}/build/ant-import/build-setup.xml"/> - <import file="${spi.dir}/build.xml"/> <import file="${core.dir}/ant-import/build-deploy.xml"/> <import file="${core.dir}/ant-import/build-thirdparty.xml"/> - <import file="${core.dir}/ant-import/build-testsuite.xml"/> + <import file="${core.dir}/ant-import-tests/build-testsuite.xml"/> <property name="core.src.dir" value="${core.dir}/src/main"/> <property name="core.etc.dir" value="${core.src.dir}/etc"/> @@ -32,7 +31,8 @@ <property name="core.output.classes14.dir" value="${core.output.dir}/classes14"/> <property name="core.output.lib.dir" value="${core.output.dir}/lib"/> - <target name="core-init" depends="prepare,core-thirdparty"> + <target name="init" depends="prepare,thirdparty-get"> + <ant antfile="${spi.dir}/build.xml" target="main" inheritall="false"/> </target>  @@ -47,11 +47,11 @@ | documentation compiles. --> - <target name="core-compile" depends="core-init,spi-compile,core-compile-classes,core-compile-etc" + <target name="compile" depends="init,compile-classes,compile-etc" description="Compile all source files."/>  - <target name="core-compile-classes" depends="core-init"> + <target name="compile-classes" depends="init">  <mkdir dir="${core.output.classes14.dir}"/> @@ -59,7 +59,7 @@ failonerror="${javac.fail.onerror}" source="1.4" target="1.4"> <include name="javax/xml/rpc/**"/> <include name="javax/xml/soap/**"/> - <classpath refid="core.thirdparty.classpath"/> + <classpath refid="thirdparty.classpath"/> </javac>  @@ -72,12 +72,12 @@ <include name="org/jboss/annotation/**"/> <include name="org/jboss/ws/**"/> <classpath path="${core.output.classes14.dir}"/> - <classpath refid="core.thirdparty.classpath"/> + <classpath refid="thirdparty.classpath"/> </javac> </target>  - <target name="core-compile-etc" depends="core-init"> + <target name="compile-etc" depends="init"> <mkdir dir="${core.output.etc.dir}"/> <copy todir="${core.output.etc.dir}" filtering="yes" overwrite="yes"> <fileset dir="${core.etc.dir}"/> @@ -101,13 +101,13 @@  - <target name="core-jars" depends="core-compile,spi-jars,core-module-jars" description="Builds all jar files."> + <target name="jars" depends="compile,module-jars" description="Builds all jar files."> </target>  - <target name="core-module-jars"> + <target name="module-jars">  <mkdir dir="${core.output.lib.dir}"/> @@ -184,8 +184,8 @@ </zipfileset> </zip> -  - <zip zipfile="${core.output.lib.dir}/jbossws-core-src.zip" > +  + <zip zipfile="${core.output.lib.dir}/jbossws-src.zip" > <fileset dir="${core.java.dir}"/> </zip> @@ -196,7 +196,7 @@   - <target name="core-javadoc" depends="core-init" description="Generate the Javadoc"> + <target name="javadoc" depends="init" description="Generate the Javadoc"> <mkdir dir="${core.output.apidocs.dir}"/> <javadoc destdir="${core.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API"> @@ -225,9 +225,9 @@ <target name="main" description="Executes the default target (most)." depends="most"/> - <target name="most" description="Builds almost everything." depends="core-jars,tests-main"/> + <target name="most" description="Builds almost everything." depends="jars"/> - <target name="all" description="Create a distribution zip file" depends="main"> + <target name="all" description="Create a distribution zip file" depends="most,tests-jars"> </target> </project> Modified: branches/tdiesler/trunk/testsuite/.project =================================================================== --- branches/tdiesler/trunk/testsuite/.project 2007-05-13 15:42:19 UTC (rev 3086) +++ branches/tdiesler/trunk/testsuite/.project 2007-05-13 18:06:04 UTC (rev 3087) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>jbossws-tests</name> + <name>testsuite</name> <comment></comment> <projects> </projects>

17 years, 1 month

1
0
0 / 0

JBossWS SVN: r3086 - branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-13 11:42:19 -0400 (Sun, 13 May 2007) New Revision: 3086 Modified: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ Log: restructure Property changes on: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50 ___________________________________________________________________ Name: svn:externals - common https://svn.jboss.org/repos/jbossws/trunk/sunri-jboss50/src/main/java/org...

17 years, 1 month

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits May 2007