svn commit: r522914 - in /ofbiz/trunk: applications/content/config/ framework/ framework/base/config/ framework/base/src/start/org/ofbiz/base/start/ framework/data/ framework/logs/ runtime/ runtime/data/ runtime/logs/ runtime/output/

[jacopoc]

Author: jacopoc
Date: Tue Mar 27 07:02:57 2007
New Revision: 522914

URL: http://svn.apache.org/viewvc?view=rev&rev=522914
Log:
Added a new 'runtime' folder, at the same level of 'applications', 'framework' 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.

Added:
    ofbiz/trunk/runtime/
    ofbiz/trunk/runtime/data/
    ofbiz/trunk/runtime/data/README   (with props)
    ofbiz/trunk/runtime/data/derby.properties   (with props)
    ofbiz/trunk/runtime/logs/
    ofbiz/trunk/runtime/logs/README   (with props)
    ofbiz/trunk/runtime/output/
Removed:
    ofbiz/trunk/framework/data/
    ofbiz/trunk/framework/logs/
Modified:
    ofbiz/trunk/applications/content/config/content.properties
    ofbiz/trunk/framework/base/config/cache.properties
    ofbiz/trunk/framework/base/config/debug.properties
    ofbiz/trunk/framework/base/config/ofbiz-containers.xml
    ofbiz/trunk/framework/base/src/start/org/ofbiz/base/start/install.properties
    ofbiz/trunk/framework/base/src/start/org/ofbiz/base/start/jetty.properties
    ofbiz/trunk/framework/base/src/start/org/ofbiz/base/start/pos.properties
    ofbiz/trunk/framework/base/src/start/org/ofbiz/base/start/rmi.properties
    ofbiz/trunk/framework/base/src/start/org/ofbiz/base/start/setup.properties
    ofbiz/trunk/framework/base/src/start/org/ofbiz/base/start/start.properties
    ofbiz/trunk/framework/base/src/start/org/ofbiz/base/start/test.properties
    ofbiz/trunk/framework/build.xml

Modified: ofbiz/trunk/applications/content/config/content.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/config/content.properties?view=diff&rev=522914&r1=522913&r2=522914
==============================================================================
--- ofbiz/trunk/applications/content/config/content.properties (original)
+++ ofbiz/trunk/applications/content/config/content.properties Tue Mar 27 07:02:57 2007
@@ -37,4 +37,4 @@
 content.upload.max.files=250
 
 # content output folder (relative to ofbiz.home)
-content.output.path=applications/content/output
+content.output.path=runtime/output

Modified: ofbiz/trunk/framework/base/config/cache.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/config/cache.properties?view=diff&rev=522914&r1=522913&r2=522914
==============================================================================
--- ofbiz/trunk/framework/base/config/cache.properties (original)
+++ ofbiz/trunk/framework/base/config/cache.properties Tue Mar 27 07:02:57 2007
@@ -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

Modified: ofbiz/trunk/framework/base/config/debug.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/config/debug.properties?view=diff&rev=522914&r1=522913&r2=522914
==============================================================================
--- ofbiz/trunk/framework/base/config/debug.properties (original)
+++ ofbiz/trunk/framework/base/config/debug.properties Tue Mar 27 07:02:57 2007
@@ -76,7 +76,7 @@
 
 #--- 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 @@
 
 #--- 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

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=522914&r1=522913&r2=522914
==============================================================================
--- ofbiz/trunk/framework/base/config/ofbiz-containers.xml (original)
+++ ofbiz/trunk/framework/base/config/ofbiz-containers.xml Tue Mar 27 07:02:57 2007
@@ -101,7 +101,7 @@
             <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">

Modified: ofbiz/trunk/framework/base/src/start/org/ofbiz/base/start/install.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/start/org/ofbiz/base/start/install.properties?view=diff&rev=522914&r1=522913&r2=522914
==============================================================================
--- ofbiz/trunk/framework/base/src/start/org/ofbiz/base/start/install.properties (original)
+++ ofbiz/trunk/framework/base/src/start/org/ofbiz/base/start/install.properties Tue Mar 27 07:02:57 2007
@@ -36,7 +36,7 @@
 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.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

Modified: ofbiz/trunk/framework/base/src/start/org/ofbiz/base/start/jetty.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/start/org/ofbiz/base/start/jetty.properties?view=diff&rev=522914&r1=522913&r2=522914
==============================================================================
--- ofbiz/trunk/framework/base/src/start/org/ofbiz/base/start/jetty.properties (original)
+++ ofbiz/trunk/framework/base/src/start/org/ofbiz/base/start/jetty.properties Tue Mar 27 07:02:57 2007
@@ -45,7 +45,7 @@
 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.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

