svn commit: r684377 - in /ofbiz/trunk/framework: appserver/build.xml base/build.xml base/src/base/ base/src/org/ base/src/start/ build.xml start/ start/build.xml start/src/ webapp/build.xml

[doogie-3]

Author: doogie
Date: Sat Aug  9 16:38:36 2008
New Revision: 684377

URL: http://svn.apache.org/viewvc?rev=684377&view=rev
Log:
Split framework/base into framework/start; now all components have
exactly the same type of layout.

Added:
    ofbiz/trunk/framework/base/src/org/
      - copied from r683752, ofbiz/trunk/framework/base/src/base/org/
    ofbiz/trunk/framework/start/   (with props)
    ofbiz/trunk/framework/start/build.xml
      - copied, changed from r681935, ofbiz/trunk/framework/base/build.xml
    ofbiz/trunk/framework/start/src/
      - copied from r658045, ofbiz/trunk/framework/base/src/start/
Removed:
    ofbiz/trunk/framework/base/src/base/
    ofbiz/trunk/framework/base/src/start/
Modified:
    ofbiz/trunk/framework/appserver/build.xml
    ofbiz/trunk/framework/base/build.xml
    ofbiz/trunk/framework/build.xml
    ofbiz/trunk/framework/webapp/build.xml

Modified: ofbiz/trunk/framework/appserver/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/appserver/build.xml?rev=684377&r1=684376&r2=684377&view=diff
==============================================================================
--- ofbiz/trunk/framework/appserver/build.xml (original)
+++ ofbiz/trunk/framework/appserver/build.xml Sat Aug  9 16:38:36 2008
@@ -31,6 +31,7 @@
 
     <path id="local.class.path">
         <fileset dir="../base/lib" includes="*.jar"/>
+        <fileset dir="../start/build/lib" includes="*.jar"/>
         <fileset dir="../base/build/lib" includes="*.jar"/>
         <fileset dir="../webapp/lib" includes="*.jar"/>
         <fileset dir="../webapp/build/lib" includes="*.jar"/>

Modified: ofbiz/trunk/framework/base/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/build.xml?rev=684377&r1=684376&r2=684377&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/build.xml (original)
+++ ofbiz/trunk/framework/base/build.xml Sat Aug  9 16:38:36 2008
@@ -33,6 +33,7 @@
         <fileset dir="${lib.dir}/commons" includes="*.jar"/>
         <fileset dir="${lib.dir}/j2eespecs" includes="*.jar"/>
         <fileset dir="${lib.dir}/scripting" includes="*.jar"/>
+        <fileset dir="../start/build/lib" includes="*.jar"/>
     </path>
     
     <!-- ================================================================== -->
@@ -51,12 +52,6 @@
     <!-- ================================================================== -->              
 
     <target name="classes" depends="prepare">
-        <!-- compile start -->
- <javac15 destdir="${build.dir}/classes/start" srcdir="${src.dir}/start"/>
-        <copy todir="${build.dir}/classes/start">
-          <fileset dir="${src.dir}/start" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/>
-        </copy>
-
         <!-- make sure we have crypto packages available -->
         <condition property="exclude.crypto" value="org/ofbiz/base/crypto/**">
             <not>
@@ -65,38 +60,22 @@
         </condition>
 
         <!-- compile base -->
- <javac15 destdir="${build.dir}/classes/base" srcdir="${src.dir}/base">            
-            <classpath>
-                <path refid="local.class.path"/>
-                <pathelement path="${build.dir}/classes/start"/>
-            </classpath>
+ <javac15 destdir="${build.dir}/classes" srcdir="${src.dir}">            
             <exclude name="${exclude.crypto}"/>
             <exclude name="org/ofbiz/base/util/OfbizJsBsfEngine.java"/>
         </javac15>
         <!-- also put the DTDs in the jar file... -->
-        <copy todir="${build.dir}/classes/base">
+        <copy todir="${build.dir}/classes">
             <fileset dir="${dtd.dir}" includes="*.dtd"/>
-            <fileset dir="${src.dir}/base" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/>
+            <fileset dir="${src.dir}" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/>
         </copy>
         
         <!-- now add the NOTICE and LICENSE files to allow the jar file to be distributed alone -->
-        <copy todir="${build.dir}/classes/start/META-INF">
-            <fileset dir="${ofbiz.home.dir}" includes="NOTICE,LICENSE"/>
-        </copy>        
-        <copy todir="${build.dir}/classes/base/META-INF">
+        <copy todir="${build.dir}/classes/META-INF">
             <fileset dir="${ofbiz.home.dir}" includes="NOTICE,LICENSE"/>
         </copy>        
     </target>
     
-    <target name="jar" depends="classes">
-        <jar jarfile="${build.dir}/lib/ofbiz.jar" basedir="${build.dir}/classes/start" manifest="${src.dir}/start/org/ofbiz/base/start/Start.mf"/>
-        <!-- copy the ofbiz.jar file -->
-        <copy todir="${basedir}/../..">
-            <fileset dir="${build.dir}/lib" includes="ofbiz.jar"/>
-        </copy>
-        <jar jarfile="${build.dir}/lib/ofbiz-base.jar" basedir="${build.dir}/classes/base"/>        
-    </target>    
-    
     <!-- ================================================================== -->
     <!-- Build JavaDoc                                                      -->
     <!-- ================================================================== -->
@@ -106,8 +85,7 @@
                  classpathref="local.class.path"
                  destdir="${build.dir}/javadocs"
                  Windowtitle="Open for Business - Base API">
-            <sourcepath path="${src.dir}/start"/>
-            <sourcepath path="${src.dir}/base"/>            
+            <sourcepath path="${src.dir}"/>            
         </javadoc>
     </target>
 </project>

Modified: ofbiz/trunk/framework/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/build.xml?rev=684377&r1=684376&r2=684377&view=diff
==============================================================================
--- ofbiz/trunk/framework/build.xml (original)
+++ ofbiz/trunk/framework/build.xml Sat Aug  9 16:38:36 2008
@@ -22,7 +22,7 @@
     <import file="../macros.xml"/>
 
     <filelist id="framework-builds" dir="."
-        files="base/build.xml,
+        files="start/build.xml,base/build.xml,
                entity/build.xml,geronimo/build.xml,
                catalina/build.xml,jetty/build.xml,
                security/build.xml,service/build.xml,entityext/build.xml,

Propchange: ofbiz/trunk/framework/start/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug  9 16:38:36 2008
@@ -0,0 +1 @@
+build

Copied: ofbiz/trunk/framework/start/build.xml (from r681935, ofbiz/trunk/framework/base/build.xml)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/start/build.xml?p2=ofbiz/trunk/framework/start/build.xml&p1=ofbiz/trunk/framework/base/build.xml&r1=681935&r2=684377&rev=684377&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/build.xml (original)
+++ ofbiz/trunk/framework/start/build.xml Sat Aug  9 16:38:36 2008
@@ -18,7 +18,7 @@
 under the License.
 -->
 
-<project name="OFBiz - Base" default="jar" basedir=".">
+<project name="OFBiz - Start" default="jar" basedir=".">
     <import file="../../common.xml"/>
 
     <!-- ================================================================== -->
@@ -26,23 +26,13 @@
     <!-- ================================================================== -->
 
     <property name="name" value="ofbiz-base"/>
-    <property name="ofbiz.home.dir" value="../.."/>
-
-    <path id="local.class.path">
-        <fileset dir="${lib.dir}" includes="*.jar"/>
-        <fileset dir="${lib.dir}/commons" includes="*.jar"/>
-        <fileset dir="${lib.dir}/j2eespecs" includes="*.jar"/>
-        <fileset dir="${lib.dir}/scripting" includes="*.jar"/>
-    </path>
     
     <!-- ================================================================== -->
     <!-- Makes sure the needed directory structure is in place              -->
     <!-- ================================================================== -->
 
     <target name="prepare" depends="clean-lib">
-        <mkdir dir="${build.dir}/classes"/>
-        <mkdir dir="${build.dir}/classes/base/META-INF"/>
-        <mkdir dir="${build.dir}/classes/start/META-INF"/>        
+        <mkdir dir="${build.dir}/classes/META-INF"/>        
         <mkdir dir="${build.dir}/lib"/>
     </target>
     
@@ -52,49 +42,23 @@
 
     <target name="classes" depends="prepare">
         <!-- compile start -->
- <javac15 destdir="${build.dir}/classes/start" srcdir="${src.dir}/start"/>
-        <copy todir="${build.dir}/classes/start">
-          <fileset dir="${src.dir}/start" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/>
-        </copy>
-
-        <!-- make sure we have crypto packages available -->
-        <condition property="exclude.crypto" value="org/ofbiz/base/crypto/**">
-            <not>
-                <available classname="javax.crypto.Cipher" classpathref="local.class.path"/>
-            </not>
-        </condition>
-
-        <!-- compile base -->
- <javac15 destdir="${build.dir}/classes/base" srcdir="${src.dir}/base">            
-            <classpath>
-                <path refid="local.class.path"/>
-                <pathelement path="${build.dir}/classes/start"/>
-            </classpath>
-            <exclude name="${exclude.crypto}"/>
-            <exclude name="org/ofbiz/base/util/OfbizJsBsfEngine.java"/>
-        </javac15>
-        <!-- also put the DTDs in the jar file... -->
-        <copy todir="${build.dir}/classes/base">
-            <fileset dir="${dtd.dir}" includes="*.dtd"/>
-            <fileset dir="${src.dir}/base" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/>
+ <javac15 destdir="${build.dir}/classes" srcdir="${src.dir}"/>
+        <copy todir="${build.dir}/classes">
+          <fileset dir="${src.dir}" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/>
         </copy>
         
         <!-- now add the NOTICE and LICENSE files to allow the jar file to be distributed alone -->
         <copy todir="${build.dir}/classes/start/META-INF">
             <fileset dir="${ofbiz.home.dir}" includes="NOTICE,LICENSE"/>
         </copy>        
-        <copy todir="${build.dir}/classes/base/META-INF">
-            <fileset dir="${ofbiz.home.dir}" includes="NOTICE,LICENSE"/>
-        </copy>        
     </target>
     
     <target name="jar" depends="classes">
-        <jar jarfile="${build.dir}/lib/ofbiz.jar" basedir="${build.dir}/classes/start" manifest="${src.dir}/start/org/ofbiz/base/start/Start.mf"/>
+        <jar jarfile="${build.dir}/lib/ofbiz.jar" basedir="${build.dir}/classes" manifest="${src.dir}/org/ofbiz/base/start/Start.mf"/>
         <!-- copy the ofbiz.jar file -->
         <copy todir="${basedir}/../..">
             <fileset dir="${build.dir}/lib" includes="ofbiz.jar"/>
         </copy>
-        <jar jarfile="${build.dir}/lib/ofbiz-base.jar" basedir="${build.dir}/classes/base"/>        
     </target>    
     
     <!-- ================================================================== -->
@@ -105,9 +69,8 @@
         <javadoc packagenames="org.ofbiz.base.*"
                  classpathref="local.class.path"
                  destdir="${build.dir}/javadocs"
-                 Windowtitle="Open for Business - Base API">
-            <sourcepath path="${src.dir}/start"/>
-            <sourcepath path="${src.dir}/base"/>            
+                 Windowtitle="Open for Business - Start API">
+            <sourcepath path="${src.dir}"/>
         </javadoc>
     </target>
 </project>

Modified: ofbiz/trunk/framework/webapp/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/build.xml?rev=684377&r1=684376&r2=684377&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/build.xml (original)
+++ ofbiz/trunk/framework/webapp/build.xml Sat Aug  9 16:38:36 2008
@@ -35,6 +35,7 @@
         <fileset dir="../base/lib/commons" includes="*.jar"/>
         <fileset dir="../base/lib/j2eespecs" includes="*.jar"/>
         <fileset dir="../base/lib/scripting" includes="*.jar"/>
+        <fileset dir="../start/build/lib" includes="*.jar"/>
         <fileset dir="../base/build/lib" includes="*.jar"/>
         <fileset dir="../entity/lib" includes="*.jar"/>
         <fileset dir="../entity/build/lib" includes="*.jar"/>