June 2007 - jbossws-commits - Jboss List Archives

JBossWS SVN: r3418 - in trunk: build/ant-import and 11 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-06-04 05:14:07 -0400 (Mon, 04 Jun 2007) New Revision: 3418 Added: trunk/integration/native/src/main/etc/component-info40.xml trunk/integration/sunri/src/main/etc/component-info50.xml trunk/integration/xfire/src/main/etc/component-info50.xml Removed: trunk/build/etc/component-info.xml trunk/integration/sunri/src/main/etc/component-info.xml trunk/integration/xfire/src/main/etc/component-info.xml trunk/jbossws-core/src/main/resources/samples/ Modified: trunk/build/ant-import/build-release.xml trunk/build/version.properties trunk/integration/native/ant-import/build-release.xml trunk/integration/sunri/ant-import/build-release.xml trunk/integration/xfire/ant-import/build-release.xml trunk/jbossws-core/ant-import/build-thirdparty.xml trunk/jbossws-core/src/main/etc/component-info.xml trunk/jbossws-core/version.properties Log: Release 2.1.0.Beta1 Modified: trunk/build/ant-import/build-release.xml =================================================================== --- trunk/build/ant-import/build-release.xml 2007-06-04 07:09:13 UTC (rev 3417) +++ trunk/build/ant-import/build-release.xml 2007-06-04 09:14:07 UTC (rev 3418) @@ -38,9 +38,12 @@ <target name="release-to-repository" depends="prepare" description="Release to local repository"> <ant antfile="${spi.dir}/build.xml" target="release" inheritall="false"/> <ant antfile="${core.dir}/build.xml" target="release" inheritall="false"/> + <ant antfile="${int.jboss50.dir}/build.xml" target="release" inheritall="false"/> <ant antfile="${int.jboss42.dir}/build.xml" target="release" inheritall="false"/> - <ant antfile="${int.jboss50.dir}/build.xml" target="release" inheritall="false"/> + <ant antfile="${int.jboss40.dir}/build.xml" target="release" inheritall="false"/> <ant antfile="${int.native.dir}/build.xml" target="release" inheritall="false"/> + <ant antfile="${int.sunri.dir}/build.xml" target="release" inheritall="false"/> + <ant antfile="${int.xfire.dir}/build.xml" target="release" inheritall="false"/> </target>  Deleted: trunk/build/etc/component-info.xml =================================================================== --- trunk/build/etc/component-info.xml 2007-06-04 07:09:13 UTC (rev 3417) +++ trunk/build/etc/component-info.xml 2007-06-04 09:14:07 UTC (rev 3418) @@ -1,53 +0,0 @@ -<project name="jboss/jbossws"> - - <component id="jboss/jbossws" - description="JBossWS an implementation of J2EE Web Services" - version="@repository.id@" - licenseType="lgpl"> - - <artifact id="jbossws-client.jar"/> - <artifact id="jbossws-core.jar"/> - <artifact id="jboss-jaxrpc.jar"/> - <artifact id="jboss-jaxws.jar"/> - <artifact id="jboss-saaj.jar"/> - <artifact id="jbossws-core-src.zip"/> - <artifact id="jbossws-resources.zip"/> - - <import componentref="apache-xmlsec"> - <compatible version="@apache-xmlsec@"/> - <compatible version="@apache-xmlsec@-brew"/> - </import> - <import componentref="ibm-wsdl4j"> - <compatible version="@ibm-wsdl4j@"/> - <compatible version="@ibm-wsdl4j@-brew"/> - </import> - <import componentref="javassist"> - <compatible version="@javassist@"/> - <compatible version="@javassist@-brew"/> - </import> - <import componentref="jbpm/bpel"> - <compatible version="@jbpm-bpel@"/> - </import> - <import componentref="jboss/jbossws-spi"> - <compatible version="@jbossws-spi@"/> - </import> - <import componentref="jboss/jbossws-wsconsume-impl"> - <compatible version="@jbossws-wsconsume-impl@"/> - </import> - <import componentref="stax-api"> - <compatible version="@stax-api@"/> - </import> - <import componentref="sun-jaxb"> - <compatible version="@sun-jaxb@"/> - </import> - - <export> - <include input="jbossws-core.jar"/> - <include input="jboss-jaxrpc.jar"/> - <include input="jboss-jaxws.jar"/> - <include input="jboss-saaj.jar"/> - </export> - - </component> - -</project> Modified: trunk/build/version.properties =================================================================== --- trunk/build/version.properties 2007-06-04 07:09:13 UTC (rev 3417) +++ trunk/build/version.properties 2007-06-04 09:14:07 UTC (rev 3418) @@ -5,8 +5,8 @@ specification.vendor=JBoss (http://www.jboss.org) specification.version=jbossws-2.1 -version.id=2.1.0.DEV -repository.id=snapshot +version.id=2.1.0.Beta1 +repository.id=2.1.0.Beta1 implementation.title=JBoss Web Services - JBossWS implementation.url=http://www.jboss.org/products/jbossws Modified: trunk/integration/native/ant-import/build-release.xml =================================================================== --- trunk/integration/native/ant-import/build-release.xml 2007-06-04 07:09:13 UTC (rev 3417) +++ trunk/integration/native/ant-import/build-release.xml 2007-06-04 09:14:07 UTC (rev 3418) @@ -46,6 +46,20 @@ </filterset> </copy> +  + <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/> + <mkdir dir="${jboss.repository.dir}/jbossws-native40/${repository.id}/lib"/> + <copy todir="${jboss.repository.dir}/jbossws-native40/${repository.id}/lib" overwrite="true"> + <fileset dir="${int.native.dir}/output/lib"> + <include name="jbossws-native40.sar"/> + </fileset> + </copy> + <copy tofile="${jboss.repository.dir}/jbossws-native40/${repository.id}/component-info.xml" file="${native.etc.dir}/component-info40.xml" filtering="true" overwrite="true"> + <filterset> + <filtersfile file="${build.dir}/version.properties"/> + </filterset> + </copy> + </target> </project> Added: trunk/integration/native/src/main/etc/component-info40.xml =================================================================== --- trunk/integration/native/src/main/etc/component-info40.xml (rev 0) +++ trunk/integration/native/src/main/etc/component-info40.xml 2007-06-04 09:14:07 UTC (rev 3418) @@ -0,0 +1,31 @@ +<project name="jboss/jbossws-native40"> + + <component id="jboss/jbossws-native40" + description="JBossWS an implementation of J2EE Web Services" + version="@repository.id@" + licenseType="lgpl"> + + <artifact id="jbossws-native40.sar"/> + + <import componentref="jboss/jbossxb"> + <compatible version="@jboss-jbossxb@"/> + </import> + <import componentref="jboss/microcontainer"> + <compatible version="@jboss-microcontainer@"/> + </import> + <import componentref="jboss/jbossws"> + <compatible version="@repository.id@"/> + </import> + <import componentref="jboss/jbossws-jboss50"> + <compatible version="@repository.id@"/> + </import> + <import componentref="jboss/jbossws-spi"> + <compatible version="@repository.id@"/> + </import> + + <export> + </export> + + </component> + +</project> Property changes on: trunk/integration/native/src/main/etc/component-info40.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/integration/sunri/ant-import/build-release.xml =================================================================== --- trunk/integration/sunri/ant-import/build-release.xml 2007-06-04 07:09:13 UTC (rev 3417) +++ trunk/integration/sunri/ant-import/build-release.xml 2007-06-04 09:14:07 UTC (rev 3418) @@ -14,9 +14,22 @@ <project>  - <target name="release" depends="jars" - description="Release to jboss.local.repository"> + <target name="release" depends="jars" description="Release to jboss.local.repository"> +  + <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/> + <mkdir dir="${jboss.repository.dir}/jbossws-sunri50/${repository.id}/lib"/> + <copy todir="${jboss.repository.dir}/jbossws-sunri50/${repository.id}/lib" overwrite="true"> + <fileset dir="${int.sunri.dir}/output/lib"> + <include name="jbossws-sunri50.sar"/> + <include name="jbossws-sunri50-deployer.zip"/> + </fileset> + </copy> + <copy tofile="${jboss.repository.dir}/jbossws-sunri50/${repository.id}/component-info.xml" file="${sunri.etc.dir}/component-info50.xml" filtering="true" overwrite="true"> + <filterset> + <filtersfile file="${build.dir}/version.properties"/> + </filterset> + </copy> </target> Deleted: trunk/integration/sunri/src/main/etc/component-info.xml =================================================================== --- trunk/integration/sunri/src/main/etc/component-info.xml 2007-06-04 07:09:13 UTC (rev 3417) +++ trunk/integration/sunri/src/main/etc/component-info.xml 2007-06-04 09:14:07 UTC (rev 3418) @@ -1,31 +0,0 @@ -<project name="jboss/jbossws-sunri50"> - - <component id="jboss/jbossws-sunri50" - description="JBossWS an implementation of J2EE Web Services" - version="@repository.id@" - licenseType="lgpl"> - - <artifact id="jbosswsri50.jar"/> - <artifact id="jbosswsri50.sar"/> - <artifact id="jbosswsri50-deployer.zip"/> - <artifact id="jbosswsri50-src.zip"/> - - <import componentref="jboss/jbossxb"> - <compatible version="@jboss-jbossxb@"/> - </import> - <import componentref="jboss/microcontainer"> - <compatible version="@jboss-microcontainer@"/> - </import> - <import componentref="jboss/jbossws-spi"> - <compatible version="@jboss-jbossws-spi@"/> - </import> - <import componentref="sun-jaxws"> - <compatible version="@sun-jaxws@"/> - </import> - - <export> - </export> - - </component> - -</project> Added: trunk/integration/sunri/src/main/etc/component-info50.xml =================================================================== --- trunk/integration/sunri/src/main/etc/component-info50.xml (rev 0) +++ trunk/integration/sunri/src/main/etc/component-info50.xml 2007-06-04 09:14:07 UTC (rev 3418) @@ -0,0 +1,26 @@ +<project name="jboss/jbossws-sunri50"> + + <component id="jboss/jbossws-sunri50" + description="JBossWS an implementation of J2EE Web Services" + version="@repository.id@" + licenseType="lgpl"> + + <artifact id="jbossws-sunri50.sar"/> + <artifact id="jbossws-sunri50-deployer.zip"/> + + <import componentref="jboss/microcontainer"> + <compatible version="@jboss-microcontainer@"/> + </import> + <import componentref="jboss/jbossws-jboss50"> + <compatible version="@repository.id@"/> + </import> + <import componentref="jboss/jbossws-spi"> + <compatible version="@repository.id@"/> + </import> + + <export> + </export> + + </component> + +</project> Property changes on: trunk/integration/sunri/src/main/etc/component-info50.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/integration/xfire/ant-import/build-release.xml =================================================================== --- trunk/integration/xfire/ant-import/build-release.xml 2007-06-04 07:09:13 UTC (rev 3417) +++ trunk/integration/xfire/ant-import/build-release.xml 2007-06-04 09:14:07 UTC (rev 3418) @@ -17,6 +17,20 @@ <target name="release" depends="jars" description="Release to jboss.local.repository"> +  + <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/> + <mkdir dir="${jboss.repository.dir}/jbossws-xfire50/${repository.id}/lib"/> + <copy todir="${jboss.repository.dir}/jbossws-xfire50/${repository.id}/lib" overwrite="true"> + <fileset dir="${int.xfire.dir}/output/lib"> + <include name="jbossws-xfire50.sar"/> + <include name="jbossws-xfire50-deployer.zip"/> + </fileset> + </copy> + <copy tofile="${jboss.repository.dir}/jbossws-xfire50/${repository.id}/component-info.xml" file="${xfire.etc.dir}/component-info50.xml" filtering="true" overwrite="true"> + <filterset> + <filtersfile file="${build.dir}/version.properties"/> + </filterset> + </copy> </target> Deleted: trunk/integration/xfire/src/main/etc/component-info.xml =================================================================== --- trunk/integration/xfire/src/main/etc/component-info.xml 2007-06-04 07:09:13 UTC (rev 3417) +++ trunk/integration/xfire/src/main/etc/component-info.xml 2007-06-04 09:14:07 UTC (rev 3418) @@ -1,31 +0,0 @@ -<project name="jboss/jbossws-xfire50"> - - <component id="jboss/jbossws-xfire50" - description="JBossWS an implementation of J2EE Web Services" - version="@repository.id@" - licenseType="lgpl"> - - <artifact id="jbosswsri50.jar"/> - <artifact id="jbosswsri50.sar"/> - <artifact id="jbosswsri50-deployer.zip"/> - <artifact id="jbosswsri50-src.zip"/> - - <import componentref="jboss/jbossxb"> - <compatible version="@jboss-jbossxb@"/> - </import> - <import componentref="jboss/microcontainer"> - <compatible version="@jboss-microcontainer@"/> - </import> - <import componentref="jboss/jbossws-spi"> - <compatible version="@jboss-jbossws-spi@"/> - </import> - <import componentref="sun-jaxws"> - <compatible version="@sun-jaxws@"/> - </import> - - <export> - </export> - - </component> - -</project> Added: trunk/integration/xfire/src/main/etc/component-info50.xml =================================================================== --- trunk/integration/xfire/src/main/etc/component-info50.xml (rev 0) +++ trunk/integration/xfire/src/main/etc/component-info50.xml 2007-06-04 09:14:07 UTC (rev 3418) @@ -0,0 +1,26 @@ +<project name="jboss/jbossws-xfire50"> + + <component id="jboss/jbossws-xfire50" + description="JBossWS an implementation of J2EE Web Services" + version="@repository.id@" + licenseType="lgpl"> + + <artifact id="jbossws-xfire50.sar"/> + <artifact id="jbossws-xfire50-deployer.zip"/> + + <import componentref="jboss/microcontainer"> + <compatible version="@jboss-microcontainer@"/> + </import> + <import componentref="jboss/jbossws-jboss50"> + <compatible version="@repository.id@"/> + </import> + <import componentref="jboss/jbossws-spi"> + <compatible version="@repository.id@"/> + </import> + + <export> + </export> + + </component> + +</project> Property changes on: trunk/integration/xfire/src/main/etc/component-info50.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/jbossws-core/ant-import/build-thirdparty.xml =================================================================== --- trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-06-04 07:09:13 UTC (rev 3417) +++ trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-06-04 09:14:07 UTC (rev 3418) @@ -67,7 +67,6 @@ <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"/> Modified: trunk/jbossws-core/src/main/etc/component-info.xml =================================================================== --- trunk/jbossws-core/src/main/etc/component-info.xml 2007-06-04 07:09:13 UTC (rev 3417) +++ trunk/jbossws-core/src/main/etc/component-info.xml 2007-06-04 09:14:07 UTC (rev 3418) @@ -31,9 +31,6 @@ <import componentref="jboss/jbossws-spi"> <compatible version="@repository.id@"/> </import> - <import componentref="jboss/jbossws-wsconsume-impl"> - <compatible version="@jbossws-wsconsume-impl@"/> - </import> <import componentref="stax-api"> <compatible version="@stax-api@"/> </import> Modified: trunk/jbossws-core/version.properties =================================================================== --- trunk/jbossws-core/version.properties 2007-06-04 07:09:13 UTC (rev 3417) +++ trunk/jbossws-core/version.properties 2007-06-04 09:14:07 UTC (rev 3418) @@ -5,7 +5,6 @@ apache-xmlsec=1.3.0 ibm-wsdl4j=1.6.2 javassist=3.5.0.CR1 -jbossws-wsconsume-impl=2.0.0 jbpm-bpel=1.1.0.Beta5 # Thirdparty library versions

18 years, 5 months

1
0
0 / 0

JBossWS SVN: r3417 - trunk/build/hudson/hudson-home/jobs/AS-Tests-ALL.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-06-04 03:09:13 -0400 (Mon, 04 Jun 2007) New Revision: 3417 Modified: trunk/build/hudson/hudson-home/jobs/AS-Tests-ALL/config.xml Log: Fix child project names Modified: trunk/build/hudson/hudson-home/jobs/AS-Tests-ALL/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/AS-Tests-ALL/config.xml 2007-06-03 23:58:33 UTC (rev 3416) +++ trunk/build/hudson/hudson-home/jobs/AS-Tests-ALL/config.xml 2007-06-04 07:09:13 UTC (rev 3417) @@ -3,7 +3,7 @@ <builders class="vector"/> <publishers class="vector"> <hudson.tasks.BuildTrigger> - <childProjects>AS-Tests-5.0, AS-Tests-4.2, AS-Tests-4.0</childProjects> + <childProjects>AS-Tests-AS-5.0, AS-Tests-AS-4.2, AS-Tests-AS-4.0</childProjects> </hudson.tasks.BuildTrigger> </publishers> <buildWrappers class="vector"/>

18 years, 5 months

1
0
0 / 0

JBossWS SVN: r3416 - trunk/build/ant-import.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-06-03 19:58:33 -0400 (Sun, 03 Jun 2007) New Revision: 3416 Modified: trunk/build/ant-import/build-testsuite.xml Log: Fix jboss40 client classpath Modified: trunk/build/ant-import/build-testsuite.xml =================================================================== --- trunk/build/ant-import/build-testsuite.xml 2007-06-03 23:52:32 UTC (rev 3415) +++ trunk/build/ant-import/build-testsuite.xml 2007-06-03 23:58:33 UTC (rev 3416) @@ -187,9 +187,10 @@ <pathelement location="${jboss.client}/commons-logging.jar"/> <pathelement location="${jboss.client}/javassist.jar"/> <pathelement location="${jboss.client}/jaxb-xjc.jar"/> - <pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/> + <pathelement location="${jboss.client}/jboss-aop-jdk50-client.jar"/> + <pathelement location="${jboss.client}/jboss-aspect-jdk50-client.jar"/> + <pathelement location="${jboss.client}/log4j.jar"/> <pathelement location="${jboss.client}/wsdl4j.jar"/> - <pathelement location="${jboss.client}/log4j.jar"/> <pathelement location="${jboss.client}/jbossws-jboss40.jar"/> <pathelement location="${jboss.client}/jbossall-client.jar"/> <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/>

18 years, 5 months

1
0
0 / 0

JBossWS SVN: r3415 - in trunk/jbossws-core: src/test/java/org/jboss/test/ws/jaxrpc/jbws165 and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-06-03 19:52:32 -0400 (Sun, 03 Jun 2007) New Revision: 3415 Removed: trunk/jbossws-core/src/test/resources/jaxrpc/jbws165/META-INF/application-client.xml trunk/jbossws-core/src/test/resources/jaxrpc/jbws165/META-INF/jboss-client.xml Modified: trunk/jbossws-core/ant-import-tests/build-jars-jaxrpc.xml trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase.java trunk/jbossws-core/src/test/resources/jaxrpc/jbws165/META-INF/application.xml Log: Fix jbws165 for jboss40 Modified: trunk/jbossws-core/ant-import-tests/build-jars-jaxrpc.xml =================================================================== --- trunk/jbossws-core/ant-import-tests/build-jars-jaxrpc.xml 2007-06-03 21:54:02 UTC (rev 3414) +++ trunk/jbossws-core/ant-import-tests/build-jars-jaxrpc.xml 2007-06-03 23:52:32 UTC (rev 3415) @@ -717,23 +717,12 @@ <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> Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase.java 2007-06-03 21:54:02 UTC (rev 3414) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase.java 2007-06-03 23:52:32 UTC (rev 3415) @@ -21,12 +21,18 @@ */ package org.jboss.test.ws.jaxrpc.jbws165; +import java.io.File; +import java.net.URL; + import javax.naming.InitialContext; import javax.xml.namespace.QName; import javax.xml.rpc.Service; +import javax.xml.rpc.Stub; import junit.framework.Test; +import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; +import org.jboss.ws.core.jaxrpc.client.ServiceImpl; import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.test.JBossWSTestSetup; @@ -48,8 +54,10 @@ public void testNone() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service) iniCtx.lookup("java:comp/env/service/HelloNone"); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxrpc-jbws165-jaxrpc-jbws165-none/HelloNone?wsdl"); + URL mappingURL = new File("resources/jaxrpc/jbws165/META-INF/jaxrpc-mapping.xml").toURL(); + QName serviceName = new QName("http://org.jboss.test.webservice/jbws165", "HelloServiceNone"); + Service service = new ServiceFactoryImpl().createService(wsdlURL, serviceName, mappingURL); Hello port = (Hello) service.getPort(Hello.class); String retObj = port.hello(getName()); assertEquals(getName(), retObj); @@ -57,8 +65,15 @@ public void testPortComponentURIOne() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service) iniCtx.lookup("java:comp/env/service/HelloPCOne"); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxrpc-jbws165-jaxrpc-jbws165-pcuri/Explicit/Path/HelloPCOne?wsdl"); + + // In JBoss40 the context-root is derived from the first token in port-component-uri + if (isTargetJBoss40()) + wsdlURL = new URL("http://" + getServerHost() + ":8080/Explicit/Path/HelloPCOne?wsdl"); + + URL mappingURL = new File("resources/jaxrpc/jbws165/META-INF/jaxrpc-mapping.xml").toURL(); + QName serviceName = new QName("http://org.jboss.test.webservice/jbws165", "HelloServicePcURI"); + Service service = new ServiceFactoryImpl().createService(wsdlURL, serviceName, mappingURL); QName portName = new QName("http://org.jboss.test.webservice/jbws165", "HelloPortOne"); Hello port = (Hello) service.getPort(portName, Hello.class); String retObj = port.hello(getName()); @@ -67,8 +82,15 @@ public void testPortComponentURITwo() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service) iniCtx.lookup("java:comp/env/service/HelloPCTwo"); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxrpc-jbws165-jaxrpc-jbws165-pcuri/Explicit/Path/HelloPCTwo?wsdl"); + + // In JBoss40 the context-root is derived from the first token in port-component-uri + if (isTargetJBoss40()) + wsdlURL = new URL("http://" + getServerHost() + ":8080/Explicit/Path/HelloPCTwo?wsdl"); + + URL mappingURL = new File("resources/jaxrpc/jbws165/META-INF/jaxrpc-mapping.xml").toURL(); + QName serviceName = new QName("http://org.jboss.test.webservice/jbws165", "HelloServicePcURI"); + Service service = new ServiceFactoryImpl().createService(wsdlURL, serviceName, mappingURL); QName portName = new QName("http://org.jboss.test.webservice/jbws165", "HelloPortTwo"); Hello port = (Hello) service.getPort(portName, Hello.class); String retObj = port.hello(getName()); @@ -77,8 +99,10 @@ public void testContextRoot() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service) iniCtx.lookup("java:comp/env/service/HelloContextRoot"); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/Explicit/Context/HelloContextRoot?wsdl"); + URL mappingURL = new File("resources/jaxrpc/jbws165/META-INF/jaxrpc-mapping.xml").toURL(); + QName serviceName = new QName("http://org.jboss.test.webservice/jbws165", "HelloServiceCtxRoot"); + Service service = new ServiceFactoryImpl().createService(wsdlURL, serviceName, mappingURL); Hello port = (Hello) service.getPort(Hello.class); String retObj = port.hello(getName()); assertEquals(getName(), retObj); @@ -86,8 +110,10 @@ public void testBoth() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service) iniCtx.lookup("java:comp/env/service/HelloBoth"); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/Explicit/Both/Explicit/Path?wsdl"); + URL mappingURL = new File("resources/jaxrpc/jbws165/META-INF/jaxrpc-mapping.xml").toURL(); + QName serviceName = new QName("http://org.jboss.test.webservice/jbws165", "HelloServiceBoth"); + Service service = new ServiceFactoryImpl().createService(wsdlURL, serviceName, mappingURL); Hello port = (Hello) service.getPort(Hello.class); String retObj = port.hello(getName()); assertEquals(getName(), retObj); Deleted: trunk/jbossws-core/src/test/resources/jaxrpc/jbws165/META-INF/application-client.xml =================================================================== --- trunk/jbossws-core/src/test/resources/jaxrpc/jbws165/META-INF/application-client.xml 2007-06-03 21:54:02 UTC (rev 3414) +++ trunk/jbossws-core/src/test/resources/jaxrpc/jbws165/META-INF/application-client.xml 2007-06-03 23:52:32 UTC (rev 3415) @@ -1,61 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<application-client 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/application-client_1_4.xsd" - version="1.4"> - - <display-name>HelloNoneService</display-name> - - <service-ref> - <service-ref-name>service/HelloNone</service-ref-name> - <service-interface>javax.xml.rpc.Service</service-interface> - <wsdl-file>USE_WSDL_OVERRIDE</wsdl-file> - <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws165.Hello</service-endpoint-interface> - </port-component-ref> - </service-ref> - - <service-ref> - <service-ref-name>service/HelloPCOne</service-ref-name> - <service-interface>javax.xml.rpc.Service</service-interface> - <wsdl-file>USE_WSDL_OVERRIDE</wsdl-file> - <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws165.Hello</service-endpoint-interface> - </port-component-ref> - </service-ref> - - <service-ref> - <service-ref-name>service/HelloPCTwo</service-ref-name> - <service-interface>javax.xml.rpc.Service</service-interface> - <wsdl-file>USE_WSDL_OVERRIDE</wsdl-file> - <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws165.Hello</service-endpoint-interface> - </port-component-ref> - </service-ref> - - <service-ref> - <service-ref-name>service/HelloContextRoot</service-ref-name> - <service-interface>javax.xml.rpc.Service</service-interface> - <wsdl-file>USE_WSDL_OVERRIDE</wsdl-file> - <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws165.Hello</service-endpoint-interface> - </port-component-ref> - </service-ref> - - <service-ref> - <service-ref-name>service/HelloBoth</service-ref-name> - <service-interface>javax.xml.rpc.Service</service-interface> - <wsdl-file>USE_WSDL_OVERRIDE</wsdl-file> - <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws165.Hello</service-endpoint-interface> - </port-component-ref> - </service-ref> - -</application-client> - Modified: trunk/jbossws-core/src/test/resources/jaxrpc/jbws165/META-INF/application.xml =================================================================== --- trunk/jbossws-core/src/test/resources/jaxrpc/jbws165/META-INF/application.xml 2007-06-03 21:54:02 UTC (rev 3414) +++ trunk/jbossws-core/src/test/resources/jaxrpc/jbws165/META-INF/application.xml 2007-06-03 23:52:32 UTC (rev 3415) @@ -19,9 +19,6 @@ <module> <java>jaxrpc-jbws165-both.jar</java> </module> - <module> - <java>jaxrpc-jbws165-client.jar</java> - </module> </application> Deleted: trunk/jbossws-core/src/test/resources/jaxrpc/jbws165/META-INF/jboss-client.xml =================================================================== --- trunk/jbossws-core/src/test/resources/jaxrpc/jbws165/META-INF/jboss-client.xml 2007-06-03 21:54:02 UTC (rev 3414) +++ trunk/jbossws-core/src/test/resources/jaxrpc/jbws165/META-INF/jboss-client.xml 2007-06-03 23:52:32 UTC (rev 3415) @@ -1,35 +0,0 @@ -<?xml version='1.0' encoding='UTF-8' ?> - -<!DOCTYPE jboss-client PUBLIC - "-//JBoss//DTD Application Client 4.0//EN" - "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> - -<jboss-client> - <jndi-name>jbossws-client</jndi-name> - - <service-ref> - <service-ref-name>service/HelloNone</service-ref-name> - <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws165-jaxrpc-jbws165-none/HelloNone?wsdl</wsdl-override> - </service-ref> - - <service-ref> - <service-ref-name>service/HelloPCOne</service-ref-name> - <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws165-jaxrpc-jbws165-pcuri/Explicit/Path/HelloPCOne?wsdl</wsdl-override> - </service-ref> - - <service-ref> - <service-ref-name>service/HelloPCTwo</service-ref-name> - <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws165-jaxrpc-jbws165-pcuri/Explicit/Path/HelloPCTwo?wsdl</wsdl-override> - </service-ref> - - <service-ref> - <service-ref-name>service/HelloContextRoot</service-ref-name> - <wsdl-override>http://@jboss.bind.address@:8080/Explicit/Context/HelloContextRoot?wsdl</wsdl-override> - </service-ref> - - <service-ref> - <service-ref-name>service/HelloBoth</service-ref-name> - <wsdl-override>http://@jboss.bind.address@:8080/Explicit/Both/Explicit/Path?wsdl</wsdl-override> - </service-ref> - -</jboss-client>

