svn commit: r490108 - in /incubator/cxf/trunk/rt: core/src/test/java/org/apache/cxf/transport/HttpUriMapperTest.java transports/http/src/main/java/org/apache/cxf/transport/http/JettyHTTPServerEngine.java

[ningjiang]

Author: ningjiang
Date: Sun Dec 24 19:56:05 2006
New Revision: 490108

URL: http://svn.apache.org/viewvc?view=rev&rev=490108
Log:
Removed the http transports duplicate code

Modified:
    
incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/transport/HttpUriMapperTest.java
    
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/JettyHTTPServerEngine.java

Modified: 
incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/transport/HttpUriMapperTest.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/transport/HttpUriMapperTest.java?view=diff&rev=490108&r1=490107&r2=490108
==============================================================================
--- 
incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/transport/HttpUriMapperTest.java
 (original)
+++ 
incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/transport/HttpUriMapperTest.java
 Sun Dec 24 19:56:05 2006
@@ -33,7 +33,12 @@
         url = new URL("http://localhost:8080/SoapContext/SoapPort/";);
         path = url.getPath();
         assertEquals("/SoapContext/SoapPort", 
HttpUriMapper.getContextName(path));
+        
+        url = new URL("http://localhost:8080/";);
+        path = url.getPath();
+        assertEquals("", HttpUriMapper.getContextName(path));
     }
+    
     
     public void testGetResourceBase() throws Exception {
         URL url = new URL("http://localhost:8080/SoapContext/SoapPort";);

Modified: 
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/JettyHTTPServerEngine.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/JettyHTTPServerEngine.java?view=diff&rev=490108&r1=490107&r2=490108
==============================================================================
--- 
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/JettyHTTPServerEngine.java
 (original)
+++ 
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/JettyHTTPServerEngine.java
 Sun Dec 24 19:56:05 2006
@@ -171,26 +171,17 @@
      * 
      * @param url the URL the servant was registered against.
      */
-    public synchronized void removeServant(URL url) {
-        String lpath = url.getPath();
+    public synchronized void removeServant(URL url) {        
         
-        String contextName = "";
-        String servletMap = lpath;
-        int idx = lpath.lastIndexOf('/');
-        if (idx > 0) {
-            contextName = lpath.substring(0, idx);
-            servletMap = lpath.substring(idx);
-        }
-        if ("".equals(servletMap) && "".equals(contextName)) {
-            servletMap = "/";
-        }
+        String contextName = HttpUriMapper.getContextName(url.getPath());
+        final String smap = HttpUriMapper.getResourceBase(url.getPath());
 
         boolean found = false;
         // REVISIT: how come server can be null?
         if (server != null) {
             HttpContext context = server.getContext(contextName);
             for (HttpHandler handler : context.getHandlers()) {
-                if (servletMap.equals(handler.getName())) {
+                if (smap.equals(handler.getName())) {
                     try {
                         handler.stop();
                     } catch (InterruptedException e) {
@@ -222,22 +213,15 @@
      * @return the HttpHandler if registered
      */
     public synchronized HttpHandler getServant(URL url)  {
-        String lpath = url.getPath();
-        
-        String contextName = "";
-        String servletMap = lpath;
-        int idx = lpath.lastIndexOf('/');
-        if (idx > 0) {
-            contextName = lpath.substring(0, idx);
-            servletMap = lpath.substring(idx);
-        }
+        String contextName = HttpUriMapper.getContextName(url.getPath());
+        final String smap = HttpUriMapper.getResourceBase(url.getPath());
         
         HttpHandler ret = null;
         // REVISIT: how come server can be null?
         if (server != null) {
             HttpContext context = server.getContext(contextName);
             for (HttpHandler handler : context.getHandlers()) {
-                if (servletMap.equals(handler.getName())) {
+                if (smap.equals(handler.getName())) {
                     ret = handler;
                     break;
                 }