diff --git a/pom.xml b/pom.xml
index f0548224..ec3993eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
diff --git a/src/main/java/org/jboss/ws/httpserver_httpspi/HttpContextDelegate.java b/src/main/java/org/jboss/ws/httpserver_httpspi/HttpContextDelegate.java
index fecc2fb4..9bff0975 100644
--- a/src/main/java/org/jboss/ws/httpserver_httpspi/HttpContextDelegate.java
+++ b/src/main/java/org/jboss/ws/httpserver_httpspi/HttpContextDelegate.java
@@ -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 @@ public Set<String> getAttributeNames()
    @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
       {
diff --git a/src/main/java/org/jboss/ws/httpserver_httpspi/HttpExchangeDelegate.java b/src/main/java/org/jboss/ws/httpserver_httpspi/HttpExchangeDelegate.java
index e69c2577..f7c34e82 100644
--- a/src/main/java/org/jboss/ws/httpserver_httpspi/HttpExchangeDelegate.java
+++ b/src/main/java/org/jboss/ws/httpserver_httpspi/HttpExchangeDelegate.java
@@ -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;
    }
diff --git a/src/main/java/org/jboss/ws/httpserver_httpspi/HttpHandlerDelegate.java b/src/main/java/org/jboss/ws/httpserver_httpspi/HttpHandlerDelegate.java
index 7a1b9a06..1bd0412b 100644
--- a/src/main/java/org/jboss/ws/httpserver_httpspi/HttpHandlerDelegate.java
+++ b/src/main/java/org/jboss/ws/httpserver_httpspi/HttpHandlerDelegate.java
@@ -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;
diff --git a/src/main/java/org/jboss/ws/httpserver_httpspi/HttpServerContextFactory.java b/src/main/java/org/jboss/ws/httpserver_httpspi/HttpServerContextFactory.java
index b716ecca..63ce7390 100644
--- a/src/main/java/org/jboss/ws/httpserver_httpspi/HttpServerContextFactory.java
+++ b/src/main/java/org/jboss/ws/httpserver_httpspi/HttpServerContextFactory.java
@@ -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)
diff --git a/src/test/java/org/jboss/ws/httpserver_httpspi/EndpointAPITest.java b/src/test/java/org/jboss/ws/httpserver_httpspi/EndpointAPITest.java
index 3adb55df..0d297716 100644
--- a/src/test/java/org/jboss/ws/httpserver_httpspi/EndpointAPITest.java
+++ b/src/test/java/org/jboss/ws/httpserver_httpspi/EndpointAPITest.java
@@ -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@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