[jbossws-commits] JBossWS SVN: r3521 - in branches/jbossws-2.0: integration/native and 2 other directories.

Author: thomas.diesler(a)jboss.com Date: 2007-06-09 10:59:33 -0400 (Sat, 09 Jun 2007) New Revision: 3521 Added: branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans-cts.xml Modified: branches/jbossws-2.0/build/ant-import/build-setup.xml branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml branches/jbossws-2.0/integration/native/build.xml Log: Add cts configuration Modified: branches/jbossws-2.0/build/ant-import/build-setup.xml =================================================================== --- branches/jbossws-2.0/build/ant-import/build-setup.xml 2007-06-09 14:11:15 UTC (rev 3520) +++ branches/jbossws-2.0/build/ant-import/build-setup.xml 2007-06-09 14:59:33 UTC (rev 3521) @@ -53,6 +53,7 @@ <property name="jboss40.server.deploy" value="${jboss40.server}/deploy"/> <property name="jbossws.integration.${jbossws.integration.target}" value="true"/> + <property name="jboss.server.instance.${jboss.server.instance}" 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"/> @@ -61,7 +62,6 @@ <available property="jboss50.available" file="${jboss50.available.file}"/> <available property="jboss42.available" file="${jboss42.available.file}"/> <available property="jboss40.available" file="${jboss40.available.file}"/> - <available property="jboss40.ejb3.available" file="${jboss40.client}/jboss-ejb3-client.jar"/> <available property="jbossws.portal.content.available" file="${jbossws.portal.content}" type="dir"/> Modified: branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml =================================================================== --- branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml 2007-06-09 14:11:15 UTC (rev 3520) +++ branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml 2007-06-09 14:59:33 UTC (rev 3521) @@ -34,6 +34,8 @@ spilibs="${spi.dir}/output/lib" thirdpartylibs="${spi.dir}/thirdparty" jbosshome="${jboss50.home}"/> + + <antcall target="deploy-jboss50-cts"/> </target> <target name="deploy-jboss50-endorsed" depends="prepare" if="HAVE_JDK_1.6"> @@ -43,6 +45,11 @@ thirdpartylibs="${core.dir}/thirdparty"/> </target> + <target name="deploy-jboss50-cts" if="jboss.server.instance.cts"> + <copy tofile="${jboss50.server.deploy}/jbossws.sar/META-INF/jbossws-beans.xml" + file="${int.native.dir}/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans-cts.xml"/> + </target> + <!-- Remove jbossws from jboss50 --> <target name="undeploy-jboss50" depends="prepare,undeploy-jboss50-endorsed" description="Remove jbossws from jboss50"> <macro-undeploy-native50/> Modified: branches/jbossws-2.0/integration/native/build.xml =================================================================== --- branches/jbossws-2.0/integration/native/build.xml 2007-06-09 14:11:15 UTC (rev 3520) +++ branches/jbossws-2.0/integration/native/build.xml 2007-06-09 14:59:33 UTC (rev 3521) @@ -158,7 +158,9 @@ <metainf dir="${core.dir}/src/main/resources/standard-config"> <include name="standard-*-config.xml"/> </metainf> - <metainf dir="${native.resources.dir}/jbossws-native50.sar/META-INF"/> + <metainf dir="${native.resources.dir}/jbossws-native50.sar/META-INF"> + <include name="jbossws-beans.xml"/> + </metainf> </jar> <!-- Build jbossws-native50.deployer --> Added: branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans-cts.xml =================================================================== --- branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans-cts.xml (rev 0) +++ branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans-cts.xml 2007-06-09 14:59:33 UTC (rev 3521) @@ -0,0 +1,266 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<deployment xmlns="urn:jboss:bean-deployer:2.0"> + + <!-- An abstraction of server configuration aspects. --> + <bean name="WSServerConfig" class="org.jboss.wsf.container.jboss50.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 --> + <bean name="WSEndpointRegistry" class="org.jboss.wsf.stack.jbws.ManagedEndpointRegistry"/> + + <!-- A subscription manager for WS-Eventing --> + <bean name="WSSubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager"> + <property name="bindAddress">${jboss.bind.address}</property> + </bean> + + <!-- Bind Service objects in client environment context --> + <bean name="WSServiceRefHandler" 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 deployers registered with the JBoss Main Deployer. + The order of which is important + + 1) EJBDeployer < WebServiceDeployerEJB + 2) WebServiceDeployerJSE < WarDeployer + 3) WebServiceMainDeployer + + Each WebServiceDeployer has a number of DeployerHooks registerd with it + + - WebServiceDeployerEJB + - WSDeployerHook_JAXRPC_EJB21 + - WSDeployerHook_JAXWS_EJB3 + + - WebServiceDeployerJSE + - WSDeployerHook_JAXRPC_JSE + - WSDeployerHook_JAXWS_JSE + + - WebServiceMainDeployer + - WSMainDeployerHook + + 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="WSUnifiedMetaDataDeployer"/> + <inject bean="WSUnifiedMetaDataAssociationDeployer"/> + <inject bean="WSModifyWebMetaDataDeployer"/> + </list> + </property> + </bean> + <bean name="WSDeployerManagerEJB" class="org.jboss.wsf.spi.deployment.BasicDeployerManager"> + <property name="deployers"> + <list class="java.util.LinkedList" elementClass="org.jboss.wsf.spi.deployment.Deployer"> + <inject bean="WSUnifiedDeploymentInfoDeployer"/> + <inject bean="WSContextRootDeployer"/> + <inject bean="WSURLPatternDeployer"/> + <inject bean="WSUnifiedMetaDataDeployer"/> + <inject bean="WSUnifiedMetaDataAssociationDeployer"/> + <inject bean="WSWebAppGeneratorDeployer"/> + <inject bean="WSWebAppDeployerDeployer"/> + </list> + </property> + </bean> + <bean name="WSMainDeployerManager" class="org.jboss.wsf.spi.deployment.BasicDeployerManager"> + <property name="deployers"> + <list class="java.util.LinkedList" elementClass="org.jboss.wsf.spi.deployment.Deployer"> + <inject bean="WSEndpointNameDeployer"/> + <inject bean="WSEndpointHandlerDeployer"/> + <inject bean="WSPublishContractDeployer"/> + <inject bean="WSClassLoaderInjectionDeployer"/> + <inject bean="WSServiceEndpointInvokerDeployer"/> + <inject bean="WSEagerInitializeDeployer"/> + <inject bean="WSEventingDeployer"/> + <inject bean="WSEndpointRegistryDeployer"/> + <inject bean="WSEndpointLifecycleDeployer"/> + </list> + </property> + </bean> + + <!-- + The Deployers + Each handles a single aspect of web service deployment + --> + <bean name="WSClassLoaderInjectionDeployer" class="org.jboss.wsf.container.jboss50.ClassLoaderInjectionDeployer"/> + <bean name="WSContextRootDeployer" class="org.jboss.ws.core.server.LegacyContextRootDeployer"/> + <bean name="WSEagerInitializeDeployer" class="org.jboss.wsf.stack.jbws.EagerInitializeDeployer"/> + <bean name="WSEndpointHandlerDeployer" class="org.jboss.wsf.spi.deployment.EndpointHandlerDeployer"> + <property name="requestHandler">org.jboss.wsf.stack.jbws.RequestHandlerImpl</property> + <property name="lifecycleHandler">org.jboss.wsf.stack.jbws.LifecycleHandlerImpl</property> + <property name="invocationHandler"> + <map keyClass="java.lang.String" valueClass="java.lang.String"> + <entry><key>JAXRPC_JSE</key><value>org.jboss.wsf.stack.jbws.ServiceLifecycleInvocationHandler</value></entry> + <entry><key>JAXRPC_EJB21</key><value>org.jboss.wsf.container.jboss50.InvocationHandlerEJB21</value></entry> + <entry><key>JAXWS_JSE</key><value>org.jboss.wsf.spi.invocation.InvocationHandlerJSE</value></entry> + <entry><key>JAXWS_EJB3</key><value>org.jboss.wsf.container.jboss50.InvocationHandlerEJB3</value></entry> + </map> + </property> + </bean> + <bean name="WSEndpointLifecycleDeployer" class="org.jboss.wsf.spi.deployment.EndpointLifecycleDeployer"/> + <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.stack.jbws.EndpointNameDeployer"/> + <bean name="WSEndpointRegistryDeployer" class="org.jboss.wsf.spi.deployment.EndpointRegistryDeployer"/> + <bean name="WSEventingDeployer" class="org.jboss.wsf.stack.jbws.EventingDeployer"/> + <bean name="WSModifyWebMetaDataDeployer" class="org.jboss.wsf.container.jboss50.ModifyWebMetaDataDeployer"> + <property name="servletClass"><inject bean="WSWebAppDesciptorModifier" property="servletClass"/></property> + </bean> + <bean name="WSPublishContractDeployer" class="org.jboss.wsf.stack.jbws.PublishContractDeployer"/> + <bean name="WSServiceEndpointInvokerDeployer" class="org.jboss.wsf.stack.jbws.ServiceEndpointInvokerDeployer"/> + <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.wsf.container.jboss50.UnifiedDeploymentInfoDeployer"/> + <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.ws.core.server.LegacyURLPatternDeployer"/> + <bean name="WSWebAppGeneratorDeployer" class="org.jboss.wsf.spi.deployment.WebAppGeneratorDeployer"> + <property name="securityHandlerEJB21"><inject bean="WSSecurityHandlerEJB21"/></property> + <property name="securityHandlerEJB3"><inject bean="WSSecurityHandlerEJB3"/></property> + </bean> + <bean name="WSWebAppDeployerDeployer" class="org.jboss.wsf.container.jboss50.WebAppDeployerDeployer"> + <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property> + <property name="mainDeployer"><inject bean="MainDeployer"/></property> + </bean> + + <!-- Deployer helper beans --> + <bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss50.SecurityHandlerEJB21"/> + <bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss50.SecurityHandlerEJB3"/> + <bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.stack.jbws.WebAppDesciptorModifierImpl"> + <property name="servletClass">org.jboss.wsf.stack.jbws.ServiceEndpointServlet</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.jboss50.JAXRPCDeployerHookJSE"> + <property name="deploymentClass">org.jboss.wsf.stack.jbws.UnifiedMetaDataDeployment</property> + <property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property> + <property name="deployerManager"><inject bean="WSDeployerManagerJSE"/></property> + <install bean="WebServiceDeployerJSE" method="addDeployerHook"> + <parameter> + <this/> + </parameter> + </install> + <uninstall bean="WebServiceDeployerJSE" method="removeDeployerHook"> + <parameter> + <this/> + </parameter> + </uninstall> + <depends>WebServiceDeployerJSE</depends> + </bean> + <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.wsf.container.jboss50.JAXRPCDeployerHookEJB21"> + <property name="deploymentClass">org.jboss.wsf.stack.jbws.UnifiedMetaDataDeployment</property> + <property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property> + <property name="deployerManager"><inject bean="WSDeployerManagerEJB"/></property> + <install bean="WebServiceDeployerEJB" method="addDeployerHook"> + <parameter> + <this/> + </parameter> + </install> + <uninstall bean="WebServiceDeployerEJB" method="removeDeployerHook"> + <parameter> + <this/> + </parameter> + </uninstall> + <depends>WebServiceDeployerEJB</depends> + </bean> + <bean name="WSDeployerHook_JAXWS_JSE" class="org.jboss.wsf.container.jboss50.JAXWSDeployerHookJSE"> + <property name="deploymentClass">org.jboss.wsf.stack.jbws.UnifiedMetaDataDeployment</property> + <property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property> + <property name="deployerManager"><inject bean="WSDeployerManagerJSE"/></property> + <install bean="WebServiceDeployerJSE" method="addDeployerHook"> + <parameter> + <this/> + </parameter> + </install> + <uninstall bean="WebServiceDeployerJSE" method="removeDeployerHook"> + <parameter> + <this/> + </parameter> + </uninstall> + <depends>WebServiceDeployerJSE</depends> + </bean> + <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.wsf.container.jboss50.JAXWSDeployerHookEJB3"> + <property name="deploymentClass">org.jboss.wsf.stack.jbws.UnifiedMetaDataDeployment</property> + <property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property> + <property name="deployerManager"><inject bean="WSDeployerManagerEJB"/></property> + <install bean="WebServiceDeployerEJB" method="addDeployerHook"> + <parameter> + <this/> + </parameter> + </install> + <uninstall bean="WebServiceDeployerEJB" method="removeDeployerHook"> + <parameter> + <this/> + </parameter> + </uninstall> + <depends>WebServiceDeployerEJB</depends> + </bean> + <bean name="WSMainDeployerHook" class="org.jboss.wsf.container.jboss50.MainDeployerHook"> + <property name="deployerManager"><inject bean="WSMainDeployerManager"/></property> + <install bean="WebServiceMainDeployer" method="addDeployerHook"> + <parameter> + <this/> + </parameter> + </install> + <uninstall bean="WebServiceMainDeployer" method="removeDeployerHook"> + <parameter> + <this/> + </parameter> + </uninstall> + <depends>WebServiceMainDeployer</depends> + </bean> + +</deployment> Property changes on: branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans-cts.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF