You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by do...@apache.org on 2008/06/29 20:39:38 UTC

svn commit: r672657 [2/3] - in /ofbiz/trunk: ./ applications/ applications/accounting/ applications/content/ applications/ecommerce/ applications/humanres/ applications/manufacturing/ applications/marketing/ applications/order/ applications/party/ appl...

Modified: ofbiz/trunk/framework/base/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/build.xml?rev=672657&r1=672656&r2=672657&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/build.xml (original)
+++ ofbiz/trunk/framework/base/build.xml Sun Jun 29 11:39:36 2008
@@ -19,42 +19,21 @@
 -->
 
 <project name="OFBiz - Base" default="jar" basedir=".">
+    <import file="../../common.xml"/>
 
     <!-- ================================================================== -->
     <!-- Initialization of all property settings                            -->
     <!-- ================================================================== -->
 
-    <target name="init">                
-        <property environment="env"/>
-        <property name="name" value="ofbiz-base"/>
-        <property name="ofbiz.home.dir" value="../.."/>
-        <property name="src.dir" value="src"/>
-        <property name="dtd.dir" value="dtd"/>
-        <property name="lib.dir" value="lib"/>
-        <property name="build.dir" value="build"/>        
-    </target>
-    
-    <target name="classpath">		        
-        <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>
-    </target>
-    
-    <!-- ================================================================== -->
-    <!-- Removes all created files and directories                          -->
-    <!-- ================================================================== -->
+    <property name="name" value="ofbiz-base"/>
+    <property name="ofbiz.home.dir" value="../.."/>
 
-    <target name="clean" depends="clean-lib">
-        <delete dir="${build.dir}"/>
-        <delete file="../../ofbiz.jar"/>
-    </target>
-
-    <target name="clean-lib" depends="init">
-        <delete dir="${build.dir}/lib"/>        
-    </target>
+    <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              -->
@@ -67,20 +46,15 @@
         <mkdir dir="${build.dir}/lib"/>
     </target>
     
-    <target name="prepare-docs" depends="init">
-        <mkdir dir="${build.dir}/javadocs"/>        
-    </target>
-    
     <!-- ================================================================== -->
     <!-- Compilation of the source files                                    -->
     <!-- ================================================================== -->               
 
-    <target name="classes" depends="prepare,classpath">
+    <target name="classes" depends="prepare">
         <!-- compile start -->
-    	<javac debug="on" source="1.5" deprecation="on" destdir="${build.dir}/classes/start">
-            <compilerarg value="-Xlint:unchecked"/>
+    	<javac15 destdir="${build.dir}/classes/start" classpathref="local.class.path">
             <src path="${src.dir}/start"/>
-        </javac>
+        </javac15>
         <copy todir="${build.dir}/classes/start">
           <fileset dir="${src.dir}/start" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/>
         </copy>
@@ -93,7 +67,7 @@
         </condition>
 
         <!-- compile base -->
-    	<javac debug="on" source="1.5" deprecation="on" destdir="${build.dir}/classes/base">            
+    	<javac15 destdir="${build.dir}/classes/base">            
             <classpath>
                 <path refid="local.class.path"/>
                 <pathelement path="${build.dir}/classes/start"/>
@@ -101,7 +75,7 @@
             <src path="${src.dir}/base"/>
             <exclude name="${exclude.crypto}"/>
             <exclude name="org/ofbiz/base/util/OfbizJsBsfEngine.java"/>
-        </javac>
+        </javac15>
         <!-- also put the DTDs in the jar file... -->
         <copy todir="${build.dir}/classes/base">
             <fileset dir="${dtd.dir}" includes="*.dtd"/>
@@ -130,7 +104,7 @@
     <!-- Build JavaDoc                                                      -->
     <!-- ================================================================== -->
 
-    <target name="docs" depends="prepare-docs,classpath">
+    <target name="docs" depends="prepare-docs">
         <javadoc packagenames="org.ofbiz.base.*" 
                  classpathref="local.class.path"
                  destdir="${build.dir}/javadocs" 
@@ -139,6 +113,4 @@
             <sourcepath path="${src.dir}/base"/>            
         </javadoc>
     </target>
-    
-    <target name="all" depends="jar,docs"/>   
 </project>

Modified: ofbiz/trunk/framework/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/build.xml?rev=672657&r1=672656&r2=672657&view=diff
==============================================================================
--- ofbiz/trunk/framework/build.xml (original)
+++ ofbiz/trunk/framework/build.xml Sun Jun 29 11:39:36 2008
@@ -19,6 +19,7 @@
 -->
 
 <project name="OFBiz Framework Build" default="build" basedir=".">
+    <import file="../macros.xml"/>
 
     <filelist id="framework-builds" dir="."
         files="base/build.xml,
@@ -121,9 +122,7 @@
     </target>
 
     <target name="clean">
-        <subant target="clean">
-            <filelist refid="framework-builds"/>
-        </subant>
+        <iterate target="clean" filelist="framework-builds"/>
         <echo message="[clean] ========== Done Cleaning Framework =========="/>
     </target>
 
@@ -138,9 +137,7 @@
         <mkdir dir="../runtime/data"/>
         <mkdir dir="../runtime/logs"/>
 
-        <subant inheritall="false">
-            <filelist refid="framework-builds"/>
-        </subant>
+        <iterate inheritall="false" filelist="framework-builds"/>
         
         <echo message="[build] ========== Done Building Framework (Compile) =========="/>
     </target>
@@ -152,9 +149,7 @@
     <target name="docs">
         <echo message="[docs] ========== Start Building Framework (JavaDoc) =========="/>
 
-        <subant target="docs">
-            <filelist refid="framework-builds"/>
-        </subant>
+        <iterate target="docs" filelist="framework-builds"/>
 
         <echo message="[docs] ========== Done Building Framework (JavaDocs) =========="/>
     </target>

Modified: ofbiz/trunk/framework/catalina/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/build.xml?rev=672657&r1=672656&r2=672657&view=diff
==============================================================================
--- ofbiz/trunk/framework/catalina/build.xml (original)
+++ ofbiz/trunk/framework/catalina/build.xml Sun Jun 29 11:39:36 2008
@@ -19,71 +19,32 @@
 -->
 
 <project name="Catalina" default="jar" basedir=".">
+    <import file="../../common.xml"/>
 
     <!-- ================================================================== -->
     <!-- Initialization of all property settings                            -->
     <!-- ================================================================== -->
 
-    <target name="init">
-        <property environment="env"/>
-        <property name="desc" value="Catalina Http/Servlet Container"/>
-        <property name="name" value="ofbiz-catalina"/>
-        <property name="ofbiz.home.dir" value="../.."/>
-        <property name="src.dir" value="src"/>
-        <property name="dtd.dir" value="dtd"/>
-        <property name="lib.dir" value="lib"/>
-        <property name="build.dir" value="build"/>
-    </target>
-
-    <target name="classpath">
-        <path id="local.class.path">
-            <fileset dir="${lib.dir}" includes="*.jar"/>
-            <fileset dir="../base/lib" includes="*.jar"/>
-            <fileset dir="../base/lib/commons" includes="*.jar"/>
-            <fileset dir="../base/lib/j2eespecs" includes="*.jar"/>
-            <fileset dir="../base/build/lib" includes="*.jar"/>
-            <fileset dir="../entity/lib" includes="*.jar"/>
-            <fileset dir="../entity/build/lib" includes="*.jar"/>
-        </path>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Removes all created files and directories                          -->
-    <!-- ================================================================== -->
-
-    <target name="clean" depends="clean-lib">
-        <delete dir="${build.dir}"/>
-    </target>
-
-    <target name="clean-lib" depends="init">
-        <delete dir="${build.dir}/lib"/>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Makes sure the needed directory structure is in place              -->
-    <!-- ================================================================== -->
-
-    <target name="prepare" depends="clean-lib">
-        <mkdir dir="${build.dir}/classes"/>
-        <mkdir dir="${build.dir}/lib"/>
-    </target>
-
-    <target name="prepare-docs" depends="init">
-        <mkdir dir="${build.dir}/javadocs"/>
-    </target>
+    <property name="desc" value="Catalina Http/Servlet Container"/>
+    <property name="name" value="ofbiz-catalina"/>
+    <property name="ofbiz.home.dir" value="../.."/>
+
+    <path id="local.class.path">
+        <fileset dir="${lib.dir}" includes="*.jar"/>
+        <fileset dir="../base/lib" includes="*.jar"/>
+        <fileset dir="../base/lib/commons" includes="*.jar"/>
+        <fileset dir="../base/lib/j2eespecs" includes="*.jar"/>
+        <fileset dir="../base/build/lib" includes="*.jar"/>
+        <fileset dir="../entity/lib" includes="*.jar"/>
+        <fileset dir="../entity/build/lib" includes="*.jar"/>
+    </path>
 
     <!-- ================================================================== -->
     <!-- Compilation of the source files                                                                                                                         -->
     <!-- ================================================================== -->
 
-    <target name="classes" depends="prepare,classpath">
-        <javac debug="on" source="1.5" deprecation="on" destdir="${build.dir}/classes">
-            <compilerarg value="-Xlint:unchecked"/>
-            <classpath>
-                <path refid="local.class.path"/>
-            </classpath>
-            <src path="${src.dir}"/>
-        </javac>
+    <target name="classes" depends="prepare">
+        <javac15 classpathref="local.class.path"/>
         <!-- also put the DTDs in the jar file... -->
         <copy todir="${build.dir}/classes">
             <!--<fileset dir="${dtd.dir}" includes="*.dtd"/>-->
@@ -96,15 +57,11 @@
         </copy>        
     </target>
 
-    <target name="jar" depends="classes">
-        <jar jarfile="${build.dir}/lib/${name}.jar" basedir="${build.dir}/classes"/>
-    </target>
-
     <!-- ================================================================== -->
     <!-- Build JavaDoc                                                      -->
     <!-- ================================================================== -->
 
-    <target name="docs" depends="prepare-docs,classpath">
+    <target name="docs" depends="prepare-docs">
         <javadoc packagenames="org.ofbiz.catalina.*"
                  classpathref="local.class.path"
                  destdir="${build.dir}/javadocs"
@@ -112,6 +69,4 @@
             <sourcepath path="${src.dir}"/>
         </javadoc>
     </target>
-
-    <target name="all" depends="jar,docs"/>
 </project>

Modified: ofbiz/trunk/framework/common/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/build.xml?rev=672657&r1=672656&r2=672657&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/build.xml (original)
+++ ofbiz/trunk/framework/common/build.xml Sun Jun 29 11:39:36 2008
@@ -19,73 +19,35 @@
 -->
 
 <project name="OFBiz - Common" default="jar" basedir=".">
+    <import file="../../common.xml"/>
 
     <!-- ================================================================== -->
     <!-- Initialization of all property settings                            -->
     <!-- ================================================================== -->
 
-    <target name="init">
-        <property environment="env"/>
-        <property name="desc" value="Common Component"/>
-        <property name="name" value="ofbiz-common"/>
-        <property name="ofbiz.home.dir" value="../.."/>
-        <property name="src.dir" value="src"/>
-        <property name="dtd.dir" value="dtd"/>
-        <property name="lib.dir" value="lib"/>
-        <property name="build.dir" value="build"/>
-    </target>
-
-    <target name="classpath">
-        <path id="local.class.path">
-            <fileset dir="../base/lib" includes="*.jar"/>
-            <fileset dir="../base/lib/commons" includes="*.jar"/>
-            <fileset dir="../base/lib/j2eespecs" includes="*.jar"/>
-            <fileset dir="../base/build/lib" includes="*.jar"/>
-            <fileset dir="../entity/lib" includes="*.jar"/>
-            <fileset dir="../entity/build/lib" includes="*.jar"/>
-            <fileset dir="../security/build/lib" includes="*.jar"/>
-            <fileset dir="../service/lib" includes="*.jar"/>
-            <fileset dir="../service/build/lib" includes="*.jar"/>
-            <fileset dir="../entityext/build/lib" includes="*.jar"/>
-        </path>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Removes all created files and directories                          -->
-    <!-- ================================================================== -->
-
-    <target name="clean" depends="clean-lib">
-        <delete dir="${build.dir}"/>
-    </target>
-
-    <target name="clean-lib" depends="init">
-        <delete dir="${build.dir}/lib"/>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Makes sure the needed directory structure is in place              -->
-    <!-- ================================================================== -->
-
-    <target name="prepare" depends="clean-lib">
-        <mkdir dir="${build.dir}/classes"/>
-        <mkdir dir="${build.dir}/lib"/>
-    </target>
-
-    <target name="prepare-docs" depends="init">
-        <mkdir dir="${build.dir}/javadocs"/>
-    </target>
+    <property name="desc" value="Common Component"/>
+    <property name="name" value="ofbiz-common"/>
+    <property name="ofbiz.home.dir" value="../.."/>
+
+    <path id="local.class.path">
+        <fileset dir="../base/lib" includes="*.jar"/>
+        <fileset dir="../base/lib/commons" includes="*.jar"/>
+        <fileset dir="../base/lib/j2eespecs" includes="*.jar"/>
+        <fileset dir="../base/build/lib" includes="*.jar"/>
+        <fileset dir="../entity/lib" includes="*.jar"/>
+        <fileset dir="../entity/build/lib" includes="*.jar"/>
+        <fileset dir="../security/build/lib" includes="*.jar"/>
+        <fileset dir="../service/lib" includes="*.jar"/>
+        <fileset dir="../service/build/lib" includes="*.jar"/>
+        <fileset dir="../entityext/build/lib" includes="*.jar"/>
+    </path>
 
     <!-- ================================================================== -->
     <!-- Compilation of the source files                                                                                                                         -->
     <!-- ================================================================== -->
 
-    <target name="classes" depends="prepare,classpath">
-    	<javac debug="on" source="1.5" deprecation="on" destdir="${build.dir}/classes">
-            <classpath>
-                <path refid="local.class.path"/>
-            </classpath>
-            <src path="${src.dir}"/>
-        </javac>
+    <target name="classes" depends="prepare">
+        <javac15 classpathref="local.class.path"/>
         <!-- also put the DTDs in the jar file... -->
         <copy todir="${build.dir}/classes">
             <!--<fileset dir="${dtd.dir}" includes="*.dtd"/>-->
@@ -98,15 +60,11 @@
         </copy>        
     </target>
 
-    <target name="jar" depends="classes">
-        <jar jarfile="${build.dir}/lib/${name}.jar" basedir="${build.dir}/classes"/>
-    </target>
-
     <!-- ================================================================== -->
     <!-- Build JavaDoc                                                      -->
     <!-- ================================================================== -->
 
-    <target name="docs" depends="prepare-docs,classpath">
+    <target name="docs" depends="prepare-docs">
         <javadoc packagenames="org.ofbiz.common.*"
                  classpathref="local.class.path"
                  destdir="${build.dir}/javadocs"
@@ -114,6 +72,4 @@
             <sourcepath path="${src.dir}"/>
         </javadoc>
     </target>
-
-    <target name="all" depends="jar,docs"/>
 </project>

Modified: ofbiz/trunk/framework/datafile/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/datafile/build.xml?rev=672657&r1=672656&r2=672657&view=diff
==============================================================================
--- ofbiz/trunk/framework/datafile/build.xml (original)
+++ ofbiz/trunk/framework/datafile/build.xml Sun Jun 29 11:39:36 2008
@@ -19,68 +19,34 @@
 -->
 
 <project name="OFBiz - Datafile" default="jar" basedir=".">
+    <import file="../../common.xml"/>
 
     <!-- ================================================================== -->
     <!-- Initialization of all property settings                            -->
     <!-- ================================================================== -->
 
-    <target name="init">
-        <property environment="env"/>
-        <property name="desc" value="Datafile Component"/>
-        <property name="name" value="ofbiz-datafile"/>
-        <property name="ofbiz.home.dir" value="../.."/>
-        <property name="src.dir" value="src"/>
-        <property name="dtd.dir" value="dtd"/>
-        <property name="lib.dir" value="lib"/>
-        <property name="build.dir" value="build"/>
-    </target>
-
-    <target name="classpath">
-        <path id="local.class.path">
-            <!--<fileset dir="${lib.dir}" includes="*.jar"/>-->
-            <fileset dir="../base/lib" includes="*.jar"/>
-            <fileset dir="../base/build/lib" includes="*.jar"/>
-            <fileset dir="../entity/lib" includes="*.jar"/>
-            <fileset dir="../entity/build/lib" includes="*.jar"/>
-        </path>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Removes all created files and directories                          -->
-    <!-- ================================================================== -->
-
-    <target name="clean" depends="clean-lib">
-        <delete dir="${build.dir}"/>
-    </target>
-
-    <target name="clean-lib" depends="init">
-        <delete dir="${build.dir}/lib"/>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Makes sure the needed directory structure is in place              -->
-    <!-- ================================================================== -->
-
-    <target name="prepare" depends="clean-lib">
-        <mkdir dir="${build.dir}/classes"/>
-        <mkdir dir="${build.dir}/lib"/>
-    </target>
-
-    <target name="prepare-docs" depends="init">
-        <mkdir dir="${build.dir}/javadocs"/>
-    </target>
+    <property name="desc" value="Datafile Component"/>
+    <property name="name" value="ofbiz-datafile"/>
+    <property name="ofbiz.home.dir" value="../.."/>
+    <property name="src.dir" value="src"/>
+    <property name="dtd.dir" value="dtd"/>
+    <property name="lib.dir" value="lib"/>
+    <property name="build.dir" value="build"/>
+
+    <path id="local.class.path">
+        <!--<fileset dir="${lib.dir}" includes="*.jar"/>-->
+        <fileset dir="../base/lib" includes="*.jar"/>
+        <fileset dir="../base/build/lib" includes="*.jar"/>
+        <fileset dir="../entity/lib" includes="*.jar"/>
+        <fileset dir="../entity/build/lib" includes="*.jar"/>
+    </path>
 
     <!-- ================================================================== -->
     <!-- Compilation of the source files                                                                                                                         -->
     <!-- ================================================================== -->
 
-    <target name="classes" depends="prepare,classpath">
-    	<javac debug="on" source="1.5" deprecation="on" destdir="${build.dir}/classes">
-            <classpath>
-                <path refid="local.class.path"/>
-            </classpath>
-            <src path="${src.dir}"/>
-        </javac>
+    <target name="classes" depends="prepare">
+        <javac15 classpathref="local.class.path"/>
         <copy todir="${build.dir}/classes">
             <!-- don't put the DTDs in the jar file... -->
             <fileset dir="${src.dir}" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/>
@@ -92,15 +58,11 @@
         </copy>        
     </target>
 
-    <target name="jar" depends="classes">
-        <jar jarfile="${build.dir}/lib/${name}.jar" basedir="${build.dir}/classes"/>
-    </target>
-
     <!-- ================================================================== -->
     <!-- Build JavaDoc                                                      -->
     <!-- ================================================================== -->
 
-    <target name="docs" depends="prepare-docs,classpath">
+    <target name="docs" depends="prepare-docs">
         <javadoc packagenames="org.ofbiz.datafile.*"
                  classpathref="local.class.path"
                  destdir="${build.dir}/javadocs"
@@ -108,6 +70,4 @@
             <sourcepath path="${src.dir}"/>
         </javadoc>
     </target>
-
-    <target name="all" depends="jar,docs"/>
 </project>

