Added a new 'runtime' folder, at the same level of 'applications', 'f…

…ramework' etc..., where all the runtime data such as logs, derby db files and output (such as the pdf report files that can be created with the new service) are created. Removed the logs and data folders from the framework folder. Still need to be migrated to the new folder the catalina/work folder: I'm sorry but I don't know how to do this. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@522914 13f79535-47bb-0310-9956-ffa450edef68
masudeden · Mar 27, 2007 · 8d695b8 · 8d695b8
1 parent 2d5adfe
commit 8d695b8
Show file tree

Hide file tree

Showing 15 changed files with 29 additions and 28 deletions.
diff --git a/applications/content/config/content.properties b/applications/content/config/content.properties
@@ -37,4 +37,4 @@ content.upload.path.prefix=/applications/content/uploads
 content.upload.max.files=250
 
 # content output folder (relative to ofbiz.home)
-content.output.path=applications/content/output
+content.output.path=runtime/output
diff --git a/framework/base/config/cache.properties b/framework/base/config/cache.properties
@@ -22,7 +22,7 @@
 ####
 
 # Default Settings
-cache.file.store=framework/data/utilcache
+cache.file.store=runtime/data/utilcache
 default.maxSize=0
 default.expireTime=0
 default.useSoftReference=false

diff --git a/framework/base/config/debug.properties b/framework/base/config/debug.properties
@@ -76,7 +76,7 @@ log4j.appender.stdout.layout.ConversionPattern=%d (%t) [%24F:%-3L:%-5p]%x %m%n
 
 #--- File Log ---
 log4j.appender.file=org.apache.log4j.RollingFileAppender
-log4j.appender.file.File=framework/logs/ofbiz.log
+log4j.appender.file.File=runtime/logs/ofbiz.log
 
 log4j.appender.file.MaxFileSize=1000KB
 log4j.appender.file.MaxBackupIndex=10
@@ -86,7 +86,7 @@ log4j.appender.file.layout.ConversionPattern=%d (%t) [%24F:%-3L:%-5p]%x %m%n
 
 #--- CSS Log ---
 log4j.appender.css=org.apache.log4j.RollingFileAppender
-log4j.appender.css.File=framework/logs/ofbiz.html
+log4j.appender.css.File=runtime/logs/ofbiz.html
 log4j.appender.css.MaxFileSize=200KB
 log4j.appender.css.MaxBackupIndex=1
 log4j.appender.css.layout=org.apache.log4j.PatternLayout

diff --git a/framework/base/config/ofbiz-containers.xml b/framework/base/config/ofbiz-containers.xml
@@ -101,7 +101,7 @@ under the License.
             <property name="access-log-resolve" value="true"/>
             <property name="access-log-rotate" value="true"/>
             <property name="access-log-prefix" value="access_log."/>
-            <property name="access-log-dir" value="framework/logs"/>
+            <property name="access-log-dir" value="runtime/logs"/>
             <property name="enable-request-dump" value="false"/>
             <!-- uncomment for cluster support
             <property name="default-server-cluster" value="cluster">

diff --git a/framework/base/src/start/org/ofbiz/base/start/install.properties b/framework/base/src/start/org/ofbiz/base/start/install.properties
@@ -36,7 +36,7 @@ ofbiz.base.lib=framework/base/lib
 ofbiz.base.jar=framework/base/build/lib/ofbiz-base.jar
 
 # --- Default logs directory (relative to ofbiz.home)
-ofbiz.log.dir=framework/logs
+ofbiz.log.dir=runtime/logs
 
 # --- Location (relative to ofbiz.home) for (normal) container configuration
 ofbiz.container.config=framework/base/config/install-containers.xml
@@ -51,7 +51,7 @@ ofbiz.enable.hook=false
 ofbiz.auto.shutdown=true
 
 # --- Default Derby system home directory
-derby.system.home=framework/data/derby
+derby.system.home=runtime/data/derby
 
 # --- By default we will find base/config/debug.properties and point to there
 #log4j.configuration=file:/c:/work/ofbiz/config/debug.properties

