ofbiz-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From doo...@apache.org
Subject svn commit: r672657 [3/3] - in /ofbiz/trunk: ./ applications/ applications/accounting/ applications/content/ applications/ecommerce/ applications/humanres/ applications/manufacturing/ applications/marketing/ applications/order/ applications/party/ appl...
Date Sun, 29 Jun 2008 18:39:38 GMT
Modified: ofbiz/trunk/framework/widget/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/build.xml?rev=672657&r1=672656&r2=672657&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/build.xml (original)
+++ ofbiz/trunk/framework/widget/build.xml Sun Jun 29 11:39:36 2008
@@ -19,77 +19,39 @@
 -->
 
 <project name="OFBiz - Widget Component" default="jar" basedir=".">
+    <import file="../../common.xml"/>
 
     <!-- ================================================================== -->
     <!-- Initialization of all property settings                            -->
     <!-- ================================================================== -->
 
-    <target name="init">
-        <property environment="env"/>
-        <property name="desc" value="Widget Component"/>
-        <property name="name" value="ofbiz-widget"/>
-        <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/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"/>
-            <fileset dir="../minilang/build/lib" includes="*.jar"/>
-            <fileset dir="../webapp/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 name="desc" value="Widget Component"/>
+    <property name="name" value="ofbiz-widget"/>
+    <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/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"/>
+        <fileset dir="../minilang/build/lib" includes="*.jar"/>
+        <fileset dir="../webapp/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"/>
@@ -101,15 +63,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.widget.*"
                  classpathref="local.class.path"
                  destdir="${build.dir}/javadocs"
@@ -117,6 +75,4 @@
             <sourcepath path="${src.dir}"/>
         </javadoc>
     </target>
-
-    <target name="all" depends="jar,docs"/>
 </project>

Added: ofbiz/trunk/macros.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/macros.xml?rev=672657&view=auto
==============================================================================
--- ofbiz/trunk/macros.xml (added)
+++ ofbiz/trunk/macros.xml Sun Jun 29 11:39:36 2008
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<project>
+ <macrodef name="iterate">
+  <attribute name="filelist" default="subdirs"/>
+  <attribute name="target" default=""/>
+  <attribute name="inheritall" default="false"/>
+  <sequential>
+   <subant target="@{target}" inheritall="@{inheritall}">
+    <filelist refid="@{filelist}"/>
+   </subant>
+  </sequential>
+ </macrodef>
+
+ <presetdef name="default-javac">
+  <javac debug="on" deprecation="on" destdir="${build.dir}/classes" srcdir="${src.dir}"/>
+ </presetdef>
+
+ <presetdef name="javac14">
+  <default-javac compiler="javac1.4" target="1.4" source="1.4"/>
+ </presetdef>
+
+ <presetdef name="javac15">
+  <default-javac compiler="javac1.5" target="1.5" source="1.5">
+   <!--
+   <compilerarg value="-Xlint:unchecked"/>
+   -->
+  </default-javac>
+ </presetdef>
+</project>

Modified: ofbiz/trunk/specialpurpose/assetmaint/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/build.xml?rev=672657&r1=672656&r2=672657&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/build.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/build.xml Sun Jun 29 11:39:36 2008
@@ -19,90 +19,48 @@
 -->
 
 <project name="OFBiz - Asset Maintenance Component" default="jar" basedir=".">
+    <import file="../../common.xml"/>
 
     <!-- ================================================================== -->
     <!-- Initialization of all property settings                            -->
     <!-- ================================================================== -->
 
-    <target name="init">
-        <property environment="env"/>
-        <property name="desc" value="Asset Maintenance Component"/>
-        <property name="name" value="ofbiz-assetmaint"/>
-        <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="../../framework/base/lib" includes="*.jar"/>
-            <fileset dir="../../framework/base/lib/commons" includes="*.jar"/>
-            <fileset dir="../../framework/base/lib/j2eespecs" 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/webapp/lib" includes="*.jar"/>
-            <fileset dir="../../framework/webapp/build/lib" includes="*.jar"/>
-            <fileset dir="../../framework/common/build/lib" includes="*.jar"/>
-            <fileset dir="../../applications/product/build/lib" includes="*.jar"/>
-        </path>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Removes all created files and directories                          -->
-    <!-- ================================================================== -->
+    <property name="desc" value="Asset Maintenance Component"/>
+    <property name="name" value="ofbiz-assetmaint"/>
 