18 years, 5 months

1
0
0 / 0

JBossWS SVN: r3414 - in trunk/integration: jboss42/src/main/java/org/jboss/wsf/container/jboss42 and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-06-03 17:54:02 -0400 (Sun, 03 Jun 2007) New Revision: 3414 Added: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapterFactory.java Modified: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java Log: Fix jboss40 serviceref Modified: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java =================================================================== --- trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java 2007-06-03 21:33:12 UTC (rev 3413) +++ trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java 2007-06-03 21:54:02 UTC (rev 3414) @@ -35,6 +35,7 @@ import org.jboss.ws.core.jaxrpc.client.ServiceReferenceable; import org.jboss.ws.integration.URLLoaderAdapter; import org.jboss.wsf.container.jboss42.DeploymentInfoAdapter; +import org.jboss.wsf.container.jboss42.DeploymentInfoAdapterFactory; import org.jboss.wsf.spi.deployment.BasicDeployment; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.JAXRPCClientDeployment; @@ -70,7 +71,8 @@ // Build the container independent deployment info Deployment dep = new BasicDeployment(); UnifiedDeploymentInfo udi = new JAXRPCClientDeployment(Deployment.DeploymentType.JAXRPC_CLIENT); - new DeploymentInfoAdapter().buildDeploymentInfo(dep, udi, di); + DeploymentInfoAdapter adapter = DeploymentInfoAdapterFactory.getDeploymentInfoAdapter(); + adapter.buildDeploymentInfo(dep, udi, di); UnifiedServiceRefMetaData usr = ServiceRefMetaDataAdapterFactory.newInstance().buildServiceRefMetaData(udi, serviceRef); usr.setVfsRoot(new URLLoaderAdapter(udi.url)); Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java 2007-06-03 21:33:12 UTC (rev 3413) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java 2007-06-03 21:54:02 UTC (rev 3414) @@ -34,6 +34,7 @@ import org.jboss.ws.integration.ResourceLoaderAdapter; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; /** * Build container independent deployment info. @@ -120,10 +121,9 @@ { udi.metaData = applicationMetaDataAdapterEJB21.buildUnifiedApplicationMetaData(dep, udi, (ApplicationMetaData)di.metaData); } - else if (udi.deployedObject != null) + else if (udi.type == DeploymentType.JAXRPC_EJB3 || udi.type == DeploymentType.JAXWS_EJB3) { udi.metaData = applicationMetaDataAdapterEJB3.buildUnifiedApplicationMetaData(dep, udi); - ; } } } Added: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapterFactory.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapterFactory.java (rev 0) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapterFactory.java 2007-06-03 21:54:02 UTC (rev 3414) @@ -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.wsf.container.jboss42; + +// $Id$ + +import org.jboss.kernel.spi.registry.KernelRegistry; +import org.jboss.kernel.spi.registry.KernelRegistryEntry; +import org.jboss.ws.integration.KernelLocator; + +/** + * @author Thomas.Diesler(a)jboss.org + * @since 10-Mar-2007 + */ +public class DeploymentInfoAdapterFactory +{ + // Hide ctor + private DeploymentInfoAdapterFactory() + { + } + + public static DeploymentInfoAdapter getDeploymentInfoAdapter() + { + KernelRegistry registry = KernelLocator.getKernel().getRegistry(); + KernelRegistryEntry entry = registry.getEntry("WSDeploymentInfoAdapter"); + return (DeploymentInfoAdapter)entry.getTarget(); + } +} Property changes on: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapterFactory.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java 2007-06-03 21:33:12 UTC (rev 3413) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java 2007-06-03 21:54:02 UTC (rev 3414) @@ -103,18 +103,18 @@ private void buildMetaData(Deployment dep, UnifiedDeploymentInfo udi, DeploymentUnit unit) throws Exception { - if (unit.getAttachment(Ejb3Deployment.class) != null) + if (unit.getAttachment(WebMetaData.class) != null) { - udi.metaData = applicationMetaDataAdapterEJB3.buildUnifiedApplicationMetaData(dep, udi, unit); + udi.metaData = webMetaDataAdapter.buildUnifiedWebMetaData(dep, udi, unit); + udi.webappURL = udi.vfRoot.toURL(); } else if (unit.getAttachment(ApplicationMetaData.class) != null) { udi.metaData = applicationMetaDataAdapterEJB21.buildUnifiedApplicationMetaData(dep, udi, unit); } - else if (unit.getAttachment(WebMetaData.class) != null) + else if (unit.getAttachment(Ejb3Deployment.class) != null) { - udi.metaData = webMetaDataAdapter.buildUnifiedWebMetaData(dep, udi, unit); - udi.webappURL = udi.vfRoot.toURL(); + udi.metaData = applicationMetaDataAdapterEJB3.buildUnifiedApplicationMetaData(dep, udi, unit); } } }

