Author: jim.ma Date: 2014-05-29 03:21:34 -0400 (Thu, 29 May 2014) New Revision: 18702 Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/apache/cxf/impl/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/cxf/impl/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/cxf/trunk/modules/resources/src/main/resources/resources/modules-deploy.conf Log: [JBWS-3630]:Add httpcomponets module with slot 'asyncclient' Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/apache/cxf/impl/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/apache/cxf/impl/main/module.xml 2014-05-28 16:37:14 UTC (rev 18701) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/apache/cxf/impl/main/module.xml 2014-05-29 07:21:34 UTC (rev 18702) @@ -43,6 +43,7 @@ <module name="javax.xml.stream.api" /> <module name="javax.xml.ws.api" /> <module name="org.apache.commons.lang" /> + <module name="org.apache.httpcomponents" slot="asyncclient"/> <module name="org.apache.neethi" /> <module name="org.apache.velocity" /> <module name="org.apache.xml-resolver" /> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/cxf/impl/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/cxf/impl/main/module.xml 2014-05-28 16:37:14 UTC (rev 18701) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/cxf/impl/main/module.xml 2014-05-29 07:21:34 UTC (rev 18702) @@ -43,6 +43,7 @@ <module name="javax.xml.stream.api" /> <module name="javax.xml.ws.api" /> <module name="org.apache.commons.lang" /> + <module name="org.apache.httpcomponents" slot="asyncclient"/> <module name="org.apache.neethi" /> <module name="org.apache.velocity" /> <module name="org.apache.xml-resolver" /> 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 2014-05-28 16:37:14 UTC (rev 18701) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2014-05-29 07:21:34 UTC (rev 18702) @@ -75,7 +75,6 @@ <fileset dir="@{thirdpartydir}/lib"> <include name="**/cxf-*.jar"/> <exclude name="**/cxf-core*.jar"/> - <exclude name="**/cxf-rt-transports-http-hc.jar"/> </fileset> </copy> <copy todir="@{targetdir}/org/jboss/ws/api/main" flatten="false" overwrite="true"> @@ -97,8 +96,16 @@ <fileset dir="@{thirdpartydir}/lib"> <include name="**/jbossws-spi.jar"/> </fileset> + </copy> + <copy todir="@{targetdir}/org/apache/httpcomponents/asyncclient" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/httpcore.jar"/> + <include name="**/httpcore-nio.jar"/> + <include name="**/httpasyncclient.jar"/> + <include name="**/httpclient.jar"/> + </fileset> </copy> - <copy todir="@{targetdir}/org/apache/neethi/main" flatten="false" overwrite="true"> + <copy todir="@{targetdir}/org/apache/neethi/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> <include name="**/neethi.jar"/> </fileset> @@ -189,8 +196,7 @@ <copy todir="@{targetdir}/org/apache/cxf/impl/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> <include name="**/cxf-*.jar"/> - <exclude name="**/cxf-core*.jar"/> - <exclude name="**/cxf-rt-transports-http-hc.jar"/> + <exclude name="**/cxf-core*.jar"/> </fileset> </copy> <copy todir="@{targetdir}/org/jboss/ws/api/main" flatten="false" overwrite="true"> @@ -213,6 +219,14 @@ <include name="**/jbossws-spi.jar"/> </fileset> </copy> + <copy todir="@{targetdir}/org/apache/httpcomponents/asyncclient" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/httpcore.jar"/> + <include name="**/httpcore-nio.jar"/> + <include name="**/httpasyncclient.jar"/> + <include name="**/httpclient.jar"/> + </fileset> + </copy> <copy todir="@{targetdir}/org/apache/neethi/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> <include name="**/neethi.jar"/> Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/modules-deploy.conf =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/resources/modules-deploy.conf 2014-05-28 16:37:14 UTC (rev 18701) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/modules-deploy.conf 2014-05-29 07:21:34 UTC (rev 18702) @@ -1 +1 @@ -org/apache/cxf/**, org/apache/ws/security/**, org/apache/neethi/**, org/apache/ws/commons/xmlschema/**, org/jboss/ws/cxf/**, org/jboss/ws/api/**, org/jboss/ws/common/**, org/jboss/ws/jaxws-client/**, org/jboss/ws/jaxws-jboss-httpserver-httpspi/**, org/jboss/ws/jaxws-undertow-httpspi/**,org/jboss/ws/saaj-impl/**, org/jboss/ws/spi/**, org/jboss/ws/tools/**, org/opensaml/**, org/springframework/spring/** +org/apache/cxf/**, org/apache/ws/security/**, org/apache/neethi/**, org/apache/ws/commons/xmlschema/**, org/jboss/ws/cxf/**, org/jboss/ws/api/**, org/jboss/ws/common/**, org/jboss/ws/jaxws-client/**, org/jboss/ws/jaxws-jboss-httpserver-httpspi/**, org/jboss/ws/jaxws-undertow-httpspi/**,org/jboss/ws/saaj-impl/**, org/jboss/ws/spi/**, org/jboss/ws/tools/**, org/opensaml/**, org/springframework/spring/**,org/apache/httpcomponents/asyncclient/**