Author: alessio.soldano(a)jboss.com
Date: 2011-04-14 11:52:34 -0400 (Thu, 14 Apr 2011)
New Revision: 14100
Added:
stack/cxf/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/tools/
stack/cxf/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/
stack/cxf/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/main/
stack/cxf/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/main/module.xml
stack/cxf/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsprovide/
stack/cxf/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsprovide/main/
stack/cxf/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsprovide/main/module.xml
Removed:
stack/cxf/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/
stack/cxf/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/main/
stack/cxf/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/main/module.xml
stack/cxf/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsprovide/
stack/cxf/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsprovide/main/
stack/cxf/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsprovide/main/module.xml
Modified:
stack/cxf/branches/ropalka/
stack/cxf/branches/ropalka/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml
stack/cxf/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml
stack/cxf/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml
stack/cxf/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/module.xml
Log:
svn merge -r 14089:14090
https://svn.jboss.org/repos/jbossws/stack/cxf/trunk .
Property changes on: stack/cxf/branches/ropalka
___________________________________________________________________
Added: svn:mergeinfo
+ /stack/cxf/trunk:14090
Modified:
stack/cxf/branches/ropalka/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml
===================================================================
---
stack/cxf/branches/ropalka/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml 2011-04-14
15:45:26 UTC (rev 14099)
+++
stack/cxf/branches/ropalka/modules/resources/src/main/resources/modules/org/apache/cxf/main/module.xml 2011-04-14
15:52:34 UTC (rev 14100)
@@ -41,6 +41,7 @@
<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/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml
===================================================================
---
stack/cxf/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml 2011-04-14
15:45:26 UTC (rev 14099)
+++
stack/cxf/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml 2011-04-14
15:52:34 UTC (rev 14100)
@@ -28,7 +28,10 @@
</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/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml
===================================================================
---
stack/cxf/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml 2011-04-14
15:45:26 UTC (rev 14099)
+++
stack/cxf/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml 2011-04-14
15:52:34 UTC (rev 14100)
@@ -29,6 +29,7 @@
</resources>
<dependencies>
+ <module name="gnu.getopt"/>
<module name="javax.api"/>
<module name="javax.annotation.api"/>
<module name="javax.ejb.api"/>
@@ -36,10 +37,12 @@
<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/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/module.xml
===================================================================
---
stack/cxf/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/module.xml 2011-04-14
15:45:26 UTC (rev 14099)
+++
stack/cxf/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-client/main/module.xml 2011-04-14
15:52:34 UTC (rev 14100)
@@ -49,6 +49,7 @@
<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"
/>
Deleted:
stack/cxf/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/main/module.xml
===================================================================
---
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/main/module.xml 2011-04-14
12:58:25 UTC (rev 14090)
+++
stack/cxf/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/main/module.xml 2011-04-14
15:52:34 UTC (rev 14100)
@@ -1,33 +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.tools.wsconsume">
-
- <main-class name="org.jboss.wsf.spi.tools.cmd.WSConsume"/>
-
- <dependencies>
- <module name="org.jboss.ws.common"/>
- </dependencies>
-
-</module>
Copied:
stack/cxf/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/main/module.xml
(from rev 14090,
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/main/module.xml)
===================================================================
---
stack/cxf/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/main/module.xml
(rev 0)
+++
stack/cxf/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsconsume/main/module.xml 2011-04-14
15:52:34 UTC (rev 14100)
@@ -0,0 +1,33 @@
+<?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.tools.wsconsume">
+
+ <main-class name="org.jboss.wsf.spi.tools.cmd.WSConsume"/>
+
+ <dependencies>
+ <module name="org.jboss.ws.common"/>
+ </dependencies>
+
+</module>
Deleted:
stack/cxf/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsprovide/main/module.xml
===================================================================
---
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsprovide/main/module.xml 2011-04-14
12:58:25 UTC (rev 14090)
+++
stack/cxf/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsprovide/main/module.xml 2011-04-14
15:52:34 UTC (rev 14100)
@@ -1,33 +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.tools.wsprovide">
-
- <main-class name="org.jboss.wsf.spi.tools.cmd.WSProvide"/>
-
- <dependencies>
- <module name="org.jboss.ws.common"/>
- </dependencies>
-
-</module>
Copied:
stack/cxf/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsprovide/main/module.xml
(from rev 14090,
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsprovide/main/module.xml)
===================================================================
---
stack/cxf/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsprovide/main/module.xml
(rev 0)
+++
stack/cxf/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/tools/wsprovide/main/module.xml 2011-04-14
15:52:34 UTC (rev 14100)
@@ -0,0 +1,33 @@
+<?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.tools.wsprovide">
+
+ <main-class name="org.jboss.wsf.spi.tools.cmd.WSProvide"/>
+
+ <dependencies>
+ <module name="org.jboss.ws.common"/>
+ </dependencies>
+
+</module>