[jbossws-commits] JBossWS SVN: r3395 - in trunk: build/ant-import and 69 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Sat Jun 2 16:38:34 EDT 2007
Author: thomas.diesler at jboss.com
Date: 2007-06-02 16:38:33 -0400 (Sat, 02 Jun 2007)
New Revision: 3395
Added:
trunk/build/hudson/hudson-home/jobs/AS-4.0/
trunk/build/hudson/hudson-home/jobs/AS-4.0/config.xml
trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.0/
trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.0/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.0/
trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.0/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0/
trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml
trunk/integration/jboss40/
trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/
trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ApplicationMetaDataAdapterEJB21.java
trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerEJB3.java
trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapter.java
trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapterFactory.java
trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java
trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployerMBean.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractApplicationMetaDataAdapter.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapterEJB21.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapterEJB3.java
trunk/integration/native/src/main/resources/jbossws-native40.sar/
trunk/integration/native/src/test/resources/excludes-jboss40.txt
trunk/integration/native/src/test/resources/excludes-none.txt
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/DocumentHandler.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647DocumentTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647RPCTestCase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/RpcHandler.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/TestCaseBase.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpointImpl.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_RequestStruct.java
trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_ResponseStruct.java
trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/
trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/doclit/
trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/doclit/WEB-INF/
trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/doclit/WEB-INF/jaxrpc-mapping.xml
trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/doclit/WEB-INF/web.xml
trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/doclit/WEB-INF/webservices.xml
trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/doclit/WEB-INF/wsdl/
trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/doclit/WEB-INF/wsdl/TestService.wsdl
trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/doclit/wstools-config.xml
trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/rpclit/
trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/rpclit/WEB-INF/
trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/rpclit/WEB-INF/jaxrpc-mapping.xml
trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/rpclit/WEB-INF/web.xml
trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/rpclit/WEB-INF/webservices.xml
trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/rpclit/WEB-INF/wsdl/
trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/rpclit/WEB-INF/wsdl/TestService.wsdl
trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/rpclit/wstools-config.xml
trunk/jbossws-core/src/test/resources/tests-jboss40-excludes.txt
Removed:
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/jboss40/src/main/java/org/jboss/wsf/container/jboss42/
trunk/integration/jboss40/src/main/resources/
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapter.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdaptorEJB3.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapterFactory.java
trunk/integration/native/src/test/resources/excludes-jboss42.txt
trunk/integration/native/src/test/resources/excludes-jboss50.txt
Modified:
trunk/build/ant-import/build-setup.xml
trunk/build/ant-import/build-testsuite.xml
trunk/build/ant.properties.example
trunk/build/build.xml
trunk/build/dist/ant.properties.example
trunk/build/hudson/hudson-home/config.xml
trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml
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
trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml
trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml
trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml
trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml
trunk/integration/jboss40/.classpath
trunk/integration/jboss40/.project
trunk/integration/jboss40/ant-import/build-release.xml
trunk/integration/jboss40/ant-import/build-thirdparty.xml
trunk/integration/jboss40/build.xml
trunk/integration/jboss40/src/main/etc/component-info.xml
trunk/integration/jboss42/.classpath
trunk/integration/jboss42/build.xml
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/UnifiedDeploymentInfoDeployer.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebMetaDataAdapter.java
trunk/integration/jboss50/.classpath
trunk/integration/jboss50/build.xml
trunk/integration/native/.classpath
trunk/integration/native/ant-import/build-bin-dist.xml
trunk/integration/native/ant-import/build-deploy.xml
trunk/integration/native/ant-import/build-testsuite.xml
trunk/integration/native/ant-import/macros-deploy-native.xml
trunk/integration/native/build.xml
trunk/integration/native/src/main/etc/bindist-build.xml
trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointServlet.java
trunk/integration/native/src/main/resources/jbossws-native40.sar/META-INF/jboss-service.xml
trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml
trunk/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml
trunk/integration/spi/.classpath
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/EndpointServlet.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTest.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestHelper.java
trunk/integration/sunri/.classpath
trunk/integration/sunri/ant-import/build-testsuite.xml
trunk/integration/sunri/build.xml
trunk/integration/xfire/.classpath
trunk/integration/xfire/ant-import/build-testsuite.xml
trunk/integration/xfire/build.xml
trunk/jbossws-core/.classpath
trunk/jbossws-core/ant-import-tests/build-jars-jaxrpc.xml
trunk/jbossws-core/ant-import-tests/build-testsuite.xml
trunk/jbossws-core/ant-import/build-deploy.xml
trunk/jbossws-core/build.xml
trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java
trunk/jbossws-core/src/test/resources/tests-jboss42-excludes.txt
trunk/jbossws-core/src/test/resources/tests-jboss50-excludes.txt
trunk/testsuite/.classpath
trunk/testsuite/ant-import/build-testsuite.xml
trunk/testsuite/build.xml
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webmethod/WebMethodTestCase.java
Log:
Add support for AS-4.0
Modified: trunk/build/ant-import/build-setup.xml
===================================================================
--- trunk/build/ant-import/build-setup.xml 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/build/ant-import/build-setup.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -23,6 +23,7 @@
<property name="testsuite.dir" value="${basedir}/testsuite"/>
<property name="int.jboss50.dir" value="${basedir}/integration/jboss50"/>
<property name="int.jboss42.dir" value="${basedir}/integration/jboss42"/>
+ <property name="int.jboss40.dir" value="${basedir}/integration/jboss40"/>
<property name="int.native.dir" value="${basedir}/integration/native"/>
<property name="int.sunri.dir" value="${basedir}/integration/sunri"/>
<property name="int.xfire.dir" value="${basedir}/integration/xfire"/>
@@ -45,13 +46,22 @@
<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"/>
<property name="jboss50.available.file" value="${jboss50.client}/jboss-ejb3-client.jar"/>
<property name="jboss42.available.file" value="${jboss42.client}/jboss-client.jar"/>
+ <property name="jboss40.available.file" value="${jboss40.client}/jboss-client.jar"/>
<available property="jboss50.available" file="${jboss50.available.file}"/>
<available property="jboss42.available" file="${jboss42.available.file}"/>
+ <available property="jboss40.available" file="${jboss40.available.file}"/>
<available property="jbossws.portal.content.available" file="${jbossws.portal.content}" type="dir"/>
Modified: trunk/build/ant-import/build-testsuite.xml
===================================================================
--- trunk/build/ant-import/build-testsuite.xml 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/build/ant-import/build-testsuite.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -10,6 +10,17 @@
<project>
+ <!-- Define jboss.home -->
+ <condition property="jboss.home" value="${jboss50.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss50"/>
+ </condition>
+ <condition property="jboss.home" value="${jboss42.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss42"/>
+ </condition>
+ <condition property="jboss.home" value="${jboss40.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss40"/>
+ </condition>
+
<!-- ================================================================== -->
<!-- Setup -->
<!-- ================================================================== -->
@@ -82,7 +93,7 @@
</tstamp>
</target>
- <target name="tests-classpath" depends="tests-classpath-jboss50,tests-classpath-jboss42"/>
+ <target name="tests-classpath" depends="tests-classpath-jboss50,tests-classpath-jboss42,tests-classpath-jboss40"/>
<target name="tests-classpath-jboss50" depends="tests-prepare" if="jbossws.integration.jboss50">
<path id="tests.javac.classpath">
@@ -154,6 +165,40 @@
</path>
</target>
+ <target name="tests-classpath-jboss40" depends="tests-prepare" if="jbossws.integration.jboss40">
+ <path id="tests.javac.classpath">
+ <path refid="ws.stack.classpath"/>
+ <path refid="tests.extra.classpath"/>
+ <pathelement location="${jboss.client}/activation.jar"/>
+ <pathelement location="${jboss.client}/jaxb-api.jar"/>
+ <pathelement location="${jboss.client}/jaxb-impl.jar"/>
+ <pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/>
+ <pathelement location="${jboss.client}/jboss-common-client.jar"/>
+ <pathelement location="${jboss.client}/jboss-ejb3x.jar"/>
+ <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>
+ <pathelement location="${jboss.client}/jboss-j2ee.jar"/>
+ <pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
+ <pathelement location="${jboss.client}/mail.jar"/>
+ <pathelement location="${jboss.client}/stax-api.jar"/>
+ <pathelement location="${jboss.client}/jbosssx-client.jar"/>
+ <pathelement location="${jboss.server.lib}/javax.servlet.jar"/>
+ </path>
+ <path id="tests.client.classpath">
+ <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}/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"/>
+ <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/>
+ <pathelement location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/>
+ <path refid="tests.javac.classpath"/>
+ </path>
+ </target>
+
<!-- ================================================================== -->
<!-- Compiling -->
<!-- ================================================================== -->
Modified: trunk/build/ant.properties.example
===================================================================
--- trunk/build/ant.properties.example 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/build/ant.properties.example 2007-06-02 20:38:33 UTC (rev 3395)
@@ -6,6 +6,7 @@
# Optional JBoss Home
#jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3
#jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA
+#jboss40.home=/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1
# The JBoss server under test. This can be [jboss50|jboss42]
jbossws.integration.target=jboss50
@@ -35,6 +36,10 @@
hudson.jboss42.build=jboss-4.2.0.GA
hudson.jboss42.rev=HEAD
+hudson.jboss40.url=https://svn.jboss.org/repos/jbossas/branches/Branch_4_0
+hudson.jboss40.build=jboss-4.0.5.SP1
+hudson.jboss40.rev=HEAD
+
hudson.mail.recipients=thomas.diesler at jboss.com, heiko.braun at jboss.com
hudson.smtp.host=mail.navisite.com
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/build/build.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -14,29 +14,29 @@
<!--
The JBossWS project is organised like this
- +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~+
- Target Container: | AS-5.0 | | AS-4.2 | | |
- +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | |
- +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | |
- Container Integration: | jbossws-jboss50 | | jbossws-jboss42 | | |
- +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | |
- +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~+ | |
- WS SPI: | jbossws-spi | | |
- +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~+ | |
- +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | |
- WS Stack Integration: | jbossws-native | | jbossws-sunri | | jbossws-xfire | | |
- +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | |
- +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | |
- WS Stack: | jbossws-core | | Sun JAXWS | | Codehaus XFire | | |
- +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | |
- WS-* Extensions: +~+ +~+ +~+ +~+ +~+ +~+ | |
- | | | | | | | | | | | | | |
- | | | | | | | | | | | | | |
- | | | | | | | | | | | | | |
- | | | | | | | | | | | | | |
- | | | | | | | | | | | | | |
- +~+ +~+ +~+ +~+ +~+ +~+ +~~~~+
- JAXWS Testsuite
+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~+
+ Target Container: | AS-5.0 | | AS-4.2 | | AS-4.0 | | |
+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | |
+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | |
+ Container Integration: | jbossws-jboss50 | | jbossws-jboss42 | | jbossws-jboss40 | | |
+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | |
+ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~+ | |
+ WS SPI: | jbossws-spi | | |
+ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~+ | |
+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | |
+ WS Stack Integration: | jbossws-native | | jbossws-sunri | | jbossws-xfire | | |
+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | |
+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | |
+ WS Stack: | jbossws-core | | Sun JAXWS | | Codehaus XFire | | |
+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | |
+ WS-* Extensions: +~+ +~+ +~+ +~+ +~+ +~+ | |
+ | | | | | | | | | | | | | |
+ | | | | | | | | | | | | | |
+ | | | | | | | | | | | | | |
+ | | | | | | | | | | | | | |
+ | | | | | | | | | | | | | |
+ +~+ +~+ +~+ +~+ +~+ +~+ +~~~~+
+ JAXWS Testsuite
Typically you would build, deploy, test one of the WS stacks against one of the supported target containers.
@@ -128,6 +128,7 @@
<ant antfile="${core.dir}/build.xml" target="clean" inheritall="false"/>
<ant antfile="${int.jboss50.dir}/build.xml" target="clean" inheritall="false"/>
<ant antfile="${int.jboss42.dir}/build.xml" target="clean" inheritall="false"/>
+ <ant antfile="${int.jboss40.dir}/build.xml" target="clean" inheritall="false"/>
<ant antfile="${testsuite.dir}/build.xml" target="clean" inheritall="false"/>
<ant antfile="${int.native.dir}/build.xml" target="clean" inheritall="false"/>
<ant antfile="${int.sunri.dir}/build.xml" target="clean" inheritall="false"/>
@@ -140,6 +141,7 @@
<ant antfile="${testsuite.dir}/build.xml" target="clobber" inheritall="false"/>
<ant antfile="${int.jboss50.dir}/build.xml" target="clobber" inheritall="false"/>
<ant antfile="${int.jboss42.dir}/build.xml" target="clobber" inheritall="false"/>
+ <ant antfile="${int.jboss40.dir}/build.xml" target="clobber" inheritall="false"/>
<ant antfile="${int.native.dir}/build.xml" target="clobber" inheritall="false"/>
<ant antfile="${int.sunri.dir}/build.xml" target="clobber" inheritall="false"/>
<ant antfile="${int.xfire.dir}/build.xml" target="clobber" inheritall="false"/>
Modified: trunk/build/dist/ant.properties.example
===================================================================
--- trunk/build/dist/ant.properties.example 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/build/dist/ant.properties.example 2007-06-02 20:38:33 UTC (rev 3395)
@@ -6,8 +6,9 @@
# Optional JBoss Home
jboss50.home=@jboss50.home@
jboss42.home=@jboss42.home@
+jboss40.home=@jboss40.home@
-# The JBoss server under test. This can be [jboss50|jboss42]
+# The JBoss server under test. This can be [jboss50|jboss42|jboss40]
jbossws.integration.target=jboss50
# The JBoss settings
Modified: trunk/build/hudson/hudson-home/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/config.xml 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/build/hudson/hudson-home/config.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -17,6 +17,7 @@
<table>
<tr><th align=left>@hudson.jboss50.build@</th><td>-r at hudson.jboss50.rev@ @hudson.jboss50.url@</td></tr>
<tr><th align=left>@hudson.jboss42.build@</th><td>-r at hudson.jboss42.rev@ @hudson.jboss42.url@</td></tr>
+ <tr><th align=left>@hudson.jboss40.build@</th><td>-r at hudson.jboss40.rev@ @hudson.jboss40.url@</td></tr>
</table>
]]>
</systemMessage>
@@ -30,8 +31,9 @@
<owner reference="../../.."/>
<jobNames class="tree-set">
<no-comparator/>
+ <string>AS-Tests-AS-5.0</string>
<string>AS-Tests-AS-4.2</string>
- <string>AS-Tests-AS-5.0</string>
+ <string>AS-Tests-AS-4.0</string>
</jobNames>
<name>AS Tests</name>
<description>
@@ -48,8 +50,9 @@
<owner reference="../../.."/>
<jobNames class="tree-set">
<no-comparator/>
+ <string>Core-Tests-AS-5.0</string>
<string>Core-Tests-AS-4.2</string>
- <string>Core-Tests-AS-5.0</string>
+ <string>Core-Tests-AS-4.0</string>
</jobNames>
<name>Core Tests</name>
<description>
@@ -68,6 +71,7 @@
<no-comparator/>
<string>Distro-Native-AS-5.0</string>
<string>Distro-Native-AS-4.2</string>
+ <string>Distro-Native-AS-4.0</string>
<string>Distro-SunRI-AS-5.0</string>
<string>Distro-SunRI-AS-4.2</string>
<string>Distro-XFire-AS-5.0</string>
@@ -90,6 +94,7 @@
<no-comparator/>
<string>Integration-Native-AS-5.0</string>
<string>Integration-Native-AS-4.2</string>
+ <string>Integration-Native-AS-4.0</string>
<string>Integration-SunRI-AS-5.0</string>
<string>Integration-SunRI-AS-4.2</string>
<string>Integration-XFire-AS-5.0</string>
@@ -123,6 +128,7 @@
<tr align=center><th> </th> <th> </th> <th>Native</th> <th>SunRI</th> <th>XFire</th></tr>
<tr align=center><th align=left>AS-5.0</th> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td></tr>
<tr align=center><th align=left>AS-4.2</th> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td></tr>
+<tr align=center><th align=left>AS-4.0</th> <td>ok</td> <td>ok</td> <td>N/A</td> <td>N/A</td></tr>
</table>
]]>
</description>
@@ -135,6 +141,7 @@
<no-comparator/>
<string>AS-5.0</string>
<string>AS-4.2</string>
+ <string>AS-4.0</string>
</jobNames>
<name>Target Container</name>
<description>
Added: trunk/build/hudson/hudson-home/jobs/AS-4.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/AS-4.0/config.xml (rev 0)
+++ trunk/build/hudson/hudson-home/jobs/AS-4.0/config.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -0,0 +1,74 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=AS-4.0
+SVNBASE=`basename @hudson.jboss40.url@`
+
+#
+# checkout with an explicit version
+#
+#if [ -d "$SVNBASE" ]; then
+# svn up -r at hudson.jboss40.rev@ $SVNBASE
+#else
+# svn co -r at hudson.jboss40.rev@ @hudson.jboss40.url@
+#fi
+
+#
+# build jboss
+#
+cd $SVNBASE
+rm -rf thirdparty/*
+./build/build.sh clean main
+
+#
+# Verify build
+#
+if [ ! -d ./build/output/@hudson.jboss40.build@ ]; then
+ echo "Cannot find expected build: @hudson.jboss40.build@"
+ exit 1
+fi
+ </command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ <hudson.tasks.BuildTrigger>
+ <childProjects>JBAS-Tests-AS-4.0</childProjects>
+ </hudson.tasks.BuildTrigger>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.jboss40.url@</remote>
+ <local>Branch_4_0</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossAS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>20</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build AS-4.0</description>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Property changes on: trunk/build/hudson/hudson-home/jobs/AS-4.0/config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -40,11 +40,9 @@
# Was it successfully started?
$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
if [ -e $WORKSPACE/spider.failed ]; then
- echo "Failed"
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
return 1
fi
-echo "Success"
#
# build the testsuite
Modified: trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -40,11 +40,9 @@
# Was it successfully started?
$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
if [ -e $WORKSPACE/spider.failed ]; then
- echo "Failed"
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
return 1
fi
-echo "Success"
#
# build the testsuite
Copied: trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.0 (from rev 3387, trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2)
Deleted: trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml 2007-06-01 22:34:58 UTC (rev 3387)
+++ trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.0/config.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -1,94 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector">
- <hudson.tasks.Shell>
- <command>
-#
-# Module settings
-#
-MODULE=JBWS-CoreTests-AS-4.2
-
-WORKSPACE=`pwd`
-JBWSDIR=$WORKSPACE/jbossws
-JBOSS_BINDADDR=@jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build@
-ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=@jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE"
-
-#
-# copy ant.properties
-#
-cd $JBWSDIR/build
-cp ant.properties.example ant.properties
-ant clean
-
-#
-# stop jbossas
-#
-$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
-
-#
-# deploy to jboss
-#
-cd $JBWSDIR/jbossws-core
-ant $ENVIRONMENT deploy-jboss42
-
-#
-# start jbossas
-#
-$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
-
-# Was it successfully started?
-$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
-if [ -e $WORKSPACE/spider.failed ]; then
- echo "Failed"
- $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
- return 1
-fi
-echo "Success"
-
-#
-# execute tests
-#
-ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
-cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
-
-#
-# stop jbossas
-#
-$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
-</command>
- </hudson.tasks.Shell>
- </builders>
- <publishers class="vector">
- <hudson.tasks.junit.JUnitResultArchiver>
- <testResults>jbossws/jbossws-core/output-tests/reports/*.xml</testResults>
- </hudson.tasks.junit.JUnitResultArchiver>
- <hudson.tasks.Mailer>
- <recipients>@hudson.mail.recipients@</recipients>
- <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
- <sendToIndividuals>true</sendToIndividuals>
- </hudson.tasks.Mailer>
- </publishers>
- <buildWrappers class="vector"/>
- <scm class="hudson.scm.SubversionSCM">
- <locations>
- <hudson.scm.SubversionSCM-ModuleLocation>
- <remote>@svn.url@</remote>
- <local>jbossws</local>
- </hudson.scm.SubversionSCM-ModuleLocation>
- </locations>
- <useUpdate>true</useUpdate>
- <browser class="hudson.scm.browsers.FishEyeSVN">
- <url>http://fisheye.jboss.com/browse/JBossWS/</url>
- <rootModule></rootModule>
- </browser>
- </scm>
- <canRoam>true</canRoam>
- <disabled>false</disabled>
- <enableRemoteTrigger>false</enableRemoteTrigger>
- <triggers class="vector"/>
- <description>Build and test jbossws- at version.id@ against AS-4.2</description>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <actions class="vector"/>
-</project>
\ No newline at end of file
Copied: trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.0/config.xml (from rev 3388, trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml)
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.0/config.xml (rev 0)
+++ trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.0/config.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -0,0 +1,96 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=JBWS-CoreTests-AS-4.0
+
+WORKSPACE=`pwd`
+JBWSDIR=$WORKSPACE/jbossws
+JBOSS_BINDADDR=@jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build@
+ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=@jboss.bind.address@ -Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE"
+
+#
+# copy ant.properties
+#
+cd $JBWSDIR/build
+cp ant.properties.example ant.properties
+ant clean
+
+#
+# stop jbossas
+#
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# deploy to jboss
+#
+cd $JBWSDIR/jbossws-core
+ant $ENVIRONMENT deploy-jboss40
+
+#
+# start jbossas
+#
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
+
+# Was it successfully started?
+$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+if [ -e $WORKSPACE/spider.failed ]; then
+ $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ return 1
+fi
+
+#
+# execute tests
+#
+ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
+cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
+
+#
+# stop jbossas
+#
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>jbossws/jbossws-core/output/tests/reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@svn.url@</remote>
+ <local>jbossws</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>20</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws- at version.id@ against AS-4.0</description>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Modified: trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -40,11 +40,9 @@
# Was it successfully started?
$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
if [ -e $WORKSPACE/spider.failed ]; then
- echo "Failed"
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
return 1
fi
-echo "Success"
#
# execute tests
@@ -61,7 +59,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>jbossws/jbossws-core/output-tests/reports/*.xml</testResults>
+ <testResults>jbossws/jbossws-core/output/tests/reports/*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients@</recipients>
Modified: trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/build/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -40,12 +40,10 @@
# Was it successfully started?
$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
if [ -e $WORKSPACE/spider.failed ]; then
- echo "Failed"
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
return 1
fi
-echo "Success"
-
+
#
# execute tests
#
@@ -61,7 +59,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>jbossws/jbossws-core/output-tests/reports/*.xml</testResults>
+ <testResults>jbossws/jbossws-core/output/tests/reports/*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients@</recipients>
Copied: trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.0 (from rev 3387, trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2)
Deleted: trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml 2007-06-01 22:34:58 UTC (rev 3387)
+++ trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.0/config.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -1,102 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector">
- <hudson.tasks.Shell>
- <command>
-#
-# Module settings
-#
-MODULE=Distro-Native-AS-4.2
-
-WORKSPACE=`pwd`
-JBWSDIR=$WORKSPACE/jbossws
-JBOSS_BINDADDR=@jboss.bind.address@
-JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/@hudson.jboss50.build@
-JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build@
-JBOSS_INSTANCE=$JBOSS42_INSTANCE
-ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=@jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss50.home=$JBOSS50_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE"
-
-#
-# copy ant.properties
-#
-cd $JBWSDIR/build
-cp ant.properties.example ant.properties
-ant clean
-
-#
-# stop jbossas
-#
-$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
-
-#
-# Build distro
-#
-cd $JBWSDIR/integration/native
-ant $ENVIRONMENT build-bin-dist
-
-#
-# Deploy distro
-#
-cd output/jbossws-native- at version.id@
-ant $ENVIRONMENT deploy-jboss42
-
-#
-# start jbossas
-#
-$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
-
-# Was it successfully started?
-$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
-if [ -e $WORKSPACE/spider.failed ]; then
- echo "Failed"
- $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
- return 1
-fi
-echo "Success"
-
-#
-# execute tests
-#
-ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
-cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
-
-#
-# stop jbossas
-#
-$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
-</command>
- </hudson.tasks.Shell>
- </builders>
- <publishers class="vector">
- <hudson.tasks.junit.JUnitResultArchiver>
- <testResults>jbossws/integration/native/output/jbossws-native- at version.id@/tests/output/reports/*.xml</testResults>
- </hudson.tasks.junit.JUnitResultArchiver>
- <hudson.tasks.Mailer>
- <recipients>@hudson.mail.recipients@</recipients>
- <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
- <sendToIndividuals>true</sendToIndividuals>
- </hudson.tasks.Mailer>
- </publishers>
- <buildWrappers class="vector"/>
- <scm class="hudson.scm.SubversionSCM">
- <locations>
- <hudson.scm.SubversionSCM-ModuleLocation>
- <remote>@svn.url@</remote>
- <local>jbossws</local>
- </hudson.scm.SubversionSCM-ModuleLocation>
- </locations>
- <useUpdate>true</useUpdate>
- <browser class="hudson.scm.browsers.FishEyeSVN">
- <url>http://fisheye.jboss.com/browse/JBossWS/</url>
- <rootModule></rootModule>
- </browser>
- </scm>
- <canRoam>true</canRoam>
- <disabled>false</disabled>
- <enableRemoteTrigger>false</enableRemoteTrigger>
- <triggers class="vector"/>
- <description>Build and test jbossws-native- at version.id@ against AS-4.2</description>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <actions class="vector"/>
-</project>
\ No newline at end of file
Copied: trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.0/config.xml (from rev 3388, trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml)
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.0/config.xml (rev 0)
+++ trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.0/config.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -0,0 +1,105 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=Distro-Native-AS-4.0
+
+WORKSPACE=`pwd`
+JBWSDIR=$WORKSPACE/jbossws
+JBOSS_BINDADDR=@jboss.bind.address@
+JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/@hudson.jboss50.build@
+JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build@
+JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build@
+JBOSS_INSTANCE=$JBOSS40_INSTANCE
+ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=@jboss.bind.address@ -Djbossws.integration.target=jboss40 -Djboss50.home=$JBOSS50_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss40.home=$JBOSS40_INSTANCE"
+
+#
+# copy ant.properties
+#
+cd $JBWSDIR/build
+cp ant.properties.example ant.properties
+ant clean
+
+#
+# stop jbossas
+#
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# Build distro
+#
+cd $JBWSDIR/integration/native
+ant $ENVIRONMENT build-bin-dist
+
+#
+# Deploy distro
+#
+cd output/jbossws-native- at version.id@
+ant $ENVIRONMENT deploy-jboss40
+
+#
+# start jbossas
+#
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
+
+# Was it successfully started?
+$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+if [ -e $WORKSPACE/spider.failed ]; then
+ $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ return 1
+fi
+
+#
+# execute tests
+#
+ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
+cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
+
+#
+# stop jbossas
+#
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>jbossws/integration/native/output/jbossws-native- at version.id@/tests/output/reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@svn.url@</remote>
+ <local>jbossws</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>20</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-native- at version.id@ against AS-4.0</description>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
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-02 15:46:20 UTC (rev 3394)
+++ trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -13,8 +13,9 @@
JBOSS_BINDADDR=@jboss.bind.address@
JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/@hudson.jboss50.build@
JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build@
+JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build@
JBOSS_INSTANCE=$JBOSS42_INSTANCE
-ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=@jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss50.home=$JBOSS50_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE"
+ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=@jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss50.home=$JBOSS50_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss40.home=$JBOSS40_INSTANCE"
#
# copy ant.properties
@@ -48,11 +49,9 @@
# Was it successfully started?
$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
if [ -e $WORKSPACE/spider.failed ]; then
- echo "Failed"
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
return 1
fi
-echo "Success"
#
# execute tests
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-02 15:46:20 UTC (rev 3394)
+++ trunk/build/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -13,8 +13,9 @@
JBOSS_BINDADDR=@jboss.bind.address@
JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/@hudson.jboss50.build@
JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build@
+JBOSS40_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build@
JBOSS_INSTANCE=$JBOSS50_INSTANCE
-ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=@jboss.bind.address@ -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS50_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE"
+ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=@jboss.bind.address@ -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS50_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss40.home=$JBOSS40_INSTANCE"
#
# copy ant.properties
@@ -48,12 +49,10 @@
# Was it successfully started?
$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
if [ -e $WORKSPACE/spider.failed ]; then
- echo "Failed"
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
return 1
fi
-echo "Success"
-
+
#
# execute tests
#
Modified: trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -48,12 +48,10 @@
# Was it successfully started?
$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
if [ -e $WORKSPACE/spider.failed ]; then
- echo "Failed"
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
return 1
fi
-echo "Success"
-
+
#
# execute tests
#
Modified: trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/build/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -48,11 +48,9 @@
# Was it successfully started?
$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
if [ -e $WORKSPACE/spider.failed ]; then
- echo "Failed"
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
return 1
fi
-echo "Success"
#
# execute tests
Modified: trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -48,12 +48,10 @@
# Was it successfully started?
$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
if [ -e $WORKSPACE/spider.failed ]; then
- echo "Failed"
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
return 1
fi
-echo "Success"
-
+
#
# execute tests
#
Modified: trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/build/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -48,12 +48,10 @@
# Was it successfully started?
$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
if [ -e $WORKSPACE/spider.failed ]; then
- echo "Failed"
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
return 1
fi
-echo "Success"
-
+
#
# execute tests
#
Copied: trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0 (from rev 3387, trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2)
Deleted: trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml 2007-06-01 22:34:58 UTC (rev 3387)
+++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -1,94 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
- <builders class="vector">
- <hudson.tasks.Shell>
- <command>
-#
-# Module settings
-#
-MODULE=Integration-Native-AS-4.2
-
-WORKSPACE=`pwd`
-JBWSDIR=$WORKSPACE/jbossws
-JBOSS_BINDADDR=@jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build@
-ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=@jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE"
-
-#
-# copy ant.properties
-#
-cd $JBWSDIR/build
-cp ant.properties.example ant.properties
-ant clean
-
-#
-# stop jbossas
-#
-$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
-
-#
-# Build jbws-jboss42
-#
-cd $JBWSDIR/integration/native
-ant $ENVIRONMENT deploy-jboss42
-
-#
-# start jbossas
-#
-$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
-
-# Was it successfully started?
-$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
-if [ -e $WORKSPACE/spider.failed ]; then
- echo "Failed"
- $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
- return 1
-fi
-echo "Success"
-
-#
-# execute tests
-#
-ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
-cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
-
-#
-# stop jbossas
-#
-$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
-</command>
- </hudson.tasks.Shell>
- </builders>
- <publishers class="vector">
- <hudson.tasks.junit.JUnitResultArchiver>
- <testResults>jbossws/integration/native/output-tests/reports/*.xml</testResults>
- </hudson.tasks.junit.JUnitResultArchiver>
- <hudson.tasks.Mailer>
- <recipients>@hudson.mail.recipients@</recipients>
- <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
- <sendToIndividuals>true</sendToIndividuals>
- </hudson.tasks.Mailer>
- </publishers>
- <buildWrappers class="vector"/>
- <scm class="hudson.scm.SubversionSCM">
- <locations>
- <hudson.scm.SubversionSCM-ModuleLocation>
- <remote>@svn.url@</remote>
- <local>jbossws</local>
- </hudson.scm.SubversionSCM-ModuleLocation>
- </locations>
- <useUpdate>true</useUpdate>
- <browser class="hudson.scm.browsers.FishEyeSVN">
- <url>http://fisheye.jboss.com/browse/JBossWS/</url>
- <rootModule></rootModule>
- </browser>
- </scm>
- <canRoam>true</canRoam>
- <disabled>false</disabled>
- <enableRemoteTrigger>false</enableRemoteTrigger>
- <triggers class="vector"/>
- <description>Build and test jbossws- at version.id@ against AS-4.2</description>
- <keepDependencies>false</keepDependencies>
- <properties/>
- <actions class="vector"/>
-</project>
\ No newline at end of file
Copied: trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml (from rev 3388, trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml)
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml (rev 0)
+++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -0,0 +1,96 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=Integration-Native-AS-4.0
+
+WORKSPACE=`pwd`
+JBWSDIR=$WORKSPACE/jbossws
+JBOSS_BINDADDR=@jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/Branch_4_0/build/output/@hudson.jboss40.build@
+ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=@jboss.bind.address@ -Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE"
+
+#
+# copy ant.properties
+#
+cd $JBWSDIR/build
+cp ant.properties.example ant.properties
+ant clean
+
+#
+# stop jbossas
+#
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+
+#
+# Build jbws-jboss40
+#
+cd $JBWSDIR/integration/native
+ant $ENVIRONMENT deploy-jboss40
+
+#
+# start jbossas
+#
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start $JBOSS_BINDADDR
+
+# Was it successfully started?
+$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+if [ -e $WORKSPACE/spider.failed ]; then
+ $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
+ return 1
+fi
+
+#
+# execute tests
+#
+ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out
+cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u
+
+#
+# stop jbossas
+#
+$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>jbossws/integration/native/output/tests/reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@svn.url@</remote>
+ <local>jbossws</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>20</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws- at version.id@ against AS-4.0</description>
+ <actions class="vector"/>
+</project>
\ No newline at end of file
Modified: trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -40,11 +40,9 @@
# Was it successfully started?
$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
if [ -e $WORKSPACE/spider.failed ]; then
- echo "Failed"
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
return 1
fi
-echo "Success"
#
# execute tests
@@ -61,7 +59,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>jbossws/integration/native/output-tests/reports/*.xml</testResults>
+ <testResults>jbossws/integration/native/output/tests/reports/*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients@</recipients>
Modified: trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -40,12 +40,10 @@
# Was it successfully started?
$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
if [ -e $WORKSPACE/spider.failed ]; then
- echo "Failed"
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
return 1
fi
-echo "Success"
-
+
#
# execute tests
#
@@ -61,7 +59,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>jbossws/integration/native/output-tests/reports/*.xml</testResults>
+ <testResults>jbossws/integration/native/output/tests/reports/*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients@</recipients>
Modified: trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -40,12 +40,10 @@
# Was it successfully started?
$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
if [ -e $WORKSPACE/spider.failed ]; then
- echo "Failed"
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
return 1
fi
-echo "Success"
-
+
#
# execute tests
#
@@ -61,7 +59,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>jbossws/integration/sunri/output-tests/reports/*.xml</testResults>
+ <testResults>jbossws/integration/sunri/output/tests/reports/*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients@</recipients>
Modified: trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -40,11 +40,9 @@
# Was it successfully started?
$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
if [ -e $WORKSPACE/spider.failed ]; then
- echo "Failed"
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
return 1
fi
-echo "Success"
#
# execute tests
@@ -61,7 +59,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>jbossws/integration/sunri/output-tests/reports/*.xml</testResults>
+ <testResults>jbossws/integration/sunri/output/tests/reports/*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients@</recipients>
Modified: trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -40,11 +40,9 @@
# Was it successfully started?
$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
if [ -e $WORKSPACE/spider.failed ]; then
- echo "Failed"
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
return 1
fi
-echo "Success"
#
# execute tests
@@ -61,7 +59,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>jbossws/integration/xfire/output-tests/reports/*.xml</testResults>
+ <testResults>jbossws/integration/xfire/output/tests/reports/*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients@</recipients>
Modified: trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -40,11 +40,9 @@
# Was it successfully started?
$JBWSDIR/build/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
if [ -e $WORKSPACE/spider.failed ]; then
- echo "Failed"
$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR
return 1
fi
-echo "Success"
#
# execute tests
@@ -61,7 +59,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>jbossws/integration/xfire/output-tests/reports/*.xml</testResults>
+ <testResults>jbossws/integration/xfire/output/tests/reports/*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail.recipients@</recipients>
Modified: trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>AS-5.0, AS-4.2</childProjects>
+ <childProjects>AS-5.0, AS-4.2, AS-4.0</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
Modified: trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>AS-Tests-AS-5.0, AS-Tests-AS-4.2, Core-Tests-AS-5.0, Core-Tests-AS-4.2, Integration-Native-AS-5.0, Integration-Native-AS-4.2, Integration-SunRI-AS-5.0, Integration-SunRI-AS-4.2, Integration-XFire-AS-5.0, Integration-XFire-AS-4.2, Distro-Native-AS-5.0, Distro-Native-AS-4.2, Distro-SunRI-AS-5.0, Distro-SunRI-AS-4.2, Distro-XFire-AS-5.0, Distro-XFire-AS-4.2</childProjects>
+ <childProjects>AS-Tests-AS-5.0, AS-Tests-AS-4.2, AS-Tests-AS-4.0, Core-Tests-AS-5.0, Core-Tests-AS-4.2, Core-Tests-AS-4.0, Integration-Native-AS-5.0, Integration-Native-AS-4.2, Integration-Native-AS-4.0, Integration-SunRI-AS-5.0, Integration-SunRI-AS-4.2, Integration-XFire-AS-5.0, Integration-XFire-AS-4.2, Distro-Native-AS-5.0, Distro-Native-AS-4.2, Distro-Native-AS-4.0, Distro-SunRI-AS-5.0, Distro-SunRI-AS-4.2, Distro-XFire-AS-5.0, Distro-XFire-AS-4.2</childProjects>
</hudson.tasks.BuildTrigger>
</publishers>
<buildWrappers class="vector"/>
Copied: trunk/integration/jboss40 (from rev 3387, trunk/integration/jboss42)
Modified: trunk/integration/jboss40/.classpath
===================================================================
--- trunk/integration/jboss42/.classpath 2007-06-01 22:34:58 UTC (rev 3387)
+++ trunk/integration/jboss40/.classpath 2007-06-02 20:38:33 UTC (rev 3395)
@@ -2,12 +2,14 @@
<classpath>
<classpathentry excluding="org/jboss/wsf/container/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="/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="lib" path="/integration-spi/thirdparty/dom4j.jar"/>
- <classpathentry kind="output" path="output-eclipse"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-4.0.x"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/integration-jboss42"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/jbossws-core"/>
+ <classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: trunk/integration/jboss40/.project
===================================================================
--- trunk/integration/jboss42/.project 2007-06-01 22:34:58 UTC (rev 3387)
+++ trunk/integration/jboss40/.project 2007-06-02 20:38:33 UTC (rev 3395)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>integration-jboss42</name>
+ <name>integration-jboss40</name>
<comment></comment>
<projects>
</projects>
Modified: trunk/integration/jboss40/ant-import/build-release.xml
===================================================================
--- trunk/integration/jboss42/ant-import/build-release.xml 2007-06-01 22:34:58 UTC (rev 3387)
+++ trunk/integration/jboss40/ant-import/build-release.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -17,16 +17,16 @@
<target name="release" depends="jars"
description="Release to jboss.local.repository">
- <!-- jboss/jbossws-jboss42 -->
+ <!-- jboss/jbossws-jboss40 -->
<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="${int.jboss42.dir}/output/lib">
- <include name="jbossws-jboss42.jar"/>
- <include name="jbossws-jboss42-src.zip"/>
+ <mkdir dir="${jboss.repository.dir}/jbossws-jboss40/${repository.id}/lib"/>
+ <copy todir="${jboss.repository.dir}/jbossws-jboss40/${repository.id}/lib" overwrite="true">
+ <fileset dir="${int.jboss40.dir}/output/lib">
+ <include name="jbossws-jboss40.jar"/>
+ <include name="jbossws-jboss40-src.zip"/>
</fileset>
</copy>
- <copy tofile="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/component-info.xml" file="${jbws42.etc.dir}/component-info.xml" filtering="true" overwrite="true">
+ <copy tofile="${jboss.repository.dir}/jbossws-jboss40/${repository.id}/component-info.xml" file="${jbws40.etc.dir}/component-info.xml" filtering="true" overwrite="true">
<filterset>
<filtersfile file="${build.dir}/version.properties"/>
</filterset>
Modified: trunk/integration/jboss40/ant-import/build-thirdparty.xml
===================================================================
--- trunk/integration/jboss42/ant-import/build-thirdparty.xml 2007-06-01 22:34:58 UTC (rev 3387)
+++ trunk/integration/jboss40/ant-import/build-thirdparty.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -30,28 +30,29 @@
<target name="thirdparty-classpath" depends="thirdparty-get">
- <!-- The compile classpath for jboss42 integration -->
- <path id="jbws42.integration.classpath">
+ <!-- The compile classpath for jboss40 integration -->
+ <path id="jbws40.integration.classpath">
<pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
+ <pathelement location="${core.dir}/output/lib/jbossws-core.jar"/>
<pathelement location="${spi.dir}/thirdparty/jaxws-api.jar"/>
<pathelement location="${spi.dir}/thirdparty/jaxrpc-api.jar"/>
<pathelement location="${spi.dir}/thirdparty/jsr181-api.jar"/>
<pathelement location="${spi.dir}/thirdparty/saaj-api.jar"/>
- <pathelement location="${jboss42.lib}/jboss-common.jar"/>
- <pathelement location="${jboss42.lib}/jboss-jmx.jar"/>
- <pathelement location="${jboss42.lib}/jboss-system.jar"/>
- <pathelement location="${jboss42.lib}/jboss-xml-binding.jar"/>
- <pathelement location="${jboss42.server.lib}/dom4j.jar"/>
- <pathelement location="${jboss42.server.lib}/jboss.jar"/>
- <pathelement location="${jboss42.server.lib}/jboss-j2ee.jar"/>
- <pathelement location="${jboss42.server.lib}/jboss-ejb3x.jar"/>
- <pathelement location="${jboss42.server.lib}/jbosssx.jar"/>
- <pathelement location="${jboss42.server.lib}/servlet-api.jar"/>
- <pathelement location="${jboss42.server.deploy}/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/>
- <pathelement location="${jboss42.server.deploy}/jboss-bean.deployer/jboss-dependency.jar"/>
- <pathelement location="${jboss42.server.deploy}/jboss-bean.deployer/jboss-microcontainer.jar"/>
- <pathelement location="${jboss42.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/>
- <pathelement location="${jboss42.server.deploy}/ejb3.deployer/jboss-ejb3.jar"/>
+ <pathelement location="${jboss40.lib}/jboss-common.jar"/>
+ <pathelement location="${jboss40.lib}/jboss-jmx.jar"/>
+ <pathelement location="${jboss40.lib}/jboss-system.jar"/>
+ <pathelement location="${jboss40.lib}/jboss-xml-binding.jar"/>
+ <pathelement location="${jboss40.server.lib}/dom4j.jar"/>
+ <pathelement location="${jboss40.server.lib}/jboss.jar"/>
+ <pathelement location="${jboss40.server.lib}/jboss-j2ee.jar"/>
+ <pathelement location="${jboss40.server.lib}/jbosssx.jar"/>
+ <pathelement location="${jboss40.server.lib}/javax.servlet.jar"/>
+ <pathelement location="${jboss40.server.deploy}/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/>
+ <pathelement location="${jboss40.server.deploy}/jboss-bean.deployer/jboss-dependency.jar"/>
+ <pathelement location="${jboss40.server.deploy}/jboss-bean.deployer/jboss-microcontainer.jar"/>
+ <pathelement location="${jboss40.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/>
+ <pathelement location="${jboss40.server.deploy}/ejb3.deployer/jboss-ejb3x.jar"/>
+ <pathelement location="${jboss40.server.deploy}/ejb3.deployer/jboss-ejb3.jar"/>
</path>
</target>
Modified: trunk/integration/jboss40/build.xml
===================================================================
--- trunk/integration/jboss42/build.xml 2007-06-01 22:34:58 UTC (rev 3387)
+++ trunk/integration/jboss40/build.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -11,34 +11,40 @@
<!-- $Id$ -->
-<project default="main" basedir="../.." name="JBossWS-JBoss42">
+<project default="main" basedir="../.." name="JBossWS-JBoss40">
<import file="${basedir}/build/ant-import/build-setup.xml"/>
- <import file="${int.jboss42.dir}/ant-import/build-release.xml"/>
- <import file="${int.jboss42.dir}/ant-import/build-thirdparty.xml"/>
+ <import file="${int.jboss40.dir}/ant-import/build-release.xml"/>
+ <import file="${int.jboss40.dir}/ant-import/build-thirdparty.xml"/>
<!-- ================================================================== -->
<!-- Setup -->
<!-- ================================================================== -->
+ <property name="jbws40.dir" value="${int.jboss40.dir}"/>
+ <property name="jbws40.src.dir" value="${jbws40.dir}/src/main"/>
+ <property name="jbws40.etc.dir" value="${jbws40.src.dir}/etc"/>
+ <property name="jbws40.java.dir" value="${jbws40.src.dir}/java"/>
+ <property name="jbws40.resources.dir" value="${jbws40.src.dir}/resources"/>
+ <property name="jbws40.output.dir" value="${jbws40.dir}/output"/>
+ <property name="jbws40.output.classes.dir" value="${jbws40.output.dir}/classes"/>
+ <property name="jbws40.output.etc.dir" value="${jbws40.output.dir}/etc"/>
+ <property name="jbws40.output.lib.dir" value="${jbws40.output.dir}/lib"/>
+
<property name="jbws42.dir" value="${int.jboss42.dir}"/>
<property name="jbws42.src.dir" value="${jbws42.dir}/src/main"/>
<property name="jbws42.etc.dir" value="${jbws42.src.dir}/etc"/>
<property name="jbws42.java.dir" value="${jbws42.src.dir}/java"/>
<property name="jbws42.resources.dir" value="${jbws42.src.dir}/resources"/>
- <property name="jbws42.output.dir" value="${jbws42.dir}/output"/>
- <property name="jbws42.output.classes.dir" value="${jbws42.output.dir}/classes"/>
- <property name="jbws42.output.etc.dir" value="${jbws42.output.dir}/etc"/>
- <property name="jbws42.output.lib.dir" value="${jbws42.output.dir}/lib"/>
<!-- ================================================================== -->
<!-- Initialization -->
<!-- ================================================================== -->
<target name="init" depends="prepare, thirdparty">
- <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
- <ant antfile="${spi.dir}/build.xml" target="main" inheritall="false"/>
+ <fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/>
+ <ant antfile="${core.dir}/build.xml" target="jars" inheritall="false"/>
</target>
<!-- ================================================================== -->
@@ -57,19 +63,24 @@
<!-- Compile integration java sources -->
<target name="compile-classes" depends="init">
- <mkdir dir="${jbws42.output.classes.dir}"/>
- <javac srcdir="${jbws42.java.dir}" sourcepath="" destdir="${jbws42.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
+ <mkdir dir="${jbws40.output.classes.dir}"/>
+ <javac srcdir="${jbws40.java.dir}" sourcepath="" destdir="${jbws40.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
+ <src path="${jbws40.java.dir}"/>
+ <src path="${jbws42.java.dir}"/>
+ <include name="org/jboss/wsf/container/jboss40/**"/>
<include name="org/jboss/wsf/container/jboss42/**"/>
<exclude name="org/jboss/wsf/container/jboss42/jms/**"/>
- <classpath refid="jbws42.integration.classpath"/>
+ <exclude name="org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapterEJB21.java"/>
+ <exclude name="org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java"/>
+ <classpath refid="jbws40.integration.classpath"/>
</javac>
</target>
<!-- Compile etc files (manifests and such) -->
<target name="compile-etc" depends="init">
- <mkdir dir="${jbws42.output.etc.dir}"/>
- <copy todir="${jbws42.output.etc.dir}" filtering="yes">
+ <mkdir dir="${jbws40.output.etc.dir}"/>
+ <copy todir="${jbws40.output.etc.dir}" filtering="yes">
<fileset dir="${build.dir}/etc">
<include name="default.mf"/>
</fileset>
@@ -98,17 +109,19 @@
-->
<target name="module-jars" depends="init">
- <!-- Build jbossws-jboss42.jar -->
- <mkdir dir="${jbws42.output.lib.dir}"/>
- <jar jarfile="${jbws42.output.lib.dir}/jbossws-jboss42.jar" manifest="${jbws42.output.etc.dir}/default.mf">
- <fileset dir="${jbws42.output.classes.dir}">
+ <!-- Build jbossws-jboss40.jar -->
+ <mkdir dir="${jbws40.output.lib.dir}"/>
+ <jar jarfile="${jbws40.output.lib.dir}/jbossws-jboss40.jar" manifest="${jbws40.output.etc.dir}/default.mf">
+ <fileset dir="${jbws40.output.classes.dir}">
+ <include name="org/jboss/wsf/container/jboss40/**"/>
<include name="org/jboss/wsf/container/jboss42/**"/>
</fileset>
<metainf dir="${jbws42.resources.dir}/jbossws-jboss42.jar/META-INF"/>
</jar>
- <!-- Build jbossws42-src.zip -->
- <zip zipfile="${jbws42.output.lib.dir}/jbossws-jboss42-src.zip" >
+ <!-- Build jbossws40-src.zip -->
+ <zip zipfile="${jbws40.output.lib.dir}/jbossws-jboss40-src.zip" >
+ <fileset dir="${jbws40.java.dir}"/>
<fileset dir="${jbws42.java.dir}"/>
</zip>
@@ -119,7 +132,7 @@
<!-- ================================================================== -->
<target name="clean" depends="prepare" description="Cleans up most generated files.">
- <delete dir="${jbws42.output.dir}"/>
+ <delete dir="${jbws40.output.dir}"/>
</target>
<target name="clobber" depends="clean" description="Cleans up all generated files.">
Modified: trunk/integration/jboss40/src/main/etc/component-info.xml
===================================================================
--- trunk/integration/jboss42/src/main/etc/component-info.xml 2007-06-01 22:34:58 UTC (rev 3387)
+++ trunk/integration/jboss40/src/main/etc/component-info.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -1,19 +1,19 @@
-<project name="jboss/jbossws-jboss42">
+<project name="jboss/jbossws-jboss40">
- <component id="jboss/jbossws-jboss42"
+ <component id="jboss/jbossws-jboss40"
description="JBossWS container integration layer"
version="@repository.id@"
licenseType="lgpl">
- <artifact id="jbossws-jboss42.jar"/>
- <artifact id="jbossws-jboss42-src.zip"/>
+ <artifact id="jbossws-jboss40.jar"/>
+ <artifact id="jbossws-jboss40-src.zip"/>
<import componentref="jboss/jbossws-spi">
<compatible version="@repository.id@"/>
</import>
<export>
- <include input="jbossws-jboss42.jar"/>
+ <include input="jbossws-jboss40.jar"/>
</export>
</component>
Added: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ApplicationMetaDataAdapterEJB21.java
===================================================================
--- trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ApplicationMetaDataAdapterEJB21.java (rev 0)
+++ trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ApplicationMetaDataAdapterEJB21.java 2007-06-02 20:38:33 UTC (rev 3395)
@@ -0,0 +1,82 @@
+/*
+ * 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.jboss40;
+
+// $Id$
+
+import org.jboss.metadata.BeanMetaData;
+import org.jboss.metadata.EjbPortComponentMetaData;
+import org.jboss.metadata.MessageDrivenMetaData;
+import org.jboss.metadata.SessionMetaData;
+import org.jboss.wsf.container.jboss42.AbstractApplicationMetaDataAdapter;
+import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.UnifiedEjbPortComponentMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.UnifiedMessageDrivenMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.UnifiedSessionMetaData;
+
+/**
+ * Build container independent application meta data
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 05-May-2006
+ */
+public class ApplicationMetaDataAdapterEJB21 extends AbstractApplicationMetaDataAdapter
+{
+ @Override
+ protected UnifiedBeanMetaData buildUnifiedBeanMetaData(BeanMetaData bmd)
+ {
+ UnifiedBeanMetaData ubmd = null;
+ if (bmd instanceof SessionMetaData)
+ {
+ ubmd = new UnifiedSessionMetaData();
+ }
+ else if (bmd instanceof MessageDrivenMetaData)
+ {
+ ubmd = new UnifiedMessageDrivenMetaData();
+ ((UnifiedMessageDrivenMetaData)ubmd).setDestinationJndiName(((MessageDrivenMetaData)bmd).getDestinationJndiName());
+ }
+
+ if (ubmd != null)
+ {
+ ubmd.setEjbName(bmd.getEjbName());
+ ubmd.setEjbClass(bmd.getEjbClass());
+ ubmd.setServiceEndpointInterface(bmd.getServiceEndpoint());
+ ubmd.setHome(bmd.getHome());
+ ubmd.setLocalHome(bmd.getLocalHome());
+ ubmd.setJndiName(bmd.getJndiName());
+ ubmd.setLocalJndiName(bmd.getLocalJndiName());
+
+ EjbPortComponentMetaData pcmd = bmd.getPortComponent();
+ if (pcmd != null)
+ {
+ UnifiedEjbPortComponentMetaData upcmd = new UnifiedEjbPortComponentMetaData();
+ upcmd.setPortComponentName(pcmd.getPortComponentName());
+ upcmd.setPortComponentURI(pcmd.getPortComponentURI());
+ upcmd.setAuthMethod(pcmd.getAuthMethod());
+ upcmd.setTransportGuarantee(pcmd.getTransportGuarantee());
+ //upcmd.setSecureWSDLAccess(pcmd.getSecureWSDLAccess());
+ ubmd.setPortComponent(upcmd);
+ }
+ }
+ return ubmd;
+ }
+}
Property changes on: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ApplicationMetaDataAdapterEJB21.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerEJB3.java
===================================================================
--- trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerEJB3.java (rev 0)
+++ trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerEJB3.java 2007-06-02 20:38:33 UTC (rev 3395)
@@ -0,0 +1,93 @@
+/*
+ * 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.jboss40;
+
+// $Id$
+
+import java.lang.reflect.Method;
+
+import javax.management.ObjectName;
+import javax.xml.ws.WebServiceException;
+
+import org.jboss.aop.Dispatcher;
+import org.jboss.ejb3.stateless.StatelessContainer;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
+import org.jboss.wsf.spi.invocation.AbstractInvocationHandler;
+import org.jboss.wsf.spi.invocation.Invocation;
+import org.jboss.wsf.spi.utils.ObjectNameFactory;
+
+/**
+ * Handles invocations on EJB3 endpoints.
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 25-Apr-2007
+ */
+public class InvocationHandlerEJB3 extends AbstractInvocationHandler
+{
+ private ObjectName objectName;
+
+ public void create(Endpoint ep)
+ {
+ super.create(ep);
+
+ String ejbName = ep.getShortName();
+ UnifiedDeploymentInfo udi = ep.getService().getDeployment().getContext().getAttachment(UnifiedDeploymentInfo.class);
+ String nameStr = "jboss.j2ee:name=" + ejbName + ",service=EJB3,jar=" + udi.simpleName;
+ if (udi.parent != null)
+ {
+ nameStr += ",ear=" + udi.parent.simpleName;
+ }
+
+ objectName = ObjectNameFactory.create(nameStr.toString());
+ }
+
+ public void start(Endpoint ep)
+ {
+ super.start(ep);
+
+ Dispatcher dispatcher = Dispatcher.singleton;
+ if (dispatcher.getRegistered(objectName.getCanonicalName()) == null)
+ throw new WebServiceException("Cannot find service endpoint target: " + objectName);
+ }
+
+ public void invoke(Endpoint ep, Object beanInstance, Invocation epInv) throws Exception
+ {
+ try
+ {
+ Dispatcher dispatcher = Dispatcher.singleton;
+ StatelessContainer container = (StatelessContainer)dispatcher.getRegistered(objectName.getCanonicalName());
+ Class beanClass = container.getBeanClass();
+
+ Method method = getImplMethod(beanClass, epInv.getJavaMethod());
+ Object[] args = epInv.getArgs();
+
+ Object retObj = container.localInvoke(method, args);
+
+ epInv.setReturnValue(retObj);
+ }
+ catch (Throwable th)
+ {
+ handleInvocationException(th);
+ }
+ }
+}
\ No newline at end of file
Property changes on: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerEJB3.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapter.java
===================================================================
--- trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapter.java (rev 0)
+++ trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapter.java 2007-06-02 20:38:33 UTC (rev 3395)
@@ -0,0 +1,131 @@
+/*
+ * 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.jboss40;
+
+// $Id$
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.LinkedHashMap;
+import java.util.Properties;
+
+import javax.xml.namespace.QName;
+
+import org.jboss.webservice.metadata.serviceref.HandlerMetaData;
+import org.jboss.webservice.metadata.serviceref.InitParamMetaData;
+import org.jboss.webservice.metadata.serviceref.PortComponentRefMetaData;
+import org.jboss.webservice.metadata.serviceref.ServiceRefMetaData;
+import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedCallPropertyMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedInitParamMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
+
+/**
+ * Build container independent service ref meta data
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 05-May-2006
+ */
+public class ServiceRefMetaDataAdapter
+{
+ public UnifiedServiceRefMetaData buildServiceRefMetaData(UnifiedDeploymentInfo udi, ServiceRefMetaData srmd) throws IOException
+ {
+ UnifiedServiceRefMetaData usrmd = new UnifiedServiceRefMetaData(udi.vfRoot);
+ usrmd.setServiceRefName(srmd.getServiceRefName());
+ usrmd.setServiceInterface(srmd.getServiceInterface());
+ usrmd.setWsdlFile(srmd.getWsdlFile());
+ usrmd.setMappingFile(srmd.getJaxrpcMappingFile());
+ usrmd.setServiceQName(srmd.getServiceQName());
+
+ LinkedHashMap<String, UnifiedPortComponentRefMetaData> pcrefs = new LinkedHashMap<String, UnifiedPortComponentRefMetaData>();
+ for (PortComponentRefMetaData pcmd : srmd.getPortComponentRefs())
+ {
+ UnifiedPortComponentRefMetaData upcmd = new UnifiedPortComponentRefMetaData(usrmd);
+ upcmd.setServiceEndpointInterface(pcmd.getServiceEndpointInterface());
+ upcmd.setPortComponentLink(pcmd.getPortComponentLink());
+ Properties callProps = pcmd.getCallProperties();
+ if (callProps != null)
+ {
+ Enumeration<Object> keys = callProps.keys();
+ while(keys.hasMoreElements())
+ {
+ String name = (String)keys.nextElement();
+ String value = callProps.getProperty(name);
+ upcmd.addCallProperty(new UnifiedCallPropertyMetaData(name, value));
+ }
+ }
+ pcrefs.put(pcmd.getServiceEndpointInterface(), upcmd);
+ usrmd.addPortComponentRef(upcmd);
+ }
+
+ for (HandlerMetaData hmd : srmd.getHandlers())
+ {
+ UnifiedHandlerMetaData uhmd = new UnifiedHandlerMetaData(null);
+ uhmd.setHandlerName(hmd.getHandlerName());
+ uhmd.setHandlerClass(hmd.getHandlerClass());
+
+ for(String portname : hmd.getPortNames())
+ {
+ uhmd.addPortName(portname);
+ }
+ for (InitParamMetaData ipmd : hmd.getInitParams())
+ {
+ UnifiedInitParamMetaData ip = new UnifiedInitParamMetaData();
+ ip.setParamName(ipmd.getParamName());
+ ip.setParamValue(ipmd.getParamValue());
+ uhmd.addInitParam(ip);
+ }
+ for (QName soapHeader : hmd.getSoapHeaders())
+ {
+ uhmd.addSoapHeader(soapHeader);
+ }
+ for (String soapRole : hmd.getSoapRoles())
+ {
+ uhmd.addSoapRole(soapRole);
+ }
+ usrmd.addHandler(uhmd);
+ }
+
+ usrmd.setConfigName(srmd.getConfigName());
+ usrmd.setConfigFile(srmd.getConfigFile());
+ URL wsdlOverride = srmd.getWsdlOverride();
+ if (wsdlOverride != null)
+ usrmd.setWsdlOverride(wsdlOverride.toExternalForm());
+
+ Properties callProps = srmd.getCallProperties();
+ if (callProps != null)
+ {
+ Enumeration<Object> keys = callProps.keys();
+ while(keys.hasMoreElements())
+ {
+ String name = (String)keys.nextElement();
+ String value = callProps.getProperty(name);
+ usrmd.addCallProperty(new UnifiedCallPropertyMetaData(name, value));
+ }
+ }
+
+ return usrmd;
+ }
+}
Property changes on: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapter.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapterFactory.java
===================================================================
--- trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapterFactory.java (rev 0)
+++ trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapterFactory.java 2007-06-02 20:38:33 UTC (rev 3395)
@@ -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.jboss40;
+
+// $Id$
+
+import org.jboss.kernel.spi.registry.KernelRegistry;
+import org.jboss.kernel.spi.registry.KernelRegistryEntry;
+import org.jboss.ws.integration.KernelLocator;
+
+/**
+ * @author Thomas.Diesler at jboss.org
+ * @since 10-Mar-2007
+ */
+public class ServiceRefMetaDataAdapterFactory
+{
+ // Hide ctor
+ private ServiceRefMetaDataAdapterFactory()
+ {
+ }
+
+ public static ServiceRefMetaDataAdapter newInstance()
+ {
+ KernelRegistry registry = KernelLocator.getKernel().getRegistry();
+ KernelRegistryEntry entry = registry.getEntry("WSServiceRefMetaDataAdapter");
+ return (ServiceRefMetaDataAdapter)entry.getTarget();
+ }
+}
Property changes on: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapterFactory.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: 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 (rev 0)
+++ trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java 2007-06-02 20:38:33 UTC (rev 3395)
@@ -0,0 +1,89 @@
+/*
+ * 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.jboss40;
+
+// $Id$
+
+import java.util.Iterator;
+
+import javax.naming.Context;
+
+import org.jboss.deployment.DeploymentException;
+import org.jboss.deployment.DeploymentInfo;
+import org.jboss.system.ServiceMBeanSupport;
+import org.jboss.util.naming.Util;
+import org.jboss.webservice.metadata.serviceref.ServiceRefMetaData;
+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.spi.deployment.BasicDeployment;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.JAXRPCClientDeployment;
+import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
+
+/**
+ * Binds a JAXRPC Service object in the client's ENC for every service-ref element in the
+ * deployment descriptor.
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 15-Jan-2005
+ */
+public class WebServiceClientDeployer extends ServiceMBeanSupport implements WebServiceClientDeployerMBean
+{
+ /**
+ * This binds a jaxrpc Service into the callers ENC for every service-ref element
+ *
+ * @param envCtx ENC to bind the javax.rpc.xml.Service object to
+ * @param serviceRefs An iterator of the service-ref elements in the client deployment descriptor
+ * @param di The client's deployment info
+ * @throws org.jboss.deployment.DeploymentException if it goes wrong
+ */
+ public void setupServiceRefEnvironment(Context envCtx, Iterator serviceRefs, DeploymentInfo di) throws DeploymentException
+ {
+ try
+ {
+ while (serviceRefs.hasNext())
+ {
+ ServiceRefMetaData serviceRef = (ServiceRefMetaData)serviceRefs.next();
+ String serviceRefName = serviceRef.getServiceRefName();
+
+ // Build the container independent deployment info
+ Deployment dep = new BasicDeployment();
+ UnifiedDeploymentInfo udi = new JAXRPCClientDeployment(Deployment.DeploymentType.JAXRPC_CLIENT);
+ new DeploymentInfoAdapter().buildDeploymentInfo(dep, udi, di);
+
+ UnifiedServiceRefMetaData usr = ServiceRefMetaDataAdapterFactory.newInstance().buildServiceRefMetaData(udi, serviceRef);
+ usr.setVfsRoot(new URLLoaderAdapter(udi.url));
+
+ ServiceReferenceable ref = new ServiceReferenceable(usr);
+ Util.bind(envCtx, serviceRefName, ref);
+
+ log.debug("Webservice binding: java:comp/env/" + serviceRefName);
+ }
+ }
+ catch (Exception e)
+ {
+ throw new DeploymentException("Cannot bind webservice to client environment", e);
+ }
+ }
+}
Property changes on: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployerMBean.java
===================================================================
--- trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployerMBean.java (rev 0)
+++ trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployerMBean.java 2007-06-02 20:38:33 UTC (rev 3395)
@@ -0,0 +1,38 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.wsf.container.jboss40;
+
+import javax.management.ObjectName;
+
+import org.jboss.system.ServiceMBean;
+import org.jboss.webservice.WebServiceClientDeployment;
+import org.jboss.wsf.spi.utils.ObjectNameFactory;
+
+/**
+ * MBean interface.
+ * @since 19-Jan-2005
+ */
+public interface WebServiceClientDeployerMBean extends WebServiceClientDeployment, ServiceMBean
+{
+ // default object name
+ public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=WebServiceClientDeployer");
+}
Property changes on: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployerMBean.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/integration/jboss42/.classpath
===================================================================
--- trunk/integration/jboss42/.classpath 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/integration/jboss42/.classpath 2007-06-02 20:38:33 UTC (rev 3395)
@@ -9,5 +9,5 @@
<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/dom4j.jar"/>
- <classpathentry kind="output" path="output-eclipse"/>
+ <classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: trunk/integration/jboss42/build.xml
===================================================================
--- trunk/integration/jboss42/build.xml 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/integration/jboss42/build.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -38,7 +38,7 @@
<target name="init" depends="prepare, thirdparty">
<fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
- <ant antfile="${spi.dir}/build.xml" target="main" inheritall="false"/>
+ <ant antfile="${spi.dir}/build.xml" target="jars" inheritall="false"/>
</target>
<!-- ================================================================== -->
Added: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractApplicationMetaDataAdapter.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractApplicationMetaDataAdapter.java (rev 0)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractApplicationMetaDataAdapter.java 2007-06-02 20:38:33 UTC (rev 3395)
@@ -0,0 +1,90 @@
+/*
+ * 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 java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.jboss.metadata.ApplicationMetaData;
+import org.jboss.metadata.BeanMetaData;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
+import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData.PublishLocationAdapter;
+
+/**
+ * Build container independent application meta data
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 05-May-2006
+ */
+public abstract class AbstractApplicationMetaDataAdapter
+{
+ public UnifiedApplicationMetaData buildUnifiedApplicationMetaData(Deployment dep, UnifiedDeploymentInfo udi, ApplicationMetaData apmd)
+ {
+ dep.getContext().addAttachment(ApplicationMetaData.class, apmd);
+
+ UnifiedApplicationMetaData umd = new UnifiedApplicationMetaData();
+ buildUnifiedBeanMetaData(umd, apmd);
+ umd.setConfigName(apmd.getConfigName());
+ umd.setConfigFile(apmd.getConfigFile());
+ umd.setWebServiceContextRoot(apmd.getWebServiceContextRoot());
+ umd.setSecurityDomain(apmd.getSecurityDomain());
+ umd.setPublishLocationAdapter(getPublishLocationAdpater(apmd));
+
+ dep.getContext().addAttachment(UnifiedApplicationMetaData.class, umd);
+ return umd;
+ }
+
+ protected PublishLocationAdapter getPublishLocationAdpater(final ApplicationMetaData apmd)
+ {
+ return new PublishLocationAdapter()
+ {
+ public String getWsdlPublishLocationByName(String name)
+ {
+ return apmd.getWsdlPublishLocationByName(name);
+ }
+ };
+ }
+
+ protected void buildUnifiedBeanMetaData(UnifiedApplicationMetaData umd, ApplicationMetaData metaData)
+ {
+ List<UnifiedBeanMetaData> beans = new ArrayList<UnifiedBeanMetaData>();
+ Iterator it = metaData.getEnterpriseBeans();
+ while (it.hasNext())
+ {
+ BeanMetaData bmd = (BeanMetaData)it.next();
+ UnifiedBeanMetaData ubmd = buildUnifiedBeanMetaData(bmd);
+ if (ubmd != null)
+ {
+ beans.add(ubmd);
+ }
+ }
+ umd.setEnterpriseBeans(beans);
+ }
+
+ protected abstract UnifiedBeanMetaData buildUnifiedBeanMetaData(BeanMetaData bmd);
+}
Property changes on: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractApplicationMetaDataAdapter.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapter.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapter.java 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapter.java 2007-06-02 20:38:33 UTC (rev 3395)
@@ -1,132 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.container.jboss42;
-
-// $Id$
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.jboss.metadata.ApplicationMetaData;
-import org.jboss.metadata.BeanMetaData;
-import org.jboss.metadata.EjbPortComponentMetaData;
-import org.jboss.metadata.MessageDrivenMetaData;
-import org.jboss.metadata.SessionMetaData;
-import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
-import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData;
-import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData;
-import org.jboss.wsf.spi.metadata.j2ee.UnifiedEjbPortComponentMetaData;
-import org.jboss.wsf.spi.metadata.j2ee.UnifiedMessageDrivenMetaData;
-import org.jboss.wsf.spi.metadata.j2ee.UnifiedSessionMetaData;
-import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData.PublishLocationAdapter;
-
-/**
- * Build container independent application meta data
- *
- * @author Thomas.Diesler at jboss.org
- * @since 05-May-2006
- */
-public class ApplicationMetaDataAdapter
-{
- public static UnifiedApplicationMetaData buildUnifiedApplicationMetaData(Deployment dep, UnifiedDeploymentInfo udi, ApplicationMetaData apmd)
- {
- dep.getContext().addAttachment(ApplicationMetaData.class, apmd);
-
- UnifiedApplicationMetaData umd = new UnifiedApplicationMetaData();
- buildUnifiedBeanMetaData(umd, apmd);
- umd.setConfigName(apmd.getConfigName());
- umd.setConfigFile(apmd.getConfigFile());
- umd.setWebServiceContextRoot(apmd.getWebServiceContextRoot());
- umd.setSecurityDomain(apmd.getSecurityDomain());
- umd.setPublishLocationAdapter(getPublishLocationAdpater(apmd));
-
- dep.getContext().addAttachment(UnifiedApplicationMetaData.class, umd);
- return umd;
- }
-
- private static PublishLocationAdapter getPublishLocationAdpater(final ApplicationMetaData apmd)
- {
- return new PublishLocationAdapter ()
- {
- public String getWsdlPublishLocationByName(String name)
- {
- return apmd.getWsdlPublishLocationByName(name);
- }
- };
- }
-
- private static void buildUnifiedBeanMetaData(UnifiedApplicationMetaData umd, ApplicationMetaData metaData)
- {
- List<UnifiedBeanMetaData> beans = new ArrayList<UnifiedBeanMetaData>();
- Iterator it = metaData.getEnterpriseBeans();
- while (it.hasNext())
- {
- BeanMetaData bmd = (BeanMetaData)it.next();
- UnifiedBeanMetaData ubmd = buildUnifiedBeanMetaData(bmd);
- if (ubmd != null)
- {
- beans.add(ubmd);
- }
- }
- umd.setEnterpriseBeans(beans);
- }
-
- private static UnifiedBeanMetaData buildUnifiedBeanMetaData(BeanMetaData bmd)
- {
- UnifiedBeanMetaData ubmd = null;
- if (bmd instanceof SessionMetaData)
- {
- ubmd = new UnifiedSessionMetaData();
- }
- else if (bmd instanceof MessageDrivenMetaData)
- {
- ubmd = new UnifiedMessageDrivenMetaData();
- ((UnifiedMessageDrivenMetaData)ubmd).setDestinationJndiName(((MessageDrivenMetaData)bmd).getDestinationJndiName());
- }
-
- if (ubmd != null)
- {
- ubmd.setEjbName(bmd.getEjbName());
- ubmd.setEjbClass(bmd.getEjbClass());
- ubmd.setServiceEndpointInterface(bmd.getServiceEndpoint());
- ubmd.setHome(bmd.getHome());
- ubmd.setLocalHome(bmd.getLocalHome());
- ubmd.setJndiName(bmd.getJndiName());
- ubmd.setLocalJndiName(bmd.getLocalJndiName());
-
- EjbPortComponentMetaData pcmd = bmd.getPortComponent();
- if (pcmd != null)
- {
- UnifiedEjbPortComponentMetaData upcmd = new UnifiedEjbPortComponentMetaData();
- upcmd.setPortComponentName(pcmd.getPortComponentName());
- upcmd.setPortComponentURI(pcmd.getPortComponentURI());
- upcmd.setAuthMethod(pcmd.getAuthMethod());
- upcmd.setTransportGuarantee(pcmd.getTransportGuarantee());
- upcmd.setSecureWSDLAccess(pcmd.getSecureWSDLAccess());
- ubmd.setPortComponent(upcmd);
- }
- }
- return ubmd;
- }
-}
Copied: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapterEJB21.java (from rev 3387, trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapter.java)
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapterEJB21.java (rev 0)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapterEJB21.java 2007-06-02 20:38:33 UTC (rev 3395)
@@ -0,0 +1,81 @@
+/*
+ * 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.metadata.BeanMetaData;
+import org.jboss.metadata.EjbPortComponentMetaData;
+import org.jboss.metadata.MessageDrivenMetaData;
+import org.jboss.metadata.SessionMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.UnifiedEjbPortComponentMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.UnifiedMessageDrivenMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.UnifiedSessionMetaData;
+
+/**
+ * Build container independent application meta data
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 05-May-2006
+ */
+public class ApplicationMetaDataAdapterEJB21 extends AbstractApplicationMetaDataAdapter
+{
+ @Override
+ protected UnifiedBeanMetaData buildUnifiedBeanMetaData(BeanMetaData bmd)
+ {
+ UnifiedBeanMetaData ubmd = null;
+ if (bmd instanceof SessionMetaData)
+ {
+ ubmd = new UnifiedSessionMetaData();
+ }
+ else if (bmd instanceof MessageDrivenMetaData)
+ {
+ ubmd = new UnifiedMessageDrivenMetaData();
+ ((UnifiedMessageDrivenMetaData)ubmd).setDestinationJndiName(((MessageDrivenMetaData)bmd).getDestinationJndiName());
+ }
+
+ if (ubmd != null)
+ {
+ ubmd.setEjbName(bmd.getEjbName());
+ ubmd.setEjbClass(bmd.getEjbClass());
+ ubmd.setServiceEndpointInterface(bmd.getServiceEndpoint());
+ ubmd.setHome(bmd.getHome());
+ ubmd.setLocalHome(bmd.getLocalHome());
+ ubmd.setJndiName(bmd.getJndiName());
+ ubmd.setLocalJndiName(bmd.getLocalJndiName());
+
+ EjbPortComponentMetaData pcmd = bmd.getPortComponent();
+ if (pcmd != null)
+ {
+ UnifiedEjbPortComponentMetaData upcmd = new UnifiedEjbPortComponentMetaData();
+ upcmd.setPortComponentName(pcmd.getPortComponentName());
+ upcmd.setPortComponentURI(pcmd.getPortComponentURI());
+ upcmd.setAuthMethod(pcmd.getAuthMethod());
+ upcmd.setTransportGuarantee(pcmd.getTransportGuarantee());
+ upcmd.setSecureWSDLAccess(pcmd.getSecureWSDLAccess());
+ ubmd.setPortComponent(upcmd);
+ }
+ }
+ return ubmd;
+ }
+}
Copied: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapterEJB3.java (from rev 3387, trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdaptorEJB3.java)
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapterEJB3.java (rev 0)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapterEJB3.java 2007-06-02 20:38:33 UTC (rev 3395)
@@ -0,0 +1,95 @@
+/*
+ * 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 java.util.ArrayList;
+
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+
+import org.jboss.ejb3.Ejb3ModuleMBean;
+import org.jboss.ejb3.stateless.StatelessContainer;
+import org.jboss.logging.Logger;
+import org.jboss.mx.util.MBeanProxy;
+import org.jboss.mx.util.MBeanProxyCreationException;
+import org.jboss.mx.util.MBeanServerLocator;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
+import org.jboss.wsf.spi.deployment.WSDeploymentException;
+import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData;
+
+/**
+ * Build container independent application meta data
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 14-Apr-2007
+ */
+public class ApplicationMetaDataAdapterEJB3
+{
+ // logging support
+ private static Logger log = Logger.getLogger(ApplicationMetaDataAdapterEJB3.class);
+
+ public UnifiedApplicationMetaData buildUnifiedApplicationMetaData(Deployment dep, UnifiedDeploymentInfo udi)
+ {
+ Ejb3ModuleMBean ejb3Module = getEJB3Module(udi.deployedObject);
+
+ ArrayList<UnifiedBeanMetaData> beans = new ArrayList<UnifiedBeanMetaData>();
+ for (Object container : ejb3Module.getContainers().values())
+ {
+ if (container instanceof StatelessContainer)
+ {
+ StatelessContainer slc = (StatelessContainer)container;
+ UnifiedBeanMetaData uslc = new UnifiedBeanMetaData();
+ uslc.setEjbName(slc.getEjbName());
+ uslc.setEjbClass(slc.getBeanClassName());
+ beans.add(uslc);
+ }
+ }
+
+ UnifiedApplicationMetaData umd = new UnifiedApplicationMetaData();
+ umd.setEnterpriseBeans(beans);
+
+ dep.getContext().addAttachment(UnifiedApplicationMetaData.class, umd);
+ return umd;
+ }
+
+ static Ejb3ModuleMBean getEJB3Module(ObjectName objectName)
+ {
+ Ejb3ModuleMBean ejb3Module;
+ try
+ {
+ MBeanServer server = MBeanServerLocator.locateJBoss();
+ ejb3Module = (Ejb3ModuleMBean)MBeanProxy.get(Ejb3ModuleMBean.class, objectName, server);
+ if (ejb3Module == null)
+ throw new WSDeploymentException("Cannot obtain EJB3 module: " + objectName);
+
+ return ejb3Module;
+ }
+ catch (MBeanProxyCreationException ex)
+ {
+ throw new WSDeploymentException("Cannot obtain proxy to EJB3 module");
+ }
+ }
+}
Deleted: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdaptorEJB3.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdaptorEJB3.java 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdaptorEJB3.java 2007-06-02 20:38:33 UTC (rev 3395)
@@ -1,95 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.container.jboss42;
-
-// $Id$
-
-import java.util.ArrayList;
-
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
-
-import org.jboss.ejb3.Ejb3ModuleMBean;
-import org.jboss.ejb3.stateless.StatelessContainer;
-import org.jboss.logging.Logger;
-import org.jboss.mx.util.MBeanProxy;
-import org.jboss.mx.util.MBeanProxyCreationException;
-import org.jboss.mx.util.MBeanServerLocator;
-import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
-import org.jboss.wsf.spi.deployment.WSDeploymentException;
-import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData;
-import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData;
-
-/**
- * Build container independent application meta data
- *
- * @author Thomas.Diesler at jboss.org
- * @since 14-Apr-2007
- */
-public class ApplicationMetaDataAdaptorEJB3
-{
- // logging support
- private static Logger log = Logger.getLogger(ApplicationMetaDataAdaptorEJB3.class);
-
- public static UnifiedApplicationMetaData buildUnifiedApplicationMetaData(Deployment dep, UnifiedDeploymentInfo udi)
- {
- Ejb3ModuleMBean ejb3Module = getEJB3Module(udi.deployedObject);
-
- ArrayList<UnifiedBeanMetaData> beans = new ArrayList<UnifiedBeanMetaData>();
- for (Object container : ejb3Module.getContainers().values())
- {
- if (container instanceof StatelessContainer)
- {
- StatelessContainer slc = (StatelessContainer)container;
- UnifiedBeanMetaData uslc = new UnifiedBeanMetaData();
- uslc.setEjbName(slc.getEjbName());
- uslc.setEjbClass(slc.getBeanClassName());
- beans.add(uslc);
- }
- }
-
- UnifiedApplicationMetaData umd = new UnifiedApplicationMetaData();
- umd.setEnterpriseBeans(beans);
-
- dep.getContext().addAttachment(UnifiedApplicationMetaData.class, umd);
- return umd;
- }
-
- static Ejb3ModuleMBean getEJB3Module(ObjectName objectName)
- {
- Ejb3ModuleMBean ejb3Module;
- try
- {
- MBeanServer server = MBeanServerLocator.locateJBoss();
- ejb3Module = (Ejb3ModuleMBean)MBeanProxy.get(Ejb3ModuleMBean.class, objectName, server);
- if (ejb3Module == null)
- throw new WSDeploymentException("Cannot obtain EJB3 module: " + objectName);
-
- return ejb3Module;
- }
- catch (MBeanProxyCreationException ex)
- {
- throw new WSDeploymentException("Cannot obtain proxy to EJB3 module");
- }
- }
-}
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-02 15:46:20 UTC (rev 3394)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java 2007-06-02 20:38:33 UTC (rev 3395)
@@ -45,9 +45,28 @@
{
// logging support
private static Logger log = Logger.getLogger(DeploymentInfoAdapter.class);
+
+ private ApplicationMetaDataAdapterEJB3 applicationMetaDataAdapterEJB3;
+ private AbstractApplicationMetaDataAdapter applicationMetaDataAdapterEJB21;
+ private WebMetaDataAdapter webMetaDataAdapter;
- public static UnifiedDeploymentInfo buildDeploymentInfo(Deployment dep, UnifiedDeploymentInfo udi, DeploymentInfo di)
+ public void setApplicationMetaDataAdapterEJB21(AbstractApplicationMetaDataAdapter applicationMetaDataAdapterEJB21)
{
+ this.applicationMetaDataAdapterEJB21 = applicationMetaDataAdapterEJB21;
+ }
+
+ public void setApplicationMetaDataAdapterEJB3(ApplicationMetaDataAdapterEJB3 applicationMetaDataAdapterEJB3)
+ {
+ this.applicationMetaDataAdapterEJB3 = applicationMetaDataAdapterEJB3;
+ }
+
+ public void setWebMetaDataAdapter(WebMetaDataAdapter webMetaDataAdapter)
+ {
+ this.webMetaDataAdapter = webMetaDataAdapter;
+ }
+
+ public UnifiedDeploymentInfo buildDeploymentInfo(Deployment dep, UnifiedDeploymentInfo udi, DeploymentInfo di)
+ {
dep.getContext().addAttachment(DeploymentInfo.class, di);
if (di.parent != null)
@@ -69,7 +88,7 @@
return udi;
}
- private static URL getDeploymentURL(DeploymentInfo di)
+ private URL getDeploymentURL(DeploymentInfo di)
{
URL deploymentURL = (di.localUrl != null ? di.localUrl : di.url);
if ("file".equals(deploymentURL.getProtocol()))
@@ -90,20 +109,20 @@
return deploymentURL;
}
- private static void buildMetaData(Deployment dep, UnifiedDeploymentInfo udi, DeploymentInfo di)
+ private void buildMetaData(Deployment dep, UnifiedDeploymentInfo udi, DeploymentInfo di)
{
if (di.metaData instanceof WebMetaData)
{
- udi.metaData = WebMetaDataAdapter.buildUnifiedWebMetaData(dep, udi, (WebMetaData)di.metaData);
+ udi.metaData = webMetaDataAdapter.buildUnifiedWebMetaData(dep, udi, (WebMetaData)di.metaData);
udi.webappURL = udi.url;
}
else if (di.metaData instanceof ApplicationMetaData)
{
- udi.metaData = ApplicationMetaDataAdapter.buildUnifiedApplicationMetaData(dep, udi, (ApplicationMetaData)di.metaData);
+ udi.metaData = applicationMetaDataAdapterEJB21.buildUnifiedApplicationMetaData(dep, udi, (ApplicationMetaData)di.metaData);
}
else if (udi.deployedObject != null)
{
- udi.metaData = ApplicationMetaDataAdaptorEJB3.buildUnifiedApplicationMetaData(dep, udi);
+ udi.metaData = applicationMetaDataAdapterEJB3.buildUnifiedApplicationMetaData(dep, udi);
;
}
}
Deleted: 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 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapterFactory.java 2007-06-02 20:38:33 UTC (rev 3395)
@@ -1,47 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.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 at jboss.org
- * @since 10-Mar-2007
- */
-public class DeploymentInfoAdapterFactory
-{
- // Hide ctor
- private DeploymentInfoAdapterFactory()
- {
- }
-
- public static DeploymentInfoAdapter newInstance()
- {
- KernelRegistry registry = KernelLocator.getKernel().getRegistry();
- KernelRegistryEntry entry = registry.getEntry("WSDeploymentInfoAdapter");
- return (DeploymentInfoAdapter)entry.getTarget();
- }
-}
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2007-06-02 20:38:33 UTC (rev 3395)
@@ -61,7 +61,7 @@
Service service = dep.getService();
- Ejb3ModuleMBean ejb3Module = ApplicationMetaDataAdaptorEJB3.getEJB3Module(unit.deployedObject);
+ Ejb3ModuleMBean ejb3Module = ApplicationMetaDataAdapterEJB3.getEJB3Module(unit.deployedObject);
for (Object manager : ejb3Module.getContainers().values())
{
if (manager instanceof EJBContainer)
@@ -92,7 +92,7 @@
boolean isWebserviceDeployment = false;
// Check if the ejb3 contains annotated endpoints
- Ejb3ModuleMBean ejb3Module = ApplicationMetaDataAdaptorEJB3.getEJB3Module(unit.deployedObject);
+ Ejb3ModuleMBean ejb3Module = ApplicationMetaDataAdapterEJB3.getEJB3Module(unit.deployedObject);
for (Object manager : ejb3Module.getContainers().values())
{
if (manager instanceof EJBContainer)
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/UnifiedDeploymentInfoDeployer.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/UnifiedDeploymentInfoDeployer.java 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/UnifiedDeploymentInfoDeployer.java 2007-06-02 20:38:33 UTC (rev 3395)
@@ -40,6 +40,13 @@
*/
public class UnifiedDeploymentInfoDeployer extends AbstractDeployer
{
+ private DeploymentInfoAdapter deploymentInfoAdapter;
+
+ public void setDeploymentInfoAdapter(DeploymentInfoAdapter deploymentInfoAdapter)
+ {
+ this.deploymentInfoAdapter = deploymentInfoAdapter;
+ }
+
@Override
public void create(Deployment dep)
{
@@ -54,13 +61,13 @@
if (type.toString().startsWith("JAXWS"))
{
udi = new JAXWSDeployment(type);
- DeploymentInfoAdapter.buildDeploymentInfo(dep, udi, unit);
+ deploymentInfoAdapter.buildDeploymentInfo(dep, udi, unit);
}
else
{
WebservicesMetaData wsMetaData = dep.getContext().getAttachment(WebservicesMetaData.class);
udi = new JAXRPCDeployment(type, wsMetaData);
- DeploymentInfoAdapter.buildDeploymentInfo(dep, udi, unit);
+ deploymentInfoAdapter.buildDeploymentInfo(dep, udi, unit);
}
dep.getContext().addAttachment(UnifiedDeploymentInfo.class, udi);
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebMetaDataAdapter.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebMetaDataAdapter.java 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebMetaDataAdapter.java 2007-06-02 20:38:33 UTC (rev 3395)
@@ -48,7 +48,7 @@
*/
public class WebMetaDataAdapter
{
- public static UnifiedWebMetaData buildUnifiedWebMetaData(Deployment dep, UnifiedDeploymentInfo udi, WebMetaData webMetaData)
+ public UnifiedWebMetaData buildUnifiedWebMetaData(Deployment dep, UnifiedDeploymentInfo udi, WebMetaData webMetaData)
{
dep.getContext().addAttachment(WebMetaData.class, webMetaData);
@@ -66,7 +66,7 @@
return umd;
}
- private static PublishLocationAdapter getPublishLocationAdpater(final WebMetaData wmd)
+ private PublishLocationAdapter getPublishLocationAdpater(final WebMetaData wmd)
{
return new PublishLocationAdapter()
{
@@ -77,7 +77,7 @@
};
}
- private static List<UnifiedWebSecurityMetaData> getSecurityMetaData(final Iterator securityConstraints)
+ private List<UnifiedWebSecurityMetaData> getSecurityMetaData(final Iterator securityConstraints)
{
ArrayList<UnifiedWebSecurityMetaData> unifiedsecurityMetaData = new ArrayList<UnifiedWebSecurityMetaData>();
@@ -106,7 +106,7 @@
return unifiedsecurityMetaData;
}
- private static Map<String, String> getServletClassMap(WebMetaData wmd)
+ private Map<String, String> getServletClassMap(WebMetaData wmd)
{
Map<String, String> mappings = new HashMap<String, String>();
Iterator it = wmd.getServletClassMap().entrySet().iterator();
Modified: trunk/integration/jboss50/.classpath
===================================================================
--- trunk/integration/jboss50/.classpath 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/integration/jboss50/.classpath 2007-06-02 20:38:33 UTC (rev 3395)
@@ -9,5 +9,5 @@
<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/dom4j.jar"/>
- <classpathentry kind="output" path="output-eclipse"/>
+ <classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: trunk/integration/jboss50/build.xml
===================================================================
--- trunk/integration/jboss50/build.xml 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/integration/jboss50/build.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -38,7 +38,7 @@
<target name="init" depends="prepare,thirdparty">
<fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/>
- <ant antfile="${spi.dir}/build.xml" target="main" inheritall="false"/>
+ <ant antfile="${spi.dir}/build.xml" target="jars" inheritall="false"/>
</target>
<!-- ================================================================== -->
@@ -122,7 +122,7 @@
</target>
<target name="clobber" depends="clean" description="Cleans up all generated files.">
- <delete dir="${int.jboss50.dir}/output-tests"/>
+ <delete dir="${int.jboss50.dir}/output/tests"/>
</target>
<target name="main" description="Executes the default target (most)." depends="most"/>
Modified: trunk/integration/native/.classpath
===================================================================
--- trunk/integration/native/.classpath 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/integration/native/.classpath 2007-06-02 20:38:33 UTC (rev 3395)
@@ -9,5 +9,5 @@
<classpathentry kind="lib" path="/integration-spi/thirdparty/jboss-common-core.jar"/>
<classpathentry kind="lib" path="/jbossws-core/thirdparty/wsdl4j.jar"/>
<classpathentry kind="lib" path="/integration-spi/thirdparty/activation.jar"/>
- <classpathentry kind="output" path="output-eclipse"/>
+ <classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: trunk/integration/native/ant-import/build-bin-dist.xml
===================================================================
--- trunk/integration/native/ant-import/build-bin-dist.xml 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/integration/native/ant-import/build-bin-dist.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -89,11 +89,14 @@
<fileset dir="${spi.dir}/thirdparty">
<include name="getopt.jar"/>
</fileset>
+ <fileset dir="${int.jboss50.dir}/output/lib">
+ <include name="jbossws-jboss50.jar"/>
+ </fileset>
<fileset dir="${int.jboss42.dir}/output/lib">
<include name="jbossws-jboss42.jar"/>
</fileset>
- <fileset dir="${int.jboss50.dir}/output/lib">
- <include name="jbossws-jboss50.jar"/>
+ <fileset dir="${int.jboss40.dir}/output/lib">
+ <include name="jbossws-jboss40.jar"/>
</fileset>
<fileset dir="${core.dir}/output/lib">
<include name="jboss-jaxrpc.jar"/>
@@ -104,6 +107,7 @@
</fileset>
<fileset dir="${int.native.dir}/output/lib">
<include name="jbossws-context.war"/>
+ <include name="jbossws-native40.sar"/>
<include name="jbossws-native42.sar"/>
<include name="jbossws-native50.sar"/>
<include name="jbossws-native50-deployer.zip"/>
Modified: trunk/integration/native/ant-import/build-deploy.xml
===================================================================
--- trunk/integration/native/ant-import/build-deploy.xml 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/integration/native/ant-import/build-deploy.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -67,4 +67,26 @@
<macro-undeploy-native42/>
<macro-undeploy-spi jbosshome="${jboss42.home}"/>
</target>
+
+ <!-- Deploy jbossws to jboss40 -->
+ <target name="deploy-jboss40" depends="jars-jboss40,undeploy-jboss40" description="Deploy jbossws to jboss40">
+ <macro-deploy-native40
+ spilibs="${spi.dir}/output/lib"
+ jbosslibs="${int.jboss40.dir}/output/lib"
+ corelibs="${core.dir}/output/lib"
+ stacklibs="${int.native.dir}/output/lib"
+ thirdpartylibs="${core.dir}/thirdparty"/>
+
+ <macro-deploy-spi
+ spilibs="${spi.dir}/output/lib"
+ spiscripts="${spi.dir}/etc"
+ thirdpartylibs="${spi.dir}/thirdparty"
+ jbosshome="${jboss40.home}"/>
+ </target>
+
+ <!-- Remove jbossws from jboss40 -->
+ <target name="undeploy-jboss40" depends="prepare" description="Remove jbossws from jboss40">
+ <macro-undeploy-native40/>
+ <macro-undeploy-spi jbosshome="${jboss40.home}"/>
+ </target>
</project>
Modified: trunk/integration/native/ant-import/build-testsuite.xml
===================================================================
--- trunk/integration/native/ant-import/build-testsuite.xml 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/integration/native/ant-import/build-testsuite.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -10,7 +10,7 @@
<project>
- <property name="tests.output.dir" value="${int.native.dir}/output-tests"/>
+ <property name="tests.output.dir" value="${int.native.dir}/output/tests"/>
<import file="${testsuite.dir}/ant-import/build-testsuite.xml"/>
<property name="tests.dir" value="${testsuite.dir}/src"/>
@@ -18,12 +18,10 @@
<property name="tests.resources.dir" value="${tests.dir}/resources"/>
<!-- Define excludesfile -->
- <condition property="excludesfile" value="${int.native.dir}/src/test/resources/excludes-jboss50.txt">
- <equals arg1="${jbossws.integration.target}" arg2="jboss50"/>
+ <condition property="excludesfile" value="${int.native.dir}/src/test/resources/excludes-jboss40.txt">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss40"/>
</condition>
- <condition property="excludesfile" value="${int.native.dir}/src/test/resources/excludes-jboss42.txt">
- <equals arg1="${jbossws.integration.target}" arg2="jboss42"/>
- </condition>
+ <property name="excludesfile" value="${int.native.dir}/src/test/resources/excludes-none.txt"/>
<!-- ================================================================== -->
<!-- Initialization -->
Modified: trunk/integration/native/ant-import/macros-deploy-native.xml
===================================================================
--- trunk/integration/native/ant-import/macros-deploy-native.xml 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/integration/native/ant-import/macros-deploy-native.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -208,4 +208,96 @@
</sequential>
</macrodef>
+ <macrodef name="macro-deploy-native40">
+ <attribute name="spilibs"/>
+ <attribute name="jbosslibs"/>
+ <attribute name="corelibs"/>
+ <attribute name="stacklibs"/>
+ <attribute name="thirdpartylibs"/>
+ <sequential>
+ <fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/>
+
+ <!-- CLIENT JARS -->
+ <copy todir="${jboss40.home}/client" overwrite="true">
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss40.jar"/>
+ </fileset>
+ <fileset dir="@{corelibs}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+ </fileset>
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="wsdl4j.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
+ <include name="policy.jar"/>
+ </fileset>
+ </copy>
+
+ <!-- SERVER JARS -->
+ <copy todir="${jboss40.home}/server/${jboss.server.instance}/lib" overwrite="true">
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss40.jar"/>
+ </fileset>
+ <fileset dir="@{corelibs}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
+ </copy>
+
+ <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <unjar dest="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native40.sar"/>
+ <!-- Deploy juddi-service.sar -->
+ <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip dest="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-undeploy-native40">
+ <sequential>
+ <fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/>
+ <delete>
+
+ <!-- CLIENT JARS -->
+ <fileset dir="${jboss40.home}/client">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+ <include name="jbossws-jboss40.jar"/>
+ <include name="policy.jar"/>
+ <include name="wsdl4j.jar"/>
+ <!-- remove only, do not deploy -->
+ <include name="jbossws-wsconsume-impl.jar"/>
+ </fileset>
+
+ <!-- SERVER JARS -->
+ <fileset dir="${jboss40.home}/lib">
+ <!-- remove only, do not deploy -->
+ <include name="jbossws-integration.jar"/>
+ </fileset>
+ <fileset dir="${jboss40.home}/server/${jboss.server.instance}/lib">
+ <include name="jbossws-jboss40.jar"/>
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
+ </delete>
+ <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <!-- Undeploy juddi-service.sar -->
+ <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
</project>
Modified: trunk/integration/native/build.xml
===================================================================
--- trunk/integration/native/build.xml 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/integration/native/build.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -94,7 +94,7 @@
<!--
| Build all jar files.
-->
- <target name="jars" depends="compile,jars-jboss42,jars-jboss50" description="Builds all jar files.">
+ <target name="jars" depends="compile,jars-jboss40,jars-jboss42,jars-jboss50" description="Builds all jar files.">
</target>
<target name="jars-common" depends="compile">
@@ -212,7 +212,43 @@
<include name="jboss-beans.xml"/>
</metainf>
</jar>
+ </target>
+
+ <target name="jars-jboss40" depends="jars-common" if="jboss40.home">
+ <ant antfile="${int.jboss40.dir}/build.xml" target="jars" inheritall="false"/>
+
+ <!-- Build jbossws-native40.sar -->
+ <mkdir dir="${native.output.lib.dir}"/>
+ <jar jarfile="${native.output.lib.dir}/jbossws-native40.sar" manifest="${native.output.etc.dir}/default.mf">
+ <fileset dir="${native.output.lib.dir}">
+ <include name="jbossws-context.war"/>
+ <include name="jbossws-native.jar"/>
+ </fileset>
+ <fileset dir="${core.dir}/output/lib">
+ <include name="jboss-jaxws.jar"/>
+ <include name="jbossws-core.jar"/>
+ </fileset>
+ <fileset dir="${core.dir}/thirdparty">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="policy.jar"/>
+ <include name="stax-api.jar"/>
+ <include name="wsdl4j.jar"/>
+ <include name="xmlsec.jar"/>
+ <include name="wstx.jar"/>
+ </fileset>
+ <fileset dir="${native.resources.dir}/jbossws-native40.sar">
+ <include name="jbossws.beans/**"/>
+ </fileset>
+ <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>
+ </jar>
</target>
<!-- ================================================================== -->
@@ -224,7 +260,6 @@
</target>
<target name="clobber" depends="clean" description="Cleans up all generated files.">
- <delete dir="${int.native.dir}/output-tests"/>
</target>
<target name="main" description="Executes the default target (most)." depends="most"/>
Modified: trunk/integration/native/src/main/etc/bindist-build.xml
===================================================================
--- trunk/integration/native/src/main/etc/bindist-build.xml 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/integration/native/src/main/etc/bindist-build.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -42,13 +42,21 @@
<property name="jboss42.server.lib" value="${jboss42.server}/lib"/>
<property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/>
+ <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="jbossws.integration.${jbossws.integration.target}" value="true"/>
<property name="jboss50.available.file" value="${jboss50.client}/jboss-ejb3-client.jar"/>
<property name="jboss42.available.file" value="${jboss42.client}/jboss-client.jar"/>
+ <property name="jboss40.available.file" value="${jboss40.client}/jboss-client.jar"/>
<available property="jboss50.available" file="${jboss50.available.file}"/>
<available property="jboss42.available" file="${jboss42.available.file}"/>
+ <available property="jboss40.available" file="${jboss40.available.file}"/>
<import file="${basedir}/build/build-testsuite.xml"/>
<import file="${basedir}/build/macros-deploy-spi.xml"/>
@@ -172,6 +180,30 @@
<macro-undeploy-spi jbosshome="${jboss42.home}"/>
</target>
+ <!-- Deploy jbossws/native to jboss40 -->
+ <target name="deploy-jboss40" depends="prepare" description="Deploy jbossws/native to jboss40">
+ <macro-undeploy-sunri40/>
+ <macro-undeploy-xfire40/>
+ <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>
+
+ <!-- Remove jbossws/native from jboss40 -->
+ <target name="undeploy-jboss40" depends="prepare" description="Remove jbossws/native from jboss40">
+ <macro-undeploy-native40/>
+ <macro-undeploy-spi jbosshome="${jboss40.home}"/>
+ </target>
+
<!-- ================================================================== -->
<!-- Miscellaneous -->
<!-- ================================================================== -->
Modified: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointServlet.java
===================================================================
--- trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointServlet.java 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointServlet.java 2007-06-02 20:38:33 UTC (rev 3395)
@@ -44,9 +44,9 @@
/** Initialize the service endpoint
*/
@Override
- protected Endpoint initServiceEndpoint(String contextPath)
+ protected void initServiceEndpoint(String contextPath)
{
- Endpoint endpoint = super.initServiceEndpoint(contextPath);
+ super.initServiceEndpoint(contextPath);
// read the config name/file from web.xml
ServletContext ctx = getServletContext();
@@ -61,7 +61,5 @@
log.debug("Updating service endpoint config\n config-name: " + configName + "\n config-file: " + configFile);
epMetaData.setConfigName(configName, configFile);
}
-
- return endpoint;
}
}
Copied: trunk/integration/native/src/main/resources/jbossws-native40.sar (from rev 3387, trunk/integration/native/src/main/resources/jbossws-native42.sar)
Modified: trunk/integration/native/src/main/resources/jbossws-native40.sar/META-INF/jboss-service.xml
===================================================================
--- trunk/integration/native/src/main/resources/jbossws-native42.sar/META-INF/jboss-service.xml 2007-06-01 22:34:58 UTC (rev 3387)
+++ trunk/integration/native/src/main/resources/jbossws-native40.sar/META-INF/jboss-service.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -5,6 +5,13 @@
<server>
<!--
+ Bind JAXRPC ServiceRefs
+ -->
+ <mbean name="jboss.ws:service=WebServiceClientDeployer" code="org.jboss.wsf.container.jboss40.WebServiceClientDeployer">
+ <depends>jboss:service=Naming</depends>
+ </mbean>
+
+ <!--
A deployer service for JSE endpoints.
-->
<mbean name="jboss.ws:service=DeployerInterceptorJSE" code="org.jboss.wsf.container.jboss42.DeployerInterceptorJSE">
Modified: trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml
===================================================================
--- trunk/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-01 22:34:58 UTC (rev 3387)
+++ trunk/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -134,7 +134,7 @@
<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>
- <entry><key>JAXWS_EJB3</key><value>org.jboss.wsf.container.jboss42.InvocationHandlerEJB3</value></entry>
+ <entry><key>JAXWS_EJB3</key><value>org.jboss.wsf.container.jboss40.InvocationHandlerEJB3</value></entry>
</map>
</property>
</bean>
@@ -147,7 +147,9 @@
</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"/>
+ <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"/>
@@ -160,11 +162,20 @@
</bean>
<!-- Deployer helper beans -->
+ <bean name="WSApplicationMetaDataAdapterEJB21" class="org.jboss.wsf.container.jboss40.ApplicationMetaDataAdapterEJB21"/>
+ <bean name="WSApplicationMetaDataAdapterEJB3" class="org.jboss.wsf.container.jboss42.ApplicationMetaDataAdapterEJB3"/>
+ <bean name="WSDeploymentInfoAdapter" class="org.jboss.wsf.container.jboss42.DeploymentInfoAdapter">
+ <property name="applicationMetaDataAdapterEJB21"><inject bean="WSApplicationMetaDataAdapterEJB21"/></property>
+ <property name="applicationMetaDataAdapterEJB3"><inject bean="WSApplicationMetaDataAdapterEJB3"/></property>
+ <property name="webMetaDataAdapter"><inject bean="WSWebMetaDataAdapter"/></property>
+ </bean>
<bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB21"/>
<bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB3"/>
+ <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>
Modified: trunk/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml
===================================================================
--- trunk/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -147,7 +147,9 @@
</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"/>
+ <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"/>
@@ -160,11 +162,19 @@
</bean>
<!-- Deployer helper beans -->
+ <bean name="WSApplicationMetaDataAdapterEJB21" class="org.jboss.wsf.container.jboss42.ApplicationMetaDataAdapterEJB21"/>
+ <bean name="WSApplicationMetaDataAdapterEJB3" class="org.jboss.wsf.container.jboss42.ApplicationMetaDataAdapterEJB3"/>
+ <bean name="WSDeploymentInfoAdapter" class="org.jboss.wsf.container.jboss42.DeploymentInfoAdapter">
+ <property name="applicationMetaDataAdapterEJB21"><inject bean="WSApplicationMetaDataAdapterEJB21"/></property>
+ <property name="applicationMetaDataAdapterEJB3"><inject bean="WSApplicationMetaDataAdapterEJB3"/></property>
+ <property name="webMetaDataAdapter"><inject bean="WSWebMetaDataAdapter"/></property>
+ </bean>
<bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB21"/>
<bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB3"/>
<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>
Copied: trunk/integration/native/src/test/resources/excludes-jboss40.txt (from rev 3387, trunk/integration/native/src/test/resources/excludes-jboss42.txt)
===================================================================
--- trunk/integration/native/src/test/resources/excludes-jboss40.txt (rev 0)
+++ trunk/integration/native/src/test/resources/excludes-jboss40.txt 2007-06-02 20:38:33 UTC (rev 3395)
@@ -0,0 +1,9 @@
+#
+# $Id$
+#
+
+# EJB3/Injection excludes
+org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase*
+org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase*
+org/jboss/test/ws/jaxws/samples/retail/**
+org/jboss/test/ws/jaxws/samples/webserviceref/**
Deleted: trunk/integration/native/src/test/resources/excludes-jboss42.txt
===================================================================
--- trunk/integration/native/src/test/resources/excludes-jboss42.txt 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/integration/native/src/test/resources/excludes-jboss42.txt 2007-06-02 20:38:33 UTC (rev 3395)
@@ -1,5 +0,0 @@
-#
-# $Id$
-#
-
-# Nothing to exclude
Deleted: trunk/integration/native/src/test/resources/excludes-jboss50.txt
===================================================================
--- trunk/integration/native/src/test/resources/excludes-jboss50.txt 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/integration/native/src/test/resources/excludes-jboss50.txt 2007-06-02 20:38:33 UTC (rev 3395)
@@ -1,5 +0,0 @@
-#
-# $Id$
-#
-
-# Nothing to exclude
Added: trunk/integration/native/src/test/resources/excludes-none.txt
===================================================================
--- trunk/integration/native/src/test/resources/excludes-none.txt (rev 0)
+++ trunk/integration/native/src/test/resources/excludes-none.txt 2007-06-02 20:38:33 UTC (rev 3395)
@@ -0,0 +1,5 @@
+#
+# $Id$
+#
+
+# Nothing to exclude
Property changes on: trunk/integration/native/src/test/resources/excludes-none.txt
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/integration/spi/.classpath
===================================================================
--- trunk/integration/spi/.classpath 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/integration/spi/.classpath 2007-06-02 20:38:33 UTC (rev 3395)
@@ -21,5 +21,5 @@
<classpathentry kind="lib" path="thirdparty/dom4j.jar"/>
<classpathentry kind="lib" path="thirdparty/ant.jar"/>
<classpathentry kind="lib" path="thirdparty/getopt.jar"/>
- <classpathentry kind="output" path="output-eclipse"/>
+ <classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/EndpointServlet.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/EndpointServlet.java 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/EndpointServlet.java 2007-06-02 20:38:33 UTC (rev 3395)
@@ -55,11 +55,16 @@
{
super.init(servletConfig);
epRegistry = EndpointRegistryFactory.getEndpointRegistry();
- endpoint = initServiceEndpoint(getServletContext().getContextPath());
}
public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
{
+ if (endpoint == null)
+ {
+ String contextPath = req.getContextPath();
+ initServiceEndpoint(contextPath);
+ }
+
try
{
EndpointAssociation.setEndpoint(endpoint);
@@ -74,12 +79,11 @@
/** Initialize the service endpoint
*/
- protected Endpoint initServiceEndpoint(String contextPath)
+ protected void initServiceEndpoint(String contextPath)
{
if (contextPath.startsWith("/"))
contextPath = contextPath.substring(1);
- Endpoint endpoint = null;
String servletName = getServletName();
for (ObjectName sepId : epRegistry.getEndpoints())
{
@@ -98,7 +102,5 @@
+ Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + servletName);
throw new WebServiceException("Cannot obtain endpoint for: " + oname);
}
-
- return endpoint;
}
}
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTest.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTest.java 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTest.java 2007-06-02 20:38:33 UTC (rev 3395)
@@ -77,6 +77,11 @@
return delegate.isTargetJBoss42();
}
+ public boolean isTargetJBoss40()
+ {
+ return delegate.isTargetJBoss40();
+ }
+
public boolean isIntegrationNative()
{
return delegate.isIntegrationNative();
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestHelper.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestHelper.java 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestHelper.java 2007-06-02 20:38:33 UTC (rev 3395)
@@ -81,6 +81,13 @@
return "jboss42".equals(target);
}
+ /** True, if -Djbossws.integration.target=jboss40 */
+ public static boolean isTargetJBoss40()
+ {
+ String target = getIntegrationTarget();
+ return "jboss40".equals(target);
+ }
+
public boolean isIntegrationNative()
{
String vendor = Service.class.getPackage().getImplementationVendor();
@@ -150,6 +157,8 @@
jbossVersion = "jboss50";
else if (jbossVersion.startsWith("4.2"))
jbossVersion = "jboss42";
+ else if (jbossVersion.startsWith("4.0"))
+ jbossVersion = "jboss40";
else throw new RuntimeException("Unsupported jboss version: " + jbossVersion);
if (jbossVersion.equals(integrationTarget) == false)
Modified: trunk/integration/sunri/.classpath
===================================================================
--- trunk/integration/sunri/.classpath 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/integration/sunri/.classpath 2007-06-02 20:38:33 UTC (rev 3395)
@@ -24,5 +24,5 @@
<classpathentry kind="lib" path="/integration-spi/thirdparty/dom4j.jar"/>
<classpathentry kind="lib" path="/integration-spi/thirdparty/jboss-common-core.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/integration-jboss50"/>
- <classpathentry kind="output" path="output-eclipse"/>
+ <classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: trunk/integration/sunri/ant-import/build-testsuite.xml
===================================================================
--- trunk/integration/sunri/ant-import/build-testsuite.xml 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/integration/sunri/ant-import/build-testsuite.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -10,7 +10,7 @@
<project>
- <property name="tests.output.dir" value="${int.sunri.dir}/output-tests"/>
+ <property name="tests.output.dir" value="${int.sunri.dir}/output/tests"/>
<import file="${testsuite.dir}/ant-import/build-testsuite.xml"/>
<property name="tests.dir" value="${testsuite.dir}/src"/>
Modified: trunk/integration/sunri/build.xml
===================================================================
--- trunk/integration/sunri/build.xml 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/integration/sunri/build.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -40,7 +40,7 @@
<!-- ================================================================== -->
<target name="init" depends="prepare,thirdparty">
- <ant antfile="${spi.dir}/build.xml" target="main" inheritall="false"/>
+ <ant antfile="${spi.dir}/build.xml" target="jars" inheritall="false"/>
</target>
<!-- ================================================================== -->
@@ -247,7 +247,6 @@
</target>
<target name="clobber" depends="clean" description="Cleans up all generated files.">
- <delete dir="${int.sunri.dir}/output-tests"/>
<delete dir="${int.sunri.dir}/thirdparty"/>
</target>
Modified: trunk/integration/xfire/.classpath
===================================================================
--- trunk/integration/xfire/.classpath 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/integration/xfire/.classpath 2007-06-02 20:38:33 UTC (rev 3395)
@@ -17,5 +17,5 @@
<classpathentry kind="lib" path="thirdparty/xbean-spring.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/integration-jboss50"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/>
- <classpathentry kind="output" path="output-eclipse"/>
+ <classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: trunk/integration/xfire/ant-import/build-testsuite.xml
===================================================================
--- trunk/integration/xfire/ant-import/build-testsuite.xml 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/integration/xfire/ant-import/build-testsuite.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -10,7 +10,7 @@
<project>
- <property name="tests.output.dir" value="${int.xfire.dir}/output-tests"/>
+ <property name="tests.output.dir" value="${int.xfire.dir}/output/tests"/>
<import file="${testsuite.dir}/ant-import/build-testsuite.xml"/>
<property name="tests.dir" value="${testsuite.dir}/src"/>
Modified: trunk/integration/xfire/build.xml
===================================================================
--- trunk/integration/xfire/build.xml 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/integration/xfire/build.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -40,7 +40,7 @@
<!-- ================================================================== -->
<target name="init" depends="prepare,thirdparty">
- <ant antfile="${spi.dir}/build.xml" target="main" inheritall="false"/>
+ <ant antfile="${spi.dir}/build.xml" target="jars" inheritall="false"/>
</target>
<!-- ================================================================== -->
@@ -233,7 +233,6 @@
</target>
<target name="clobber" depends="clean" description="Cleans up all generated files.">
- <delete dir="${int.xfire.dir}/output-tests"/>
<delete dir="${int.xfire.dir}/thirdparty"/>
</target>
Modified: trunk/jbossws-core/.classpath
===================================================================
--- trunk/jbossws-core/.classpath 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/jbossws-core/.classpath 2007-06-02 20:38:33 UTC (rev 3395)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="output/tests/wsconsume/java"/>
<classpathentry excluding="org/jboss/test/ws/jaxrpc/samples/jmstransport/" kind="src" path="src/test/java"/>
- <classpathentry kind="src" path="output-tests/wsconsume/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="thirdparty/activation.jar"/>
<classpathentry kind="lib" path="thirdparty/getopt.jar"/>
@@ -36,5 +36,5 @@
<classpathentry kind="lib" path="thirdparty/xmlunit.jar"/>
<classpathentry kind="lib" path="thirdparty/jaxws-tools.jar"/>
<classpathentry kind="lib" path="thirdparty/jaxws-rt.jar"/>
- <classpathentry kind="output" path="output-eclipse"/>
+ <classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: trunk/jbossws-core/ant-import/build-deploy.xml
===================================================================
--- trunk/jbossws-core/ant-import/build-deploy.xml 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/jbossws-core/ant-import/build-deploy.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -33,4 +33,14 @@
<ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/>
</target>
+ <!-- Deploy jbossws to jboss40 -->
+ <target name="deploy-jboss40" depends="prepare" description="Deploy jbossws">
+ <ant antfile="${int.native.dir}/build.xml" target="deploy-jboss40" inheritall="false"/>
+ </target>
+
+ <!-- Undeploy jbossws to jboss40 -->
+ <target name="undeploy-jboss40" depends="prepare" description="Undeploy jbossws">
+ <ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss40" inheritall="false"/>
+ </target>
+
</project>
Modified: trunk/jbossws-core/ant-import-tests/build-jars-jaxrpc.xml
===================================================================
--- trunk/jbossws-core/ant-import-tests/build-jars-jaxrpc.xml 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/jbossws-core/ant-import-tests/build-jars-jaxrpc.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -52,7 +52,7 @@
</metainf>
</jar>
- <!-- jaxrpc-benchmark -->
+ <!-- jaxrpc-benchmark -->
<war warfile="${tests.output.dir}/libs/jaxrpc-benchmark-rpclit.war" webxml="${tests.output.dir}/resources/benchmark/jaxrpc/rpclit/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
<include name="org/jboss/test/ws/benchmark/jaxrpc/**"/>
@@ -1257,7 +1257,7 @@
<include name="org/jboss/test/ws/jaxrpc/jbws434/TestServiceEndpoint.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws434/TestServiceEndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws434/ArrayOfAny*.class"/>
- <include name="org/jboss/test/ws/jaxrpc/jbws434/TypeOfAny*.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws434/TypeOfAny*.class"/>
</classes>
<webinf dir="${tests.output.dir}/resources/jaxrpc/jbws434/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
@@ -2004,7 +2004,7 @@
<include name="wsdl/**"/>
</metainf>
</jar>
-
+
<!-- jaxrpc-jbws1011 -->
<jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1011.jar">
<fileset dir="${tests.output.dir}/classes">
@@ -2031,7 +2031,7 @@
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
+ <include name="wsdl/**"/>
</metainf>
</jar>
@@ -2039,15 +2039,15 @@
<war warfile="${tests.output.dir}/libs/jaxrpc-jbws1093.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1093/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1093/ServletTest.class"/>
- <include name="org/jboss/test/ws/jaxrpc/jbws1093/TestEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxrpc/jbws1093/TestEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1093/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1093/TestEndpointImpl.class"/>
</classes>
<webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1093/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
- </webinf>
- </war>
+ </webinf>
+ </war>
<jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1093-client.jar">
<fileset dir="${tests.output.dir}/classes">
<include name="org/jboss/test/ws/jbws1093/TestEndpoint.class"/>
@@ -2065,15 +2065,15 @@
<!-- jaxrpc-jbws1107 -->
<war warfile="${tests.output.dir}/libs/jaxrpc-jbws1107.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1107/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/jbws1107/TestEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxrpc/jbws1107/TestEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1107/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1107/TestEndpointImpl.class"/>
</classes>
<webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1107/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
- </webinf>
- </war>
+ </webinf>
+ </war>
<jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1107-client.jar">
<fileset dir="${tests.output.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1107/TestEndpoint.class"/>
@@ -2087,7 +2087,7 @@
<include name="wsdl/**"/>
</metainf>
</jar>
-
+
<!-- jaxrpc-jbws1121 -->
<war destfile="${tests.output.dir}/libs/jaxrpc-jbws1121.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1121/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
@@ -2121,10 +2121,9 @@
<metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1121">
<include name="wsse.keystore"/>
<include name="wsse.truststore"/>
- </metainf>
+ </metainf>
</jar>
- <ear destfile="${tests.output.dir}/libs/jaxrpc-jbws1121.ear"
- appxml="${tests.output.dir}/resources/jaxrpc/jbws1121/META-INF/application.xml">
+ <ear destfile="${tests.output.dir}/libs/jaxrpc-jbws1121.ear" appxml="${tests.output.dir}/resources/jaxrpc/jbws1121/META-INF/application.xml">
<fileset dir="${tests.output.dir}/libs">
<include name="jaxrpc-jbws1121-client.jar"/>
<include name="jaxrpc-jbws1121.war"/>
@@ -2147,8 +2146,8 @@
</copy>
<war warfile="${tests.output.dir}/libs/jaxrpc-jbws1124one.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1124/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/jbws1124/TestEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxrpc/jbws1124/TestEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1124/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1124/TestEndpointImpl.class"/>
</classes>
<webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1124/WEB-INF">
<include name="webservices.xml"/>
@@ -2156,8 +2155,8 @@
<include name="test-resource.txt"/>
<include name="jboss-web.xml"/>
<include name="wsdl/**"/>
- </webinf>
- </war>
+ </webinf>
+ </war>
<!-- jaxrpc-jbws1124two -->
<copy todir="${tests.output.dir}/resources" overwrite="true">
<fileset dir="${tests.resources.dir}">
@@ -2171,8 +2170,8 @@
</copy>
<war warfile="${tests.output.dir}/libs/jaxrpc-jbws1124two.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1124/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/jbws1124/TestEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxrpc/jbws1124/TestEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1124/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1124/TestEndpointImpl.class"/>
</classes>
<webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1124/WEB-INF">
<include name="webservices.xml"/>
@@ -2180,9 +2179,9 @@
<include name="test-resource.txt"/>
<include name="jboss-web.xml"/>
<include name="wsdl/**"/>
- </webinf>
- </war>
-
+ </webinf>
+ </war>
+
<!-- jaxrpc-jbws1125 -->
<war warfile="${tests.output.dir}/libs/jaxrpc-jbws1125.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1125/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
@@ -2195,7 +2194,7 @@
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
- </webinf>
+ </webinf>
</war>
<jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1125-client.jar">
<fileset dir="${tests.output.dir}/classes">
@@ -2224,7 +2223,7 @@
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
- </webinf>
+ </webinf>
</war>
<jar jarfile="${tests.output.dir}/libs/jaxrpc-jbws1148-client.jar">
<fileset dir="${tests.output.dir}/classes">
@@ -2238,7 +2237,7 @@
<metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1148/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
</metainf>
- </jar>
+ </jar>
<!-- jbossws-jbws1179 -->
<war warfile="${tests.output.dir}/libs/jaxrpc-jbws1179.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1179/WEB-INF/web.xml">
@@ -2250,7 +2249,7 @@
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
- </webinf>
+ </webinf>
</war>
<jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1179-client.jar">
<fileset dir="${tests.output.dir}/classes">
@@ -2278,15 +2277,15 @@
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
- </webinf>
+ </webinf>
</war>
-
+
<!-- jaxrpc-jbws1190 -->
<war warfile="${tests.output.dir}/libs/jaxrpc-jbws1190.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1190/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1190/TestEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl$1.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl$1.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpoint.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190Exception.class"/>
@@ -2296,7 +2295,7 @@
<include name="test-mapping.xml"/>
<include name="confidential-mapping.xml"/>
<include name="wsdl/**"/>
- </webinf>
+ </webinf>
</war>
<jar jarfile="${tests.output.dir}/libs/jaxrpc-jbws1190-client.jar">
<fileset dir="${tests.output.dir}/classes">
@@ -2309,7 +2308,7 @@
<metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1190/WEB-INF">
<include name="test-mapping.xml"/>
</metainf>
- </jar>
+ </jar>
<!-- jaxrpcws-jbws1205 -->
<war warfile="${tests.output.dir}/libs/jaxrpc-jbws1205-simple.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/web.xml">
@@ -2328,7 +2327,7 @@
<war warfile="${tests.output.dir}/libs/jaxrpc-jbws1205-test.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1205/TestEndpointImpl.class"/>
- <include name="org/jboss/test/ws/jaxrpc/jbws1205/TestEndpointImpl$*.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1205/TestEndpointImpl$*.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1205/TestEndpoint.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1205/TestException.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint.class"/>
@@ -2339,12 +2338,12 @@
<include name="webservices.xml"/>
<include name="test-mapping.xml"/>
<include name="wsdl/**"/>
- <include name="jboss-web.xml"/>
- </webinf>
+ <include name="jboss-web.xml"/>
+ </webinf>
<webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF">
<include name="simple-mapping.xml"/>
<include name="wsdl/**"/>
- </webinf>
+ </webinf>
</war>
<jar jarfile="${tests.output.dir}/libs/jaxrpc-jbws1205-client.jar">
<fileset dir="${tests.output.dir}/classes">
@@ -2358,7 +2357,7 @@
<metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF">
<include name="test-mapping.xml"/>
</metainf>
- </jar>
+ </jar>
<!-- jaxrpc-jbws1303 -->
<war warfile="${tests.output.dir}/libs/jaxrpc-jbws1303.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1303/WEB-INF/web.xml">
@@ -2456,15 +2455,15 @@
<!-- jbossws-jbws1619 -->
<war warfile="${tests.output.dir}/libs/jaxrpc-jbws1619.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1619/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/jbws1619/TestEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxrpc/jbws1619/TestEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1619/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1619/TestEndpointImpl.class"/>
</classes>
<webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1619/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
- </webinf>
- </war>
+ </webinf>
+ </war>
<jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1619-client.jar">
<fileset dir="${tests.output.dir}/classes">
<include name="org/jboss/test/ws/jbws1619/TestEndpoint.class"/>
@@ -2480,6 +2479,36 @@
</metainf>
</jar>
+ <!-- jbossws-jbws1647 -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1647-rpclit.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1647/rpclit/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1647/TestEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1647/RpcHandler.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1647/rpclit/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1647-doclit.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1647/doclit/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1647/TestEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1647/DocumentHandler.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_RequestStruct.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_ResponseStruct.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1647/doclit/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+
<!-- jaxrpc-marshall-doclit.war -->
<war warfile="${tests.output.dir}/libs/jaxrpc-marshall-doclit.war" webxml="${tests.output.dir}/resources/jaxrpc/marshall-doclit/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
@@ -2631,7 +2660,7 @@
<include name="wsdl/**"/>
</metainf>
</jar>
-
+
<!-- jaxrpc-utf16 -->
<war warfile="${tests.output.dir}/libs/jaxrpc-utf16.war" webxml="${tests.output.dir}/resources/jaxrpc/utf16/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
@@ -2848,7 +2877,7 @@
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
-
+
<!-- jaxrpc-wsse-sign-encrypt-fault.war -->
<war warfile="${tests.output.dir}/libs/jaxrpc-wsse-sign-encrypt-fault.war" webxml="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
@@ -2889,7 +2918,7 @@
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
-
+
<!-- jaxrpc-wsse-store-pass-encrypt-class-cmd.war -->
<replace file="${tests.output.dir}/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml" token="${buildpath}" value="${tests.output.dir}"/>
<war warfile="${tests.output.dir}/libs/jaxrpc-wsse-store-pass-encrypt-class-cmd.war" webxml="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml">
Modified: trunk/jbossws-core/ant-import-tests/build-testsuite.xml
===================================================================
--- trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -10,7 +10,7 @@
<project>
- <property name="tests.output.dir" value="${core.dir}/output-tests"/>
+ <property name="tests.output.dir" value="${core.dir}/output/tests"/>
<import file="${build.dir}/ant-import/build-testsuite.xml"/>
<property name="tests.dir" value="${core.dir}/src/test"/>
Modified: trunk/jbossws-core/build.xml
===================================================================
--- trunk/jbossws-core/build.xml 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/jbossws-core/build.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -32,16 +32,8 @@
<property name="core.output.classes14.dir" value="${core.output.dir}/classes14"/>
<property name="core.output.lib.dir" value="${core.output.dir}/lib"/>
- <!-- Define jboss.home -->
- <condition property="jboss.home" value="${jboss50.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss50"/>
- </condition>
- <condition property="jboss.home" value="${jboss42.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss42"/>
- </condition>
-
<target name="init" depends="prepare,thirdparty-get">
- <ant antfile="${spi.dir}/build.xml" target="main" inheritall="false"/>
+ <ant antfile="${spi.dir}/build.xml" target="jars" inheritall="false"/>
</target>
<!-- ================================================================== -->
@@ -234,7 +226,6 @@
</target>
<target name="clobber" depends="clean" description="Cleans up all generated files.">
- <delete dir="${core.dir}/output-tests"/>
<delete dir="${core.dir}/thirdparty"/>
</target>
Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java 2007-06-02 20:38:33 UTC (rev 3395)
@@ -187,18 +187,17 @@
{
String expMsg =
"<soapenv:Envelope xmlns:ns1='http://somens.org' xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/'>" +
- " <!-- header -->" +
" <soapenv:Header>" +
- " <!-- header element -->" +
" <ns1:header>kermit</ns1:header>" +
" </soapenv:Header>" +
- " <!-- body -->" +
" <soapenv:Body>" +
- " <!-- body element -->" +
+ " <!-- pre body element -->" +
" <Hello>" +
- " <!-- element -->" +
+ " <!-- pre element -->" +
" <argument>kermit</argument>" +
+ " <!-- post element -->" +
" </Hello>" +
+ " <!-- post body element -->" +
" </soapenv:Body>" +
"</soapenv:Envelope>";
Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.java (rev 0)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.java 2007-06-02 20:38:33 UTC (rev 3395)
@@ -0,0 +1,86 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxrpc.jbws1647;
+
+import java.io.ByteArrayOutputStream;
+
+import javax.xml.namespace.QName;
+import javax.xml.rpc.handler.GenericHandler;
+import javax.xml.rpc.handler.MessageContext;
+import javax.xml.rpc.handler.soap.SOAPMessageContext;
+import javax.xml.soap.SOAPMessage;
+
+import org.jboss.logging.Logger;
+
+/**
+ *
+ * @author darran.lofthouse at jboss.com
+ * @since 15 May 2007
+ */
+public abstract class AbstractHandler extends GenericHandler
+{
+
+ private static final Logger log = Logger.getLogger(AbstractHandler.class);
+
+ public abstract String getExpectedMessage();
+
+ public boolean handleRequest(MessageContext msgContext)
+ {
+ log.info("handleRequest");
+
+ boolean valid = false;
+
+ SOAPMessageContext messageContext = (SOAPMessageContext)msgContext;
+
+ SOAPMessage soapMessage = messageContext.getMessage();
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+
+ String receivedMessage = "";
+ try
+ {
+ soapMessage.writeTo(baos);
+ receivedMessage = baos.toString();
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException("Unable to process SOAPMessage", e);
+ }
+
+ valid = getExpectedMessage().equals(receivedMessage);
+ if (valid == false)
+ {
+ log.error("Received message does not equal expected message.");
+ log.info("EXP - " + getExpectedMessage());
+ log.info("ACT - " + receivedMessage);
+
+ throw new RuntimeException("Received message does not equal expected message.");
+ }
+
+ return valid;
+ }
+
+ public QName[] getHeaders()
+ {
+ return null;
+ }
+
+}
Property changes on: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/AbstractHandler.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/DocumentHandler.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/DocumentHandler.java (rev 0)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/DocumentHandler.java 2007-06-02 20:38:33 UTC (rev 3395)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxrpc.jbws1647;
+
+/**
+ *
+ * @author darran.lofthouse at jboss.com
+ * @since 15 May 2007
+ */
+public class DocumentHandler extends AbstractHandler
+{
+
+ public static final String MESSAGE =
+ "<soapenv:Envelope xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/' xmlns:typ='http://org.jboss.test.ws/jbws1647/types'>" +
+ " <!-- Comment Before Header -->" +
+ " <soapenv:Header></soapenv:Header>" +
+ " <!-- Comment After Header, Before Body -->" +
+ " <soapenv:Body>" +
+ " <!-- Comment After Body -->" +
+ " <typ:echoMessage xmlns:typ='http://org.jboss.test.ws/jbws1647/types'>" +
+ " <!-- Comment After Wrapper -->" +
+ " <String_1>My Message</String_1>" +
+ " <!-- Comment After Parameter -->" +
+ " </typ:echoMessage>" +
+ " <!-- Comment Before Close Body -->" +
+ " </soapenv:Body>" +
+ " <!-- Comment Before Close Envelope -->" +
+ "</soapenv:Envelope>";
+
+ public String getExpectedMessage()
+ {
+ return MESSAGE;
+ }
+
+}
Property changes on: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/DocumentHandler.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647DocumentTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647DocumentTestCase.java (rev 0)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647DocumentTestCase.java 2007-06-02 20:38:33 UTC (rev 3395)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxrpc.jbws1647;
+
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
+
+import junit.framework.Test;
+
+/**
+ * Text Node Preservation For Messages Sent Across The Wire
+ *
+ * http://jira.jboss.org/jira/browse/JBWS-1647
+ *
+ * @author darran.lofthouse at jboss.com
+ * @since 15 May 2007
+ */
+public class JBWS1647DocumentTestCase extends TestCaseBase
+{
+
+ public static Test suite() throws Exception
+ {
+ return JBossWSTestSetup.newTestSetup(JBWS1647DocumentTestCase.class, "jaxrpc-jbws1647-doclit.war");
+ }
+
+ public String getMessage()
+ {
+ return DocumentHandler.MESSAGE;
+ }
+
+ public String getToUrl()
+ {
+ return "http://" + getServerHost() + ":8080/jaxrpc-jbws1647-doclit/TestEndpoint";
+ }
+
+}
Property changes on: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647DocumentTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647RPCTestCase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647RPCTestCase.java (rev 0)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647RPCTestCase.java 2007-06-02 20:38:33 UTC (rev 3395)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxrpc.jbws1647;
+
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
+
+import junit.framework.Test;
+
+/**
+ * Text Node Preservation For Messages Sent Across The Wire
+ *
+ * http://jira.jboss.org/jira/browse/JBWS-1647
+ *
+ * @author darran.lofthouse at jboss.com
+ * @since 14 May 2007
+ */
+public class JBWS1647RPCTestCase extends TestCaseBase
+{
+
+ public static Test suite() throws Exception
+ {
+ return JBossWSTestSetup.newTestSetup(JBWS1647RPCTestCase.class, "jaxrpc-jbws1647-rpclit.war");
+ }
+
+ public String getMessage()
+ {
+ return RpcHandler.MESSAGE;
+ }
+
+ public String getToUrl()
+ {
+ return "http://" + getServerHost() + ":8080/jaxrpc-jbws1647-rpclit/TestEndpoint";
+ }
+
+}
Property changes on: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/JBWS1647RPCTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/RpcHandler.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/RpcHandler.java (rev 0)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/RpcHandler.java 2007-06-02 20:38:33 UTC (rev 3395)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxrpc.jbws1647;
+
+/**
+ *
+ * @author darran.lofthouse at jboss.com
+ * @since 15 May 2007
+ */
+public class RpcHandler extends AbstractHandler
+{
+
+ public static final String MESSAGE =
+ "<soapenv:Envelope xmlns:jbw='http://org.jboss.test.ws/jbws1647' xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/'>" +
+ " <!-- Comment Before Header -->" +
+ " <soapenv:Header></soapenv:Header>" +
+ " <!-- Comment After Header, Before Body -->" +
+ " <soapenv:Body>" +
+ " <!-- Comment After Body -->" +
+ " <jbw:echoMessage xmlns:jbw='http://org.jboss.test.ws/jbws1647'>" +
+ " <!-- Comment After Operation -->" +
+ " <String_1>My Message</String_1>" +
+ " <!-- Comment After Parameter -->" +
+ " </jbw:echoMessage>" +
+ " <!-- Comment Before Close Body -->" +
+ " </soapenv:Body>" +
+ " <!-- Comment Before Close Envelope -->" +
+ "</soapenv:Envelope>";
+
+ public String getExpectedMessage()
+ {
+ return MESSAGE;
+ }
+
+}
Property changes on: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/RpcHandler.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/TestCaseBase.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/TestCaseBase.java (rev 0)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/TestCaseBase.java 2007-06-02 20:38:33 UTC (rev 3395)
@@ -0,0 +1,58 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxrpc.jbws1647;
+
+import java.io.ByteArrayInputStream;
+
+import javax.xml.soap.MessageFactory;
+import javax.xml.soap.SOAPConnection;
+import javax.xml.soap.SOAPConnectionFactory;
+import javax.xml.soap.SOAPElement;
+import javax.xml.soap.SOAPMessage;
+
+import org.jboss.wsf.spi.test.JBossWSTest;
+
+/**
+ *
+ * @author darran.lofthouse at jboss.com
+ * @since 15 May 2007
+ */
+public abstract class TestCaseBase extends JBossWSTest
+{
+ public abstract String getMessage();
+
+ public abstract String getToUrl();
+
+ public void testCall() throws Exception
+ {
+ MessageFactory msgFactory = MessageFactory.newInstance();
+ SOAPMessage soapMessage = msgFactory.createMessage(null, new ByteArrayInputStream(getMessage().getBytes()));
+
+ SOAPConnectionFactory conFactory = SOAPConnectionFactory.newInstance();
+ SOAPConnection con = conFactory.createConnection();
+ SOAPMessage resMessage = con.call(soapMessage, getToUrl());
+
+ SOAPElement soapElement = (SOAPElement)resMessage.getSOAPBody().getChildElements().next();
+ assertEquals("echoMessageResponse", soapElement.getElementName().getLocalName());
+ }
+
+}
Property changes on: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/TestCaseBase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint.java (rev 0)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint.java 2007-06-02 20:38:33 UTC (rev 3395)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxrpc.jbws1647;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+/**
+ *
+ * @author darran.lofthouse at jboss.com
+ * @since 14 May 2007
+ */
+public interface TestEndpoint extends Remote
+{
+
+ public String echoMessage(final String message) throws RemoteException;
+
+}
Property changes on: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpointImpl.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpointImpl.java (rev 0)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpointImpl.java 2007-06-02 20:38:33 UTC (rev 3395)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxrpc.jbws1647;
+
+import org.jboss.logging.Logger;
+
+/**
+ *
+ * @author darran.lofthouse at jboss.com
+ * @since 14 May 2007
+ */
+public class TestEndpointImpl implements TestEndpoint
+{
+
+ private static final Logger log = Logger.getLogger(TestEndpointImpl.class);
+
+ public String echoMessage(final String message)
+ {
+ return message;
+ }
+
+}
Property changes on: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpointImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_RequestStruct.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_RequestStruct.java (rev 0)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_RequestStruct.java 2007-06-02 20:38:33 UTC (rev 3395)
@@ -0,0 +1,27 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue May 15 11:14:30 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jaxrpc.jbws1647;
+
+
+public class TestEndpoint_echoMessage_RequestStruct
+{
+
+protected java.lang.String string_1;
+public TestEndpoint_echoMessage_RequestStruct(){}
+
+public TestEndpoint_echoMessage_RequestStruct(java.lang.String string_1){
+this.string_1=string_1;
+}
+public java.lang.String getString_1() { return string_1 ;}
+
+public void setString_1(java.lang.String string_1){ this.string_1=string_1; }
+
+}
Property changes on: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_RequestStruct.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_ResponseStruct.java
===================================================================
--- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_ResponseStruct.java (rev 0)
+++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_ResponseStruct.java 2007-06-02 20:38:33 UTC (rev 3395)
@@ -0,0 +1,27 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Tue May 15 11:14:30 CEST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jaxrpc.jbws1647;
+
+
+public class TestEndpoint_echoMessage_ResponseStruct
+{
+
+protected java.lang.String result;
+public TestEndpoint_echoMessage_ResponseStruct(){}
+
+public TestEndpoint_echoMessage_ResponseStruct(java.lang.String result){
+this.result=result;
+}
+public java.lang.String getResult() { return result ;}
+
+public void setResult(java.lang.String result){ this.result=result; }
+
+}
Property changes on: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1647/TestEndpoint_echoMessage_ResponseStruct.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/doclit/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/doclit/WEB-INF/jaxrpc-mapping.xml (rev 0)
+++ trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/doclit/WEB-INF/jaxrpc-mapping.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -0,0 +1,56 @@
+<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' 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://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jaxrpc.jbws1647</package-type>
+ <namespaceURI>http://org.jboss.test.ws/jbws1647/types</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint_echoMessage_RequestStruct</java-type>
+ <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1647/types'>typeNS:echoMessage</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>string_1</java-variable-name>
+ <xml-element-name>String_1</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint_echoMessage_ResponseStruct</java-type>
+ <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1647/types'>typeNS:echoMessageResponse</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>result</java-variable-name>
+ <xml-element-name>result</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jaxrpc.jbws1647.TestService</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1647'>serviceNS:TestService</wsdl-service-name>
+ <port-mapping>
+ <port-name>TestEndpointPort</port-name>
+ <java-port-name>TestEndpointPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1647'>portTypeNS:TestEndpoint</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1647'>bindingNS:TestEndpointBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>echoMessage</java-method-name>
+ <wsdl-operation>echoMessage</wsdl-operation>
+ <wrapped-element/>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>java.lang.String</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1647'>wsdlMsgNS:TestEndpoint_echoMessage</wsdl-message>
+ <wsdl-message-part-name>String_1</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>java.lang.String</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1647'>wsdlMsgNS:TestEndpoint_echoMessageResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
\ No newline at end of file
Property changes on: trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/doclit/WEB-INF/jaxrpc-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/doclit/WEB-INF/web.xml
===================================================================
--- trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/doclit/WEB-INF/web.xml (rev 0)
+++ trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/doclit/WEB-INF/web.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ version="2.4">
+
+ <servlet>
+ <servlet-name>TestEndpoint</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpointImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>TestEndpoint</servlet-name>
+ <url-pattern>/TestEndpoint</url-pattern>
+ </servlet-mapping>
+
+</web-app>
+
Property changes on: trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/doclit/WEB-INF/web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/doclit/WEB-INF/webservices.xml
===================================================================
--- trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/doclit/WEB-INF/webservices.xml (rev 0)
+++ trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/doclit/WEB-INF/webservices.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -0,0 +1,21 @@
+<webservices version='1.1' 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://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'>
+ <webservice-description>
+ <webservice-description-name>TestService</webservice-description-name>
+ <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file>
+ <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
+ <port-component>
+ <port-component-name>TestEndpointPort</port-component-name>
+ <wsdl-port xmlns:portNS='http://org.jboss.test.ws/jbws1647'>portNS:TestEndpointPort</wsdl-port>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint</service-endpoint-interface>
+ <service-impl-bean>
+ <servlet-link>TestEndpoint</servlet-link>
+ </service-impl-bean>
+
+ <handler>
+ <handler-name>TestHandler</handler-name>
+ <handler-class>org.jboss.test.ws.jaxrpc.jbws1647.DocumentHandler</handler-class>
+ </handler>
+
+ </port-component>
+ </webservice-description>
+</webservices>
\ No newline at end of file
Property changes on: trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/doclit/WEB-INF/webservices.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/doclit/WEB-INF/wsdl/TestService.wsdl
===================================================================
--- trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/doclit/WEB-INF/wsdl/TestService.wsdl (rev 0)
+++ trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/doclit/WEB-INF/wsdl/TestService.wsdl 2007-06-02 20:38:33 UTC (rev 3395)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1647' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.test.ws/jbws1647/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1647' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://org.jboss.test.ws/jbws1647/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.test.ws/jbws1647/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+ <complexType name='echoMessage'>
+ <sequence>
+ <element name='String_1' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+ <complexType name='echoMessageResponse'>
+ <sequence>
+ <element name='result' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+ <element name='echoMessage' type='tns:echoMessage'/>
+ <element name='echoMessageResponse' type='tns:echoMessageResponse'/>
+ </schema>
+ </types>
+ <message name='TestEndpoint_echoMessage' xmlns='http://schemas.xmlsoap.org/wsdl/'>
+ <part element='ns1:echoMessage' name='echoMessage'/>
+ </message>
+ <message name='TestEndpoint_echoMessageResponse'>
+ <part element='ns1:echoMessageResponse' name='echoMessageResponse'/>
+ </message>
+ <portType name='TestEndpoint'>
+ <operation name='echoMessage' parameterOrder='echoMessage'>
+ <input message='tns:TestEndpoint_echoMessage'/>
+ <output message='tns:TestEndpoint_echoMessageResponse'/>
+ </operation>
+ </portType>
+ <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='echoMessage'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='TestService'>
+ <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/doclit/WEB-INF/wsdl/TestService.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/doclit/wstools-config.xml
===================================================================
--- trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/doclit/wstools-config.xml (rev 0)
+++ trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/doclit/wstools-config.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ wstools.sh -cp ../../../../../output/classes -config wstools-config.xml
+-->
+
+<!-- Add the following handler to the generated webservices.xml
+
+ <handler>
+ <handler-name>TestHandler</handler-name>
+ <handler-class>org.jboss.test.ws.jaxrpc.jbws1647.DocumentHandler</handler-class>
+ </handler>
+
+-->
+
+<configuration xmlns="http://www.jboss.org/jbossws-tools"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
+
+ <java-wsdl>
+ <service name="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint" style="document">
+ </service>
+ <namespaces target-namespace="http://org.jboss.test.ws/jbws1647" type-namespace="http://org.jboss.test.ws/jbws1647/types"/>
+ <mapping file="jaxrpc-mapping.xml"/>
+ <webservices servlet-link="TestEndpoint"/>
+ </java-wsdl>
+
+</configuration>
Property changes on: trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/doclit/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/rpclit/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/rpclit/WEB-INF/jaxrpc-mapping.xml (rev 0)
+++ trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/rpclit/WEB-INF/jaxrpc-mapping.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -0,0 +1,37 @@
+<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' 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://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jaxrpc.jbws1647</package-type>
+ <namespaceURI>http://org.jboss.test.ws/jbws1647/types</namespaceURI>
+ </package-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jaxrpc.jbws1647.TestService</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1647'>serviceNS:TestService</wsdl-service-name>
+ <port-mapping>
+ <port-name>TestEndpointPort</port-name>
+ <java-port-name>TestEndpointPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1647'>portTypeNS:TestEndpoint</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1647'>bindingNS:TestEndpointBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>echoMessage</java-method-name>
+ <wsdl-operation>echoMessage</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>java.lang.String</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1647'>wsdlMsgNS:TestEndpoint_echoMessage</wsdl-message>
+ <wsdl-message-part-name>String_1</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>java.lang.String</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1647'>wsdlMsgNS:TestEndpoint_echoMessageResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
\ No newline at end of file
Property changes on: trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/rpclit/WEB-INF/jaxrpc-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/rpclit/WEB-INF/web.xml
===================================================================
--- trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/rpclit/WEB-INF/web.xml (rev 0)
+++ trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/rpclit/WEB-INF/web.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ version="2.4">
+
+ <servlet>
+ <servlet-name>TestEndpoint</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpointImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>TestEndpoint</servlet-name>
+ <url-pattern>/TestEndpoint</url-pattern>
+ </servlet-mapping>
+
+</web-app>
+
Property changes on: trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/rpclit/WEB-INF/web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/rpclit/WEB-INF/webservices.xml
===================================================================
--- trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/rpclit/WEB-INF/webservices.xml (rev 0)
+++ trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/rpclit/WEB-INF/webservices.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -0,0 +1,21 @@
+<webservices version='1.1' 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://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'>
+ <webservice-description>
+ <webservice-description-name>TestService</webservice-description-name>
+ <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file>
+ <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
+ <port-component>
+ <port-component-name>TestEndpointPort</port-component-name>
+ <wsdl-port xmlns:portNS='http://org.jboss.test.ws/jbws1647'>portNS:TestEndpointPort</wsdl-port>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint</service-endpoint-interface>
+ <service-impl-bean>
+ <servlet-link>TestEndpoint</servlet-link>
+ </service-impl-bean>
+
+ <handler>
+ <handler-name>TestHandler</handler-name>
+ <handler-class>org.jboss.test.ws.jaxrpc.jbws1647.RpcHandler</handler-class>
+ </handler>
+
+ </port-component>
+ </webservice-description>
+</webservices>
\ No newline at end of file
Property changes on: trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/rpclit/WEB-INF/webservices.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/rpclit/WEB-INF/wsdl/TestService.wsdl
===================================================================
--- trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/rpclit/WEB-INF/wsdl/TestService.wsdl (rev 0)
+++ trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/rpclit/WEB-INF/wsdl/TestService.wsdl 2007-06-02 20:38:33 UTC (rev 3395)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1647' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1647' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types/>
+ <message name='TestEndpoint_echoMessage'>
+ <part name='String_1' type='xsd:string'/>
+ </message>
+ <message name='TestEndpoint_echoMessageResponse'>
+ <part name='result' type='xsd:string'/>
+ </message>
+ <portType name='TestEndpoint'>
+ <operation name='echoMessage' parameterOrder='String_1'>
+ <input message='tns:TestEndpoint_echoMessage'/>
+ <output message='tns:TestEndpoint_echoMessageResponse'/>
+ </operation>
+ </portType>
+ <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
+ <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='echoMessage'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body namespace='http://org.jboss.test.ws/jbws1647' use='literal'/>
+ </input>
+ <output>
+ <soap:body namespace='http://org.jboss.test.ws/jbws1647' use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='TestService'>
+ <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/rpclit/WEB-INF/wsdl/TestService.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/rpclit/wstools-config.xml
===================================================================
--- trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/rpclit/wstools-config.xml (rev 0)
+++ trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/rpclit/wstools-config.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ wstools.sh -cp ../../../../../output/classes -config wstools-config.xml
+-->
+
+<!-- Add the following handler to the generated webservices.xml
+
+ <handler>
+ <handler-name>TestHandler</handler-name>
+ <handler-class>org.jboss.test.ws.jaxrpc.jbws1647.RpcHandler</handler-class>
+ </handler>
+
+-->
+
+<configuration xmlns="http://www.jboss.org/jbossws-tools"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
+
+ <java-wsdl>
+ <service name="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws1647.TestEndpoint" style="rpc">
+ </service>
+ <namespaces target-namespace="http://org.jboss.test.ws/jbws1647" type-namespace="http://org.jboss.test.ws/jbws1647/types"/>
+ <mapping file="jaxrpc-mapping.xml"/>
+ <webservices servlet-link="TestEndpoint"/>
+ </java-wsdl>
+
+</configuration>
Property changes on: trunk/jbossws-core/src/test/resources/jaxrpc/jbws1647/rpclit/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-core/src/test/resources/tests-jboss40-excludes.txt
===================================================================
--- trunk/jbossws-core/src/test/resources/tests-jboss40-excludes.txt (rev 0)
+++ trunk/jbossws-core/src/test/resources/tests-jboss40-excludes.txt 2007-06-02 20:38:33 UTC (rev 3395)
@@ -0,0 +1,18 @@
+# Always exclude
+org/jboss/test/ws/interop/**
+org/jboss/test/ws/benchmark/**
+
+# JBossAS-4.0 excludes
+org/jboss/test/ws/jaxrpc/jbws723/**
+
+# EJB3/Injection excludes
+org/jboss/test/ws/jaxws/endpoint/**
+org/jboss/test/ws/jaxws/jbws1581/**
+org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase*
+org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase*
+org/jboss/test/ws/jaxws/samples/retail/**
+org/jboss/test/ws/jaxws/samples/webserviceref/**
+org/jboss/test/ws/jaxws/serviceref/**
+
+org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.*
+org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.*
Property changes on: trunk/jbossws-core/src/test/resources/tests-jboss40-excludes.txt
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/jbossws-core/src/test/resources/tests-jboss42-excludes.txt
===================================================================
--- trunk/jbossws-core/src/test/resources/tests-jboss42-excludes.txt 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/jbossws-core/src/test/resources/tests-jboss42-excludes.txt 2007-06-02 20:38:33 UTC (rev 3395)
@@ -1,11 +1,9 @@
-# Always excludes
+# Always exclude
org/jboss/test/ws/interop/**
org/jboss/test/ws/benchmark/**
# EJB3/Injection excludes
org/jboss/test/ws/jaxws/endpoint/**
-org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase.*
-org/jboss/test/ws/jaxws/samples/webserviceref/**
org/jboss/test/ws/jaxws/jbws1581/**
org/jboss/test/ws/jaxws/serviceref/**
Modified: trunk/jbossws-core/src/test/resources/tests-jboss50-excludes.txt
===================================================================
--- trunk/jbossws-core/src/test/resources/tests-jboss50-excludes.txt 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/jbossws-core/src/test/resources/tests-jboss50-excludes.txt 2007-06-02 20:38:33 UTC (rev 3395)
@@ -1,4 +1,4 @@
-# Always excludes
+# Always exclude
org/jboss/test/ws/interop/**
org/jboss/test/ws/benchmark/**
Modified: trunk/testsuite/.classpath
===================================================================
--- trunk/testsuite/.classpath 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/testsuite/.classpath 2007-06-02 20:38:33 UTC (rev 3395)
@@ -13,5 +13,5 @@
<classpathentry kind="lib" path="/integration-spi/thirdparty/activation.jar"/>
<classpathentry kind="lib" path="/integration-spi/thirdparty/jaxb-api.jar"/>
<classpathentry kind="lib" path="/integration-spi/thirdparty/jaxb-impl.jar"/>
- <classpathentry kind="output" path="output-eclipse"/>
+ <classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: trunk/testsuite/ant-import/build-testsuite.xml
===================================================================
--- trunk/testsuite/ant-import/build-testsuite.xml 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/testsuite/ant-import/build-testsuite.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -2,14 +2,6 @@
<import file="${build.dir}/ant-import/build-testsuite.xml"/>
- <!-- Define jboss.home -->
- <condition property="jboss.home" value="${jboss50.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss50"/>
- </condition>
- <condition property="jboss.home" value="${jboss42.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss42"/>
- </condition>
-
<!-- ================================================================== -->
<!-- Initialization -->
<!-- ================================================================== -->
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/testsuite/build.xml 2007-06-02 20:38:33 UTC (rev 3395)
@@ -16,11 +16,10 @@
<import file="${basedir}/build/ant-import/build-setup.xml"/>
<!-- ================================================================== -->
- <!-- Miscellaneous -->
+ <!-- Miscellaneous -->
<!-- ================================================================== -->
<target name="clean" depends="prepare" description="Cleans up most generated files.">
- <delete dir="${testsuite.dir}/output-tests"/>
</target>
<target name="clobber" depends="clean" description="Cleans up all generated files.">
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webmethod/WebMethodTestCase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webmethod/WebMethodTestCase.java 2007-06-02 15:46:20 UTC (rev 3394)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webmethod/WebMethodTestCase.java 2007-06-02 20:38:33 UTC (rev 3395)
@@ -143,7 +143,7 @@
if (isIntegrationNative())
{
- System.out.println("FIXME: [JBWS-1680] Dispatch.invoke does not throw a Protocol exception when response is a SOAP Fault");
+ System.out.println("FIXME: [JBWS-1680] Dispatch.invoke does not throw a ProtocolException on Fault");
return;
}
More information about the jbossws-commits
mailing list