Modified: ofbiz/trunk/framework/entity/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/build.xml?rev=672657&r1=672656&r2=672657&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/build.xml (original)
+++ ofbiz/trunk/framework/entity/build.xml Sun Jun 29 11:39:36 2008
@@ -19,72 +19,35 @@
 -->
 
 <project name="OFBiz - Entity" default="jar" basedir=".">
+    <import file="../../common.xml"/>
 
     <!-- ================================================================== -->
     <!-- Initialization of all property settings                            -->
     <!-- ================================================================== -->
 
-    <target name="init">
-        <property environment="env"/>
-        <property name="desc" value="Entity Component"/>
-        <property name="name" value="ofbiz-entity"/>
-        <property name="ofbiz.home.dir" value="../.."/>
-        <property name="src.dir" value="src"/>
-        <property name="dtd.dir" value="dtd"/>
-        <property name="lib.dir" value="lib"/>
-        <property name="build.dir" value="build"/>
-    </target>
-
-    <target name="classpath">
-        <path id="local.class.path">
-            <fileset dir="${lib.dir}" includes="*.jar"/>
-            <fileset dir="${lib.dir}/jdbc" includes="*.jar"/>
-            <fileset dir="../base/lib" includes="*.jar"/>
-            <fileset dir="../base/lib/commons" includes="*.jar"/>
-            <fileset dir="../base/lib/j2eespecs" includes="*.jar"/>
-            <fileset dir="../base/lib/scripting" includes="*.jar"/>
-            <fileset dir="../base/build/lib" includes="*.jar"/>
-        </path>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Removes all created files and directories                          -->
-    <!-- ================================================================== -->
-
-    <target name="clean" depends="clean-lib">
-        <delete dir="${build.dir}"/>
-    </target>
-
-    <target name="clean-lib" depends="init">
-        <delete dir="${build.dir}/lib"/>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Makes sure the needed directory structure is in place              -->
-    <!-- ================================================================== -->
-
-    <target name="prepare" depends="clean-lib">
-        <mkdir dir="${build.dir}/classes"/>
-        <mkdir dir="${build.dir}/lib"/>
-    </target>
-
-    <target name="prepare-docs" depends="init">
-        <mkdir dir="${build.dir}/javadocs"/>
-    </target>
+    <property name="desc" value="Entity Component"/>
+    <property name="name" value="ofbiz-entity"/>
+    <property name="ofbiz.home.dir" value="../.."/>
+
+    <path id="local.class.path">
+        <fileset dir="${lib.dir}" includes="*.jar"/>
+        <fileset dir="${lib.dir}/jdbc" includes="*.jar"/>
+        <fileset dir="../base/lib" includes="*.jar"/>
+        <fileset dir="../base/lib/commons" includes="*.jar"/>
+        <fileset dir="../base/lib/j2eespecs" includes="*.jar"/>
+        <fileset dir="../base/lib/scripting" includes="*.jar"/>
+        <fileset dir="../base/build/lib" includes="*.jar"/>
+    </path>
 
     <!-- ================================================================== -->
     <!-- Compilation of the source files                                                                                                                         -->
     <!-- ================================================================== -->
 
-    <target name="classes" depends="prepare,classpath">
-        <javac debug="on" source="1.5" deprecation="on" destdir="${build.dir}/classes">
-            <classpath>
-                <path refid="local.class.path"/>
-            </classpath>
-            <src path="${src.dir}"/>
+    <target name="classes" depends="prepare">
+        <javac15 classpathref="local.class.path">
             <exclude name="org/ofbiz/entity/connection/XaPoolConnectionFactory.java"/>
             <exclude name="org/ofbiz/entity/connection/TyrexConnectionFactory.java"/>
-        </javac>
+        </javac15>
         <copy todir="${build.dir}/classes">
             <!-- don't put the DTDs in the jar file... -->
             <fileset dir="${src.dir}" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/>
@@ -96,15 +59,11 @@
         </copy>        
     </target>
 
-    <target name="jar" depends="classes">
-        <jar jarfile="${build.dir}/lib/${name}.jar" basedir="${build.dir}/classes"/>
-    </target>
-
     <!-- ================================================================== -->
     <!-- Build JavaDoc                                                      -->
     <!-- ================================================================== -->
 
-    <target name="docs" depends="prepare-docs,classpath">
+    <target name="docs" depends="prepare-docs">
         <javadoc packagenames="org.ofbiz.entity.*"
                  classpathref="local.class.path"
                  destdir="${build.dir}/javadocs"
@@ -112,6 +71,4 @@
             <sourcepath path="${src.dir}"/>
         </javadoc>
     </target>
-
-    <target name="all" depends="jar,docs"/>
 </project>

Modified: ofbiz/trunk/framework/entityext/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/build.xml?rev=672657&r1=672656&r2=672657&view=diff
==============================================================================
--- ofbiz/trunk/framework/entityext/build.xml (original)
+++ ofbiz/trunk/framework/entityext/build.xml Sun Jun 29 11:39:36 2008
@@ -19,71 +19,33 @@
 -->
 
 <project name="OFBiz - Entity Extensions" default="jar" basedir=".">
+    <import file="../../common.xml"/>
 
     <!-- ================================================================== -->
     <!-- Initialization of all property settings                            -->
     <!-- ================================================================== -->
 
-    <target name="init">
-        <property environment="env"/>
-        <property name="desc" value="Entity Extensions Component"/>
-        <property name="name" value="ofbiz-entityext"/>
-        <property name="ofbiz.home.dir" value="../.."/>
-        <property name="src.dir" value="src"/>
-        <property name="dtd.dir" value="dtd"/>
-        <property name="lib.dir" value="lib"/>
-        <property name="build.dir" value="build"/>
-    </target>
-
-    <target name="classpath">
-        <path id="local.class.path">
-            <fileset dir="../base/lib" includes="*.jar"/>
-            <fileset dir="../base/lib/j2eespecs" includes="*.jar"/>
-            <fileset dir="../base/build/lib" includes="*.jar"/>
-            <fileset dir="../entity/lib" includes="*.jar"/>
-            <fileset dir="../entity/build/lib" includes="*.jar"/>
-            <fileset dir="../security/build/lib" includes="*.jar"/>
-            <fileset dir="../service/lib" includes="*.jar"/>
-            <fileset dir="../service/build/lib" includes="*.jar"/>
-        </path>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Removes all created files and directories                          -->
-    <!-- ================================================================== -->
-
-    <target name="clean" depends="clean-lib">
-        <delete dir="${build.dir}"/>
-    </target>
-
-    <target name="clean-lib" depends="init">
-        <delete dir="${build.dir}/lib"/>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Makes sure the needed directory structure is in place              -->
-    <!-- ================================================================== -->
-
-    <target name="prepare" depends="clean-lib">
-        <mkdir dir="${build.dir}/classes"/>
-        <mkdir dir="${build.dir}/lib"/>
-    </target>
-
-    <target name="prepare-docs" depends="init">
-        <mkdir dir="${build.dir}/javadocs"/>
-    </target>
+    <property name="desc" value="Entity Extensions Component"/>
+    <property name="name" value="ofbiz-entityext"/>
+    <property name="ofbiz.home.dir" value="../.."/>
+
+    <path id="local.class.path">
+        <fileset dir="../base/lib" includes="*.jar"/>
+        <fileset dir="../base/lib/j2eespecs" includes="*.jar"/>
+        <fileset dir="../base/build/lib" includes="*.jar"/>
+        <fileset dir="../entity/lib" includes="*.jar"/>
+        <fileset dir="../entity/build/lib" includes="*.jar"/>
+        <fileset dir="../security/build/lib" includes="*.jar"/>
+        <fileset dir="../service/lib" includes="*.jar"/>
+        <fileset dir="../service/build/lib" includes="*.jar"/>
+    </path>
 
     <!-- ================================================================== -->
     <!-- Compilation of the source files                                                                                                                         -->
     <!-- ================================================================== -->
 
-    <target name="classes" depends="prepare,classpath">
-    	<javac debug="on" source="1.5" deprecation="on" destdir="${build.dir}/classes">
-            <classpath>
-                <path refid="local.class.path"/>
-            </classpath>
-            <src path="${src.dir}"/>
-        </javac>
+    <target name="classes" depends="prepare">
+        <javac15 classpathref="local.class.path"/>
         <!-- also put the DTDs in the jar file... -->
         <copy todir="${build.dir}/classes">
             <!--<fileset dir="${dtd.dir}" includes="*.dtd"/>-->
@@ -96,15 +58,11 @@
         </copy>        
     </target>
 
-    <target name="jar" depends="classes">
-        <jar jarfile="${build.dir}/lib/${name}.jar" basedir="${build.dir}/classes"/>
-    </target>
-
     <!-- ================================================================== -->
     <!-- Build JavaDoc                                                      -->
     <!-- ================================================================== -->
 
-    <target name="docs" depends="prepare-docs,classpath">
+    <target name="docs" depends="prepare-docs">
         <javadoc packagenames="org.ofbiz.entityext.*"
                  classpathref="local.class.path"
                  destdir="${build.dir}/javadocs"
@@ -112,6 +70,4 @@
             <sourcepath path="${src.dir}"/>
         </javadoc>
     </target>
-
-    <target name="all" depends="jar,docs"/>
 </project>

Modified: ofbiz/trunk/framework/example/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/build.xml?rev=672657&r1=672656&r2=672657&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/build.xml (original)
+++ ofbiz/trunk/framework/example/build.xml Sun Jun 29 11:39:36 2008
@@ -19,75 +19,42 @@
 -->
 
 <project name="OFBiz - Example Component" default="jar" basedir=".">
+    <import file="../../common.xml"/>
 
     <!-- ================================================================== -->
     <!-- Initialization of all property settings                            -->
     <!-- ================================================================== -->
 
