11:17 a.m.
Author: alessio.soldano(a)jboss.com
Date: 2011-05-10 12:17:01 -0400 (Tue, 10 May 2011)
New Revision: 14349
Added:
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-jboss-httpserver-httpspi/
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-jboss-httpserver-httpspi/main/
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-jboss-httpserver-httpspi/main/module.xml
Removed:
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-httpserver-httpspi/
Modified:
stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml
stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestination.java
stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngine.java
stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngineTest.java
stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/resources/deploy.conf
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/cxf/trunk/pom.xml
Log:
- com.sun.net.httpserver -> org.jboss.com.sun.httpserver
- removal of duplicated dependencies in main pom.xml
Modified: stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml
===================================================================
--- stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml 2011-05-10 15:43:51
UTC (rev 14348)
+++ stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml 2011-05-10 16:17:01
UTC (rev 14349)
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.jboss.ws.projects</groupId>
- <artifactId>jaxws-httpserver-httpspi</artifactId>
+ <artifactId>jaxws-jboss-httpserver-httpspi</artifactId>
</dependency>
<!-- CXF dependencies -->
Modified:
stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestination.java
===================================================================
---
stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestination.java 2011-05-10
15:43:51 UTC (rev 14348)
+++
stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerDestination.java 2011-05-10
16:17:01 UTC (rev 14349)
@@ -35,8 +35,8 @@
import org.apache.cxf.transport.http_jaxws_spi.JAXWSHttpSpiDestination;
import org.jboss.ws.httpserver_httpspi.HttpExchangeDelegate;
-import com.sun.net.httpserver.HttpExchange;
-import com.sun.net.httpserver.HttpHandler;
+import org.jboss.com.sun.net.httpserver.HttpExchange;
+import org.jboss.com.sun.net.httpserver.HttpHandler;
/**
* HTTP destination to be used with the JDK6 httpserver; this extends the
Modified:
stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngine.java
===================================================================
---
stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngine.java 2011-05-10
15:43:51 UTC (rev 14348)
+++
stack/cxf/trunk/modules/addons/transports/http/httpserver/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngine.java 2011-05-10
16:17:01 UTC (rev 14349)
@@ -30,8 +30,8 @@
import org.apache.cxf.common.logging.LogUtils;
import org.jboss.ws.httpserver_httpspi.PathUtils;
-import com.sun.net.httpserver.HttpHandler;
-import com.sun.net.httpserver.HttpServer;
+import org.jboss.com.sun.net.httpserver.HttpHandler;
+import org.jboss.com.sun.net.httpserver.HttpServer;
/**
* A server engine that internally uses the JDK6 httpserver
@@ -40,7 +40,6 @@
* @since 19-Aug-2010
*
*/
-@SuppressWarnings("restriction")
public class HttpServerEngine
{
private static final Logger LOG = LogUtils.getL7dLogger(HttpServerEngine.class);
Modified:
stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngineTest.java
===================================================================
---
stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngineTest.java 2011-05-10
15:43:51 UTC (rev 14348)
+++
stack/cxf/trunk/modules/addons/transports/http/httpserver/src/test/java/org/jboss/wsf/stack/cxf/addons/transports/httpserver/HttpServerEngineTest.java 2011-05-10
16:17:01 UTC (rev 14349)
@@ -119,8 +119,7 @@
}
}
- @SuppressWarnings("restriction")
- private class MyTestHandler implements com.sun.net.httpserver.HttpHandler
+ private class MyTestHandler implements org.jboss.com.sun.net.httpserver.HttpHandler
{
volatile int count;
@@ -130,7 +129,7 @@
}
@Override
- public void handle(com.sun.net.httpserver.HttpExchange exchange) throws IOException
{
+ public void handle(org.jboss.com.sun.net.httpserver.HttpExchange exchange) throws
IOException {
count++;
exchange.sendResponseHeaders(200, 0);
OutputStream os = exchange.getResponseBody();
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
15:43:51 UTC (rev 14348)
+++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-05-10
16:17:01 UTC (rev 14349)
@@ -51,7 +51,7 @@
<unpack>false</unpack>
<includes>
<include>org.jboss.ws.cxf:*</include>
-
<include>org.jboss.ws.projects:jaxws-httpserver-httpspi:jar</include>
+
<include>org.jboss.ws.projects:jaxws-jboss-httpserver-httpspi: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/modules/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml
===================================================================
---
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml 2011-05-10
15:43:51 UTC (rev 14348)
+++
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml 2011-05-10
16:17:01 UTC (rev 14349)
@@ -33,7 +33,7 @@
<module name="org.jboss.ws.common" />
<module name="javax.annotation.api" />
<module name="javax.xml.ws.api" />
- <module name="org.jboss.ws.jaxws-httpserver-httpspi" />
+ <module name="org.jboss.ws.jaxws-jboss-httpserver-httpspi" />
<module name="org.apache.cxf" services="import">
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull
in the bus extensions from META-INF -->
Added:
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-jboss-httpserver-httpspi/main/module.xml
===================================================================
---
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-jboss-httpserver-httpspi/main/module.xml
(rev 0)
+++
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/jaxws-jboss-httpserver-httpspi/main/module.xml 2011-05-10
16:17:01 UTC (rev 14349)
@@ -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-jboss-httpserver-httpspi">
+
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+
+ <dependencies>
+ <module name="javax.xml.ws.api" />
+ <module name="org.jboss.com.sun.httpserver"/>
+ </dependencies>
+</module>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/deploy.conf
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/deploy.conf 2011-05-10
15:43:51 UTC (rev 14348)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/deploy.conf 2011-05-10
16:17:01 UTC (rev 14349)
@@ -1 +1 @@
-bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat
bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jbossws-native-jaxws-ext.jar
client/cxf-*.jar client/geronimo-*.jar client/jaxws-httpserver-httpspi.jar
client/neethi.jar client/saaj-impl.jar client/spring-*.jar client/wss4j.jar
client/XmlSchema.jar client/asm.jar client/jetty*.jar client/velocity.jar
client/commons-collections.jar client/commons-lang.jar client/jettison.jar
client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar
client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar
client/policy.jar client/jbossws-cxf-* client/jbossws-native-jaxrpc.jar
client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar
client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar
client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-services.jar
client/jbossws-common.jar client!
/jbossws-common-tools.jar client/jbossws-framework.jar client/jbossws-api.jar
client/jbossws-spi.jar client/wscommons-policy.jar client/stax-ex.jar
client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar
common/lib/jbossws-native-jaxws-ext.jar common/lib/cxf-*.jar
common/lib/jaxws-httpserver-httpspi.jar common/lib/geronimo-*.jar common/lib/neethi.jar
common/lib/saaj-impl.jar common/lib/spring-*.jar common/lib/wss4j.jar
common/lib/XmlSchema.jar common/lib/asm.jar common/lib/FastInfoset.jar
common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/wscommons-policy.jar
common/lib/wsdl4j.jar common/lib/xmlsec.jar common/lib/jbossws-native-jaxrpc.jar
common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar
common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar
common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-api.jar
common/lib/jbossws-spi.jar common/lib/com!
mons-beanutils.jar lib/endorsed/*jbossws* lib/endorsed/*jaxb*.!
jar lib/
endorsed/*jaxws*.jar
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat
bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jbossws-native-jaxws-ext.jar
client/cxf-*.jar client/geronimo-*.jar client/jaxws-*httpserver-httpspi.jar
client/neethi.jar client/saaj-impl.jar client/spring-*.jar client/wss4j.jar
client/XmlSchema.jar client/asm.jar client/jetty*.jar client/velocity.jar
client/commons-collections.jar client/commons-lang.jar client/jettison.jar
client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar
client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar
client/policy.jar client/jbossws-cxf-* client/jbossws-native-jaxrpc.jar
client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar
client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar
client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-services.jar
client/jbossws-common.jar clien!
t/jbossws-common-tools.jar client/jbossws-framework.jar client/jbossws-api.jar
client/jbossws-spi.jar client/wscommons-policy.jar client/stax-ex.jar
client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar
common/lib/jbossws-native-jaxws-ext.jar common/lib/cxf-*.jar
common/lib/jaxws-httpserver-httpspi.jar common/lib/geronimo-*.jar common/lib/neethi.jar
common/lib/saaj-impl.jar common/lib/spring-*.jar common/lib/wss4j.jar
common/lib/XmlSchema.jar common/lib/asm.jar common/lib/FastInfoset.jar
common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/wscommons-policy.jar
common/lib/wsdl4j.jar common/lib/xmlsec.jar common/lib/jbossws-native-jaxrpc.jar
common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar
common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar
common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-api.jar
common/lib/jbossws-spi.jar common/lib/co!
mmons-beanutils.jar lib/endorsed/*jbossws* lib/endorsed/*jaxb*!
.jar lib
/endorsed/*jaxws*.jar
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
15:43:51 UTC (rev 14348)
+++
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-05-10
16:17:01 UTC (rev 14349)
@@ -34,7 +34,7 @@
<include name="**/jaxb-xjc.jar"/>
<include name="**/jaxrpc-api.jar"/>
<include name="**/jaxws-api.jar"/>
- <include name="**/jaxws-httpserver-httpspi.jar"/>
+ <include name="**/jaxws-jboss-httpserver-httpspi.jar"/>
<include name="**/jsr181-api.jar"/>
<include name="**/jbossws-api.jar"/>
<include name="**/jbossws-common.jar"/>
@@ -73,7 +73,7 @@
<include name="**/FastInfoset.jar"/>
<include name="**/jaxrpc-api.jar"/>
<include name="**/jaxws-api.jar"/>
- <include name="**/jaxws-httpserver-httpspi.jar"/>
+ <include name="**/jaxws-jboss-httpserver-httpspi.jar"/>
<include name="**/jsr181-api.jar"/>
<include name="**/jboss-jaxb-intros.jar"/>
<include name="**/jbossws-api.jar"/>
@@ -332,9 +332,9 @@
<include name="**/jbossws-cxf-client.jar"/>
</fileset>
</copy>
- <copy todir="@{targetdir}/org/jboss/ws/jaxws-httpserver-httpspi/main"
flatten="false" overwrite="true">
+ <copy
todir="@{targetdir}/org/jboss/ws/jaxws-jboss-httpserver-httpspi/main"
flatten="false" overwrite="true">
<fileset dir="@{thirdpartydir}/lib">
- <include name="**/jaxws-httpserver-httpspi.jar"/>
+ <include name="**/jaxws-jboss-httpserver-httpspi.jar"/>
</fileset>
</copy>
<copy todir="@{targetdir}/org/jboss/ws/cxf/jbossws-cxf-server/main"
flatten="false" overwrite="true">
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2011-05-10 15:43:51 UTC (rev 14348)
+++ stack/cxf/trunk/pom.xml 2011-05-10 16:17:01 UTC (rev 14349)
@@ -67,7 +67,7 @@
<jboss.security.sx.version>2.0.4</jboss.security.sx.version>
<jboss.xb.version>2.0.2.Beta7</jboss.xb.version>
<picketbox.version>3.0.0.Beta5</picketbox.version>
-
<jaxws-httpserver-httpspi.version>1.0.0.GA</jaxws-httpserver-httpspi.version>
+
<jaxws-jboss-httpserver-httpspi.version>1.0.0.GA</jaxws-jboss-httpserver-httpspi.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>
@@ -162,8 +162,8 @@
<!-- END -->
<dependency>
<groupId>org.jboss.ws.projects</groupId>
- <artifactId>jaxws-httpserver-httpspi</artifactId>
- <version>${jaxws-httpserver-httpspi.version}</version>
+ <artifactId>jaxws-jboss-httpserver-httpspi</artifactId>
+ <version>${jaxws-jboss-httpserver-httpspi.version}</version>
</dependency>
<!-- provided apis -->
@@ -1181,19 +1181,6 @@
<version>3.8.1</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-shared-testsuite</artifactId>
- <version>${jbossws.shared.testsuite.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-shared-testsuite</artifactId>
- <version>${jbossws.shared.testsuite.version}</version>
- <type>zip</type>
- <scope>test</scope>
- </dependency>
</dependencies>
</dependencyManagement>