Modified: ofbiz/trunk/specialpurpose/assetmaint/webapp/ismgr/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/webapp/ismgr/WEB-INF/web.xml?rev=1761304&r1=1761303&r2=1761304&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/webapp/ismgr/WEB-INF/web.xml 
(original)
+++ ofbiz/trunk/specialpurpose/assetmaint/webapp/ismgr/WEB-INF/web.xml Sun Sep 
18 08:08:30 2016
@@ -55,29 +55,30 @@
     </context-param>
 
     <filter>
-        <display-name>ContextFilter</display-name>
-        <filter-name>ContextFilter</filter-name>
-        
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
-        <init-param>
-            <param-name>disableContextSecurity</param-name>
-            <param-value>N</param-value>
-        </init-param>
+        <display-name>ControlFilter</display-name>
+        <filter-name>ControlFilter</filter-name>
+        
<filter-class>org.apache.ofbiz.webapp.control.ControlFilter</filter-class>
         <init-param>
             <param-name>allowedPaths</param-name>
             
<param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images</param-value>
         </init-param>
         <init-param>
-            <param-name>errorCode</param-name>
-            <param-value>403</param-value>
-        </init-param>
-        <init-param>
             <param-name>redirectPath</param-name>
             <param-value>/control/main</param-value>
         </init-param>
     </filter>
+    <filter>
+        <display-name>ContextFilter</display-name>
+        <filter-name>ContextFilter</filter-name>
+        
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>ControlFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
     <filter-mapping>
         <filter-name>ContextFilter</filter-name>
