Author: alessio.soldano(a)jboss.com
Date: 2011-02-23 05:54:31 -0500 (Wed, 23 Feb 2011)
New Revision: 13790
Added:
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/module.xml
Removed:
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-client/
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/module.xml
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
Log:
[JBWS-3223] Moving org.jboss.ws.cxf.jbossws-cxf-client module to org.jboss.ws.jaxws-client
to have a unique name without reference to any stack
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml
===================================================================
---
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml 2011-02-23
10:47:34 UTC (rev 13789)
+++
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml 2011-02-23
10:54:31 UTC (rev 13790)
@@ -49,7 +49,7 @@
<module name="org.jboss.ws.api" />
<module name="org.jboss.ws.common" />
<module name="org.jboss.ws.cxf.jbossws-cxf-factories"
services="import"/>
- <module name="org.jboss.ws.cxf.jbossws-cxf-client"
services="import"/>
+ <module name="org.jboss.ws.jaxws-client"
services="import"/>
<module name="org.jboss.ws.cxf.jbossws-cxf-server"
services="import"/>
<module name="org.jboss.ws.spi" />
</dependencies>
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
===================================================================
---
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2011-02-23
10:47:34 UTC (rev 13789)
+++
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2011-02-23
10:54:31 UTC (rev 13790)
@@ -38,7 +38,7 @@
<module name="org.jboss.ws.api" />
<module name="org.jboss.ws.spi" />
<module name="org.jboss.ws.common" />
- <module name="org.jboss.ws.cxf.jbossws-cxf-client" />
+ <module name="org.jboss.ws.jaxws-client" />
<module name="org.jboss.ws.cxf.jbossws-cxf-factories"
services="import"/>
<module name="org.apache.cxf" services="import">
<imports>
Deleted:
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/module.xml
===================================================================
---
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml 2011-02-21
20:01:40 UTC (rev 13780)
+++
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/module.xml 2011-02-23
10:54:31 UTC (rev 13790)
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- ~ JBoss, Home of Professional Open Source.
- ~ Copyright 2011, 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.0"
name="org.jboss.ws.cxf.jbossws-cxf-client">
-
- <resources>
- <!-- Insert resources here -->
- </resources>
-
- <dependencies>
- <module name="javax.api" />
- <module name="javax.xml.bind.api" />
- <module name="javax.xml.ws.api" />
- <module name="org.jboss.ws.spi" />
- <module name="org.jboss.ws.common" />
- <module name="org.jboss.ws.cxf.jbossws-cxf-factories"
services="import"/>
- <module name="org.apache.cxf" services="import">
- <imports>
- <include path="META-INF/cxf"/> <!-- required to also pull
in the bus extensions from META-INF -->
- <include path="META-INF/spring.*"/>
- </imports>
- </module>
- <module name="org.apache.neethi" />
- <module name="org.jboss.logging" />
- </dependencies>
-</module>
Copied:
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/module.xml
(from rev 13787,
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml)
===================================================================
---
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/module.xml
(rev 0)
+++
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/module.xml 2011-02-23
10:54:31 UTC (rev 13790)
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2011, 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.0"
name="org.jboss.ws.jaxws-client">
+
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+
+ <dependencies>
+ <module name="javax.api" />
+ <module name="javax.xml.bind.api" />
+ <module name="com.sun.xml.bind" services="import"/>
+ <module name="javax.xml.ws.api" />
+ <module name="org.jboss.ws.spi" />
+ <module name="org.jboss.ws.common" />
+ <module name="org.jboss.ws.cxf.jbossws-cxf-factories"
services="import"/>
+ <module name="org.apache.cxf" services="import">
+ <imports>
+ <include path="META-INF/cxf"/> <!-- required to also pull
in the bus extensions from META-INF -->
+ <include path="META-INF/spring.*"/>
+ </imports>
+ </module>
+ <module name="org.jboss.ws.cxf.jbossws-cxf-transports-httpserver"
services="import">
+ <imports>
+ <include path="META-INF/cxf"/> <!-- required to also pull
in the bus extensions from META-INF -->
+ <include path="META-INF/spring.*"/>
+ </imports>
+ </module>
+ <module name="org.apache.neethi" />
+ <module name="org.jboss.logging" />
+ </dependencies>
+</module>
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 2011-02-23
10:47:34 UTC (rev 13789)
+++
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-02-23
10:54:31 UTC (rev 13790)
@@ -326,7 +326,7 @@
<attribute name="targetdir"/>
<sequential>
<!-- libraries -->
- <copy todir="@{targetdir}/org/jboss/ws/cxf/jbossws-cxf-client/main"
flatten="false" overwrite="true">
+ <copy todir="@{targetdir}/org/jboss/ws/jaxws-client/main"
flatten="false" overwrite="true">
<fileset dir="@{thirdpartydir}/lib">
<include name="**/jbossws-cxf-client.jar"/>
</fileset>