-    <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>
+    <path id="local.class.path">
+        <fileset dir="../../framework/base/lib" includes="*.jar"/>
+        <fileset dir="../../framework/base/lib/commons" includes="*.jar"/>
+        <fileset dir="../../framework/base/lib/j2eespecs" 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/webapp/lib" includes="*.jar"/>
+        <fileset dir="../../framework/webapp/build/lib" includes="*.jar"/>
+        <fileset dir="../../framework/common/build/lib" includes="*.jar"/>
+        <fileset dir="../../applications/product/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">
             <fileset dir="${src.dir}" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/>
         </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.assetmaint.*"
                  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/specialpurpose/bi/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/bi/build.xml?rev=672657&r1=672656&r2=672657&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/bi/build.xml (original)
+++ ofbiz/trunk/specialpurpose/bi/build.xml Sun Jun 29 11:39:36 2008
@@ -19,77 +19,40 @@
 -->
 
 <project name="OFBiz - Business Intelligence" default="jar" basedir=".">
+    <import file="../../common.xml"/>
 
     <!-- ================================================================== -->
     <!-- Initialization of all property settings                            -->
     <!-- ================================================================== -->
 
-    <target name="init">
-        <property environment="env"/>
-        <property name="desc" value="Business Intelligence Component"/>
-        <property name="name" value="ofbiz-bi"/>
-        <property name="ofbiz.home.dir" value="../.."/>
-        <property name="src.dir" value="src"/>
-        <property name="build.dir" value="build"/>
-    </target>
-
-    <target name="classpath">
-        <path id="local.class.path">
-            <fileset dir="../../framework/base/lib" includes="*.jar"/>
-            <fileset dir="../../framework/base/lib/commons" includes="*.jar"/>
-            <fileset dir="../../framework/base/lib/j2eespecs" includes="*.jar"/>
-            <fileset dir="../../framework/base/lib/scripting" 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/entityext/build/lib" includes="*.jar"/>
-            <fileset dir="../../framework/guiapp/lib" includes="*.jar"/>
-            <fileset dir="../../framework/guiapp/build/lib" includes="*.jar"/>
-            <fileset dir="../../framework/webapp/build/lib" includes="*.jar"/>
-            <fileset dir="../../applications/party/build/lib" includes="*.jar"/>
-            <fileset dir="../../applications/product/build/lib" includes="*.jar"/>
-        </path>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Removes all created files and directories                          -->
-    <!-- ================================================================== -->
+    <property name="desc" value="Business Intelligence Component"/>
+    <property name="name" value="ofbiz-bi"/>
 
-    <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>
+    <path id="local.class.path">
+        <fileset dir="../../framework/base/lib" includes="*.jar"/>
+        <fileset dir="../../framework/base/lib/commons" includes="*.jar"/>
+        <fileset dir="../../framework/base/lib/j2eespecs" includes="*.jar"/>
+        <fileset dir="../../framework/base/lib/scripting" 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/entityext/build/lib" includes="*.jar"/>
+        <fileset dir="../../framework/guiapp/lib" includes="*.jar"/>
+        <fileset dir="../../framework/guiapp/build/lib" includes="*.jar"/>
+        <fileset dir="../../framework/webapp/build/lib" includes="*.jar"/>
+        <fileset dir="../../applications/party/build/lib" includes="*.jar"/>
+        <fileset dir="../../applications/product/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">
             <fileset dir="${src.dir}" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/>
         </copy>
@@ -100,15 +63,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.bi.*"
                  classpathref="local.class.path"
                  destdir="${build.dir}/javadocs"
@@ -116,6 +75,4 @@
             <sourcepath path="${src.dir}"/>
         </javadoc>
     </target>
-
-    <target name="all" depends="jar,docs"/>
 </project>

Modified: ofbiz/trunk/specialpurpose/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/build.xml?rev=672657&r1=672656&r2=672657&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/build.xml (original)
+++ ofbiz/trunk/specialpurpose/build.xml Sun Jun 29 11:39:36 2008
@@ -19,6 +19,7 @@
 -->
 
 <project name="OFBiz Special Purpose Applications Build" default="build" basedir=".">
+    <import file="../macros.xml"/>
     <filelist id="specialpurpose-builds" dir="."
         files="
         pos/build.xml, 
