Author: thomas.diesler(a)jboss.com Date: 2007-01-04 11:26:42 -0500 (Thu, 04 Jan 2007) New Revision: 1798 Added: trunk/integration-jboss40/src/main/resources/jbossws14.sar/ trunk/integration-jboss40/src/main/resources/jbossws14.sar/META-INF/ trunk/integration-jboss40/src/main/resources/jbossws14.sar/META-INF/jboss-service.xml Modified: trunk/integration-jboss40/build.xml Log: Remove dependency on ejb3 in jbossws14.sar Modified: trunk/integration-jboss40/build.xml =================================================================== --- trunk/integration-jboss40/build.xml 2007-01-04 16:26:36 UTC (rev 1797) +++ trunk/integration-jboss40/build.xml 2007-01-04 16:26:42 UTC (rev 1798) @@ -163,44 +163,11 @@ <include name="standard-jaxws-client-config.xml"/> <include name="standard-jaxws-endpoint-config.xml"/> </metainf> - <metainf dir="${jboss42.resources.dir}/jbossws.sar/META-INF"> + <metainf dir="${jboss40.resources.dir}/jbossws14.sar/META-INF"> <include name="jboss-service.xml"/> </metainf> </jar> - <!-- Build jbossws40-no-ejb3.sar --> - <jar jarfile="${jboss40.output.lib.dir}/jbossws40-no-ejb3.sar" manifest="${output.etc.dir}/default.mf"> - <fileset dir="${jboss40.output.lib.dir}"> - <include name="jbossws-jboss40-integration.jar"/> - <include name="jbossws-context.war"/> - </fileset> - <fileset dir="${core.output.lib.dir}"> - <include name="jbossws-core.jar"/> - <include name="jboss-jaxws.jar"/> - </fileset> - <fileset dir="${thirdparty.dir}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="policy-1.0.jar"/> - <include name="sjsxp.jar"/> - <include name="stax-api-1.0.jar"/> - <include name="wstx-lgpl-2.9.3.jar"/> - <include name="xmlsec.jar"/> - </fileset> - <fileset dir="${jboss42.resources.dir}"> - <include name="jbossws.beans/META-INF/jboss-beans.xml"/> - </fileset> - <metainf dir="${core.resources.dir}/jbossws.sar/META-INF"> - <include name="standard-jaxrpc-client-config.xml"/> - <include name="standard-jaxrpc-endpoint-config.xml"/> - <include name="standard-jaxws-client-config.xml"/> - <include name="standard-jaxws-endpoint-config.xml"/> - </metainf> - <metainf dir="${jboss42.resources.dir}/jbossws.sar/META-INF-no-ejb3"> - <include name="jboss-service.xml"/> - </metainf> - </jar> - </target> <!-- @@ -291,7 +258,7 @@ <include name="standard-jaxws-client-config.xml"/> <include name="standard-jaxws-endpoint-config.xml"/> </metainf> - <metainf dir="${jboss42.resources.dir}/jbossws.sar/META-INF-no-ejb3"> + <metainf dir="${jboss40.resources.dir}/jbossws14.sar/META-INF"> <include name="jboss-service.xml"/> </metainf> </jar> Added: trunk/integration-jboss40/src/main/resources/jbossws14.sar/META-INF/jboss-service.xml =================================================================== --- trunk/integration-jboss40/src/main/resources/jbossws14.sar/META-INF/jboss-service.xml 2007-01-04 16:26:36 UTC (rev 1797) +++ trunk/integration-jboss40/src/main/resources/jbossws14.sar/META-INF/jboss-service.xml 2007-01-04 16:26:42 UTC (rev 1798) @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- $Id$ --> + +<server> + + <!-- + A deployer service for WS clients. + --> + <mbean name="jboss.ws:service=WebServiceClientDeployer" code="org.jboss.ws.integration.jboss42.WebServiceClientDeployer"> + <depends>jboss:service=Naming</depends> + </mbean> + + <!-- + A deployer service for JSE endpoints. + --> + <mbean name="jboss.ws:service=WebServiceDeployerJSE" code="org.jboss.ws.integration.jboss42.DeployerInterceptorJSE"> + <depends-list optional-attribute-name="Interceptables"> + <depends-list-element>jboss.web:service=WebServer</depends-list-element> + </depends-list> + </mbean> + + <!-- + A deployer service for EJB2.1 endpoints. + --> + <mbean name="jboss.ws:service=DeployerInterceptorEJB21" code="org.jboss.ws.integration.jboss42.DeployerInterceptorEJB21"> + <depends-list optional-attribute-name="Interceptables"> + <depends-list-element>jboss.ejb:service=EJBDeployer</depends-list-element> + </depends-list> + </mbean> + + <!-- + A deployer service for EJB3 endpoints. + <mbean name="jboss.ws:service=DeployerInterceptorEJB3" code="org.jboss.ws.integration.jboss42.DeployerInterceptorEJB3"> + <depends-list optional-attribute-name="Interceptables"> + <depends-list-element>jboss.ejb3:service=EJB3Deployer</depends-list-element> + </depends-list> + </mbean> + --> + + <!-- + A deployer service for JSE endpoints that are nested in service archives (sar). + --> + <mbean name="jboss.ws:service=DeployerInterceptorNestedJSE" code="org.jboss.ws.integration.jboss42.DeployerInterceptorNestedJSE"> + <depends optional-attribute-name="MainDeployer" proxy-type="attribute">jboss.system:service=MainDeployer</depends> + <depends>jboss.ws:service=WebServiceDeployerJSE</depends> + </mbean> + +</server> Property changes on: trunk/integration-jboss40/src/main/resources/jbossws14.sar/META-INF/jboss-service.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF