JBossWS SVN: r6014 - stack/native/trunk/src/test/resources.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-03-19 04:26:13 -0400 (Wed, 19 Mar 2008)
New Revision: 6014
Modified:
stack/native/trunk/src/test/resources/test-excludes-jboss500.txt
Log:
[JBAS-5114] MessageDriven EJB3 does not create destination automatically
Modified: stack/native/trunk/src/test/resources/test-excludes-jboss500.txt
===================================================================
--- stack/native/trunk/src/test/resources/test-excludes-jboss500.txt 2008-03-18 21:12:20 UTC (rev 6013)
+++ stack/native/trunk/src/test/resources/test-excludes-jboss500.txt 2008-03-19 08:26:13 UTC (rev 6014)
@@ -17,7 +17,7 @@
org/jboss/test/ws/jaxws/jbws1840/JBWS1840TestCase.*
# [JBAS-5114] MessageDriven EJB3 does not create destination automatically
-#org/jboss/test/ws/jaxws/samples/jmstransport/**
+org/jboss/test/ws/jaxws/samples/jmstransport/**
# [JBAS-5115] Valid jboss-app.xml file not recognized correctly by jbossxb runtime
org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.*
16 years, 3 months
JBossWS SVN: r6013 - framework/trunk/hudson/hudson-home.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-03-18 17:12:20 -0400 (Tue, 18 Mar 2008)
New Revision: 6013
Modified:
framework/trunk/hudson/hudson-home/config.xml
Log:
Metro/CXF are not available on AS421
Modified: framework/trunk/hudson/hudson-home/config.xml
===================================================================
--- framework/trunk/hudson/hudson-home/config.xml 2008-03-18 20:39:32 UTC (rev 6012)
+++ framework/trunk/hudson/hudson-home/config.xml 2008-03-18 21:12:20 UTC (rev 6013)
@@ -165,7 +165,7 @@
<table border=1>
<tr align=center><th>Target</th> <th>Core Tests</th> <th colspan=3>Distribution Tests</th> <th colspan=3>Integration Tests</th></tr>
<tr align=center><th> </th> <th> </th> <th>Native</th><th>Metro</th><th>CXF</th> <th>Native</th><th>Metro</th><th>CXF</th></tr>
-<tr align=center><th align=left>AS-4.2.1</th> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td></tr>
+<tr align=center><th align=left>AS-4.2.1</th> <td>ok</td> <td>ok</td> <td>N/A</td> <td>N/A</td> <td>ok</td> <td>N/A</td> <td>N/A</td></tr>
<tr align=center><th align=left>AS-4.2.2</th> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td></tr>
<tr align=center><th align=left>AS-4.2.3</th> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td></tr>
<tr align=center><th align=left>AS-5.0.0</th> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td> <td>ok</td></tr>
16 years, 3 months
JBossWS SVN: r6012 - in stack/native/trunk: src/main/resources and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-03-18 16:39:32 -0400 (Tue, 18 Mar 2008)
New Revision: 6012
Modified:
stack/native/trunk/src/main/resources/jbossws-native-config.xml
stack/native/trunk/version.properties
Log:
Restore EndpointRegistry with stack config.
Revert to jbossws-jboss42-4.2.1.GA since 4.2.3.CR1 breaks AS421 runs
Modified: stack/native/trunk/src/main/resources/jbossws-native-config.xml
===================================================================
--- stack/native/trunk/src/main/resources/jbossws-native-config.xml 2008-03-18 18:11:49 UTC (rev 6011)
+++ stack/native/trunk/src/main/resources/jbossws-native-config.xml 2008-03-18 20:39:32 UTC (rev 6012)
@@ -24,6 +24,11 @@
-->
</bean>
+ <!-- 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>
+ </bean>
+
<!-- A subscription manager for WS-Eventing -->
<bean name="WSSubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager">
<property name="bindAddress">${jboss.bind.address}</property>
Modified: stack/native/trunk/version.properties
===================================================================
--- stack/native/trunk/version.properties 2008-03-18 18:11:49 UTC (rev 6011)
+++ stack/native/trunk/version.properties 2008-03-18 20:39:32 UTC (rev 6012)
@@ -27,7 +27,7 @@
jbossws-spi=snapshot
jbossws-common=snapshot
jbossws-framework=snapshot
-jbossws-jboss42=4.2.3.CR1
+jbossws-jboss42=4.2.1.GA
# JBossAS-5.0
jboss-jbossxb-jboss50=2.0.0.CR5
16 years, 3 months
JBossWS SVN: r6011 - stack/cxf/trunk.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-03-18 14:11:49 -0400 (Tue, 18 Mar 2008)
New Revision: 6011
Modified:
stack/cxf/trunk/version.properties
Log:
Updating jbossws-jboss42 dependency
Modified: stack/cxf/trunk/version.properties
===================================================================
--- stack/cxf/trunk/version.properties 2008-03-18 18:10:57 UTC (rev 6010)
+++ stack/cxf/trunk/version.properties 2008-03-18 18:11:49 UTC (rev 6011)
@@ -35,7 +35,7 @@
jbossws-spi=1.0.1.GA
jbossws-common=snapshot
jbossws-framework=snapshot
-jbossws-jboss42=4.2.1.GA
+jbossws-jboss42=4.2.3.CR1
apache-xml-commons=1.2
ibm-wsdl4j=1.6.2
16 years, 3 months
JBossWS SVN: r6010 - stack/metro/trunk.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-03-18 14:10:57 -0400 (Tue, 18 Mar 2008)
New Revision: 6010
Modified:
stack/metro/trunk/version.properties
Log:
Updating jbossws-jboss42 dependency
Modified: stack/metro/trunk/version.properties
===================================================================
--- stack/metro/trunk/version.properties 2008-03-18 17:53:33 UTC (rev 6009)
+++ stack/metro/trunk/version.properties 2008-03-18 18:10:57 UTC (rev 6010)
@@ -17,7 +17,7 @@
jbossws-spi=snapshot
jbossws-common=snapshot
jbossws-framework=snapshot
-jbossws-jboss42=4.2.1.GA
+jbossws-jboss42=4.2.3.CR1
junit=3.8.1
jboss-common-core=2.0.2.GA
16 years, 3 months
JBossWS SVN: r6009 - in stack/metro/trunk: ant-import and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-03-18 13:53:33 -0400 (Tue, 18 Mar 2008)
New Revision: 6009
Removed:
stack/metro/trunk/src/main/resources/jbossws-jboss42-config.xml
Modified:
stack/metro/trunk/ant-import/build-thirdparty.xml
stack/metro/trunk/build.xml
Log:
Reverting changes to the build, 5995
Modified: stack/metro/trunk/ant-import/build-thirdparty.xml
===================================================================
--- stack/metro/trunk/ant-import/build-thirdparty.xml 2008-03-18 17:46:48 UTC (rev 6008)
+++ stack/metro/trunk/ant-import/build-thirdparty.xml 2008-03-18 17:53:33 UTC (rev 6009)
@@ -46,6 +46,7 @@
<get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework.jar" dest="${thirdparty.dir}/jbossws-framework.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework-scripts.zip" dest="${thirdparty.dir}/jbossws-framework-scripts.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar" dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true" verbose="true"/>
Modified: stack/metro/trunk/build.xml
===================================================================
--- stack/metro/trunk/build.xml 2008-03-18 17:46:48 UTC (rev 6008)
+++ stack/metro/trunk/build.xml 2008-03-18 17:53:33 UTC (rev 6009)
@@ -116,12 +116,13 @@
</concat>
<!-- Concat jboss-beans.xml -->
+ <unzip dest="${metro.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/>
<concat destfile="${metro.output.resources.dir}/jbossws-metro42-beans.xml">
<header trimleading="yes">
<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer">
</header>
<fileset file="${metro.resources.dir}/jbossws-metro-config.xml"/>
- <fileset file="${metro.resources.dir}/jbossws-jboss42-config.xml"/>
+ <fileset file="${metro.output.resources.dir}/jbossws-jboss42-config.xml"/>
<footer trimleading="yes">
</deployment>
</footer>
Deleted: stack/metro/trunk/src/main/resources/jbossws-jboss42-config.xml
===================================================================
--- stack/metro/trunk/src/main/resources/jbossws-jboss42-config.xml 2008-03-18 17:46:48 UTC (rev 6008)
+++ stack/metro/trunk/src/main/resources/jbossws-jboss42-config.xml 2008-03-18 17:53:33 UTC (rev 6009)
@@ -1,288 +0,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"/>
-
- <!-- The HTTPServer used by the JAXWS Endpoint API -->
- <bean name="WSHTTPServer" class="org.jboss.wsf.container.jboss42.DeploymentAspectHttpServer"/>
-
- <!-- Bind Service objects in client environment context -->
- <bean name="WSServiceRefHandler" class="org.jboss.wsf.container.jboss42.serviceref.ServiceRefHandlerImpl"/>
-
- <!-- JBoss_4_2_0_GA uses this hardcoded bean name -->
- <bean name="ServiceRefHandler" class="org.jboss.wsf.container.jboss42.serviceref.ServiceRefHandlerImpl"/>
-
- <!--
- *********************************************************************************************************************
- Web Service deployment
-
- There are three deployer interceptors registered with the JBoss Deployers.
-
- 1) DeployerInterceptorJSE
- 2) DeployerInterceptorEJB21
- 3) DeployerInterceptorEJB3
-
- Each interceptor has a number of DeployerHooks registerd with it
-
- Conceptually, each of these hooks implements the following pattern:
-
- DployerHook.deploy(unit)
- if(isWebServiceDeployment)
- Deployment dep = createDeployment(unit)
- DeploymentAspectManager.deploy(dep)
-
- DeployerHook.undeploy(unit)
- Deployment dep = getDeployment(unit)
- DeploymentAspectManager.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.
-
- *********************************************************************************************************************
- -->
-
- <!--
- Register DeployerHooks with JBoss deployers
- -->
-
- <!-- Phase 1 -->
- <bean name="WSDeployerHook_JAXRPC_PRE_JSE" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookPreJSE">
- <property name="deploymentManagerName">WSDeploymentAspectManagerPreJSE</property>
- <property name="phaseOneInterceptors">
- <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
- <value>jboss.ws:service=DeployerInterceptorJSE</value>
- </list>
- </property>
- </bean>
-
- <!-- Phase 2 -->
- <bean name="WSDeployerHook_JAXRPC_POST_JSE" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookPostJSE">
- <property name="deploymentManagerName">WSDeploymentAspectManagerPostJSE</property>
- <property name="phaseTwoInterceptors">
- <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
- <value>jboss.ws:service=DeployerInterceptorJSE</value>
- </list>
- </property>
- </bean>
-
- <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookEJB21">
- <property name="deploymentManagerName">WSDeploymentAspectManagerEJB</property>
- <property name="phaseTwoInterceptors">
- <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
- <value>jboss.ws:service=DeployerInterceptorEJB21</value>
- </list>
- </property>
- </bean>
-
- <!-- Phase 1 -->
- <bean name="WSDeployerHook_JAXWS_PRE_JSE" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookPreJSE">
- <property name="deploymentManagerName">WSDeploymentAspectManagerPreJSE</property>
- <property name="phaseOneInterceptors">
- <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
- <value>jboss.ws:service=DeployerInterceptorJSE</value>
- </list>
- </property>
- </bean>
-
- <!-- Phase 2 -->
- <bean name="WSDeployerHook_JAXWS_POST_JSE" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookPostJSE">
- <property name="deploymentManagerName">WSDeploymentAspectManagerPostJSE</property>
- <property name="phaseTwoInterceptors">
- <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
- <value>jboss.ws:service=DeployerInterceptorJSE</value>
- </list>
- </property>
- </bean>
-
- <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookEJB3">
- <property name="deploymentManagerName">WSDeploymentAspectManagerEJB</property>
- <property name="phaseTwoInterceptors">
- <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
- <value>jboss.ws:service=DeployerInterceptorEJB3</value>
- </list>
- </property>
- </bean>
-
- <!--
- Each DeploymentAspectManger maintains a list of DeploymentAspects
- -->
- <bean name="WSDeploymentAspectManagerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl">
- <property name="name">WSDeploymentAspectManagerPreJSE</property>
- </bean>
- <bean name="WSDeploymentAspectManagerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl">
- <property name="parent"><inject bean="WSDeploymentAspectManagerPreJSE"/></property>
- <property name="name">WSDeploymentAspectManagerPostJSE</property>
- </bean>
- <bean name="WSDeploymentAspectManagerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl">
- <property name="name">WSDeploymentAspectManagerEJB</property>
- </bean>
- <bean name="WSDeploymentAspectManagerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl">
- <property name="name">WSDeploymentAspectManagerEndpointAPI</property>
- </bean>
-
- <!--
- The container deployment aspects
- -->
- <bean name="WSContainerMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss42.ContainerMetaDataDeploymentAspect">
- <property name="provides">ContainerMetaData, VFSRoot</property>
- <property name="metaDataAdapter"><inject bean="WSContainerMetaDataAdapter"/></property>
- </bean>
-
- <bean name="WSContextRootDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleContextRootDeploymentAspect">
- <property name="requires">ContainerMetaData</property>
- <property name="provides">ContextRoot</property>
- </bean>
-
- <bean name="WSEndpointAPIDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAPIDeploymentAspect">
- <property name="provides">ContainerMetaData, RuntimeLoader, URLPattern, VFSRoot</property>
- </bean>
-
- <bean name="WSEndpointAddressDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAddressDeploymentAspect">
- <property name="requires">URLPattern</property>
- <property name="provides">EndpointAddress</property>
- </bean>
-
- <bean name="WSEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
- <property name="requires">ContainerMetaData</property>
- <property name="provides">ContainerEndpointHandler</property>
- </bean>
-
- <bean name="WSEndpointLifecycleDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointLifecycleDeploymentAspect">
- <property name="requires">LAST_DEPLOYMENT_ASPECT</property>
- </bean>
-
- <bean name="WSEndpointMetricsDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointMetricsDeploymentAspect">
- <property name="provides">EndpointMetrics</property>
- </bean>
-
- <bean name="WSEndpointNameDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointNameDeploymentAspect">
- <property name="requires">URLPattern</property>
- <property name="provides">EndpointName</property>
- </bean>
-
- <bean name="WSEndpointRegistryDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRegistryDeploymentAspect">
- <property name="requires">EndpointName</property>
- <property name="provides">RegisteredEndpoint</property>
- </bean>
-
- <bean name="WSModifyWebMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss42.ModifyWebMetaDataDeploymentAspect">
- <property name="requires">ContextProperties, ContainerMetaData, StackDescriptor</property>
- <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property>
- </bean>
-
- <bean name="WSRuntimeLoaderDeploymentAspect" class="org.jboss.wsf.container.jboss42.RuntimeLoaderDeploymentAspect">
- <property name="requires">ContainerMetaData</property>
- <property name="provides">RuntimeLoader</property>
- </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="WSWebAppDeploymentAspect" class="org.jboss.wsf.container.jboss42.WebAppDeploymentAspect">
- <property name="requires">WebMetaData, ContextProperties</property>
- <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property>
- </bean>
-
- <bean name="WSWebAppGeneratorDeploymentAspect" class="org.jboss.wsf.framework.deployment.WebAppGeneratorDeploymentAspect">
- <property name="requires">URLPattern</property>
- <property name="provides">WebMetaData</property>
- <property name="securityHandlerEJB21"><inject bean="WSSecurityHandlerEJB21"/></property>
- <property name="securityHandlerEJB3"><inject bean="WSSecurityHandlerEJB3"/></property>
- </bean>
-
- <!-- Deployment aspect helper beans -->
- <bean name="WSApplicationMetaDataAdapterEJB21" class="org.jboss.wsf.container.jboss42.EJBArchiveMetaDataAdapterEJB21"/>
- <bean name="WSApplicationMetaDataAdapterEJB3" class="org.jboss.wsf.container.jboss42.EJBArchiveMetaDataAdapterEJB3"/>
- <bean name="WSContainerMetaDataAdapter" class="org.jboss.wsf.container.jboss42.ContainerMetaDataAdapter">
- <property name="applicationMetaDataAdapterEJB21"><inject bean="WSApplicationMetaDataAdapterEJB21"/></property>
- <property name="applicationMetaDataAdapterEJB3"><inject bean="WSApplicationMetaDataAdapterEJB3"/></property>
- <property name="webMetaDataAdapter"><inject bean="WSWebMetaDataAdapter"/></property>
- </bean>
- <bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB21"/>
- <bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB3"/>
- <bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.container.jboss42.DefaultWebAppDesciptorModifierImpl"/>
- <bean name="WSWebMetaDataAdapter" class="org.jboss.wsf.container.jboss42.JSEArchiveMetaDataAdapter"/>
- <bean name="WSWebXMLRewriter" class="org.jboss.wsf.container.jboss42.WebXMLRewriterImpl">
- <property name="desciptorModifier"><inject bean="WSWebAppDesciptorModifier"/></property>
- </bean>
-
- <!-- Deployment aspect installers -->
- <!-- Phase 1 -->
- <bean name="WSDeploymentAspectInstallerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManagerPreJSE"/></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="WSContextRootDeploymentAspect"/>
- <inject bean="WSEndpointAddressDeploymentAspect"/>
- <inject bean="WSEndpointHandlerDeploymentAspect"/>
- <inject bean="WSEndpointMetricsDeploymentAspect"/>
- <inject bean="WSEndpointNameDeploymentAspect"/>
- <inject bean="WSEndpointRegistryDeploymentAspect"/>
- <inject bean="WSModifyWebMetaDataDeploymentAspect"/>
- <inject bean="WSURLPatternDeploymentAspect"/>
- </set>
- </property>
- </bean>
-
- <!-- Phase 2 -->
- <bean name="WSDeploymentAspectInstallerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManagerPostJSE"/></property>
- <property name="sortAspectsOnCreate">false</property>
- <property name="aspects">
- <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
- <inject bean="WSEndpointLifecycleDeploymentAspect"/>
- <inject bean="WSRuntimeLoaderDeploymentAspect"/>
- </set>
- </property>
- <depends>WSDeploymentAspectInstallerPreJSE</depends>
- </bean>
-
- <bean name="WSDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></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="WSContextRootDeploymentAspect"/>
- <inject bean="WSEndpointAddressDeploymentAspect"/>
- <inject bean="WSEndpointHandlerDeploymentAspect"/>
- <inject bean="WSEndpointLifecycleDeploymentAspect"/>
- <inject bean="WSEndpointMetricsDeploymentAspect"/>
- <inject bean="WSEndpointNameDeploymentAspect"/>
- <inject bean="WSEndpointRegistryDeploymentAspect"/>
- <inject bean="WSRuntimeLoaderDeploymentAspect"/>
- <inject bean="WSURLPatternDeploymentAspect"/>
- <inject bean="WSWebAppDeploymentAspect"/>
- <inject bean="WSWebAppGeneratorDeploymentAspect"/>
- </set>
- </property>
- </bean>
-
- <bean name="WSDeploymentAspectInstallerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManagerEndpointAPI"/></property>
- <property name="sortAspectsOnCreate">false</property>
- <property name="aspects">
- <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
- <inject bean="WSEndpointAPIDeploymentAspect"/>
- <inject bean="WSEndpointAddressDeploymentAspect"/>
- <inject bean="WSEndpointHandlerDeploymentAspect"/>
- <inject bean="WSEndpointLifecycleDeploymentAspect"/>
- <inject bean="WSEndpointMetricsDeploymentAspect"/>
- <inject bean="WSEndpointNameDeploymentAspect"/>
- <inject bean="WSEndpointRegistryDeploymentAspect"/>
- <inject bean="WSWebAppDeploymentAspect"/>
- <inject bean="WSWebAppGeneratorDeploymentAspect"/>
- </set>
- </property>
- </bean>
16 years, 3 months
JBossWS SVN: r6008 - in stack/cxf/trunk: ant-import and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-03-18 13:46:48 -0400 (Tue, 18 Mar 2008)
New Revision: 6008
Removed:
stack/cxf/trunk/src/main/resources/jbossws-jboss42-config.xml
Modified:
stack/cxf/trunk/ant-import/build-thirdparty.xml
stack/cxf/trunk/build.xml
Log:
Reverting changes to the build, 5996
Modified: stack/cxf/trunk/ant-import/build-thirdparty.xml
===================================================================
--- stack/cxf/trunk/ant-import/build-thirdparty.xml 2008-03-18 17:37:59 UTC (rev 6007)
+++ stack/cxf/trunk/ant-import/build-thirdparty.xml 2008-03-18 17:46:48 UTC (rev 6008)
@@ -54,6 +54,7 @@
<get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework-scripts.zip" dest="${thirdparty.dir}/jbossws-framework-scripts.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi-src.zip" dest="${thirdparty.dir}/jbossws-spi-src.zip" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/apache-xml-commons/${apache-xml-commons}/lib/resolver.jar" dest="${thirdparty.dir}/resolver.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/>
Modified: stack/cxf/trunk/build.xml
===================================================================
--- stack/cxf/trunk/build.xml 2008-03-18 17:37:59 UTC (rev 6007)
+++ stack/cxf/trunk/build.xml 2008-03-18 17:46:48 UTC (rev 6008)
@@ -114,12 +114,13 @@
</concat>
<!-- Concat jboss-beans.xml -->
+ <unzip dest="${cxf.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/>
<concat destfile="${cxf.output.resources.dir}/jbossws-cxf42-beans.xml">
<header trimleading="yes">
<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer">
</header>
<fileset file="${cxf.resources.dir}/jbossws-cxf-config.xml"/>
- <fileset file="${cxf.resources.dir}/jbossws-jboss42-config.xml"/>
+ <fileset file="${cxf.output.resources.dir}/jbossws-jboss42-config.xml"/>
<footer trimleading="yes">
</deployment>
</footer>
Deleted: stack/cxf/trunk/src/main/resources/jbossws-jboss42-config.xml
===================================================================
--- stack/cxf/trunk/src/main/resources/jbossws-jboss42-config.xml 2008-03-18 17:37:59 UTC (rev 6007)
+++ stack/cxf/trunk/src/main/resources/jbossws-jboss42-config.xml 2008-03-18 17:46:48 UTC (rev 6008)
@@ -1,288 +0,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"/>
-
- <!-- The HTTPServer used by the JAXWS Endpoint API -->
- <bean name="WSHTTPServer" class="org.jboss.wsf.container.jboss42.DeploymentAspectHttpServer"/>
-
- <!-- Bind Service objects in client environment context -->
- <bean name="WSServiceRefHandler" class="org.jboss.wsf.container.jboss42.serviceref.ServiceRefHandlerImpl"/>
-
- <!-- JBoss_4_2_0_GA uses this hardcoded bean name -->
- <bean name="ServiceRefHandler" class="org.jboss.wsf.container.jboss42.serviceref.ServiceRefHandlerImpl"/>
-
- <!--
- *********************************************************************************************************************
- Web Service deployment
-
- There are three deployer interceptors registered with the JBoss Deployers.
-
- 1) DeployerInterceptorJSE
- 2) DeployerInterceptorEJB21
- 3) DeployerInterceptorEJB3
-
- Each interceptor has a number of DeployerHooks registerd with it
-
- Conceptually, each of these hooks implements the following pattern:
-
- DployerHook.deploy(unit)
- if(isWebServiceDeployment)
- Deployment dep = createDeployment(unit)
- DeploymentAspectManager.deploy(dep)
-
- DeployerHook.undeploy(unit)
- Deployment dep = getDeployment(unit)
- DeploymentAspectManager.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.
-
- *********************************************************************************************************************
- -->
-
- <!--
- Register DeployerHooks with JBoss deployers
- -->
-
- <!-- Phase 1 -->
- <bean name="WSDeployerHook_JAXRPC_PRE_JSE" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookPreJSE">
- <property name="deploymentManagerName">WSDeploymentAspectManagerPreJSE</property>
- <property name="phaseOneInterceptors">
- <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
- <value>jboss.ws:service=DeployerInterceptorJSE</value>
- </list>
- </property>
- </bean>
-
- <!-- Phase 2 -->
- <bean name="WSDeployerHook_JAXRPC_POST_JSE" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookPostJSE">
- <property name="deploymentManagerName">WSDeploymentAspectManagerPostJSE</property>
- <property name="phaseTwoInterceptors">
- <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
- <value>jboss.ws:service=DeployerInterceptorJSE</value>
- </list>
- </property>
- </bean>
-
- <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookEJB21">
- <property name="deploymentManagerName">WSDeploymentAspectManagerEJB</property>
- <property name="phaseTwoInterceptors">
- <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
- <value>jboss.ws:service=DeployerInterceptorEJB21</value>
- </list>
- </property>
- </bean>
-
- <!-- Phase 1 -->
- <bean name="WSDeployerHook_JAXWS_PRE_JSE" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookPreJSE">
- <property name="deploymentManagerName">WSDeploymentAspectManagerPreJSE</property>
- <property name="phaseOneInterceptors">
- <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
- <value>jboss.ws:service=DeployerInterceptorJSE</value>
- </list>
- </property>
- </bean>
-
- <!-- Phase 2 -->
- <bean name="WSDeployerHook_JAXWS_POST_JSE" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookPostJSE">
- <property name="deploymentManagerName">WSDeploymentAspectManagerPostJSE</property>
- <property name="phaseTwoInterceptors">
- <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
- <value>jboss.ws:service=DeployerInterceptorJSE</value>
- </list>
- </property>
- </bean>
-
- <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookEJB3">
- <property name="deploymentManagerName">WSDeploymentAspectManagerEJB</property>
- <property name="phaseTwoInterceptors">
- <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
- <value>jboss.ws:service=DeployerInterceptorEJB3</value>
- </list>
- </property>
- </bean>
-
- <!--
- Each DeploymentAspectManger maintains a list of DeploymentAspects
- -->
- <bean name="WSDeploymentAspectManagerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl">
- <property name="name">WSDeploymentAspectManagerPreJSE</property>
- </bean>
- <bean name="WSDeploymentAspectManagerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl">
- <property name="parent"><inject bean="WSDeploymentAspectManagerPreJSE"/></property>
- <property name="name">WSDeploymentAspectManagerPostJSE</property>
- </bean>
- <bean name="WSDeploymentAspectManagerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl">
- <property name="name">WSDeploymentAspectManagerEJB</property>
- </bean>
- <bean name="WSDeploymentAspectManagerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl">
- <property name="name">WSDeploymentAspectManagerEndpointAPI</property>
- </bean>
-
- <!--
- The container deployment aspects
- -->
- <bean name="WSContainerMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss42.ContainerMetaDataDeploymentAspect">
- <property name="provides">ContainerMetaData, VFSRoot</property>
- <property name="metaDataAdapter"><inject bean="WSContainerMetaDataAdapter"/></property>
- </bean>
-
- <bean name="WSContextRootDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleContextRootDeploymentAspect">
- <property name="requires">ContainerMetaData</property>
- <property name="provides">ContextRoot</property>
- </bean>
-
- <bean name="WSEndpointAPIDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAPIDeploymentAspect">
- <property name="provides">ContainerMetaData, RuntimeLoader, URLPattern, VFSRoot</property>
- </bean>
-
- <bean name="WSEndpointAddressDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAddressDeploymentAspect">
- <property name="requires">URLPattern</property>
- <property name="provides">EndpointAddress</property>
- </bean>
-
- <bean name="WSEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
- <property name="requires">ContainerMetaData</property>
- <property name="provides">ContainerEndpointHandler</property>
- </bean>
-
- <bean name="WSEndpointLifecycleDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointLifecycleDeploymentAspect">
- <property name="requires">LAST_DEPLOYMENT_ASPECT</property>
- </bean>
-
- <bean name="WSEndpointMetricsDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointMetricsDeploymentAspect">
- <property name="provides">EndpointMetrics</property>
- </bean>
-
- <bean name="WSEndpointNameDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointNameDeploymentAspect">
- <property name="requires">URLPattern</property>
- <property name="provides">EndpointName</property>
- </bean>
-
- <bean name="WSEndpointRegistryDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRegistryDeploymentAspect">
- <property name="requires">EndpointName</property>
- <property name="provides">RegisteredEndpoint</property>
- </bean>
-
- <bean name="WSModifyWebMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss42.ModifyWebMetaDataDeploymentAspect">
- <property name="requires">ContextProperties, ContainerMetaData, StackDescriptor</property>
- <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property>
- </bean>
-
- <bean name="WSRuntimeLoaderDeploymentAspect" class="org.jboss.wsf.container.jboss42.RuntimeLoaderDeploymentAspect">
- <property name="requires">ContainerMetaData</property>
- <property name="provides">RuntimeLoader</property>
- </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="WSWebAppDeploymentAspect" class="org.jboss.wsf.container.jboss42.WebAppDeploymentAspect">
- <property name="requires">WebMetaData, ContextProperties</property>
- <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property>
- </bean>
-
- <bean name="WSWebAppGeneratorDeploymentAspect" class="org.jboss.wsf.framework.deployment.WebAppGeneratorDeploymentAspect">
- <property name="requires">URLPattern</property>
- <property name="provides">WebMetaData</property>
- <property name="securityHandlerEJB21"><inject bean="WSSecurityHandlerEJB21"/></property>
- <property name="securityHandlerEJB3"><inject bean="WSSecurityHandlerEJB3"/></property>
- </bean>
-
- <!-- Deployment aspect helper beans -->
- <bean name="WSApplicationMetaDataAdapterEJB21" class="org.jboss.wsf.container.jboss42.EJBArchiveMetaDataAdapterEJB21"/>
- <bean name="WSApplicationMetaDataAdapterEJB3" class="org.jboss.wsf.container.jboss42.EJBArchiveMetaDataAdapterEJB3"/>
- <bean name="WSContainerMetaDataAdapter" class="org.jboss.wsf.container.jboss42.ContainerMetaDataAdapter">
- <property name="applicationMetaDataAdapterEJB21"><inject bean="WSApplicationMetaDataAdapterEJB21"/></property>
- <property name="applicationMetaDataAdapterEJB3"><inject bean="WSApplicationMetaDataAdapterEJB3"/></property>
- <property name="webMetaDataAdapter"><inject bean="WSWebMetaDataAdapter"/></property>
- </bean>
- <bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB21"/>
- <bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB3"/>
- <bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.container.jboss42.DefaultWebAppDesciptorModifierImpl"/>
- <bean name="WSWebMetaDataAdapter" class="org.jboss.wsf.container.jboss42.JSEArchiveMetaDataAdapter"/>
- <bean name="WSWebXMLRewriter" class="org.jboss.wsf.container.jboss42.WebXMLRewriterImpl">
- <property name="desciptorModifier"><inject bean="WSWebAppDesciptorModifier"/></property>
- </bean>
-
- <!-- Deployment aspect installers -->
- <!-- Phase 1 -->
- <bean name="WSDeploymentAspectInstallerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManagerPreJSE"/></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="WSContextRootDeploymentAspect"/>
- <inject bean="WSEndpointAddressDeploymentAspect"/>
- <inject bean="WSEndpointHandlerDeploymentAspect"/>
- <inject bean="WSEndpointMetricsDeploymentAspect"/>
- <inject bean="WSEndpointNameDeploymentAspect"/>
- <inject bean="WSEndpointRegistryDeploymentAspect"/>
- <inject bean="WSModifyWebMetaDataDeploymentAspect"/>
- <inject bean="WSURLPatternDeploymentAspect"/>
- </set>
- </property>
- </bean>
-
- <!-- Phase 2 -->
- <bean name="WSDeploymentAspectInstallerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManagerPostJSE"/></property>
- <property name="sortAspectsOnCreate">false</property>
- <property name="aspects">
- <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
- <inject bean="WSEndpointLifecycleDeploymentAspect"/>
- <inject bean="WSRuntimeLoaderDeploymentAspect"/>
- </set>
- </property>
- <depends>WSDeploymentAspectInstallerPreJSE</depends>
- </bean>
-
- <bean name="WSDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></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="WSContextRootDeploymentAspect"/>
- <inject bean="WSEndpointAddressDeploymentAspect"/>
- <inject bean="WSEndpointHandlerDeploymentAspect"/>
- <inject bean="WSEndpointLifecycleDeploymentAspect"/>
- <inject bean="WSEndpointMetricsDeploymentAspect"/>
- <inject bean="WSEndpointNameDeploymentAspect"/>
- <inject bean="WSEndpointRegistryDeploymentAspect"/>
- <inject bean="WSRuntimeLoaderDeploymentAspect"/>
- <inject bean="WSURLPatternDeploymentAspect"/>
- <inject bean="WSWebAppDeploymentAspect"/>
- <inject bean="WSWebAppGeneratorDeploymentAspect"/>
- </set>
- </property>
- </bean>
-
- <bean name="WSDeploymentAspectInstallerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManagerEndpointAPI"/></property>
- <property name="sortAspectsOnCreate">false</property>
- <property name="aspects">
- <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
- <inject bean="WSEndpointAPIDeploymentAspect"/>
- <inject bean="WSEndpointAddressDeploymentAspect"/>
- <inject bean="WSEndpointHandlerDeploymentAspect"/>
- <inject bean="WSEndpointLifecycleDeploymentAspect"/>
- <inject bean="WSEndpointMetricsDeploymentAspect"/>
- <inject bean="WSEndpointNameDeploymentAspect"/>
- <inject bean="WSEndpointRegistryDeploymentAspect"/>
- <inject bean="WSWebAppDeploymentAspect"/>
- <inject bean="WSWebAppGeneratorDeploymentAspect"/>
- </set>
- </property>
- </bean>
16 years, 3 months
JBossWS SVN: r6007 - stack/native/trunk.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-03-18 13:37:59 -0400 (Tue, 18 Mar 2008)
New Revision: 6007
Modified:
stack/native/trunk/version.properties
Log:
Updating jbossws-jboss42 dependency
Modified: stack/native/trunk/version.properties
===================================================================
--- stack/native/trunk/version.properties 2008-03-18 17:35:32 UTC (rev 6006)
+++ stack/native/trunk/version.properties 2008-03-18 17:37:59 UTC (rev 6007)
@@ -27,7 +27,7 @@
jbossws-spi=snapshot
jbossws-common=snapshot
jbossws-framework=snapshot
-jbossws-jboss42=4.2.1.GA
+jbossws-jboss42=4.2.3.CR1
# JBossAS-5.0
jboss-jbossxb-jboss50=2.0.0.CR5
16 years, 3 months
JBossWS SVN: r6006 - in stack/native/trunk: ant-import and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-03-18 13:35:32 -0400 (Tue, 18 Mar 2008)
New Revision: 6006
Removed:
stack/native/trunk/src/main/resources/jbossws-jboss42-config.xml
stack/native/trunk/src/main/resources/jbossws-jboss42.jar/
stack/native/trunk/src/main/resources/jbossws-jboss42.sar/
Modified:
stack/native/trunk/ant-import/build-thirdparty.xml
stack/native/trunk/build.xml
Log:
Reverting changes to the build (6002 and 5994)
Modified: stack/native/trunk/ant-import/build-thirdparty.xml
===================================================================
--- stack/native/trunk/ant-import/build-thirdparty.xml 2008-03-18 17:18:17 UTC (rev 6005)
+++ stack/native/trunk/ant-import/build-thirdparty.xml 2008-03-18 17:35:32 UTC (rev 6006)
@@ -63,6 +63,7 @@
<get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi-src.zip" dest="${thirdparty.dir}/jbossws-spi-src.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42.jar" dest="${thirdparty.dir}/jbossws-jboss421.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-src.zip" dest="${thirdparty.dir}/jbossws-jboss421-src.zip" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/apache-ant/${apache-ant}/lib/ant.jar" dest="${thirdparty.dir}/ant.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/apache-collections/${apache-collections}/lib/commons-collections.jar" dest="${thirdparty.dir}/commons-collections.jar" usetimestamp="true" verbose="true"/>
Modified: stack/native/trunk/build.xml
===================================================================
--- stack/native/trunk/build.xml 2008-03-18 17:18:17 UTC (rev 6005)
+++ stack/native/trunk/build.xml 2008-03-18 17:35:32 UTC (rev 6006)
@@ -195,12 +195,13 @@
</concat>
<!-- Concat jboss-beans.xml -->
+ <unzip dest="${core.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/>
<concat destfile="${core.output.resources.dir}/jbossws-native42-beans.xml">
<header trimleading="yes">
<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer">
</header>
<fileset file="${core.resources.dir}/jbossws-native-config.xml"/>
- <fileset file="${core.resources.dir}/jbossws-jboss42-config.xml"/>
+ <fileset file="${core.output.resources.dir}/jbossws-jboss42-config.xml"/>
<footer trimleading="yes">
</deployment>
</footer>
@@ -210,10 +211,6 @@
<fileset dir="${core.resources.dir}/standard-config">
<include name="standard-*-config.xml"/>
</fileset>
- <fileset dir="${core.resources.dir}">
- <include name="jbossws-jboss42.jar/**"/>
- <include name="jbossws-jboss42.sar/**"/>
- </fileset>
</copy>
</target>
Deleted: stack/native/trunk/src/main/resources/jbossws-jboss42-config.xml
===================================================================
--- stack/native/trunk/src/main/resources/jbossws-jboss42-config.xml 2008-03-18 17:18:17 UTC (rev 6005)
+++ stack/native/trunk/src/main/resources/jbossws-jboss42-config.xml 2008-03-18 17:35:32 UTC (rev 6006)
@@ -1,294 +0,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"/>
-
- <!-- The HTTPServer used by the JAXWS Endpoint API -->
- <bean name="WSHTTPServer" class="org.jboss.wsf.container.jboss42.DeploymentAspectHttpServer"/>
-
- <!-- Bind Service objects in client environment context -->
- <bean name="WSServiceRefHandler" class="org.jboss.wsf.container.jboss42.serviceref.ServiceRefHandlerImpl"/>
-
- <!-- JBoss_4_2_0_GA uses this hardcoded bean name -->
- <bean name="ServiceRefHandler" class="org.jboss.wsf.container.jboss42.serviceref.ServiceRefHandlerImpl"/>
-
- <!--
- *********************************************************************************************************************
- Web Service deployment
-
- There are three deployer interceptors registered with the JBoss Deployers.
-
- 1) DeployerInterceptorJSE
- 2) DeployerInterceptorEJB21
- 3) DeployerInterceptorEJB3
-
- Each interceptor has a number of DeployerHooks registerd with it
-
- Conceptually, each of these hooks implements the following pattern:
-
- DployerHook.deploy(unit)
- if(isWebServiceDeployment)
- Deployment dep = createDeployment(unit)
- DeploymentAspectManager.deploy(dep)
-
- DeployerHook.undeploy(unit)
- Deployment dep = getDeployment(unit)
- DeploymentAspectManager.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.
-
- *********************************************************************************************************************
- -->
-
- <!--
- Register DeployerHooks with JBoss deployers
- -->
-
- <!-- Phase 1 -->
- <bean name="WSDeployerHook_JAXRPC_PRE_JSE" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookPreJSE">
- <property name="deploymentManagerName">WSDeploymentAspectManagerPreJSE</property>
- <property name="phaseOneInterceptors">
- <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
- <value>jboss.ws:service=DeployerInterceptorJSE</value>
- </list>
- </property>
- </bean>
-
- <!-- Phase 2 -->
- <bean name="WSDeployerHook_JAXRPC_POST_JSE" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookPostJSE">
- <property name="deploymentManagerName">WSDeploymentAspectManagerPostJSE</property>
- <property name="phaseTwoInterceptors">
- <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
- <value>jboss.ws:service=DeployerInterceptorJSE</value>
- </list>
- </property>
- </bean>
-
- <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookEJB21">
- <property name="deploymentManagerName">WSDeploymentAspectManagerEJB</property>
- <property name="phaseTwoInterceptors">
- <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
- <value>jboss.ws:service=DeployerInterceptorEJB21</value>
- </list>
- </property>
- </bean>
-
- <!-- Phase 1 -->
- <bean name="WSDeployerHook_JAXWS_PRE_JSE" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookPreJSE">
- <property name="deploymentManagerName">WSDeploymentAspectManagerPreJSE</property>
- <property name="phaseOneInterceptors">
- <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
- <value>jboss.ws:service=DeployerInterceptorJSE</value>
- </list>
- </property>
- </bean>
-
- <!-- Phase 2 -->
- <bean name="WSDeployerHook_JAXWS_POST_JSE" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookPostJSE">
- <property name="deploymentManagerName">WSDeploymentAspectManagerPostJSE</property>
- <property name="phaseTwoInterceptors">
- <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
- <value>jboss.ws:service=DeployerInterceptorJSE</value>
- </list>
- </property>
- </bean>
-
- <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookEJB3">
- <property name="deploymentManagerName">WSDeploymentAspectManagerEJB</property>
- <property name="phaseTwoInterceptors">
- <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
- <value>jboss.ws:service=DeployerInterceptorEJB3</value>
- </list>
- </property>
- </bean>
-
- <!--
- Each DeploymentAspectManger maintains a list of DeploymentAspects
- -->
- <bean name="WSDeploymentAspectManagerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl">
- <property name="name">WSDeploymentAspectManagerPreJSE</property>
- </bean>
- <bean name="WSDeploymentAspectManagerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl">
- <property name="parent"><inject bean="WSDeploymentAspectManagerPreJSE"/></property>
- <property name="name">WSDeploymentAspectManagerPostJSE</property>
- </bean>
- <bean name="WSDeploymentAspectManagerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl">
- <property name="name">WSDeploymentAspectManagerEJB</property>
- </bean>
- <bean name="WSDeploymentAspectManagerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl">
- <property name="name">WSDeploymentAspectManagerEndpointAPI</property>
- </bean>
-
- <!--
- The container deployment aspects
- -->
- <bean name="WSContainerMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss42.ContainerMetaDataDeploymentAspect">
- <property name="provides">ContainerMetaData, VFSRoot</property>
- <property name="metaDataAdapter"><inject bean="WSContainerMetaDataAdapter"/></property>
- </bean>
-
- <bean name="WSContextRootDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleContextRootDeploymentAspect">
- <property name="requires">ContainerMetaData</property>
- <property name="provides">ContextRoot</property>
- </bean>
-
- <bean name="WSEndpointAPIDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAPIDeploymentAspect">
- <property name="provides">ContainerMetaData, RuntimeLoader, URLPattern, VFSRoot</property>
- </bean>
-
- <bean name="WSEndpointAddressDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAddressDeploymentAspect">
- <property name="requires">URLPattern</property>
- <property name="provides">EndpointAddress</property>
- </bean>
-
- <bean name="WSEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
- <property name="requires">ContainerMetaData</property>
- <property name="provides">ContainerEndpointHandler</property>
- </bean>
-
- <bean name="WSEndpointLifecycleDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointLifecycleDeploymentAspect">
- <property name="requires">LAST_DEPLOYMENT_ASPECT</property>
- </bean>
-
- <bean name="WSEndpointMetricsDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointMetricsDeploymentAspect">
- <property name="provides">EndpointMetrics</property>
- </bean>
-
- <bean name="WSEndpointNameDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointNameDeploymentAspect">
- <property name="requires">URLPattern</property>
- <property name="provides">EndpointName</property>
- </bean>
-
- <bean name="WSEndpointRegistryDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRegistryDeploymentAspect">
- <property name="requires">EndpointName</property>
- <property name="provides">RegisteredEndpoint</property>
- <depends>WSEndpointRegistry</depends>
- </bean>
-
- <bean name="WSModifyWebMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss42.ModifyWebMetaDataDeploymentAspect">
- <property name="requires">ContextProperties, ContainerMetaData, StackDescriptor</property>
- <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property>
- </bean>
-
- <bean name="WSRuntimeLoaderDeploymentAspect" class="org.jboss.wsf.container.jboss42.RuntimeLoaderDeploymentAspect">
- <property name="requires">ContainerMetaData</property>
- <property name="provides">RuntimeLoader</property>
- </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="WSWebAppDeploymentAspect" class="org.jboss.wsf.container.jboss42.WebAppDeploymentAspect">
- <property name="requires">WebMetaData, ContextProperties</property>
- <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property>
- </bean>
-
- <bean name="WSWebAppGeneratorDeploymentAspect" class="org.jboss.wsf.framework.deployment.WebAppGeneratorDeploymentAspect">
- <property name="requires">URLPattern</property>
- <property name="provides">WebMetaData</property>
- <property name="securityHandlerEJB21"><inject bean="WSSecurityHandlerEJB21"/></property>
- <property name="securityHandlerEJB3"><inject bean="WSSecurityHandlerEJB3"/></property>
- </bean>
-
- <!-- Deployment aspect helper beans -->
- <bean name="WSApplicationMetaDataAdapterEJB21" class="org.jboss.wsf.container.jboss42.EJBArchiveMetaDataAdapterEJB21"/>
- <bean name="WSApplicationMetaDataAdapterEJB3" class="org.jboss.wsf.container.jboss42.EJBArchiveMetaDataAdapterEJB3"/>
- <bean name="WSContainerMetaDataAdapter" class="org.jboss.wsf.container.jboss42.ContainerMetaDataAdapter">
- <property name="applicationMetaDataAdapterEJB21"><inject bean="WSApplicationMetaDataAdapterEJB21"/></property>
- <property name="applicationMetaDataAdapterEJB3"><inject bean="WSApplicationMetaDataAdapterEJB3"/></property>
- <property name="webMetaDataAdapter"><inject bean="WSWebMetaDataAdapter"/></property>
- </bean>
- <bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB21"/>
- <bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB3"/>
- <bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.container.jboss42.DefaultWebAppDesciptorModifierImpl"/>
- <bean name="WSWebMetaDataAdapter" class="org.jboss.wsf.container.jboss42.JSEArchiveMetaDataAdapter"/>
- <bean name="WSWebXMLRewriter" class="org.jboss.wsf.container.jboss42.WebXMLRewriterImpl">
- <property name="desciptorModifier"><inject bean="WSWebAppDesciptorModifier"/></property>
- </bean>
-
- <!-- 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>
- </bean>
-
- <!-- Deployment aspect installers -->
- <!-- Phase 1 -->
- <bean name="WSDeploymentAspectInstallerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManagerPreJSE"/></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="WSContextRootDeploymentAspect"/>
- <inject bean="WSEndpointAddressDeploymentAspect"/>
- <inject bean="WSEndpointHandlerDeploymentAspect"/>
- <inject bean="WSEndpointMetricsDeploymentAspect"/>
- <inject bean="WSEndpointNameDeploymentAspect"/>
- <inject bean="WSEndpointRegistryDeploymentAspect"/>
- <inject bean="WSModifyWebMetaDataDeploymentAspect"/>
- <inject bean="WSURLPatternDeploymentAspect"/>
- </set>
- </property>
- </bean>
-
- <!-- Phase 2 -->
- <bean name="WSDeploymentAspectInstallerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManagerPostJSE"/></property>
- <property name="sortAspectsOnCreate">false</property>
- <property name="aspects">
- <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
- <inject bean="WSEndpointLifecycleDeploymentAspect"/>
- <inject bean="WSRuntimeLoaderDeploymentAspect"/>
- </set>
- </property>
- <depends>WSDeploymentAspectInstallerPreJSE</depends>
- </bean>
-
- <bean name="WSDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></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="WSContextRootDeploymentAspect"/>
- <inject bean="WSEndpointAddressDeploymentAspect"/>
- <inject bean="WSEndpointHandlerDeploymentAspect"/>
- <inject bean="WSEndpointLifecycleDeploymentAspect"/>
- <inject bean="WSEndpointMetricsDeploymentAspect"/>
- <inject bean="WSEndpointNameDeploymentAspect"/>
- <inject bean="WSEndpointRegistryDeploymentAspect"/>
- <inject bean="WSRuntimeLoaderDeploymentAspect"/>
- <inject bean="WSURLPatternDeploymentAspect"/>
- <inject bean="WSWebAppDeploymentAspect"/>
- <inject bean="WSWebAppGeneratorDeploymentAspect"/>
- </set>
- </property>
- </bean>
-
- <bean name="WSDeploymentAspectInstallerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManagerEndpointAPI"/></property>
- <property name="sortAspectsOnCreate">false</property>
- <property name="aspects">
- <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
- <inject bean="WSEndpointAPIDeploymentAspect"/>
- <inject bean="WSEndpointAddressDeploymentAspect"/>
- <inject bean="WSEndpointHandlerDeploymentAspect"/>
- <inject bean="WSEndpointLifecycleDeploymentAspect"/>
- <inject bean="WSEndpointMetricsDeploymentAspect"/>
- <inject bean="WSEndpointNameDeploymentAspect"/>
- <inject bean="WSEndpointRegistryDeploymentAspect"/>
- <inject bean="WSWebAppDeploymentAspect"/>
- <inject bean="WSWebAppGeneratorDeploymentAspect"/>
- </set>
- </property>
- </bean>
16 years, 3 months
JBossWS SVN: r6005 - stack/cxf/trunk/src/test/resources.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-03-18 13:18:17 -0400 (Tue, 18 Mar 2008)
New Revision: 6005
Modified:
stack/cxf/trunk/src/test/resources/test-excludes-jboss422.txt
stack/cxf/trunk/src/test/resources/test-excludes-jboss423.txt
stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt
stack/cxf/trunk/src/test/resources/test-excludes-jboss501.txt
Log:
[CXF-1250] SOAPMessage.getSOAPHeader returns null
Modified: stack/cxf/trunk/src/test/resources/test-excludes-jboss422.txt
===================================================================
--- stack/cxf/trunk/src/test/resources/test-excludes-jboss422.txt 2008-03-18 15:02:52 UTC (rev 6004)
+++ stack/cxf/trunk/src/test/resources/test-excludes-jboss422.txt 2008-03-18 17:18:17 UTC (rev 6005)
@@ -20,9 +20,6 @@
# [CXF-1244] Application Exception not initialized properly
org/jboss/test/ws/jaxws/samples/exception/**
-# [CXF-1250] SOAPMessage.getSOAPHeader returns null
-org/jboss/test/ws/jaxws/samples/handlerchain/**
-
# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope
org/jboss/test/ws/jaxws/samples/httpbinding/**
org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.*
Modified: stack/cxf/trunk/src/test/resources/test-excludes-jboss423.txt
===================================================================
--- stack/cxf/trunk/src/test/resources/test-excludes-jboss423.txt 2008-03-18 15:02:52 UTC (rev 6004)
+++ stack/cxf/trunk/src/test/resources/test-excludes-jboss423.txt 2008-03-18 17:18:17 UTC (rev 6005)
@@ -20,9 +20,6 @@
# [CXF-1244] Application Exception not initialized properly
org/jboss/test/ws/jaxws/samples/exception/**
-# [CXF-1250] SOAPMessage.getSOAPHeader returns null
-org/jboss/test/ws/jaxws/samples/handlerchain/**
-
# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope
org/jboss/test/ws/jaxws/samples/httpbinding/**
org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.*
Modified: stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt
===================================================================
--- stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt 2008-03-18 15:02:52 UTC (rev 6004)
+++ stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt 2008-03-18 17:18:17 UTC (rev 6005)
@@ -17,9 +17,6 @@
# [CXF-1244] Application Exception not initialized properly
org/jboss/test/ws/jaxws/samples/exception/**
-# [CXF-1250] SOAPMessage.getSOAPHeader returns null
-org/jboss/test/ws/jaxws/samples/handlerchain/**
-
# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope
org/jboss/test/ws/jaxws/samples/httpbinding/**
org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.*
Modified: stack/cxf/trunk/src/test/resources/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/trunk/src/test/resources/test-excludes-jboss501.txt 2008-03-18 15:02:52 UTC (rev 6004)
+++ stack/cxf/trunk/src/test/resources/test-excludes-jboss501.txt 2008-03-18 17:18:17 UTC (rev 6005)
@@ -24,9 +24,6 @@
# [CXF-1244] Application Exception not initialized properly
org/jboss/test/ws/jaxws/samples/exception/**
-# [CXF-1250] SOAPMessage.getSOAPHeader returns null
-org/jboss/test/ws/jaxws/samples/handlerchain/**
-
# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope
org/jboss/test/ws/jaxws/samples/httpbinding/**
org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.*
16 years, 3 months