[jbossws-commits] JBossWS SVN: r14351 - in stack/cxf/trunk: modules/addons/transports/http/httpserver and 2 other directories.

[jbossws-commits at lists.jboss.org]

Author: alessio.soldano at jboss.com
Date: 2011-05-10 17:12:50 -0400 (Tue, 10 May 2011)
New Revision: 14351

Modified:
   stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml
   stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
   stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
   stack/cxf/trunk/pom.xml
Log:
Deploy org.jboss.com.sun.httpserver on AS6


Modified: stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml
===================================================================
--- stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml	2011-05-10 21:01:43 UTC (rev 14350)
+++ stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml	2011-05-10 21:12:50 UTC (rev 14351)
@@ -29,6 +29,10 @@
       <groupId>org.apache.cxf</groupId>
       <artifactId>cxf-rt-transports-http</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.jboss.com.sun.httpserver</groupId>
+      <artifactId>httpserver</artifactId>
+    </dependency>
     
     <!-- Spring -->
     <dependency>

Modified: stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml	2011-05-10 21:01:43 UTC (rev 14350)
+++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml	2011-05-10 21:12:50 UTC (rev 14351)
@@ -52,6 +52,7 @@
             <includes>
               <include>org.jboss.ws.cxf:*</include>
               <include>org.jboss.ws.projects:jaxws-jboss-httpserver-httpspi:jar</include>
+              <include>org.jboss.com.sun.httpserver:httpserver:jar</include>
               <include>org.apache.cxf:cxf-*</include>
               <include>org.apache.cxf.xjcplugins:cxf-*</include>
               <include>com.sun.xml.bind:jaxb-impl:jar</include>

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-05-10 21:01:43 UTC (rev 14350)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml	2011-05-10 21:12:50 UTC (rev 14351)
@@ -35,6 +35,7 @@
     <include name="**/jaxrpc-api.jar"/>
     <include name="**/jaxws-api.jar"/>
     <include name="**/jaxws-jboss-httpserver-httpspi.jar"/>
+    <include name="**/httpserver.jar"/>
     <include name="**/jsr181-api.jar"/>
     <include name="**/jbossws-api.jar"/>
     <include name="**/jbossws-common.jar"/>
@@ -74,6 +75,7 @@
     <include name="**/jaxrpc-api.jar"/>
     <include name="**/jaxws-api.jar"/>
     <include name="**/jaxws-jboss-httpserver-httpspi.jar"/>
+    <include name="**/httpserver.jar"/>
     <include name="**/jsr181-api.jar"/>
     <include name="**/jboss-jaxb-intros.jar"/>
     <include name="**/jbossws-api.jar"/>

Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml	2011-05-10 21:01:43 UTC (rev 14350)
+++ stack/cxf/trunk/pom.xml	2011-05-10 21:12:50 UTC (rev 14351)
@@ -68,6 +68,7 @@
     <jboss.xb.version>2.0.2.Beta7</jboss.xb.version>
     <picketbox.version>3.0.0.Beta5</picketbox.version>
     <jaxws-jboss-httpserver-httpspi.version>1.0.0.GA</jaxws-jboss-httpserver-httpspi.version>
+    <httpserver.version>1.0.0.Beta1</httpserver.version>
     <jaxb.api.version>1.0.0.Final</jaxb.api.version>
     <jaxb.impl.version>2.2</jaxb.impl.version>
     <jaxrpc.api.version>1.0.0.Final</jaxrpc.api.version>
@@ -983,6 +984,11 @@
         <artifactId>asm</artifactId>
         <version>${cxf.asm.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.jboss.com.sun.httpserver</groupId>
+        <artifactId>httpserver</artifactId>
+        <version>${httpserver.version}</version>
+      </dependency>
       <!-- Spring -->
       <dependency>
         <groupId>org.springframework</groupId>