svn commit: r1081740 - in /ofbiz/trunk/framework: base/config/both-containers.xml base/config/ofbiz-containers.xml base/config/test-containers.xml catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java

Author: jleroux
Date: Tue Mar 15 11:40:43 2011
New Revision: 1081740

URL: http://svn.apache.org/viewvc?rev=1081740&view=rev
Log:
Update defaultValveFilter using http://tomcat.apache.org/tomcat-6.0-doc/config/cluster-valve.html as reference, with our own specificities (.*\.ico;.*\.htc;) even if I guess It's not a big deal. This is mostly a reference for future.
So adds.*\.png;.*\.css;.*\.ico;.*\.htc;

I wonder though why "\" were not used previously, maybe an older version of Tomcat cluster-valve

Also update containers...

Modified:
    ofbiz/trunk/framework/base/config/both-containers.xml
    ofbiz/trunk/framework/base/config/ofbiz-containers.xml
    ofbiz/trunk/framework/base/config/test-containers.xml
    ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java

Modified: ofbiz/trunk/framework/base/config/both-containers.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/config/both-containers.xml?rev=1081740&r1=1081739&r2=1081740&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/config/both-containers.xml (original)
+++ ofbiz/trunk/framework/base/config/both-containers.xml Tue Mar 15 11:40:43 2011
@@ -120,7 +120,7 @@ under the License.
             <!-- uncomment for cluster support
             <property name="default-server-cluster" value="cluster">
                 <property name="rep-valve-filter">
-                    <property-value>.*\.gif;.*\.js;.*\.jpg;.*\.htm;.*\.html;.*\.txt;</property-value>
+                <property-value>.*\.gif;.*\.js;.*\.jpg;.*\.htm;.*\.html;.*\.txt;.*\.png;.*\.css;.*\.ico;.*\.htc;</property-value>
                 </property>
                 <property name="manager-class" value="org.apache.catalina.ha.session.DeltaManager"/>
                 <property name="debug" value="5"/>
@@ -256,8 +256,8 @@ under the License.
             <property name="ciphers" value=""/>
         </property>
     </container>
-    
-    
+
+
     <!-- load the JPOS devices -->
     <container name="jpos.device-container" class="org.ofbiz.pos.container.JposDeviceContainer">
         <property name="CashDrawer.1" value="NullCashDrawer"/>

Modified: ofbiz/trunk/framework/base/config/ofbiz-containers.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/config/ofbiz-containers.xml?rev=1081740&r1=1081739&r2=1081740&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/config/ofbiz-containers.xml (original)
+++ ofbiz/trunk/framework/base/config/ofbiz-containers.xml Tue Mar 15 11:40:43 2011
@@ -118,7 +118,7 @@ under the License.
             <!-- uncomment for cluster support
             <property name="default-server-cluster" value="cluster">
                 <property name="rep-valve-filter">
-                    <property-value>.*\.gif;.*\.js;.*\.jpg;.*\.htm;.*\.html;.*\.txt;</property-value>
+                <property-value>.*\.gif;.*\.js;.*\.jpg;.*\.htm;.*\.html;.*\.txt;.*\.png;.*\.css;.*\.ico;.*\.htc;</property-value>
                 </property>
                 <property name="manager-class" value="org.apache.catalina.ha.session.DeltaManager"/>
                 <property name="debug" value="5"/>
@@ -254,7 +254,7 @@ under the License.
             <property name="ciphers" value=""/>
         </property>
     </container>
-    
+
     <!-- load the BIRT container -->
     <container name="birt-container" class="org.ofbiz.birt.container.BirtContainer">
         <property name="delegator-name" value="default"/>
@@ -269,11 +269,11 @@ under the License.
         <property name="telnet-port" value="9990"/>
         <property name="app-name" value="OFBiz"/>
     </container-->
-    
+
     <!-- load Groovy remote telnet server -->
     <!-- Uncommented by default for security reasons -->
     <!-- the port below will be opened by Groovy -->
     <!--container name="groovyshell-container" class="org.ofbiz.base.container.GroovyShellContainer">
         <property name="telnet-port" value="9991"/>
-    </container-->    
+    </container-->
 </ofbiz-containers>

Modified: ofbiz/trunk/framework/base/config/test-containers.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/config/test-containers.xml?rev=1081740&r1=1081739&r2=1081740&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/config/test-containers.xml (original)
+++ ofbiz/trunk/framework/base/config/test-containers.xml Tue Mar 15 11:40:43 2011
@@ -87,7 +87,7 @@ under the License.
             <!-- uncomment for cluster support
             <property name="default-server-cluster" value="cluster">
                 <property name="rep-valve-filter">
-                    <property-value>.*\.gif;.*\.js;.*\.jpg;.*\.htm;.*\.html;.*\.txt;</property-value>
+                <property-value>.*\.gif;.*\.js;.*\.jpg;.*\.htm;.*\.html;.*\.txt;.*\.png;.*\.css;.*\.ico;.*\.htc;</property-value>
                 </property>
                 <property name="manager-class" value="org.apache.catalina.cluster.session.DeltaManager"/>
                 <property name="debug" value="5"/>

Modified: ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java?rev=1081740&r1=1081739&r2=1081740&view=diff
==============================================================================
--- ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java (original)
+++ ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java Tue Mar 15 11:40:43 2011
@@ -376,7 +376,7 @@ public class CatalinaContainer implement
     }
 
     protected Cluster createCluster(ContainerConfig.Container.Property clusterProps, Host host) throws ContainerException {
-        String defaultValveFilter = ".*.gif;.*.js;.*.jpg;.*.htm;.*.html;.*.txt;";
+        String defaultValveFilter = ".*\\.gif;.*\\.js;.*\\.jpg;.*\\.htm;.*\\.html;.*\\.txt;.*\\.png;.*\\.css;.*\\.ico;.*\\.htc;";
 
         ReplicationValve clusterValve = new ReplicationValve();
         clusterValve.setFilter(ContainerConfig.getPropertyValue(clusterProps, "rep-valve-filter", defaultValveFilter));