Modified: ofbiz/trunk/framework/base/src/start/org/ofbiz/base/start/pos.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/start/org/ofbiz/base/start/pos.properties?view=diff&rev=522914&r1=522913&r2=522914
==============================================================================
--- ofbiz/trunk/framework/base/src/start/org/ofbiz/base/start/pos.properties (original)
+++ ofbiz/trunk/framework/base/src/start/org/ofbiz/base/start/pos.properties Tue Mar 27 07:02:57 2007
@@ -36,7 +36,7 @@
 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.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

Modified: ofbiz/trunk/framework/base/src/start/org/ofbiz/base/start/rmi.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/start/org/ofbiz/base/start/rmi.properties?view=diff&rev=522914&r1=522913&r2=522914
==============================================================================
--- ofbiz/trunk/framework/base/src/start/org/ofbiz/base/start/rmi.properties (original)
+++ ofbiz/trunk/framework/base/src/start/org/ofbiz/base/start/rmi.properties Tue Mar 27 07:02:57 2007
@@ -36,7 +36,7 @@
 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.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

Modified: ofbiz/trunk/framework/base/src/start/org/ofbiz/base/start/setup.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/start/org/ofbiz/base/start/setup.properties?view=diff&rev=522914&r1=522913&r2=522914
==============================================================================
--- ofbiz/trunk/framework/base/src/start/org/ofbiz/base/start/setup.properties (original)
+++ ofbiz/trunk/framework/base/src/start/org/ofbiz/base/start/setup.properties Tue Mar 27 07:02:57 2007
@@ -36,7 +36,7 @@
 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.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

Modified: ofbiz/trunk/framework/base/src/start/org/ofbiz/base/start/start.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/start/org/ofbiz/base/start/start.properties?view=diff&rev=522914&r1=522913&r2=522914
==============================================================================
--- ofbiz/trunk/framework/base/src/start/org/ofbiz/base/start/start.properties (original)
+++ ofbiz/trunk/framework/base/src/start/org/ofbiz/base/start/start.properties Tue Mar 27 07:02:57 2007
@@ -45,7 +45,7 @@
 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.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

Modified: ofbiz/trunk/framework/base/src/start/org/ofbiz/base/start/test.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/start/org/ofbiz/base/start/test.properties?view=diff&rev=522914&r1=522913&r2=522914
==============================================================================
--- ofbiz/trunk/framework/base/src/start/org/ofbiz/base/start/test.properties (original)
+++ ofbiz/trunk/framework/base/src/start/org/ofbiz/base/start/test.properties Tue Mar 27 07:02:57 2007
@@ -36,7 +36,7 @@
 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.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

Modified: ofbiz/trunk/framework/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/build.xml?view=diff&rev=522914&r1=522913&r2=522914
==============================================================================
--- ofbiz/trunk/framework/build.xml (original)
+++ ofbiz/trunk/framework/build.xml Tue Mar 27 07:02:57 2007
@@ -45,10 +45,11 @@
     </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 @@
     </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 @@
 
     <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 @@
 
     <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 @@
         <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"/>

Added: ofbiz/trunk/runtime/data/README
URL: http://svn.apache.org/viewvc/ofbiz/trunk/runtime/data/README?view=auto&rev=522914
==============================================================================
--- ofbiz/trunk/runtime/data/README (added)
+++ ofbiz/trunk/runtime/data/README Tue Mar 27 07:02:57 2007
@@ -0,0 +1 @@
+The data (database) files, like the Derby files, will be put here.

Propchange: ofbiz/trunk/runtime/data/README
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/runtime/data/README
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ofbiz/trunk/runtime/data/derby.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/runtime/data/derby.properties?view=auto&rev=522914
==============================================================================
--- ofbiz/trunk/runtime/data/derby.properties (added)
+++ ofbiz/trunk/runtime/data/derby.properties Tue Mar 27 07:02:57 2007
@@ -0,0 +1,23 @@
+###############################################################################
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+###############################################################################
+
+derby.infolog.append=true
+derby.storage.pageSize=8192
+derby.storage.pageReservedSpace=60
+derby.storage.fileSyncTransactionLog=true

Propchange: ofbiz/trunk/runtime/data/derby.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/runtime/data/derby.properties
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/runtime/data/derby.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ofbiz/trunk/runtime/logs/README
URL: http://svn.apache.org/viewvc/ofbiz/trunk/runtime/logs/README?view=auto&rev=522914
==============================================================================
--- ofbiz/trunk/runtime/logs/README (added)
+++ ofbiz/trunk/runtime/logs/README Tue Mar 27 07:02:57 2007
@@ -0,0 +1 @@
+The log files will be put in this directory.

Propchange: ofbiz/trunk/runtime/logs/README
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/runtime/logs/README
------------------------------------------------------------------------------
    svn:mime-type = text/plain