18 years, 5 months

1
0
0 / 0

JBossWS SVN: r3413 - trunk/integration/native/ant-import.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-06-03 17:33:12 -0400 (Sun, 03 Jun 2007) New Revision: 3413 Modified: trunk/integration/native/ant-import/macros-deploy-native.xml Log: Use move instead of copy Modified: trunk/integration/native/ant-import/macros-deploy-native.xml =================================================================== --- trunk/integration/native/ant-import/macros-deploy-native.xml 2007-06-03 21:20:14 UTC (rev 3412) +++ trunk/integration/native/ant-import/macros-deploy-native.xml 2007-06-03 21:33:12 UTC (rev 3413) @@ -263,14 +263,14 @@ <macrodef name="macro-setup-native40-no-ejb3"> <sequential> - <copy tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service-ejb3.xml" + <move tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service-ejb3.xml" file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service.xml"/> - <copy tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service.xml" + <move tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service.xml" file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service-no-ejb3.xml"/> - <copy tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans-ejb3.xml" + <move tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans-ejb3.xml" file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans.xml"/> - <copy tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans.xml" + <move tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans.xml" file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml"/> </sequential>

18 years, 5 months

1
0
0 / 0

JBossWS SVN: r3412 - trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.0.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-06-03 17:20:14 -0400 (Sun, 03 Jun 2007) New Revision: 3412 Modified: trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.0/config.xml Log: Do not deploy to ejb3 build Modified: trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.0/config.xml 2007-06-03 21:13:04 UTC (rev 3411) +++ trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.0/config.xml 2007-06-03 21:20:14 UTC (rev 3412) @@ -27,10 +27,11 @@ $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # -# deploy to jboss +# build/deploy jbossws-native # -cd $JBWSDIR/jbossws-core -ant $ENVIRONMENT -Djboss40.home=$JBOSS_INSTANCE-ejb3 deploy-jboss40 +cd $JBWSDIR/integration/native +ant $ENVIRONMENT -Djboss40.home=$JBOSS_INSTANCE-ejb3 main +ant $ENVIRONMENT -Djboss40.home=$JBOSS_INSTANCE deploy-jboss40 # # start jbossas