@@ -56,9 +57,7 @@
     </target>
 
     <target name="clean">
-        <subant target="clean">
-            <filelist refid="specialpurpose-builds"/>
-        </subant>
+        <iterate target="clean" filelist="specialpurpose-builds"/>
         <delete file="ofbiz.jar"/>
         <echo message="[clean] ========== Done Cleaning Special purpose =========="/>
     </target>
@@ -70,9 +69,7 @@
     <target name="build" depends="">
         <echo message="[build] ========== Start Building Special Purpose (Compile) =========="/>
 
-        <subant inheritall="false">
-            <filelist refid="specialpurpose-builds"/>
-        </subant>
+        <iterate inheritall="false" filelist="specialpurpose-builds"/>
 
         <echo message="[build] ========== Done Building Special Purpose (Compile) =========="/>
     </target>
@@ -84,9 +81,7 @@
     <target name="docs" depends="">
         <echo message="[docs] ========== Start Building Special Purpose (JavaDoc) =========="/>
 
-        <subant target="docs">
-            <filelist refid="specialpurpose-builds"/>
-        </subant>
+        <iterate target="docs" filelist="specialpurpose-builds"/>
 
         <echo message="[docs] ========== Done Building Special Purpose (JavaDocs) =========="/>
     </target>

Modified: ofbiz/trunk/specialpurpose/ebay/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/build.xml?rev=672657&r1=672656&r2=672657&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/build.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/build.xml Sun Jun 29 11:39:36 2008
@@ -19,92 +19,50 @@
 -->
 
 <project name="OFBiz - eBay Component" default="jar" basedir=".">
+    <import file="../../common.xml"/>
 
     <!-- ================================================================== -->
     <!-- Initialization of all property settings                            -->
     <!-- ================================================================== -->
 
-    <target name="init">
-        <property environment="env"/>
-        <property name="desc" value="eBay Component"/>
-        <property name="name" value="ofbiz-ebay"/>
-        <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="../../framework/base/lib" includes="*.jar"/>
-            <fileset dir="../../framework/base/lib/commons" includes="*.jar"/>
-            <fileset dir="../../framework/base/lib/j2eespecs" 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/webapp/lib" includes="*.jar"/>
-            <fileset dir="../../framework/webapp/build/lib" includes="*.jar"/>
-            <fileset dir="../../framework/common/build/lib" includes="*.jar"/>
-            <fileset dir="../../applications/product/build/lib" includes="*.jar"/>
-            <fileset dir="../../applications/party/build/lib" includes="*.jar"/>
-            <fileset dir="../../applications/order/build/lib" includes="*.jar"/>            
-        </path>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Removes all created files and directories                          -->
-    <!-- ================================================================== -->
+    <property name="desc" value="eBay Component"/>
+    <property name="name" value="ofbiz-ebay"/>
 
-    <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>
+    <path id="local.class.path">
+        <fileset dir="../../framework/base/lib" includes="*.jar"/>
+        <fileset dir="../../framework/base/lib/commons" includes="*.jar"/>
+        <fileset dir="../../framework/base/lib/j2eespecs" 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/webapp/lib" includes="*.jar"/>
+        <fileset dir="../../framework/webapp/build/lib" includes="*.jar"/>
+        <fileset dir="../../framework/common/build/lib" includes="*.jar"/>
+        <fileset dir="../../applications/product/build/lib" includes="*.jar"/>
+        <fileset dir="../../applications/party/build/lib" includes="*.jar"/>
+        <fileset dir="../../applications/order/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">
             <fileset dir="${src.dir}" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/>
         </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.ebay.*"
                  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/specialpurpose/googlebase/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/build.xml?rev=672657&r1=672656&r2=672657&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlebase/build.xml (original)
+++ ofbiz/trunk/specialpurpose/googlebase/build.xml Sun Jun 29 11:39:36 2008
@@ -19,90 +19,48 @@
 -->
 
 <project name="OFBiz - Google Base Component" default="jar" basedir=".">
+    <import file="../../common.xml"/>
 
     <!-- ================================================================== -->
     <!-- Initialization of all property settings                            -->
     <!-- ================================================================== -->
 
