Author: alessio.soldano(a)jboss.com Date: 2011-05-10 11:40:05 -0400 (Tue, 10 May 2011) New Revision: 14346 Modified: projects/jaxws-jboss-httpserver-httpspi/trunk/pom.xml projects/jaxws-jboss-httpserver-httpspi/trunk/src/main/java/org/jboss/ws/httpserver_httpspi/HttpContextDelegate.java projects/jaxws-jboss-httpserver-httpspi/trunk/src/main/java/org/jboss/ws/httpserver_httpspi/HttpExchangeDelegate.java projects/jaxws-jboss-httpserver-httpspi/trunk/src/main/java/org/jboss/ws/httpserver_httpspi/HttpHandlerDelegate.java projects/jaxws-jboss-httpserver-httpspi/trunk/src/main/java/org/jboss/ws/httpserver_httpspi/HttpServerContextFactory.java projects/jaxws-jboss-httpserver-httpspi/trunk/src/test/java/org/jboss/ws/httpserver_httpspi/EndpointAPITest.java Log: Use org.jboss.com.sun.httpserver Modified: projects/jaxws-jboss-httpserver-httpspi/trunk/pom.xml =================================================================== --- projects/jaxws-jboss-httpserver-httpspi/trunk/pom.xml 2011-05-10 14:15:57 UTC (rev 14345) +++ projects/jaxws-jboss-httpserver-httpspi/trunk/pom.xml 2011-05-10 15:40:05 UTC (rev 14346) @@ -26,10 +26,11 @@ <!-- Properties --> <properties> - <jaxws.version>1.0.0.Beta1</jaxws.version> + <jaxws.version>1.0.0.Final</jaxws.version> <junit.version>4.8.1</junit.version> <cxf.version>2.3.0</cxf.version> - <servlet-api.version>1.0.0.Beta2</servlet-api.version> + <servlet-api.version>1.0.0.Final</servlet-api.version> + <jboss.httpserver.version>1.0.0.Beta1</jboss.httpserver.version> </properties> <!-- Dependencies --> @@ -38,7 +39,12 @@ <groupId>org.jboss.spec.javax.xml.ws</groupId> <artifactId>jboss-jaxws-api_2.2_spec</artifactId> <version>${jaxws.version}</version> - </dependency> + </dependency> + <dependency> + <groupId>org.jboss.com.sun.httpserver</groupId> + <artifactId>httpserver</artifactId> + <version>${jboss.httpserver.version}</version> + </dependency> <!-- test dependencies --> <dependency> Modified: projects/jaxws-jboss-httpserver-httpspi/trunk/src/main/java/org/jboss/ws/httpserver_httpspi/HttpContextDelegate.java =================================================================== --- projects/jaxws-jboss-httpserver-httpspi/trunk/src/main/java/org/jboss/ws/httpserver_httpspi/HttpContextDelegate.java 2011-05-10 14:15:57 UTC (rev 14345) +++ projects/jaxws-jboss-httpserver-httpspi/trunk/src/main/java/org/jboss/ws/httpserver_httpspi/HttpContextDelegate.java 2011-05-10 15:40:05 UTC (rev 14346) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * Copyright 2011, Red Hat Middleware LLC, and individual contributors * as indicated by the @author tags. See the copyright.txt file in the * distribution for a full listing of individual contributors. * @@ -35,13 +35,12 @@ * @since 22-Aug-2010 * */ -@SuppressWarnings("restriction") public class HttpContextDelegate extends HttpContext { - private com.sun.net.httpserver.HttpContext delegate; + private org.jboss.com.sun.net.httpserver.HttpContext delegate; private String path; - public HttpContextDelegate(com.sun.net.httpserver.HttpContext delegate, String path) + public HttpContextDelegate(org.jboss.com.sun.net.httpserver.HttpContext delegate, String path) { this.delegate = delegate; this.path = path; @@ -70,9 +69,9 @@ @Override public void setHandler(HttpHandler handler) { - if (handler instanceof com.sun.net.httpserver.HttpHandler) + if (handler instanceof org.jboss.com.sun.net.httpserver.HttpHandler) { - delegate.setHandler((com.sun.net.httpserver.HttpHandler) handler); + delegate.setHandler((org.jboss.com.sun.net.httpserver.HttpHandler) handler); } else { Modified: projects/jaxws-jboss-httpserver-httpspi/trunk/src/main/java/org/jboss/ws/httpserver_httpspi/HttpExchangeDelegate.java =================================================================== --- projects/jaxws-jboss-httpserver-httpspi/trunk/src/main/java/org/jboss/ws/httpserver_httpspi/HttpExchangeDelegate.java 2011-05-10 14:15:57 UTC (rev 14345) +++ projects/jaxws-jboss-httpserver-httpspi/trunk/src/main/java/org/jboss/ws/httpserver_httpspi/HttpExchangeDelegate.java 2011-05-10 15:40:05 UTC (rev 14346) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * Copyright 2011, Red Hat Middleware LLC, and individual contributors * as indicated by the @author tags. See the copyright.txt file in the * distribution for a full listing of individual contributors. * @@ -34,8 +34,8 @@ import javax.xml.ws.spi.http.HttpContext; import javax.xml.ws.spi.http.HttpExchange; -import com.sun.net.httpserver.HttpServer; -import com.sun.net.httpserver.HttpsServer; +import org.jboss.com.sun.net.httpserver.HttpServer; +import org.jboss.com.sun.net.httpserver.HttpsServer; /** * A javax.xml.ws.spi.http.HttpExchange that delegates @@ -45,15 +45,14 @@ * @since 22-Aug-2010 * */ -@SuppressWarnings("restriction") public class HttpExchangeDelegate extends HttpExchange { - private com.sun.net.httpserver.HttpExchange delegate; + private org.jboss.com.sun.net.httpserver.HttpExchange delegate; private HttpContextDelegate contextDelegate; private OutputStream wrappeddOutputStream; private int status; - public HttpExchangeDelegate(com.sun.net.httpserver.HttpExchange delegate) + public HttpExchangeDelegate(org.jboss.com.sun.net.httpserver.HttpExchange delegate) { this.delegate = delegate; } Modified: projects/jaxws-jboss-httpserver-httpspi/trunk/src/main/java/org/jboss/ws/httpserver_httpspi/HttpHandlerDelegate.java =================================================================== --- projects/jaxws-jboss-httpserver-httpspi/trunk/src/main/java/org/jboss/ws/httpserver_httpspi/HttpHandlerDelegate.java 2011-05-10 14:15:57 UTC (rev 14345) +++ projects/jaxws-jboss-httpserver-httpspi/trunk/src/main/java/org/jboss/ws/httpserver_httpspi/HttpHandlerDelegate.java 2011-05-10 15:40:05 UTC (rev 14346) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * Copyright 2011, Red Hat Middleware LLC, and individual contributors * as indicated by the @author tags. See the copyright.txt file in the * distribution for a full listing of individual contributors. * @@ -23,8 +23,8 @@ import java.io.IOException; -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; /** * A com.sun.net.httpserver.HttpHandler delegating @@ -34,7 +34,6 @@ * @sine 22-Aug-2010 * */ -@SuppressWarnings("restriction") public class HttpHandlerDelegate implements HttpHandler { private javax.xml.ws.spi.http.HttpHandler delegate; Modified: projects/jaxws-jboss-httpserver-httpspi/trunk/src/main/java/org/jboss/ws/httpserver_httpspi/HttpServerContextFactory.java =================================================================== --- projects/jaxws-jboss-httpserver-httpspi/trunk/src/main/java/org/jboss/ws/httpserver_httpspi/HttpServerContextFactory.java 2011-05-10 14:15:57 UTC (rev 14345) +++ projects/jaxws-jboss-httpserver-httpspi/trunk/src/main/java/org/jboss/ws/httpserver_httpspi/HttpServerContextFactory.java 2011-05-10 15:40:05 UTC (rev 14346) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * Copyright 2011, Red Hat Middleware LLC, and individual contributors * as indicated by the @author tags. See the copyright.txt file in the * distribution for a full listing of individual contributors. * @@ -21,7 +21,7 @@ */ package org.jboss.ws.httpserver_httpspi; -import com.sun.net.httpserver.HttpServer; +import org.jboss.com.sun.net.httpserver.HttpServer; import javax.xml.ws.spi.http.HttpContext; /** @@ -31,7 +31,6 @@ * @since 22-Aug-2010 * */ -@SuppressWarnings("restriction") public class HttpServerContextFactory { public static HttpContext createHttpContext(HttpServer server, String contextPath, String path) Modified: projects/jaxws-jboss-httpserver-httpspi/trunk/src/test/java/org/jboss/ws/httpserver_httpspi/EndpointAPITest.java =================================================================== --- projects/jaxws-jboss-httpserver-httpspi/trunk/src/test/java/org/jboss/ws/httpserver_httpspi/EndpointAPITest.java 2011-05-10 14:15:57 UTC (rev 14345) +++ projects/jaxws-jboss-httpserver-httpspi/trunk/src/test/java/org/jboss/ws/httpserver_httpspi/EndpointAPITest.java 2011-05-10 15:40:05 UTC (rev 14346) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * Copyright 2011, Red Hat Middleware LLC, and individual contributors * as indicated by the @author tags. See the copyright.txt file in the * distribution for a full listing of individual contributors. * @@ -43,25 +43,24 @@ /** * A JAXWS 2.2 Endoint.publish(HttpContext context) API test - * using the JDK6 httpsever as underlying http container + * using the JBoss httpsever as underlying http container * * @author alessio.soldano(a)jboss.com * @since 22-Aug-2010 * */ -@SuppressWarnings("restriction") public class EndpointAPITest extends Assert { private static int currentPort = 9876; - private com.sun.net.httpserver.HttpServer server; + private org.jboss.com.sun.net.httpserver.HttpServer server; @Before public void setUp() throws IOException { currentPort++; - server = com.sun.net.httpserver.HttpServer.create(new InetSocketAddress(currentPort), 0); + server = org.jboss.com.sun.net.httpserver.HttpServer.create(new InetSocketAddress(currentPort), 0); } @After