18 years, 5 months

1
0
0 / 0

JBossWS SVN: r3411 - trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.0.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-06-03 17:13:04 -0400 (Sun, 03 Jun 2007) New Revision: 3411 Modified: trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.0/config.xml Log: Fix AS-4.0 tests Modified: trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.0/config.xml 2007-06-03 18:35:01 UTC (rev 3410) +++ trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.0/config.xml 2007-06-03 21:13:04 UTC (rev 3411) @@ -12,7 +12,7 @@ JBWSDIR=$WORKSPACE/jbossws JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/(a)hudson.jboss40.build@ -ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE" +ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss40" # # copy ant.properties @@ -30,7 +30,7 @@ # deploy to jboss # cd $JBWSDIR/jbossws-core -ant $ENVIRONMENT deploy-jboss40 +ant $ENVIRONMENT -Djboss40.home=$JBOSS_INSTANCE-ejb3 deploy-jboss40 # # start jbossas

18 years, 5 months

1
0
0 / 0

JBossWS SVN: r3410 - in trunk/build/hudson/hudson-home/jobs: Distro-Native-AS-5.0 and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-06-03 14:35:01 -0400 (Sun, 03 Jun 2007) New Revision: 3410 Modified: trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml Log: Use jboss40 ejb3 build Modified: trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml 2007-06-03 18:25:10 UTC (rev 3409) +++ trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml 2007-06-03 18:35:01 UTC (rev 3410) @@ -13,7 +13,7 @@ JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@ JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@ -JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/(a)hudson.jboss40.build@ +JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3 JBOSS_INSTANCE=$JBOSS42_INSTANCE ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss50.home=$JBOSS50_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss40.home=$JBOSS40_INSTANCE" Modified: trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml 2007-06-03 18:25:10 UTC (rev 3409) +++ trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml 2007-06-03 18:35:01 UTC (rev 3410) @@ -13,7 +13,7 @@ JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@ JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@ -JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/(a)hudson.jboss40.build@ +JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3 JBOSS_INSTANCE=$JBOSS50_INSTANCE ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS50_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss40.home=$JBOSS40_INSTANCE"

18 years, 5 months

1
0
0 / 0

