[jbossws-commits] JBossWS SVN: r18913 - in stack/cxf/trunk/modules/resources/src/main/resources: modules/wildfly800/org/apache/httpcomponents and 5 other directories.

Author: jim.ma Date: 2014-09-05 05:52:13 -0400 (Fri, 05 Sep 2014) New Revision: 18913 Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/apache/httpcomponents/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/apache/httpcomponents/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/httpcomponents/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/httpcomponents/main/module.xml Removed: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/apache/httpcomponents/asyncclient/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/httpcomponents/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/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]:Remove asyncclient slot 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-09-05 09:45:17 UTC (rev 18912) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/apache/cxf/impl/main/module.xml 2014-09-05 09:52:13 UTC (rev 18913) @@ -43,7 +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.httpcomponents"/> <module name="org.apache.neethi" /> <module name="org.apache.velocity" /> <module name="org.apache.xml-resolver" /> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/apache/httpcomponents/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/apache/httpcomponents/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/apache/httpcomponents/main/module.xml 2014-09-05 09:52:13 UTC (rev 18913) @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ JBoss, Home of Professional Open Source. + ~ Copyright 2014, Red Hat, Inc., and individual contributors + ~ as indicated by the @author tags. See the copyright.txt file in the + ~ distribution for a full listing of individual contributors. + ~ + ~ This is free software; you can redistribute it and/or modify it + ~ under the terms of the GNU Lesser General Public License as + ~ published by the Free Software Foundation; either version 2.1 of + ~ the License, or (at your option) any later version. + ~ + ~ This software is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + ~ Lesser General Public License for more details. + ~ + ~ You should have received a copy of the GNU Lesser General Public + ~ License along with this software; if not, write to the Free + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. + --> + +<module xmlns="urn:jboss:module:1.3" name="org.apache.httpcomponents"> + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.api"/> + <module name="org.apache.commons.codec"/> + <module name="org.apache.commons.logging"/> + </dependencies> +</module> Property changes on: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/apache/httpcomponents/main/module.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Rev Date Added: svn:eol-style + native 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-09-05 09:45:17 UTC (rev 18912) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/cxf/impl/main/module.xml 2014-09-05 09:52:13 UTC (rev 18913) @@ -47,7 +47,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.httpcomponents"/> <module name="org.apache.neethi" /> <module name="org.apache.velocity" /> <module name="org.apache.xml-resolver" /> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/httpcomponents/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/httpcomponents/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/httpcomponents/main/module.xml 2014-09-05 09:52:13 UTC (rev 18913) @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ JBoss, Home of Professional Open Source. + ~ Copyright 2014, Red Hat, Inc., and individual contributors + ~ as indicated by the @author tags. See the copyright.txt file in the + ~ distribution for a full listing of individual contributors. + ~ + ~ This is free software; you can redistribute it and/or modify it + ~ under the terms of the GNU Lesser General Public License as + ~ published by the Free Software Foundation; either version 2.1 of + ~ the License, or (at your option) any later version. + ~ + ~ This software is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + ~ Lesser General Public License for more details. + ~ + ~ You should have received a copy of the GNU Lesser General Public + ~ License along with this software; if not, write to the Free + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. + --> + +<module xmlns="urn:jboss:module:1.3" name="org.apache.httpcomponents"> + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.api"/> + <module name="org.apache.commons.codec"/> + <module name="org.apache.commons.logging"/> + </dependencies> +</module> Property changes on: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/httpcomponents/main/module.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Rev Date Added: svn:eol-style + native 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-09-05 09:45:17 UTC (rev 18912) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2014-09-05 09:52:13 UTC (rev 18913) @@ -97,7 +97,7 @@ <include name="**/jbossws-spi.jar"/> </fileset> </copy> - <copy todir="@{targetdir}/org/apache/httpcomponents/asyncclient" flatten="false" overwrite="true"> + <copy todir="@{targetdir}/org/apache/httpcomponents/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> <include name="**/httpcore.jar"/> <include name="**/httpcore-nio.jar"/> @@ -219,7 +219,7 @@ <include name="**/jbossws-spi.jar"/> </fileset> </copy> - <copy todir="@{targetdir}/org/apache/httpcomponents/asyncclient" flatten="false" overwrite="true"> + <copy todir="@{targetdir}/org/apache/httpcomponents/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> <include name="**/httpcore.jar"/> <include name="**/httpcore-nio.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-09-05 09:45:17 UTC (rev 18912) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/modules-deploy.conf 2014-09-05 09:52:13 UTC (rev 18913) @@ -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/httpcomponents/asyncclient/** +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/**,