svn commit: r591096 - in /incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet: AbstractCXFServlet.java ServletController.java

[dkulp]

Author: dkulp
Date: Thu Nov  1 10:31:35 2007
New Revision: 591096

URL: http://svn.apache.org/viewvc?rev=591096&view=rev
Log:
[CXF-1158] Ability to turn off rewritting of addresses in servlet

Modified:
    
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractCXFServlet.java
    
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java

Modified: 
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractCXFServlet.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractCXFServlet.java?rev=591096&r1=591095&r2=591096&view=diff
==============================================================================
--- 
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractCXFServlet.java
 (original)
+++ 
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractCXFServlet.java
 Thu Nov  1 10:31:35 2007
@@ -56,7 +56,15 @@
         ServletController newController = new 
ServletController(servletTransportFactory, this);
         if (hideServiceList != null) {
             newController.setHideServiceList(Boolean.valueOf(hideServiceList));
-        }    
+        }
+        String disableAddressUpdates = 
servletConfig.getInitParameter("disable-address-updates");
+        if (disableAddressUpdates != null) {
+            
newController.setDisableAddressUpdates(Boolean.valueOf(disableAddressUpdates));
+        }
+        String forcedBaseAddress = 
servletConfig.getInitParameter("base-address");
+        if (forcedBaseAddress != null) {
+            newController.setForcedBaseAddress(forcedBaseAddress);
+        }
         return newController;
     }
     

Modified: 
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java?rev=591096&r1=591095&r2=591096&view=diff
==============================================================================
--- 
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
 (original)
+++ 
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
 Thu Nov  1 10:31:35 2007
@@ -55,6 +55,8 @@
     private AbstractCXFServlet cxfServlet;
     private String lastBase = "";
     private boolean isHideServiceList;
+    private boolean disableAddressUpdates;
+    private String forcedBaseAddress;
  
     public ServletController(ServletTransportFactory df, AbstractCXFServlet 
servlet) {
         this.transport = df;
@@ -64,9 +66,18 @@
     public void setHideServiceList(boolean generate) {
         isHideServiceList = generate;
     }
+    public void setDisableAddressUpdates(boolean noupdates) {
+        disableAddressUpdates = noupdates;
+    }
+    public void setForcedBaseAddress(String s) {
+        forcedBaseAddress = s;
+    }
     
     private synchronized void updateDests(HttpServletRequest request) {
-        String base = getBaseURL(request);
+        if (disableAddressUpdates) {
+            return;
+        }
+        String base = forcedBaseAddress == null ? getBaseURL(request) : 
forcedBaseAddress;
                 
         if (base.equals(lastBase)) {
             return;