svn commit: r1451882 - in /ofbiz/branches/release12.04: ./ framework/start/src/org/ofbiz/base/start/both.properties

Author: jleroux
Date: Sat Mar  2 12:45:53 2013
New Revision: 1451882

URL: http://svn.apache.org/r1451882
Log:
"Applied fix from trunk for revision: 1451879"
------------------------------------------------------------------------
r1451879 | jleroux | 2013-03-02 13:32:11 +0100 (sam., 02 mars 2013) | 2 lines

This prevented to load both web and pos simultaneously (both-containers.xml does not exist anymore).
It needs a compilation to work again.
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release12.04/   (props changed)
    ofbiz/branches/release12.04/framework/start/src/org/ofbiz/base/start/both.properties

Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1451879

Modified: ofbiz/branches/release12.04/framework/start/src/org/ofbiz/base/start/both.properties
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/start/src/org/ofbiz/base/start/both.properties?rev=1451882&r1=1451881&r2=1451882&view=diff
==============================================================================
--- ofbiz/branches/release12.04/framework/start/src/org/ofbiz/base/start/both.properties (original)
+++ ofbiz/branches/release12.04/framework/start/src/org/ofbiz/base/start/both.properties Sat Mar  2 12:45:53 2013
@@ -39,7 +39,7 @@
 #ofbiz.log.dir=runtime/logs
 
 # --- Location (relative to ofbiz.home) for (normal) container configuration
-ofbiz.container.config=framework/base/config/both-containers.xml
+#ofbiz.container.config=framework/base/config/ofbiz-containers.xml
 
 # -- StartupLoader implementation for Splash Screen
 ofbiz.start.loader1=org.ofbiz.base.splash.SplashLoader