svn commit: r1334794 - in /openejb/trunk/openejb/server/openejb-http/src/main/java/org/apache/openejb/server/httpd: HttpRequest.java HttpRequestImpl.java

[rmannibucau]

Author: rmannibucau
Date: Sun May  6 21:50:32 2012
New Revision: 1334794

URL: http://svn.apache.org/viewvc?rev=1334794&view=rev
Log:
minor rework of http layer

Modified:
    
openejb/trunk/openejb/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequest.java
    
openejb/trunk/openejb/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java

Modified: 
openejb/trunk/openejb/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequest.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequest.java?rev=1334794&r1=1334793&r2=1334794&view=diff
==============================================================================
--- 
openejb/trunk/openejb/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequest.java
 (original)
+++ 
openejb/trunk/openejb/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequest.java
 Sun May  6 21:50:32 2012
@@ -26,6 +26,8 @@ import java.util.Map;
  *
  */
 public interface HttpRequest extends java.io.Serializable, HttpServletRequest {
+
+
     /**
      * Request methods
      */

Modified: 
openejb/trunk/openejb/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java?rev=1334794&r1=1334793&r2=1334794&view=diff
==============================================================================
--- 
openejb/trunk/openejb/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java
 (original)
+++ 
openejb/trunk/openejb/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpRequestImpl.java
 Sun May  6 21:50:32 2012
@@ -17,6 +17,7 @@
 package org.apache.openejb.server.httpd;
 
 import org.apache.openejb.core.security.jaas.UserPrincipal;
+import org.apache.openejb.loader.SystemInstance;
 import org.apache.openejb.util.ArrayEnumeration;
 import org.apache.openejb.util.Logger;
 
@@ -687,6 +688,22 @@ public class HttpRequestImpl implements 
         return path;
     }
 
+    public String extractContextPath() {
+        if 
(SystemInstance.get().getOptions().get("openejb.webservice.old-deployment", 
false)) {
+            return path;
+        }
+
+        String uri = getURI().getPath();
+        if (uri.startsWith("/")) {
+            uri = uri.substring(1);
+        }
+        int idx = uri.indexOf("/");
+        if (idx < 0) {
+            return uri;
+        }
+        return uri.substring(0, idx);
+    }
+
     @Override
     public Cookie[] getCookies() {
         if (cookies != null) return toCookies(cookies);
@@ -933,4 +950,12 @@ public class HttpRequestImpl implements 
     public void removeAttribute(String s) {
         attributes.remove(s);
     }
+
+    public String requestRawPath() {
+        try {
+            return new URI(getRequestURI()).getRawPath();
+        } catch (URISyntaxException e) {
+            return getRequestURI();
+        }
+    }
 }
\ No newline at end of file