-    <target name="init">
-        <property environment="env"/>
-        <property name="desc" value="Google Base Component"/>
-        <property name="name" value="ofbiz-googlebase"/>
-        <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="../../framework/base/lib" includes="*.jar"/>
-            <fileset dir="../../framework/base/lib/commons" includes="*.jar"/>
-            <fileset dir="../../framework/base/lib/j2eespecs" 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/webapp/lib" includes="*.jar"/>
-            <fileset dir="../../framework/webapp/build/lib" includes="*.jar"/>
-            <fileset dir="../../framework/common/build/lib" includes="*.jar"/>
-            <fileset dir="../../applications/product/build/lib" includes="*.jar"/>
-        </path>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Removes all created files and directories                          -->
-    <!-- ================================================================== -->
+    <property name="desc" value="Google Base Component"/>
+    <property name="name" value="ofbiz-googlebase"/>
 
-    <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>
+    <path id="local.class.path">
+        <fileset dir="../../framework/base/lib" includes="*.jar"/>
+        <fileset dir="../../framework/base/lib/commons" includes="*.jar"/>
+        <fileset dir="../../framework/base/lib/j2eespecs" 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/webapp/lib" includes="*.jar"/>
+        <fileset dir="../../framework/webapp/build/lib" includes="*.jar"/>
+        <fileset dir="../../framework/common/build/lib" includes="*.jar"/>
+        <fileset dir="../../applications/product/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">
             <fileset dir="${src.dir}" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/>
         </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.googlebase.*"
                  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/specialpurpose/hhfacility/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/build.xml?rev=672657&r1=672656&r2=672657&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/hhfacility/build.xml (original)
+++ ofbiz/trunk/specialpurpose/hhfacility/build.xml Sun Jun 29 11:39:36 2008
@@ -19,77 +19,40 @@
 -->
 
 <project name="OFBiz - HHFacility" default="jar" basedir=".">
+    <import file="../../common.xml"/>
 
     <!-- ================================================================== -->
     <!-- Initialization of all property settings                            -->
     <!-- ================================================================== -->
 
-    <target name="init">
-        <property environment="env"/>
-        <property name="desc" value="HHFacility Component"/>
-        <property name="name" value="ofbiz-hhfacility"/>
-        <property name="ofbiz.home.dir" value="../.."/>
-        <property name="src.dir" value="src"/>
-        <property name="build.dir" value="build"/>
-    </target>
-
-    <target name="classpath">
-        <path id="local.class.path">
-            <fileset dir="../../framework/base/lib" includes="*.jar"/>
-            <fileset dir="../../framework/base/lib/commons" includes="*.jar"/>
-            <fileset dir="../../framework/base/lib/j2eespecs" includes="*.jar"/>
-            <fileset dir="../../framework/base/lib/scripting" 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/entityext/build/lib" includes="*.jar"/>
-            <fileset dir="../../framework/guiapp/lib" includes="*.jar"/>
-            <fileset dir="../../framework/guiapp/build/lib" includes="*.jar"/>
-            <fileset dir="../../framework/webapp/build/lib" includes="*.jar"/>
-            <fileset dir="../../applications/party/build/lib" includes="*.jar"/>
-            <fileset dir="../../applications/product/build/lib" includes="*.jar"/>
-        </path>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Removes all created files and directories                          -->
-    <!-- ================================================================== -->
+    <property name="desc" value="HHFacility Component"/>
+    <property name="name" value="ofbiz-hhfacility"/>
 
-    <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>
+    <path id="local.class.path">
+        <fileset dir="../../framework/base/lib" includes="*.jar"/>
+        <fileset dir="../../framework/base/lib/commons" includes="*.jar"/>
+        <fileset dir="../../framework/base/lib/j2eespecs" includes="*.jar"/>
+        <fileset dir="../../framework/base/lib/scripting" 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/entityext/build/lib" includes="*.jar"/>
+        <fileset dir="../../framework/guiapp/lib" includes="*.jar"/>
+        <fileset dir="../../framework/guiapp/build/lib" includes="*.jar"/>
+        <fileset dir="../../framework/webapp/build/lib" includes="*.jar"/>
+        <fileset dir="../../applications/party/build/lib" includes="*.jar"/>
+        <fileset dir="../../applications/product/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">
             <fileset dir="${src.dir}" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/>
         </copy>
@@ -100,15 +63,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.hhfacility.*"
                  classpathref="local.class.path"
                  destdir="${build.dir}/javadocs"
@@ -116,6 +75,4 @@
             <sourcepath path="${src.dir}"/>
         </javadoc>
     </target>
