10:14 a.m.
Author: alessio.soldano(a)jboss.com
Date: 2013-02-08 11:14:15 -0500 (Fri, 08 Feb 2013)
New Revision: 17291
Modified:
stack/cxf/branches/jbossws-cxf-4.1.x/
stack/cxf/branches/jbossws-cxf-4.1.x/modules/dist/src/main/distro/build-deploy.xml
stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/EndpointImpl.java
stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/CXFInstanceProviderDeploymentAspect.java
stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EnableDecoupledFaultInterceptor.java
Log:
Merged revisions 17260,17277 via svnmerge from
https://svn.jboss.org/repos/jbossws/stack/cxf/trunk
.......
r17260 | alessio.soldano(a)jboss.com | 2013-01-25 19:21:16 +0100 (Fri, 25 Jan 2013) | 2
lines
Minor cleanups
.......
r17277 | alessio.soldano(a)jboss.com | 2013-02-07 19:29:48 +0100 (Thu, 07 Feb 2013) | 2
lines
Changes on deployment macros to copy modules' content on new AS720 structure (see
AS7-6344)
.......
Property changes on: stack/cxf/branches/jbossws-cxf-4.1.x
___________________________________________________________________
Modified: svnmerge-integrated
- /stack/cxf/trunk:1-17199,17279
+ /stack/cxf/trunk:1-17199,17260-17277,17279
Modified: svn:mergeinfo
- /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/branches/ropalka:16301-16305,16966-17008
/stack/cxf/branches/ropalka_JBWS-3550:16747-16757
/stack/cxf/trunk:17279
+ /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/branches/ropalka:16301-16305,16966-17008
/stack/cxf/branches/ropalka_JBWS-3550:16747-16757
/stack/cxf/trunk:17260-17277,17279
Modified:
stack/cxf/branches/jbossws-cxf-4.1.x/modules/dist/src/main/distro/build-deploy.xml
===================================================================
---
stack/cxf/branches/jbossws-cxf-4.1.x/modules/dist/src/main/distro/build-deploy.xml 2013-02-08
16:08:31 UTC (rev 17290)
+++
stack/cxf/branches/jbossws-cxf-4.1.x/modules/dist/src/main/distro/build-deploy.xml 2013-02-08
16:14:15 UTC (rev 17291)
@@ -46,11 +46,16 @@
</fileset>
</jandex>
<antcall target="deploy-jbossws-cxf-modules"
inheritall="false">
- <param name="installserver"
value="${deploy.structure}"/>
+ <param name="installserver"
value="${deploy.structure}/modules"/>
<param name="thirdpartydir"
value="${deploy.artifacts.dir}"/>
<param name="jbossid"
value="${jbossws.integration.target}"/>
<param name="modules-jbossid" value="jboss710"/>
</antcall>
+ <copy toDir="${deploy.structure}/modules">
+ <fileset dir="${deploy.artifacts.dir}/modules/jboss710">
+ <include name="**/jboss/as/webservices/**/module.xml"/>
+ </fileset>
+ </copy>
</target>
<!-- ================================================================== -->
@@ -79,7 +84,7 @@
<target name="undeploy-jboss711" depends="target-jboss711,init"
description="Remove jbossws from jboss711">
<fail message="Not available: ${jboss711.available.file}"
unless="jboss711.available"/>
- <macro-undeploy-jbossws-modules targetdir="${jboss711.home}"
defaultmodulesconf="${jbossws.default.modules.conf}"
modifyjbossintegration="true"/>
+ <macro-undeploy-jbossws-modules targetdir="${jboss711.home}/modules"
defaultmodulesconf="${jbossws.default.modules.conf}"
modifyjbossintegration="true"/>
</target>
<!-- ================================================================== -->
@@ -108,7 +113,7 @@
<target name="undeploy-jboss712" depends="target-jboss712,init"
description="Remove jbossws from jboss712">
<fail message="Not available: ${jboss712.available.file}"
unless="jboss712.available"/>
- <macro-undeploy-jbossws-modules targetdir="${jboss712.home}"
defaultmodulesconf="${jbossws.default.modules.conf}"
modifyjbossintegration="true"/>
+ <macro-undeploy-jbossws-modules targetdir="${jboss712.home}/modules"
defaultmodulesconf="${jbossws.default.modules.conf}"
modifyjbossintegration="true"/>
</target>
<!-- ================================================================== -->
@@ -137,7 +142,7 @@
<target name="undeploy-jboss713" depends="target-jboss713,init"
description="Remove jbossws from jboss713">
<fail message="Not available: ${jboss713.available.file}"
unless="jboss713.available"/>
- <macro-undeploy-jbossws-modules targetdir="${jboss713.home}"
defaultmodulesconf="${jbossws.default.modules.conf}"
modifyjbossintegration="true"/>
+ <macro-undeploy-jbossws-modules targetdir="${jboss713.home}/modules"
defaultmodulesconf="${jbossws.default.modules.conf}"
modifyjbossintegration="true"/>
</target>
<!-- ================================================================== -->
@@ -162,11 +167,16 @@
</fileset>
</jandex>
<antcall target="deploy-jbossws-cxf-modules"
inheritall="false">
- <param name="installserver"
value="${deploy.structure}"/>
+ <param name="installserver"
value="${deploy.structure}/modules/system/layers/base"/>
<param name="thirdpartydir"
value="${deploy.artifacts.dir}"/>
<param name="jbossid"
value="${jbossws.integration.target}"/>
<param name="modules-jbossid" value="jboss720"/>
</antcall>
+ <copy toDir="${deploy.structure}/modules/system/layers/base">
+ <fileset dir="${deploy.artifacts.dir}/modules/jboss720">
+ <include name="**/jboss/as/webservices/**/module.xml"/>
+ </fileset>
+ </copy>
</target>
<!-- ================================================================== -->
@@ -186,8 +196,8 @@
</fileset>
</copy>
<!-- Install org/jboss/as/webservices module.xml separately since it needs to
reference libs already on the AS -->
- <installModules targetDir="${jboss720.home}/modules">
- <fileset dir="${deploy.structure}/modules">
+ <installModules
targetDir="${jboss720.home}/modules/system/layers/base/">
+ <fileset dir="${deploy.structure}/modules/system/layers/base">
<include name="**/jboss/as/webservices/**/module.xml"/>
</fileset>
</installModules>
@@ -195,7 +205,7 @@
<target name="undeploy-jboss720" depends="target-jboss720,init"
description="Remove jbossws from jboss720">
<fail message="Not available: ${jboss720.available.file}"
unless="jboss720.available"/>
- <macro-undeploy-jbossws-modules targetdir="${jboss720.home}"
defaultmodulesconf="${jbossws.default.modules.conf}"
modifyjbossintegration="false"/>
+ <macro-undeploy-jbossws-modules
targetdir="${jboss720.home}/modules/system/layers/base"
defaultmodulesconf="${jbossws.default.modules.conf}"
modifyjbossintegration="false"/>
</target>
<!-- ================================================================== -->
@@ -211,7 +221,7 @@
<target name="install-spring-module71x"
if="spring-required">
<antcall target="deploy-spring-module" inheritall="false">
- <param name="installserver"
value="${deploy.structure}"/>
+ <param name="installserver"
value="${deploy.structure}/modules"/>
<param name="thirdpartydir"
value="${deploy.artifacts.dir}"/>
<param name="modules-jbossid" value="jboss710"/>
</antcall>
@@ -219,7 +229,7 @@
<target name="install-spring-module72x"
if="spring-required">
<antcall target="deploy-spring-module" inheritall="false">
- <param name="installserver"
value="${deploy.structure}"/>
+ <param name="installserver"
value="${deploy.structure}/modules/system/layers/base"/>
<param name="thirdpartydir"
value="${deploy.artifacts.dir}"/>
<param name="modules-jbossid" value="jboss720"/>
</antcall>
Modified:
stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
---
stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2013-02-08
16:08:31 UTC (rev 17290)
+++
stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2013-02-08
16:14:15 UTC (rev 17291)
@@ -142,11 +142,6 @@
<exclude name="**/spring/**/module.xml"/>
</fileset>
</installModules>
- <copy toDir="@{targetdir}">
- <fileset dir="@{thirdpartydir}/modules/@{modules-jbossid}">
- <include name="**/jboss/as/webservices/**/module.xml"/>
- </fileset>
- </copy>
</sequential>
</macrodef>
@@ -164,7 +159,7 @@
<target name="deploy-jbossws-cxf-modules">
<fail message="installserver must be specified"
unless="installserver"/>
<fail message="thirdpartydir must be specified"
unless="thirdpartydir"/>
- <macro-deploy-jbossws-modules targetdir="${installserver}/modules"
thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"
modules-jbossid="${modules-jbossid}"/>
+ <macro-deploy-jbossws-modules targetdir="${installserver}"
thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"
modules-jbossid="${modules-jbossid}"/>
</target>
<!-- ================================================================== -->
@@ -194,7 +189,7 @@
<target name="deploy-spring-module">
<fail message="installserver must be specified"
unless="installserver"/>
<fail message="thirdpartydir must be specified"
unless="thirdpartydir"/>
- <macro-install-spring-modules targetdir="${installserver}/modules"
thirdpartydir="${thirdpartydir}"
modules-jbossid="${modules-jbossid}"/>
+ <macro-install-spring-modules targetdir="${installserver}"
thirdpartydir="${thirdpartydir}"
modules-jbossid="${modules-jbossid}"/>
</target>
<!-- ================================================================== -->
@@ -207,24 +202,23 @@
<attribute name="modifyjbossintegration"/>
<sequential>
- <loadfile property="jbossws.modules.conf"
srcfile="(a){targetdir}/modules/org/jboss/as/webservices/jbossws-modules.conf"
failonerror="false"/>
+ <loadfile property="jbossws.modules.conf"
srcfile="(a){targetdir}/org/jboss/as/webservices/jbossws-modules.conf"
failonerror="false"/>
<loadfile property="jbossws.modules.conf"
srcfile="@{defaultmodulesconf}" failonerror="false"/>
- <property name="jboss.modules"
value="@{targetdir}/modules"/>
-
<delete includeemptydirs="true" verbose="true">
- <fileset dir="${jboss.modules}">
+ <fileset dir="@{targetdir}">
<include
name="**/org/jboss/as/webservices/main/jbossws-*-resources*"/>
<include
name="**/org/jboss/as/webservices/main/jbossws-jboss*"/>
</fileset>
</delete>
+ <property name="jboss.modules" value="@{targetdir}"/>
<antcall target="remove-jboss-integration-module">
<param name="modifyjbossintegration"
value="@{modifyjbossintegration}"/>
</antcall>
<!-- delete content of last deployment -->
<delete includeemptydirs="true" verbose="true">
- <fileset dir="${jboss.modules}"
includes="${jbossws.modules.conf}"/>
+ <fileset dir="@{targetdir}"
includes="${jbossws.modules.conf}"/>
</delete>
</sequential>
</macrodef>
Modified:
stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/EndpointImpl.java
===================================================================
---
stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/EndpointImpl.java 2013-02-08
16:08:31 UTC (rev 17290)
+++
stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/EndpointImpl.java 2013-02-08
16:14:15 UTC (rev 17291)
@@ -28,7 +28,6 @@
import javax.xml.namespace.QName;
import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactory;
import org.apache.cxf.configuration.Configurer;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.jaxws.support.JaxWsImplementorInfo;
Modified:
stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/CXFInstanceProviderDeploymentAspect.java
===================================================================
---
stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/CXFInstanceProviderDeploymentAspect.java 2013-02-08
16:08:31 UTC (rev 17290)
+++
stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/CXFInstanceProviderDeploymentAspect.java 2013-02-08
16:14:15 UTC (rev 17291)
@@ -27,8 +27,6 @@
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.stack.cxf.CXFInstanceProvider;
-import org.jboss.wsf.stack.cxf.Messages;
-import org.jboss.wsf.stack.cxf.client.util.SpringUtils;
/**
@@ -41,7 +39,6 @@
@Override
public void start(final Deployment dep)
{
- boolean springAvailable = SpringUtils.isSpringAvailable();
for (final Endpoint ep : dep.getService().getEndpoints())
{
final ServerFactoryBean factory = ep.getAttachment(ServerFactoryBean.class);
Modified:
stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EnableDecoupledFaultInterceptor.java
===================================================================
---
stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EnableDecoupledFaultInterceptor.java 2013-02-08
16:08:31 UTC (rev 17290)
+++
stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/EnableDecoupledFaultInterceptor.java 2013-02-08
16:14:15 UTC (rev 17291)
@@ -27,8 +27,8 @@
import org.apache.cxf.ws.addressing.soap.MAPCodec;
/**
- * This intercetpor adds the context property decoupled_fault_support
- * to enable decoupled faultTo. This is an optinal feature in cxf and we
+ * This interceptor adds the context property decoupled_fault_support
+ * to enable decoupled faultTo. This is an optional feature in cxf and we
* need this to be default to make it same behavior with native stack.
* @author <a href="mailto:ema@redhat.com>Jim Ma</a>
*/