[jbossws-commits] JBossWS SVN: r12741 - in stack/cxf/trunk: modules/server and 3 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Thu Aug 5 09:35:43 EDT 2010
Author: sergeyb
Date: 2010-08-05 09:35:43 -0400 (Thu, 05 Aug 2010)
New Revision: 12741
Removed:
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-jms-config-as6.xml
Modified:
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/resources/jbossws-cxf-config-as6.xml
stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
stack/cxf/trunk/src/main/distro/build-deploy.xml
Log:
[JBWS-3094] Reverting r12731
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 2010-08-05 13:29:33 UTC (rev 12740)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-08-05 13:35:43 UTC (rev 12741)
@@ -29,7 +29,6 @@
<include name="**/commons-collections.jar"/>
<include name="**/commons-lang.jar"/>
<include name="**/cxf-*.jar"/>
- <exclude name="**/cxf-rt-transports-jms.jar"/>
<include name="**/jaxb-api.jar"/>
<include name="**/jaxb-impl.jar"/>
<include name="**/jaxb-xjc.jar"/>
@@ -70,7 +69,6 @@
<include name="**/asm.jar"/>
<include name="**/commons-beanutils.jar"/>
<include name="**/cxf-*.jar"/>
- <exclude name="**/cxf-rt-transports-jms.jar"/>
<include name="**/FastInfoset.jar"/>
<include name="**/jaxrpc-api.jar"/>
<include name="**/jaxws-api.jar"/>
@@ -105,10 +103,6 @@
<include name="**/spring-tx.jar"/>
</patternset>
- <patternset id="cxf.jms.patternset">
- <include name="**/cxf-rt-transports-jms.jar"/>
- </patternset>
-
<!-- ================================================================== -->
<!-- Deploy Bin -->
<!-- ================================================================== -->
@@ -360,28 +354,6 @@
</target>
<!-- ================================================================== -->
- <!-- Install CXF JMS component which depends on Spring -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-install-cxf-jms">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <sequential>
- <mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="cxf.jms.patternset"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
- <target name="deploy-cxf-jms">
- <macro-install-cxf-jms targetdir="${installserver}/client" thirdpartydir="${thirdpartydir}"/>
- <macro-install-cxf-jms targetdir="${installserver}/common/lib" thirdpartydir="${thirdpartydir}"/>
- </target>
-
- <!-- ================================================================== -->
<!-- Undeploy JBossWS -->
<!-- ================================================================== -->
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2010-08-05 13:29:33 UTC (rev 12740)
+++ stack/cxf/trunk/modules/server/pom.xml 2010-08-05 13:35:43 UTC (rev 12741)
@@ -333,9 +333,7 @@
</goals>
<configuration>
<tasks>
- <ant antfile="src/main/scripts/antrun-beans-config.xml">
- <property name="spring" value="${spring}"/>
- </ant>
+ <ant antfile="src/main/scripts/antrun-beans-config.xml" />
</tasks>
</configuration>
</execution>
@@ -387,17 +385,6 @@
</plugins>
</build>
</profile>
-
- <!--
- Name: spring
- Descr: indicates if Spring will be required for deployments to succeed
- -->
- <profile>
- <id>spring</id>
- <properties>
- <spring>true</spring>
- </properties>
- </profile>
</profiles>
</project>
Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as6.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as6.xml 2010-08-05 13:29:33 UTC (rev 12740)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as6.xml 2010-08-05 13:35:43 UTC (rev 12741)
@@ -86,5 +86,16 @@
<property name="requires">ResourceResolver,StackDescriptor</property>
<property name="forJaxRpc">false</property>
</bean>
-
-</deployment>
+
+ <!---JMSEndpoints Deployment Aspect-->
+ <bean name="JMSEndpointDeploymentAspect" class="org.jboss.wsf.stack.cxf.deployment.aspect.JMSEndpointDeploymentAspect">
+ <property name="provides">BusHolder</property>
+ <property name="forJaxRpc">false</property>
+ </bean>
+
+ <bean name="JMSEndpointRegistryDeploymentAspect" class="org.jboss.wsf.stack.cxf.deployment.aspect.JMSEndpointRegistryDeploymentAspect">
+ <property name="requires">BusHolder</property>
+ <property name="forJaxRpc">false</property>
+ </bean>
+
+</deployment>
\ No newline at end of file
Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-jms-config-as6.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-jms-config-as6.xml 2010-08-05 13:29:33 UTC (rev 12740)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-jms-config-as6.xml 2010-08-05 13:35:43 UTC (rev 12741)
@@ -1,101 +0,0 @@
-<?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">
- <list class="java.util.LinkedList" elementClass="java.lang.String">
- <value>org.apache.cxf</value>
- </list>
- </property>
- </bean>
-
- <bean name="CXFJMSDescriptorProcessor" class="org.jboss.wsf.stack.cxf.deployment.jms.JMSDescriptorProcessorImpl">
- <property name="validating">false</property>
- <property name="descriptorName">jbossws-cxf.xml</property>
- </bean>
-
- <!-- Installed Record Processors-->
- <bean name="WSMemoryBufferRecorder" class="org.jboss.wsf.framework.management.recording.MemoryBufferRecorder">
- <property name="recording">false</property>
- </bean>
- <bean name="WSLogRecorder" class="org.jboss.wsf.framework.management.recording.LogRecorder">
- <property name="recording">false</property>
- </bean>
-
- <!-- 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>stack.transport.class.provider</key>
- <value>org.jboss.wsf.stack.cxf.deployment.CXFServletClassProvider</value>
- </entry>
- </map>
- </property>
- <property name="forJaxRpc">false</property>
- </bean>
-
- <bean name="WSCXFDescriptorDeploymentAspect" class="org.jboss.wsf.stack.cxf.deployment.aspect.DescriptorDeploymentAspect">
- <property name="requires">EndpointAddress,JAXBIntros</property>
- <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="forJaxRpc">false</property>
- </bean>
-
- <bean name="WSCXFResourceResolverDeploymentAspect" class="org.jboss.wsf.stack.cxf.deployment.aspect.ResourceResolverDeploymentAspect">
- <property name="requires">JmsEndpointAddress</property>
- <property name="provides">ResourceResolver</property>
- <property name="forJaxRpc">false</property>
- </bean>
-
- <bean name="WSCXFEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
- <property name="requires">ContainerMetaData</property>
- <property name="provides">StackEndpointHandler</property>
- <property name="forJaxRpc">false</property>
- </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="processors">
- <list class="java.util.ArrayList" elementClass="org.jboss.wsf.spi.management.recording.RecordProcessor">
- <inject bean="WSMemoryBufferRecorder"/>
- <inject bean="WSLogRecorder"/>
- </list>
- </property>
- <property name="forJaxRpc">false</property>
- </bean>
-
- <bean name="WSCXFJAXBIntroDeploymentAspect" class="org.jboss.wsf.framework.deployment.JAXBIntroDeploymentAspect">
- <property name="provides">JAXBIntros</property>
- <property name="forJaxRpc">false</property>
- </bean>
-
- <bean name="WSCXFBusDeploymentAspect" class="org.jboss.wsf.stack.cxf.deployment.aspect.BusDeploymentAspect">
- <property name="provides">BusHolder</property>
- <property name="requires">ResourceResolver,StackDescriptor</property>
- <property name="forJaxRpc">false</property>
- </bean>
-
- <!---JMSEndpoints Deployment Aspect-->
- <bean name="JMSEndpointDeploymentAspect" class="org.jboss.wsf.stack.cxf.deployment.aspect.JMSEndpointDeploymentAspect">
- <property name="provides">BusHolder</property>
- <property name="forJaxRpc">false</property>
- </bean>
-
- <bean name="JMSEndpointRegistryDeploymentAspect" class="org.jboss.wsf.stack.cxf.deployment.aspect.JMSEndpointRegistryDeploymentAspect">
- <property name="requires">BusHolder</property>
- <property name="forJaxRpc">false</property>
- </bean>
-
-</deployment>
\ No newline at end of file
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 2010-08-05 13:29:33 UTC (rev 12740)
+++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2010-08-05 13:35:43 UTC (rev 12741)
@@ -14,19 +14,8 @@
<property name="src.dir" value="${basedir}/src/main/resources"/>
<property name="dest.dir" value="${basedir}/target/resources"/>
- <target name="check-spring">
- <condition property="spring-required">
- <and>
- <istrue value="${spring}"/>
- </and>
- </condition>
- </target>
+ <target name="main">
- <target name="main"
- depends="check-spring,copy-config-as5,copy-config-as6,copy-config-as6-jms,copy-config-as6-jaxrpc"/>
-
- <target name="copy-config-as5">
-
<copy
file="${src.dir}/jbossws-cxf-config-as5.xml"
tofile="${dest.dir}/jbossws-jboss501/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
@@ -37,10 +26,6 @@
tofile="${dest.dir}/jbossws-jboss510/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
/>
- </target>
-
- <target name="copy-config-as6" unless="spring-required">
-
<copy
file="${src.dir}/jbossws-cxf-config-as6.xml"
tofile="${dest.dir}/jbossws-jboss600/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
@@ -51,26 +36,7 @@
tofile="${dest.dir}/jbossws-jboss601/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
/>
- </target>
-
- <target name="copy-config-as6-jms" if="spring-required">
-
<copy
- file="${src.dir}/jbossws-cxf-jms-config-as6.xml"
- tofile="${dest.dir}/jbossws-jboss600/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
- />
-
- <copy
- file="${src.dir}/jbossws-cxf-jms-config-as6.xml"
- tofile="${dest.dir}/jbossws-jboss601/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
- />
-
- </target>
-
-
- <target name="copy-config-as6-jaxrpc">
-
- <copy
file="${src.dir}/jbossws-jaxrpc-config-as6.xml"
tofile="${dest.dir}/jbossws-jaxrpc-jboss600/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
/>
@@ -81,4 +47,5 @@
/>
</target>
+
</project>
Modified: stack/cxf/trunk/src/main/distro/build-deploy.xml
===================================================================
--- stack/cxf/trunk/src/main/distro/build-deploy.xml 2010-08-05 13:29:33 UTC (rev 12740)
+++ stack/cxf/trunk/src/main/distro/build-deploy.xml 2010-08-05 13:35:43 UTC (rev 12741)
@@ -35,8 +35,7 @@
<echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
</target>
- <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-structure-jboss50,check-spring,install-spring"
- description="Deploy jbossws to jboss501">
+ <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-structure-jboss50,check-spring,install-spring" description="Deploy jbossws to jboss501">
<macro-create-deploy-conf deploystructure="${deploy.structure}"/>
<fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
<copy todir="${jboss501.home}" overwrite="true" verbose="true">
@@ -78,8 +77,7 @@
<echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
</target>
- <target name="deploy-jboss510" depends="undeploy-jboss510,deploy-structure-jboss51,check-spring,install-spring"
- description="Deploy jbossws to jboss510">
+ <target name="deploy-jboss510" depends="undeploy-jboss510,deploy-structure-jboss51,check-spring,install-spring" description="Deploy jbossws to jboss510">
<macro-create-deploy-conf deploystructure="${deploy.structure}"/>
<fail message="Not available: ${jboss510.available.file}" unless="jboss510.available"/>
<copy todir="${jboss510.home}" overwrite="true" verbose="true">
@@ -121,8 +119,7 @@
<echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
</target>
- <target name="deploy-jboss600" depends="undeploy-jboss600,deploy-structure-jboss600,check-spring,install-spring,install-cxf-jms"
- description="Deploy jbossws to jboss600">
+ <target name="deploy-jboss600" depends="undeploy-jboss600,deploy-structure-jboss600,check-spring,install-spring" description="Deploy jbossws to jboss600">
<macro-create-deploy-conf deploystructure="${deploy.structure}"/>
<fail message="Not available: ${jboss600.available.file}" unless="jboss600.available"/>
<copy todir="${jboss600.home}" overwrite="true" verbose="true">
@@ -164,8 +161,7 @@
<echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
</target>
- <target name="deploy-jboss601" depends="undeploy-jboss601,deploy-structure-jboss601,check-spring,install-spring,install-cxf-jms"
- description="Deploy jbossws to jboss601">
+ <target name="deploy-jboss601" depends="undeploy-jboss601,deploy-structure-jboss601,check-spring,install-spring" description="Deploy jbossws to jboss601">
<macro-create-deploy-conf deploystructure="${deploy.structure}"/>
<fail message="Not available: ${jboss601.available.file}" unless="jboss601.available"/>
<copy todir="${jboss601.home}" overwrite="true" verbose="true">
@@ -201,13 +197,6 @@
</antcall>
</target>
- <target name="install-cxf-jms" if="spring-required">
- <antcall target="deploy-cxf-jms" inheritall="false">
- <param name="installserver" value="${deploy.structure}"/>
- <param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
- </antcall>
- </target>
-
<!-- ================================================================== -->
<!-- Create jbossws-deploy.conf and jbossws-server-deploy.conf -->
<!-- ================================================================== -->
More information about the jbossws-commits
mailing list