-
-    <target name="all" depends="jar,docs"/>
 </project>

Modified: ofbiz/trunk/specialpurpose/oagis/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/build.xml?rev=672657&r1=672656&r2=672657&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/build.xml (original)
+++ ofbiz/trunk/specialpurpose/oagis/build.xml Sun Jun 29 11:39:36 2008
@@ -19,79 +19,42 @@
 -->
 
 <project name="OFBiz - Oagis" default="jar" basedir=".">
+    <import file="../../common.xml"/>
 
     <!-- ================================================================== -->
     <!-- Initialization of all property settings                            -->
     <!-- ================================================================== -->
 
-    <target name="init">
-        <property environment="env"/>
-        <property name="desc" value="Oagis Implementation Component"/>
-        <property name="name" value="ofbiz-oagis"/>
-        <property name="ofbiz.home.dir" value="../.."/>
-        <property name="src.dir" value="src"/>
-        <property name="build.dir" value="build"/>
-    </target>
-
-    <target name="classpath">
-        <path id="local.class.path">
-            <fileset dir="../../framework/base/lib" includes="*.jar"/>
-            <fileset dir="../../framework/base/lib/commons" includes="*.jar"/>
-            <fileset dir="../../framework/base/lib/j2eespecs" includes="*.jar"/>
-            <fileset dir="../../framework/base/lib/scripting" 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/entityext/build/lib" includes="*.jar"/>
-            <fileset dir="../../framework/guiapp/lib" includes="*.jar"/>
-            <fileset dir="../../framework/guiapp/build/lib" includes="*.jar"/>
-            <fileset dir="../../framework/webapp/build/lib" includes="*.jar"/>
-            <fileset dir="../../framework/widget/build/lib" includes="*.jar"/>
-            <fileset dir="../../applications/party/build/lib" includes="*.jar"/>
-            <fileset dir="../../applications/product/build/lib" includes="*.jar"/>
-            <fileset dir="../../applications/order/build/lib" includes="*.jar"/>
-        </path>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Removes all created files and directories                          -->
-    <!-- ================================================================== -->
+    <property name="desc" value="Oagis Implementation Component"/>
+    <property name="name" value="ofbiz-oagis"/>
 
-    <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>
+    <path id="local.class.path">
+        <fileset dir="../../framework/base/lib" includes="*.jar"/>
+        <fileset dir="../../framework/base/lib/commons" includes="*.jar"/>
+        <fileset dir="../../framework/base/lib/j2eespecs" includes="*.jar"/>
+        <fileset dir="../../framework/base/lib/scripting" 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/entityext/build/lib" includes="*.jar"/>
+        <fileset dir="../../framework/guiapp/lib" includes="*.jar"/>
+        <fileset dir="../../framework/guiapp/build/lib" includes="*.jar"/>
+        <fileset dir="../../framework/webapp/build/lib" includes="*.jar"/>
+        <fileset dir="../../framework/widget/build/lib" includes="*.jar"/>
+        <fileset dir="../../applications/party/build/lib" includes="*.jar"/>
+        <fileset dir="../../applications/product/build/lib" includes="*.jar"/>
+        <fileset dir="../../applications/order/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">
             <fileset dir="${src.dir}" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/>
         </copy>
@@ -102,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.oagis.*"
                  classpathref="local.class.path"
                  destdir="${build.dir}/javadocs"
@@ -118,6 +77,4 @@
             <sourcepath path="${src.dir}"/>
         </javadoc>
     </target>
-
-    <target name="all" depends="jar,docs"/>
 </project>

Modified: ofbiz/trunk/specialpurpose/pos/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/build.xml?rev=672657&r1=672656&r2=672657&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/build.xml (original)
+++ ofbiz/trunk/specialpurpose/pos/build.xml Sun Jun 29 11:39:36 2008
@@ -19,81 +19,42 @@
 -->
 
 <project name="OFBiz - POS" default="jar" basedir=".">
+    <import file="../../common.xml"/>
 
     <!-- ================================================================== -->
     <!-- Initialization of all property settings                            -->
     <!-- ================================================================== -->
 