-    <target name="init">
-        <property environment="env"/>
-        <property name="desc" value="Example Component"/>
-        <property name="name" value="ofbiz-example"/>
-        <property name="ofbiz.home.dir" value="../.."/>
-        <property name="src.dir" value="src"/>
-        <property name="dtd.dir" value="dtd"/>
-        <property name="lib.dir" value="lib"/>
-        <property name="build.dir" value="build"/>
-    </target>
-
-    <target name="classpath">
-        <path id="local.class.path">
-            <fileset dir="${lib.dir}" includes="*.jar"/>
-            <fileset dir="../../framework/base/lib" includes="*.jar"/>
-            <fileset dir="../../framework/base/build/lib" includes="*.jar"/>
-            <fileset dir="../../framework/entity/lib" includes="*.jar"/>
-            <fileset dir="../../framework/entity/build/lib" includes="*.jar"/>
-            <fileset dir="../../framework/security/build/lib" includes="*.jar"/>
-            <fileset dir="../../framework/service/lib" includes="*.jar"/>
-            <fileset dir="../../framework/service/build/lib" includes="*.jar"/>
-            <fileset dir="../../framework/minilang/build/lib" includes="*.jar"/>
-            <fileset dir="../../framework/widget/build/lib" includes="*.jar"/>
-            <fileset dir="../../framework/webapp/lib" includes="*.jar"/>
-            <fileset dir="../../framework/webapp/build/lib" includes="*.jar"/>
-        </path>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Removes all created files and directories                          -->
-    <!-- ================================================================== -->
-
-    <target name="clean" depends="clean-lib">
-        <delete dir="${build.dir}"/>
-    </target>
-
-    <target name="clean-lib" depends="init">
-        <delete dir="${build.dir}/lib"/>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Makes sure the needed directory structure is in place              -->
-    <!-- ================================================================== -->
-
-    <target name="prepare" depends="clean-lib">
-        <mkdir dir="${build.dir}/classes"/>
-        <mkdir dir="${build.dir}/lib"/>
-    </target>
-
-    <target name="prepare-docs" depends="init">
-        <mkdir dir="${build.dir}/javadocs"/>
-    </target>
+    <property environment="env"/>
+    <property name="desc" value="Example Component"/>
+    <property name="name" value="ofbiz-example"/>
+    <property name="ofbiz.home.dir" value="../.."/>
+    <property name="src.dir" value="src"/>
+    <property name="dtd.dir" value="dtd"/>
+    <property name="lib.dir" value="lib"/>
+    <property name="build.dir" value="build"/>
+
+    <path id="local.class.path">
+        <fileset dir="${lib.dir}" includes="*.jar"/>
+        <fileset dir="../../framework/base/lib" includes="*.jar"/>
+        <fileset dir="../../framework/base/build/lib" includes="*.jar"/>
+        <fileset dir="../../framework/entity/lib" includes="*.jar"/>
+        <fileset dir="../../framework/entity/build/lib" includes="*.jar"/>
+        <fileset dir="../../framework/security/build/lib" includes="*.jar"/>
+        <fileset dir="../../framework/service/lib" includes="*.jar"/>
+        <fileset dir="../../framework/service/build/lib" includes="*.jar"/>
+        <fileset dir="../../framework/minilang/build/lib" includes="*.jar"/>
+        <fileset dir="../../framework/widget/build/lib" includes="*.jar"/>
+        <fileset dir="../../framework/webapp/lib" includes="*.jar"/>
+        <fileset dir="../../framework/webapp/build/lib" includes="*.jar"/>
+    </path>
 
     <!-- ================================================================== -->
     <!-- Compilation of the source files                                                                                                                         -->
     <!-- ================================================================== -->
 
-    <target name="classes" depends="prepare,classpath">
-    	<javac debug="on" source="1.5" deprecation="on" destdir="${build.dir}/classes">
-            <classpath>
-                <path refid="local.class.path"/>
-            </classpath>
-            <src path="${src.dir}"/>
-        </javac>
+    <target name="classes" depends="prepare">
+        <javac15 classpathref="local.class.path"/>
         <copy todir="${build.dir}/classes">
             <!-- don't put the DTDs in the jar file... -->
             <fileset dir="${src.dir}" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/>
@@ -99,15 +66,11 @@
         </copy>        
     </target>
 
-    <target name="jar" depends="classes">
-        <jar jarfile="${build.dir}/lib/${name}.jar" basedir="${build.dir}/classes"/>
-    </target>
-
     <!-- ================================================================== -->
     <!-- Build JavaDoc                                                      -->
     <!-- ================================================================== -->
 
-    <target name="docs" depends="prepare-docs,classpath">
+    <target name="docs" depends="prepare-docs">
         <javadoc packagenames="org.ofbiz.example.*"
                  classpathref="local.class.path"
                  destdir="${build.dir}/javadocs"
@@ -115,6 +78,4 @@
             <sourcepath path="${src.dir}"/>
         </javadoc>
     </target>
-
-    <target name="all" depends="jar,docs"/>
 </project>

Modified: ofbiz/trunk/framework/geronimo/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/geronimo/build.xml?rev=672657&r1=672656&r2=672657&view=diff
==============================================================================
--- ofbiz/trunk/framework/geronimo/build.xml (original)
+++ ofbiz/trunk/framework/geronimo/build.xml Sun Jun 29 11:39:36 2008
@@ -19,69 +19,31 @@
 -->
 
 <project name="geronimo" default="jar" basedir=".">
+    <import file="../../common.xml"/>
 
     <!-- ================================================================== -->
     <!-- Initialization of all property settings                            -->
     <!-- ================================================================== -->
 
-    <target name="init">
-        <property environment="env"/>
-        <property name="desc" value="Geronimo Transaction Manager, and possibly other too"/>
-        <property name="name" value="ofbiz-geronimo"/>
-        <property name="ofbiz.home.dir" value="../.."/>
-        <property name="src.dir" value="src"/>
-        <property name="dtd.dir" value="dtd"/>
-        <property name="lib.dir" value="lib"/>
-        <property name="build.dir" value="build"/>
-    </target>
-
-    <target name="classpath">
-        <path id="local.class.path">
-            <fileset dir="${lib.dir}" includes="*.jar"/>
-            <fileset dir="../base/lib/commons" includes="*.jar"/>
-            <fileset dir="../base/lib/j2eespecs" includes="*.jar"/>
-            <fileset dir="../base/build/lib" includes="*.jar"/>
-            <fileset dir="../entity/lib" includes="*.jar"/>
-            <fileset dir="../entity/build/lib" includes="*.jar"/>
-        </path>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Removes all created files and directories                          -->
-    <!-- ================================================================== -->
-
-    <target name="clean" depends="clean-lib">
-        <delete dir="${build.dir}"/>
-    </target>
-
-    <target name="clean-lib" depends="init">
-        <delete dir="${build.dir}/lib"/>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Makes sure the needed directory structure is in place              -->
-    <!-- ================================================================== -->
-
-    <target name="prepare" depends="clean-lib">
-        <mkdir dir="${build.dir}/classes"/>
-        <mkdir dir="${build.dir}/lib"/>
-    </target>
-
-    <target name="prepare-docs" depends="init">
-        <mkdir dir="${build.dir}/javadocs"/>
-    </target>
+    <property name="desc" value="Geronimo Transaction Manager, and possibly other too"/>
+    <property name="name" value="ofbiz-geronimo"/>
+    <property name="ofbiz.home.dir" value="../.."/>
+
+    <path id="local.class.path">
+        <fileset dir="${lib.dir}" includes="*.jar"/>
+        <fileset dir="../base/lib/commons" includes="*.jar"/>
+        <fileset dir="../base/lib/j2eespecs" includes="*.jar"/>
+        <fileset dir="../base/build/lib" includes="*.jar"/>
+        <fileset dir="../entity/lib" includes="*.jar"/>
+        <fileset dir="../entity/build/lib" includes="*.jar"/>
+    </path>
 
     <!-- ================================================================== -->
     <!-- Compilation of the source files                                                                                                                         -->
     <!-- ================================================================== -->
 
-    <target name="classes" depends="prepare,classpath">
-        <javac debug="on" source="1.5" deprecation="on" destdir="${build.dir}/classes">
-            <classpath>
-                <path refid="local.class.path"/>
-            </classpath>
-            <src path="${src.dir}"/>
-        </javac>
+    <target name="classes" depends="prepare">
+        <javac15 classpathref="local.class.path"/>
         <!-- also put the DTDs in the jar file... -->
         <copy todir="${build.dir}/classes">
             <!--<fileset dir="${dtd.dir}" includes="*.dtd"/>-->
@@ -94,15 +56,11 @@
         </copy>        
     </target>
 
-    <target name="jar" depends="classes">
-        <jar jarfile="${build.dir}/lib/${name}.jar" basedir="${build.dir}/classes"/>
-    </target>
-
     <!-- ================================================================== -->
     <!-- Build JavaDoc                                                      -->
     <!-- ================================================================== -->
 
-    <target name="docs" depends="prepare-docs,classpath">
+    <target name="docs" depends="prepare-docs">
         <javadoc packagenames="org.ofbiz.geronimo.*"
                  classpathref="local.class.path"
                  destdir="${build.dir}/javadocs"
@@ -110,6 +68,4 @@
             <sourcepath path="${src.dir}"/>
         </javadoc>
     </target>
-
-    <target name="all" depends="jar,docs"/>
 </project>

Modified: ofbiz/trunk/framework/guiapp/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/guiapp/build.xml?rev=672657&r1=672656&r2=672657&view=diff
==============================================================================
--- ofbiz/trunk/framework/guiapp/build.xml (original)
+++ ofbiz/trunk/framework/guiapp/build.xml Sun Jun 29 11:39:36 2008
@@ -19,74 +19,41 @@
 -->
 
 <project name="OFBiz - GUI App Component" default="jar" basedir=".">
