[jbossws-commits] JBossWS SVN: r10424 - in stack/cxf/trunk/modules: server and 4 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Wed Jul 29 16:48:11 EDT 2009
Author: richard.opalka at jboss.com
Date: 2009-07-29 16:48:11 -0400 (Wed, 29 Jul 2009)
New Revision: 10424
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/resources/default-deploy.conf
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/cxf/trunk/modules/server/pom.xml
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config.xml
stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
[JBWS-2332] svn merge -r 10168:10413 https://svn.jboss.org/repos/jbossws/stack/cxf/branches/ropalka
Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/default-deploy.conf
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/default-deploy.conf 2009-07-29 20:47:10 UTC (rev 10423)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/default-deploy.conf 2009-07-29 20:48:11 UTC (rev 10424)
@@ -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 server/default/deployers/jbossws.deployer/META-INF/standard-*-config.xml lib/endorse!
d/jbossws-native-* lib/endorsed/jaxb-api.jar
Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-07-29 20:47:10 UTC (rev 10423)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-07-29 20:48:11 UTC (rev 10424)
@@ -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/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2009-07-29 20:47:10 UTC (rev 10423)
+++ stack/cxf/trunk/modules/server/pom.xml 2009-07-29 20:48:11 UTC (rev 10424)
@@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <name>JBoss Web Services - Stack CXF Runtime Server</name>
+ <name>JBoss Web Services - CXF Server</name>
<artifactId>jbossws-cxf-server</artifactId>
<packaging>jar</packaging>
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java 2009-07-29 20:47:10 UTC (rev 10423)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java 2009-07-29 20:48:11 UTC (rev 10424)
@@ -27,6 +27,7 @@
import java.util.Map;
import org.jboss.logging.Logger;
+import org.jboss.wsf.common.integration.WSConstants;
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.DeploymentAspect;
@@ -64,7 +65,7 @@
}
@Override
- public void create(Deployment dep)
+ public void start(Deployment dep)
{
URL cxfURL = getCXFConfigFromClassLoader(dep);
if (cxfURL == null)
@@ -79,7 +80,7 @@
}
@Override
- public void destroy(Deployment dep)
+ public void stop(Deployment dep)
{
DDBeans dd = dep.getAttachment(DDBeans.class);
if (dd != null)
@@ -195,20 +196,21 @@
}
/**
- * Puts CXF config file to deployment property <b>org.jboss.ws.webapp.ContextParameterMap</b> map
- * @param dep deployment where to put
- * @param cxfURL to be put
+ * Puts CXF config file reference to the stack specific context properties.
+ *
+ * @param dep webservice deployment
+ * @param cxfURL CXF DD URL
+ * @see org.jboss.wsf.common.integration.WSConstants.STACK_CONTEXT_PARAMS
*/
private void putCXFConfigToDeployment(Deployment dep, URL cxfURL)
{
// get property map
- String propKey = "org.jboss.ws.webapp.ContextParameterMap";
- Map<String, String> contextParams = (Map<String, String>)dep.getProperty(propKey);
+ Map<String, String> contextParams = (Map<String, String>)dep.getProperty(WSConstants.STACK_CONTEXT_PARAMS);
if (contextParams == null)
{
// if there's no associated map with the property create it now
contextParams = new HashMap<String, String>();
- dep.setProperty(propKey, contextParams);
+ dep.setProperty(WSConstants.STACK_CONTEXT_PARAMS, contextParams);
}
// put cxf config URL to the property map
contextParams.put(CXFServletExt.PARAM_CXF_BEANS_URL, cxfURL.toExternalForm());
Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config.xml 2009-07-29 20:47:10 UTC (rev 10423)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config.xml 2009-07-29 20:48:11 UTC (rev 10424)
@@ -1,9 +1,12 @@
-
+<?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>
</bean>
-
+
<!-- Logging redirector -->
<bean name="JDKLogRedirector" class="org.jboss.wsf.common.logging.JDKLogRedirector">
<property name="namespaces">
@@ -21,16 +24,18 @@
<property name="recording">false</property>
</bean>
- <!--
- The stack specific deployment aspects
- -->
+ <!-- The stack specific deployment aspects -->
<bean name="WSCXFContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect">
<property name="provides">ContextProperties</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>
+ <entry>
+ <key>stack.transport.class</key>
+ <value>org.jboss.wsf.stack.cxf.CXFServletExt</value>
+ </entry>
</map>
</property>
+ <property name="relativeOrder">31</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
<bean name="WSCXFDescriptorDeploymentAspect" class="org.jboss.wsf.stack.cxf.DescriptorDeploymentAspect">
@@ -38,17 +43,20 @@
<property name="provides">StackDescriptor</property>
<property name="invokerEJB3">org.jboss.wsf.stack.cxf.InvokerEJB3</property>
<property name="invokerJSE">org.jboss.wsf.stack.cxf.InvokerJSE</property>
+ <property name="relativeOrder">21</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
<bean name="WSCXFEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
- <property name="requires">ContainerEndpointHandler</property>
- <property name="provides">StackEndpointHandler</property>
+ <property name="requires">ContainerMetaData</property>
+ <property name="provides">StackEndpointHandler</property>
+ <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="relativeOrder">36</property> <!-- [JBDEPLOY-201] workaround -->
<property name="processors">
<list class="java.util.ArrayList" elementClass="org.jboss.wsf.spi.management.recording.RecordProcessor">
<inject bean="WSMemoryBufferRecorder"/>
@@ -57,45 +65,4 @@
</property>
</bean>
- <!-- Deployment aspect installers -->
-
- <!-- Phase 2 -->
- <bean name="WSCXFDeploymentAspectInstallerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManagerPreJSE"/></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"/>
- </set>
- </property>
- <depends>WSDeploymentAspectInstallerPreJSE</depends>
- </bean>
-
- <!-- Phase 2 -->
- <bean name="WSCXFDeploymentAspectInstallerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManagerPostJSE"/></property>
- <property name="sortAspectsOnCreate">true</property>
- <property name="aspects">
- <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
- <inject bean="WSCXFEndpointHandlerDeploymentAspect"/>
- <inject bean="WSCXFEndpointRecordProcessorDeploymentAspect"/>
- </set>
- </property>
- <depends>WSDeploymentAspectInstallerPostJSE</depends>
- </bean>
-
- <bean name="WSCXFDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></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="WSCXFEndpointHandlerDeploymentAspect"/>
- <inject bean="WSCXFEndpointRecordProcessorDeploymentAspect"/>
- <inject bean="WSCXFDescriptorDeploymentAspect"/>
- </set>
- </property>
- <depends>WSDeploymentAspectInstallerEJB</depends>
- </bean>
-
+</deployment>
Modified: stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2009-07-29 20:47:10 UTC (rev 10423)
+++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2009-07-29 20:48:11 UTC (rev 10424)
@@ -11,72 +11,36 @@
<project default="main">
- <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="src.dir" value="${basedir}/src/main/resources"/>
+ <property name="dest.dir" value="${basedir}/target/resources"/>
- <property name="thirdparty.dir" value="${project.build.directory}/thirdparty"/>
+ <target name="main">
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
+ <copy
+ file="${src.dir}/jbossws-cxf-config.xml"
+ tofile="${dest.dir}/jbossws-jboss500/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
+ />
- <target name="init">
- </target>
+ <copy
+ file="${src.dir}/jbossws-cxf-config.xml"
+ tofile="${dest.dir}/jbossws-jboss501/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
+ />
- <!-- Compile resource files -->
- <target name="main" depends="init">
+ <copy
+ file="${src.dir}/jbossws-cxf-config.xml"
+ tofile="${dest.dir}/jbossws-jboss510/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="${src.dir}/jbossws-cxf-config.xml"
+ tofile="${dest.dir}/jbossws-jboss520/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="${src.dir}/jbossws-cxf-config.xml"
+ tofile="${dest.dir}/jbossws-jboss600/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>
-
- <!-- 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>
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2009-07-29 20:47:10 UTC (rev 10423)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2009-07-29 20:48:11 UTC (rev 10424)
@@ -25,7 +25,6 @@
<wsdl.publish.location>${project.build.directory}/wsdl-publish</wsdl.publish.location>
<hibernate.version>3.2.4.sp1</hibernate.version>
<asm.version>2.2.3</asm.version>
- <endpoint.servlet>org.jboss.wsf.stack.cxf.CXFServletExt</endpoint.servlet>
<jboss.javaee.version>5.0.0.GA</jboss.javaee.version>
</properties>
@@ -178,6 +177,10 @@
<value>${jbossws.integration.target}</value>
</property>
<property>
+ <name>test.disable.deployment</name>
+ <value>false</value>
+ </property>
+ <property>
<name>log4j.output.dir</name>
<value>${project.build.directory}</value>
</property>
More information about the jbossws-commits
mailing list