-    <target name="init">
-        <property environment="env"/>
-        <property name="desc" value="POS Component"/>
-        <property name="name" value="ofbiz-pos"/>
-        <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/lib/commons" includes="*.jar"/>
-            <fileset dir="../../framework/base/lib/j2eespecs" includes="*.jar"/>
-            <fileset dir="../../framework/base/lib/scripting" 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/entityext/build/lib" includes="*.jar"/>
-            <fileset dir="../../framework/guiapp/lib" includes="*.jar"/>
-            <fileset dir="../../framework/guiapp/build/lib" includes="*.jar"/>
-            <fileset dir="../../applications/party/build/lib" includes="*.jar"/>
-            <fileset dir="../../applications/product/build/lib" includes="*.jar"/>
-            <fileset dir="../../applications/order/build/lib" includes="*.jar"/>
-            <fileset dir="../../applications/accounting/build/lib" includes="*.jar"/>
-        </path>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Removes all created files and directories                          -->
-    <!-- ================================================================== -->
+    <property name="desc" value="POS Component"/>
+    <property name="name" value="ofbiz-pos"/>
 
-    <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>
+    <path id="local.class.path">
+        <fileset dir="${lib.dir}" includes="*.jar"/>
+        <fileset dir="../../framework/base/lib" includes="*.jar"/>
+        <fileset dir="../../framework/base/lib/commons" includes="*.jar"/>
+        <fileset dir="../../framework/base/lib/j2eespecs" includes="*.jar"/>
+        <fileset dir="../../framework/base/lib/scripting" 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/entityext/build/lib" includes="*.jar"/>
+        <fileset dir="../../framework/guiapp/lib" includes="*.jar"/>
+        <fileset dir="../../framework/guiapp/build/lib" includes="*.jar"/>
+        <fileset dir="../../applications/party/build/lib" includes="*.jar"/>
+        <fileset dir="../../applications/product/build/lib" includes="*.jar"/>
+        <fileset dir="../../applications/order/build/lib" includes="*.jar"/>
+        <fileset dir="../../applications/accounting/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">
             <fileset dir="${src.dir}" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/>
         </copy>
@@ -104,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.pos.*"
                  classpathref="local.class.path"
                  destdir="${build.dir}/javadocs"
@@ -120,6 +77,4 @@
             <sourcepath path="${src.dir}"/>
         </javadoc>
     </target>
-
-    <target name="all" depends="jar,docs"/>
 </project>

Modified: ofbiz/trunk/specialpurpose/projectmgr/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/build.xml?rev=672657&r1=672656&r2=672657&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/build.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/build.xml Sun Jun 29 11:39:36 2008
@@ -19,77 +19,40 @@
 -->
 
 <project name="OFBiz - Project Management" default="jar" basedir=".">
+    <import file="../../common.xml"/>
 
     <!-- ================================================================== -->
     <!-- Initialization of all property settings                            -->
     <!-- ================================================================== -->
 
-    <target name="init">
-        <property environment="env"/>
-        <property name="desc" value="Project Management Component"/>
-        <property name="name" value="ofbiz-projectmgr"/>
-        <property name="ofbiz.home.dir" value="../.."/>
-        <property name="src.dir" value="src"/>
-        <property name="build.dir" value="build"/>
-    </target>
-
-    <target name="classpath">
-        <path id="local.class.path">
-            <fileset dir="../../framework/base/lib" includes="*.jar"/>
-            <fileset dir="../../framework/base/lib/commons" includes="*.jar"/>
-            <fileset dir="../../framework/base/lib/j2eespecs" includes="*.jar"/>
-            <fileset dir="../../framework/base/lib/scripting" 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/entityext/build/lib" includes="*.jar"/>
-            <fileset dir="../../framework/guiapp/lib" includes="*.jar"/>
-            <fileset dir="../../framework/guiapp/build/lib" includes="*.jar"/>
-            <fileset dir="../../framework/webapp/build/lib" includes="*.jar"/>
-            <fileset dir="../../applications/party/build/lib" includes="*.jar"/>
-            <fileset dir="../../applications/product/build/lib" includes="*.jar"/>
-        </path>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Removes all created files and directories                          -->
-    <!-- ================================================================== -->
+    <property name="desc" value="Project Management Component"/>
+    <property name="name" value="ofbiz-projectmgr"/>
 