diff --git a/framework/base/src/start/org/ofbiz/base/start/jetty.properties b/framework/base/src/start/org/ofbiz/base/start/jetty.properties
@@ -45,7 +45,7 @@ ofbiz.base.lib=framework/base/lib
 ofbiz.base.jar=framework/base/build/lib/ofbiz-base.jar
 
 # --- Default logs directory (relative to ofbiz.home)
-ofbiz.log.dir=framework/logs
+ofbiz.log.dir=runtime/logs
 
 # --- Location (relative to ofbiz.home) for (normal) container configuration
 ofbiz.container.config=framework/base/config/jetty-containers.xml
@@ -60,7 +60,7 @@ ofbiz.enable.hook=true
 ofbiz.auto.shutdown=false
 
 # --- Default Derby system home directory
-derby.system.home=framework/data/derby
+derby.system.home=runtime/data/derby
 
 # --- By default we will find base/config/debug.properties and point to there
 #log4j.configuration=file:/c:/work/ofbiz/config/debug.properties

diff --git a/framework/base/src/start/org/ofbiz/base/start/pos.properties b/framework/base/src/start/org/ofbiz/base/start/pos.properties
@@ -36,7 +36,7 @@ ofbiz.base.lib=framework/base/lib
 ofbiz.base.jar=framework/base/build/lib/ofbiz-base.jar
 
 # --- Default logs directory (relative to ofbiz.home)
-ofbiz.log.dir=framework/logs
+ofbiz.log.dir=runtime/logs
 
 # --- Location (relative to ofbiz.home) for (normal) container configuration
 ofbiz.container.config=framework/base/config/pos-containers.xml
@@ -57,7 +57,7 @@ ofbiz.enable.hook=true
 ofbiz.auto.shutdown=false
 
 # --- Default Derby system home directory
-derby.system.home=framework/data/derby
+derby.system.home=runtime/data/derby
 
 # --- By default we will find base/config/debug.properties and point to there
 #log4j.configuration=file:/c:/work/ofbiz/config/debug.properties

diff --git a/framework/base/src/start/org/ofbiz/base/start/rmi.properties b/framework/base/src/start/org/ofbiz/base/start/rmi.properties
@@ -36,7 +36,7 @@ ofbiz.base.lib=framework/base/lib
 ofbiz.base.jar=framework/base/build/lib/ofbiz-base.jar
 
 # --- Default logs directory (relative to ofbiz.home)
-ofbiz.log.dir=logs
+ofbiz.log.dir=runtime/logs
 
 # --- Location (relative to ofbiz.home) for (normal) container configuration
 ofbiz.container.config=framework/base/config/rmi-containers.xml
@@ -51,7 +51,7 @@ ofbiz.enable.hook=true
 ofbiz.auto.shutdown=false
 
 # --- Default Derby system home directory
-derby.system.home=framework/data/derby
+derby.system.home=runtime/data/derby
 
 # --- By default we will find base/config/debug.properties and point to there
 #log4j.configuration=file:/c:/work/ofbiz/config/debug.properties

diff --git a/framework/base/src/start/org/ofbiz/base/start/setup.properties b/framework/base/src/start/org/ofbiz/base/start/setup.properties
@@ -36,7 +36,7 @@ ofbiz.base.lib=framework/base/lib
 ofbiz.base.jar=framework/base/build/lib/ofbiz-base.jar
 
 # --- Default logs directory (relative to ofbiz.home)
-ofbiz.log.dir=logs
+ofbiz.log.dir=runtime/logs
 
 # --- Location (relative to ofbiz.home) for (normal) container configuration
 ofbiz.container.config=framework/appservers/config/ofbiz-containers.xml
@@ -51,7 +51,7 @@ ofbiz.enable.hook=false
 ofbiz.auto.shutdown=true
 
 # --- Default Derby system home directory
-derby.system.home=framework/data/derby
+derby.system.home=runtime/data/derby
 
 # --- By default we will find base/config/debug.properties and point to there
 #log4j.configuration=file:/c:/work/ofbiz/config/debug.properties

diff --git a/framework/base/src/start/org/ofbiz/base/start/start.properties b/framework/base/src/start/org/ofbiz/base/start/start.properties
@@ -45,7 +45,7 @@ ofbiz.base.lib=framework/base/lib
 ofbiz.base.jar=framework/base/build/lib/ofbiz-base.jar
 
 # --- Default logs directory (relative to ofbiz.home)