+    <import file="../../common.xml"/>
 
     <!-- ================================================================== -->
     <!-- Initialization of all property settings                            -->
     <!-- ================================================================== -->
 
-    <target name="init">
-        <property environment="env"/>
-        <property name="desc" value="GUI App Component"/>
-        <property name="name" value="ofbiz-guiapp"/>
-        <property name="ofbiz.home.dir" value="../.."/>
-        <property name="src.dir" value="src"/>
-        <property name="dtd.dir" value="dtd"/>
-        <property name="lib.dir" value="lib"/>
-        <property name="build.dir" value="build"/>
-    </target>
-
-    <target name="classpath">
-        <path id="local.class.path">
-            <fileset dir="${lib.dir}" includes="*.jar"/>
-            <fileset dir="../base/lib" includes="*.jar"/>
-            <fileset dir="../base/lib/commons" includes="*.jar"/>
-            <fileset dir="../base/lib/scripting" includes="*.jar"/>
-            <fileset dir="../base/build/lib" includes="*.jar"/>
-            <fileset dir="../entity/build/lib" includes="*.jar"/>
-            <fileset dir="../security/build/lib" includes="*.jar"/>
-            <fileset dir="../service/lib" includes="*.jar"/>
-            <fileset dir="../service/build/lib" includes="*.jar"/>
-            <fileset dir="../minilang/build/lib" includes="*.jar"/>
-            <fileset dir="../webapp/build/lib" includes="*.jar"/>
-        </path>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Removes all created files and directories                          -->
-    <!-- ================================================================== -->
-
-    <target name="clean" depends="clean-lib">
-        <delete dir="${build.dir}"/>
-    </target>
-
-    <target name="clean-lib" depends="init">
-        <delete dir="${build.dir}/lib"/>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Makes sure the needed directory structure is in place              -->
-    <!-- ================================================================== -->
-
-    <target name="prepare" depends="clean-lib">
-        <mkdir dir="${build.dir}/classes"/>
-        <mkdir dir="${build.dir}/lib"/>
-    </target>
-
-    <target name="prepare-docs" depends="init">
-        <mkdir dir="${build.dir}/javadocs"/>
-    </target>
+    <property environment="env"/>
+    <property name="desc" value="GUI App Component"/>
+    <property name="name" value="ofbiz-guiapp"/>
+    <property name="ofbiz.home.dir" value="../.."/>
+    <property name="src.dir" value="src"/>
+    <property name="dtd.dir" value="dtd"/>
+    <property name="lib.dir" value="lib"/>
+    <property name="build.dir" value="build"/>
+
+    <path id="local.class.path">
+        <fileset dir="${lib.dir}" includes="*.jar"/>
+        <fileset dir="../base/lib" includes="*.jar"/>
+        <fileset dir="../base/lib/commons" includes="*.jar"/>
+        <fileset dir="../base/lib/scripting" includes="*.jar"/>
+        <fileset dir="../base/build/lib" includes="*.jar"/>
+        <fileset dir="../entity/build/lib" includes="*.jar"/>
+        <fileset dir="../security/build/lib" includes="*.jar"/>
+        <fileset dir="../service/lib" includes="*.jar"/>
+        <fileset dir="../service/build/lib" includes="*.jar"/>
+        <fileset dir="../minilang/build/lib" includes="*.jar"/>
+        <fileset dir="../webapp/build/lib" includes="*.jar"/>
+    </path>
 
     <!-- ================================================================== -->
     <!-- Compilation of the source files                                                                                                                         -->
     <!-- ================================================================== -->
 
-    <target name="classes" depends="prepare,classpath">
-    	<javac debug="on" source="1.5" deprecation="on" destdir="${build.dir}/classes">
-            <classpath>
-                <path refid="local.class.path"/>
-            </classpath>
-            <src path="${src.dir}"/>
-        </javac>
+    <target name="classes" depends="prepare">
+        <javac15 classpathref="local.class.path"/>
         <copy todir="${build.dir}/classes">
             <!-- don't put the DTDs in the jar file... -->
             <fileset dir="${src.dir}" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/>
@@ -98,15 +65,11 @@
         </copy>        
     </target>
 
-    <target name="jar" depends="classes">
-        <jar jarfile="${build.dir}/lib/${name}.jar" basedir="${build.dir}/classes"/>
-    </target>
-
     <!-- ================================================================== -->
     <!-- Build JavaDoc                                                      -->
     <!-- ================================================================== -->
 
-    <target name="docs" depends="prepare-docs,classpath">
+    <target name="docs" depends="prepare-docs">
         <javadoc packagenames="org.ofbiz.guiapp.*"
                  classpathref="local.class.path"
                  destdir="${build.dir}/javadocs"
@@ -114,6 +77,4 @@
             <sourcepath path="${src.dir}"/>
         </javadoc>
     </target>
-
-    <target name="all" depends="jar,docs"/>
 </project>

Modified: ofbiz/trunk/framework/jetty/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/jetty/build.xml?rev=672657&r1=672656&r2=672657&view=diff
==============================================================================
--- ofbiz/trunk/framework/jetty/build.xml (original)
+++ ofbiz/trunk/framework/jetty/build.xml Sun Jun 29 11:39:36 2008
@@ -19,70 +19,31 @@
 -->
 
 <project name="Jetty" default="jar" basedir=".">
+    <import file="../../common.xml"/>
 
     <!-- ================================================================== -->
     <!-- Initialization of all property settings                            -->
     <!-- ================================================================== -->
 
-    <target name="init">
-        <property environment="env"/>
-        <property name="desc" value="Jetty Http/Servlet Container"/>
-        <property name="name" value="ofbiz-jetty"/>
-        <property name="ofbiz.home.dir" value="../.."/>
-        <property name="src.dir" value="src"/>
-        <property name="dtd.dir" value="dtd"/>
-        <property name="lib.dir" value="lib"/>
-        <property name="build.dir" value="build"/>
-    </target>
-
-    <target name="classpath">
-        <path id="local.class.path">
-            <fileset dir="${lib.dir}" includes="*.jar"/>
-            <fileset dir="../base/lib" includes="*.jar"/>
-            <fileset dir="../base/lib/commons" includes="*.jar"/>
-            <fileset dir="../base/build/lib" includes="*.jar"/>
-            <fileset dir="../entity/lib" includes="*.jar"/>
-            <fileset dir="../entity/build/lib" includes="*.jar"/>
-        </path>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Removes all created files and directories                          -->
-    <!-- ================================================================== -->
-
-    <target name="clean" depends="clean-lib">
-        <delete dir="${build.dir}"/>
-    </target>
-
-    <target name="clean-lib" depends="init">
-        <delete dir="${build.dir}/lib"/>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Makes sure the needed directory structure is in place              -->
-    <!-- ================================================================== -->
-
-    <target name="prepare" depends="clean-lib">
-        <mkdir dir="${build.dir}/classes"/>
-        <mkdir dir="${build.dir}/lib"/>
-    </target>
-
-    <target name="prepare-docs" depends="init">
-        <mkdir dir="${build.dir}/javadocs"/>
-    </target>
+    <property name="desc" value="Jetty Http/Servlet Container"/>
+    <property name="name" value="ofbiz-jetty"/>
+    <property name="ofbiz.home.dir" value="../.."/>
+
+    <path id="local.class.path">
+        <fileset dir="${lib.dir}" includes="*.jar"/>
+        <fileset dir="../base/lib" includes="*.jar"/>
+        <fileset dir="../base/lib/commons" includes="*.jar"/>
+        <fileset dir="../base/build/lib" includes="*.jar"/>
+        <fileset dir="../entity/lib" includes="*.jar"/>
+        <fileset dir="../entity/build/lib" includes="*.jar"/>
+    </path>
 
     <!-- ================================================================== -->
     <!-- Compilation of the source files                                                                                                                         -->
     <!-- ================================================================== -->
 
-    <target name="classes" depends="prepare,classpath">
-        <javac debug="on" source="1.5" deprecation="on" destdir="${build.dir}/classes">
-            <compilerarg value="-Xlint:unchecked"/>
-            <classpath>
-                <path refid="local.class.path"/>
-            </classpath>
-            <src path="${src.dir}"/>
-        </javac>
+    <target name="classes" depends="prepare">
+        <javac15 classpathref="local.class.path"/>
         <!-- also put the DTDs in the jar file... -->
         <copy todir="${build.dir}/classes">
             <!--<fileset dir="${dtd.dir}" includes="*.dtd"/>-->
@@ -95,15 +56,11 @@
         </copy>        
     </target>
 
-    <target name="jar" depends="classes">
-        <jar jarfile="${build.dir}/lib/${name}.jar" basedir="${build.dir}/classes"/>
-    </target>
-
     <!-- ================================================================== -->
     <!-- Build JavaDoc                                                      -->
     <!-- ================================================================== -->
 
-    <target name="docs" depends="prepare-docs,classpath">
+    <target name="docs" depends="prepare-docs">
         <javadoc packagenames="org.ofbiz.jetty.*"
                  classpathref="local.class.path"
                  destdir="${build.dir}/javadocs"
@@ -111,6 +68,4 @@
             <sourcepath path="${src.dir}"/>
         </javadoc>
     </target>
-
-    <target name="all" depends="jar,docs"/>
 </project>

Modified: ofbiz/trunk/framework/minilang/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/build.xml?rev=672657&r1=672656&r2=672657&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/build.xml (original)
+++ ofbiz/trunk/framework/minilang/build.xml Sun Jun 29 11:39:36 2008
@@ -19,72 +19,34 @@
 -->
 
 <project name="OFBiz - MiniLang Component" default="jar" basedir=".">