-    <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>
+    <path id="local.class.path">
+        <fileset dir="../../framework/base/lib" includes="*.jar"/>
+        <fileset dir="../../framework/base/lib/commons" includes="*.jar"/>
+        <fileset dir="../../framework/base/lib/j2eespecs" includes="*.jar"/>
+        <fileset dir="../../framework/base/lib/scripting" 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/entityext/build/lib" includes="*.jar"/>
+        <fileset dir="../../framework/guiapp/lib" includes="*.jar"/>
+        <fileset dir="../../framework/guiapp/build/lib" includes="*.jar"/>
+        <fileset dir="../../framework/webapp/build/lib" includes="*.jar"/>
+        <fileset dir="../../applications/party/build/lib" includes="*.jar"/>
+        <fileset dir="../../applications/product/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">
             <fileset dir="${src.dir}" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/>
         </copy>
@@ -100,15 +63,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.project.*"
                  classpathref="local.class.path"
                  destdir="${build.dir}/javadocs"
@@ -116,6 +75,4 @@
             <sourcepath path="${src.dir}"/>
         </javadoc>
     </target>
-
-    <target name="all" depends="jar,docs"/>
 </project>

Modified: ofbiz/trunk/specialpurpose/shark/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/build.xml?rev=672657&r1=672656&r2=672657&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/build.xml (original)
+++ ofbiz/trunk/specialpurpose/shark/build.xml Sun Jun 29 11:39:36 2008
@@ -19,77 +19,40 @@
 -->
 
 <project name="OFBiz - Shark" default="jar" basedir=".">
+    <import file="../../common.xml"/>
 
     <!-- ================================================================== -->
     <!-- Initialization of all property settings                            -->
     <!-- ================================================================== -->
 
-    <target name="init">
-        <property environment="env"/>
-        <property name="desc" value="Shark Component"/>
-        <property name="name" value="ofbiz-shark"/>
-        <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="../entityext/build/lib" includes="*.jar"/>
-            <fileset dir="../common/build/lib" includes="*.jar"/>
-        </path>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Removes all created files and directories                          -->
-    <!-- ================================================================== -->
+    <property name="desc" value="Shark Component"/>
+    <property name="name" value="ofbiz-shark"/>
 
-    <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>
+    <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="../entityext/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>
+    <target name="classes" depends="prepare">
+        <javac15 classpathref="local.class.path">
             <src path="${src.dir}"/>
             <exclude name="org/ofbiz/shark/SharkGuiContainer.java"/>
-        </javac>
+        </javac15>
         <!-- also put the DTDs in the jar file... -->
         <copy todir="${build.dir}/classes">
             <!--<fileset dir="${dtd.dir}" includes="*.dtd"/>-->
@@ -102,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.shark.*"
                  classpathref="local.class.path"
                  destdir="${build.dir}/javadocs"
@@ -119,8 +78,6 @@
         </javadoc>
     </target>
 
-    <target name="all" depends="jar,docs"/>
-
     <!-- ================================================================== -->
     <!-- Copy Libs                                                          -->
     <!-- ================================================================== -->

Modified: ofbiz/trunk/specialpurpose/workflow/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/build.xml?rev=672657&r1=672656&r2=672657&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/build.xml (original)
+++ ofbiz/trunk/specialpurpose/workflow/build.xml Sun Jun 29 11:39:36 2008
@@ -19,72 +19,33 @@
 -->
 
 <project name="OFBiz - Workflow Component" default="jar" basedir=".">
+    <import file="../../common.xml"/>
 
     <!-- ================================================================== -->
     <!-- Initialization of all property settings                            -->
     <!-- ================================================================== -->
 
-    <target name="init">
-        <property environment="env"/>
-        <property name="desc" value="Workflow Component"/>
-        <property name="name" value="ofbiz-workflow"/>
-        <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/lib/j2eespecs" includes="*.jar"/>
-            <fileset dir="../../framework/base/lib/scripting" 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/build/lib" includes="*.jar"/>
-        </path>
-    </target>
-
-    <!-- ================================================================== -->
-    <!-- Removes all created files and directories                          -->
-    <!-- ================================================================== -->
+    <property name="desc" value="Workflow Component"/>
+    <property name="name" value="ofbiz-workflow"/>
 
-    <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>
+    <path id="local.class.path">
+        <!--<fileset dir="${lib.dir}" includes="*.jar"/>-->
+        <fileset dir="../../framework/base/lib" includes="*.jar"/>
+        <fileset dir="../../framework/base/lib/j2eespecs" includes="*.jar"/>
+        <fileset dir="../../framework/base/lib/scripting" 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/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 +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.workflow.*"
                  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>



Mime
View raw message