[AS7-664] Switch to renamed HTTP server classes.

jbossas · May 9, 2011 · f9d8f77 · f9d8f77
1 parent 066bbbc
commit f9d8f77
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 22 deletions.
diff --git a/domain-http-api/src/main/java/org/jboss/as/domain/http/server/ConsoleHandler.java b/domain-http-api/src/main/java/org/jboss/as/domain/http/server/ConsoleHandler.java
@@ -46,9 +46,9 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import com.sun.net.httpserver.Headers;
-import com.sun.net.httpserver.HttpExchange;
-import com.sun.net.httpserver.HttpServer;
+import org.jboss.com.sun.net.httpserver.Headers;
+import org.jboss.com.sun.net.httpserver.HttpExchange;
+import org.jboss.com.sun.net.httpserver.HttpServer;
 
 /**
  * @author Heiko Braun

diff --git a/domain-http-api/src/main/java/org/jboss/as/domain/http/server/DomainApiHandler.java b/domain-http-api/src/main/java/org/jboss/as/domain/http/server/DomainApiHandler.java
@@ -53,21 +53,19 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
-
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.jboss.as.controller.ModelController;
 import org.jboss.as.controller.client.OperationBuilder;
 import org.jboss.as.domain.http.server.multipart.BoundaryDelimitedInputStream;
 import org.jboss.as.domain.http.server.multipart.MimeHeaderParser;
+import org.jboss.com.sun.net.httpserver.Headers;
+import org.jboss.com.sun.net.httpserver.HttpExchange;
+import org.jboss.com.sun.net.httpserver.HttpServer;
 import org.jboss.dmr.ModelNode;
 import org.jboss.logging.Logger;
 
-import com.sun.net.httpserver.Headers;
-import com.sun.net.httpserver.HttpExchange;
-import com.sun.net.httpserver.HttpServer;
-
 /**
  * An embedded web server that provides a JSON over HTTP API to the domain management model.
  *

diff --git a/domain-http-api/src/main/java/org/jboss/as/domain/http/server/ManagementHttpHandler.java b/domain-http-api/src/main/java/org/jboss/as/domain/http/server/ManagementHttpHandler.java
@@ -21,8 +21,8 @@
  */
 package org.jboss.as.domain.http.server;
 
-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;
 
 /**
  * An interface to add a couple of additional lifecycle methods to the HttpHandler interface.

diff --git a/domain-http-api/src/main/java/org/jboss/as/domain/http/server/ManagementHttpServer.java b/domain-http-api/src/main/java/org/jboss/as/domain/http/server/ManagementHttpServer.java
@@ -21,16 +21,14 @@
  */
 package org.jboss.as.domain.http.server;
 
-import java.io.File;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.Executor;
 
 import org.jboss.as.controller.ModelController;
-
-import com.sun.net.httpserver.HttpServer;
+import org.jboss.com.sun.net.httpserver.HttpServer;
 
 /**
  * The general HTTP server for handling management API requests.

diff --git a/domain-http-api/src/main/java/org/jboss/as/domain/http/server/TrailingSlashFilter.java b/domain-http-api/src/main/java/org/jboss/as/domain/http/server/TrailingSlashFilter.java
@@ -26,9 +26,9 @@
 import java.io.IOException;
 import java.net.URI;
 
-import com.sun.net.httpserver.Filter;
-import com.sun.net.httpserver.Headers;
-import com.sun.net.httpserver.HttpExchange;
+import org.jboss.com.sun.net.httpserver.Filter;
+import org.jboss.com.sun.net.httpserver.Headers;
+import org.jboss.com.sun.net.httpserver.HttpExchange;
 
 /**
  * Filter to ensure request to a context have a trailing slash.

diff --git a/...in-http-api/src/main/java/org/jboss/as/domain/http/server/multipart/MimeHeaderParser.java b/...in-http-api/src/main/java/org/jboss/as/domain/http/server/multipart/MimeHeaderParser.java
@@ -22,11 +22,11 @@
 
 package org.jboss.as.domain.http.server.multipart;
 
-import com.sun.net.httpserver.Headers;
-
 import java.io.IOException;
 import java.io.InputStream;
 
+import org.jboss.com.sun.net.httpserver.Headers;
+
 /**
  * Parses MIME headers
  *

diff --git a/domain-http-api/src/test/java/ConsoleHandlerTest.java b/domain-http-api/src/test/java/ConsoleHandlerTest.java
@@ -1,7 +1,24 @@
-import com.sun.net.httpserver.HttpServer;
-import junit.framework.TestCase;
-import org.jboss.as.domain.http.server.ConsoleHandler;
-
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, 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.
+ */
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -10,6 +27,10 @@
 import java.net.URL;
 import java.util.concurrent.Executors;
 
+import junit.framework.TestCase;
+import org.jboss.as.domain.http.server.ConsoleHandler;
+import org.jboss.com.sun.net.httpserver.HttpServer;
+
 /**
  * @author Heiko Braun
  * @date 3/14/11