Author: thomas.diesler(a)jboss.com Date: 2007-05-25 06:28:07 -0400 (Fri, 25 May 2007) New Revision: 3250 Added: trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/ trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/META-INF/ trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/META-INF/jboss-service.xml trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/ trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/ trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml Modified: 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-5.0/config.xml trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml trunk/integration/native/.classpath 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/sunri/ant-import/build-deploy.xml trunk/integration/sunri/ant-import/build-testsuite.xml trunk/integration/sunri/ant-import/macros-deploy-sunri.xml trunk/integration/sunri/build.xml trunk/integration/sunri/src/test/resources/excludes-jboss42.txt trunk/integration/sunri/src/test/resources/excludes-jboss50.txt trunk/integration/xfire/ant-import/build-deploy.xml trunk/integration/xfire/ant-import/build-testsuite.xml trunk/integration/xfire/build.xml trunk/integration/xfire/src/test/resources/excludes-jboss42.txt trunk/integration/xfire/src/test/resources/excludes-jboss50.txt trunk/testsuite/ant-import/build-testsuite.xml Log: Add support for SunRI in JBoss42 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-05-25 09:17:13 UTC (rev 3249) +++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml 2007-05-25 10:28:07 UTC (rev 3250) @@ -52,7 +52,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>jbossws/testsuite/output-tests/reports/*.xml</testResults> + <testResults>jbossws/integration/native/output-tests/reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; 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-05-25 09:17:13 UTC (rev 3249) +++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml 2007-05-25 10:28:07 UTC (rev 3250) @@ -52,7 +52,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>jbossws/testsuite/output-tests/reports/*.xml</testResults> + <testResults>jbossws/integration/native/output-tests/reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; 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-05-25 09:17:13 UTC (rev 3249) +++ trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml 2007-05-25 10:28:07 UTC (rev 3250) @@ -52,7 +52,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>jbossws/testsuite/output-tests/reports/*.xml</testResults> + <testResults>jbossws/integration/sunri/output-tests/reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; 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-05-25 09:17:13 UTC (rev 3249) +++ trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml 2007-05-25 10:28:07 UTC (rev 3250) @@ -52,7 +52,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>jbossws/testsuite/output-tests/reports/*.xml</testResults> + <testResults>jbossws/integration/xfire/output-tests/reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; Modified: trunk/integration/native/.classpath =================================================================== --- trunk/integration/native/.classpath 2007-05-25 09:17:13 UTC (rev 3249) +++ trunk/integration/native/.classpath 2007-05-25 10:28:07 UTC (rev 3250) @@ -3,5 +3,7 @@ <classpathentry kind="src" path="src/main/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/> + <classpathentry combineaccessrules="false" kind="src" path="/integration-spi"/> + <classpathentry combineaccessrules="false" kind="src" path="/jbossws-core"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: trunk/integration/native/ant-import/build-deploy.xml =================================================================== --- trunk/integration/native/ant-import/build-deploy.xml 2007-05-25 09:17:13 UTC (rev 3249) +++ trunk/integration/native/ant-import/build-deploy.xml 2007-05-25 10:28:07 UTC (rev 3250) @@ -16,15 +16,14 @@ <import file="${int.native.dir}/ant-import/macros-deploy-native.xml"/> <!-- ================================================================== --> - <!-- Deployment JBoss50 --> + <!-- Deployment --> <!-- ================================================================== --> - <!-- Deploy jbossws to jboss50 --> - <target name="deploy-jboss50" depends="jars-native50" description="Deploy jbossws to jboss50"> + <!-- Deploy to jboss50 --> + <target name="deploy-jboss50" depends="jars-native50,undeploy-jboss50" description="Deploy jbossws to jboss50"> <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/> <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> - <macro-undeploy-native50/> <macro-deploy-native50 spilibs="${spi.dir}/output/lib" jbosslibs="${int.jboss50.dir}/output/lib" @@ -33,15 +32,14 @@ thirdpartylibs="${core.dir}/thirdparty"/> </target> - <!-- Remove jbossws from jboss50 --> + <!-- Remove from jboss50 --> <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws from jboss50"> <macro-undeploy-native50/> </target> - <!-- Deploy jbossws to jboss42 --> - <target name="deploy-jboss42" depends="jars-native42" description="Deploy jbossws to jboss42"> + <!-- Deploy to jboss42 --> + <target name="deploy-jboss42" depends="jars-native42,undeploy-jboss42" description="Deploy jbossws to jboss42"> <ant antfile="${int.jboss42.dir}/build.xml" target="jars" inheritall="false"/> - <macro-undeploy-native42/> <macro-deploy-native42 spilibs="${spi.dir}/output/lib" jbosslibs="${int.jboss42.dir}/output/lib" @@ -50,7 +48,7 @@ thirdpartylibs="${core.dir}/thirdparty"/> </target> - <!-- Remove jbossws from jboss42 --> + <!-- Remove from jboss42 --> <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws from jboss42"> <macro-undeploy-native42/> </target> Modified: trunk/integration/native/ant-import/build-testsuite.xml =================================================================== --- trunk/integration/native/ant-import/build-testsuite.xml 2007-05-25 09:17:13 UTC (rev 3249) +++ trunk/integration/native/ant-import/build-testsuite.xml 2007-05-25 10:28:07 UTC (rev 3250) @@ -10,6 +10,9 @@ <project> + <property name="tests.dir" value="${testsuite.dir}/src"/> + <property name="tests.output.dir" value="${int.native.dir}/output-tests"/> + <import file="${testsuite.dir}/ant-import/build-testsuite.xml"/> <!-- Define excludesfile --> Modified: trunk/integration/native/ant-import/macros-deploy-native.xml =================================================================== --- trunk/integration/native/ant-import/macros-deploy-native.xml 2007-05-25 09:17:13 UTC (rev 3249) +++ trunk/integration/native/ant-import/macros-deploy-native.xml 2007-05-25 10:28:07 UTC (rev 3250) @@ -134,12 +134,10 @@ <include name="jbossws-wsconsume-impl.jar"/> </fileset> </copy> - <copy todir="${jboss42.home}/lib" overwrite="true"> + <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true"> <fileset dir="@{spilibs}"> <include name="jbossws-spi.jar"/> </fileset> - </copy> - <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true"> <fileset dir="@{jbosslibs}"> <include name="jbossws-jboss42.jar"/> </fileset> Modified: trunk/integration/native/build.xml =================================================================== --- trunk/integration/native/build.xml 2007-05-25 09:17:13 UTC (rev 3249) +++ trunk/integration/native/build.xml 2007-05-25 10:28:07 UTC (rev 3250) @@ -96,8 +96,6 @@ --> <target name="jars-native50" depends="compile" if="jboss50.home"> - <ant antfile="${int.jboss50.dir}/build.xml" target="main" inheritall="false"/> - <mkdir dir="${native.output.lib.dir}"/> <!-- Build jbossws-context.war --> @@ -149,8 +147,6 @@ --> <target name="jars-native42" depends="compile" if="jboss42.home"> - <ant antfile="${int.jboss42.dir}/build.xml" target="main" inheritall="false"/> - <mkdir dir="${native.output.lib.dir}"/> <!-- Build jbossws-native42.sar --> @@ -158,9 +154,6 @@ <fileset dir="${native.output.lib.dir}"> <include name="jbossws-context.war"/> </fileset> - <fileset dir="${spi.dir}/output/lib"> - <include name="jbossws-spi.jar"/> - </fileset> <fileset dir="${core.dir}/output/lib"> <include name="jboss-jaxws.jar"/> <include name="jbossws-core.jar"/> Modified: trunk/integration/sunri/ant-import/build-deploy.xml =================================================================== --- trunk/integration/sunri/ant-import/build-deploy.xml 2007-05-25 09:17:13 UTC (rev 3249) +++ trunk/integration/sunri/ant-import/build-deploy.xml 2007-05-25 10:28:07 UTC (rev 3250) @@ -16,15 +16,14 @@ <import file="${int.sunri.dir}/ant-import/macros-deploy-sunri.xml"/> <!-- ================================================================== --> - <!-- Deployment JBoss50 --> + <!-- Deployment --> <!-- ================================================================== --> - <!-- Deploy jbossws/sunri to jboss50 --> + <!-- Deploy to jboss50 --> <target name="deploy-jboss50" depends="jars-jboss50,undeploy-jboss50" description="Deploy jbossws/sunri to jboss50"> <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/> <ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> - <macro-undeploy-sunri50/> <macro-deploy-sunri50 spilibs="${spi.dir}/output/lib" jbosslibs="${int.jboss50.dir}/output/lib" @@ -32,9 +31,26 @@ thirdpartylibs="${int.sunri.dir}/thirdparty"/> </target> - <!-- Remove jbossws/sunri from jboss50 --> + <!-- Remove from jboss50 --> <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/sunri from jboss50"> <macro-undeploy-sunri50/> </target> + <!-- Deploy to jboss42 --> + <target name="deploy-jboss42" depends="jars-jboss42,undeploy-jboss42" description="Deploy jbossws/sunri to jboss42"> + <ant antfile="${int.jboss42.dir}/build.xml" target="jars" inheritall="false"/> + <ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/> + <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/> + <macro-deploy-sunri42 + spilibs="${spi.dir}/output/lib" + jbosslibs="${int.jboss42.dir}/output/lib" + stacklibs="${int.sunri.dir}/output/lib" + thirdpartylibs="${int.sunri.dir}/thirdparty"/> + </target> + + <!-- Remove from jboss42 --> + <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/sunri from jboss42"> + <macro-undeploy-sunri42/> + </target> + </project> Modified: trunk/integration/sunri/ant-import/build-testsuite.xml =================================================================== --- trunk/integration/sunri/ant-import/build-testsuite.xml 2007-05-25 09:17:13 UTC (rev 3249) +++ trunk/integration/sunri/ant-import/build-testsuite.xml 2007-05-25 10:28:07 UTC (rev 3250) @@ -10,6 +10,9 @@ <project> + <property name="tests.dir" value="${testsuite.dir}/src"/> + <property name="tests.output.dir" value="${int.sunri.dir}/output-tests"/> + <import file="${testsuite.dir}/ant-import/build-testsuite.xml"/> <!-- Define excludesfile --> Modified: trunk/integration/sunri/ant-import/macros-deploy-sunri.xml =================================================================== --- trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-05-25 09:17:13 UTC (rev 3249) +++ trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-05-25 10:28:07 UTC (rev 3250) @@ -76,4 +76,60 @@ </sequential> </macrodef> + <macrodef name="macro-deploy-sunri42"> + <attribute name="spilibs"/> + <attribute name="jbosslibs"/> + <attribute name="stacklibs"/> + <attribute name="thirdpartylibs"/> + <sequential> + <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> + <copy todir="${jboss42.home}/client" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + </fileset> + <fileset dir="@{spilibs}"> + <include name="jbossws-spi.jar"/> + </fileset> + <fileset dir="@{jbosslibs}"> + <include name="jbossws-jboss42.jar"/> + </fileset> + </copy> + <copy todir="${jboss42.home}/lib" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + </fileset> + </copy> + <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true"> + <fileset dir="@{spilibs}"> + <include name="jbossws-spi.jar"/> + </fileset> + <fileset dir="@{jbosslibs}"> + <include name="jbossws-jboss42.jar"/> + </fileset> + </copy> + <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> + <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src=&quot;(a){stacklibs}/jbossws-sunri42.sar&quot;/&gt; + </sequential> + </macrodef> + + <!-- Remove jbossws/sunri from jboss42 --> + <macrodef name="macro-undeploy-sunri42"> + <sequential> + <delete> + <fileset dir="${jboss42.home}/client"> + <include name="jbossws-spi.jar"/> + <include name="jbossws-jboss42.jar"/> + </fileset> + <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib"> + <include name="jbossws-spi.jar"/> + <include name="jbossws-jboss42.jar"/> + </fileset> + </delete> + <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> + </sequential> + </macrodef> + </project> Modified: trunk/integration/sunri/build.xml =================================================================== --- trunk/integration/sunri/build.xml 2007-05-25 09:17:13 UTC (rev 3249) +++ trunk/integration/sunri/build.xml 2007-05-25 10:28:07 UTC (rev 3250) @@ -96,17 +96,14 @@ <!-- | Build all jar files. --> - <target name="jars" depends="compile,jars-jboss50" description="Builds all jar files."> + <target name="jars" depends="compile,jars-jboss50,jars-jboss42" description="Builds all jar files."> </target> - <!-- - | Build all jar files. - --> - <target name="jars-jboss50" depends="compile"> + <target name="jars-common" depends="compile"> - <!-- Build jbossws-sunri50.jar --> + <!-- Build jbossws-sunri.jar --> <mkdir dir="${sunri.output.lib.dir}"/> - <jar jarfile="${sunri.output.lib.dir}/jbossws-sunri50.jar" manifest="${sunri.output.etc.dir}/default.mf"> + <jar jarfile="${sunri.output.lib.dir}/jbossws-sunri.jar" manifest="${sunri.output.etc.dir}/default.mf"> <fileset dir="${sunri.output.classes.dir}"> <include name="org/jboss/wsf/stack/sunri/**"/> </fileset> @@ -123,7 +120,15 @@ </webinf> </war> - <!-- Build jbosswsri.sar --> + <!-- Build jbossws-sunri-src.zip --> + <zip zipfile="${sunri.output.lib.dir}/jbossws-sunri-src.zip" > + <fileset dir="${sunri.java.dir}"/> + </zip> + </target> + + <target name="jars-jboss50" depends="jars-common" if="jboss50.home"> + + <!-- Build jbossws-sunri50.sar --> <jar jarfile="${sunri.output.lib.dir}/jbossws-sunri50.sar" manifest="${sunri.output.etc.dir}/default.mf"> <!-- [JBAS-4379] MC beans deployed twice because of jacc service <fileset dir="${sunri.output.lib.dir}"> @@ -160,18 +165,55 @@ <include name="jbossws-jboss50.jar"/> </fileset> <fileset dir="${sunri.output.lib.dir}"> - <include name="jbossws-sunri50.jar"/> + <include name="jbossws-sunri.jar"/> </fileset> <fileset dir="${sunri.resources.dir}/jbossws-sunri50.deployer"> <include name="META-INF/jbossws-deployer-beans.xml"/> </fileset> </zip> + </target> + + <target name="jars-jboss42" depends="jars-common" if="jboss42.home"> - <!-- Build jbossws-sunri50-src.zip --> - <zip zipfile="${sunri.output.lib.dir}/jbossws-sunri50-src.zip" > - <fileset dir="${sunri.java.dir}"/> - </zip> - + <!-- Build jbossws-sunri42.sar --> + <jar jarfile="${sunri.output.lib.dir}/jbossws-sunri42.sar" manifest="${sunri.output.etc.dir}/default.mf"> + <fileset dir="${sunri.output.lib.dir}"> + <include name="jbossws-context.war"/> + </fileset> + <fileset dir="${spi.dir}/thirdparty"> + <include name="jaxrpc-api.jar"/> + </fileset> + <fileset dir="${int.jboss42.dir}/output/lib"> + <include name="jbossws-jboss42.jar"/> + </fileset> + <fileset dir="${sunri.output.lib.dir}"> + <include name="jbossws-sunri.jar"/> + </fileset> + <fileset dir="${thirdparty.dir}"> + <include name="FastInfoset.jar"/> + <include name="http.jar"/> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxws-api.jar"/> + <include name="jaxws-rt.jar"/> + <include name="jaxws-tools.jar"/> + <include name="jsr173_api.jar"/> + <include name="jsr181-api.jar"/> + <include name="jsr250-api.jar"/> + <include name="resolver.jar"/> + <include name="saaj-api.jar"/> + <include name="saaj-impl.jar"/> + <include name="sjsxp.jar"/> + <include name="stax-ex.jar"/> + <include name="streambuffer.jar"/> + </fileset> + <fileset dir="${sunri.resources.dir}/jbossws-sunri42.sar"> + <include name="jbossws.beans/**"/> + </fileset> + <metainf dir="${sunri.resources.dir}/jbossws-sunri42.sar/META-INF"> + <include name="jboss-service.xml"/> + </metainf> + </jar> </target> <!-- ================================================================== --> Added: trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/META-INF/jboss-service.xml =================================================================== --- trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/META-INF/jboss-service.xml (rev 0) +++ trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/META-INF/jboss-service.xml 2007-05-25 10:28:07 UTC (rev 3250) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- $Id$ --> + +<server> + + <!-- + A deployer service for JSE endpoints. + --> + <mbean name="jboss.ws:service=DeployerInterceptorJSE" code="org.jboss.wsf.container.jboss42.DeployerInterceptorJSE"> + <depends-list optional-attribute-name="Interceptables"> + <depends-list-element>jboss.web:service=WebServer</depends-list-element> + </depends-list> + </mbean> + + <!-- + A deployer service for EJB2.1 endpoints. + --> + <mbean name="jboss.ws:service=DeployerInterceptorEJB21" code="org.jboss.wsf.container.jboss42.DeployerInterceptorEJB21"> + <depends-list optional-attribute-name="Interceptables"> + <depends-list-element>jboss.ejb:service=EJBDeployer</depends-list-element> + </depends-list> + </mbean> + + <!-- + A deployer service for EJB3 endpoints. + --> + <mbean name="jboss.ws:service=DeployerInterceptorEJB3" code="org.jboss.wsf.container.jboss42.DeployerInterceptorEJB3"> + <depends-list optional-attribute-name="Interceptables"> + <depends-list-element>jboss.ejb3:service=EJB3Deployer</depends-list-element> + </depends-list> + </mbean> + +</server> Property changes on: trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/META-INF/jboss-service.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml =================================================================== --- trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml (rev 0) +++ trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-05-25 10:28:07 UTC (rev 3250) @@ -0,0 +1,207 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer"> + + <!-- An abstraction of server configuration aspects. --> + <bean name="WSServerConfig" class="org.jboss.wsf.container.jboss42.ManagedServerConfig"> + <!-- + The WSDL, that is a required deployment artifact for an endpoint, has a <soap:address> + element which points to the location of the endpoint. JBoss supports rewriting of that SOAP address. + + If the content of <soap:address> is a valid URL, JBossWS will not rewrite it unless 'modifySOAPAddress' is true. + If the content of <soap:address> is not a valid URL, JBossWS will rewrite it using the attribute values given below. + + If 'webServiceHost' is not set, JBossWS uses requesters protocol host and port when rewriting the <soap:address>. + --> + <property name="webServiceHost">${jboss.bind.address}</property> + <property name="modifySOAPAddress">true</property> + + <!-- + Set these properties to explicitly define the ports that will be used for rewriting the SOAP address. + Otherwise the ports will be identified by querying the list of installed connectors. + If multiple connectors are found the port of the first connector is used. + <property name="webServiceSecurePort">8443</property> + <property name="webServicePort">8080</property> + --> + </bean> + + <!-- The registry for web service endpoints --> + <!-- The registry for web service endpoints --> + <bean name="WSEndpointRegistry" class="org.jboss.wsf.stack.sunri.ManagedEndpointRegistry"/> + + <!-- Bind Service objects in client environment context --> + <!-- The bean name is compiled into the server. Changeit with the next release. --> + <!--bean name="ServiceRefHandler" class="org.jboss.ws.core.client.ServiceRefHandlerImpl"/--> + + <!-- Locate the single instance of the kernel --> + <bean name="WSKernelLocator" class="org.jboss.ws.integration.KernelLocator"> + <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property> + </bean> + + <!-- + ********************************************************************************************************************* + Web Service deployment + + There are three deployer interceptors registered with the JBoss Deployers. + + 1) DeployerInterceptorJSE + 2) DeployerInterceptorEJB21 + 3) DeployerInterceptorEJB3 + + Each interceptor has a number of DeployerHooks registerd with it + + Conceptually, each of these hooks implements the following pattern: + + DployerHook.deploy(unit) + if(isWebServiceDeployment) + Deployment dep = createDeployment(unit) + DeployerManager.deploy(dep) + + DeployerHook.undeploy(unit) + Deployment dep = getDeployment(unit) + DeployerManager.undeploy(dep) + + Each deployer hook has a web service DeployerManager injected into it. + A web service DeployerManager maintains a list of Deployers, each of which + handles a single aspect of web service deployment. + + Finally, each Endpoint is registered with the EndpointRegistry. + + ********************************************************************************************************************* + --> + + <!-- + Each DeploymentManger maintains a list of Deployers + Each Deployer handles a single aspect of web service deployment. + --> + <bean name="WSDeployerManagerJSE" class="org.jboss.wsf.spi.deployment.BasicDeployerManager"> + <property name="deployers"> + <list class="java.util.LinkedList" elementClass="org.jboss.wsf.spi.deployment.Deployer"> + <inject bean="WSUnifiedDeploymentInfoDeployer"/> + <inject bean="WSContextRootDeployer"/> + <inject bean="WSURLPatternDeployer"/> + <inject bean="WSSunJaxwsDeployer"/> + <inject bean="WSModifyWebMetaDataDeployer"/> + </list> + </property> + </bean> + <bean name="WSDeployerManagerEJB" class="org.jboss.wsf.spi.deployment.BasicDeployerManager"> + <property name="deployers"> + <list class="java.util.LinkedList" elementClass="org.jboss.wsf.spi.deployment.Deployer"> + <inject bean="WSUnifiedDeploymentInfoDeployer"/> + <inject bean="WSContextRootDeployer"/> + <inject bean="WSURLPatternDeployer"/> + <inject bean="WSSunJaxwsDeployer"/> + <inject bean="WSWebAppGeneratorDeployer"/> + <inject bean="WSWebAppDeployerDeployer"/> + </list> + </property> + </bean> + <bean name="WSMainDeployerManager" class="org.jboss.wsf.spi.deployment.BasicDeployerManager"> + <property name="deployers"> + <list class="java.util.LinkedList" elementClass="org.jboss.wsf.spi.deployment.Deployer"> + <inject bean="WSEndpointNameDeployer"/> + <inject bean="WSEndpointHandlerDeployer"/> + <inject bean="WSEndpointRegistryDeployer"/> + <inject bean="WSEndpointLifecycleDeployer"/> + </list> + </property> + </bean> + + <!-- + The Deployers + Each handles a single aspect of web service deployment + --> + <bean name="WSContextRootDeployer" class="org.jboss.wsf.spi.deployment.ContextRootDeployer"/> + <bean name="WSEndpointHandlerDeployer" class="org.jboss.wsf.spi.deployment.EndpointHandlerDeployer"> + <property name="requestHandler">org.jboss.wsf.stack.sunri.RequestHandlerImpl</property> + <property name="lifecycleHandler">org.jboss.wsf.stack.sunri.LifecycleHandlerImpl</property> + <property name="invocationHandler"> + <map keyClass="java.lang.String" valueClass="java.lang.String"> + <entry><key>JAXWS_JSE</key><value>org.jboss.wsf.spi.invocation.InvocationHandlerJSE</value></entry> + <entry><key>JAXWS_EJB3</key><value>org.jboss.wsf.container.jboss42.InvocationHandlerEJB3</value></entry> + </map> + </property> + </bean> + <bean name="WSEndpointLifecycleDeployer" class="org.jboss.wsf.spi.deployment.EndpointLifecycleDeployer"/> + <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.spi.deployment.EndpointNameDeployer"/> + <bean name="WSEndpointRegistryDeployer" class="org.jboss.wsf.spi.deployment.EndpointRegistryDeployer"/> + <bean name="WSModifyWebMetaDataDeployer" class="org.jboss.wsf.container.jboss42.ModifyWebMetaDataDeployer"> + <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property> + </bean> + <bean name="WSSunJaxwsDeployer" class="org.jboss.wsf.stack.sunri.SunJaxwsDeployer"/> + <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.wsf.container.jboss42.UnifiedDeploymentInfoDeployer"/> + <bean name="WSURLPatternDeployer" class="org.jboss.wsf.spi.deployment.URLPatternDeployer"/> + <bean name="WSWebAppGeneratorDeployer" class="org.jboss.wsf.spi.deployment.WebAppGeneratorDeployer"> + <property name="securityHandlerEJB3"><inject bean="WSSecurityHandlerEJB3"/></property> + </bean> + <bean name="WSWebAppDeployerDeployer" class="org.jboss.wsf.container.jboss42.WebAppDeployerDeployer"> + <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property> + </bean> + + <!-- Deployer helper beans --> + <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.sunri.WebAppDesciptorModifierImpl"> + <property name="listenerClass">org.jboss.wsf.stack.sunri.WSServletContextListenerJBWS</property> + <property name="servletClass">org.jboss.wsf.spi.invocation.EndpointServlet</property> + </bean> + <bean name="WSWebXMLRewriter" class="org.jboss.wsf.spi.deployment.WebXMLRewriter"> + <property name="desciptorModifier"><inject bean="WSWebAppDesciptorModifier"/></property> + </bean> + + <!-- + Register DeployerHooks with JBoss deployers + --> + <bean name="WSDeployerHook_JAXRPC_JSE" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookJSE"> + <property name="deploymentClass">org.jboss.wsf.spi.deployment.BasicDeployment</property> + <property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property> + <property name="deployerManager"><inject bean="WSDeployerManagerJSE"/></property> + <property name="phaseOneInterceptors"> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorJSE</value> + </list> + </property> + </bean> + <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookEJB21"> + <property name="deploymentClass">org.jboss.wsf.spi.deployment.BasicDeployment</property> + <property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property> + <property name="deployerManager"><inject bean="WSDeployerManagerEJB"/></property> + <property name="phaseOneInterceptors"> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorEJB21</value> + </list> + </property> + </bean> + <bean name="WSDeployerHook_JAXWS_JSE" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookJSE"> + <property name="deploymentClass">org.jboss.wsf.spi.deployment.BasicDeployment</property> + <property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property> + <property name="deployerManager"><inject bean="WSDeployerManagerJSE"/></property> + <property name="phaseOneInterceptors"> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorJSE</value> + </list> + </property> + </bean> + <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookEJB3"> + <property name="deploymentClass">org.jboss.wsf.spi.deployment.BasicDeployment</property> + <property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property> + <property name="deployerManager"><inject bean="WSDeployerManagerEJB"/></property> + <property name="phaseOneInterceptors"> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorEJB3</value> + </list> + </property> + </bean> + <bean name="WSMainDeployerHook" class="org.jboss.wsf.container.jboss42.MainDeployerHook"> + <property name="deployerManager"><inject bean="WSMainDeployerManager"/></property> + <property name="phaseTwoInterceptors"> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorJSE</value> + <value>jboss.ws:service=DeployerInterceptorEJB21</value> + <value>jboss.ws:service=DeployerInterceptorEJB3</value> + </list> + </property> + </bean> + +</deployment> \ No newline at end of file Property changes on: trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/integration/sunri/src/test/resources/excludes-jboss42.txt =================================================================== --- trunk/integration/sunri/src/test/resources/excludes-jboss42.txt 2007-05-25 09:17:13 UTC (rev 3249) +++ trunk/integration/sunri/src/test/resources/excludes-jboss42.txt 2007-05-25 10:28:07 UTC (rev 3250) @@ -1,2 +1,27 @@ +# +# $Id$ +# -# Nothing to exclude +org/jboss/test/ws/jaxws/samples/asynchronous/** +org/jboss/test/ws/jaxws/samples/context/** +# org/jboss/test/ws/jaxws/samples/eardeployment/** +org/jboss/test/ws/jaxws/samples/exception/** +org/jboss/test/ws/jaxws/samples/handlerchain/** +org/jboss/test/ws/jaxws/samples/httpbinding/** +org/jboss/test/ws/jaxws/samples/jaxr/** +org/jboss/test/ws/jaxws/samples/jsr181ejb/** +org/jboss/test/ws/jaxws/samples/jsr181pojo/** +org/jboss/test/ws/jaxws/samples/logicalhandler/** +org/jboss/test/ws/jaxws/samples/oneway/** +org/jboss/test/ws/jaxws/samples/provider/** +org/jboss/test/ws/jaxws/samples/retail/** +org/jboss/test/ws/jaxws/samples/soapbinding/** +org/jboss/test/ws/jaxws/samples/webmethod/** +org/jboss/test/ws/jaxws/samples/webparam/** +org/jboss/test/ws/jaxws/samples/webresult/** +org/jboss/test/ws/jaxws/samples/webservice/** +org/jboss/test/ws/jaxws/samples/webserviceref/** +org/jboss/test/ws/jaxws/samples/wsaddressing/** +org/jboss/test/ws/jaxws/samples/wseventing/** +org/jboss/test/ws/jaxws/samples/wssecurity/** +org/jboss/test/ws/jaxws/samples/xop/** Modified: trunk/integration/sunri/src/test/resources/excludes-jboss50.txt =================================================================== --- trunk/integration/sunri/src/test/resources/excludes-jboss50.txt 2007-05-25 09:17:13 UTC (rev 3249) +++ trunk/integration/sunri/src/test/resources/excludes-jboss50.txt 2007-05-25 10:28:07 UTC (rev 3250) @@ -1,3 +1,6 @@ +# +# $Id$ +# org/jboss/test/ws/jaxws/samples/asynchronous/** org/jboss/test/ws/jaxws/samples/context/** Modified: trunk/integration/xfire/ant-import/build-deploy.xml =================================================================== --- trunk/integration/xfire/ant-import/build-deploy.xml 2007-05-25 09:17:13 UTC (rev 3249) +++ trunk/integration/xfire/ant-import/build-deploy.xml 2007-05-25 10:28:07 UTC (rev 3250) @@ -16,15 +16,14 @@ <import file="${int.xfire.dir}/ant-import/macros-deploy-xfire.xml"/> <!-- ================================================================== --> - <!-- Deployment JBoss50 --> + <!-- Deployment --> <!-- ================================================================== --> - <!-- Deploy jbossws/xfire to jboss50 --> + <!-- Deploy to jboss50 --> <target name="deploy-jboss50" depends="jars-jboss50,undeploy-jboss50" description="Deploy jbossws/xfire to jboss50"> <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/> <ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> - <macro-undeploy-xfire50/> <macro-deploy-xfire50 spilibs="${spi.dir}/output/lib" jbosslibs="${int.jboss50.dir}/output/lib" @@ -32,9 +31,28 @@ thirdpartylibs="${int.xfire.dir}/thirdparty"/> </target> - <!-- Remove jbossws/xfire from jboss50 --> + <!-- Remove from jboss50 --> <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/xfire from jboss50"> <macro-undeploy-xfire50/> </target> + <!-- Deploy to jboss42 --> + <target name="deploy-jboss42" depends="jars-jboss42,undeploy-jboss42" description="Deploy jbossws/xfire to jboss42"> + <ant antfile="${int.jboss42.dir}/build.xml" target="jars" inheritall="false"/> + <ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/> + <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/> + <!-- + <macro-deploy-xfire42 + spilibs="${spi.dir}/output/lib" + jbosslibs="${int.jboss42.dir}/output/lib" + stacklibs="${int.xfire.dir}/output/lib" + thirdpartylibs="${int.xfire.dir}/thirdparty"/> + --> + </target> + + <!-- Remove from jboss42 --> + <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/xfire from jboss42"> + <!--macro-undeploy-xfire42/--> + </target> + </project> Modified: trunk/integration/xfire/ant-import/build-testsuite.xml =================================================================== --- trunk/integration/xfire/ant-import/build-testsuite.xml 2007-05-25 09:17:13 UTC (rev 3249) +++ trunk/integration/xfire/ant-import/build-testsuite.xml 2007-05-25 10:28:07 UTC (rev 3250) @@ -10,6 +10,9 @@ <project> + <property name="tests.dir" value="${testsuite.dir}/src"/> + <property name="tests.output.dir" value="${int.xfire.dir}/output-tests"/> + <import file="${testsuite.dir}/ant-import/build-testsuite.xml"/> <!-- Define excludesfile --> Modified: trunk/integration/xfire/build.xml =================================================================== --- trunk/integration/xfire/build.xml 2007-05-25 09:17:13 UTC (rev 3249) +++ trunk/integration/xfire/build.xml 2007-05-25 10:28:07 UTC (rev 3250) @@ -96,17 +96,14 @@ <!-- | Build all jar files. --> - <target name="jars" depends="compile,jars-jboss50" description="Builds all jar files."> + <target name="jars" depends="compile,jars-jboss50,jars-jboss42" description="Builds all jar files."> </target> - <!-- - | Build all jar files. - --> - <target name="jars-jboss50" depends="compile"> + <target name="jars-common" depends="compile"> - <!-- Build jbossws-xfire50.jar --> + <!-- Build jbossws-xfire.jar --> <mkdir dir="${xfire.output.lib.dir}"/> - <jar jarfile="${xfire.output.lib.dir}/jbossws-xfire50.jar" manifest="${xfire.output.etc.dir}/default.mf"> + <jar jarfile="${xfire.output.lib.dir}/jbossws-xfire.jar" manifest="${xfire.output.etc.dir}/default.mf"> <fileset dir="${xfire.output.classes.dir}"> <include name="org/jboss/wsf/stack/xfire/**"/> </fileset> @@ -123,6 +120,14 @@ </webinf> </war> + <!-- Build jbossws-xfire-src.zip --> + <zip zipfile="${xfire.output.lib.dir}/jbossws-xfire-src.zip" > + <fileset dir="${xfire.java.dir}"/> + </zip> + </target> + + <target name="jars-jboss50" depends="jars-common" if="jboss50.home"> + <!-- Build jbosswsri.sar --> <jar jarfile="${xfire.output.lib.dir}/jbossws-xfire50.sar" manifest="${xfire.output.etc.dir}/default.mf"> <!-- [JBAS-4379] MC beans deployed twice because of jacc service @@ -162,14 +167,15 @@ <include name="META-INF/jbossws-deployer-beans.xml"/> </fileset> </zip> - - <!-- Build jbossws-xfire50-src.zip --> - <zip zipfile="${xfire.output.lib.dir}/jbossws-xfire50-src.zip" > - <fileset dir="${xfire.java.dir}"/> - </zip> - </target> + <target name="jars-jboss42" depends="jars-common" if="jboss42.home"> + + <!-- Build jbossws-xfire42.sar --> + <jar jarfile="${xfire.output.lib.dir}/jbossws-xfire42.sar" manifest="${xfire.output.etc.dir}/default.mf"> + </jar> + </target> + <!-- ================================================================== --> <!-- Miscellaneous --> <!-- ================================================================== --> Modified: trunk/integration/xfire/src/test/resources/excludes-jboss42.txt =================================================================== --- trunk/integration/xfire/src/test/resources/excludes-jboss42.txt 2007-05-25 09:17:13 UTC (rev 3249) +++ trunk/integration/xfire/src/test/resources/excludes-jboss42.txt 2007-05-25 10:28:07 UTC (rev 3250) @@ -1,2 +1,27 @@ +# +# $Id$ +# -# Nothing to exclude +org/jboss/test/ws/jaxws/samples/asynchronous/** +org/jboss/test/ws/jaxws/samples/context/** +# org/jboss/test/ws/jaxws/samples/eardeployment/** +org/jboss/test/ws/jaxws/samples/exception/** +org/jboss/test/ws/jaxws/samples/handlerchain/** +org/jboss/test/ws/jaxws/samples/httpbinding/** +org/jboss/test/ws/jaxws/samples/jaxr/** +org/jboss/test/ws/jaxws/samples/jsr181ejb/** +org/jboss/test/ws/jaxws/samples/jsr181pojo/** +org/jboss/test/ws/jaxws/samples/logicalhandler/** +org/jboss/test/ws/jaxws/samples/oneway/** +org/jboss/test/ws/jaxws/samples/provider/** +org/jboss/test/ws/jaxws/samples/retail/** +org/jboss/test/ws/jaxws/samples/soapbinding/** +org/jboss/test/ws/jaxws/samples/webmethod/** +org/jboss/test/ws/jaxws/samples/webparam/** +org/jboss/test/ws/jaxws/samples/webresult/** +org/jboss/test/ws/jaxws/samples/webservice/** +org/jboss/test/ws/jaxws/samples/webserviceref/** +org/jboss/test/ws/jaxws/samples/wsaddressing/** +org/jboss/test/ws/jaxws/samples/wseventing/** +org/jboss/test/ws/jaxws/samples/wssecurity/** +org/jboss/test/ws/jaxws/samples/xop/** Modified: trunk/integration/xfire/src/test/resources/excludes-jboss50.txt =================================================================== --- trunk/integration/xfire/src/test/resources/excludes-jboss50.txt 2007-05-25 09:17:13 UTC (rev 3249) +++ trunk/integration/xfire/src/test/resources/excludes-jboss50.txt 2007-05-25 10:28:07 UTC (rev 3250) @@ -1,3 +1,6 @@ +# +# $Id$ +# org/jboss/test/ws/jaxws/samples/asynchronous/** org/jboss/test/ws/jaxws/samples/context/** Modified: trunk/testsuite/ant-import/build-testsuite.xml =================================================================== --- trunk/testsuite/ant-import/build-testsuite.xml 2007-05-25 09:17:13 UTC (rev 3249) +++ trunk/testsuite/ant-import/build-testsuite.xml 2007-05-25 10:28:07 UTC (rev 3250) @@ -1,8 +1,5 @@ <project> - <property name="tests.dir" value="${testsuite.dir}/src"/> - <property name="tests.output.dir" value="${testsuite.dir}/output-tests"/> - <import file="${build.dir}/ant-import/build-testsuite.xml"/> <!-- Define jboss.home -->