4:47 a.m.
Author: alessio.soldano(a)jboss.com
Date: 2011-02-23 05:47:34 -0500 (Wed, 23 Feb 2011)
New Revision: 13789
Added:
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-httpserver-httpspi/
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-httpserver-httpspi/main/
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-httpserver-httpspi/main/module.xml
Modified:
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:
[JBAS-8838][JBWS-3206] Adding jaxws-httpserver-httpspi module + fixing broken stack
uninstall against AS7
Added:
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-httpserver-httpspi/main/module.xml
===================================================================
---
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-httpserver-httpspi/main/module.xml
(rev 0)
+++
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-httpserver-httpspi/main/module.xml 2011-02-23
10:47:34 UTC (rev 13789)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2010, 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-httpserver-httpspi">
+
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+
+ <dependencies>
+ <module name="javax.xml.ws.api" />
+ <module name="com.sun.httpserver"/>
+ </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-22
23:04:44 UTC (rev 13788)
+++
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-02-23
10:47:34 UTC (rev 13789)
@@ -331,6 +331,11 @@
<include name="**/jbossws-cxf-client.jar"/>
</fileset>
</copy>
+ <copy todir="@{targetdir}/org/jboss/ws/jaxws-httpserver-httpspi/main"
flatten="false" overwrite="true">
+ <fileset dir="@{thirdpartydir}/lib">
+ <include name="**/jaxws-httpserver-httpspi.jar"/>
+ </fileset>
+ </copy>
<copy todir="@{targetdir}/org/jboss/ws/cxf/jbossws-cxf-server/main"
flatten="false" overwrite="true">
<fileset dir="@{thirdpartydir}/lib">
<include name="**/jbossws-cxf-server.jar"/>
@@ -474,12 +479,12 @@
<delete includeemptydirs="true" verbose="true">
<fileset dir="${jboss.modules}">
- <include
name="**/org/jboss/as/webservices/main/jbossws-cxf-resources-*"/>
+ <include
name="**/org/jboss/as/webservices/main/jbossws-*-resources*"/>
</fileset>
</delete>
<!-- delete content of last deployment -->
- <delete verbose="true">
+ <delete includeemptydirs="true" verbose="true">
<fileset dir="${jboss.modules}"
includes="${jbossws.modules.conf}"/>
</delete>
</sequential>
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 2011-02-22
23:04:44 UTC (rev 13788)
+++
stack/cxf/trunk/modules/resources/src/main/resources/resources/modules-deploy.conf 2011-02-23
10:47:34 UTC (rev 13789)
@@ -1 +1 @@
-org/apache/cxf, org/apache/neethi, org/apache/ws/commons/xmlschema, org/jboss/ws
\ No newline at end of file
+org/apache/cxf/**, org/apache/neethi/**, org/apache/ws/commons/xmlschema/**,
org/jboss/ws/cxf/**, org/jboss/ws/**
\ No newline at end of file