svn commit: r1662393 - in /ofbiz/trunk/framework: webapp/src/org/ofbiz/webapp/control/ContextFilter.java webtools/webapp/webtools/WEB-INF/web.xml

[jacopoc]

Author: jacopoc
Date: Thu Feb 26 09:09:04 2015
New Revision: 1662393

URL: http://svn.apache.org/r1662393
Log:
Removed some old code that, as can be easily noticed by reviewing the lines I am removing, was completely useless; it was probably an half baked experiment that has been committed by error.

Modified:
    ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java
    ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/web.xml

Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java?rev=1662393&r1=1662392&r2=1662393&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java Thu Feb 26 09:09:04 2015
@@ -407,15 +407,6 @@ public class ContextFilter implements Fi
             if (Debug.verboseOn()) Debug.logVerbose("Adding web.xml context-param to application attribute with name [" + initParamName + "] and value [" + initParamValue + "]", module);
             config.getServletContext().setAttribute(initParamName, initParamValue);
         }
-        String GeronimoMultiOfbizInstances = (String) config.getServletContext().getAttribute("GeronimoMultiOfbizInstances");
-        if (UtilValidate.isNotEmpty(GeronimoMultiOfbizInstances)) {
-            String ofbizHome = System.getProperty("ofbiz.home");
-            if (GeronimoMultiOfbizInstances.equalsIgnoreCase("true") && UtilValidate.isEmpty(ofbizHome)) {
-                ofbizHome = System.getProperty("ofbiz.home"); // This is only used in case of Geronimo or WASCE using OFBiz multi-instances. It allows to retrieve ofbiz.home value set in JVM env
-                System.out.println("Set OFBIZ_HOME to - " + ofbizHome);
-                System.setProperty("ofbiz.home", ofbizHome);
-            }
-        }
     }
 
     protected String getServerId() {

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/web.xml?rev=1662393&r1=1662392&r2=1662393&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/web.xml (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/web.xml Thu Feb 26 09:09:04 2015
@@ -44,12 +44,6 @@ under the License.
     <description>The location of the main-decorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description>
   </context-param>
 
-  <context-param>
-    <param-name>GeronimoMultiOfbizInstances</param-name>
-    <param-value>true</param-value>
-    <description>This is only used in case of Geronimo or WASCE using OFBiz multi-instances. It allows to retrieve ofbiz.home value set in JVM env</description>
-  </context-param>
-
     <filter>
         <filter-name>ContextFilter</filter-name>
         <display-name>ContextFilter</display-name>