JBossWS SVN: r3409 - in trunk: build/ant-import and 14 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-06-03 14:25:10 -0400 (Sun, 03 Jun 2007) New Revision: 3409 Added: trunk/integration/native/src/main/etc/bin-dist-deploy.xml trunk/integration/native/src/main/resources/jbossws-native40.sar/META-INF/jboss-service-no-ejb3.xml trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml trunk/integration/sunri/src/main/etc/bin-dist-deploy.xml trunk/integration/xfire/src/main/etc/bin-dist-deploy.xml trunk/jbossws-core/src/main/etc/default.mf Modified: trunk/build/ant-import/build-setup.xml trunk/build/ant.properties.example trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.0/config.xml trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.0/config.xml trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml trunk/integration/native/ant-import/build-bin-dist.xml trunk/integration/native/ant-import/build-deploy.xml trunk/integration/native/ant-import/macros-deploy-native.xml trunk/integration/native/build.xml trunk/integration/native/src/main/etc/bin-dist-build.xml trunk/integration/sunri/ant-import/build-bin-dist.xml trunk/integration/sunri/src/main/etc/bin-dist-build.xml trunk/integration/xfire/ant-import/build-bin-dist.xml trunk/integration/xfire/src/main/etc/bin-dist-build.xml trunk/jbossws-core/build.xml Log: Add support for no-ejb3 Modified: trunk/build/ant-import/build-setup.xml =================================================================== --- trunk/build/ant-import/build-setup.xml 2007-06-03 16:15:04 UTC (rev 3408) +++ trunk/build/ant-import/build-setup.xml 2007-06-03 18:25:10 UTC (rev 3409) @@ -41,21 +41,18 @@ <property name="jboss50.server.lib" value="${jboss50.server}/lib"/> <property name="jboss50.server.deploy" value="${jboss50.server}/deploy"/> <property name="jboss50.server.deployers" value="${jboss50.server}/deployers"/> - <property name="jboss50.thirdparty" value="${jboss50.home}/../../../thirdparty"/> <property name="jboss42.lib" value="${jboss42.home}/lib"/> <property name="jboss42.client" value="${jboss42.home}/client"/> <property name="jboss42.server" value="${jboss42.home}/server/${jboss.server.instance}"/> <property name="jboss42.server.lib" value="${jboss42.server}/lib"/> <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="jbossws.integration.${jbossws.integration.target}" value="true"/> @@ -67,6 +64,8 @@ <available property="jboss42.available" file="${jboss42.available.file}"/> <available property="jboss40.available" file="${jboss40.available.file}"/> + <available property="jboss40.ejb3.available" file="${jboss40.client}/jboss-ejb3-client.jar"/> + <available property="jbossws.portal.content.available" file="${jbossws.portal.content}" type="dir"/>  Modified: trunk/build/ant.properties.example =================================================================== --- trunk/build/ant.properties.example 2007-06-03 16:15:04 UTC (rev 3408) +++ trunk/build/ant.properties.example 2007-06-03 18:25:10 UTC (rev 3409) @@ -37,7 +37,7 @@ 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-ejb3 +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 Modified: trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.0/config.xml 2007-06-03 16:15:04 UTC (rev 3408) +++ trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.0/config.xml 2007-06-03 18:25:10 UTC (rev 3409) @@ -11,7 +11,7 @@ WORKSPACE=`pwd` JBWSDIR=$WORKSPACE/jbossws JBOSS_BINDADDR=(a)jboss.bind.address@ -JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/(a)hudson.jboss40.build@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3 ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE" # Modified: trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.0/config.xml 2007-06-03 16:15:04 UTC (rev 3408) +++ trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.0/config.xml 2007-06-03 18:25:10 UTC (rev 3409) @@ -13,7 +13,7 @@ JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@ JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@ -JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/(a)hudson.jboss40.build@ +JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3 JBOSS_INSTANCE=$JBOSS40_INSTANCE ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss40 -Djboss50.home=$JBOSS50_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss40.home=$JBOSS40_INSTANCE" Modified: trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml 2007-06-03 16:15:04 UTC (rev 3408) +++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml 2007-06-03 18:25:10 UTC (rev 3409) @@ -11,7 +11,7 @@ WORKSPACE=`pwd` JBWSDIR=$WORKSPACE/jbossws JBOSS_BINDADDR=(a)jboss.bind.address@ -JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/(a)hudson.jboss40.build@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build(a)-ejb3 ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE" # Modified: trunk/integration/native/ant-import/build-bin-dist.xml =================================================================== --- trunk/integration/native/ant-import/build-bin-dist.xml 2007-06-03 16:15:04 UTC (rev 3408) +++ trunk/integration/native/ant-import/build-bin-dist.xml 2007-06-03 18:25:10 UTC (rev 3409) @@ -39,6 +39,7 @@ </filterset> </copy> <copy tofile="${bindist.dir}/build.xml" file="${native.etc.dir}/bin-dist-build.xml"/> + <copy tofile="${bindist.build.dir}/build-deploy.xml" file="${native.etc.dir}/bin-dist-deploy.xml"/> <copy todir="${bindist.dir}" file="${native.dir}/version.properties"/>  Modified: trunk/integration/native/ant-import/build-deploy.xml =================================================================== --- trunk/integration/native/ant-import/build-deploy.xml 2007-06-03 16:15:04 UTC (rev 3408) +++ trunk/integration/native/ant-import/build-deploy.xml 2007-06-03 18:25:10 UTC (rev 3409) @@ -69,7 +69,9 @@ </target>  - <target name="deploy-jboss40" depends="jars-jboss40,undeploy-jboss40" description="Deploy jbossws to jboss40"> + <target name="deploy-jboss40" depends="jars-jboss40,undeploy-jboss40,deploy-jboss40-no-ejb3" description="Deploy jbossws to jboss40"/> + + <target name="deploy-jboss40-ejb3"> <macro-deploy-native40 spilibs="${spi.dir}/output/lib" jbosslibs="${int.jboss40.dir}/output/lib" @@ -83,7 +85,17 @@ thirdpartylibs="${spi.dir}/thirdparty" jbosshome="${jboss40.home}"/> </target> - + + <target name="deploy-jboss40-no-ejb3" depends="deploy-jboss40-ejb3" unless="jboss40.ejb3.available"> + <macro-setup-native40-no-ejb3/> + <echo> + *********************************** + * JBossWS EJB3 support disabled * + * All EJB3 tests will fail. * + *********************************** + </echo> + </target> +  <target name="undeploy-jboss40" depends="prepare" description="Remove jbossws from jboss40"> <macro-undeploy-native40/> Modified: trunk/integration/native/ant-import/macros-deploy-native.xml =================================================================== --- trunk/integration/native/ant-import/macros-deploy-native.xml 2007-06-03 16:15:04 UTC (rev 3408) +++ trunk/integration/native/ant-import/macros-deploy-native.xml 2007-06-03 18:25:10 UTC (rev 3409) @@ -96,7 +96,7 @@ <include name="jbossws-jboss50.jar"/> <include name="policy.jar"/> <include name="wsdl4j.jar"/> -  +  <include name="jbossws-wsconsume-impl.jar"/> </fileset> @@ -186,13 +186,13 @@ <include name="jbossws-jboss42.jar"/> <include name="policy.jar"/> <include name="wsdl4j.jar"/> -  +  <include name="jbossws-wsconsume-impl.jar"/> </fileset>  <fileset dir="${jboss42.home}/lib"> -  +  <include name="jbossws-integration.jar"/> </fileset> <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib"> @@ -259,6 +259,22 @@ <unzip dest="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/> </sequential> </macrodef> + + <macrodef name="macro-setup-native40-no-ejb3"> + <sequential> + + <copy tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service-ejb3.xml" + file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service.xml"/> + <copy tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service.xml" + file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service-no-ejb3.xml"/> + + <copy tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans-ejb3.xml" + file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans.xml"/> + <copy tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans.xml" + file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml"/> + + </sequential> + </macrodef> <macrodef name="macro-undeploy-native40"> <sequential> @@ -280,13 +296,14 @@ <include name="policy.jar"/> <include name="stax-api.jar"/> <include name="wsdl4j.jar"/> -  +  <include name="jbossws-wsconsume-impl.jar"/> + <include name="jbossws14-client.jar"/> </fileset>  <fileset dir="${jboss40.home}/lib"> -  +  <include name="jbossws-integration.jar"/> </fileset> <fileset dir="${jboss40.home}/server/${jboss.server.instance}/lib"> @@ -299,6 +316,8 @@ <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>  <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> +  + <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/> </sequential> </macrodef> Modified: trunk/integration/native/build.xml =================================================================== --- trunk/integration/native/build.xml 2007-06-03 16:15:04 UTC (rev 3408) +++ trunk/integration/native/build.xml 2007-06-03 18:25:10 UTC (rev 3409) @@ -114,9 +114,7 @@ <include name="index.html"/> <include name="styles.css"/> </fileset> - <webinf dir="${native.resources.dir}/jbossws-context.war/WEB-INF"> - <include name="jboss-web.xml"/> - </webinf> + <webinf dir="${native.resources.dir}/jbossws-context.war/WEB-INF"/> </war>  @@ -137,9 +135,7 @@ <include name="index.html"/> <include name="styles.css"/> </fileset> - <webinf dir="${native.resources.dir}/jbossws-context.war/WEB-INF"> - <include name="jboss-web.xml"/> - </webinf> + <webinf dir="${native.resources.dir}/jbossws-context.war/WEB-INF"/> </war>  @@ -161,9 +157,7 @@ <metainf dir="${core.dir}/src/main/resources/standard-config"> <include name="standard-*-config.xml"/> </metainf> - <metainf dir="${native.resources.dir}/jbossws-native50.sar/META-INF"> - <include name="jbossws-beans.xml"/> - </metainf> + <metainf dir="${native.resources.dir}/jbossws-native50.sar/META-INF"/> </jar>  @@ -207,10 +201,7 @@ <metainf dir="${core.dir}/src/main/resources/standard-config"> <include name="standard-*-config.xml"/> </metainf> - <metainf dir="${native.resources.dir}/jbossws-native42.sar/META-INF"> - <include name="jboss-service.xml"/> - <include name="jboss-beans.xml"/> - </metainf> + <metainf dir="${native.resources.dir}/jbossws-native42.sar/META-INF"/> </jar> </target> @@ -244,10 +235,7 @@ <metainf dir="${core.dir}/src/main/resources/standard-config"> <include name="standard-*-config.xml"/> </metainf> - <metainf dir="${native.resources.dir}/jbossws-native40.sar/META-INF"> - <include name="jboss-service.xml"/> - <include name="jboss-beans.xml"/> - </metainf> + <metainf dir="${native.resources.dir}/jbossws-native40.sar/META-INF"/> </jar> </target> Modified: trunk/integration/native/src/main/etc/bin-dist-build.xml =================================================================== --- trunk/integration/native/src/main/etc/bin-dist-build.xml 2007-06-03 16:15:04 UTC (rev 3408) +++ trunk/integration/native/src/main/etc/bin-dist-build.xml 2007-06-03 18:25:10 UTC (rev 3409) @@ -11,7 +11,7 @@  -<project default="main" basedir="." name="JBossWS/XFire"> +<project default="main" basedir="." name="JBossWS-Native">   @@ -57,7 +57,10 @@ <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="jboss40.ejb3.available" file="${jboss40.client}/jboss-ejb3-client.jar"/> + <import file="${basedir}/build/build-deploy.xml"/> <import file="${basedir}/build/build-testsuite.xml"/> <import file="${basedir}/build/macros-deploy-spi.xml"/> <import file="${basedir}/build/macros-deploy-native.xml"/> @@ -127,80 +130,6 @@ <target name="tests-main" depends="tests-jars" description="Build the test deployments."/>  -  -  - -  - <target name="deploy-jboss50" depends="prepare" description="Deploy jbossws/native to jboss50"> - <macro-undeploy-sunri50/> - <macro-undeploy-xfire50/> - <macro-deploy-native50 - spilibs="${lib.dir}" - jbosslibs="${lib.dir}" - corelibs="${lib.dir}" - stacklibs="${lib.dir}" - thirdpartylibs="${lib.dir}"/> - - <macro-deploy-spi - spilibs="${lib.dir}" - spiscripts="${bin.dir}" - thirdpartylibs="${lib.dir}" - jbosshome="${jboss50.home}"/> - </target> - -  - <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/native from jboss50"> - <macro-undeploy-native50/> - <macro-undeploy-spi jbosshome="${jboss50.home}"/> - </target> - -  - <target name="deploy-jboss42" depends="prepare" description="Deploy jbossws/native to jboss42"> - <macro-undeploy-sunri42/> - <macro-undeploy-xfire42/> - <macro-deploy-native42 - spilibs="${lib.dir}" - jbosslibs="${lib.dir}" - corelibs="${lib.dir}" - stacklibs="${lib.dir}" - thirdpartylibs="${lib.dir}"/> - - <macro-deploy-spi - spilibs="${lib.dir}" - spiscripts="${bin.dir}" - thirdpartylibs="${lib.dir}" - jbosshome="${jboss42.home}"/> - </target> - -  - <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/native from jboss42"> - <macro-undeploy-native42/> - <macro-undeploy-spi jbosshome="${jboss42.home}"/> - </target> - -  - <target name="deploy-jboss40" depends="prepare" description="Deploy jbossws/native to jboss40"> - <macro-deploy-native40 - spilibs="${lib.dir}" - jbosslibs="${lib.dir}" - corelibs="${lib.dir}" - stacklibs="${lib.dir}" - thirdpartylibs="${lib.dir}"/> - - <macro-deploy-spi - spilibs="${lib.dir}" - spiscripts="${bin.dir}" - thirdpartylibs="${lib.dir}" - jbosshome="${jboss40.home}"/> - </target> - -  - <target name="undeploy-jboss40" depends="prepare" description="Remove jbossws/native from jboss40"> - <macro-undeploy-native40/> - <macro-undeploy-spi jbosshome="${jboss40.home}"/> - </target> - -    Added: trunk/integration/native/src/main/etc/bin-dist-deploy.xml =================================================================== --- trunk/integration/native/src/main/etc/bin-dist-deploy.xml (rev 0) +++ trunk/integration/native/src/main/etc/bin-dist-deploy.xml 2007-06-03 18:25:10 UTC (rev 3409) @@ -0,0 +1,102 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project> + +  +  +  + +  + <target name="deploy-jboss50" depends="undeploy-jboss50" description="Deploy jbossws/native to jboss50"> + <macro-undeploy-sunri50/> + <macro-undeploy-xfire50/> + <macro-deploy-native50 + spilibs="${lib.dir}" + jbosslibs="${lib.dir}" + corelibs="${lib.dir}" + stacklibs="${lib.dir}" + thirdpartylibs="${lib.dir}"/> + + <macro-deploy-spi + spilibs="${lib.dir}" + spiscripts="${bin.dir}" + thirdpartylibs="${lib.dir}" + jbosshome="${jboss50.home}"/> + </target> + +  + <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/native from jboss50"> + <macro-undeploy-native50/> + <macro-undeploy-spi jbosshome="${jboss50.home}"/> + </target> + +  + <target name="deploy-jboss42" depends="undeploy-jboss42" description="Deploy jbossws/native to jboss42"> + <macro-undeploy-sunri42/> + <macro-undeploy-xfire42/> + <macro-deploy-native42 + spilibs="${lib.dir}" + jbosslibs="${lib.dir}" + corelibs="${lib.dir}" + stacklibs="${lib.dir}" + thirdpartylibs="${lib.dir}"/> + + <macro-deploy-spi + spilibs="${lib.dir}" + spiscripts="${bin.dir}" + thirdpartylibs="${lib.dir}" + jbosshome="${jboss42.home}"/> + </target> + +  + <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/native from jboss42"> + <macro-undeploy-native42/> + <macro-undeploy-spi jbosshome="${jboss42.home}"/> + </target> + +  + <target name="deploy-jboss40" depends="deploy-jboss40-no-ejb3" description="Deploy jbossws/native to jboss40"/> + + <target name="deploy-jboss40-ejb3" depends="undeploy-jboss40"> + <macro-deploy-native40 + spilibs="${lib.dir}" + jbosslibs="${lib.dir}" + corelibs="${lib.dir}" + stacklibs="${lib.dir}" + thirdpartylibs="${lib.dir}"/> + + <macro-deploy-spi + spilibs="${lib.dir}" + spiscripts="${bin.dir}" + thirdpartylibs="${lib.dir}" + jbosshome="${jboss40.home}"/> + </target> + + <target name="deploy-jboss40-no-ejb3" depends="deploy-jboss40-ejb3" unless="jboss40.ejb3.available"> + <macro-setup-native40-no-ejb3/> + <echo> + *********************************** + * JBossWS EJB3 support disabled * + * All EJB3 tests will fail. * + *********************************** + </echo> + </target> + +  + <target name="undeploy-jboss40" depends="prepare" description="Remove jbossws/native from jboss40"> + <macro-undeploy-native40/> + <macro-undeploy-spi jbosshome="${jboss40.home}"/> + </target> + +</project> Property changes on: trunk/integration/native/src/main/etc/bin-dist-deploy.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/integration/native/src/main/resources/jbossws-native40.sar/META-INF/jboss-service-no-ejb3.xml =================================================================== --- trunk/integration/native/src/main/resources/jbossws-native40.sar/META-INF/jboss-service-no-ejb3.xml (rev 0) +++ trunk/integration/native/src/main/resources/jbossws-native40.sar/META-INF/jboss-service-no-ejb3.xml 2007-06-03 18:25:10 UTC (rev 3409) @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<server> + +  + <mbean name="jboss.ws:service=WebServiceClientDeployer" code="org.jboss.wsf.container.jboss40.WebServiceClientDeployer"> + <depends>jboss:service=Naming</depends> + </mbean> + +  + <mbean name="jboss.ws:service=DeployerInterceptorJSE" code="org.jboss.wsf.container.jboss42.DeployerInterceptorJSE"> + <depends-list optional-attribute-name="Interceptables"> + <depends-list-element>jboss.web:service=WebServer</depends-list-element> + </depends-list> + </mbean> + +  + <mbean name="jboss.ws:service=DeployerInterceptorEJB21" code="org.jboss.wsf.container.jboss42.DeployerInterceptorEJB21"> + <depends-list optional-attribute-name="Interceptables"> + <depends-list-element>jboss.ejb:service=EJBDeployer</depends-list-element> + </depends-list> + </mbean> + +</server> Property changes on: trunk/integration/native/src/main/resources/jbossws-native40.sar/META-INF/jboss-service-no-ejb3.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml =================================================================== --- trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml (rev 0) +++ trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml 2007-06-03 18:25:10 UTC (rev 3409) @@ -0,0 +1,221 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<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.wsf.container.jboss42.ManagedServerConfig"> +  + <property name="webServiceHost">${jboss.bind.address}</property> + <property name="modifySOAPAddress">true</property> + +  + </bean> + +  + <bean name="WSEndpointRegistry" class="org.jboss.wsf.stack.jbws.ManagedEndpointRegistry"/> + +  + <bean name="WSSubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager"> + <property name="bindAddress">${jboss.bind.address}</property> + </bean> + +  +  + <bean name="ServiceRefHandler" class="org.jboss.ws.core.client.ServiceRefHandlerImpl"/> + +  + <bean name="WSKernelLocator" class="org.jboss.ws.integration.KernelLocator"> + <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property> + </bean> + +  + +  + <bean name="WSDeployerManagerJSE" class="org.jboss.wsf.spi.deployment.BasicDeployerManager"> + <property name="deployers"> + <list class="java.util.LinkedList" elementClass="org.jboss.wsf.spi.deployment.Deployer"> + <inject bean="WSUnifiedDeploymentInfoDeployer"/> + <inject bean="WSContextRootDeployer"/> + <inject bean="WSURLPatternDeployer"/> + <inject bean="WSUnifiedMetaDataDeployer"/> + <inject bean="WSUnifiedMetaDataAssociationDeployer"/> + <inject bean="WSModifyWebMetaDataDeployer"/> + </list> + </property> + </bean> + <bean name="WSDeployerManagerEJB" class="org.jboss.wsf.spi.deployment.BasicDeployerManager"> + <property name="deployers"> + <list class="java.util.LinkedList" elementClass="org.jboss.wsf.spi.deployment.Deployer"> + <inject bean="WSUnifiedDeploymentInfoDeployer"/> + <inject bean="WSContextRootDeployer"/> + <inject bean="WSURLPatternDeployer"/> + <inject bean="WSUnifiedMetaDataDeployer"/> + <inject bean="WSUnifiedMetaDataAssociationDeployer"/> + <inject bean="WSWebAppGeneratorDeployer"/> + <inject bean="WSWebAppDeployerDeployer"/> + </list> + </property> + </bean> + <bean name="WSMainDeployerManager" class="org.jboss.wsf.spi.deployment.BasicDeployerManager"> + <property name="deployers"> + <list class="java.util.LinkedList" elementClass="org.jboss.wsf.spi.deployment.Deployer"> + <inject bean="WSEndpointNameDeployer"/> + <inject bean="WSEndpointHandlerDeployer"/> + <inject bean="WSPublishContractDeployer"/> + <inject bean="WSClassLoaderInjectionDeployer"/> + <inject bean="WSServiceEndpointInvokerDeployer"/> + <inject bean="WSEagerInitializeDeployer"/> + <inject bean="WSEventingDeployer"/> + <inject bean="WSEndpointRegistryDeployer"/> + <inject bean="WSEndpointLifecycleDeployer"/> + </list> + </property> + </bean> + +  + <bean name="WSClassLoaderInjectionDeployer" class="org.jboss.wsf.container.jboss42.ClassLoaderInjectionDeployer"/> + <bean name="WSContextRootDeployer" class="org.jboss.wsf.spi.deployment.ContextRootDeployer"/> + <bean name="WSEagerInitializeDeployer" class="org.jboss.wsf.stack.jbws.EagerInitializeDeployer"/> + <bean name="WSEndpointHandlerDeployer" class="org.jboss.wsf.spi.deployment.EndpointHandlerDeployer"> + <property name="requestHandler">org.jboss.wsf.stack.jbws.RequestHandlerImpl</property> + <property name="lifecycleHandler">org.jboss.wsf.stack.jbws.LifecycleHandlerImpl</property> + <property name="invocationHandler"> + <map keyClass="java.lang.String" valueClass="java.lang.String"> + <entry><key>JAXRPC_JSE</key><value>org.jboss.wsf.stack.jbws.ServiceLifecycleInvocationHandler</value></entry> + <entry><key>JAXRPC_EJB21</key><value>org.jboss.wsf.container.jboss42.InvocationHandlerEJB21</value></entry> + <entry><key>JAXWS_JSE</key><value>org.jboss.wsf.stack.jbws.ServiceLifecycleInvocationHandler</value></entry> + </map> + </property> + </bean> + <bean name="WSEndpointLifecycleDeployer" class="org.jboss.wsf.spi.deployment.EndpointLifecycleDeployer"/> + <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.stack.jbws.EndpointNameDeployer"/> + <bean name="WSEndpointRegistryDeployer" class="org.jboss.wsf.spi.deployment.EndpointRegistryDeployer"/> + <bean name="WSEventingDeployer" class="org.jboss.wsf.stack.jbws.EventingDeployer"/> + <bean name="WSModifyWebMetaDataDeployer" class="org.jboss.wsf.container.jboss42.ModifyWebMetaDataDeployer"> + <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property> + </bean> + <bean name="WSPublishContractDeployer" class="org.jboss.wsf.stack.jbws.PublishContractDeployer"/> + <bean name="WSServiceEndpointInvokerDeployer" class="org.jboss.wsf.stack.jbws.ServiceEndpointInvokerDeployer"/> + <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.wsf.container.jboss42.UnifiedDeploymentInfoDeployer"> + <property name="deploymentInfoAdapter"><inject bean="WSDeploymentInfoAdapter"/></property> + </bean> + <bean name="WSUnifiedMetaDataAssociationDeployer" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataAssociationDeployer"/> + <bean name="WSUnifiedMetaDataDeployer" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeployer"/> + <bean name="WSURLPatternDeployer" class="org.jboss.wsf.spi.deployment.URLPatternDeployer"/> + <bean name="WSWebAppGeneratorDeployer" class="org.jboss.wsf.spi.deployment.WebAppGeneratorDeployer"> + <property name="securityHandlerEJB21"><inject bean="WSSecurityHandlerEJB21"/></property> + </bean> + <bean name="WSWebAppDeployerDeployer" class="org.jboss.wsf.container.jboss42.WebAppDeployerDeployer"> + <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property> + </bean> + +  + <bean name="WSApplicationMetaDataAdapterEJB21" class="org.jboss.wsf.container.jboss40.ApplicationMetaDataAdapterEJB21"/> + <bean name="WSDeploymentInfoAdapter" class="org.jboss.wsf.container.jboss42.DeploymentInfoAdapter"> + <property name="applicationMetaDataAdapterEJB21"><inject bean="WSApplicationMetaDataAdapterEJB21"/></property> + <property name="webMetaDataAdapter"><inject bean="WSWebMetaDataAdapter"/></property> + </bean> + <bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB21"/> + <bean name="WSServiceRefMetaDataAdapter" class="org.jboss.wsf.container.jboss40.ServiceRefMetaDataAdapter"/> + <bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.stack.jbws.WebAppDesciptorModifierImpl"> + <property name="servletClass">org.jboss.wsf.stack.jbws.ServiceEndpointServlet</property> + </bean> + <bean name="WSWebMetaDataAdapter" class="org.jboss.wsf.container.jboss42.WebMetaDataAdapter"/> + <bean name="WSWebXMLRewriter" class="org.jboss.wsf.spi.deployment.WebXMLRewriter"> + <property name="desciptorModifier"><inject bean="WSWebAppDesciptorModifier"/></property> + </bean> + +  + <bean name="WSDeployerHook_JAXRPC_JSE" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookJSE"> + <property name="deploymentClass">org.jboss.wsf.stack.jbws.UnifiedMetaDataDeployment</property> + <property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property> + <property name="deployerManager"><inject bean="WSDeployerManagerJSE"/></property> + <property name="phaseOneInterceptors"> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorJSE</value> + </list> + </property> + </bean> + <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookEJB21"> + <property name="deploymentClass">org.jboss.wsf.stack.jbws.UnifiedMetaDataDeployment</property> + <property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property> + <property name="deployerManager"><inject bean="WSDeployerManagerEJB"/></property> + <property name="phaseOneInterceptors"> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorEJB21</value> + </list> + </property> + </bean> + <bean name="WSDeployerHook_JAXWS_JSE" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookJSE"> + <property name="deploymentClass">org.jboss.wsf.stack.jbws.UnifiedMetaDataDeployment</property> + <property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property> + <property name="deployerManager"><inject bean="WSDeployerManagerJSE"/></property> + <property name="phaseOneInterceptors"> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorJSE</value> + </list> + </property> + </bean> + <bean name="WSMainDeployerHook" class="org.jboss.wsf.container.jboss42.MainDeployerHook"> + <property name="deployerManager"><inject bean="WSMainDeployerManager"/></property> + <property name="phaseTwoInterceptors"> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorJSE</value> + <value>jboss.ws:service=DeployerInterceptorEJB21</value> + </list> + </property> + </bean> + +</deployment> Property changes on: trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/integration/sunri/ant-import/build-bin-dist.xml =================================================================== --- trunk/integration/sunri/ant-import/build-bin-dist.xml 2007-06-03 16:15:04 UTC (rev 3408) +++ trunk/integration/sunri/ant-import/build-bin-dist.xml 2007-06-03 18:25:10 UTC (rev 3409) @@ -42,6 +42,7 @@ </filterset> </copy> <copy tofile="${bindist.dir}/build.xml" file="${sunri.etc.dir}/bin-dist-build.xml"/> + <copy tofile="${bindist.build.dir}/build-deploy.xml" file="${sunri.etc.dir}/bin-dist-deploy.xml"/> <copy todir="${bindist.dir}" file="${sunri.dir}/version.properties"/>  Modified: trunk/integration/sunri/src/main/etc/bin-dist-build.xml =================================================================== --- trunk/integration/sunri/src/main/etc/bin-dist-build.xml 2007-06-03 16:15:04 UTC (rev 3408) +++ trunk/integration/sunri/src/main/etc/bin-dist-build.xml 2007-06-03 18:25:10 UTC (rev 3409) @@ -11,7 +11,7 @@  -<project default="main" basedir="." name="JBossWS/SunRI"> +<project default="main" basedir="." name="JBossWS-SunRI">   @@ -49,6 +49,7 @@ <available property="jboss50.available" file="${jboss50.available.file}"/> <available property="jboss42.available" file="${jboss42.available.file}"/> + <import file="${basedir}/build/build-deploy.xml"/> <import file="${basedir}/build/build-testsuite.xml"/> <import file="${basedir}/build/macros-deploy-spi.xml"/> <import file="${basedir}/build/macros-deploy-native.xml"/> @@ -124,56 +125,6 @@ <target name="tests-main" depends="tests-jars" description="Build the test deployments."/>  -  -  - -  - <target name="deploy-jboss50" depends="prepare" description="Deploy jbossws/sunri to jboss50"> - <macro-undeploy-native50/> - <macro-undeploy-xfire50/> - <macro-deploy-sunri50 - spilibs="${lib.dir}" - jbosslibs="${lib.dir}" - stacklibs="${lib.dir}" - thirdpartylibs="${lib.dir}"/> - - <macro-deploy-spi - spilibs="${lib.dir}" - spiscripts="${build.dir}" - thirdpartylibs="${lib.dir}" - jbosshome="${jboss50.home}"/> - </target> - -  - <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/sunri from jboss50"> - <macro-undeploy-sunri50/> - <macro-undeploy-spi jbosshome="${jboss50.home}"/> - </target> - -  - <target name="deploy-jboss42" depends="prepare" description="Deploy jbossws/sunri to jboss42"> - <macro-undeploy-native42/> - <macro-undeploy-xfire42/> - <macro-deploy-sunri42 - spilibs="${lib.dir}" - jbosslibs="${lib.dir}" - stacklibs="${lib.dir}" - thirdpartylibs="${lib.dir}"/> - - <macro-deploy-spi - spilibs="${lib.dir}" - spiscripts="${build.dir}" - thirdpartylibs="${lib.dir}" - jbosshome="${jboss42.home}"/> - </target> - -  - <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/sunri from jboss42"> - <macro-undeploy-sunri42/> - <macro-undeploy-spi jbosshome="${jboss42.home}"/> - </target> - -    Added: trunk/integration/sunri/src/main/etc/bin-dist-deploy.xml =================================================================== --- trunk/integration/sunri/src/main/etc/bin-dist-deploy.xml (rev 0) +++ trunk/integration/sunri/src/main/etc/bin-dist-deploy.xml 2007-06-03 18:25:10 UTC (rev 3409) @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project> + +  +  +  + +  + <target name="deploy-jboss50" depends="undeploy-jboss50" description="Deploy jbossws/sunri to jboss50"> + <macro-undeploy-native50/> + <macro-undeploy-xfire50/> + <macro-deploy-sunri50 + spilibs="${lib.dir}" + jbosslibs="${lib.dir}" + stacklibs="${lib.dir}" + thirdpartylibs="${lib.dir}"/> + + <macro-deploy-spi + spilibs="${lib.dir}" + spiscripts="${build.dir}" + thirdpartylibs="${lib.dir}" + jbosshome="${jboss50.home}"/> + </target> + +  + <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/sunri from jboss50"> + <macro-undeploy-sunri50/> + <macro-undeploy-spi jbosshome="${jboss50.home}"/> + </target> + +  + <target name="deploy-jboss42" depends="undeploy-jboss42" description="Deploy jbossws/sunri to jboss42"> + <macro-undeploy-native42/> + <macro-undeploy-xfire42/> + <macro-deploy-sunri42 + spilibs="${lib.dir}" + jbosslibs="${lib.dir}" + stacklibs="${lib.dir}" + thirdpartylibs="${lib.dir}"/> + + <macro-deploy-spi + spilibs="${lib.dir}" + spiscripts="${build.dir}" + thirdpartylibs="${lib.dir}" + jbosshome="${jboss42.home}"/> + </target> + +  + <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/sunri from jboss42"> + <macro-undeploy-sunri42/> + <macro-undeploy-spi jbosshome="${jboss42.home}"/> + </target> + +</project> Property changes on: trunk/integration/sunri/src/main/etc/bin-dist-deploy.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/integration/xfire/ant-import/build-bin-dist.xml =================================================================== --- trunk/integration/xfire/ant-import/build-bin-dist.xml 2007-06-03 16:15:04 UTC (rev 3408) +++ trunk/integration/xfire/ant-import/build-bin-dist.xml 2007-06-03 18:25:10 UTC (rev 3409) @@ -44,6 +44,7 @@ </filterset> </copy> <copy tofile="${bindist.dir}/build.xml" file="${xfire.etc.dir}/bin-dist-build.xml"/> + <copy tofile="${bindist.build.dir}/build-deploy.xml" file="${xfire.etc.dir}/bin-dist-deploy.xml"/> <copy todir="${bindist.dir}" file="${xfire.dir}/version.properties"/>  Modified: trunk/integration/xfire/src/main/etc/bin-dist-build.xml =================================================================== --- trunk/integration/xfire/src/main/etc/bin-dist-build.xml 2007-06-03 16:15:04 UTC (rev 3408) +++ trunk/integration/xfire/src/main/etc/bin-dist-build.xml 2007-06-03 18:25:10 UTC (rev 3409) @@ -11,7 +11,7 @@  -<project default="main" basedir="." name="JBossWS/XFire"> +<project default="main" basedir="." name="JBossWS-XFire">   @@ -50,6 +50,7 @@ <available property="jboss50.available" file="${jboss50.available.file}"/> <available property="jboss42.available" file="${jboss42.available.file}"/> + <import file="${basedir}/build/build-deploy.xml"/> <import file="${basedir}/build/build-testsuite.xml"/> <import file="${basedir}/build/macros-deploy-spi.xml"/> <import file="${basedir}/build/macros-deploy-native.xml"/> @@ -143,56 +144,6 @@ <target name="tests-main" depends="tests-jars" description="Build the test deployments."/>  -  -  - -  - <target name="deploy-jboss50" depends="prepare" description="Deploy jbossws/xfire to jboss50"> - <macro-undeploy-native50/> - <macro-undeploy-sunri50/> - <macro-deploy-xfire50 - spilibs="${lib.dir}" - jbosslibs="${lib.dir}" - stacklibs="${lib.dir}" - thirdpartylibs="${lib.dir}"/> - - <macro-deploy-spi - spilibs="${lib.dir}" - spiscripts="${bin.dir}" - thirdpartylibs="${lib.dir}" - jbosshome="${jboss50.home}"/> - </target> - -  - <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/xfire from jboss50"> - <macro-undeploy-xfire50/> - <macro-undeploy-spi jbosshome="${jboss50.home}"/> - </target> - -  - <target name="deploy-jboss42" depends="prepare" description="Deploy jbossws/xfire to jboss42"> - <macro-undeploy-native42/> - <macro-undeploy-sunri42/> - <macro-deploy-xfire42 - spilibs="${lib.dir}" - jbosslibs="${lib.dir}" - stacklibs="${lib.dir}" - thirdpartylibs="${lib.dir}"/> - - <macro-deploy-spi - spilibs="${lib.dir}" - spiscripts="${bin.dir}" - thirdpartylibs="${lib.dir}" - jbosshome="${jboss42.home}"/> - </target> - -  - <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/xfire from jboss42"> - <macro-undeploy-xfire42/> - <macro-undeploy-spi jbosshome="${jboss42.home}"/> - </target> - -    Added: trunk/integration/xfire/src/main/etc/bin-dist-deploy.xml =================================================================== --- trunk/integration/xfire/src/main/etc/bin-dist-deploy.xml (rev 0) +++ trunk/integration/xfire/src/main/etc/bin-dist-deploy.xml 2007-06-03 18:25:10 UTC (rev 3409) @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project> + +  +  +  + +  + <target name="deploy-jboss50" depends="undeploy-jboss50" description="Deploy jbossws/xfire to jboss50"> + <macro-undeploy-native50/> + <macro-undeploy-sunri50/> + <macro-deploy-xfire50 + spilibs="${lib.dir}" + jbosslibs="${lib.dir}" + stacklibs="${lib.dir}" + thirdpartylibs="${lib.dir}"/> + + <macro-deploy-spi + spilibs="${lib.dir}" + spiscripts="${bin.dir}" + thirdpartylibs="${lib.dir}" + jbosshome="${jboss50.home}"/> + </target> + +  + <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/xfire from jboss50"> + <macro-undeploy-xfire50/> + <macro-undeploy-spi jbosshome="${jboss50.home}"/> + </target> + +  + <target name="deploy-jboss42" depends="undeploy-jboss42" description="Deploy jbossws/xfire to jboss42"> + <macro-undeploy-native42/> + <macro-undeploy-sunri42/> + <macro-deploy-xfire42 + spilibs="${lib.dir}" + jbosslibs="${lib.dir}" + stacklibs="${lib.dir}" + thirdpartylibs="${lib.dir}"/> + + <macro-deploy-spi + spilibs="${lib.dir}" + spiscripts="${bin.dir}" + thirdpartylibs="${lib.dir}" + jbosshome="${jboss42.home}"/> + </target> + +  + <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/xfire from jboss42"> + <macro-undeploy-xfire42/> + <macro-undeploy-spi jbosshome="${jboss42.home}"/> + </target> + +</project> Property changes on: trunk/integration/xfire/src/main/etc/bin-dist-deploy.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/jbossws-core/build.xml =================================================================== --- trunk/jbossws-core/build.xml 2007-06-03 16:15:04 UTC (rev 3408) +++ trunk/jbossws-core/build.xml 2007-06-03 18:25:10 UTC (rev 3409) @@ -82,14 +82,11 @@ <mkdir dir="${core.output.etc.dir}"/> <copy todir="${core.output.etc.dir}" filtering="yes"> <fileset dir="${core.etc.dir}"/> - <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}"/> + <filter token="implementation.version" value="jbossws-native-${version.id}"/> <filtersfile file="${build.dir}/version.properties"/> <filtersfile file="${core.dir}/version.properties"/> </filterset> Added: trunk/jbossws-core/src/main/etc/default.mf =================================================================== --- trunk/jbossws-core/src/main/etc/default.mf (rev 0) +++ trunk/jbossws-core/src/main/etc/default.mf 2007-06-03 18:25:10 UTC (rev 3409) @@ -0,0 +1,12 @@ +Manifest-Version: 1.0 +Created-By: @java.vm.version@ (@java.vm.vendor@) +Specification-Title: @specification.title@ +Specification-Version: @specification.version@ +Specification-Vendor: @specification.vendor@ +Implementation-Title: @implementation.title@ +Implementation-URL: @implementation.url@ +Implementation-Version: @implementation.version@ (build=(a)build.id@) +Implementation-Vendor: @implementation.vendor@ +Implementation-Vendor-Id: @implementation.vendor.id@ +Class-Path: jbossws-spi.jar jboss-jaxrpc.jar jboss-jaxws.jar + jboss-saaj.jar \ No newline at end of file

18 years, 5 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits June 2007