-ofbiz.log.dir=framework/logs
+ofbiz.log.dir=runtime/logs
 
 # --- Location (relative to ofbiz.home) for (normal) container configuration
 ofbiz.container.config=framework/base/config/ofbiz-containers.xml
@@ -60,7 +60,7 @@ ofbiz.enable.hook=true
 ofbiz.auto.shutdown=false
 
 # --- Default Derby system home directory
-derby.system.home=framework/data/derby
+derby.system.home=runtime/data/derby
 
 # --- By default we will find base/config/debug.properties and point to there
 #log4j.configuration=file:/c:/work/ofbiz/config/debug.properties

diff --git a/framework/base/src/start/org/ofbiz/base/start/test.properties b/framework/base/src/start/org/ofbiz/base/start/test.properties
@@ -36,7 +36,7 @@ ofbiz.base.lib=framework/base/lib
 ofbiz.base.jar=framework/base/build/lib/ofbiz-base.jar
 
 # --- Default logs directory (relative to ofbiz.home)
-ofbiz.log.dir=logs
+ofbiz.log.dir=runtime/logs
 
 # --- Location (relative to ofbiz.home) for (normal) container configuration
 ofbiz.container.config=framework/base/config/test-containers.xml
@@ -51,7 +51,7 @@ ofbiz.enable.hook=true
 ofbiz.auto.shutdown=true
 
 # --- Default Derby system home directory
-derby.system.home=framework/data/derby
+derby.system.home=runtime/data/derby
 
 # --- By default we will find base/config/debug.properties and point to there
 #log4j.configuration=file:/c:/work/ofbiz/config/debug.properties

diff --git a/framework/build.xml b/framework/build.xml
@@ -45,10 +45,11 @@ under the License.
     </target>
 
     <target name="dir-init" depends="ofbiz-init">
-        <mkdir dir="logs"/>
-        <mkdir dir="data"/>
-        <mkdir dir="data/derby"/>
-        <mkdir dir="data/hsql"/>
+        <mkdir dir="../runtime"/>
+        <mkdir dir="../runtime/logs"/>
+        <mkdir dir="../runtime/data"/>
+        <mkdir dir="../runtime/data/derby"/>
+        <mkdir dir="../runtime/data/hsql"/>
 
         <condition property="isMac">
             <os family="mac"/>
@@ -57,7 +58,7 @@ under the License.
     </target>
 
     <target name="copy-derby-props" if="isMac">
-        <copy file="data/derby.properties" todir="data/derby"/>
+        <copy file="../runtime/data/derby.properties" todir="../runtime/data/derby"/>
     </target>
 
     <!-- ================================================================== -->
@@ -79,7 +80,7 @@ under the License.
 
     <target name="clean-data">
         <delete verbose="on" includeemptydirs="true">
-            <fileset dir="data" includes="**/*">
+            <fileset dir="../runtime/data" includes="**/*">
                 <exclude name="README"/>
                 <exclude name="derby.properties"/>
             </fileset>
@@ -88,7 +89,7 @@ under the License.
 
     <target name="clean-logs">
         <delete verbose="on">
-            <fileset dir="logs" includes="*">
+            <fileset dir="../runtime/logs" includes="*">
                 <exclude name="README"/>
             </fileset>
         </delete>
@@ -126,8 +127,8 @@ under the License.
         <echo message="[build] ========== Start Building Framework (Compile) =========="/>
 
         <!-- make sure the data and logs directories exist (they should exist, because they are in svn) -->
-        <mkdir dir="data"/>
-        <mkdir dir="logs"/>
+        <mkdir dir="../runtime/data"/>
+        <mkdir dir="../runtime/logs"/>
 
         <subant inheritall="false">
             <filelist refid="framework-builds"/>

diff --git a/framework/data/README → runtime/data/README b/framework/data/README → runtime/data/README
diff --git a/framework/data/derby.properties → runtime/data/derby.properties b/framework/data/derby.properties → runtime/data/derby.properties
diff --git a/framework/logs/README → runtime/logs/README b/framework/logs/README → runtime/logs/README