Author: doogie
Date: Thu Aug 14 08:08:14 2008 New Revision: 685934 URL: http://svn.apache.org/viewvc?rev=685934&view=rev Log: No longer *copy* the extra support files into the classes dir; instead, just add them straight to the final jar. Modified: ofbiz/trunk/applications/accounting/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/bi/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/start/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/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=685934&r1=685933&r2=685934&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/build.xml (original) +++ ofbiz/trunk/applications/accounting/build.xml Thu Aug 14 08:08:14 2008 @@ -63,16 +63,6 @@ <exclude name="org/ofbiz/accounting/thirdparty/cybersource/**"/> <exclude name="org/ofbiz/accounting/thirdparty/worldpay/**"/> </javac15> - <!-- also put the DTDs in the jar file... --> - <copy todir="${build.dir}/classes"> - <!--<fileset dir="${dtd.dir}" includes="*.dtd"/>--> - <fileset dir="${src.dir}" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/> - </copy> - - <!-- now add the NOTICE and LICENSE files to allow the jar file to be distributed alone --> - <copy todir="${build.dir}/classes/META-INF"> - <fileset dir="${ofbiz.home.dir}" includes="NOTICE,LICENSE"/> - </copy> </target> <!-- ================================================================== --> Modified: ofbiz/trunk/applications/content/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/build.xml?rev=685934&r1=685933&r2=685934&view=diff ============================================================================== --- ofbiz/trunk/applications/content/build.xml (original) +++ ofbiz/trunk/applications/content/build.xml Thu Aug 14 08:08:14 2008 @@ -58,15 +58,6 @@ <exclude name="org/ofbiz/content/report/JRMapCollectionDataSource.java"/> <exclude name="org/ofbiz/content/openoffice/*.java"/> </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"/> - </copy> - - <!-- now add the NOTICE and LICENSE files to allow the jar file to be distributed alone --> - <copy todir="${build.dir}/classes/META-INF"> - <fileset dir="${ofbiz.home.dir}" includes="NOTICE,LICENSE"/> - </copy> </target> <!-- ================================================================== --> Modified: ofbiz/trunk/applications/ecommerce/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/build.xml?rev=685934&r1=685933&r2=685934&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/build.xml (original) +++ ofbiz/trunk/applications/ecommerce/build.xml Thu Aug 14 08:08:14 2008 @@ -54,16 +54,6 @@ <target name="classes" depends="prepare"> <javac15/> - <!-- also put the DTDs in the jar file... --> - <copy todir="${build.dir}/classes"> - <!--<fileset dir="${dtd.dir}" includes="*.dtd"/>--> - <fileset dir="${src.dir}" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/> - </copy> - - <!-- now add the NOTICE and LICENSE files to allow the jar file to be distributed alone --> - <copy todir="${build.dir}/classes/META-INF"> - <fileset dir="${ofbiz.home.dir}" includes="NOTICE,LICENSE"/> - </copy> </target> <!-- ================================================================== --> Modified: ofbiz/trunk/applications/humanres/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/build.xml?rev=685934&r1=685933&r2=685934&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/build.xml (original) +++ ofbiz/trunk/applications/humanres/build.xml Thu Aug 14 08:08:14 2008 @@ -49,16 +49,6 @@ <target name="classes" depends="prepare"> <javac15/> - <!-- also put the DTDs in the jar file... --> - <copy todir="${build.dir}/classes"> - <!--<fileset dir="${dtd.dir}" includes="*.dtd"/>--> - <fileset dir="${src.dir}" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/> - </copy> - - <!-- now add the NOTICE and LICENSE files to allow the jar file to be distributed alone --> - <copy todir="${build.dir}/classes/META-INF"> - <fileset dir="${ofbiz.home.dir}" includes="NOTICE,LICENSE"/> - </copy> </target> <!-- ================================================================== --> Modified: ofbiz/trunk/applications/manufacturing/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/build.xml?rev=685934&r1=685933&r2=685934&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/build.xml (original) +++ ofbiz/trunk/applications/manufacturing/build.xml Thu Aug 14 08:08:14 2008 @@ -54,16 +54,6 @@ <target name="classes" depends="prepare"> <javac15/> - <!-- also put the DTDs in the jar file... --> - <copy todir="${build.dir}/classes"> - <!--<fileset dir="${dtd.dir}" includes="*.dtd"/>--> - <fileset dir="${src.dir}" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/> - </copy> - - <!-- now add the NOTICE and LICENSE files to allow the jar file to be distributed alone --> - <copy todir="${build.dir}/classes/META-INF"> - <fileset dir="${ofbiz.home.dir}" includes="NOTICE,LICENSE"/> - </copy> </target> <!-- ================================================================== --> Modified: ofbiz/trunk/applications/marketing/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/build.xml?rev=685934&r1=685933&r2=685934&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/build.xml (original) +++ ofbiz/trunk/applications/marketing/build.xml Thu Aug 14 08:08:14 2008 @@ -54,16 +54,6 @@ <target name="classes" depends="prepare"> <javac15/> - <!-- also put the DTDs in the jar file... --> - <copy todir="${build.dir}/classes"> - <!--<fileset dir="${dtd.dir}" includes="*.dtd"/>--> - <fileset dir="${src.dir}" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/> - </copy> - - <!-- now add the NOTICE and LICENSE files to allow the jar file to be distributed alone --> - <copy todir="${build.dir}/classes/META-INF"> - <fileset dir="${ofbiz.home.dir}" includes="NOTICE,LICENSE"/> - </copy> </target> <!-- ================================================================== --> Modified: ofbiz/trunk/applications/order/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/build.xml?rev=685934&r1=685933&r2=685934&view=diff ============================================================================== --- ofbiz/trunk/applications/order/build.xml (original) +++ ofbiz/trunk/applications/order/build.xml Thu Aug 14 08:08:14 2008 @@ -60,16 +60,6 @@ <!-- exclude the payment processor packages; comment if you have libs --> <exclude name="org/ofbiz/order/thirdparty/taxware/**"/> </javac15> - <!-- also put the DTDs in the jar file... --> - <copy todir="${build.dir}/classes"> - <!--<fileset dir="${dtd.dir}" includes="*.dtd"/>--> - <fileset dir="${src.dir}" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/> - </copy> - - <!-- now add the NOTICE and LICENSE files to allow the jar file to be distributed alone --> - <copy todir="${build.dir}/classes/META-INF"> - <fileset dir="${ofbiz.home.dir}" includes="NOTICE,LICENSE"/> - </copy> </target> <!-- ================================================================== --> Modified: ofbiz/trunk/applications/party/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/build.xml?rev=685934&r1=685933&r2=685934&view=diff ============================================================================== --- ofbiz/trunk/applications/party/build.xml (original) +++ ofbiz/trunk/applications/party/build.xml Thu Aug 14 08:08:14 2008 @@ -50,16 +50,6 @@ <target name="classes" depends="prepare"> <javac15/> - <!-- also put the DTDs in the jar file... --> - <copy todir="${build.dir}/classes"> - <!--<fileset dir="${dtd.dir}" includes="*.dtd"/>--> - <fileset dir="${src.dir}" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/> - </copy> - - <!-- now add the NOTICE and LICENSE files to allow the jar file to be distributed alone --> - <copy todir="${build.dir}/classes/META-INF"> - <fileset dir="${ofbiz.home.dir}" includes="NOTICE,LICENSE"/> - </copy> </target> <!-- ================================================================== --> Modified: ofbiz/trunk/applications/product/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/build.xml?rev=685934&r1=685933&r2=685934&view=diff ============================================================================== --- ofbiz/trunk/applications/product/build.xml (original) +++ ofbiz/trunk/applications/product/build.xml Thu Aug 14 08:08:14 2008 @@ -67,16 +67,6 @@ <javac15> <exclude name="${noapplet}"/> </javac15> - <!-- also put the DTDs in the jar file... --> - <copy todir="${build.dir}/classes"> - <!--<fileset dir="${dtd.dir}" includes="*.dtd"/>--> - <fileset dir="${src.dir}" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/> - </copy> - - <!-- now add the NOTICE and LICENSE files to allow the jar file to be distributed alone --> - <copy todir="${build.dir}/classes/META-INF"> - <fileset dir="${ofbiz.home.dir}" includes="NOTICE,LICENSE"/> - </copy> </target> <!-- ================================================================== --> Modified: ofbiz/trunk/applications/securityext/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/securityext/build.xml?rev=685934&r1=685933&r2=685934&view=diff ============================================================================== --- ofbiz/trunk/applications/securityext/build.xml (original) +++ ofbiz/trunk/applications/securityext/build.xml Thu Aug 14 08:08:14 2008 @@ -56,16 +56,6 @@ <!-- exclude the Truition; comment if you have libs --> <exclude name="org/ofbiz/securityext/thirdparty/truition/**"/> </javac15> - <!-- also put the DTDs in the jar file... --> - <copy todir="${build.dir}/classes"> - <!--<fileset dir="${dtd.dir}" includes="*.dtd"/>--> - <fileset dir="${src.dir}" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/> - </copy> - - <!-- now add the NOTICE and LICENSE files to allow the jar file to be distributed alone --> - <copy todir="${build.dir}/classes/META-INF"> - <fileset dir="${ofbiz.home.dir}" includes="NOTICE,LICENSE"/> - </copy> </target> <!-- ================================================================== --> Modified: ofbiz/trunk/applications/workeffort/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/build.xml?rev=685934&r1=685933&r2=685934&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/build.xml (original) +++ ofbiz/trunk/applications/workeffort/build.xml Thu Aug 14 08:08:14 2008 @@ -53,16 +53,6 @@ <target name="classes" depends="prepare"> <javac15/> - <!-- also put the DTDs, etc in the jar file... --> - <copy todir="${build.dir}/classes"> - <!--<fileset dir="${dtd.dir}" includes="*.dtd"/>--> - <fileset dir="${src.dir}" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/> - </copy> - - <!-- now add the NOTICE and LICENSE files to allow the jar file to be distributed alone --> - <copy todir="${build.dir}/classes/META-INF"> - <fileset dir="${ofbiz.home.dir}" includes="NOTICE,LICENSE"/> - </copy> </target> <!-- ================================================================== --> Modified: ofbiz/trunk/framework/appserver/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/appserver/build.xml?rev=685934&r1=685933&r2=685934&view=diff ============================================================================== --- ofbiz/trunk/framework/appserver/build.xml (original) +++ ofbiz/trunk/framework/appserver/build.xml Thu Aug 14 08:08:14 2008 @@ -43,16 +43,6 @@ <target name="classes" depends="prepare"> <javac15/> - <!-- also put the DTDs in the jar file... --> - <copy todir="${build.dir}/classes"> - <!--<fileset dir="${dtd.dir}" includes="*.dtd"/>--> - <fileset dir="${src.dir}" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/> - </copy> - - <!-- now add the NOTICE and LICENSE files to allow the jar file to be distributed alone --> - <copy todir="${build.dir}/classes/META-INF"> - <fileset dir="${ofbiz.home.dir}" includes="NOTICE,LICENSE"/> - </copy> </target> <!-- ================================================================== --> Modified: ofbiz/trunk/framework/base/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/build.xml?rev=685934&r1=685933&r2=685934&view=diff ============================================================================== --- ofbiz/trunk/framework/base/build.xml (original) +++ ofbiz/trunk/framework/base/build.xml Thu Aug 14 08:08:14 2008 @@ -62,16 +62,20 @@ <exclude name="${exclude.crypto}"/> <exclude name="org/ofbiz/base/util/OfbizJsBsfEngine.java"/> </javac15> - <!-- also put the DTDs in the jar file... --> - <copy todir="${build.dir}/classes"> + </target> + + <target name="jar" depends="classes"> + <jar jarfile="${build.dir}/lib/${name}.jar"> + <fileset dir="${build.dir}/classes"/> + <fileset dir="${src.dir}"> + <include name="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/> + <include name="META-INF/**"/> + </fileset> + <!-- also put the DTDs in the jar file... --> <fileset dir="${dtd.dir}" includes="*.dtd"/> - <fileset dir="${src.dir}" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/> - </copy> - - <!-- now add the NOTICE and LICENSE files to allow the jar file to be distributed alone --> - <copy todir="${build.dir}/classes/META-INF"> - <fileset dir="${ofbiz.home.dir}" includes="NOTICE,LICENSE"/> - </copy> + <!-- now add the NOTICE and LICENSE files to allow the jar file to be distributed alone --> + <zipfileset dir="${ofbiz.home.dir}" prefix="META-INF" includes="NOTICE,LICENSE"/> + </jar> </target> <!-- ================================================================== --> Modified: ofbiz/trunk/framework/bi/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/bi/build.xml?rev=685934&r1=685933&r2=685934&view=diff ============================================================================== --- ofbiz/trunk/framework/bi/build.xml (original) +++ ofbiz/trunk/framework/bi/build.xml Thu Aug 14 08:08:14 2008 @@ -47,14 +47,6 @@ <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> - - <!-- now add the NOTICE and LICENSE files to allow the jar file to be distributed alone --> - <copy todir="${build.dir}/classes/META-INF"> - <fileset dir="${ofbiz.home.dir}" includes="NOTICE,LICENSE"/> - </copy> </target> <!-- ================================================================== --> Modified: ofbiz/trunk/framework/catalina/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/build.xml?rev=685934&r1=685933&r2=685934&view=diff ============================================================================== --- ofbiz/trunk/framework/catalina/build.xml (original) +++ ofbiz/trunk/framework/catalina/build.xml Thu Aug 14 08:08:14 2008 @@ -45,16 +45,6 @@ <target name="classes" depends="prepare"> <javac15/> - <!-- also put the DTDs in the jar file... --> - <copy todir="${build.dir}/classes"> - <!--<fileset dir="${dtd.dir}" includes="*.dtd"/>--> - <fileset dir="${src.dir}" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/> - </copy> - - <!-- now add the NOTICE and LICENSE files to allow the jar file to be distributed alone --> - <copy todir="${build.dir}/classes/META-INF"> - <fileset dir="${ofbiz.home.dir}" includes="NOTICE,LICENSE"/> - </copy> </target> <!-- ================================================================== --> Modified: ofbiz/trunk/framework/common/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/build.xml?rev=685934&r1=685933&r2=685934&view=diff ============================================================================== --- ofbiz/trunk/framework/common/build.xml (original) +++ ofbiz/trunk/framework/common/build.xml Thu Aug 14 08:08:14 2008 @@ -48,16 +48,6 @@ <target name="classes" depends="prepare"> <javac15/> - <!-- also put the DTDs in the jar file... --> - <copy todir="${build.dir}/classes"> - <!--<fileset dir="${dtd.dir}" includes="*.dtd"/>--> - <fileset dir="${src.dir}" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/> - </copy> - - <!-- now add the NOTICE and LICENSE files to allow the jar file to be distributed alone --> - <copy todir="${build.dir}/classes/META-INF"> - <fileset dir="${ofbiz.home.dir}" includes="NOTICE,LICENSE"/> - </copy> </target> <!-- ================================================================== --> Modified: ofbiz/trunk/framework/datafile/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/datafile/build.xml?rev=685934&r1=685933&r2=685934&view=diff ============================================================================== --- ofbiz/trunk/framework/datafile/build.xml (original) +++ ofbiz/trunk/framework/datafile/build.xml Thu Aug 14 08:08:14 2008 @@ -47,15 +47,6 @@ <target name="classes" depends="prepare"> <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"/> - </copy> - - <!-- now add the NOTICE and LICENSE files to allow the jar file to be distributed alone --> - <copy todir="${build.dir}/classes/META-INF"> - <fileset dir="${ofbiz.home.dir}" includes="NOTICE,LICENSE"/> - </copy> </target> <!-- ================================================================== --> Modified: ofbiz/trunk/framework/entity/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/build.xml?rev=685934&r1=685933&r2=685934&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/build.xml (original) +++ ofbiz/trunk/framework/entity/build.xml Thu Aug 14 08:08:14 2008 @@ -48,15 +48,6 @@ <exclude name="org/ofbiz/entity/connection/XaPoolConnectionFactory.java"/> <exclude name="org/ofbiz/entity/connection/TyrexConnectionFactory.java"/> </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"/> - </copy> - - <!-- now add the NOTICE and LICENSE files to allow the jar file to be distributed alone --> - <copy todir="${build.dir}/classes/META-INF"> - <fileset dir="${ofbiz.home.dir}" includes="NOTICE,LICENSE"/> - </copy> </target> <!-- ================================================================== --> Modified: ofbiz/trunk/framework/entityext/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/build.xml?rev=685934&r1=685933&r2=685934&view=diff ============================================================================== --- ofbiz/trunk/framework/entityext/build.xml (original) +++ ofbiz/trunk/framework/entityext/build.xml Thu Aug 14 08:08:14 2008 @@ -46,16 +46,6 @@ <target name="classes" depends="prepare"> <javac15/> - <!-- also put the DTDs in the jar file... --> - <copy todir="${build.dir}/classes"> - <!--<fileset dir="${dtd.dir}" includes="*.dtd"/>--> - <fileset dir="${src.dir}" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/> - </copy> - - <!-- now add the NOTICE and LICENSE files to allow the jar file to be distributed alone --> - <copy todir="${build.dir}/classes/META-INF"> - <fileset dir="${ofbiz.home.dir}" includes="NOTICE,LICENSE"/> - </copy> </target> <!-- ================================================================== --> Modified: ofbiz/trunk/framework/example/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/build.xml?rev=685934&r1=685933&r2=685934&view=diff ============================================================================== --- ofbiz/trunk/framework/example/build.xml (original) +++ ofbiz/trunk/framework/example/build.xml Thu Aug 14 08:08:14 2008 @@ -55,15 +55,6 @@ <target name="classes" depends="prepare"> <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"/> - </copy> - - <!-- now add the NOTICE and LICENSE files to allow the jar file to be distributed alone --> - <copy todir="${build.dir}/classes/META-INF"> - <fileset dir="${ofbiz.home.dir}" includes="NOTICE,LICENSE"/> - </copy> </target> <!-- ================================================================== --> Modified: ofbiz/trunk/framework/geronimo/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/geronimo/build.xml?rev=685934&r1=685933&r2=685934&view=diff ============================================================================== --- ofbiz/trunk/framework/geronimo/build.xml (original) +++ ofbiz/trunk/framework/geronimo/build.xml Thu Aug 14 08:08:14 2008 @@ -44,16 +44,6 @@ <target name="classes" depends="prepare"> <javac15/> - <!-- also put the DTDs in the jar file... --> - <copy todir="${build.dir}/classes"> - <!--<fileset dir="${dtd.dir}" includes="*.dtd"/>--> - <fileset dir="${src.dir}" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/> - </copy> - - <!-- now add the NOTICE and LICENSE files to allow the jar file to be distributed alone --> - <copy todir="${build.dir}/classes/META-INF"> - <fileset dir="${ofbiz.home.dir}" includes="NOTICE,LICENSE"/> - </copy> </target> <!-- ================================================================== --> Modified: ofbiz/trunk/framework/guiapp/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/guiapp/build.xml?rev=685934&r1=685933&r2=685934&view=diff ============================================================================== --- ofbiz/trunk/framework/guiapp/build.xml (original) +++ ofbiz/trunk/framework/guiapp/build.xml Thu Aug 14 08:08:14 2008 @@ -54,15 +54,6 @@ <target name="classes" depends="prepare"> <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"/> - </copy> - - <!-- now add the NOTICE and LICENSE files to allow the jar file to be distributed alone --> - <copy todir="${build.dir}/classes/META-INF"> - <fileset dir="${ofbiz.home.dir}" includes="NOTICE,LICENSE"/> - </copy> </target> <!-- ================================================================== --> Modified: ofbiz/trunk/framework/jetty/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/jetty/build.xml?rev=685934&r1=685933&r2=685934&view=diff ============================================================================== --- ofbiz/trunk/framework/jetty/build.xml (original) +++ ofbiz/trunk/framework/jetty/build.xml Thu Aug 14 08:08:14 2008 @@ -44,16 +44,6 @@ <target name="classes" depends="prepare"> <javac15/> - <!-- also put the DTDs in the jar file... --> - <copy todir="${build.dir}/classes"> - <!--<fileset dir="${dtd.dir}" includes="*.dtd"/>--> - <fileset dir="${src.dir}" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/> - </copy> - - <!-- now add the NOTICE and LICENSE files to allow the jar file to be distributed alone --> - <copy todir="${build.dir}/classes/META-INF"> - <fileset dir="${ofbiz.home.dir}" includes="NOTICE,LICENSE"/> - </copy> </target> <!-- ================================================================== --> Modified: ofbiz/trunk/framework/minilang/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/build.xml?rev=685934&r1=685933&r2=685934&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/build.xml (original) +++ ofbiz/trunk/framework/minilang/build.xml Thu Aug 14 08:08:14 2008 @@ -47,16 +47,6 @@ <target name="classes" depends="prepare"> <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"/> - </copy> - - <!-- now add the NOTICE and LICENSE files to allow the jar file to be distributed alone --> - <copy todir="${build.dir}/classes/META-INF"> - <fileset dir="${ofbiz.home.dir}" includes="NOTICE,LICENSE"/> - <fileset dir="src/META-INF" includes="**"/> - </copy> </target> <!-- ================================================================== --> Modified: ofbiz/trunk/framework/security/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/security/build.xml?rev=685934&r1=685933&r2=685934&view=diff ============================================================================== --- ofbiz/trunk/framework/security/build.xml (original) +++ ofbiz/trunk/framework/security/build.xml Thu Aug 14 08:08:14 2008 @@ -44,15 +44,6 @@ <target name="classes" depends="prepare"> <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"/> - </copy> - - <!-- now add the NOTICE and LICENSE files to allow the jar file to be distributed alone --> - <copy todir="${build.dir}/classes/META-INF"> - <fileset dir="${ofbiz.home.dir}" includes="NOTICE,LICENSE"/> - </copy> </target> <!-- ================================================================== --> Modified: ofbiz/trunk/framework/service/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/build.xml?rev=685934&r1=685933&r2=685934&view=diff ============================================================================== --- ofbiz/trunk/framework/service/build.xml (original) +++ ofbiz/trunk/framework/service/build.xml Thu Aug 14 08:08:14 2008 @@ -47,15 +47,6 @@ <target name="classes" depends="prepare"> <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"/> - </copy> - - <!-- now add the NOTICE and LICENSE files to allow the jar file to be distributed alone --> - <copy todir="${build.dir}/classes/META-INF"> - <fileset dir="${ofbiz.home.dir}" includes="NOTICE,LICENSE"/> - </copy> </target> <target name="stubs" depends="classes"> @@ -67,7 +58,15 @@ </target> <target name="main-jar" depends="stubs"> - <jar jarfile="${build.dir}/lib/${name}.jar" basedir="${build.dir}/classes"/> + <jar jarfile="${build.dir}/lib/${name}.jar"> + <fileset dir="${build.dir}/classes"/> + <fileset dir="${src.dir}"> + <include name="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/> + <include name="META-INF/**"/> + </fileset> + <!-- now add the NOTICE and LICENSE files to allow the jar file to be distributed alone --> + <zipfileset dir="${ofbiz.home.dir}" prefix="META-INF" includes="NOTICE,LICENSE"/> + </jar> </target> <target name="rmi-jar" depends="stubs"> Modified: ofbiz/trunk/framework/start/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/start/build.xml?rev=685934&r1=685933&r2=685934&view=diff ============================================================================== --- ofbiz/trunk/framework/start/build.xml (original) +++ ofbiz/trunk/framework/start/build.xml Thu Aug 14 08:08:14 2008 @@ -43,18 +43,18 @@ <target name="classes" depends="prepare"> <!-- compile start --> <javac15 destdir="${build.dir}/classes" srcdir="${src.dir}"/> - <copy todir="${build.dir}/classes"> - <fileset dir="${src.dir}" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/> - </copy> - - <!-- now add the NOTICE and LICENSE files to allow the jar file to be distributed alone --> - <copy todir="${build.dir}/classes/start/META-INF"> - <fileset dir="${ofbiz.home.dir}" includes="NOTICE,LICENSE"/> - </copy> </target> <target name="jar" depends="classes"> - <jar jarfile="${build.dir}/lib/ofbiz.jar" basedir="${build.dir}/classes" manifest="${src.dir}/org/ofbiz/base/start/Start.mf"/> + <jar jarfile="${build.dir}/lib/ofbiz.jar" manifest="${src.dir}/org/ofbiz/base/start/Start.mf"> + <fileset dir="${build.dir}/classes"/> + <fileset dir="${src.dir}"> + <include name="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/> + <include name="META-INF/**"/> + </fileset> + <!-- now add the NOTICE and LICENSE files to allow the jar file to be distributed alone --> + <zipfileset dir="${ofbiz.home.dir}" prefix="META-INF" includes="NOTICE,LICENSE"/> + </jar> <!-- copy the ofbiz.jar file --> <copy todir="${basedir}/../.."> <fileset dir="${build.dir}/lib" includes="ofbiz.jar"/> Modified: ofbiz/trunk/framework/testtools/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/testtools/build.xml?rev=685934&r1=685933&r2=685934&view=diff ============================================================================== --- ofbiz/trunk/framework/testtools/build.xml (original) +++ ofbiz/trunk/framework/testtools/build.xml Thu Aug 14 08:08:14 2008 @@ -47,15 +47,6 @@ <target name="classes" depends="prepare"> <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"/> - </copy> - - <!-- now add the NOTICE and LICENSE files to allow the jar file to be distributed alone --> - <copy todir="${build.dir}/classes/META-INF"> - <fileset dir="${ofbiz.home.dir}" includes="NOTICE,LICENSE"/> - </copy> </target> <!-- ================================================================== --> Modified: ofbiz/trunk/framework/webapp/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/build.xml?rev=685934&r1=685933&r2=685934&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/build.xml (original) +++ ofbiz/trunk/framework/webapp/build.xml Thu Aug 14 08:08:14 2008 @@ -65,15 +65,6 @@ <exclude name="org/ofbiz/webapp/ftl/FreeMarkerViewRenderer.java"/> <exclude name="org/ofbiz/webapp/ftl/JpCacheIncludeTransform.java"/> </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"/> - </copy> - - <!-- now add the NOTICE and LICENSE files to allow the jar file to be distributed alone --> - <copy todir="${build.dir}/classes/META-INF"> - <fileset dir="${ofbiz.home.dir}" includes="NOTICE,LICENSE"/> - </copy> </target> <!-- ================================================================== --> Modified: ofbiz/trunk/framework/webtools/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/build.xml?rev=685934&r1=685933&r2=685934&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/build.xml (original) +++ ofbiz/trunk/framework/webtools/build.xml Thu Aug 14 08:08:14 2008 @@ -53,16 +53,6 @@ <target name="classes" depends="prepare"> <javac15/> - <!-- also put the DTDs in the jar file... --> - <copy todir="${build.dir}/classes"> - <!--<fileset dir="${dtd.dir}" includes="*.dtd"/>--> - <fileset dir="${src.dir}" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/> - </copy> - - <!-- now add the NOTICE and LICENSE files to allow the jar file to be distributed alone --> - <copy todir="${build.dir}/classes/META-INF"> - <fileset dir="${ofbiz.home.dir}" includes="NOTICE,LICENSE"/> - </copy> </target> <!-- ================================================================== --> Modified: ofbiz/trunk/framework/widget/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/build.xml?rev=685934&r1=685933&r2=685934&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/build.xml (original) +++ ofbiz/trunk/framework/widget/build.xml Thu Aug 14 08:08:14 2008 @@ -52,15 +52,6 @@ <target name="classes" depends="prepare"> <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"/> - </copy> - - <!-- now add the NOTICE and LICENSE files to allow the jar file to be distributed alone --> - <copy todir="${build.dir}/classes/META-INF"> - <fileset dir="${ofbiz.home.dir}" includes="NOTICE,LICENSE"/> - </copy> </target> <!-- ================================================================== --> Modified: ofbiz/trunk/specialpurpose/assetmaint/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/build.xml?rev=685934&r1=685933&r2=685934&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/build.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/build.xml Thu Aug 14 08:08:14 2008 @@ -51,9 +51,6 @@ <target name="classes" depends="prepare"> <javac15/> - <copy todir="${build.dir}/classes"> - <fileset dir="${src.dir}" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/> - </copy> </target> <!-- ================================================================== --> Modified: ofbiz/trunk/specialpurpose/ebay/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/build.xml?rev=685934&r1=685933&r2=685934&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/build.xml (original) +++ ofbiz/trunk/specialpurpose/ebay/build.xml Thu Aug 14 08:08:14 2008 @@ -53,9 +53,6 @@ <target name="classes" depends="prepare"> <javac15/> - <copy todir="${build.dir}/classes"> - <fileset dir="${src.dir}" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/> - </copy> </target> <!-- ================================================================== --> Modified: ofbiz/trunk/specialpurpose/googlebase/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/build.xml?rev=685934&r1=685933&r2=685934&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/googlebase/build.xml (original) +++ ofbiz/trunk/specialpurpose/googlebase/build.xml Thu Aug 14 08:08:14 2008 @@ -51,9 +51,6 @@ <target name="classes" depends="prepare"> <javac15/> - <copy todir="${build.dir}/classes"> - <fileset dir="${src.dir}" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/> - </copy> </target> <!-- ================================================================== --> Modified: ofbiz/trunk/specialpurpose/hhfacility/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/build.xml?rev=685934&r1=685933&r2=685934&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/hhfacility/build.xml (original) +++ ofbiz/trunk/specialpurpose/hhfacility/build.xml Thu Aug 14 08:08:14 2008 @@ -53,14 +53,6 @@ <target name="classes" depends="prepare"> <javac15/> - <copy todir="${build.dir}/classes"> - <fileset dir="${src.dir}" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/> - </copy> - - <!-- now add the NOTICE and LICENSE files to allow the jar file to be distributed alone --> - <copy todir="${build.dir}/classes/META-INF"> - <fileset dir="${ofbiz.home.dir}" includes="NOTICE,LICENSE"/> - </copy> </target> <!-- ================================================================== --> Modified: ofbiz/trunk/specialpurpose/oagis/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/build.xml?rev=685934&r1=685933&r2=685934&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/oagis/build.xml (original) +++ ofbiz/trunk/specialpurpose/oagis/build.xml Thu Aug 14 08:08:14 2008 @@ -55,14 +55,6 @@ <target name="classes" depends="prepare"> <javac15/> - <copy todir="${build.dir}/classes"> - <fileset dir="${src.dir}" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/> - </copy> - - <!-- now add the NOTICE and LICENSE files to allow the jar file to be distributed alone --> - <copy todir="${build.dir}/classes/META-INF"> - <fileset dir="${ofbiz.home.dir}" includes="NOTICE,LICENSE"/> - </copy> </target> <!-- ================================================================== --> Modified: ofbiz/trunk/specialpurpose/pos/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/build.xml?rev=685934&r1=685933&r2=685934&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/build.xml (original) +++ ofbiz/trunk/specialpurpose/pos/build.xml Thu Aug 14 08:08:14 2008 @@ -55,14 +55,6 @@ <target name="classes" depends="prepare"> <javac15/> - <copy todir="${build.dir}/classes"> - <fileset dir="${src.dir}" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/> - </copy> - - <!-- now add the NOTICE and LICENSE files to allow the jar file to be distributed alone --> - <copy todir="${build.dir}/classes/META-INF"> - <fileset dir="${ofbiz.home.dir}" includes="NOTICE,LICENSE"/> - </copy> </target> <!-- ================================================================== --> Modified: ofbiz/trunk/specialpurpose/projectmgr/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/build.xml?rev=685934&r1=685933&r2=685934&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/build.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/build.xml Thu Aug 14 08:08:14 2008 @@ -53,14 +53,6 @@ <target name="classes" depends="prepare"> <javac15/> - <copy todir="${build.dir}/classes"> - <fileset dir="${src.dir}" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/> - </copy> - - <!-- now add the NOTICE and LICENSE files to allow the jar file to be distributed alone --> - <copy todir="${build.dir}/classes/META-INF"> - <fileset dir="${ofbiz.home.dir}" includes="NOTICE,LICENSE"/> - </copy> </target> <!-- ================================================================== --> Modified: ofbiz/trunk/specialpurpose/shark/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/build.xml?rev=685934&r1=685933&r2=685934&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/shark/build.xml (original) +++ ofbiz/trunk/specialpurpose/shark/build.xml Thu Aug 14 08:08:14 2008 @@ -53,16 +53,6 @@ <src path="${src.dir}"/> <exclude name="org/ofbiz/shark/SharkGuiContainer.java"/> </javac15> - <!-- also put the DTDs in the jar file... --> - <copy todir="${build.dir}/classes"> - <!--<fileset dir="${dtd.dir}" includes="*.dtd"/>--> - <fileset dir="${src.dir}" includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/> - </copy> - - <!-- now add the NOTICE and LICENSE files to allow the jar file to be distributed alone --> - <copy todir="${build.dir}/classes/META-INF"> - <fileset dir="${ofbiz.home.dir}" includes="NOTICE,LICENSE"/> - </copy> </target> <!-- ================================================================== --> Modified: ofbiz/trunk/specialpurpose/workflow/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/build.xml?rev=685934&r1=685933&r2=685934&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/workflow/build.xml (original) +++ ofbiz/trunk/specialpurpose/workflow/build.xml Thu Aug 14 08:08:14 2008 @@ -46,15 +46,6 @@ <target name="classes" depends="prepare"> <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"/> - </copy> - - <!-- now add the NOTICE and LICENSE files to allow the jar file to be distributed alone --> - <copy todir="${build.dir}/classes/META-INF"> - <fileset dir="${ofbiz.home.dir}" includes="NOTICE,LICENSE"/> - </copy> </target> <!-- ================================================================== --> |
Free forum by Nabble | Edit this page |