+    <import file="../../common.xml"/>
 
     <!-- ================================================================== -->
     <!-- Initialization of all property settings                            -->
     <!-- ================================================================== -->
 
-    <target name="init">
-        <property environment="env"/>
-        <property name="desc" value="MiniLang Component"/>
-        <property name="name" value="ofbiz-minilang"/>
-        <property name="ofbiz.home.dir" value="../.."/>
-        <property name="src.dir" value="src"/>
-        <property name="dtd.dir" value="dtd"/>
-        <property name="lib.dir" value="lib"/>
-        <property name="build.dir" value="build"/>
-    </target>
-
-    <target name="classpath">
-        <path id="local.class.path">
-            <!-- <fileset dir="${lib.dir}" includes="*.jar"/> -->
-            <fileset dir="../base/lib" includes="*.jar"/>
-            <fileset dir="../base/lib/j2eespecs" includes="*.jar"/>
-            <fileset dir="../base/lib/scripting" includes="*.jar"/>
-            <fileset dir="../base/build/lib" includes="*.jar"/>
-            <fileset dir="../entity/lib" includes="*.jar"/>
-            <fileset dir="../entity/build/lib" includes="*.jar"/>
-            <fileset dir="../security/build/lib" includes="*.jar"/>
-            <fileset dir="../service/build/lib" includes="*.jar"/>
-        </path>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Removes all created files and directories                          -->
-    <!-- ================================================================== -->
-
-    <target name="clean" depends="clean-lib">
-        <delete dir="${build.dir}"/>
-    </target>
-
-    <target name="clean-lib" depends="init">
-        <delete dir="${build.dir}/lib"/>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Makes sure the needed directory structure is in place              -->
-    <!-- ================================================================== -->
-
-    <target name="prepare" depends="clean-lib">
-        <mkdir dir="${build.dir}/classes"/>
-        <mkdir dir="${build.dir}/lib"/>
-    </target>
-
-    <target name="prepare-docs" depends="init">
-        <mkdir dir="${build.dir}/javadocs"/>
-    </target>
+    <property name="desc" value="MiniLang Component"/>
+    <property name="name" value="ofbiz-minilang"/>
+    <property name="ofbiz.home.dir" value="../.."/>
+
+    <path id="local.class.path">
+        <!-- <fileset dir="${lib.dir}" includes="*.jar"/> -->
+        <fileset dir="../base/lib" includes="*.jar"/>
+        <fileset dir="../base/lib/j2eespecs" includes="*.jar"/>
+        <fileset dir="../base/lib/scripting" includes="*.jar"/>
+        <fileset dir="../base/build/lib" includes="*.jar"/>
+        <fileset dir="../entity/lib" includes="*.jar"/>
+        <fileset dir="../entity/build/lib" includes="*.jar"/>
+        <fileset dir="../security/build/lib" includes="*.jar"/>
+        <fileset dir="../service/build/lib" includes="*.jar"/>
+    </path>
 
     <!-- ================================================================== -->
     <!-- Compilation of the source files                                                                                                                         -->
     <!-- ================================================================== -->
 
-    <target name="classes" depends="prepare,classpath">
-    	<javac debug="on" source="1.5" deprecation="on" destdir="${build.dir}/classes">
-            <classpath>
-                <path refid="local.class.path"/>
-            </classpath>
-            <src path="${src.dir}"/>
-        </javac>
+    <target name="classes" depends="prepare">
+        <javac15 classpathref="local.class.path"/>
         <copy todir="${build.dir}/classes">
             <!-- don't put the DTDs in the jar file... -->
             <fileset dir="${src.dir}" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/>
@@ -96,15 +58,11 @@
         </copy>        
     </target>
 
-    <target name="jar" depends="classes">
-        <jar jarfile="${build.dir}/lib/${name}.jar" basedir="${build.dir}/classes"/>
-    </target>
-
     <!-- ================================================================== -->
     <!-- Build JavaDoc                                                      -->
     <!-- ================================================================== -->
 
-    <target name="docs" depends="prepare-docs,classpath">
+    <target name="docs" depends="prepare-docs">
         <javadoc packagenames="org.ofbiz.minilang.*"
                  classpathref="local.class.path"
                  destdir="${build.dir}/javadocs"
@@ -112,6 +70,4 @@
             <sourcepath path="${src.dir}"/>
         </javadoc>
     </target>
-
-    <target name="all" depends="jar,docs"/>
 </project>

Modified: ofbiz/trunk/framework/security/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/security/build.xml?rev=672657&r1=672656&r2=672657&view=diff
==============================================================================
--- ofbiz/trunk/framework/security/build.xml (original)
+++ ofbiz/trunk/framework/security/build.xml Sun Jun 29 11:39:36 2008
@@ -19,70 +19,31 @@
 -->
 
 <project name="OFBiz - Security" default="jar" basedir=".">
+    <import file="../../common.xml"/>
 
     <!-- ================================================================== -->
     <!-- Initialization of all property settings                            -->
     <!-- ================================================================== -->
 
-    <target name="init">
-        <property environment="env"/>
-        <property name="desc" value="Security Component"/>
-        <property name="name" value="ofbiz-security"/>
-        <property name="ofbiz.home.dir" value="../.."/>
-        <property name="src.dir" value="src"/>
-        <property name="dtd.dir" value="dtd"/>
-        <property name="lib.dir" value="lib"/>
-        <property name="build.dir" value="build"/>
-    </target>
-
-    <target name="classpath">
-        <path id="local.class.path">
-            <!--<fileset dir="${lib.dir}" includes="*.jar"/>-->
-            <fileset dir="../base/lib" includes="*.jar"/>
-            <fileset dir="../base/lib/j2eespecs" includes="*.jar"/>
-            <fileset dir="../base/build/lib" includes="*.jar"/>
-            <fileset dir="../entity/lib" includes="*.jar"/>
-            <fileset dir="../entity/build/lib" includes="*.jar"/>
-        </path>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Removes all created files and directories                          -->
-    <!-- ================================================================== -->
-
-    <target name="clean" depends="clean-lib">
-        <delete dir="${build.dir}"/>
-    </target>
-
-    <target name="clean-lib" depends="init">
-        <delete dir="${build.dir}/lib"/>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Makes sure the needed directory structure is in place              -->
-    <!-- ================================================================== -->
-
-    <target name="prepare" depends="clean-lib">
-        <mkdir dir="${build.dir}/classes"/>
-        <mkdir dir="${build.dir}/lib"/>
-    </target>
-
-    <target name="prepare-docs" depends="init">
-        <mkdir dir="${build.dir}/javadocs"/>
-    </target>
+    <property name="desc" value="Security Component"/>
+    <property name="name" value="ofbiz-security"/>
+    <property name="ofbiz.home.dir" value="../.."/>
+
+    <path id="local.class.path">
+        <!--<fileset dir="${lib.dir}" includes="*.jar"/>-->
+        <fileset dir="../base/lib" includes="*.jar"/>
+        <fileset dir="../base/lib/j2eespecs" includes="*.jar"/>
+        <fileset dir="../base/build/lib" includes="*.jar"/>
+        <fileset dir="../entity/lib" includes="*.jar"/>
+        <fileset dir="../entity/build/lib" includes="*.jar"/>
+    </path>
 
     <!-- ================================================================== -->
     <!-- Compilation of the source files                                                                                                                         -->
     <!-- ================================================================== -->
 
-    <target name="classes" depends="prepare,classpath">
-    	<javac debug="on" source="1.5" deprecation="on" destdir="${build.dir}/classes">
-            <compilerarg value="-Xlint:unchecked"/>
-            <classpath>
-                <path refid="local.class.path"/>
-            </classpath>
-            <src path="${src.dir}"/>
-        </javac>
+    <target name="classes" depends="prepare">
+        <javac15 classpathref="local.class.path"/>
         <copy todir="${build.dir}/classes">
             <!-- don't put the DTDs in the jar file... -->
             <fileset dir="${src.dir}" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/>
@@ -94,15 +55,11 @@
         </copy>        
     </target>
 
-    <target name="jar" depends="classes">
-        <jar jarfile="${build.dir}/lib/${name}.jar" basedir="${build.dir}/classes"/>
-    </target>
-
     <!-- ================================================================== -->
     <!-- Build JavaDoc                                                      -->
     <!-- ================================================================== -->
 
-    <target name="docs" depends="prepare-docs,classpath">
+    <target name="docs" depends="prepare-docs">
         <javadoc packagenames="org.ofbiz.security.*"
                  classpathref="local.class.path"
                  destdir="${build.dir}/javadocs"
@@ -110,6 +67,4 @@
             <sourcepath path="${src.dir}"/>
         </javadoc>
     </target>
-
-    <target name="all" depends="jar,docs"/>
 </project>

Modified: ofbiz/trunk/framework/service/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/build.xml?rev=672657&r1=672656&r2=672657&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/build.xml (original)
+++ ofbiz/trunk/framework/service/build.xml Sun Jun 29 11:39:36 2008
@@ -19,73 +19,34 @@
 -->
 
 <project name="OFBiz - Service" default="jar" basedir=".">
+    <import file="../../common.xml"/>
 
     <!-- ================================================================== -->
     <!-- Initialization of all property settings                            -->
     <!-- ================================================================== -->
 
-    <target name="init">
-        <property environment="env"/>
-        <property name="desc" value="Service Component"/>
-        <property name="name" value="ofbiz-service"/>
-        <property name="ofbiz.home.dir" value="../.."/>
-        <property name="src.dir" value="src"/>
-        <property name="dtd.dir" value="dtd"/>
-        <property name="lib.dir" value="lib"/>
-        <property name="build.dir" value="build"/>
-    </target>
-
-    <target name="classpath">
-        <path id="local.class.path">
-            <fileset dir="${lib.dir}" includes="*.jar"/>
-            <fileset dir="../base/lib" includes="*.jar"/>
-            <fileset dir="../base/lib/commons" includes="*.jar"/>
-            <fileset dir="../base/lib/j2eespecs" includes="*.jar"/>
-            <fileset dir="../base/lib/scripting" includes="*.jar"/>
-            <fileset dir="../base/build/lib" includes="*.jar"/>
-            <fileset dir="../entity/lib" includes="*.jar"/>
-            <fileset dir="../entity/build/lib" includes="*.jar"/>
-            <fileset dir="../security/build/lib" includes="*.jar"/>
-        </path>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Removes all created files and directories                          -->
-    <!-- ================================================================== -->
-
-    <target name="clean" depends="clean-lib">
-        <delete dir="${build.dir}"/>
-    </target>
-
-    <target name="clean-lib" depends="init">
-        <delete dir="${build.dir}/lib"/>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Makes sure the needed directory structure is in place              -->
-    <!-- ================================================================== -->
-
-    <target name="prepare" depends="clean-lib">
-        <mkdir dir="${build.dir}/classes"/>
-        <mkdir dir="${build.dir}/lib"/>
-    </target>
-
-    <target name="prepare-docs" depends="init">
-        <mkdir dir="${build.dir}/javadocs"/>
-    </target>
+    <property name="desc" value="Service Component"/>
+    <property name="name" value="ofbiz-service"/>
+    <property name="ofbiz.home.dir" value="../.."/>
+
+    <path id="local.class.path">
+        <fileset dir="${lib.dir}" includes="*.jar"/>
+        <fileset dir="../base/lib" includes="*.jar"/>
+        <fileset dir="../base/lib/commons" includes="*.jar"/>
+        <fileset dir="../base/lib/j2eespecs" includes="*.jar"/>
+        <fileset dir="../base/lib/scripting" includes="*.jar"/>
+        <fileset dir="../base/build/lib" includes="*.jar"/>
+        <fileset dir="../entity/lib" includes="*.jar"/>
+        <fileset dir="../entity/build/lib" includes="*.jar"/>
+        <fileset dir="../security/build/lib" includes="*.jar"/>
+    </path>
 
     <!-- ================================================================== -->
     <!-- Compilation of the source files                                                                                                                         -->
     <!-- ================================================================== -->
 
-    <target name="classes" depends="prepare,classpath">
-        <javac debug="on" source="1.5" deprecation="on" destdir="${build.dir}/classes">
-            <compilerarg value="-Xlint:unchecked"/>
-            <classpath>
-                <path refid="local.class.path"/>
-            </classpath>
-            <src path="${src.dir}"/>
-        </javac>
+    <target name="classes" depends="prepare">
+        <javac15 classpathref="local.class.path"/>
         <copy todir="${build.dir}/classes">
             <!-- don't put the DTDs in the jar file... -->
             <fileset dir="${src.dir}" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/>
@@ -126,7 +87,7 @@
     <!-- Build JavaDoc                                                      -->
     <!-- ================================================================== -->
 
-    <target name="docs" depends="prepare-docs,classpath">
+    <target name="docs" depends="prepare-docs">
         <javadoc packagenames="org.ofbiz.service.*"
                  classpathref="local.class.path"
                  destdir="${build.dir}/javadocs"
@@ -134,6 +95,4 @@
             <sourcepath path="${src.dir}"/>
         </javadoc>
     </target>
-
-    <target name="all" depends="jar,docs"/>
 </project>

Modified: ofbiz/trunk/framework/testtools/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/testtools/build.xml?rev=672657&r1=672656&r2=672657&view=diff
==============================================================================
--- ofbiz/trunk/framework/testtools/build.xml (original)
+++ ofbiz/trunk/framework/testtools/build.xml Sun Jun 29 11:39:36 2008
@@ -19,72 +19,34 @@
 -->
 
 <project name="OFBiz - Test Tools Component" default="jar" basedir=".">
+    <import file="../../common.xml"/>
 
     <!-- ================================================================== -->
     <!-- Initialization of all property settings                            -->
     <!-- ================================================================== -->
 
-    <target name="init">
-        <property environment="env"/>
-        <property name="desc" value="Test Tools Component"/>
-        <property name="name" value="ofbiz-testtools"/>
-        <property name="ofbiz.home.dir" value="../.."/>
-        <property name="src.dir" value="src"/>
-        <property name="dtd.dir" value="dtd"/>
-        <property name="lib.dir" value="lib"/>
-        <property name="build.dir" value="build"/>
-    </target>
-
-    <target name="classpath">
-        <path id="local.class.path">
-            <!-- <fileset dir="${lib.dir}" includes="*.jar"/> -->
-            <fileset dir="../base/lib" includes="*.jar"/>
-            <fileset dir="../base/build/lib" includes="*.jar"/>
-            <fileset dir="../entity/lib" includes="*.jar"/>
-            <fileset dir="../entity/build/lib" includes="*.jar"/>
-            <fileset dir="../security/build/lib" includes="*.jar"/>
-            <fileset dir="../service/lib" includes="*.jar"/>
-            <fileset dir="../service/build/lib" includes="*.jar"/>
-            <fileset dir="../minilang/build/lib" includes="*.jar"/>
-        </path>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Removes all created files and directories                          -->
-    <!-- ================================================================== -->
-
-    <target name="clean" depends="clean-lib">
-        <delete dir="${build.dir}"/>
-    </target>
-
-    <target name="clean-lib" depends="init">
-        <delete dir="${build.dir}/lib"/>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Makes sure the needed directory structure is in place              -->
-    <!-- ================================================================== -->
-
-    <target name="prepare" depends="clean-lib">
-        <mkdir dir="${build.dir}/classes"/>
-        <mkdir dir="${build.dir}/lib"/>
-    </target>
-
-    <target name="prepare-docs" depends="init">
-        <mkdir dir="${build.dir}/javadocs"/>
-    </target>
+    <property name="desc" value="Test Tools Component"/>
+    <property name="name" value="ofbiz-testtools"/>
+    <property name="ofbiz.home.dir" value="../.."/>
+
+    <path id="local.class.path">
+        <!-- <fileset dir="${lib.dir}" includes="*.jar"/> -->
+        <fileset dir="../base/lib" includes="*.jar"/>
+        <fileset dir="../base/build/lib" includes="*.jar"/>
+        <fileset dir="../entity/lib" includes="*.jar"/>
+        <fileset dir="../entity/build/lib" includes="*.jar"/>
+        <fileset dir="../security/build/lib" includes="*.jar"/>
+        <fileset dir="../service/lib" includes="*.jar"/>
+        <fileset dir="../service/build/lib" includes="*.jar"/>
+        <fileset dir="../minilang/build/lib" includes="*.jar"/>
+    </path>
 
     <!-- ================================================================== -->
     <!-- Compilation of the source files                                                                                                                         -->
     <!-- ================================================================== -->
 
-    <target name="classes" depends="prepare,classpath">
-    	<javac debug="on" source="1.5" deprecation="on" destdir="${build.dir}/classes">
-            <classpath>
-                <path refid="local.class.path"/>
-            </classpath>
-            <src path="${src.dir}"/>
-        </javac>
+    <target name="classes" depends="prepare">
+        <javac15 classpathref="local.class.path"/>
         <copy todir="${build.dir}/classes">
             <!-- don't put the DTDs in the jar file... -->
             <fileset dir="${src.dir}" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/>
@@ -96,15 +58,11 @@
         </copy>        
     </target>
 
-    <target name="jar" depends="classes">
-        <jar jarfile="${build.dir}/lib/${name}.jar" basedir="${build.dir}/classes"/>
-    </target>
-
     <!-- ================================================================== -->
     <!-- Build JavaDoc                                                      -->
     <!-- ================================================================== -->
 
-    <target name="docs" depends="prepare-docs,classpath">
+    <target name="docs" depends="prepare-docs">
         <javadoc packagenames="org.ofbiz.testtools.*"
                  classpathref="local.class.path"
                  destdir="${build.dir}/javadocs"
@@ -112,6 +70,4 @@
             <sourcepath path="${src.dir}"/>
         </javadoc>
     </target>
-
-    <target name="all" depends="jar,docs"/>
 </project>

Modified: ofbiz/trunk/framework/webapp/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/build.xml?rev=672657&r1=672656&r2=672657&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/build.xml (original)
+++ ofbiz/trunk/framework/webapp/build.xml Sun Jun 29 11:39:36 2008
@@ -19,75 +19,38 @@
 -->
 
 <project name="OFBiz - WebApp Component" default="jar" basedir=".">
+    <import file="../../common.xml"/>
 
     <!-- ================================================================== -->
     <!-- Initialization of all property settings                            -->
     <!-- ================================================================== -->
 
