JBossWS SVN: r10281 - stack/cxf/branches/ropalka/modules/server/src/main/scripts.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-07-02 03:57:22 -0400 (Thu, 02 Jul 2009)
New Revision: 10281
Modified:
stack/cxf/branches/ropalka/modules/server/src/main/scripts/antrun-beans-config.xml
Log:
fix whitespace
Modified: stack/cxf/branches/ropalka/modules/server/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/cxf/branches/ropalka/modules/server/src/main/scripts/antrun-beans-config.xml 2009-07-02 07:48:08 UTC (rev 10280)
+++ stack/cxf/branches/ropalka/modules/server/src/main/scripts/antrun-beans-config.xml 2009-07-02 07:57:22 UTC (rev 10281)
@@ -19,7 +19,7 @@
<target name="main">
<copy
- file="${project.resources.directory}/jbossws-cxf-config.xml"
+ file="${project.resources.directory}/jbossws-cxf-config.xml"
tofile="${project.build.resources.directory}/jbossws-jboss500/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
/>
14 years, 10 months
- 1
- 0
JBossWS SVN: r10280 - in stack/cxf/branches/ropalka/modules: server/src/main/resources and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-07-02 03:48:08 -0400 (Thu, 02 Jul 2009)
New Revision: 10280
Modified:
stack/cxf/branches/ropalka/modules/resources/src/main/resources/resources/default-deploy.conf
stack/cxf/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/cxf/branches/ropalka/modules/server/src/main/resources/jbossws-cxf-config.xml
stack/cxf/branches/ropalka/modules/server/src/main/scripts/antrun-beans-config.xml
Log:
[JBWS-2332][JBWS-2382] refactoring - renaming beans file (WIP)
Modified: stack/cxf/branches/ropalka/modules/resources/src/main/resources/resources/default-deploy.conf
===================================================================
--- stack/cxf/branches/ropalka/modules/resources/src/main/resources/resources/default-deploy.conf 2009-07-02 07:46:19 UTC (rev 10279)
+++ stack/cxf/branches/ropalka/modules/resources/src/main/resources/resources/default-deploy.conf 2009-07-02 07:48:08 UTC (rev 10280)
@@ -1 +1 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/jbossws-native!
-jaxws.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/jbossws-native!
-jaxws.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar
Modified: stack/cxf/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/cxf/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-07-02 07:46:19 UTC (rev 10279)
+++ stack/cxf/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-07-02 07:48:08 UTC (rev 10280)
@@ -446,7 +446,7 @@
</copy>
<copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
<fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
- <include name="**/jbossws-deployer-jboss-beans.xml"/>
+ <include name="**/stack-agnostic-jboss-beans.xml"/>
</fileset>
</copy>
</sequential>
@@ -478,7 +478,7 @@
</copy>
<copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
<fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
- <include name="**/jbossws-deployer-jboss-beans.xml"/>
+ <include name="**/stack-agnostic-jboss-beans.xml"/>
</fileset>
</copy>
</sequential>
@@ -518,7 +518,7 @@
<!--
<copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
<fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
- <include name="**/jbossws-deployer-jboss-beans.xml"/>
+ <include name="**/stack-agnostic-jboss-beans.xml"/>
</fileset>
</copy>
-->
@@ -560,7 +560,7 @@
<!--
<copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
<fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
- <include name="**/jbossws-deployer-jboss-beans.xml"/>
+ <include name="**/stack-agnostic-jboss-beans.xml"/>
</fileset>
</copy>
-->
Modified: stack/cxf/branches/ropalka/modules/server/src/main/resources/jbossws-cxf-config.xml
===================================================================
--- stack/cxf/branches/ropalka/modules/server/src/main/resources/jbossws-cxf-config.xml 2009-07-02 07:46:19 UTC (rev 10279)
+++ stack/cxf/branches/ropalka/modules/server/src/main/resources/jbossws-cxf-config.xml 2009-07-02 07:48:08 UTC (rev 10280)
@@ -1,4 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
<!-- The registry for web service endpoints -->
<bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry">
<property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
@@ -90,3 +93,5 @@
</constructor>
<property name="relativeOrder">36</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
+
+</deployment>
Modified: stack/cxf/branches/ropalka/modules/server/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/cxf/branches/ropalka/modules/server/src/main/scripts/antrun-beans-config.xml 2009-07-02 07:46:19 UTC (rev 10279)
+++ stack/cxf/branches/ropalka/modules/server/src/main/scripts/antrun-beans-config.xml 2009-07-02 07:48:08 UTC (rev 10280)
@@ -14,69 +14,35 @@
<property name="project.resources.directory" value="${basedir}/src/main/resources"/>
<property name="project.build.directory" value="${basedir}/target"/>
<property name="project.build.resources.directory" value="${project.build.directory}/resources"/>
-
<property name="thirdparty.dir" value="${project.build.directory}/thirdparty"/>
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
+ <target name="main">
- <target name="init">
- </target>
+ <copy
+ file="${project.resources.directory}/jbossws-cxf-config.xml"
+ tofile="${project.build.resources.directory}/jbossws-jboss500/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
+ />
- <!-- Compile resource files -->
- <target name="main" depends="init">
+ <copy
+ file="${project.resources.directory}/jbossws-cxf-config.xml"
+ tofile="${project.build.resources.directory}/jbossws-jboss501/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
+ />
- <!-- Concat jbossws-jboss500/jbossws.beans -->
- <echo message="Concat jbossws-jboss500/jbossws.beans"/>
- <concat destfile="${project.build.resources.directory}/jbossws-jboss500/jbossws.beans/META-INF/jboss-beans.xml">
- <header trimleading="yes">
- <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
- <fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
+ <copy
+ file="${project.resources.directory}/jbossws-cxf-config.xml"
+ tofile="${project.build.resources.directory}/jbossws-jboss510/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
+ />
- <!-- Concat jbossws-jboss501/jbossws.beans -->
- <echo message="Concat jbossws-jboss501/jbossws.beans"/>
- <concat destfile="${project.build.resources.directory}/jbossws-jboss501/jbossws.beans/META-INF/jboss-beans.xml">
- <header trimleading="yes">
- <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
- <fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
+ <copy
+ file="${project.resources.directory}/jbossws-cxf-config.xml"
+ tofile="${project.build.resources.directory}/jbossws-jboss520/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
+ />
- <!-- Concat jbossws-jboss510/jbossws.beans -->
- <echo message="Concat jbossws-jboss510/jbossws.beans"/>
- <concat destfile="${project.build.resources.directory}/jbossws-jboss510/jbossws.beans/META-INF/jboss-beans.xml">
- <header trimleading="yes">
- <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
- <fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
+ <copy
+ file="${project.resources.directory}/jbossws-cxf-config.xml"
+ tofile="${project.build.resources.directory}/jbossws-jboss600/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
+ />
- <!-- Concat jbossws-jboss520/jbossws.beans -->
- <echo message="Concat jbossws-jboss520/jbossws.beans"/>
- <concat destfile="${project.build.resources.directory}/jbossws-jboss520/jbossws.beans/META-INF/jboss-beans.xml">
- <header trimleading="yes">
- <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
- <fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
-
- <!-- Concat jbossws-jboss600/jbossws.beans -->
- <echo message="Concat jbossws-jboss600/jbossws.beans"/>
- <concat destfile="${project.build.resources.directory}/jbossws-jboss600/jbossws.beans/META-INF/jboss-beans.xml">
- <header trimleading="yes">
- <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
- <fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
-
</target>
</project>
14 years, 10 months
- 1
- 0
JBossWS SVN: r10279 - container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.deployer/META-INF.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-07-02 03:46:19 -0400 (Thu, 02 Jul 2009)
New Revision: 10279
Added:
container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.deployer/META-INF/stack-agnostic-jboss-beans.xml
Removed:
container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml
Log:
[JBWS-2332][JBWS-2382] refactoring - renaming beans file (WIP)
Deleted: container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml 2009-07-02 06:43:52 UTC (rev 10278)
+++ container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml 2009-07-02 07:46:19 UTC (rev 10279)
@@ -1,251 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <!-- Locate the single instance of the kernel -->
- <bean name="WSKernelLocator" class="org.jboss.wsf.spi.util.KernelLocator">
- <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
- </bean>
-
- <!-- Locate the single instance of the MBeanServer -->
- <bean name="WSMBeanServerLocator" class="org.jboss.wsf.framework.management.MBeanServerLocator">
- <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
- </bean>
-
- <!-- An abstraction of server configuration aspects. -->
- <bean name="WSServerConfig" class="org.jboss.wsf.container.jboss50.deployer.ServerConfigImpl">
- <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
-
- <!--
- 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 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>
-
- <!-- deployers -->
- <bean name="WSDescriptorDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDescriptorDeployer">
- <property name="name">webservices.xml</property>
- <property name="useSchemaValidation">true</property>
- </bean>
-
- <bean name="WSEJBAdapterDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSEJBAdapterDeployer"/>
-
- <bean name="WSTypeDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSTypeDeployer">
- <property name="relativeOrder">1</property> <!-- [JBDEPLOY-201] workaround -->
- </bean>
-
- <bean name="WSDeploymentDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentDeployer">
- <property name="relativeOrder">2</property> <!-- [JBDEPLOY-201] workaround -->
- </bean>
-
- <!-- The AS deployment aspects wrapped in deployers -->
- <bean name="WSContainerMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss50.deployment.metadata.ContainerMetaDataDeploymentAspect">
- <property name="provides">ContainerMetaData, VFSRoot</property>
- </bean>
-
- <bean name="WSContainerMetaDataDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
- <constructor>
- <parameter>
- <inject bean="WSContainerMetaDataDeploymentAspect"/>
- </parameter>
- </constructor>
- <property name="relativeOrder">12</property> <!-- [JBDEPLOY-201] workaround -->
- </bean>
-
- <bean name="WSInjectionMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss50.deployment.metadata.InjectionMetaDataDeploymentAspect">
- <property name="requires">WebMetaData</property>
- <property name="provides">InjectionMetaData</property>
- <property name="ejbReferenceResolver"><inject bean="org.jboss.ejb3.EjbReferenceResolver"/></property>
- </bean>
-
- <bean name="WSInjectionMetaDataDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
- <constructor>
- <parameter>
- <inject bean="WSInjectionMetaDataDeploymentAspect"/>
- </parameter>
- </constructor>
- <property name="relativeOrder">34</property> <!-- [JBDEPLOY-201] workaround -->
- </bean>
-
- <bean name="WSContextRootDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleContextRootDeploymentAspect">
- <property name="requires">ContainerMetaData</property>
- <property name="provides">ContextRoot</property>
- </bean>
-
- <bean name="WSContextRootDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
- <constructor>
- <parameter>
- <inject bean="WSContextRootDeploymentAspect"/>
- </parameter>
- </constructor>
- <property name="relativeOrder">14</property> <!-- [JBDEPLOY-201] workaround -->
- </bean>
-
- <bean name="WSVirtualHostDeploymentAspect" class="org.jboss.wsf.framework.deployment.VirtualHostDeploymentAspect">
- <property name="requires">ContainerMetaData</property>
- <property name="provides">VirtualHosts</property>
- </bean>
-
- <bean name="WSVirtualHostDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
- <constructor>
- <parameter>
- <inject bean="WSVirtualHostDeploymentAspect"/>
- </parameter>
- </constructor>
- <property name="relativeOrder">18</property> <!-- [JBDEPLOY-201] workaround -->
- </bean>
-
- <bean name="WSEndpointAddressDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAddressDeploymentAspect">
- <property name="requires">URLPattern</property>
- <property name="provides">EndpointAddress</property>
- </bean>
-
- <bean name="WSEndpointAddressDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
- <constructor>
- <parameter>
- <inject bean="WSEndpointAddressDeploymentAspect"/>
- </parameter>
- </constructor>
- <property name="relativeOrder">16</property> <!-- [JBDEPLOY-201] workaround -->
- </bean>
-
- <bean name="WSEndpointLifecycleDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointLifecycleDeploymentAspect">
- <property name="requires">
- ContainerMetaData, ContextProperties, ContextRoot, EndpointAddress,
- EndpointMetrics, EndpointName, EndpointRecordProcessors, InjectionMetaData,
- RegisteredEndpoint, RuntimeLoader, URLPattern, StackEndpointHandler,
- StackDescriptor, VirtualHosts, VFSRoot, WebMetaData, StackSpecificMetaData
- </property>
- <property name="provides">LifecycleHandler</property>
- </bean>
-
- <bean name="WSEndpointLifecycleDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
- <constructor>
- <parameter>
- <inject bean="WSEndpointLifecycleDeploymentAspect"/>
- </parameter>
- </constructor>
- <property name="relativeOrder">37</property> <!-- [JBDEPLOY-201] workaround -->
- </bean>
-
- <bean name="WSEndpointMetricsDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointMetricsDeploymentAspect">
- <property name="provides">EndpointMetrics</property>
- </bean>
-
- <bean name="WSEndpointMetricsDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
- <constructor>
- <parameter>
- <inject bean="WSEndpointMetricsDeploymentAspect"/>
- </parameter>
- </constructor>
- <property name="relativeOrder">11</property> <!-- [JBDEPLOY-201] workaround -->
- </bean>
-
- <bean name="WSEndpointNameDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointNameDeploymentAspect">
- <property name="requires">URLPattern</property>
- <property name="provides">EndpointName</property>
- </bean>
-
- <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
- <constructor>
- <parameter>
- <inject bean="WSEndpointNameDeploymentAspect"/>
- </parameter>
- </constructor>
- <property name="relativeOrder">17</property> <!-- [JBDEPLOY-201] workaround -->
- </bean>
-
- <bean name="WSEndpointRegistryDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRegistryDeploymentAspect">
- <property name="requires">EndpointName</property>
- <property name="provides">RegisteredEndpoint</property>
- </bean>
-
- <bean name="WSEndpointRegistryDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
- <constructor>
- <parameter>
- <inject bean="WSEndpointRegistryDeploymentAspect"/>
- </parameter>
- </constructor>
- <property name="relativeOrder">35</property> <!-- [JBDEPLOY-201] workaround -->
- </bean>
-
- <bean name="WSRuntimeLoaderDeploymentAspect" class="org.jboss.wsf.container.jboss50.deployment.RuntimeLoaderDeploymentAspect">
- <property name="requires">ContainerMetaData</property>
- <property name="provides">RuntimeLoader</property>
- </bean>
-
- <bean name="WSRuntimeLoaderDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
- <constructor>
- <parameter>
- <inject bean="WSRuntimeLoaderDeploymentAspect"/>
- </parameter>
- </constructor>
- <property name="relativeOrder">19</property> <!-- [JBDEPLOY-201] workaround -->
- </bean>
-
- <bean name="WSURLPatternDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleURLPatternDeploymentAspect">
- <property name="requires">ContextRoot, ContainerMetaData</property>
- <property name="provides">URLPattern</property>
- </bean>
-
- <bean name="WSURLPatternDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
- <constructor>
- <parameter>
- <inject bean="WSURLPatternDeploymentAspect"/>
- </parameter>
- </constructor>
- <property name="relativeOrder">15</property> <!-- [JBDEPLOY-201] workaround -->
- </bean>
-
- <bean name="WSWebAppDeploymentAspect" class="org.jboss.wsf.container.jboss50.transport.WebAppDeploymentAspect">
- <property name="requires">WebMetaData, ContextProperties, StackDescriptor</property>
- <property name="provides">WebMetaData</property>
- <property name="webMetaDataModifier"><inject bean="WSWebMetaDataModifier"/></property>
- </bean>
-
- <bean name="WSWebAppDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
- <constructor>
- <parameter>
- <inject bean="WSWebAppDeploymentAspect"/>
- </parameter>
- </constructor>
- <property name="relativeOrder">33</property> <!-- [JBDEPLOY-201] workaround -->
- </bean>
-
- <bean name="WSWebAppGeneratorDeploymentAspect" class="org.jboss.wsf.container.jboss50.transport.WebAppGeneratorDeploymentAspect">
- <property name="requires">VirtualHosts,URLPattern</property>
- <property name="provides">WebMetaData</property>
- <property name="securityHandlerEJB21"><inject bean="WSSecurityHandlerEJB21"/></property>
- <property name="securityHandlerEJB3"><inject bean="WSSecurityHandlerEJB3"/></property>
- </bean>
-
- <bean name="WSWebAppGeneratorDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
- <constructor>
- <parameter>
- <inject bean="WSWebAppGeneratorDeploymentAspect"/>
- </parameter>
- </constructor>
- <property name="relativeOrder">32</property> <!-- [JBDEPLOY-201] workaround -->
- </bean>
-
- <!-- Deployment aspect helper beans -->
- <bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss50.deployment.tomcat.SecurityHandlerEJB21"/>
- <bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss50.deployment.tomcat.SecurityHandlerEJB3"/>
- <bean name="WSWebMetaDataModifier" class="org.jboss.wsf.container.jboss50.deployment.tomcat.WebMetaDataModifierImpl"/>
-
-</deployment>
Added: container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.deployer/META-INF/stack-agnostic-jboss-beans.xml
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.deployer/META-INF/stack-agnostic-jboss-beans.xml (rev 0)
+++ container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.deployer/META-INF/stack-agnostic-jboss-beans.xml 2009-07-02 07:46:19 UTC (rev 10279)
@@ -0,0 +1,251 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- Locate the single instance of the kernel -->
+ <bean name="WSKernelLocator" class="org.jboss.wsf.spi.util.KernelLocator">
+ <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
+ </bean>
+
+ <!-- Locate the single instance of the MBeanServer -->
+ <bean name="WSMBeanServerLocator" class="org.jboss.wsf.framework.management.MBeanServerLocator">
+ <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+ </bean>
+
+ <!-- An abstraction of server configuration aspects. -->
+ <bean name="WSServerConfig" class="org.jboss.wsf.container.jboss50.deployer.ServerConfigImpl">
+ <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
+
+ <!--
+ 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 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>
+
+ <!-- deployers -->
+ <bean name="WSDescriptorDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDescriptorDeployer">
+ <property name="name">webservices.xml</property>
+ <property name="useSchemaValidation">true</property>
+ </bean>
+
+ <bean name="WSEJBAdapterDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSEJBAdapterDeployer"/>
+
+ <bean name="WSTypeDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSTypeDeployer">
+ <property name="relativeOrder">1</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
+ <bean name="WSDeploymentDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentDeployer">
+ <property name="relativeOrder">2</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
+ <!-- The AS deployment aspects wrapped in deployers -->
+ <bean name="WSContainerMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss50.deployment.metadata.ContainerMetaDataDeploymentAspect">
+ <property name="provides">ContainerMetaData, VFSRoot</property>
+ </bean>
+
+ <bean name="WSContainerMetaDataDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="WSContainerMetaDataDeploymentAspect"/>
+ </parameter>
+ </constructor>
+ <property name="relativeOrder">12</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
+ <bean name="WSInjectionMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss50.deployment.metadata.InjectionMetaDataDeploymentAspect">
+ <property name="requires">WebMetaData</property>
+ <property name="provides">InjectionMetaData</property>
+ <property name="ejbReferenceResolver"><inject bean="org.jboss.ejb3.EjbReferenceResolver"/></property>
+ </bean>
+
+ <bean name="WSInjectionMetaDataDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="WSInjectionMetaDataDeploymentAspect"/>
+ </parameter>
+ </constructor>
+ <property name="relativeOrder">34</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
+ <bean name="WSContextRootDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleContextRootDeploymentAspect">
+ <property name="requires">ContainerMetaData</property>
+ <property name="provides">ContextRoot</property>
+ </bean>
+
+ <bean name="WSContextRootDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="WSContextRootDeploymentAspect"/>
+ </parameter>
+ </constructor>
+ <property name="relativeOrder">14</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
+ <bean name="WSVirtualHostDeploymentAspect" class="org.jboss.wsf.framework.deployment.VirtualHostDeploymentAspect">
+ <property name="requires">ContainerMetaData</property>
+ <property name="provides">VirtualHosts</property>
+ </bean>
+
+ <bean name="WSVirtualHostDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="WSVirtualHostDeploymentAspect"/>
+ </parameter>
+ </constructor>
+ <property name="relativeOrder">18</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
+ <bean name="WSEndpointAddressDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAddressDeploymentAspect">
+ <property name="requires">URLPattern</property>
+ <property name="provides">EndpointAddress</property>
+ </bean>
+
+ <bean name="WSEndpointAddressDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="WSEndpointAddressDeploymentAspect"/>
+ </parameter>
+ </constructor>
+ <property name="relativeOrder">16</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
+ <bean name="WSEndpointLifecycleDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointLifecycleDeploymentAspect">
+ <property name="requires">
+ ContainerMetaData, ContextProperties, ContextRoot, EndpointAddress,
+ EndpointMetrics, EndpointName, EndpointRecordProcessors, InjectionMetaData,
+ RegisteredEndpoint, RuntimeLoader, URLPattern, StackEndpointHandler,
+ StackDescriptor, VirtualHosts, VFSRoot, WebMetaData, StackSpecificMetaData
+ </property>
+ <property name="provides">LifecycleHandler</property>
+ </bean>
+
+ <bean name="WSEndpointLifecycleDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="WSEndpointLifecycleDeploymentAspect"/>
+ </parameter>
+ </constructor>
+ <property name="relativeOrder">37</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
+ <bean name="WSEndpointMetricsDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointMetricsDeploymentAspect">
+ <property name="provides">EndpointMetrics</property>
+ </bean>
+
+ <bean name="WSEndpointMetricsDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="WSEndpointMetricsDeploymentAspect"/>
+ </parameter>
+ </constructor>
+ <property name="relativeOrder">11</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
+ <bean name="WSEndpointNameDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointNameDeploymentAspect">
+ <property name="requires">URLPattern</property>
+ <property name="provides">EndpointName</property>
+ </bean>
+
+ <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="WSEndpointNameDeploymentAspect"/>
+ </parameter>
+ </constructor>
+ <property name="relativeOrder">17</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
+ <bean name="WSEndpointRegistryDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRegistryDeploymentAspect">
+ <property name="requires">EndpointName</property>
+ <property name="provides">RegisteredEndpoint</property>
+ </bean>
+
+ <bean name="WSEndpointRegistryDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="WSEndpointRegistryDeploymentAspect"/>
+ </parameter>
+ </constructor>
+ <property name="relativeOrder">35</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
+ <bean name="WSRuntimeLoaderDeploymentAspect" class="org.jboss.wsf.container.jboss50.deployment.RuntimeLoaderDeploymentAspect">
+ <property name="requires">ContainerMetaData</property>
+ <property name="provides">RuntimeLoader</property>
+ </bean>
+
+ <bean name="WSRuntimeLoaderDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="WSRuntimeLoaderDeploymentAspect"/>
+ </parameter>
+ </constructor>
+ <property name="relativeOrder">19</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
+ <bean name="WSURLPatternDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleURLPatternDeploymentAspect">
+ <property name="requires">ContextRoot, ContainerMetaData</property>
+ <property name="provides">URLPattern</property>
+ </bean>
+
+ <bean name="WSURLPatternDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="WSURLPatternDeploymentAspect"/>
+ </parameter>
+ </constructor>
+ <property name="relativeOrder">15</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
+ <bean name="WSWebAppDeploymentAspect" class="org.jboss.wsf.container.jboss50.transport.WebAppDeploymentAspect">
+ <property name="requires">WebMetaData, ContextProperties, StackDescriptor</property>
+ <property name="provides">WebMetaData</property>
+ <property name="webMetaDataModifier"><inject bean="WSWebMetaDataModifier"/></property>
+ </bean>
+
+ <bean name="WSWebAppDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="WSWebAppDeploymentAspect"/>
+ </parameter>
+ </constructor>
+ <property name="relativeOrder">33</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
+ <bean name="WSWebAppGeneratorDeploymentAspect" class="org.jboss.wsf.container.jboss50.transport.WebAppGeneratorDeploymentAspect">
+ <property name="requires">VirtualHosts,URLPattern</property>
+ <property name="provides">WebMetaData</property>
+ <property name="securityHandlerEJB21"><inject bean="WSSecurityHandlerEJB21"/></property>
+ <property name="securityHandlerEJB3"><inject bean="WSSecurityHandlerEJB3"/></property>
+ </bean>
+
+ <bean name="WSWebAppGeneratorDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="WSWebAppGeneratorDeploymentAspect"/>
+ </parameter>
+ </constructor>
+ <property name="relativeOrder">32</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
+ <!-- Deployment aspect helper beans -->
+ <bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss50.deployment.tomcat.SecurityHandlerEJB21"/>
+ <bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss50.deployment.tomcat.SecurityHandlerEJB3"/>
+ <bean name="WSWebMetaDataModifier" class="org.jboss.wsf.container.jboss50.deployment.tomcat.WebMetaDataModifierImpl"/>
+
+</deployment>
14 years, 10 months
- 1
- 0
JBossWS SVN: r10278 - stack/native/branches/ropalka/modules/core/src/main/resources.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-07-02 02:43:52 -0400 (Thu, 02 Jul 2009)
New Revision: 10278
Modified:
stack/native/branches/ropalka/modules/core/src/main/resources/jbossws-native-config.xml
Log:
[JBWS-2332][JBWS-2382] refactoring - removing deployer hooks notion (WIP)
Modified: stack/native/branches/ropalka/modules/core/src/main/resources/jbossws-native-config.xml
===================================================================
--- stack/native/branches/ropalka/modules/core/src/main/resources/jbossws-native-config.xml 2009-07-02 06:41:58 UTC (rev 10277)
+++ stack/native/branches/ropalka/modules/core/src/main/resources/jbossws-native-config.xml 2009-07-02 06:43:52 UTC (rev 10278)
@@ -16,9 +16,9 @@
<property name="recording">false</property>
</bean>
- <!-- The stack specific deployment aspects -->
+ <!-- The stack specific deployment aspects wrapped in deployers -->
<bean name="WSNativeContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect">
- <property name="provides">ContextProperties, StackDescriptor</property>
+ <property name="provides">ContextProperties, StackDescriptor, StackSpecificMetaData</property>
<property name="contextProperties">
<map keyClass="java.lang.String" valueClass="java.lang.String">
<entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.jbws.EndpointServlet</value></entry>
@@ -26,20 +26,47 @@
</property>
</bean>
+ <bean name="WSNativeContextPropertiesDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="WSNativeContextPropertiesDeploymentAspect"/>
+ </parameter>
+ </constructor>
+ <property name="relativeOrder">31</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
<bean name="WSNativeEagerInitializeDeploymentAspect" class="org.jboss.wsf.stack.jbws.EagerInitializeDeploymentAspect">
<property name="requires">UnifiedMetaDataModel</property>
- <property name="provides">InitializedMetaDataModel</property>
+ <property name="provides">InitializedMetaDataModel, StackSpecificMetaData</property>
</bean>
+ <bean name="WSNativeEagerInitializeDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="WSNativeEagerInitializeDeploymentAspect"/>
+ </parameter>
+ </constructor>
+ <property name="relativeOrder">25</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
<bean name="WSNativeEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
<property name="requires">ContainerMetaData</property>
- <property name="provides">StackEndpointHandler</property>
+ <property name="provides">StackEndpointHandler, StackSpecificMetaData</property>
</bean>
+ <bean name="WSNativeEndpointHandlerDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="WSNativeEndpointHandlerDeploymentAspect"/>
+ </parameter>
+ </constructor>
+ <property name="relativeOrder">13</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
<bean name="WSNativeEndpointRecordProcessorDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRecordProcessorDeploymentAspect">
<property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
<property name="requires">RegisteredEndpoint</property>
- <property name="provides">EndpointRecordProcessors</property>
+ <property name="provides">EndpointRecordProcessors, StackSpecificMetaData</property>
<property name="processors">
<list class="java.util.ArrayList" elementClass="org.jboss.wsf.spi.management.recording.RecordProcessor">
<inject bean="WSMemoryBufferRecorder"/>
@@ -48,49 +75,94 @@
</property>
</bean>
+ <bean name="WSNativeEndpointRecordProcessorDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="WSNativeEndpointRecordProcessorDeploymentAspect"/>
+ </parameter>
+ </constructor>
+ <property name="relativeOrder">36</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
<bean name="WSNativeEventingDeploymentAspect" class="org.jboss.wsf.stack.jbws.EventingDeploymentAspect">
<property name="requires">UnifiedMetaDataModel</property>
+ <property name="provides">StackSpecificMetaData</property>
</bean>
+ <bean name="WSNativeEventingDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="WSNativeEventingDeploymentAspect"/>
+ </parameter>
+ </constructor>
+ <property name="relativeOrder">26</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
<bean name="WSNativePublishContractDeploymentAspect" class="org.jboss.wsf.stack.jbws.PublishContractDeploymentAspect">
<property name="requires">UnifiedMetaDataModel, JAXBIntros</property>
- <property name="provides">PublishedContract</property>
+ <property name="provides">PublishedContract, StackSpecificMetaData</property>
</bean>
+ <bean name="WSNativePublishContractDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="WSNativePublishContractDeploymentAspect"/>
+ </parameter>
+ </constructor>
+ <property name="relativeOrder">24</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
<bean name="WSNativeServiceEndpointInvokerDeploymentAspect" class="org.jboss.wsf.stack.jbws.ServiceEndpointInvokerDeploymentAspect">
<property name="requires">UnifiedMetaDataModel</property>
+ <property name="provides">StackSpecificMetaData</property>
</bean>
+ <bean name="WSNativeServiceEndpointInvokerDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/>
+ </parameter>
+ </constructor>
+ <property name="relativeOrder">23</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
<bean name="WSNativeRMDeploymentAspect" class="org.jboss.ws.extensions.wsrm.server.RMDeploymentAspect">
<property name="requires">StackEndpointHandler, UnifiedMetaDataModel</property>
+ <property name="provides">StackSpecificMetaData</property>
</bean>
+ <bean name="WSNativeRMDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="WSNativeRMDeploymentAspect"/>
+ </parameter>
+ </constructor>
+ <property name="relativeOrder">27</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
<bean name="WSNativeUnifiedMetaDataDeploymentAspect" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeploymentAspect">
<property name="requires">RuntimeLoader, ContainerMetaData, URLPattern, VFSRoot, JAXBIntros</property>
- <property name="provides">UnifiedMetaDataModel</property>
+ <property name="provides">UnifiedMetaDataModel, StackSpecificMetaData</property>
</bean>
+ <bean name="WSNativeUnifiedMetaDataDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/>
+ </parameter>
+ </constructor>
+ <property name="relativeOrder">22</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
<bean name="WSJAXBIntroDeploymentAspect" class="org.jboss.wsf.stack.jbws.JAXBIntroDeploymentAspect">
- <property name="provides">JAXBIntros</property>
+ <property name="provides">JAXBIntros, StackSpecificMetaData</property>
</bean>
- <!-- Deployment aspect installers -->
- <bean name="WSNativeDeploymentAspectInstaller" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManager"/></property>
- <property name="sortAspectsOnCreate">true</property>
- <property name="aspects">
- <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
- <inject bean="WSNativeContextPropertiesDeploymentAspect"/>
- <inject bean="WSNativeEndpointHandlerDeploymentAspect"/>
- <inject bean="WSNativeEndpointRecordProcessorDeploymentAspect"/>
- <inject bean="WSNativeEventingDeploymentAspect"/>
- <inject bean="WSNativePublishContractDeploymentAspect"/>
- <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/>
- <inject bean="WSNativeRMDeploymentAspect"/>
- <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/>
- <inject bean="WSNativeEagerInitializeDeploymentAspect"/>
+ <bean name="WSJAXBIntroDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <constructor>
+ <parameter>
<inject bean="WSJAXBIntroDeploymentAspect"/>
- </set>
- </property>
- <depends>WSDeploymentAspectInstaller</depends>
+ </parameter>
+ </constructor>
+ <property name="relativeOrder">21</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
14 years, 10 months
- 1
- 0
JBossWS SVN: r10277 - stack/metro/branches/ropalka/modules/server/src/main/resources.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-07-02 02:41:58 -0400 (Thu, 02 Jul 2009)
New Revision: 10277
Modified:
stack/metro/branches/ropalka/modules/server/src/main/resources/jbossws-metro-config.xml
Log:
[JBWS-2332][JBWS-2382] refactoring - removing deployer hooks notion (WIP)
Modified: stack/metro/branches/ropalka/modules/server/src/main/resources/jbossws-metro-config.xml
===================================================================
--- stack/metro/branches/ropalka/modules/server/src/main/resources/jbossws-metro-config.xml 2009-07-02 06:41:28 UTC (rev 10276)
+++ stack/metro/branches/ropalka/modules/server/src/main/resources/jbossws-metro-config.xml 2009-07-02 06:41:58 UTC (rev 10277)
@@ -22,9 +22,9 @@
<property name="recording">false</property>
</bean>
- <!-- The stack specific deployment aspects -->
+ <!-- The stack specific deployment aspects wrapped in deployers -->
<bean name="WSMetroContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect">
- <property name="provides">ContextProperties</property>
+ <property name="provides">ContextProperties, StackSpecificMetaData</property>
<property name="contextProperties">
<map keyClass="java.lang.String" valueClass="java.lang.String">
<entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.metro.EndpointServlet</value></entry>
@@ -32,15 +32,33 @@
</property>
</bean>
+ <bean name="WSMetroContextPropertiesDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="WSMetroContextPropertiesDeploymentAspect"/>
+ </parameter>
+ </constructor>
+ <property name="relativeOrder">31</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
<bean name="WSMetroEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
<property name="requires">ContainerMetaData</property>
- <property name="provides">StackEndpointHandler</property>
+ <property name="provides">StackEndpointHandler, StackSpecificMetaData</property>
</bean>
+ <bean name="WSMetroEndpointHandlerDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="WSMetroEndpointHandlerDeploymentAspect"/>
+ </parameter>
+ </constructor>
+ <property name="relativeOrder">13</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
<bean name="WSMetroEndpointRecordProcessorDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRecordProcessorDeploymentAspect">
<property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
<property name="requires">RegisteredEndpoint</property>
- <property name="provides">EndpointRecordProcessors</property>
+ <property name="provides">EndpointRecordProcessors, StackSpecificMetaData</property>
<property name="processors">
<list class="java.util.ArrayList" elementClass="org.jboss.wsf.spi.management.recording.RecordProcessor">
<inject bean="WSMemoryBufferRecorder"/>
@@ -49,28 +67,39 @@
</property>
</bean>
+ <bean name="WSMetroEndpointRecordProcessorDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="WSMetroEndpointRecordProcessorDeploymentAspect"/>
+ </parameter>
+ </constructor>
+ <property name="relativeOrder">36</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
<bean name="WSMetroDescriptorDeploymentAspect" class="org.jboss.wsf.stack.metro.SunJaxwsDeploymentAspect">
<property name="requires">URLPattern</property>
- <property name="provides">StackDescriptor</property>
+ <property name="provides">StackDescriptor, StackSpecificMetaData</property>
</bean>
+ <bean name="WSMetroDescriptorDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="WSMetroDescriptorDeploymentAspect"/>
+ </parameter>
+ </constructor>
+ <property name="relativeOrder">21</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
<bean name="WSRuntimeModelDeploymentAspect" class="org.jboss.wsf.stack.metro.metadata.RuntimeModelDeploymentAspect">
<property name="requires">RuntimeLoader, StackDescriptor</property>
- <property name="provides">RuntimeModel</property>
+ <property name="provides">RuntimeModel, StackSpecificMetaData</property>
</bean>
- <!-- Deployment aspect installers -->
- <bean name="WSMetroDeploymentAspectInstaller" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManager"/></property>
- <property name="sortAspectsOnCreate">true</property>
- <property name="aspects">
- <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
- <inject bean="WSMetroContextPropertiesDeploymentAspect"/>
- <inject bean="WSMetroDescriptorDeploymentAspect"/>
- <inject bean="WSMetroEndpointHandlerDeploymentAspect"/>
- <inject bean="WSMetroEndpointRecordProcessorDeploymentAspect"/>
+ <bean name="WSRuntimeModelDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <constructor>
+ <parameter>
<inject bean="WSRuntimeModelDeploymentAspect"/>
- </set>
- </property>
- <depends>WSDeploymentAspectInstaller</depends>
+ </parameter>
+ </constructor>
+ <property name="relativeOrder">22</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
14 years, 10 months
- 1
- 0
JBossWS SVN: r10276 - stack/cxf/branches/ropalka/modules/server/src/main/resources.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-07-02 02:41:28 -0400 (Thu, 02 Jul 2009)
New Revision: 10276
Modified:
stack/cxf/branches/ropalka/modules/server/src/main/resources/jbossws-cxf-config.xml
Log:
[JBWS-2332][JBWS-2382] refactoring - removing deployer hooks notion (WIP)
Modified: stack/cxf/branches/ropalka/modules/server/src/main/resources/jbossws-cxf-config.xml
===================================================================
--- stack/cxf/branches/ropalka/modules/server/src/main/resources/jbossws-cxf-config.xml 2009-07-02 06:34:39 UTC (rev 10275)
+++ stack/cxf/branches/ropalka/modules/server/src/main/resources/jbossws-cxf-config.xml 2009-07-02 06:41:28 UTC (rev 10276)
@@ -21,9 +21,9 @@
<property name="recording">false</property>
</bean>
- <!-- The stack specific deployment aspects -->
+ <!-- The stack specific deployment aspects wrapped in deployers -->
<bean name="WSCXFContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect">
- <property name="provides">ContextProperties</property>
+ <property name="provides">ContextProperties, StackSpecificMetaData</property>
<property name="contextProperties">
<map keyClass="java.lang.String" valueClass="java.lang.String">
<entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.cxf.CXFServletExt</value></entry>
@@ -31,22 +31,49 @@
</property>
</bean>
+ <bean name="WSCXFContextPropertiesDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="WSCXFContextPropertiesDeploymentAspect"/>
+ </parameter>
+ </constructor>
+ <property name="relativeOrder">31</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
<bean name="WSCXFDescriptorDeploymentAspect" class="org.jboss.wsf.stack.cxf.DescriptorDeploymentAspect">
<property name="requires">EndpointAddress</property>
- <property name="provides">StackDescriptor</property>
+ <property name="provides">StackDescriptor, StackSpecificMetaData</property>
<property name="invokerEJB3">org.jboss.wsf.stack.cxf.InvokerEJB3</property>
<property name="invokerJSE">org.jboss.wsf.stack.cxf.InvokerJSE</property>
</bean>
+ <bean name="WSCXFDescriptorDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="WSCXFDescriptorDeploymentAspect"/>
+ </parameter>
+ </constructor>
+ <property name="relativeOrder">21</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
<bean name="WSCXFEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
<property name="requires">ContainerMetaData</property>
- <property name="provides">StackEndpointHandler</property>
+ <property name="provides">StackEndpointHandler, StackSpecificMetaData</property>
</bean>
+ <bean name="WSCXFEndpointHandlerDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="WSCXFEndpointHandlerDeploymentAspect"/>
+ </parameter>
+ </constructor>
+ <property name="relativeOrder">13</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
<bean name="WSCXFEndpointRecordProcessorDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRecordProcessorDeploymentAspect">
<property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
<property name="requires">RegisteredEndpoint</property>
- <property name="provides">EndpointRecordProcessors</property>
+ <property name="provides">EndpointRecordProcessors, StackSpecificMetaData</property>
<property name="processors">
<list class="java.util.ArrayList" elementClass="org.jboss.wsf.spi.management.recording.RecordProcessor">
<inject bean="WSMemoryBufferRecorder"/>
@@ -55,17 +82,11 @@
</property>
</bean>
- <!-- Deployment aspect installers -->
- <bean name="WSCXFDeploymentAspectInstaller" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManager"/></property>
- <property name="sortAspectsOnCreate">true</property>
- <property name="aspects">
- <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
- <inject bean="WSCXFContextPropertiesDeploymentAspect"/>
- <inject bean="WSCXFDescriptorDeploymentAspect"/>
- <inject bean="WSCXFEndpointHandlerDeploymentAspect"/>
+ <bean name="WSCXFEndpointRecordProcessorDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <constructor>
+ <parameter>
<inject bean="WSCXFEndpointRecordProcessorDeploymentAspect"/>
- </set>
- </property>
- <depends>WSDeploymentAspectInstaller</depends>
+ </parameter>
+ </constructor>
+ <property name="relativeOrder">36</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
14 years, 10 months
- 1
- 0
JBossWS SVN: r10275 - in container/jboss50/branches/ropalka-jboss510/src/main: resources/jbossws-jboss50.deployer/META-INF and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-07-02 02:34:39 -0400 (Thu, 02 Jul 2009)
New Revision: 10275
Removed:
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/DeployerHook.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/DeployerHookImpl.java
Modified:
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WSDeploymentAspectDeployer.java
container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml
Log:
[JBWS-2332][JBWS-2382] refactoring - removing deployer hooks notion (WIP)
Deleted: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/DeployerHook.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/DeployerHook.java 2009-07-01 15:00:55 UTC (rev 10274)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/DeployerHook.java 2009-07-02 06:34:39 UTC (rev 10275)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.jboss50.deployer;
-
-import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
-
-/**
- * An interface for all web service deployer hooks
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 24-Apr-2007
- */
-public interface DeployerHook
-{
- void deploy(DeploymentUnit unit) throws DeploymentException;
-
- void undeploy(DeploymentUnit unit);
-}
Deleted: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/DeployerHookImpl.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/DeployerHookImpl.java 2009-07-01 15:00:55 UTC (rev 10274)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/DeployerHookImpl.java 2009-07-02 06:34:39 UTC (rev 10275)
@@ -1,91 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.jboss50.deployer;
-
-import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.logging.Logger;
-import org.jboss.wsf.spi.SPIProvider;
-import org.jboss.wsf.spi.SPIProviderResolver;
-import org.jboss.wsf.spi.deployment.*;
-import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
-
-/**
- * An abstract web service deployer.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @author Heiko.Braun(a)jboss.com
- * @author <a href="ropalka(a)redhat.com">Richard Opalka</a>
- */
-public final class DeployerHookImpl implements DeployerHook
-{
-
- protected final Logger log = Logger.getLogger(getClass());
-
- private DeploymentAspectManager deploymentAspectManager;
-
- protected String deploymentManagerName;
-
- /** MC provided property **/
- public void setDeploymentManagerName(String deploymentManagerName)
- {
- this.deploymentManagerName = deploymentManagerName;
- }
-
- public DeploymentAspectManager getDeploymentAspectManager()
- {
- if(null == deploymentAspectManager)
- {
- SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- deploymentAspectManager = spiProvider.getSPI(DeploymentAspectManagerFactory.class).getDeploymentAspectManager( deploymentManagerName );
- }
-
- return deploymentAspectManager;
- }
-
- public void deploy( final DeploymentUnit unit ) throws DeploymentException
- {
- if ( this.isWebServiceDeployment( unit ) )
- {
- log.debug( "deploy: " + unit.getName() );
- final Deployment dep = unit.getAttachment( Deployment.class );
- unit.addAttachment( Deployment.class, dep );
- this.getDeploymentAspectManager().deploy( dep );
- }
- }
-
- public void undeploy( final DeploymentUnit unit )
- {
- final Deployment dep = unit.getAttachment( Deployment.class );
- if ( dep != null )
- {
- log.debug( "undeploy: " + unit.getName() );
- this.getDeploymentAspectManager().undeploy( dep );
- }
- }
-
- private boolean isWebServiceDeployment( final DeploymentUnit unit )
- {
- return unit.getAttachment( DeploymentType.class ) != null;
- }
-
-}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WSDeploymentAspectDeployer.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WSDeploymentAspectDeployer.java 2009-07-01 15:00:55 UTC (rev 10274)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WSDeploymentAspectDeployer.java 2009-07-02 06:34:39 UTC (rev 10275)
@@ -21,66 +21,85 @@
*/
package org.jboss.wsf.container.jboss50.deployer;
-import java.util.LinkedList;
-import java.util.List;
+import java.util.Set;
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.deployer.helpers.AbstractRealDeployer;
import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.logging.Logger;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.DeploymentAspect;
+import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
/**
- * The phase one web service deployer.
+ * A deployer that delegates to JBossWS deployment aspect.
*
- * @author Thomas.Diesler(a)jboss.org
* @author <a href="ropalka(a)redhat.com">Richard Opalka</a>
*/
public class WSDeploymentAspectDeployer extends AbstractRealDeployer
{
- private static final Logger log = Logger.getLogger(WSDeploymentAspectDeployer.class);
+ private static final String JBOSSWS_ATTACHMENT_PREFIX = "jbossws.";
+ private final DeploymentAspect aspect;
- private List<DeployerHook> deployerHooks = new LinkedList<DeployerHook>();
-
/**
* Constructor.
*/
- public WSDeploymentAspectDeployer()
+ public WSDeploymentAspectDeployer( DeploymentAspect aspect )
{
super();
+
+ this.aspect = aspect;
// inputs
this.addInput( JBossWebMetaData.class );
this.addInput( Deployment.class );
+ // propagate DA requirements and map them to deployer inputs
+ final Set< String > inputs = aspect.getRequiresAsSet();
+ for ( String input : inputs )
+ {
+ this.addInput( JBOSSWS_ATTACHMENT_PREFIX + input );
+ }
+
// outputs
this.addOutput( JBossWebMetaData.class );
- }
- public void addDeployerHook(DeployerHook deployer)
- {
- log.debug("Add deployer hook: " + deployer);
- deployerHooks.add(deployer);
+ // propagate DA provides and map them to deployer outputs
+ final Set< String > outputs = aspect.getProvidesAsSet();
+ for ( String output : outputs )
+ {
+ this.addOutput( JBOSSWS_ATTACHMENT_PREFIX + output );
+ }
}
- public void removeDeployerHook(DeployerHook deployer)
- {
- log.debug("Remove deployer hook: " + deployer);
- deployerHooks.remove(deployer);
- }
-
@Override
public void internalDeploy(DeploymentUnit unit) throws DeploymentException
{
- for (DeployerHook deployer : deployerHooks) deployer.deploy(unit);
+ if ( this.isWebServiceDeployment( unit ) )
+ {
+ log.debug( this.aspect.getClass() + " deploy: " + unit.getName() );
+ final Deployment dep = unit.getAttachment( Deployment.class );
+ this.aspect.create( dep );
+ this.aspect.start( dep );
+ }
}
@Override
public void internalUndeploy(DeploymentUnit unit)
{
- for (DeployerHook deployer : deployerHooks) deployer.undeploy(unit);
+ if ( this.isWebServiceDeployment( unit ) )
+ {
+ log.debug( this.aspect.getClass() + " undeploy: " + unit.getName() );
+ final Deployment dep = unit.getAttachment( Deployment.class );
+ this.aspect.stop( dep );
+ this.aspect.destroy( dep );
+ }
}
+ private boolean isWebServiceDeployment( final DeploymentUnit unit )
+ {
+ return unit.getAttachment( DeploymentType.class ) != null;
+ }
+
}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml 2009-07-01 15:00:55 UTC (rev 10274)
+++ container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml 2009-07-02 06:34:39 UTC (rev 10275)
@@ -53,91 +53,180 @@
<property name="relativeOrder">2</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
- <bean name="WSDeploymentAspectsDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
- <property name="relativeOrder">3</property> <!-- [JBDEPLOY-201] workaround -->
+ <!-- The AS deployment aspects wrapped in deployers -->
+ <bean name="WSContainerMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss50.deployment.metadata.ContainerMetaDataDeploymentAspect">
+ <property name="provides">ContainerMetaData, VFSRoot</property>
</bean>
- <!-- Register DeployerHooks with JBoss deployers -->
- <bean name="WSDeployerHook" class="org.jboss.wsf.container.jboss50.deployer.DeployerHookImpl">
- <property name="deploymentManagerName">WSDeploymentAspectManager</property>
- <install bean="WSDeploymentAspectsDeployer" method="addDeployerHook">
+ <bean name="WSContainerMetaDataDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <constructor>
<parameter>
- <this/>
+ <inject bean="WSContainerMetaDataDeploymentAspect"/>
</parameter>
- </install>
- <uninstall bean="WSDeploymentAspectsDeployer" method="removeDeployerHook">
- <parameter>
- <this/>
- </parameter>
- </uninstall>
- <depends>WSDeploymentAspectsDeployer</depends>
+ </constructor>
+ <property name="relativeOrder">12</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
- <!-- Each DeploymentAspectManger maintains a list of DeploymentAspects -->
- <bean name="WSDeploymentAspectManager" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl">
- <property name="name">WSDeploymentAspectManager</property>
- </bean>
-
- <!-- The container deployment aspects -->
- <bean name="WSContainerMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss50.deployment.metadata.ContainerMetaDataDeploymentAspect">
- <property name="provides">ContainerMetaData, VFSRoot</property>
- </bean>
-
<bean name="WSInjectionMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss50.deployment.metadata.InjectionMetaDataDeploymentAspect">
<property name="requires">WebMetaData</property>
<property name="provides">InjectionMetaData</property>
<property name="ejbReferenceResolver"><inject bean="org.jboss.ejb3.EjbReferenceResolver"/></property>
</bean>
+ <bean name="WSInjectionMetaDataDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="WSInjectionMetaDataDeploymentAspect"/>
+ </parameter>
+ </constructor>
+ <property name="relativeOrder">34</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
<bean name="WSContextRootDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleContextRootDeploymentAspect">
<property name="requires">ContainerMetaData</property>
<property name="provides">ContextRoot</property>
</bean>
+ <bean name="WSContextRootDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="WSContextRootDeploymentAspect"/>
+ </parameter>
+ </constructor>
+ <property name="relativeOrder">14</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
<bean name="WSVirtualHostDeploymentAspect" class="org.jboss.wsf.framework.deployment.VirtualHostDeploymentAspect">
<property name="requires">ContainerMetaData</property>
<property name="provides">VirtualHosts</property>
</bean>
+ <bean name="WSVirtualHostDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="WSVirtualHostDeploymentAspect"/>
+ </parameter>
+ </constructor>
+ <property name="relativeOrder">18</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
<bean name="WSEndpointAddressDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAddressDeploymentAspect">
<property name="requires">URLPattern</property>
<property name="provides">EndpointAddress</property>
</bean>
+ <bean name="WSEndpointAddressDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="WSEndpointAddressDeploymentAspect"/>
+ </parameter>
+ </constructor>
+ <property name="relativeOrder">16</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
<bean name="WSEndpointLifecycleDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointLifecycleDeploymentAspect">
- <property name="requires">LAST_DEPLOYMENT_ASPECT</property>
+ <property name="requires">
+ ContainerMetaData, ContextProperties, ContextRoot, EndpointAddress,
+ EndpointMetrics, EndpointName, EndpointRecordProcessors, InjectionMetaData,
+ RegisteredEndpoint, RuntimeLoader, URLPattern, StackEndpointHandler,
+ StackDescriptor, VirtualHosts, VFSRoot, WebMetaData, StackSpecificMetaData
+ </property>
+ <property name="provides">LifecycleHandler</property>
</bean>
+ <bean name="WSEndpointLifecycleDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="WSEndpointLifecycleDeploymentAspect"/>
+ </parameter>
+ </constructor>
+ <property name="relativeOrder">37</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
<bean name="WSEndpointMetricsDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointMetricsDeploymentAspect">
<property name="provides">EndpointMetrics</property>
</bean>
+ <bean name="WSEndpointMetricsDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="WSEndpointMetricsDeploymentAspect"/>
+ </parameter>
+ </constructor>
+ <property name="relativeOrder">11</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
<bean name="WSEndpointNameDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointNameDeploymentAspect">
<property name="requires">URLPattern</property>
<property name="provides">EndpointName</property>
</bean>
+ <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="WSEndpointNameDeploymentAspect"/>
+ </parameter>
+ </constructor>
+ <property name="relativeOrder">17</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
<bean name="WSEndpointRegistryDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRegistryDeploymentAspect">
<property name="requires">EndpointName</property>
<property name="provides">RegisteredEndpoint</property>
</bean>
+ <bean name="WSEndpointRegistryDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="WSEndpointRegistryDeploymentAspect"/>
+ </parameter>
+ </constructor>
+ <property name="relativeOrder">35</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
<bean name="WSRuntimeLoaderDeploymentAspect" class="org.jboss.wsf.container.jboss50.deployment.RuntimeLoaderDeploymentAspect">
<property name="requires">ContainerMetaData</property>
<property name="provides">RuntimeLoader</property>
</bean>
+ <bean name="WSRuntimeLoaderDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="WSRuntimeLoaderDeploymentAspect"/>
+ </parameter>
+ </constructor>
+ <property name="relativeOrder">19</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
<bean name="WSURLPatternDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleURLPatternDeploymentAspect">
<property name="requires">ContextRoot, ContainerMetaData</property>
<property name="provides">URLPattern</property>
</bean>
+ <bean name="WSURLPatternDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="WSURLPatternDeploymentAspect"/>
+ </parameter>
+ </constructor>
+ <property name="relativeOrder">15</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
<bean name="WSWebAppDeploymentAspect" class="org.jboss.wsf.container.jboss50.transport.WebAppDeploymentAspect">
<property name="requires">WebMetaData, ContextProperties, StackDescriptor</property>
<property name="provides">WebMetaData</property>
<property name="webMetaDataModifier"><inject bean="WSWebMetaDataModifier"/></property>
</bean>
+ <bean name="WSWebAppDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="WSWebAppDeploymentAspect"/>
+ </parameter>
+ </constructor>
+ <property name="relativeOrder">33</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
<bean name="WSWebAppGeneratorDeploymentAspect" class="org.jboss.wsf.container.jboss50.transport.WebAppGeneratorDeploymentAspect">
<property name="requires">VirtualHosts,URLPattern</property>
<property name="provides">WebMetaData</property>
@@ -145,32 +234,18 @@
<property name="securityHandlerEJB3"><inject bean="WSSecurityHandlerEJB3"/></property>
</bean>
+ <bean name="WSWebAppGeneratorDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <constructor>
+ <parameter>
+ <inject bean="WSWebAppGeneratorDeploymentAspect"/>
+ </parameter>
+ </constructor>
+ <property name="relativeOrder">32</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
+
<!-- Deployment aspect helper beans -->
<bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss50.deployment.tomcat.SecurityHandlerEJB21"/>
<bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss50.deployment.tomcat.SecurityHandlerEJB3"/>
<bean name="WSWebMetaDataModifier" class="org.jboss.wsf.container.jboss50.deployment.tomcat.WebMetaDataModifierImpl"/>
- <!-- Deployment aspect installers -->
- <bean name="WSDeploymentAspectInstaller" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManager"/></property>
- <property name="sortAspectsOnCreate">false</property>
- <property name="aspects">
- <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
- <inject bean="WSContainerMetaDataDeploymentAspect"/>
- <inject bean="WSVirtualHostDeploymentAspect"/>
- <inject bean="WSInjectionMetaDataDeploymentAspect"/>
- <inject bean="WSContextRootDeploymentAspect"/>
- <inject bean="WSEndpointAddressDeploymentAspect"/>
- <inject bean="WSEndpointMetricsDeploymentAspect"/>
- <inject bean="WSEndpointNameDeploymentAspect"/>
- <inject bean="WSEndpointRegistryDeploymentAspect"/>
- <inject bean="WSURLPatternDeploymentAspect"/>
- <inject bean="WSWebAppDeploymentAspect"/>
- <inject bean="WSWebAppGeneratorDeploymentAspect"/>
- <inject bean="WSEndpointLifecycleDeploymentAspect"/>
- <inject bean="WSRuntimeLoaderDeploymentAspect"/>
- </set>
- </property>
- </bean>
-
</deployment>
14 years, 10 months
- 1
- 0
JBossWS SVN: r10274 - framework/trunk/hudson/jboss/bin.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-07-01 11:00:55 -0400 (Wed, 01 Jul 2009)
New Revision: 10274
Modified:
framework/trunk/hudson/jboss/bin/jbossws-qa.sh
Log:
Adding java.io.tmpdir conf to environment for the new machine layout
Modified: framework/trunk/hudson/jboss/bin/jbossws-qa.sh
===================================================================
--- framework/trunk/hudson/jboss/bin/jbossws-qa.sh 2009-07-01 12:51:50 UTC (rev 10273)
+++ framework/trunk/hudson/jboss/bin/jbossws-qa.sh 2009-07-01 15:00:55 UTC (rev 10274)
@@ -8,7 +8,7 @@
}
setupEnv() {
- ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=$JBOSS_BIND_ADDRESS -Djbossws.integration.target=$JBOSS_TARGET -D$JBOSS_TARGET.home=$JBOSS_INSTANCE"
+ ENVIRONMENT="-Djava.io.tmpdir=/data/tmp -Dmaven.opts=-U -Djboss.bind.address=$JBOSS_BIND_ADDRESS -Djbossws.integration.target=$JBOSS_TARGET -D$JBOSS_TARGET.home=$JBOSS_INSTANCE"
export JBOSS_HOME=$JBOSS_INSTANCE
}
14 years, 10 months
- 1
- 0
JBossWS SVN: r10273 - spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/deployment.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-07-01 08:51:50 -0400 (Wed, 01 Jul 2009)
New Revision: 10273
Modified:
spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspect.java
Log:
adding notion of new lines and tabs
Modified: spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspect.java
===================================================================
--- spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspect.java 2009-07-01 10:56:25 UTC (rev 10272)
+++ spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspect.java 2009-07-01 12:51:50 UTC (rev 10273)
@@ -87,7 +87,7 @@
Set<String> condset = new HashSet<String>();
if (provides != null)
{
- StringTokenizer st = new StringTokenizer(provides, ", ");
+ StringTokenizer st = new StringTokenizer(provides, ", \r\n\t");
while (st.hasMoreTokens())
condset.add(st.nextToken());
}
@@ -99,7 +99,7 @@
Set<String> condset = new HashSet<String>();
if (requires != null)
{
- StringTokenizer st = new StringTokenizer(requires, ", ");
+ StringTokenizer st = new StringTokenizer(requires, ", \r\n\t");
while (st.hasMoreTokens())
condset.add(st.nextToken());
}
14 years, 10 months
- 1
- 0
JBossWS SVN: r10272 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP/src: test/java/org/jboss/test/ws/common/soap and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-07-01 06:56:25 -0400 (Wed, 01 Jul 2009)
New Revision: 10272
Added:
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/common/soap/jbws2693.xml
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/soap/NodeImpl.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java
Log:
[JBPAPP-2185] Implement Node.setTextContent().
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/soap/NodeImpl.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/soap/NodeImpl.java 2009-07-01 10:06:19 UTC (rev 10271)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/soap/NodeImpl.java 2009-07-01 10:56:25 UTC (rev 10272)
@@ -647,8 +647,17 @@
public void setTextContent(String textContent) throws DOMException
{
- // FIXME setTextContent
- throw new NotImplementedException("setTextContent");
+ NodeList nodes = getChildNodes();
+ for (int i = 0; i < nodes.getLength(); i++)
+ {
+ removeChild((Node)nodes.item(i));
+ }
+
+ if (textContent != null && textContent.length() > 0)
+ {
+ Node node = domNode.getOwnerDocument().createTextNode(textContent);
+ appendChild(node);
+ }
}
public Object setUserData(String key, Object data, UserDataHandler handler)
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java 2009-07-01 10:06:19 UTC (rev 10271)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java 2009-07-01 10:56:25 UTC (rev 10272)
@@ -188,7 +188,41 @@
assertEquals(soapFactory.createName("name"), it.next());
assertEquals(soapFactory.createName("species", null, "http://zoofan.net"), it.next());
}
+
+ public void testSetTextContent() throws Exception
+ {
+ InputStream is = new File("resources/common/soap/jbws2693.xml").toURL().openStream();
+ MessageFactory messageFactory = MessageFactory.newInstance();
+ SOAPMessage soapMessage = messageFactory.createMessage(null, is);
+ NodeList nl = soapMessage.getSOAPBody().getChildNodes();
+ SOAPElement echo = null;
+ for (int i = 0; i < nl.getLength() && echo == null; i++)
+ {
+ Object current = nl.item(i);
+ if (current instanceof SOAPElement)
+ {
+ echo = (SOAPElement)current;
+ }
+ }
+ nl = echo.getChildNodes();
+ SOAPElement arg0 = null;
+ for (int i = 0; i < nl.getLength() && arg0 == null; i++)
+ {
+ Object current = nl.item(i);
+ if (current instanceof SOAPElement)
+ {
+ arg0 = (SOAPElement)current;
+ }
+ }
+ String value = arg0.getTextContent();
+ assertEquals("Expected value", "123", value);
+
+ arg0.setTextContent("456");
+ value = arg0.getTextContent();
+ assertEquals("Expected value", "456", value);
+ }
+
/** Return the count of iterator elements, rendering the iterator unusable.
*/
private int getIteratorCount(Iterator i)
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/common/soap/jbws2693.xml (from rev 10271, stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/common/soap/jbws2693.xml)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/common/soap/jbws2693.xml (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/common/soap/jbws2693.xml 2009-07-01 10:56:25 UTC (rev 10272)
@@ -0,0 +1,8 @@
+<soapenv:Envelope xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/' xmlns:jbw='http://ws.jboss.org/jbws2693'>
+ <soapenv:Header/>
+ <soapenv:Body>
+ <jbw:echo>
+ <arg0>123</arg0>
+ </jbw:echo>
+ </soapenv:Body>
+</soapenv:Envelope>
\ No newline at end of file
14 years, 10 months
- 1
- 0