Author: thomas.diesler(a)jboss.com Date: 2007-05-18 05:01:49 -0400 (Fri, 18 May 2007) New Revision: 3131 Added: branches/tdiesler/trunk/integration/jbws/ant-import/build-release.xml branches/tdiesler/trunk/integration/jbws/src/main/resources/jbossws-jboss50.deployer/ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/ branches/tdiesler/trunk/integration/sunri/src/main/resources/jbossws-jboss50.deployer/ branches/tdiesler/trunk/integration/sunri/src/main/resources/jbossws-jboss50.sar/ branches/tdiesler/trunk/integration/sunri/src/test/resources/excludes-jboss50.txt Removed: branches/tdiesler/trunk/integration/jbws/ant-import/build-deploy-jboss42.xml branches/tdiesler/trunk/integration/jbws/ant-import/build-deploy-jboss50.xml branches/tdiesler/trunk/integration/jbws/ant-import/build-release-jboss42.xml branches/tdiesler/trunk/integration/jbws/ant-import/build-release-jboss50.xml branches/tdiesler/trunk/integration/jbws/src/main/resources/jbossws.deployer/ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/ branches/tdiesler/trunk/integration/sunri/src/main/resources/jbossws.deployer/ branches/tdiesler/trunk/integration/sunri/src/main/resources/jbossws.sar/ branches/tdiesler/trunk/integration/sunri/src/test/resources/excludes.txt Modified: branches/tdiesler/trunk/integration/jboss42/.classpath branches/tdiesler/trunk/integration/jboss42/.project branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/AbstractDeployerHook.java branches/tdiesler/trunk/integration/jboss50/.classpath branches/tdiesler/trunk/integration/jboss50/.project branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployerHook.java branches/tdiesler/trunk/integration/jbws/.classpath branches/tdiesler/trunk/integration/jbws/.project branches/tdiesler/trunk/integration/jbws/ant-import/build-deploy.xml branches/tdiesler/trunk/integration/jbws/build.xml branches/tdiesler/trunk/integration/spi/.project branches/tdiesler/trunk/integration/sunri/.classpath branches/tdiesler/trunk/integration/sunri/.project branches/tdiesler/trunk/integration/sunri/ant-import/build-deploy.xml branches/tdiesler/trunk/integration/sunri/ant-import/build-testsuite.xml branches/tdiesler/trunk/integration/sunri/ant-import/build-thirdparty.xml branches/tdiesler/trunk/integration/sunri/build.xml branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/EndpointNameDeployer.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/LifecycleHandlerImpl.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/ManagedEndpointRegistry.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/ManagedEndpointRegistryMBean.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/ModifyWebMetaDataDeployer.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/RequestHandlerImpl.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/ServletResourceLoader.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/SunJaxwsDeployer.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/VirtualFileResourceLoader.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/WSEndpointServlet.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/WSServletContextListener.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/metadata/sunjaxws/DDEndpoint.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/metadata/sunjaxws/DDEndpoints.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/metadata/sunjaxws/DDHandler.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/metadata/sunjaxws/DDHandlerChain.java branches/tdiesler/trunk/integration/sunri/src/main/resources/jbossws-jboss50.sar/META-INF/jbossws-beans.xml branches/tdiesler/trunk/jbossws-core/.classpath branches/tdiesler/trunk/jbossws-core/.project branches/tdiesler/trunk/testsuite/.classpath branches/tdiesler/trunk/testsuite/ant-import/build-jars-jaxws.xml branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/EarTestCase.java Log: Modified: branches/tdiesler/trunk/integration/jboss42/.classpath =================================================================== --- branches/tdiesler/trunk/integration/jboss42/.classpath 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/jboss42/.classpath 2007-05-18 09:01:49 UTC (rev 3131) @@ -3,10 +3,10 @@ <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="/spi"/> - <classpathentry kind="lib" path="/spi/thirdparty/jaxrpc-api.jar"/> - <classpathentry kind="lib" path="/spi/thirdparty/jaxws-api.jar"/> - <classpathentry kind="lib" path="/spi/thirdparty/jsr181-api.jar"/> - <classpathentry kind="lib" path="/spi/thirdparty/saaj-api.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/integration-spi"/> + <classpathentry kind="lib" path="/integration-spi/thirdparty/jaxrpc-api.jar"/> + <classpathentry kind="lib" path="/integration-spi/thirdparty/jaxws-api.jar"/> + <classpathentry kind="lib" path="/integration-spi/thirdparty/jsr181-api.jar"/> + <classpathentry kind="lib" path="/integration-spi/thirdparty/saaj-api.jar"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: branches/tdiesler/trunk/integration/jboss42/.project =================================================================== --- branches/tdiesler/trunk/integration/jboss42/.project 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/jboss42/.project 2007-05-18 09:01:49 UTC (rev 3131) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>jboss42</name> + <name>integration-jboss42</name> <comment></comment> <projects> </projects> Modified: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/AbstractDeployerHook.java =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/AbstractDeployerHook.java 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/AbstractDeployerHook.java 2007-05-18 09:01:49 UTC (rev 3131) @@ -89,7 +89,7 @@ } catch (Exception ex) { - throw new WSDeploymentException("Cannot load: " + deploymentClass); + throw new WSDeploymentException("Cannot load Deployment class: " + deploymentClass); } } @@ -103,7 +103,7 @@ } catch (Exception ex) { - throw new WSDeploymentException("Cannot load: " + serviceClass); + throw new WSDeploymentException("Cannot load Service class: " + serviceClass); } } @@ -117,7 +117,7 @@ } catch (Exception ex) { - throw new WSDeploymentException("Cannot load: " + endpointClass); + throw new WSDeploymentException("Cannot load Endpoint class: " + endpointClass); } } Modified: branches/tdiesler/trunk/integration/jboss50/.classpath =================================================================== --- branches/tdiesler/trunk/integration/jboss50/.classpath 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/jboss50/.classpath 2007-05-18 09:01:49 UTC (rev 3131) @@ -2,11 +2,11 @@ <classpath> <classpathentry kind="src" path="src/main/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <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="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/> - <classpathentry kind="lib" path="/spi/thirdparty/jaxrpc-api.jar"/> - <classpathentry kind="lib" path="/spi/thirdparty/saaj-api.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/integration-spi"/> + <classpathentry kind="lib" path="/integration-spi/thirdparty/jaxrpc-api.jar"/> + <classpathentry kind="lib" path="/integration-spi/thirdparty/jaxws-api.jar"/> + <classpathentry kind="lib" path="/integration-spi/thirdparty/jsr181-api.jar"/> + <classpathentry kind="lib" path="/integration-spi/thirdparty/saaj-api.jar"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: branches/tdiesler/trunk/integration/jboss50/.project =================================================================== --- branches/tdiesler/trunk/integration/jboss50/.project 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/jboss50/.project 2007-05-18 09:01:49 UTC (rev 3131) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>jboss50</name> + <name>integration-jboss50</name> <comment></comment> <projects> </projects> Modified: 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/AbstractDeployerHook.java 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployerHook.java 2007-05-18 09:01:49 UTC (rev 3131) @@ -77,7 +77,7 @@ } catch (Exception ex) { - throw new WSDeploymentException("Cannot load: " + deploymentClass); + throw new WSDeploymentException("Cannot load Deployment class: " + deploymentClass); } } @@ -91,7 +91,7 @@ } catch (Exception ex) { - throw new WSDeploymentException("Cannot load: " + serviceClass); + throw new WSDeploymentException("Cannot load Service class: " + serviceClass); } } @@ -105,7 +105,7 @@ } catch (Exception ex) { - throw new WSDeploymentException("Cannot load: " + endpointClass); + throw new WSDeploymentException("Cannot load Endpoint class: " + endpointClass); } } Modified: branches/tdiesler/trunk/integration/jbws/.classpath =================================================================== --- branches/tdiesler/trunk/integration/jbws/.classpath 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/jbws/.classpath 2007-05-18 09:01:49 UTC (rev 3131) @@ -3,8 +3,5 @@ <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> Modified: branches/tdiesler/trunk/integration/jbws/.project =================================================================== --- branches/tdiesler/trunk/integration/jbws/.project 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/jbws/.project 2007-05-18 09:01:49 UTC (rev 3131) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>jbws-jboss50</name> + <name>integration-jbws</name> <comment></comment> <projects> </projects> Deleted: branches/tdiesler/trunk/integration/jbws/ant-import/build-deploy-jboss42.xml =================================================================== --- branches/tdiesler/trunk/integration/jbws/ant-import/build-deploy-jboss42.xml 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/jbws/ant-import/build-deploy-jboss42.xml 2007-05-18 09:01:49 UTC (rev 3131) @@ -1,83 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- ====================================================================== --> -<!-- --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- --> -<!-- ====================================================================== --> - -<!-- $Id$ --> - -<project> - - <!-- ================================================================== --> - <!-- Deployment JBoss42 --> - <!-- ================================================================== --> - - <!-- Deploy jbossws to jboss42 --> - <target name="deploy-jboss42" depends="jars-jbws42,undeploy-jboss42" 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.dir}/thirdparty"> - <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="${jbws.output.lib.dir}/jbossws-jbws42.sar"/> - </target> - - <!-- Remove jbossws from jboss42 --> - <target name="undeploy-jboss42" 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"/> <!-- The old 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> - -</project> Deleted: branches/tdiesler/trunk/integration/jbws/ant-import/build-deploy-jboss50.xml =================================================================== --- branches/tdiesler/trunk/integration/jbws/ant-import/build-deploy-jboss50.xml 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/jbws/ant-import/build-deploy-jboss50.xml 2007-05-18 09:01:49 UTC (rev 3131) @@ -1,88 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- ====================================================================== --> -<!-- --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- --> -<!-- ====================================================================== --> - -<!-- $Id$ --> - -<project> - - <!-- ================================================================== --> - <!-- Deployment JBoss50 --> - <!-- ================================================================== --> - - <!-- Deploy jbossws to jboss50 --> - <target name="deploy-jboss50" depends="jars-jbws50,undeploy-jboss50" description="Deploy jbossws to jboss50"> - - <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.dir}/thirdparty"> - <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.dir}/thirdparty"> - <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="${jbws.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="${jbws.output.lib.dir}/jbossws-jbws50.sar"/> - <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file="${jbws.output.lib.dir}/jbossws-context.war" overwrite="true"/> - </target> - - <!-- Remove jbossws from jboss50 --> - <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws from jboss50"> - - <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> - - <ant antfile="${int.sunri.dir}/build.xml" target="undeploy" inheritall="false"/> - - <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> - -</project> Modified: branches/tdiesler/trunk/integration/jbws/ant-import/build-deploy.xml =================================================================== --- branches/tdiesler/trunk/integration/jbws/ant-import/build-deploy.xml 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/jbws/ant-import/build-deploy.xml 2007-05-18 09:01:49 UTC (rev 3131) @@ -18,7 +18,7 @@ <!-- ================================================================== --> <!-- Deploy jbossws to jboss50 --> - <target name="deploy" depends="jars,undeploy" description="Deploy jbossws"> + <target name="deploy-jboss50" depends="jars-jbws50,undeploy-jboss50" description="Deploy jbossws to jboss50"> <copy todir="${jboss50.home}/client" overwrite="true"> <fileset dir="${core.dir}/output/lib"> @@ -52,18 +52,18 @@ </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}/jbossws-jbws50-deployer.zip"/> + <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="${jbws.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}/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"/> + <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jbws.output.lib.dir}/jbossws-jbws50.sar"/> + <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file="${jbws.output.lib.dir}/jbossws-context.war" overwrite="true"/> </target> <!-- Remove jbossws from jboss50 --> - <target name="undeploy" depends="prepare" description="Remove jbossws"> + <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws from jboss50"> <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> - <ant antfile="${int.sunri50.dir}/build.xml" target="undeploy" inheritall="false"/> + <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> <delete> <fileset dir="${jboss50.home}/client"> @@ -85,4 +85,67 @@ <delete file="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war"/> </target> + <!-- Deploy jbossws to jboss42 --> + <target name="deploy-jboss42" depends="jars-jbws42,undeploy-jboss42" description="Deploy jbossws to jboss42"> + + <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.dir}/thirdparty"> + <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="${jbws.output.lib.dir}/jbossws-jbws42.sar"/> + </target> + + <!-- Remove jbossws from jboss42 --> + <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws from jboss42"> + + <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"/> <!-- The old 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> + </project> Deleted: branches/tdiesler/trunk/integration/jbws/ant-import/build-release-jboss42.xml =================================================================== --- branches/tdiesler/trunk/integration/jbws/ant-import/build-release-jboss42.xml 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/jbws/ant-import/build-release-jboss42.xml 2007-05-18 09:01:49 UTC (rev 3131) @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- ====================================================================== --> -<!-- --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- --> -<!-- ====================================================================== --> - -<!-- $Id$ --> - -<project> - - <!-- Release to jboss.local.repository --> - <target name="release" depends="jars" - description="Release to jboss.local.repository"> - - <!-- jboss/jbossws-jboss42 --> - <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/> - <mkdir dir="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/lib"/> - <copy todir="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/lib" overwrite="true"> - <fileset dir="${jbws.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="${jbws.etc.dir}/component-info.xml" filtering="true" overwrite="true"> - <filterset> - <filtersfile file="${int.jbws42.dir}/version.properties"/> - </filterset> - </copy> - - </target> - -</project> Deleted: branches/tdiesler/trunk/integration/jbws/ant-import/build-release-jboss50.xml =================================================================== --- branches/tdiesler/trunk/integration/jbws/ant-import/build-release-jboss50.xml 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/jbws/ant-import/build-release-jboss50.xml 2007-05-18 09:01:49 UTC (rev 3131) @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- ====================================================================== --> -<!-- --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- --> -<!-- ====================================================================== --> - -<!-- $Id$ --> - -<project> - - <!-- Release to jboss.local.repository --> - <target name="release" depends="jbws50-jars" - description="Release to jboss.local.repository"> - - <!-- jboss/jbossws-jboss50 --> - <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/> - <mkdir dir="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/lib"/> - <copy todir="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/lib" overwrite="true"> - <fileset dir="${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> Copied: branches/tdiesler/trunk/integration/jbws/ant-import/build-release.xml (from rev 3130, branches/tdiesler/trunk/integration/jbws/ant-import/build-release-jboss50.xml) =================================================================== --- branches/tdiesler/trunk/integration/jbws/ant-import/build-release.xml (rev 0) +++ branches/tdiesler/trunk/integration/jbws/ant-import/build-release.xml 2007-05-18 09:01:49 UTC (rev 3131) @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ====================================================================== --> +<!-- --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- --> +<!-- ====================================================================== --> + +<!-- $Id$ --> + +<project> + + <!-- Release to jboss.local.repository --> + <target name="release" depends="jbws50-jars" + description="Release to jboss.local.repository"> + + <!-- jboss/jbossws-jboss50 --> + <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/> + <mkdir dir="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/lib"/> + <copy todir="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/lib" overwrite="true"> + <fileset dir="${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> Modified: branches/tdiesler/trunk/integration/jbws/build.xml =================================================================== --- branches/tdiesler/trunk/integration/jbws/build.xml 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/jbws/build.xml 2007-05-18 09:01:49 UTC (rev 3131) @@ -15,8 +15,7 @@ <import file="${basedir}/build/ant-import/build-setup.xml"/> - <import file="${int.jbws.dir}/ant-import/build-deploy-jboss50.xml"/> - <import file="${int.jbws.dir}/ant-import/build-deploy-jboss42.xml"/> + <import file="${int.jbws.dir}/ant-import/build-deploy.xml"/> <import file="${int.jbws.dir}/ant-import/build-testsuite.xml"/> <import file="${int.jbws.dir}/ant-import/build-thirdparty.xml"/> @@ -39,11 +38,9 @@ <!-- ================================================================== --> <target name="init" depends="prepare,thirdparty"> - <!-- <ant antfile="${core.dir}/build.xml" target="main" inheritall="false"/> <ant antfile="${int.jboss50.dir}/build.xml" target="main" inheritall="false"/> <ant antfile="${int.jboss42.dir}/build.xml" target="main" inheritall="false"/> - --> </target> <!-- ================================================================== --> @@ -140,7 +137,7 @@ <fileset dir="${int.jboss50.dir}/output/lib"> <include name="jbossws-jboss50.jar"/> </fileset> - <fileset dir="${jbws.resources.dir}/jbossws.deployer"> + <fileset dir="${jbws.resources.dir}/jbossws-jboss50.deployer"> <include name="META-INF/jbossws-deployer-beans.xml"/> </fileset> </zip> Copied: branches/tdiesler/trunk/integration/jbws/src/main/resources/jbossws-jboss50.deployer (from rev 3130, branches/tdiesler/trunk/integration/jbws/src/main/resources/jbossws.deployer) Modified: branches/tdiesler/trunk/integration/spi/.project =================================================================== --- branches/tdiesler/trunk/integration/spi/.project 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/spi/.project 2007-05-18 09:01:49 UTC (rev 3131) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>spi</name> + <name>integration-spi</name> <comment></comment> <projects> </projects> Modified: branches/tdiesler/trunk/integration/sunri/.classpath =================================================================== --- branches/tdiesler/trunk/integration/sunri/.classpath 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/sunri/.classpath 2007-05-18 09:01:49 UTC (rev 3131) @@ -19,7 +19,7 @@ <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 combineaccessrules="false" kind="src" path="/integration-spi"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: branches/tdiesler/trunk/integration/sunri/.project =================================================================== --- branches/tdiesler/trunk/integration/sunri/.project 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/sunri/.project 2007-05-18 09:01:49 UTC (rev 3131) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>sunri-jboss50</name> + <name>integration-sunri</name> <comment></comment> <projects> </projects> Modified: branches/tdiesler/trunk/integration/sunri/ant-import/build-deploy.xml =================================================================== --- branches/tdiesler/trunk/integration/sunri/ant-import/build-deploy.xml 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/sunri/ant-import/build-deploy.xml 2007-05-18 09:01:49 UTC (rev 3131) @@ -18,9 +18,9 @@ <!-- ================================================================== --> <!-- Deploy jbossws/sunri to jboss50 --> - <target name="deploy" depends="jars,undeploy" description="Deploy jbossws"> + <target name="deploy-jboss50" depends="jars-jboss50,undeploy-jboss50" description="Deploy jbossws/sunri to jboss50"> - <ant antfile="${int.jbws50.dir}/build.xml" target="undeploy" inheritall="false"/> + <ant antfile="${int.jbws.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> <copy todir="${jboss50.home}/client" overwrite="true"> <fileset dir="${thirdparty.dir}"> @@ -41,14 +41,14 @@ </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="${sunri50.output.lib.dir}/jbossws-sunri50-deployer.zip"/> + <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="${sunri.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"/> + <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src="${sunri.output.lib.dir}/jbossws-sunri50.sar"/> + <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file="${sunri.output.lib.dir}/jbossws-context.war" overwrite="true"/> </target> <!-- Remove jbossws/sunri from jboss50 --> - <target name="undeploy" depends="prepare" description="Remove jbossws/sunri"> + <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/sunri from jboss50"> <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> </target> Modified: branches/tdiesler/trunk/integration/sunri/ant-import/build-testsuite.xml =================================================================== --- branches/tdiesler/trunk/integration/sunri/ant-import/build-testsuite.xml 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/sunri/ant-import/build-testsuite.xml 2007-05-18 09:01:49 UTC (rev 3131) @@ -10,14 +10,29 @@ <project> - <property name="tests.dir" value="${int.sunri50.dir}/src/test"/> - <property name="tests.output.dir" value="${int.sunri50.dir}/output-tests"/> + <property name="tests.dir" value="${int.sunri.dir}/src/test"/> + <property name="tests.output.dir" value="${int.sunri.dir}/output-tests"/> - <property name="jboss.home" value="${jboss50.home}"/> - <property name="excludesfile" value="${int.sunri50.dir}/src/test/resources/excludes.txt"/> - <import file="${build.dir}/ant-import/build-testsuite.xml"/> + <!-- + Run tests against jboss50 + --> + <target name="tests-jboss50" depends="tests-prepare-jboss50,tests"/> + <target name="tests-prepare-jboss50"> + <property name="jboss.home" value="${jboss50.home}"/> + <property name="excludesfile" value="${int.sunri.dir}/src/test/resources/excludes-jboss50.txt"/> + </target> + + <!-- + Run tests against jboss42 + --> + <target name="tests-jboss42" depends="tests-prepare-jboss42,tests"/> + <target name="tests-prepare-jboss42"> + <property name="jboss.home" value="${jboss42.home}"/> + <property name="excludesfile" value="${int.sunri.dir}/src/test/resources/excludes-jboss42.txt"/> + </target> + <!-- ================================================================== --> <!-- Initialization --> <!-- ================================================================== --> @@ -88,7 +103,7 @@ <!-- Copy resources --> <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> <copy-test-resources srcdir="${testsuite.dir}/src"/> - <copy-test-resources srcdir="${int.sunri50.dir}/src/test"/> + <copy-test-resources srcdir="${int.sunri.dir}/src/test"/> </target> <target name="tests-jars" depends="tests-compile,tests-copy-resources" description="Build the deployments."> Modified: branches/tdiesler/trunk/integration/sunri/ant-import/build-thirdparty.xml =================================================================== --- branches/tdiesler/trunk/integration/sunri/ant-import/build-thirdparty.xml 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/sunri/ant-import/build-thirdparty.xml 2007-05-18 09:01:49 UTC (rev 3131) @@ -13,7 +13,7 @@ <project> - <property file="${int.sunri50.dir}/version.properties"/> + <property file="${int.sunri.dir}/version.properties"/> <!-- ========= --> <!-- Libraries --> @@ -23,8 +23,8 @@ </target> <target name="thirdparty-init" depends="prepare"> - <property name="thirdparty.dir" value="${int.sunri50.dir}/thirdparty"/> - <checksum file="${int.sunri50.dir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/> + <property name="thirdparty.dir" value="${int.sunri.dir}/thirdparty"/> + <checksum file="${int.sunri.dir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/> <condition property="force.thirdparty.get"> <or> <not> @@ -63,7 +63,7 @@ <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="${int.sunri50.dir}/version.properties" fileext=".md5"/> + <checksum file="${int.sunri.dir}/version.properties" fileext=".md5"/> </target> <target name="thirdparty-classpath" depends="thirdparty-init"> Modified: branches/tdiesler/trunk/integration/sunri/build.xml =================================================================== --- branches/tdiesler/trunk/integration/sunri/build.xml 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/sunri/build.xml 2007-05-18 09:01:49 UTC (rev 3131) @@ -24,15 +24,15 @@ <!-- Setup --> <!-- ================================================================== --> - <property name="sunri50.dir" value="${int.sunri.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"/> + <property name="sunri.dir" value="${int.sunri.dir}"/> + <property name="sunri.src.dir" value="${sunri.dir}/src/main"/> + <property name="sunri.etc.dir" value="${sunri.src.dir}/etc"/> + <property name="sunri.java.dir" value="${sunri.src.dir}/java"/> + <property name="sunri.resources.dir" value="${sunri.src.dir}/resources"/> + <property name="sunri.output.dir" value="${sunri.dir}/output"/> + <property name="sunri.output.classes.dir" value="${sunri.output.dir}/classes"/> + <property name="sunri.output.etc.dir" value="${sunri.output.dir}/etc"/> + <property name="sunri.output.lib.dir" value="${sunri.output.dir}/lib"/> <!-- ================================================================== --> <!-- Initialization --> @@ -59,19 +59,19 @@ <!-- Compile java sources --> <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}" + <mkdir dir="${sunri.output.classes.dir}"/> + <javac srcdir="${sunri.java.dir}" sourcepath="" destdir="${sunri.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/**"/> + <include name="org/jboss/ws/integration/sunri/**"/> <classpath refid="sunri50.integration.classpath"/> </javac> </target> <!-- Compile etc files (manifests and such) --> <target name="compile-etc" depends="init"> - <mkdir dir="${sunri50.output.etc.dir}"/> - <copy todir="${sunri50.output.etc.dir}" filtering="yes"> - <fileset dir="${sunri50.etc.dir}"> + <mkdir dir="${sunri.output.etc.dir}"/> + <copy todir="${sunri.output.etc.dir}" filtering="yes"> + <fileset dir="${sunri.etc.dir}"> <include name="component-info.xml"/> </fileset> <fileset dir="${build.dir}/etc"> @@ -95,37 +95,37 @@ <!-- | Build all jar files. --> - <target name="jars" depends="compile,module-jars" description="Builds all jar files."> + <target name="jars" depends="compile,jars-jboss50" description="Builds all jar files."> </target> <!-- | Build all jar files. --> - <target name="module-jars" depends="init"> + <target name="jars-jboss50" depends="compile"> <!-- Build jbossws-sunri50.jar --> - <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/**"/> + <mkdir dir="${sunri.output.lib.dir}"/> + <jar jarfile="${sunri.output.lib.dir}/jbossws-sunri50.jar" manifest="${sunri.output.etc.dir}/default.mf"> + <fileset dir="${sunri.output.classes.dir}"> + <include name="org/jboss/ws/integration/sunri/**"/> </fileset> </jar> - <!-- Build jbosswsri-context.war --> - <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"> + <!-- Build jbossws-context.war --> + <war warfile="${sunri.output.lib.dir}/jbossws-context.war" webxml="${sunri.resources.dir}/jbossws-context.war/WEB-INF/web.xml"> + <fileset dir="${sunri.resources.dir}/jbossws-context.war"> <include name="index.html"/> <include name="styles.css"/> </fileset> - <webinf dir="${sunri50.resources.dir}/jbossws-context.war/WEB-INF"> + <webinf dir="${sunri.resources.dir}/jbossws-context.war/WEB-INF"> <include name="jboss-web.xml"/> </webinf> </war> <!-- Build jbosswsri.sar --> - <jar jarfile="${sunri50.output.lib.dir}/jbossws-sunri50.sar" manifest="${sunri50.output.etc.dir}/default.mf"> + <jar jarfile="${sunri.output.lib.dir}/jbossws-sunri50.sar" manifest="${sunri.output.etc.dir}/default.mf"> <!-- [JBAS-4379] MC beans deployed twice because of jacc service - <fileset dir="${sunri50.output.lib.dir}"> + <fileset dir="${sunri.output.lib.dir}"> <include name="jbossws-context.war"/> </fileset> --> @@ -145,27 +145,27 @@ <include name="stax-ex.jar"/> <include name="streambuffer.jar"/> </fileset> - <metainf dir="${sunri50.resources.dir}/jbossws.sar/META-INF"> + <metainf dir="${sunri.resources.dir}/jbossws-jboss50.sar/META-INF"> <include name="jbossws-beans.xml"/> </metainf> </jar> <!-- Build jbosswsri-deployer --> - <zip zipfile="${sunri50.output.lib.dir}/jbossws-sunri50-deployer.zip"> + <zip zipfile="${sunri.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}"> + <fileset dir="${sunri.output.lib.dir}"> <include name="jbossws-sunri50.jar"/> </fileset> - <fileset dir="${sunri50.resources.dir}/jbossws.deployer"> + <fileset dir="${sunri.resources.dir}/jbossws-jboss50.deployer"> <include name="META-INF/jbossws-deployer-beans.xml"/> </fileset> </zip> <!-- Build jbosswsri50-src.zip --> - <zip zipfile="${sunri50.output.lib.dir}/jbossws-sunri50-src.zip" > - <fileset dir="${sunri50.java.dir}"/> + <zip zipfile="${sunri.output.lib.dir}/jbossws-sunri50-src.zip" > + <fileset dir="${sunri.java.dir}"/> </zip> </target> @@ -175,7 +175,7 @@ <!-- ================================================================== --> <target name="clean" depends="prepare" description="Cleans up most generated files."> - <delete dir="${sunri50.output.dir}"/> + <delete dir="${sunri.output.dir}"/> </target> <target name="clobber" depends="clean" description="Cleans up all generated files."> Copied: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri (from rev 3130, branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/sunri) Modified: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/EndpointNameDeployer.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/sunri/EndpointNameDeployer.java 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/EndpointNameDeployer.java 2007-05-18 09:01:49 UTC (rev 3131) @@ -19,7 +19,7 @@ * 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.sunri; +package org.jboss.ws.integration.sunri; //$Id$ Modified: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/LifecycleHandlerImpl.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/sunri/LifecycleHandlerImpl.java 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/LifecycleHandlerImpl.java 2007-05-18 09:01:49 UTC (rev 3131) @@ -19,7 +19,7 @@ * 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.sunri; +package org.jboss.ws.integration.sunri; //$Id$ Modified: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/ManagedEndpointRegistry.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/sunri/ManagedEndpointRegistry.java 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/ManagedEndpointRegistry.java 2007-05-18 09:01:49 UTC (rev 3131) @@ -19,7 +19,7 @@ * 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.sunri; +package org.jboss.ws.integration.sunri; // $Id$ Modified: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/ManagedEndpointRegistryMBean.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/sunri/ManagedEndpointRegistryMBean.java 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/ManagedEndpointRegistryMBean.java 2007-05-18 09:01:49 UTC (rev 3131) @@ -19,7 +19,7 @@ * 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.sunri; +package org.jboss.ws.integration.sunri; import org.jboss.ws.integration.management.EndpointRegistry; Modified: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/ModifyWebMetaDataDeployer.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/sunri/ModifyWebMetaDataDeployer.java 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/ModifyWebMetaDataDeployer.java 2007-05-18 09:01:49 UTC (rev 3131) @@ -19,7 +19,7 @@ * 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.sunri; +package org.jboss.ws.integration.sunri; //$Id$ @@ -30,7 +30,7 @@ import org.jboss.metadata.web.ParamValue.ParamType; import org.jboss.ws.integration.deployment.AbstractDeployer; import org.jboss.ws.integration.deployment.Deployment; -import org.jboss.ws.integration.jboss50.sunri.metadata.sunjaxws.DDEndpoints; +import org.jboss.ws.integration.sunri.metadata.sunjaxws.DDEndpoints; /** * A deployer that modifies the web.xml meta data Modified: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/RequestHandlerImpl.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/sunri/RequestHandlerImpl.java 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/RequestHandlerImpl.java 2007-05-18 09:01:49 UTC (rev 3131) @@ -19,7 +19,7 @@ * 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.sunri; +package org.jboss.ws.integration.sunri; //$Id$ Modified: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/ServletResourceLoader.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/sunri/ServletResourceLoader.java 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/ServletResourceLoader.java 2007-05-18 09:01:49 UTC (rev 3131) @@ -19,7 +19,7 @@ * 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.sunri; +package org.jboss.ws.integration.sunri; // $Id$ Modified: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/SunJaxwsDeployer.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/sunri/SunJaxwsDeployer.java 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/SunJaxwsDeployer.java 2007-05-18 09:01:49 UTC (rev 3131) @@ -19,7 +19,7 @@ * 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.sunri; +package org.jboss.ws.integration.sunri; //$Id$ @@ -32,8 +32,8 @@ 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.jboss50.sunri.metadata.sunjaxws.DDEndpoint; -import org.jboss.ws.integration.jboss50.sunri.metadata.sunjaxws.DDEndpoints; +import org.jboss.ws.integration.sunri.metadata.sunjaxws.DDEndpoint; +import org.jboss.ws.integration.sunri.metadata.sunjaxws.DDEndpoints; /** * A deployer that generates sun-jaxws.xml Modified: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/VirtualFileResourceLoader.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/sunri/VirtualFileResourceLoader.java 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/VirtualFileResourceLoader.java 2007-05-18 09:01:49 UTC (rev 3131) @@ -19,7 +19,7 @@ * 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.sunri; +package org.jboss.ws.integration.sunri; //$Id$ Modified: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/WSEndpointServlet.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/sunri/WSEndpointServlet.java 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/WSEndpointServlet.java 2007-05-18 09:01:49 UTC (rev 3131) @@ -19,7 +19,7 @@ * 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.sunri; +package org.jboss.ws.integration.sunri; // $Id$ Modified: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/WSServletContextListener.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/sunri/WSServletContextListener.java 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/WSServletContextListener.java 2007-05-18 09:01:49 UTC (rev 3131) @@ -19,7 +19,7 @@ * 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.sunri; +package org.jboss.ws.integration.sunri; // $Id$ Modified: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/metadata/sunjaxws/DDEndpoint.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/sunjaxws/DDEndpoint.java 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/metadata/sunjaxws/DDEndpoint.java 2007-05-18 09:01:49 UTC (rev 3131) @@ -19,7 +19,7 @@ * 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.sunri.metadata.sunjaxws; +package org.jboss.ws.integration.sunri.metadata.sunjaxws; import java.io.IOException; import java.io.Writer; Modified: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/metadata/sunjaxws/DDEndpoints.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/sunjaxws/DDEndpoints.java 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/metadata/sunjaxws/DDEndpoints.java 2007-05-18 09:01:49 UTC (rev 3131) @@ -19,7 +19,7 @@ * 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.sunri.metadata.sunjaxws; +package org.jboss.ws.integration.sunri.metadata.sunjaxws; import java.io.File; import java.io.FileOutputStream; Modified: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/metadata/sunjaxws/DDHandler.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/sunjaxws/DDHandler.java 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/metadata/sunjaxws/DDHandler.java 2007-05-18 09:01:49 UTC (rev 3131) @@ -19,7 +19,7 @@ * 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.sunri.metadata.sunjaxws; +package org.jboss.ws.integration.sunri.metadata.sunjaxws; import java.io.IOException; import java.io.Writer; Modified: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/metadata/sunjaxws/DDHandlerChain.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/jboss50/sunri/metadata/sunjaxws/DDHandlerChain.java 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/ws/integration/sunri/metadata/sunjaxws/DDHandlerChain.java 2007-05-18 09:01:49 UTC (rev 3131) @@ -19,7 +19,7 @@ * 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.sunri.metadata.sunjaxws; +package org.jboss.ws.integration.sunri.metadata.sunjaxws; import java.io.IOException; import java.io.Writer; Copied: branches/tdiesler/trunk/integration/sunri/src/main/resources/jbossws-jboss50.deployer (from rev 3130, branches/tdiesler/trunk/integration/sunri/src/main/resources/jbossws.deployer) Copied: branches/tdiesler/trunk/integration/sunri/src/main/resources/jbossws-jboss50.sar (from rev 3130, branches/tdiesler/trunk/integration/sunri/src/main/resources/jbossws.sar) Modified: branches/tdiesler/trunk/integration/sunri/src/main/resources/jbossws-jboss50.sar/META-INF/jbossws-beans.xml =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/sunri/src/main/resources/jbossws-jboss50.sar/META-INF/jbossws-beans.xml 2007-05-18 09:01:49 UTC (rev 3131) @@ -26,7 +26,7 @@ </bean> <!-- The registry for web service endpoints --> - <bean name="WSEndpointRegistry" class="org.jboss.ws.integration.jboss50.sunri.ManagedEndpointRegistry"/> + <bean name="WSEndpointRegistry" class="org.jboss.ws.integration.sunri.ManagedEndpointRegistry"/> <!-- Bind Service objects in client environment context --> <!-- The bean name is compiled into the server. Changeit with the next release. --> @@ -117,28 +117,31 @@ Each handles a single aspect of web service deployment --> <bean name="WSEndpointHandlerDeployer" class="org.jboss.ws.integration.deployment.EndpointHandlerDeployer"> - <property name="requestHandler">org.jboss.ws.integration.jboss50.sunri.RequestHandlerImpl</property> - <property name="lifecycleHandler">org.jboss.ws.integration.jboss50.sunri.LifecycleHandlerImpl</property> + <property name="requestHandler">org.jboss.ws.integration.sunri.RequestHandlerImpl</property> + <property name="lifecycleHandler">org.jboss.ws.integration.sunri.LifecycleHandlerImpl</property> <property name="invocationHandler"> <map keyClass="java.lang.String" valueClass="java.lang.String"> - <entry><key>JAXWS_JSE</key><value>org.jboss.ws.integration.jboss50.sunri.InvocationHandlerJSE</value></entry> + <entry><key>JAXWS_JSE</key><value>org.jboss.ws.integration.invocation.InvocationHandlerJSE</value></entry> + <entry><key>JAXWS_EJB3</key><value>org.jboss.ws.integration.jboss50.InvocationHandlerEJB3</value></entry> </map> </property> </bean> <bean name="WSEndpointLifecycleDeployer" class="org.jboss.ws.integration.deployment.EndpointLifecycleDeployer"/> - <bean name="WSEndpointNameDeployer" class="org.jboss.ws.integration.jboss50.sunri.EndpointNameDeployer"/> + <bean name="WSEndpointNameDeployer" class="org.jboss.ws.integration.sunri.EndpointNameDeployer"/> <bean name="WSEndpointRegistryDeployer" class="org.jboss.ws.integration.deployment.EndpointRegistryDeployer"/> - <bean name="WSModifyWebMetaDataDeployer" class="org.jboss.ws.integration.jboss50.sunri.ModifyWebMetaDataDeployer"> - <property name="listenerClass">org.jboss.ws.integration.jboss50.sunri.WSServletContextListener</property> - <property name="servletClass">org.jboss.ws.integration.jboss50.sunri.WSEndpointServlet</property> + <bean name="WSModifyWebMetaDataDeployer" class="org.jboss.ws.integration.sunri.ModifyWebMetaDataDeployer"> + <property name="listenerClass">org.jboss.ws.integration.sunri.WSServletContextListener</property> + <property name="servletClass">org.jboss.ws.integration.sunri.WSEndpointServlet</property> </bean> - <bean name="WSSunJaxwsDeployer" class="org.jboss.ws.integration.jboss50.sunri.SunJaxwsDeployer"/> + <bean name="WSSunJaxwsDeployer" class="org.jboss.ws.integration.sunri.SunJaxwsDeployer"/> <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.ws.integration.jboss50.UnifiedDeploymentInfoDeployer"/> <!-- Register DeployerHooks with JBoss deployers --> <bean name="WSDeployerHook_JAXRPC_JSE" class="org.jboss.ws.integration.jboss50.JAXRPCDeployerHookJSE"> + <property name="deploymentClass">org.jboss.ws.integration.deployment.BasicDeployment</property> + <property name="endpointClass">org.jboss.ws.integration.BasicEndpoint</property> <property name="deployerManager"><inject bean="WSDeployerManagerJSE"/></property> <install bean="WebServiceDeployerJSE" method="addDeployerHook"> <parameter> @@ -153,6 +156,8 @@ <depends>WebServiceDeployerJSE</depends> </bean> <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.ws.integration.jboss50.JAXRPCDeployerHookEJB21"> + <property name="deploymentClass">org.jboss.ws.integration.deployment.BasicDeployment</property> + <property name="endpointClass">org.jboss.ws.integration.BasicEndpoint</property> <property name="deployerManager"><inject bean="WSDeployerManagerEJB"/></property> <install bean="WebServiceDeployerEJB" method="addDeployerHook"> <parameter> @@ -167,6 +172,8 @@ <depends>WebServiceDeployerEJB</depends> </bean> <bean name="WSDeployerHook_JAXWS_JSE" class="org.jboss.ws.integration.jboss50.JAXWSDeployerHookJSE"> + <property name="deploymentClass">org.jboss.ws.integration.deployment.BasicDeployment</property> + <property name="endpointClass">org.jboss.ws.integration.BasicEndpoint</property> <property name="deployerManager"><inject bean="WSDeployerManagerJSE"/></property> <install bean="WebServiceDeployerJSE" method="addDeployerHook"> <parameter> @@ -181,6 +188,8 @@ <depends>WebServiceDeployerJSE</depends> </bean> <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.ws.integration.jboss50.JAXWSDeployerHookEJB3"> + <property name="deploymentClass">org.jboss.ws.integration.deployment.BasicDeployment</property> + <property name="endpointClass">org.jboss.ws.integration.BasicEndpoint</property> <property name="deployerManager"><inject bean="WSDeployerManagerEJB"/></property> <install bean="WebServiceDeployerEJB" method="addDeployerHook"> <parameter> Copied: branches/tdiesler/trunk/integration/sunri/src/test/resources/excludes-jboss50.txt (from rev 3130, branches/tdiesler/trunk/integration/sunri/src/test/resources/excludes.txt) =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/test/resources/excludes-jboss50.txt (rev 0) +++ branches/tdiesler/trunk/integration/sunri/src/test/resources/excludes-jboss50.txt 2007-05-18 09:01:49 UTC (rev 3131) @@ -0,0 +1,2 @@ + +# Nothing to exclude Deleted: branches/tdiesler/trunk/integration/sunri/src/test/resources/excludes.txt =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/test/resources/excludes.txt 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/integration/sunri/src/test/resources/excludes.txt 2007-05-18 09:01:49 UTC (rev 3131) @@ -1,2 +0,0 @@ - -# Nothing to exclude Modified: branches/tdiesler/trunk/jbossws-core/.classpath =================================================================== --- branches/tdiesler/trunk/jbossws-core/.classpath 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/jbossws-core/.classpath 2007-05-18 09:01:49 UTC (rev 3131) @@ -4,7 +4,6 @@ <classpathentry excluding="org/jboss/test/ws/jaxrpc/samples/jmstransport/" kind="src" path="src/test/java"/> <classpathentry kind="src" path="output-tests/wsconsume/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <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"/> @@ -30,8 +29,9 @@ <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 combineaccessrules="false" kind="src" path="/integration-spi"/> + <classpathentry kind="lib" path="/integration-spi/thirdparty/junit.jar"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: branches/tdiesler/trunk/jbossws-core/.project =================================================================== --- branches/tdiesler/trunk/jbossws-core/.project 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/jbossws-core/.project 2007-05-18 09:01:49 UTC (rev 3131) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>jbossws</name> + <name>jbossws-core</name> <comment></comment> <projects> </projects> Modified: branches/tdiesler/trunk/testsuite/.classpath =================================================================== --- branches/tdiesler/trunk/testsuite/.classpath 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/testsuite/.classpath 2007-05-18 09:01:49 UTC (rev 3131) @@ -3,11 +3,12 @@ <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="/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 combineaccessrules="false" kind="src" path="/integration-spi"/> + <classpathentry kind="lib" path="/integration-spi/thirdparty/jaxrpc-api.jar"/> + <classpathentry kind="lib" path="/integration-spi/thirdparty/jaxws-api.jar"/> + <classpathentry kind="lib" path="/integration-spi/thirdparty/jboss-logging-spi.jar"/> + <classpathentry kind="lib" path="/integration-spi/thirdparty/jsr181-api.jar"/> + <classpathentry kind="lib" path="/integration-spi/thirdparty/saaj-api.jar"/> + <classpathentry kind="lib" path="/integration-spi/thirdparty/junit.jar"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: branches/tdiesler/trunk/testsuite/ant-import/build-jars-jaxws.xml =================================================================== --- branches/tdiesler/trunk/testsuite/ant-import/build-jars-jaxws.xml 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/testsuite/ant-import/build-jars-jaxws.xml 2007-05-18 09:01:49 UTC (rev 3131) @@ -39,7 +39,7 @@ </jar> <jar jarfile="${tests.output.dir}/libs/jaxws-eardeployment.ear"> <fileset dir="${tests.output.dir}/libs"> - <include name="jaxws-eardeployment.jar"/> + <!--include name="jaxws-eardeployment.jar"/--> <include name="jaxws-eardeployment.war"/> </fileset> <metainf dir="${tests.output.dir}/resources/jaxws/eardeployment/META-INF"> Modified: branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/EarTestCase.java =================================================================== --- branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/EarTestCase.java 2007-05-17 21:56:56 UTC (rev 3130) +++ branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/eardeployment/EarTestCase.java 2007-05-18 09:01:49 UTC (rev 3131) @@ -45,7 +45,7 @@ return JBossWSTestSetup.newTestSetup(EarTestCase.class, earName); } - public void testEJB3Endpoint() throws Exception + public void _testEJB3Endpoint() throws Exception { URL wsdlURL = new URL("http://" + getServerHost() + ":8080/earejb3/EJB3Bean?wsdl"); QName serviceName = new QName("http://eardeployment.jaxws.ws.test.jboss.org/";, "TestEndpointService");