-    <target name="init">
-        <property environment="env"/>
-        <property name="desc" value="Web App Component"/>
-        <property name="name" value="ofbiz-webapp"/>
-        <property name="ofbiz.home.dir" value="../.."/>
-        <property name="src.dir" value="src"/>
-        <property name="dtd.dir" value="dtd"/>
-        <property name="lib.dir" value="lib"/>
-        <property name="build.dir" value="build"/>
-    </target>
-
-    <target name="classpath">
-        <path id="local.class.path">
-            <fileset dir="${lib.dir}" includes="*.jar"/>
-            <fileset dir="../base/lib" includes="*.jar"/>
-            <fileset dir="../base/lib/commons" includes="*.jar"/>
-            <fileset dir="../base/lib/j2eespecs" includes="*.jar"/>
-            <fileset dir="../base/lib/scripting" includes="*.jar"/>
-            <fileset dir="../base/build/lib" includes="*.jar"/>
-            <fileset dir="../entity/lib" includes="*.jar"/>
-            <fileset dir="../entity/build/lib" includes="*.jar"/>
-            <fileset dir="../security/build/lib" includes="*.jar"/>
-            <fileset dir="../service/lib" includes="*.jar"/>
-            <fileset dir="../service/build/lib" includes="*.jar"/>
-            <fileset dir="../minilang/build/lib" includes="*.jar"/>
-            <fileset dir="../common/build/lib" includes="*.jar"/>
-        </path>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Removes all created files and directories                          -->
-    <!-- ================================================================== -->
-
-    <target name="clean" depends="clean-lib">
-        <delete dir="${build.dir}"/>
-    </target>
-
-    <target name="clean-lib" depends="init">
-        <delete dir="${build.dir}/lib"/>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Makes sure the needed directory structure is in place              -->
-    <!-- ================================================================== -->
-
-    <target name="prepare" depends="clean-lib">
-        <mkdir dir="${build.dir}/classes"/>
-        <mkdir dir="${build.dir}/lib"/>
-    </target>
-
-    <target name="prepare-docs" depends="init">
-        <mkdir dir="${build.dir}/javadocs"/>
-    </target>
+    <property name="desc" value="Web App Component"/>
+    <property name="name" value="ofbiz-webapp"/>
+    <property name="ofbiz.home.dir" value="../.."/>
+
+    <path id="local.class.path">
+        <fileset dir="${lib.dir}" includes="*.jar"/>
+        <fileset dir="../base/lib" includes="*.jar"/>
+        <fileset dir="../base/lib/commons" includes="*.jar"/>
+        <fileset dir="../base/lib/j2eespecs" includes="*.jar"/>
+        <fileset dir="../base/lib/scripting" includes="*.jar"/>
+        <fileset dir="../base/build/lib" includes="*.jar"/>
+        <fileset dir="../entity/lib" includes="*.jar"/>
+        <fileset dir="../entity/build/lib" includes="*.jar"/>
+        <fileset dir="../security/build/lib" includes="*.jar"/>
+        <fileset dir="../service/lib" includes="*.jar"/>
+        <fileset dir="../service/build/lib" includes="*.jar"/>
+        <fileset dir="../minilang/build/lib" includes="*.jar"/>
+        <fileset dir="../common/build/lib" includes="*.jar"/>
+    </path>
 
     <!-- ================================================================== -->
     <!-- Compilation of the source files                                                                                                                         -->
     <!-- ================================================================== -->
 
-    <target name="classes" depends="prepare,classpath">
-    	<javac debug="on" source="1.5" deprecation="on" destdir="${build.dir}/classes">
-            <classpath>
-                <path refid="local.class.path"/>
-            </classpath>
-            <src path="${src.dir}"/>
+    <target name="classes" depends="prepare">
+        <javac15 classpathref="local.class.path">
     		<!-- JasperReports dependent files -->
             <exclude name="org/ofbiz/webapp/view/JasperReportsPdfViewHandler.java"/>
             <exclude name="org/ofbiz/webapp/view/JasperReportsXmlViewHandler.java"/>
@@ -100,7 +63,7 @@
             <exclude name="org/ofbiz/webapp/view/FopPdfViewHandler.java"/>
     		<exclude name="org/ofbiz/webapp/ftl/FreeMarkerViewRenderer.java"/>
             <exclude name="org/ofbiz/webapp/ftl/JpCacheIncludeTransform.java"/>
-        </javac>
+        </javac15>
         <copy todir="${build.dir}/classes">
             <!-- don't put the DTDs in the jar file... -->
             <fileset dir="${src.dir}" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/>
@@ -112,15 +75,11 @@
         </copy>        
     </target>
 
-    <target name="jar" depends="classes">
-        <jar jarfile="${build.dir}/lib/${name}.jar" basedir="${build.dir}/classes"/>
-    </target>
-
     <!-- ================================================================== -->
     <!-- Build JavaDoc                                                      -->
     <!-- ================================================================== -->
 
-    <target name="docs" depends="prepare-docs,classpath">
+    <target name="docs" depends="prepare-docs">
         <javadoc packagenames="org.ofbiz.webapp.*"
                  classpathref="local.class.path"
                  destdir="${build.dir}/javadocs"
@@ -128,6 +87,4 @@
             <sourcepath path="${src.dir}"/>
         </javadoc>
     </target>
-
-    <target name="all" depends="jar,docs"/>
 </project>

Modified: ofbiz/trunk/framework/webtools/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/build.xml?rev=672657&r1=672656&r2=672657&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/build.xml (original)
+++ ofbiz/trunk/framework/webtools/build.xml Sun Jun 29 11:39:36 2008
@@ -19,78 +19,40 @@
 -->
 
 <project name="OFBiz - WebTools Component" default="jar" basedir=".">
+    <import file="../../common.xml"/>
 
     <!-- ================================================================== -->
     <!-- Initialization of all property settings                            -->
     <!-- ================================================================== -->
 
-    <target name="init">
-        <property environment="env"/>
-        <property name="desc" value="WebTools Component"/>
-        <property name="name" value="ofbiz-webtools"/>
-        <property name="ofbiz.home.dir" value="../.."/>
-        <property name="src.dir" value="src"/>
-        <property name="dtd.dir" value="dtd"/>
-        <property name="lib.dir" value="lib"/>
-        <property name="build.dir" value="build"/>
-    </target>
-
-    <target name="classpath">
-        <path id="local.class.path">
-            <!--<fileset dir="${lib.dir}" includes="*.jar"/>-->
-            <fileset dir="../base/lib" includes="*.jar"/>
-            <fileset dir="../base/lib/commons" includes="*.jar"/>
-            <fileset dir="../base/lib/j2eespecs" includes="*.jar"/>
-            <fileset dir="../base/build/lib" includes="*.jar"/>
-            <fileset dir="../entity/lib" includes="*.jar"/>
-            <fileset dir="../entity/build/lib" includes="*.jar"/>
-            <fileset dir="../entityext/build/lib" includes="*.jar"/>
-            <fileset dir="../security/build/lib" includes="*.jar"/>
-            <fileset dir="../service/lib" includes="*.jar"/>
-            <fileset dir="../service/build/lib" includes="*.jar"/>
-            <fileset dir="../minilang/build/lib" includes="*.jar"/>
-            <fileset dir="../webapp/lib" includes="*.jar"/>
-            <fileset dir="../webapp/build/lib" includes="*.jar"/>
-            <fileset dir="../widget/build/lib" includes="*.jar"/>
-        </path>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Removes all created files and directories                          -->
-    <!-- ================================================================== -->
-
-    <target name="clean" depends="clean-lib">
-        <delete dir="${build.dir}"/>
-    </target>
-
-    <target name="clean-lib" depends="init">
-        <delete dir="${build.dir}/lib"/>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Makes sure the needed directory structure is in place              -->
-    <!-- ================================================================== -->
-
-    <target name="prepare" depends="clean-lib">
-        <mkdir dir="${build.dir}/classes"/>
-        <mkdir dir="${build.dir}/lib"/>
-    </target>
-
-    <target name="prepare-docs" depends="init">
-        <mkdir dir="${build.dir}/javadocs"/>
-    </target>
+    <property name="desc" value="WebTools Component"/>
+    <property name="name" value="ofbiz-webtools"/>
+    <property name="ofbiz.home.dir" value="../.."/>
+
+    <path id="local.class.path">
+        <!--<fileset dir="${lib.dir}" includes="*.jar"/>-->
+        <fileset dir="../base/lib" includes="*.jar"/>
+        <fileset dir="../base/lib/commons" includes="*.jar"/>
+        <fileset dir="../base/lib/j2eespecs" includes="*.jar"/>
+        <fileset dir="../base/build/lib" includes="*.jar"/>
+        <fileset dir="../entity/lib" includes="*.jar"/>
+        <fileset dir="../entity/build/lib" includes="*.jar"/>
+        <fileset dir="../entityext/build/lib" includes="*.jar"/>
+        <fileset dir="../security/build/lib" includes="*.jar"/>
+        <fileset dir="../service/lib" includes="*.jar"/>
+        <fileset dir="../service/build/lib" includes="*.jar"/>
+        <fileset dir="../minilang/build/lib" includes="*.jar"/>
+        <fileset dir="../webapp/lib" includes="*.jar"/>
+        <fileset dir="../webapp/build/lib" includes="*.jar"/>
+        <fileset dir="../widget/build/lib" includes="*.jar"/>
+    </path>
 
     <!-- ================================================================== -->
     <!-- Compilation of the source files                                                                                                                         -->
     <!-- ================================================================== -->
 
-    <target name="classes" depends="prepare,classpath">
-        <javac debug="on" source="1.5" deprecation="on" destdir="${build.dir}/classes">
-            <classpath>
-                <path refid="local.class.path"/>
-            </classpath>
-            <src path="${src.dir}"/>
-        </javac>
+    <target name="classes" depends="prepare">
+        <javac15 classpathref="local.class.path"/>
         <!-- also put the DTDs in the jar file... -->
         <copy todir="${build.dir}/classes">
             <!--<fileset dir="${dtd.dir}" includes="*.dtd"/>-->
@@ -103,15 +65,11 @@
         </copy>        
     </target>
 
-    <target name="jar" depends="classes">
-        <jar jarfile="${build.dir}/lib/${name}.jar" basedir="${build.dir}/classes"/>
-    </target>        
-
     <!-- ================================================================== -->
     <!-- Build JavaDoc                                                      -->
     <!-- ================================================================== -->
 
-    <target name="docs" depends="prepare-docs,classpath">
+    <target name="docs" depends="prepare-docs">
         <javadoc packagenames="org.ofbiz.webtools.*"
                  classpathref="local.class.path"
                  destdir="${build.dir}/javadocs"
@@ -119,6 +77,4 @@
             <sourcepath path="${src.dir}"/>
         </javadoc>
     </target>
-
-    <target name="all" depends="jar,docs"/>
 </project>