-            <url-pattern>/*</url-pattern>
+        <url-pattern>/*</url-pattern>
     </filter-mapping>
 
     
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>

Modified: ofbiz/trunk/specialpurpose/bi/webapp/bi/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/bi/webapp/bi/WEB-INF/web.xml?rev=1761304&r1=1761303&r2=1761304&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/bi/webapp/bi/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/bi/webapp/bi/WEB-INF/web.xml Sun Sep 18 08:08:30 
2016
@@ -40,29 +40,30 @@
     </context-param>
 
     <filter>
-        <display-name>ContextFilter</display-name>
-        <filter-name>ContextFilter</filter-name>
-        
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
-        <init-param>
-            <param-name>disableContextSecurity</param-name>
-            <param-value>N</param-value>
-        </init-param>
+        <display-name>ControlFilter</display-name>
+        <filter-name>ControlFilter</filter-name>
+        
<filter-class>org.apache.ofbiz.webapp.control.ControlFilter</filter-class>
         <init-param>
             <param-name>allowedPaths</param-name>
             
<param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images</param-value>
         </init-param>
         <init-param>
-            <param-name>errorCode</param-name>
-            <param-value>403</param-value>
-        </init-param>
-        <init-param>
             <param-name>redirectPath</param-name>
             <param-value>/control/main</param-value>
         </init-param>
     </filter>
+    <filter>
+        <display-name>ContextFilter</display-name>
+        <filter-name>ContextFilter</filter-name>
+        
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>ControlFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
     <filter-mapping>
         <filter-name>ContextFilter</filter-name>
-            <url-pattern>/*</url-pattern>
+        <url-pattern>/*</url-pattern>
     </filter-mapping>
 
     
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>

Modified: ofbiz/trunk/specialpurpose/birt/webapp/accounting/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/accounting/WEB-INF/web.xml?rev=1761304&r1=1761303&r2=1761304&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/webapp/accounting/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/birt/webapp/accounting/WEB-INF/web.xml Sun Sep 
18 08:08:30 2016
@@ -46,26 +46,27 @@ under the License.
     </context-param>
 
     <filter>
-        <display-name>ContextFilter</display-name>
-        <filter-name>ContextFilter</filter-name>
-        
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
-        <init-param>
-            <param-name>disableContextSecurity</param-name>
-            <param-value>N</param-value>
-        </init-param>
+        <display-name>ControlFilter</display-name>
+        <filter-name>ControlFilter</filter-name>
+        
<filter-class>org.apache.ofbiz.webapp.control.ControlFilter</filter-class>
         <init-param>
             <param-name>allowedPaths</param-name>
             
<param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images</param-value>
         </init-param>
         <init-param>
-            <param-name>errorCode</param-name>
-            <param-value>403</param-value>
-        </init-param>
-        <init-param>
             <param-name>redirectPath</param-name>
             <param-value>/control/main</param-value>
         </init-param>
     </filter>
+    <filter>
+        <display-name>ContextFilter</display-name>
+        <filter-name>ContextFilter</filter-name>
+        
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>ControlFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
     <filter-mapping>
         <filter-name>ContextFilter</filter-name>
         <url-pattern>/*</url-pattern>

Modified: ofbiz/trunk/specialpurpose/birt/webapp/birt/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/birt/WEB-INF/web.xml?rev=1761304&r1=1761303&r2=1761304&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/webapp/birt/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/birt/webapp/birt/WEB-INF/web.xml Sun Sep 18 
08:08:30 2016
@@ -179,34 +179,31 @@ under the License.
     </context-param>
     
     <filter>
-        <display-name>ContextFilter</display-name>
-        <filter-name>ContextFilter</filter-name>
-        
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
-        
<init-param><param-name>disableContextSecurity</param-name><param-value>N</param-value></init-param>
+        <display-name>ControlFilter</display-name>
+        <filter-name>ControlFilter</filter-name>
+        
<filter-class>org.apache.ofbiz.webapp.control.ControlFilter</filter-class>
         <init-param>
             <param-name>allowedPaths</param-name>
             
<param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/frameset:/run:/preview:/download:/parameter:/document:/output:/extract:/webcontent:/CancelTask.jsp</param-value>
         </init-param>
-        
<init-param><param-name>errorCode</param-name><param-value>403</param-value></init-param>
-        
<init-param><param-name>redirectPath</param-name><param-value>/control/main</param-value></init-param>
        
+        <init-param>
+            <param-name>redirectPath</param-name>
+            <param-value>/control/main</param-value>
+        </init-param>
     </filter>
-    <!--
-        Viewer Filter used to set the request character encoding to UTF-8.
-    -->
     <filter>
-        <filter-name>ViewerFilter</filter-name>
-        
<filter-class>org.eclipse.birt.report.filter.ViewerFilter</filter-class>
+        <display-name>ContextFilter</display-name>
+        <filter-name>ContextFilter</filter-name>
+        
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
     </filter>
-    
-    
<filter-mapping><filter-name>ContextFilter</filter-name><url-pattern>/*</url-pattern></filter-mapping>
     <filter-mapping>
-        <filter-name>ViewerFilter</filter-name>
-        <servlet-name>ViewerServlet</servlet-name>
+        <filter-name>ControlFilter</filter-name>
+        <url-pattern>/*</url-pattern>
     </filter-mapping>
     <filter-mapping>
-        <filter-name>ViewerFilter</filter-name>
-        <servlet-name>EngineServlet</servlet-name>
-    </filter-mapping> 
+        <filter-name>ContextFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
 
     
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
     
<listener><listener-class>org.apache.ofbiz.webapp.control.LoginEventListener</listener-class></listener>

Modified: ofbiz/trunk/specialpurpose/birt/webapp/facility/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/facility/WEB-INF/web.xml?rev=1761304&r1=1761303&r2=1761304&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/webapp/facility/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/birt/webapp/facility/WEB-INF/web.xml Sun Sep 18 
08:08:30 2016
@@ -46,29 +46,30 @@ under the License.
     </context-param>
 
     <filter>
-        <display-name>ContextFilter</display-name>
-        <filter-name>ContextFilter</filter-name>
-        
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
-        <init-param>
-            <param-name>disableContextSecurity</param-name>
-            <param-value>N</param-value>
-        </init-param>
+        <display-name>ControlFilter</display-name>
+        <filter-name>ControlFilter</filter-name>
+        
<filter-class>org.apache.ofbiz.webapp.control.ControlFilter</filter-class>
         <init-param>
             <param-name>allowedPaths</param-name>
             
<param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/ShippingAPI.dll</param-value>
         </init-param>
         <init-param>
-            <param-name>errorCode</param-name>
-            <param-value>403</param-value>
-        </init-param>
-        <init-param>
             <param-name>redirectPath</param-name>
             <param-value>/control/main</param-value>
         </init-param>
     </filter>
+    <filter>
+        <display-name>ContextFilter</display-name>
+        <filter-name>ContextFilter</filter-name>
+        
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>ControlFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
     <filter-mapping>
         <filter-name>ContextFilter</filter-name>
-            <url-pattern>/*</url-pattern>
+        <url-pattern>/*</url-pattern>
     </filter-mapping>
 
     
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>

Modified: ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/WEB-INF/web.xml?rev=1761304&r1=1761303&r2=1761304&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/WEB-INF/web.xml Sun Sep 18 
08:08:30 2016
@@ -41,29 +41,30 @@ under the License.
     </context-param>
 
     <filter>
-        <display-name>ContextFilter</display-name>
-        <filter-name>ContextFilter</filter-name>
-        
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
-        <init-param>
-            <param-name>disableContextSecurity</param-name>
-            <param-value>N</param-value>
-        </init-param>
+        <display-name>ControlFilter</display-name>
+        <filter-name>ControlFilter</filter-name>
+        
<filter-class>org.apache.ofbiz.webapp.control.ControlFilter</filter-class>
         <init-param>
             <param-name>allowedPaths</param-name>
             
<param-value>/error:/control:/products:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images</param-value>
         </init-param>
         <init-param>
-            <param-name>errorCode</param-name>
-            <param-value>403</param-value>
-        </init-param>
-        <init-param>
             <param-name>redirectPath</param-name>
             <param-value>/control/main</param-value>
         </init-param>
     </filter>
+    <filter>
+        <display-name>ContextFilter</display-name>
+        <filter-name>ContextFilter</filter-name>
+        
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>ControlFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
     <filter-mapping>
         <filter-name>ContextFilter</filter-name>
-            <url-pattern>/*</url-pattern>
+        <url-pattern>/*</url-pattern>
     </filter-mapping>
 
     
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>

Modified: ofbiz/trunk/specialpurpose/cmssite/webapp/cmssite/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/cmssite/webapp/cmssite/WEB-INF/web.xml?rev=1761304&r1=1761303&r2=1761304&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/cmssite/webapp/cmssite/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/cmssite/webapp/cmssite/WEB-INF/web.xml Sun Sep 
18 08:08:30 2016
@@ -40,34 +40,35 @@ under the License.
     </context-param>
 
     <filter>
-        <display-name>ContextFilter</display-name>
-        <filter-name>ContextFilter</filter-name>
-        
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
-        <init-param>
-            <param-name>disableContextSecurity</param-name>
-            <param-value>N</param-value>
-        </init-param>
+        <display-name>ControlFilter</display-name>
+        <filter-name>ControlFilter</filter-name>
+        
<filter-class>org.apache.ofbiz.webapp.control.ControlFilter</filter-class>
         <init-param>
             <param-name>allowedPaths</param-name>
             
<param-value>/cms:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images</param-value>
         </init-param>
         <init-param>
-            <param-name>errorCode</param-name>
-            <param-value>403</param-value>
-        </init-param>
-        <init-param>
             <param-name>redirectPath</param-name>
-            <param-value>/cms/cms</param-value>
+            <param-value>/control/main</param-value>
         </init-param>
     </filter>
     <filter>
+        <display-name>ContextFilter</display-name>
+        <filter-name>ContextFilter</filter-name>
+        
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
+    </filter>
+    <filter>
         <display-name>WebSiteFilter</display-name>
         <filter-name>WebSiteFilter</filter-name>
         
<filter-class>org.apache.ofbiz.cmssite.multisite.WebSiteFilter</filter-class>
     </filter>
     <filter-mapping>
+        <filter-name>ControlFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
         <filter-name>ContextFilter</filter-name>
-            <url-pattern>/*</url-pattern>
+        <url-pattern>/*</url-pattern>
     </filter-mapping>
     
<filter-mapping><filter-name>WebSiteFilter</filter-name><url-pattern>/*</url-pattern></filter-mapping>
 

Modified: ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/web.xml?rev=1761304&r1=1761303&r2=1761304&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/webapp/ebay/WEB-INF/web.xml Sun Sep 18 
08:08:30 2016
@@ -45,29 +45,30 @@ under the License.
     </context-param>
 
     <filter>
-        <display-name>ContextFilter</display-name>
-        <filter-name>ContextFilter</filter-name>
-        
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
-        <init-param>
-            <param-name>disableContextSecurity</param-name>
-            <param-value>N</param-value>
-        </init-param>
+        <display-name>ControlFilter</display-name>
+        <filter-name>ControlFilter</filter-name>
+        
<filter-class>org.apache.ofbiz.webapp.control.ControlFilter</filter-class>
         <init-param>
             <param-name>allowedPaths</param-name>
             
<param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images</param-value>
         </init-param>
         <init-param>
-            <param-name>errorCode</param-name>
-            <param-value>403</param-value>
-        </init-param>
-        <init-param>
             <param-name>redirectPath</param-name>
             <param-value>/control/main</param-value>
         </init-param>
     </filter>
+    <filter>
+        <display-name>ContextFilter</display-name>
+        <filter-name>ContextFilter</filter-name>
+        
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>ControlFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
     <filter-mapping>
         <filter-name>ContextFilter</filter-name>
-            <url-pattern>/*</url-pattern>
+        <url-pattern>/*</url-pattern>
     </filter-mapping>
 
     
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>

Modified: ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/web.xml?rev=1761304&r1=1761303&r2=1761304&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/web.xml 
(original)
+++ ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/web.xml Sun 
Sep 18 08:08:30 2016
@@ -45,29 +45,30 @@ under the License.
     </context-param>
 
     <filter>
-        <display-name>ContextFilter</display-name>
-        <filter-name>ContextFilter</filter-name>
-        
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
-        <init-param>
-            <param-name>disableContextSecurity</param-name>
-            <param-value>N</param-value>
-        </init-param>
+        <display-name>ControlFilter</display-name>
+        <filter-name>ControlFilter</filter-name>
+        
<filter-class>org.apache.ofbiz.webapp.control.ControlFilter</filter-class>
         <init-param>
             <param-name>allowedPaths</param-name>
             
<param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images</param-value>
         </init-param>
         <init-param>
-            <param-name>errorCode</param-name>
-            <param-value>403</param-value>
-        </init-param>
-        <init-param>
             <param-name>redirectPath</param-name>
             <param-value>/control/main</param-value>
         </init-param>
     </filter>
+    <filter>
+        <display-name>ContextFilter</display-name>
+        <filter-name>ContextFilter</filter-name>
+        
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>ControlFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
     <filter-mapping>
         <filter-name>ContextFilter</filter-name>
-            <url-pattern>/*</url-pattern>
+        <url-pattern>/*</url-pattern>
     </filter-mapping>
 
     
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>

Modified: 
ofbiz/trunk/specialpurpose/ecommerce/src/main/java/org/apache/ofbiz/ecommerce/webapp/view/JspViewHandler.java
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/src/main/java/org/apache/ofbiz/ecommerce/webapp/view/JspViewHandler.java?rev=1761304&r1=1761303&r2=1761304&view=diff
==============================================================================
--- 
ofbiz/trunk/specialpurpose/ecommerce/src/main/java/org/apache/ofbiz/ecommerce/webapp/view/JspViewHandler.java
 (original)
+++ 
ofbiz/trunk/specialpurpose/ecommerce/src/main/java/org/apache/ofbiz/ecommerce/webapp/view/JspViewHandler.java
 Sun Sep 18 08:08:30 2016
@@ -61,7 +61,7 @@ public class JspViewHandler extends Abst
         // Debug.logInfo("Requested Page : " + page, module);
         // Debug.logInfo("Physical Path  : " + context.getRealPath(page));
 
-        // tell the ContextFilter we are forwarding
+        // tell the ControlFilter we are forwarding
         request.setAttribute(ControlFilter.FORWARDED_FROM_SERVLET, 
Boolean.TRUE);
         RequestDispatcher rd = request.getRequestDispatcher(page);
 

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml?rev=1761304&r1=1761303&r2=1761304&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml 
(original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml Sun 
Sep 18 08:08:30 2016
@@ -46,10 +46,18 @@ under the License.
     </context-param>
 
     <filter>
+        <display-name>ContextFilter</display-name>
+        <filter-name>ContextFilter</filter-name>
+        
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
+    </filter>
+    <filter>
         <display-name>CatalogUrlFilter</display-name>
         <filter-name>CatalogUrlFilter</filter-name>
         
<filter-class>org.apache.ofbiz.product.category.CatalogUrlFilter</filter-class>
-        
<init-param><param-name>defaultLocaleString</param-name><param-value>en_US</param-value></init-param>
+        <init-param>
+            <param-name>defaultLocaleString</param-name>
+            <param-value>en_US</param-value>
+        </init-param>
     </filter>
     <filter>
         <display-name>ContentUrlFilter</display-name>
@@ -59,22 +67,29 @@ under the License.
             <param-name>defaultLocaleString</param-name>
             <param-value>en_US</param-value>
         </init-param>
-        
<init-param><param-name>viewRequest</param-name><param-value>ViewBlogArticle</param-value></init-param>
-    </filter>
-    <filter>
-        <display-name>ContextFilter</display-name>
-        <filter-name>ContextFilter</filter-name>
-        
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
         <init-param>
-            <param-name>disableContextSecurity</param-name>
-            <param-value>N</param-value>
+            <param-name>viewRequest</param-name>
+            <param-value>ViewBlogArticle</param-value>
         </init-param>
+    </filter>
+    <filter>
+        <display-name>ControlFilter</display-name>
+        <filter-name>ControlFilter</filter-name>
+        
<filter-class>org.apache.ofbiz.webapp.control.ControlFilter</filter-class>
         <init-param>
             <param-name>allowedPaths</param-name>
             
<param-value>/error:/control:/products:/select:/index.html:/index.jsp:/robots.txt:/default.html:/default.jsp:/images</param-value>
         </init-param>
+        <init-param>
+            <param-name>redirectPath</param-name>
+            <param-value>/control/main</param-value>
+        </init-param>
     </filter>
     <filter-mapping>
+        <filter-name>ContextFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
         <filter-name>CatalogUrlFilter</filter-name>
         <url-pattern>/*</url-pattern>
     </filter-mapping>
@@ -83,10 +98,9 @@ under the License.
         <url-pattern>/*</url-pattern>
     </filter-mapping>
     <filter-mapping>
-        <filter-name>ContextFilter</filter-name>
+        <filter-name>ControlFilter</filter-name>
         <url-pattern>/*</url-pattern>
     </filter-mapping>
-
     
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
     <!-- NOTE: not all app servers support mounting implementations of the 
HttpSessionActivationListener interface -->
     <!-- 
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlActivationEventListener</listener-class></listener>
 -->

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecomseo/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecomseo/WEB-INF/web.xml?rev=1761304&r1=1761303&r2=1761304&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecomseo/WEB-INF/web.xml 
(original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecomseo/WEB-INF/web.xml Sun Sep 
18 08:08:30 2016
@@ -51,10 +51,18 @@ under the License.
     </context-param>
 
     <filter>
+        <display-name>ContextFilter</display-name>
+        <filter-name>ContextFilter</filter-name>
+        
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
+    </filter>
+    <filter>
         <display-name>SeoCatalogUrlFilter</display-name>
         <filter-name>SeoCatalogUrlFilter</filter-name>
         
<filter-class>org.apache.ofbiz.product.category.CatalogUrlSeoFilter</filter-class>
-        
<init-param><param-name>defaultLocaleString</param-name><param-value>en_US</param-value></init-param>
+        <init-param>
+            <param-name>defaultLocaleString</param-name>
+            <param-value>en_US</param-value>
+        </init-param>
     </filter>
     <filter>
         <display-name>SeoContentUrlFilter</display-name>
@@ -64,22 +72,25 @@ under the License.
             <param-name>defaultLocaleString</param-name>
             <param-value>en_US</param-value>
         </init-param>
-        
<init-param><param-name>viewRequest</param-name><param-value>ViewBlogArticle</param-value></init-param>
+        <init-param>
+            <param-name>viewRequest</param-name>
+            <param-value>ViewBlogArticle</param-value>
+        </init-param>
     </filter>
     <filter>
         <display-name>SeoContextFilter</display-name>
         <filter-name>SeoContextFilter</filter-name>
         
<filter-class>org.apache.ofbiz.product.category.SeoContextFilter</filter-class>
         <init-param>
-            <param-name>disableContextSecurity</param-name>
-            <param-value>N</param-value>
-        </init-param>
-        <init-param>
             <param-name>allowedPaths</param-name>
             
<param-value>/error:/control:/products:/select:/index.html:/index.jsp:/robots.txt:/default.html:/default.jsp:/images</param-value>
         </init-param>
     </filter>
     <filter-mapping>
+        <filter-name>ContextFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
         <filter-name>SeoCatalogUrlFilter</filter-name>
         <url-pattern>/*</url-pattern>
     </filter-mapping>

Modified: ofbiz/trunk/specialpurpose/example/webapp/example/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/webapp/example/WEB-INF/web.xml?rev=1761304&r1=1761303&r2=1761304&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/example/webapp/example/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/example/webapp/example/WEB-INF/web.xml Sun Sep 
18 08:08:30 2016
@@ -43,18 +43,31 @@ under the License.
     </context-param>
 
     <filter>
-        <display-name>ContextFilter</display-name>
-        <filter-name>ContextFilter</filter-name>
-        
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
-        
<init-param><param-name>disableContextSecurity</param-name><param-value>N</param-value></init-param>
+        <display-name>ControlFilter</display-name>
+        <filter-name>ControlFilter</filter-name>
+        
<filter-class>org.apache.ofbiz.webapp.control.ControlFilter</filter-class>
         <init-param>
             <param-name>allowedPaths</param-name>
             
<param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/js:/ws</param-value>
         </init-param>
-        
<init-param><param-name>errorCode</param-name><param-value>403</param-value></init-param>
-        
<init-param><param-name>redirectPath</param-name><param-value>/control/main</param-value></init-param>
+        <init-param>
+            <param-name>redirectPath</param-name>
+            <param-value>/control/main</param-value>
+        </init-param>
     </filter>
-    
<filter-mapping><filter-name>ContextFilter</filter-name><url-pattern>/*</url-pattern></filter-mapping>
+    <filter>
+        <display-name>ContextFilter</display-name>
+        <filter-name>ContextFilter</filter-name>
+        
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>ControlFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>ContextFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
 
     
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
     
<listener><listener-class>org.apache.ofbiz.webapp.control.LoginEventListener</listener-class></listener>

Modified: 
ofbiz/trunk/specialpurpose/exampleext/webapp/exampleext/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/exampleext/webapp/exampleext/WEB-INF/web.xml?rev=1761304&r1=1761303&r2=1761304&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/exampleext/webapp/exampleext/WEB-INF/web.xml 
(original)
+++ ofbiz/trunk/specialpurpose/exampleext/webapp/exampleext/WEB-INF/web.xml Sun 
Sep 18 08:08:30 2016
@@ -38,18 +38,31 @@ under the License.
     </context-param>
 
     <filter>
-        <display-name>ContextFilter</display-name>
-        <filter-name>ContextFilter</filter-name>
-        
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
-        
<init-param><param-name>disableContextSecurity</param-name><param-value>N</param-value></init-param>
+        <display-name>ControlFilter</display-name>
+        <filter-name>ControlFilter</filter-name>
+        
<filter-class>org.apache.ofbiz.webapp.control.ControlFilter</filter-class>
         <init-param>
             <param-name>allowedPaths</param-name>
             
<param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images</param-value>
         </init-param>
-        
<init-param><param-name>errorCode</param-name><param-value>403</param-value></init-param>
-        
<init-param><param-name>redirectPath</param-name><param-value>/control/main</param-value></init-param>
+        <init-param>
+            <param-name>redirectPath</param-name>
+            <param-value>/control/main</param-value>
+        </init-param>
     </filter>
-    
<filter-mapping><filter-name>ContextFilter</filter-name><url-pattern>/*</url-pattern></filter-mapping>
+    <filter>
+        <display-name>ContextFilter</display-name>
+        <filter-name>ContextFilter</filter-name>
+        
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>ControlFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>ContextFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
 
     
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
     
<listener><listener-class>org.apache.ofbiz.webapp.control.LoginEventListener</listener-class></listener>

Modified: 
ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/web.xml?rev=1761304&r1=1761303&r2=1761304&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/web.xml 
(original)
+++ ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/web.xml Sun 
Sep 18 08:08:30 2016
@@ -46,29 +46,30 @@ under the License.
     </context-param>
 
     <filter>
-        <display-name>ContextFilter</display-name>
-        <filter-name>ContextFilter</filter-name>
-        
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
-        <init-param>
-            <param-name>disableContextSecurity</param-name>
-            <param-value>N</param-value>
-        </init-param>
+        <display-name>ControlFilter</display-name>
+        <filter-name>ControlFilter</filter-name>
+        
<filter-class>org.apache.ofbiz.webapp.control.ControlFilter</filter-class>
         <init-param>
             <param-name>allowedPaths</param-name>
             
<param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images</param-value>
         </init-param>
         <init-param>
-            <param-name>errorCode</param-name>
-            <param-value>403</param-value>
-        </init-param>
-        <init-param>
             <param-name>redirectPath</param-name>
             <param-value>/control/main</param-value>
         </init-param>
     </filter>
+    <filter>
+        <display-name>ContextFilter</display-name>
+        <filter-name>ContextFilter</filter-name>
+        
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>ControlFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
     <filter-mapping>
         <filter-name>ContextFilter</filter-name>
-            <url-pattern>/*</url-pattern>
+        <url-pattern>/*</url-pattern>
     </filter-mapping>
 
     
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>

Modified: ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/web.xml?rev=1761304&r1=1761303&r2=1761304&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/lucene/webapp/content/WEB-INF/web.xml Sun Sep 18 
08:08:30 2016
@@ -53,18 +53,31 @@ under the License.
     </context-param>
 
     <filter>
-        <display-name>ContextFilter</display-name>
-        <filter-name>ContextFilter</filter-name>
-        
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
-        
<init-param><param-name>disableContextSecurity</param-name><param-value>N</param-value></init-param>
+        <display-name>ControlFilter</display-name>
+        <filter-name>ControlFilter</filter-name>
+        
<filter-class>org.apache.ofbiz.webapp.control.ControlFilter</filter-class>
         <init-param>
             <param-name>allowedPaths</param-name>
             
<param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images</param-value>
         </init-param>
-        
<init-param><param-name>errorCode</param-name><param-value>403</param-value></init-param>
-        
<init-param><param-name>redirectPath</param-name><param-value>/control/main</param-value></init-param>
+        <init-param>
+            <param-name>redirectPath</param-name>
+            <param-value>/control/main</param-value>
+        </init-param>
     </filter>
-    
<filter-mapping><filter-name>ContextFilter</filter-name><url-pattern>/*</url-pattern></filter-mapping>
+    <filter>
+        <display-name>ContextFilter</display-name>
+        <filter-name>ContextFilter</filter-name>
+        
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>ControlFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>ContextFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
 
     
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
     
<listener><listener-class>org.apache.ofbiz.webapp.control.LoginEventListener</listener-class></listener>

Modified: ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/web.xml?rev=1761304&r1=1761303&r2=1761304&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/web.xml 
(original)
+++ ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/web.xml Sun Sep 
18 08:08:30 2016
@@ -40,29 +40,30 @@
     </context-param>
 
     <filter>
-        <display-name>ContextFilter</display-name>
-        <filter-name>ContextFilter</filter-name>
-        
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
-        <init-param>
-            <param-name>disableContextSecurity</param-name>
-            <param-value>N</param-value>
-        </init-param>
+        <display-name>ControlFilter</display-name>
+        <filter-name>ControlFilter</filter-name>
+        
<filter-class>org.apache.ofbiz.webapp.control.ControlFilter</filter-class>
         <init-param>
             <param-name>allowedPaths</param-name>
             
<param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images</param-value>
         </init-param>
         <init-param>
-            <param-name>errorCode</param-name>
-            <param-value>403</param-value>
-        </init-param>
-        <init-param>
             <param-name>redirectPath</param-name>
             <param-value>/control/main</param-value>
         </init-param>
     </filter>
+    <filter>
+        <display-name>ContextFilter</display-name>
+        <filter-name>ContextFilter</filter-name>
+        
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>ControlFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
     <filter-mapping>
         <filter-name>ContextFilter</filter-name>
-            <url-pattern>/*</url-pattern>
+        <url-pattern>/*</url-pattern>
     </filter-mapping>
 
     
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>

Modified: ofbiz/trunk/specialpurpose/oagis/webapp/oagis/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/webapp/oagis/WEB-INF/web.xml?rev=1761304&r1=1761303&r2=1761304&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/webapp/oagis/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/oagis/webapp/oagis/WEB-INF/web.xml Sun Sep 18 
08:08:30 2016
@@ -39,29 +39,30 @@
     </context-param>
 
     <filter>
-        <display-name>ContextFilter</display-name>
-        <filter-name>ContextFilter</filter-name>
-        
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
-        <init-param>
-            <param-name>disableContextSecurity</param-name>
-            <param-value>N</param-value>
-        </init-param>
+        <display-name>ControlFilter</display-name>
+        <filter-name>ControlFilter</filter-name>
+        
<filter-class>org.apache.ofbiz.webapp.control.ControlFilter</filter-class>
         <init-param>
             <param-name>allowedPaths</param-name>
             
<param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/js</param-value>
         </init-param>
         <init-param>
-            <param-name>errorCode</param-name>
-            <param-value>403</param-value>
-        </init-param>
-        <init-param>
             <param-name>redirectPath</param-name>
             <param-value>/control/main</param-value>
         </init-param>
     </filter>
+    <filter>
+        <display-name>ContextFilter</display-name>
+        <filter-name>ContextFilter</filter-name>
+        
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>ControlFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
     <filter-mapping>
         <filter-name>ContextFilter</filter-name>
-            <url-pattern>/*</url-pattern>
+        <url-pattern>/*</url-pattern>
     </filter-mapping>
 
     
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>

Modified: 
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/web.xml?rev=1761304&r1=1761303&r2=1761304&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/web.xml 
(original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/web.xml Sun 
Sep 18 08:08:30 2016
@@ -39,29 +39,30 @@
     </context-param>
 
     <filter>
-        <display-name>ContextFilter</display-name>
-        <filter-name>ContextFilter</filter-name>
-        
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
-        <init-param>
-            <param-name>disableContextSecurity</param-name>
-            <param-value>N</param-value>
-        </init-param>
+        <display-name>ControlFilter</display-name>
+        <filter-name>ControlFilter</filter-name>
+        
<filter-class>org.apache.ofbiz.webapp.control.ControlFilter</filter-class>
         <init-param>
             <param-name>allowedPaths</param-name>
             
<param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/static:/js</param-value>
         </init-param>
         <init-param>
-            <param-name>errorCode</param-name>
-            <param-value>403</param-value>
-        </init-param>
-        <init-param>
             <param-name>redirectPath</param-name>
             <param-value>/control/main</param-value>
         </init-param>
     </filter>
+    <filter>
+        <display-name>ContextFilter</display-name>
+        <filter-name>ContextFilter</filter-name>
+        
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>ControlFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
     <filter-mapping>
         <filter-name>ContextFilter</filter-name>
-            <url-pattern>/*</url-pattern>
+        <url-pattern>/*</url-pattern>
     </filter-mapping>
 
     
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>

Modified: ofbiz/trunk/specialpurpose/scrum/webapp/demotest/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/demotest/WEB-INF/web.xml?rev=1761304&r1=1761303&r2=1761304&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/webapp/demotest/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/webapp/demotest/WEB-INF/web.xml Sun Sep 18 
08:08:30 2016
@@ -57,27 +57,27 @@ under the License.
     </context-param>
 
     <filter>
-        <display-name>ContextFilter</display-name>
-        <filter-name>ContextFilter</filter-name>
-        
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
-        <init-param>
-            <param-name>disableContextSecurity</param-name>
-            <param-value>N</param-value>
-        </init-param>
+        <display-name>ControlFilter</display-name>
+        <filter-name>ControlFilter</filter-name>
+        
<filter-class>org.apache.ofbiz.webapp.control.ControlFilter</filter-class>
         <init-param>
             <param-name>allowedPaths</param-name>
-            
<param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images
-            </param-value>
-        </init-param>
-        <init-param>
-            <param-name>errorCode</param-name>
-            <param-value>403</param-value>
+            
<param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images</param-value>
         </init-param>
         <init-param>
             <param-name>redirectPath</param-name>
             <param-value>/control/main</param-value>
         </init-param>
     </filter>
+    <filter>
+        <display-name>ContextFilter</display-name>
+        <filter-name>ContextFilter</filter-name>
+        
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>ControlFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
     <filter-mapping>
         <filter-name>ContextFilter</filter-name>
         <url-pattern>/*</url-pattern>

Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/web.xml?rev=1761304&r1=1761303&r2=1761304&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/web.xml Sun Sep 18 
08:08:30 2016
@@ -46,18 +46,31 @@ under the License.
     </context-param>
 
     <filter>
-        <display-name>ContextFilter</display-name>
-        <filter-name>ContextFilter</filter-name>
-        
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
-        
<init-param><param-name>disableContextSecurity</param-name><param-value>N</param-value></init-param>
+        <display-name>ControlFilter</display-name>
+        <filter-name>ControlFilter</filter-name>
+        
<filter-class>org.apache.ofbiz.webapp.control.ControlFilter</filter-class>
         <init-param>
             <param-name>allowedPaths</param-name>
             
<param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images</param-value>
         </init-param>
-        
<init-param><param-name>errorCode</param-name><param-value>403</param-value></init-param>
-        
<init-param><param-name>redirectPath</param-name><param-value>/control/main</param-value></init-param>
+        <init-param>
+            <param-name>redirectPath</param-name>
+            <param-value>/control/main</param-value>
+        </init-param>
     </filter>
-    
<filter-mapping><filter-name>ContextFilter</filter-name><url-pattern>/*</url-pattern></filter-mapping>
+    <filter>
+        <display-name>ContextFilter</display-name>
+        <filter-name>ContextFilter</filter-name>
+        
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>ControlFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>ContextFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
 
     
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
     
<listener><listener-class>org.apache.ofbiz.webapp.control.LoginEventListener</listener-class></listener>

Modified: 
ofbiz/trunk/specialpurpose/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java?rev=1761304&r1=1761303&r2=1761304&view=diff
==============================================================================
--- 
ofbiz/trunk/specialpurpose/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java
 (original)
+++ 
ofbiz/trunk/specialpurpose/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java
 Sun Sep 18 08:08:30 2016
@@ -47,8 +47,6 @@ import org.apache.ofbiz.base.util.UtilPr
 import org.apache.ofbiz.base.util.UtilTimer;
 import org.apache.ofbiz.base.util.UtilValidate;
 import org.apache.ofbiz.entity.GenericValue;
-import org.apache.ofbiz.security.Security;
-import org.apache.ofbiz.webapp.WebAppUtil;
 import org.apache.ofbiz.webapp.control.LoginWorker;
 
 /**
@@ -75,9 +73,6 @@ public class OFBizSolrContextFilter exte
         HttpServletResponse httpResponse = (HttpServletResponse) response;
         Locale locale = UtilHttp.getLocale(httpRequest);
 
-        // set the ServletContext in the request for future use
-        httpRequest.setAttribute("servletContext", 
request.getServletContext());
-        
         // check if the request is from an authorized user
         String servletPath = httpRequest.getServletPath();
         if (UtilValidate.isNotEmpty(servletPath) && 
(servletPath.startsWith("/admin/") || servletPath.endsWith("/update") 
@@ -85,19 +80,6 @@ public class OFBizSolrContextFilter exte
                 || servletPath.endsWith("/replication") || 
servletPath.endsWith("/file") || servletPath.endsWith("/file/"))) {
             HttpSession session = httpRequest.getSession();
             GenericValue userLogin = (GenericValue) 
session.getAttribute("userLogin");
-            Security security = (Security) request.getAttribute("security");
-            if (security == null) {
-                security = (Security) 
httpRequest.getServletContext().getAttribute("security");
-                if (security != null) {
-                    request.setAttribute("security", security);
-                }
-            }
-            if (security == null) {
-                security = 
WebAppUtil.getSecurity(httpRequest.getServletContext());
-                if (security != null) {
-                    request.setAttribute("security", security);
-                }
-            }
             if (servletPath.startsWith("/admin/") && 
(UtilValidate.isEmpty(userLogin) || !LoginWorker.hasBasePermission(userLogin, 
httpRequest))) {
                 response.setContentType("application/json");
                 MapToJSON mapToJson = new MapToJSON();

Modified: 
ofbiz/trunk/specialpurpose/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrRedirectServlet.java
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrRedirectServlet.java?rev=1761304&r1=1761303&r2=1761304&view=diff
==============================================================================
--- 
ofbiz/trunk/specialpurpose/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrRedirectServlet.java
 (original)
+++ 
ofbiz/trunk/specialpurpose/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrRedirectServlet.java
 Sun Sep 18 08:08:30 2016
@@ -59,19 +59,6 @@ public class OFBizSolrRedirectServlet ex
         if (UtilValidate.isEmpty(userLogin)) {
             forwardToLogin = true;
         } else {
-            Security security = (Security) request.getAttribute("security");
-            if (security == null) {
-                security = (Security) session.getAttribute("security");
-                if (security != null) {
-                    request.setAttribute("security", security);
-                }
-            }
-            if (security == null) {
-                security = (Security) 
request.getServletContext().getAttribute("security");
-                if (security != null) {
-                    request.setAttribute("security", security);
-                }
-            }
             if (!LoginWorker.hasBasePermission(userLogin, request)) {
                 forwardToLogin = true;
             }

Modified: ofbiz/trunk/specialpurpose/solr/webapp/solr/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/solr/webapp/solr/WEB-INF/web.xml?rev=1761304&r1=1761303&r2=1761304&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/solr/webapp/solr/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/solr/webapp/solr/WEB-INF/web.xml Sun Sep 18 
08:08:30 2016
@@ -45,18 +45,10 @@
         <filter-name>ControlFilter</filter-name>
         
<filter-class>org.apache.ofbiz.webapp.control.ControlFilter</filter-class>
         <init-param>
-            <param-name>disableContextSecurity</param-name>
-            <param-value>N</param-value>
-        </init-param>
-        <init-param>
             <param-name>allowedPaths</param-name>
             
<param-value>/control:/error:/css:/img:/js:/tpl:/favicon.ico:/admin:/admin.html:/#:/schema:/config:/:/solrdefault</param-value>
         </init-param>
         <init-param>
-            <param-name>errorCode</param-name>
-            <param-value>403</param-value>
-        </init-param>
-        <init-param>
             <param-name>redirectPath</param-name>
             <param-value>/control/login</param-value>
         </init-param>

Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/web.xml?rev=1761304&r1=1761303&r2=1761304&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/web.xml Sun Sep 18 
08:08:30 2016
@@ -44,29 +44,30 @@
     </context-param>
 
     <filter>
-        <display-name>ContextFilter</display-name>
-        <filter-name>ContextFilter</filter-name>
-        
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
-        <init-param>
-            <param-name>disableContextSecurity</param-name>
-            <param-value>N</param-value>
-        </init-param>
+        <display-name>ControlFilter</display-name>
+        <filter-name>ControlFilter</filter-name>
+        
<filter-class>org.apache.ofbiz.webapp.control.ControlFilter</filter-class>
         <init-param>
             <param-name>allowedPaths</param-name>
-            
<param-value>/control:/products:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images</param-value>
-        </init-param>
-        <init-param>
-            <param-name>errorCode</param-name>
-            <param-value>403</param-value>
+            
<param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images</param-value>
         </init-param>
         <init-param>
             <param-name>redirectPath</param-name>
             <param-value>/control/main</param-value>
         </init-param>
     </filter>
+    <filter>
+        <display-name>ContextFilter</display-name>
+        <filter-name>ContextFilter</filter-name>
+        
<filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>ControlFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
     <filter-mapping>
         <filter-name>ContextFilter</filter-name>
-            <url-pattern>/*</url-pattern>
+        <url-pattern>/*</url-pattern>
     </filter-mapping>
 
     
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>


Reply via email to