You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jo...@apache.org on 2007/03/27 19:16:36 UTC
svn commit: r523002 - in /ofbiz/trunk: framework/base/config/
framework/catalina/config/
framework/catalina/src/org/ofbiz/catalina/container/ runtime/catalina/
Author: jonesde
Date: Tue Mar 27 10:16:35 2007
New Revision: 523002
URL: http://svn.apache.org/viewvc?view=rev&rev=523002
Log:
Changed CatalinaContainer and added configuration settings for the cataling runtime directory, which is now under the ofbiz/runtime directory and that is where the work directory and such will go
Added:
ofbiz/trunk/runtime/catalina/
ofbiz/trunk/runtime/catalina/README (with props)
ofbiz/trunk/runtime/catalina/catalina-users.xml
- copied unchanged from r522986, ofbiz/trunk/framework/catalina/config/catalina-users.xml
Removed:
ofbiz/trunk/framework/catalina/config/catalina-users.xml
Modified:
ofbiz/trunk/framework/base/config/ofbiz-containers.xml
ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java
Modified: ofbiz/trunk/framework/base/config/ofbiz-containers.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/config/ofbiz-containers.xml?view=diff&rev=523002&r1=523001&r2=523002
==============================================================================
--- ofbiz/trunk/framework/base/config/ofbiz-containers.xml (original)
+++ ofbiz/trunk/framework/base/config/ofbiz-containers.xml Tue Mar 27 10:16:35 2007
@@ -88,6 +88,7 @@
<property name="delegator-name" value="default"/>
<property name="use-naming" value="false"/>
<property name="debug" value="0"/>
+ <property name="catalina-runtime-home" value="runtime/catalina"/>
<property name="apps-context-reloadable" value="false"/>
<property name="apps-cross-context" value="false"/>
<property name="apps-distributable" value="false"/>
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?view=diff&rev=523002&r1=523001&r2=523002
==============================================================================
--- 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 27 10:16:35 2007
@@ -142,14 +142,13 @@
protected boolean distribute = false;
protected boolean enableDefaultMimeTypes = true;
+
+ protected String catalinaRuntimeHome;
/**
* @see org.ofbiz.base.container.Container#init(java.lang.String[], java.lang.String)
*/
public void init(String[] args, String configFile) throws ContainerException {
- // set catalina_home
- System.setProperty("catalina.home", System.getProperty("ofbiz.home") + "/framework/catalina");
-
// get the container config
ContainerConfig.Container cc = ContainerConfig.getContainer("catalina-container", configFile);
if (cc == null) {
@@ -165,6 +164,11 @@
this.contextReloadable = ContainerConfig.getPropertyValue(cc, "apps-context-reloadable", false);
this.crossContext = ContainerConfig.getPropertyValue(cc, "apps-cross-context", true);
this.distribute = ContainerConfig.getPropertyValue(cc, "apps-distributable", true);
+
+ this.catalinaRuntimeHome = ContainerConfig.getPropertyValue(cc, "catalina-runtime-home", "runtime/catalina");
+
+ // set catalina_home
+ System.setProperty("catalina.home", System.getProperty("ofbiz.home") + "/" + this.catalinaRuntimeHome);
// configure JNDI in the StandardServer
StandardServer server = (StandardServer) ServerFactory.getServer();
@@ -258,7 +262,7 @@
}
// create the default realm -- TODO: make this configurable
- String dbConfigPath = "config/catalina-users.xml";
+ String dbConfigPath = "catalina-users.xml";
MemoryRealm realm = new MemoryRealm();
realm.setPathname(dbConfigPath);
engine.setRealm(realm);
Added: ofbiz/trunk/runtime/catalina/README
URL: http://svn.apache.org/viewvc/ofbiz/trunk/runtime/catalina/README?view=auto&rev=523002
==============================================================================
--- ofbiz/trunk/runtime/catalina/README (added)
+++ ofbiz/trunk/runtime/catalina/README Tue Mar 27 10:16:35 2007
@@ -0,0 +1 @@
+The Catalina (Tomcat) work directory and such will go here when catalina is used.
Propchange: ofbiz/trunk/runtime/catalina/README
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/runtime/catalina/README
------------------------------------------------------------------------------
svn:mime-type = text/plain