[jbossws-commits] JBossWS SVN: r14092 - in stack/cxf/trunk/modules/resources/src/main/resources/modules/org: jboss/as/webservices/server/integration/main and 3 other directories.
Author: alessio.soldano(a)jboss.com
Date: 2011-04-14 11:12:21 -0400 (Thu, 14 Apr 2011)
New Revision: 14092
Removed:
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/module.xml
Log:
Rollback Richard's changes that does not work with the current AS7 upstream master;
I'm going to move them to a branch later
svn merge -r 14090:14089 https://svn.jboss.org/repos/jbossws/stack/cxf/trunk .
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml
===================================================================
---
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml 2011-04-14
14:39:40 UTC (rev 14091)
+++
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml 2011-04-14
15:12:21 UTC (rev 14092)
@@ -41,7 +41,6 @@
<module name="javax.xml.stream.api" />
<module name="javax.xml.ws.api" />
<module name="org.apache.neethi" />
- <module name="org.apache.velocity" />
<module name="org.apache.ws.commons.xmlschema" />
<module name="org.apache.ws.security" />
<module name="org.apache.santuario.xmlsec" />
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml
===================================================================
---
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml 2011-04-14
14:39:40 UTC (rev 14091)
+++
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml 2011-04-14
15:12:21 UTC (rev 14092)
@@ -28,10 +28,7 @@
</resources>
<dependencies>
- <module name="javax.api" export="true"/>
- <module name="javax.jws.api" export="true"/>
<module name="javax.wsdl4j.api" export="true"/>
- <module name="javax.xml.ws.api" export="true"/>
<module name="com.sun.xml.bind" services="export"
export="true"/>
<module name="org.jboss.ws.api" export="true"/>
<module name="org.jboss.ws.spi" export="true"/>
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml
===================================================================
---
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml 2011-04-14
14:39:40 UTC (rev 14091)
+++
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml 2011-04-14
15:12:21 UTC (rev 14092)
@@ -29,7 +29,6 @@
</resources>
<dependencies>
- <module name="gnu.getopt"/>
<module name="javax.api"/>
<module name="javax.annotation.api"/>
<module name="javax.ejb.api"/>
@@ -37,12 +36,10 @@
<module name="javax.servlet.api"/>
<module name="javax.wsdl4j.api" />
<module name="javax.xml.ws.api"/>
- <module name="org.jboss.modules"/>
<module name="org.jboss.ws.api"/>
<module name="org.jboss.ws.spi"/>
<module name="org.jboss.logging"/>
<module name="org.jboss.common-core"/>
- <module name="org.apache.log4j"/>
<module name="org.apache.xerces" services="import"/>
</dependencies>
Modified:
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/jaxws-client/main/module.xml 2011-04-14
14:39:40 UTC (rev 14091)
+++
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/module.xml 2011-04-14
15:12:21 UTC (rev 14092)
@@ -49,7 +49,6 @@
<include path="META-INF/"/>
</imports>
</module>
- <module name="org.apache.log4j" />
<module name="org.apache.neethi" />
<module name="org.jboss.logging" />
<module name="org.springframework.spring" optional="true"
/>