svn commit: r672657 [1/3] - in /ofbiz/trunk: ./ applications/ applications/accounting/ applications/content/ applications/ecommerce/ applications/humanres/ applications/manufacturing/ applications/marketing/ applications/order/ applications/party/ appl...
Locked
svn commit: r672657 [1/3] - in /ofbiz/trunk: ./ applications/ applications/accounting/ applications/content/ applications/ecommerce/ applications/humanres/ applications/manufacturing/ applications/marketing/ applications/order/ applications/party/ appl...
 
|
Author: doogie
Date: Sun Jun 29 11:39:36 2008 New Revision: 672657 URL: http://svn.apache.org/viewvc?rev=672657&view=rev Log: The build.xml files are now much smaller and simpler; they reuse a few global definitions. 1585 lines removed. Added: ofbiz/trunk/common.xml ofbiz/trunk/macros.xml Modified: ofbiz/trunk/applications/accounting/build.xml ofbiz/trunk/applications/build.xml ofbiz/trunk/applications/content/build.xml ofbiz/trunk/applications/ecommerce/build.xml ofbiz/trunk/applications/humanres/build.xml ofbiz/trunk/applications/manufacturing/build.xml ofbiz/trunk/applications/marketing/build.xml ofbiz/trunk/applications/order/build.xml ofbiz/trunk/applications/party/build.xml ofbiz/trunk/applications/product/build.xml ofbiz/trunk/applications/securityext/build.xml ofbiz/trunk/applications/workeffort/build.xml ofbiz/trunk/framework/appserver/build.xml ofbiz/trunk/framework/base/build.xml ofbiz/trunk/framework/build.xml ofbiz/trunk/framework/catalina/build.xml ofbiz/trunk/framework/common/build.xml ofbiz/trunk/framework/datafile/build.xml ofbiz/trunk/framework/entity/build.xml ofbiz/trunk/framework/entityext/build.xml ofbiz/trunk/framework/example/build.xml ofbiz/trunk/framework/geronimo/build.xml ofbiz/trunk/framework/guiapp/build.xml ofbiz/trunk/framework/jetty/build.xml ofbiz/trunk/framework/minilang/build.xml ofbiz/trunk/framework/security/build.xml ofbiz/trunk/framework/service/build.xml ofbiz/trunk/framework/testtools/build.xml ofbiz/trunk/framework/webapp/build.xml ofbiz/trunk/framework/webtools/build.xml ofbiz/trunk/framework/widget/build.xml ofbiz/trunk/specialpurpose/assetmaint/build.xml ofbiz/trunk/specialpurpose/bi/build.xml ofbiz/trunk/specialpurpose/build.xml ofbiz/trunk/specialpurpose/ebay/build.xml ofbiz/trunk/specialpurpose/googlebase/build.xml ofbiz/trunk/specialpurpose/hhfacility/build.xml ofbiz/trunk/specialpurpose/oagis/build.xml ofbiz/trunk/specialpurpose/pos/build.xml ofbiz/trunk/specialpurpose/projectmgr/build.xml ofbiz/trunk/specialpurpose/shark/build.xml ofbiz/trunk/specialpurpose/workflow/build.xml Modified: ofbiz/trunk/applications/accounting/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/build.xml?rev=672657&r1=672656&r2=672657&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/build.xml (original) +++ ofbiz/trunk/applications/accounting/build.xml Sun Jun 29 11:39:36 2008 @@ -19,87 +19,50 @@ --> <project name="OFBiz - Accounting Component" default="jar" basedir="."> + <import file="../../common.xml"/> <!-- ================================================================== --> <!-- Initialization of all property settings --> <!-- ================================================================== --> - <target name="init"> - <property environment="env"/> - <property name="desc" value="Accounting Component"/> - <property name="name" value="ofbiz-accounting"/> - <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="../../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="../party/build/lib" includes="*.jar"/> - <fileset dir="../product/build/lib" includes="*.jar"/> - <fileset dir="../marketing/build/lib" includes="*.jar"/> - <fileset dir="../order/build/lib" includes="*.jar"/> - <!-- <fileset dir="lib/worldpay" includes="*.jar"/> --> - <!-- <fileset dir="lib/cybersource" includes="*.jar"/> --> - <fileset dir="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="Accounting Component"/> + <property name="name" value="ofbiz-accounting"/> + <property name="ofbiz.home.dir" value="../.."/> + + <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="../party/build/lib" includes="*.jar"/> + <fileset dir="../product/build/lib" includes="*.jar"/> + <fileset dir="../marketing/build/lib" includes="*.jar"/> + <fileset dir="../order/build/lib" includes="*.jar"/> + <!-- <fileset dir="lib/worldpay" includes="*.jar"/> --> + <!-- <fileset dir="lib/cybersource" includes="*.jar"/> --> + <fileset dir="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 the payment processor packages; comment this out to not exclude if you have libs --> <exclude name="org/ofbiz/accounting/thirdparty/verisign/**"/> <exclude name="org/ofbiz/accounting/thirdparty/cybersource/**"/> <exclude name="org/ofbiz/accounting/thirdparty/worldpay/**"/> - </javac> + </javac15> <!-- also put the DTDs in the jar file... --> <copy todir="${build.dir}/classes"> <!--<fileset dir="${dtd.dir}" includes="*.dtd"/>--> @@ -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.accounting.*" 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/applications/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/build.xml?rev=672657&r1=672656&r2=672657&view=diff ============================================================================== --- ofbiz/trunk/applications/build.xml (original) +++ ofbiz/trunk/applications/build.xml Sun Jun 29 11:39:36 2008 @@ -19,6 +19,8 @@ --> <project name="OFBiz Applications Build" default="build" basedir="."> + <import file="../macros.xml"/> + <filelist id="application-builds" dir="." files="content/build.xml,party/build.xml, workeffort/build.xml,product/build.xml,marketing/build.xml, @@ -50,9 +52,7 @@ </target> <target name="clean"> - <subant target="clean"> - <filelist refid="application-builds"/> - </subant> + <iterate target="clean" filelist="application-builds"/> <delete file="ofbiz.jar"/> <echo message="[clean] ========== Done Cleaning Applications =========="/> </target> @@ -64,9 +64,7 @@ <target name="build" depends=""> <echo message="[build] ========== Start Building Applications (Compile) =========="/> - <subant inheritall="false"> - <filelist refid="application-builds"/> - </subant> + <iterate inheritall="false" filelist="application-builds"/> <echo message="[build] ========== Done Building Applications (Compile) =========="/> </target> @@ -78,9 +76,7 @@ <target name="docs" depends=""> <echo message="[docs] ========== Start Building Applications (JavaDoc) =========="/> - <subant target="docs"> - <filelist refid="application-builds"/> - </subant> + <iterate target="docs" filelist="application-builds"/> <echo message="[docs] ========== Done Building Applications (JavaDocs) =========="/> </target> Modified: ofbiz/trunk/applications/content/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/build.xml?rev=672657&r1=672656&r2=672657&view=diff ============================================================================== --- ofbiz/trunk/applications/content/build.xml (original) +++ ofbiz/trunk/applications/content/build.xml Sun Jun 29 11:39:36 2008 @@ -19,82 +19,45 @@ --> <project name="OFBiz - Content Component" default="jar" basedir="."> + <import file="../../common.xml"/> <!-- ================================================================== --> <!-- Initialization of all property settings --> <!-- ================================================================== --> - <target name="init"> - <property environment="env"/> - <property name="desc" value="Content Component"/> - <property name="name" value="ofbiz-content"/> - <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}/uno" 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/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/minilang/build/lib" includes="*.jar"/> - <fileset dir="../../framework/webapp/lib" includes="*.jar"/> - <fileset dir="../../framework/webapp/build/lib" includes="*.jar"/> - <fileset dir="../../framework/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="Content Component"/> + <property name="name" value="ofbiz-content"/> + <property name="ofbiz.home.dir" value="../.."/> + + <path id="local.class.path"> + <fileset dir="${lib.dir}" includes="*.jar"/> + <fileset dir="${lib.dir}/uno" 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/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/minilang/build/lib" includes="*.jar"/> + <fileset dir="../../framework/webapp/lib" includes="*.jar"/> + <fileset dir="../../framework/webapp/build/lib" includes="*.jar"/> + <fileset dir="../../framework/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}"/> + <target name="classes" depends="prepare"> + <javac15 classpathref="local.class.path"> <exclude name="org/ofbiz/content/report/JREntityListIteratorDataSource.java"/> <exclude name="org/ofbiz/content/report/JRMapCollectionDataSource.java"/> <exclude name="org/ofbiz/content/openoffice/*.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"/> @@ -106,15 +69,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.content.*" classpathref="local.class.path" destdir="${build.dir}/javadocs" @@ -122,6 +81,4 @@ <sourcepath path="${src.dir}"/> </javadoc> </target> - - <target name="all" depends="jar,docs"/> </project> Modified: ofbiz/trunk/applications/ecommerce/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/build.xml?rev=672657&r1=672656&r2=672657&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/build.xml (original) +++ ofbiz/trunk/applications/ecommerce/build.xml Sun Jun 29 11:39:36 2008 @@ -19,80 +19,41 @@ --> <project name="OFBiz - Ecommerce Component" default="jar" basedir="."> + <import file="../../common.xml"/> <!-- ================================================================== --> <!-- Initialization of all property settings --> <!-- ================================================================== --> - <target name="init"> - <property environment="env"/> - <property name="desc" value="Ecommerce Component"/> - <property name="name" value="ofbiz-ecommerce"/> - <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/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/common/build/lib" includes="*.jar"/> - <fileset dir="../party/build/lib" includes="*.jar"/> - <fileset dir="../product/build/lib" includes="*.jar"/> - <fileset dir="../marketing/build/lib" includes="*.jar"/> - <fileset dir="../order/build/lib" includes="*.jar"/> - <fileset dir="../accounting/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="Ecommerce Component"/> + <property name="name" value="ofbiz-ecommerce"/> + <property name="ofbiz.home.dir" value="../.."/> + + <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/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/common/build/lib" includes="*.jar"/> + <fileset dir="../party/build/lib" includes="*.jar"/> + <fileset dir="../product/build/lib" includes="*.jar"/> + <fileset dir="../marketing/build/lib" includes="*.jar"/> + <fileset dir="../order/build/lib" includes="*.jar"/> + <fileset dir="../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"> - <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"/>--> @@ -105,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.ecommerce.*" classpathref="local.class.path" destdir="${build.dir}/javadocs" @@ -121,6 +78,4 @@ <sourcepath path="${src.dir}"/> </javadoc> </target> - - <target name="all" depends="jar,docs"/> </project> Modified: ofbiz/trunk/applications/humanres/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/build.xml?rev=672657&r1=672656&r2=672657&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/build.xml (original) +++ ofbiz/trunk/applications/humanres/build.xml Sun Jun 29 11:39:36 2008 @@ -19,74 +19,36 @@ --> <project name="OFBiz - HumanRes" default="jar" basedir="."> + <import file="../../common.xml"/> <!-- ================================================================== --> <!-- Initialization of all property settings --> <!-- ================================================================== --> - <target name="init"> - <property environment="env"/> - <property name="desc" value="Human Resources"/> - <property name="name" value="ofbiz-humanres"/> - <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/common/build/lib" includes="*.jar"/> - <fileset dir="../../applications/securityext/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="Human Resources"/> + <property name="name" value="ofbiz-humanres"/> + <property name="ofbiz.home.dir" value="../.."/> + + <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/common/build/lib" includes="*.jar"/> + <fileset dir="../../applications/securityext/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"/>--> @@ -99,15 +61,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"> <!-- Commented out since there are no java files in this package at this time --> <!-- <javadoc packagenames="org.ofbiz.humanres.*" @@ -118,6 +76,4 @@ </javadoc> --> </target> - - <target name="all" depends="jar,docs"/> </project> Modified: ofbiz/trunk/applications/manufacturing/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/build.xml?rev=672657&r1=672656&r2=672657&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/build.xml (original) +++ ofbiz/trunk/applications/manufacturing/build.xml Sun Jun 29 11:39:36 2008 @@ -19,79 +19,41 @@ --> <project name="OFBiz - Manufacturing Component" default="jar" basedir="."> + <import file="../../common.xml"/> <!-- ================================================================== --> <!-- Initialization of all property settings --> <!-- ================================================================== --> - <target name="init"> - <property environment="env"/> - <property name="desc" value="Manufacturing Component"/> - <property name="name" value="ofbiz-manufacturing"/> - <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/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="../party/build/lib" includes="*.jar"/> - <fileset dir="../product/build/lib" includes="*.jar"/> - <fileset dir="../order/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="Manufacturing Component"/> + <property name="name" value="ofbiz-manufacturing"/> + <property name="ofbiz.home.dir" value="../.."/> + + <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/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="../party/build/lib" includes="*.jar"/> + <fileset dir="../product/build/lib" includes="*.jar"/> + <fileset dir="../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"/> <!-- also put the DTDs in the jar file... --> <copy todir="${build.dir}/classes"> <!--<fileset dir="${dtd.dir}" includes="*.dtd"/>--> @@ -104,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.manufacturing.*" classpathref="local.class.path" destdir="${build.dir}/javadocs" @@ -120,8 +78,6 @@ <sourcepath path="${src.dir}"/> </javadoc> </target> - - <target name="all" depends="jar,docs"/> </project> Modified: ofbiz/trunk/applications/marketing/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/build.xml?rev=672657&r1=672656&r2=672657&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/build.xml (original) +++ ofbiz/trunk/applications/marketing/build.xml Sun Jun 29 11:39:36 2008 @@ -19,79 +19,41 @@ --> <project name="OFBiz - Marketing Component" default="jar" basedir="."> - + <import file="../../common.xml"/> + <!-- ================================================================== --> <!-- Initialization of all property settings --> <!-- ================================================================== --> - <target name="init"> - <property environment="env"/> - <property name="desc" value="Marketing Component"/> - <property name="name" value="ofbiz-marketing"/> - <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/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="../content/build/lib" includes="*.jar"/> - <fileset dir="../../framework/common/build/lib" includes="*.jar"/> - <fileset dir="../product/build/lib" includes="*.jar"/> - <fileset dir="../party/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="Marketing Component"/> + <property name="name" value="ofbiz-marketing"/> + <property name="ofbiz.home.dir" value="../.."/> + + <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/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="../content/build/lib" includes="*.jar"/> + <fileset dir="../../framework/common/build/lib" includes="*.jar"/> + <fileset dir="../product/build/lib" includes="*.jar"/> + <fileset dir="../party/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"/>--> @@ -104,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.marketing.*" classpathref="local.class.path" destdir="${build.dir}/javadocs" @@ -120,6 +78,4 @@ <sourcepath path="${src.dir}"/> </javadoc> </target> - - <target name="all" depends="jar,docs"/> </project> Modified: ofbiz/trunk/applications/order/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/build.xml?rev=672657&r1=672656&r2=672657&view=diff ============================================================================== --- ofbiz/trunk/applications/order/build.xml (original) +++ ofbiz/trunk/applications/order/build.xml Sun Jun 29 11:39:36 2008 @@ -19,84 +19,47 @@ --> <project name="OFBiz - Order Component" default="jar" basedir="."> + <import file="../../common.xml"/> <!-- ================================================================== --> <!-- Initialization of all property settings --> <!-- ================================================================== --> - <target name="init"> - <property environment="env"/> - <property name="desc" value="Order Component"/> - <property name="name" value="ofbiz-order"/> - <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/build/lib" includes="*.jar"/> - <fileset dir="../../framework/entity/lib" includes="*.jar"/> - <fileset dir="../../framework/entity/build/lib" includes="*.jar"/> - <fileset dir="../../framework/datafile/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="../content/build/lib" includes="*.jar"/> - <fileset dir="../party/build/lib" includes="*.jar"/> - <fileset dir="../product/build/lib" includes="*.jar"/> - <fileset dir="../marketing/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="Order Component"/> + <property name="name" value="ofbiz-order"/> + <property name="ofbiz.home.dir" value="../.."/> + + <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/build/lib" includes="*.jar"/> + <fileset dir="../../framework/entity/lib" includes="*.jar"/> + <fileset dir="../../framework/entity/build/lib" includes="*.jar"/> + <fileset dir="../../framework/datafile/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="../content/build/lib" includes="*.jar"/> + <fileset dir="../party/build/lib" includes="*.jar"/> + <fileset dir="../product/build/lib" includes="*.jar"/> + <fileset dir="../marketing/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 the payment processor packages; comment if you have libs --> <exclude name="org/ofbiz/order/thirdparty/taxware/**"/> - </javac> + </javac15> <!-- also put the DTDs in the jar file... --> <copy todir="${build.dir}/classes"> <!--<fileset dir="${dtd.dir}" includes="*.dtd"/>--> @@ -109,15 +72,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.order.*" classpathref="local.class.path" destdir="${build.dir}/javadocs" @@ -125,6 +84,4 @@ <sourcepath path="${src.dir}"/> </javadoc> </target> - - <target name="all" depends="jar,docs"/> </project> Modified: ofbiz/trunk/applications/party/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/build.xml?rev=672657&r1=672656&r2=672657&view=diff ============================================================================== --- ofbiz/trunk/applications/party/build.xml (original) +++ ofbiz/trunk/applications/party/build.xml Sun Jun 29 11:39:36 2008 @@ -19,75 +19,37 @@ --> <project name="OFBiz - Party Component" default="jar" basedir="."> + <import file="../../common.xml"/> <!-- ================================================================== --> <!-- Initialization of all property settings --> <!-- ================================================================== --> - <target name="init"> - <property environment="env"/> - <property name="desc" value="Party Component"/> - <property name="name" value="ofbiz-party"/> - <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/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/common/build/lib" includes="*.jar"/> - <fileset dir="../content/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="Party Component"/> + <property name="name" value="ofbiz-party"/> + <property name="ofbiz.home.dir" value="../.."/> + + <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/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/common/build/lib" includes="*.jar"/> + <fileset dir="../content/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"/>--> @@ -100,15 +62,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.party.*" classpathref="local.class.path" destdir="${build.dir}/javadocs" @@ -116,6 +74,4 @@ <sourcepath path="${src.dir}"/> </javadoc> </target> - - <target name="all" depends="jar,docs"/> </project> Modified: ofbiz/trunk/applications/product/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/build.xml?rev=672657&r1=672656&r2=672657&view=diff ============================================================================== --- ofbiz/trunk/applications/product/build.xml (original) +++ ofbiz/trunk/applications/product/build.xml Sun Jun 29 11:39:36 2008 @@ -19,74 +19,41 @@ --> <project name="OFBiz - Product Component" default="jar" basedir="."> + <import file="../../common.xml"/> <!-- ================================================================== --> <!-- Initialization of all property settings --> <!-- ================================================================== --> - <target name="init"> - <property environment="env"/> - <property name="desc" value="Product Component"/> - <property name="name" value="ofbiz-product"/> - <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/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="../content/lib" includes="*.jar"/> - <fileset dir="../content/build/lib" includes="*.jar"/> - <fileset dir="../party/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="Product Component"/> + <property name="name" value="ofbiz-product"/> + <property name="ofbiz.home.dir" value="../.."/> + + <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/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="../content/lib" includes="*.jar"/> + <fileset dir="../content/build/lib" includes="*.jar"/> + <fileset dir="../party/build/lib" includes="*.jar"/> + </path> <!-- ================================================================== --> <!-- Compilation of the source files --> <!-- ================================================================== --> - <target name="classes" depends="prepare,classpath"> + <target name="classes" depends="prepare"> <!-- check for applet required classes --> <condition property="noapplet" value="ShipmentScaleApplet.java"> <not> @@ -97,13 +64,9 @@ </not> </condition> - <javac debug="on" source="1.5" deprecation="on" destdir="${build.dir}/classes"> - <classpath> - <path refid="local.class.path"/> - </classpath> - <src path="${src.dir}"/> + <javac15 classpathref="local.class.path"> <exclude name="${noapplet}"/> - </javac> + </javac15> <!-- also put the DTDs in the jar file... --> <copy todir="${build.dir}/classes"> <!--<fileset dir="${dtd.dir}" includes="*.dtd"/>--> @@ -116,15 +79,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.product.*,org.ofbiz.shipment.*" classpathref="local.class.path" destdir="${build.dir}/javadocs" @@ -132,6 +91,4 @@ <sourcepath path="${src.dir}"/> </javadoc> </target> - - <target name="all" depends="jar,docs"/> </project> Modified: ofbiz/trunk/applications/securityext/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/securityext/build.xml?rev=672657&r1=672656&r2=672657&view=diff ============================================================================== --- ofbiz/trunk/applications/securityext/build.xml (original) +++ ofbiz/trunk/applications/securityext/build.xml Sun Jun 29 11:39:36 2008 @@ -19,80 +19,43 @@ --> <project name="OFBiz - Security Extensions" default="jar" basedir="."> + <import file="../../common.xml"/> <!-- ================================================================== --> <!-- Initialization of all property settings --> <!-- ================================================================== --> - <target name="init"> - <property environment="env"/> - <property name="desc" value="Security Extensions Component"/> - <property name="name" value="ofbiz-securityext"/> - <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/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/webapp/lib" includes="*.jar"/> - <fileset dir="../../framework/webapp/build/lib" includes="*.jar"/> - <fileset dir="../../framework/common/build/lib" includes="*.jar"/> - <fileset dir="../party/build/lib" includes="*.jar"/> - <fileset dir="../product/build/lib" includes="*.jar"/> - <fileset dir="../order/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 Extensions Component"/> + <property name="name" value="ofbiz-securityext"/> + <property name="ofbiz.home.dir" value="../.."/> + + <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/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/webapp/lib" includes="*.jar"/> + <fileset dir="../../framework/webapp/build/lib" includes="*.jar"/> + <fileset dir="../../framework/common/build/lib" includes="*.jar"/> + <fileset dir="../party/build/lib" includes="*.jar"/> + <fileset dir="../product/build/lib" includes="*.jar"/> + <fileset dir="../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}"/> + <target name="classes" depends="prepare"> + <javac15 classpathref="local.class.path"> <!-- exclude the Truition; comment if you have libs --> <exclude name="org/ofbiz/securityext/thirdparty/truition/**"/> - </javac> + </javac15> <!-- also put the DTDs in the jar file... --> <copy todir="${build.dir}/classes"> <!--<fileset dir="${dtd.dir}" includes="*.dtd"/>--> @@ -105,15 +68,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.securityext.*" classpathref="local.class.path" destdir="${build.dir}/javadocs" @@ -121,6 +80,4 @@ <sourcepath path="${src.dir}"/> </javadoc> </target> - - <target name="all" depends="jar,docs"/> </project> Modified: ofbiz/trunk/applications/workeffort/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/build.xml?rev=672657&r1=672656&r2=672657&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/build.xml (original) +++ ofbiz/trunk/applications/workeffort/build.xml Sun Jun 29 11:39:36 2008 @@ -19,78 +19,40 @@ --> <project name="OFBiz - Work Effort Component" default="jar" basedir="."> + <import file="../../common.xml"/> <!-- ================================================================== --> <!-- Initialization of all property settings --> <!-- ================================================================== --> - <target name="init"> - <property environment="env"/> - <property name="desc" value="Work Effort Component"/> - <property name="name" value="ofbiz-workeffort"/> - <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/lib" includes="*.jar"/> - <fileset dir="../../framework/service/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="../content/build/lib" includes="*.jar"/> - <fileset dir="../party/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="Work Effort Component"/> + <property name="name" value="ofbiz-workeffort"/> + <property name="ofbiz.home.dir" value="../.."/> + + <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/lib" includes="*.jar"/> + <fileset dir="../../framework/service/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="../content/build/lib" includes="*.jar"/> + <fileset dir="../party/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, etc 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.workeffort.*" 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> Added: ofbiz/trunk/common.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/common.xml?rev=672657&view=auto ============================================================================== --- ofbiz/trunk/common.xml (added) +++ ofbiz/trunk/common.xml Sun Jun 29 11:39:36 2008 @@ -0,0 +1,60 @@ +<?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 name="Ant - Common"> + <dirname property="ofbiz.home.dir" file="${ant.file.Ant - Common}"/> + <import file="${ofbiz.home.dir}/macros.xml"/> + + <property environment="env"/> + <property name="src.dir" value="src"/> + <property name="dtd.dir" value="dtd"/> + <property name="lib.dir" value="lib"/> + <property name="build.dir" value="build"/> + + <!-- ================================================================== --> + <!-- Removes all created files and directories --> + <!-- ================================================================== --> + + <target name="clean" depends="clean-lib"> + <delete dir="${build.dir}"/> + </target> + + <target name="clean-lib"> + <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"> + <mkdir dir="${build.dir}/javadocs"/> + </target> + + <target name="jar" depends="classes"> + <jar jarfile="${build.dir}/lib/${name}.jar" basedir="${build.dir}/classes"/> + </target> + + <target name="all" depends="jar,docs"/> +</project> Modified: ofbiz/trunk/framework/appserver/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/appserver/build.xml?rev=672657&r1=672656&r2=672657&view=diff ============================================================================== --- ofbiz/trunk/framework/appserver/build.xml (original) +++ ofbiz/trunk/framework/appserver/build.xml Sun Jun 29 11:39:36 2008 @@ -19,68 +19,29 @@ --> <project name="OFBiz - AppServers" default="jar" basedir="."> + <import file="../../common.xml"/> <!-- ================================================================== --> <!-- Initialization of all property settings --> <!-- ================================================================== --> - <target name="init"> - <property environment="env"/> - <property name="desc" value="AppServers Component"/> - <property name="name" value="ofbiz-appsvrs"/> - <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/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="AppServers Component"/> + <property name="name" value="ofbiz-appsvrs"/> + <property name="ofbiz.home.dir" value="../.."/> + + <path id="local.class.path"> + <fileset dir="../base/lib" includes="*.jar"/> + <fileset dir="../base/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"> - <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"/>--> @@ -93,15 +54,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.appservers.*" classpathref="local.class.path" destdir="${build.dir}/javadocs" @@ -109,6 +66,4 @@ <sourcepath path="${src.dir}"/> </javadoc> </target> - - <target name="all" depends="jar,docs"/> </project> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |