Skip to content

Commit

Permalink
No longer *copy* the extra support files into the classes dir;
Browse files Browse the repository at this point in the history
instead, just add them straight to the final jar.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@685934 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
eigood committed Aug 14, 2008
1 parent 3c07f8e commit 7606cab
Show file tree
Hide file tree
Showing 40 changed files with 31 additions and 357 deletions.
10 changes: 0 additions & 10 deletions applications/accounting/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -63,16 +63,6 @@ under the License.
<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>

<!-- ================================================================== -->
Expand Down
9 changes: 0 additions & 9 deletions applications/content/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,6 @@ under the License.
<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>

<!-- ================================================================== -->
Expand Down
10 changes: 0 additions & 10 deletions applications/ecommerce/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -54,16 +54,6 @@ under the License.

<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>

<!-- ================================================================== -->
Expand Down
10 changes: 0 additions & 10 deletions applications/humanres/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,16 +49,6 @@ under the License.

<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>

<!-- ================================================================== -->
Expand Down
10 changes: 0 additions & 10 deletions applications/manufacturing/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -54,16 +54,6 @@ under the License.

<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>

<!-- ================================================================== -->
Expand Down
10 changes: 0 additions & 10 deletions applications/marketing/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -54,16 +54,6 @@ under the License.

<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>

<!-- ================================================================== -->
Expand Down
10 changes: 0 additions & 10 deletions applications/order/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,16 +60,6 @@ under the License.
<!-- 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>

<!-- ================================================================== -->
Expand Down
10 changes: 0 additions & 10 deletions applications/party/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,6 @@ under the License.

<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>

<!-- ================================================================== -->
Expand Down
10 changes: 0 additions & 10 deletions applications/product/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -67,16 +67,6 @@ under the License.
<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>

<!-- ================================================================== -->
Expand Down
10 changes: 0 additions & 10 deletions applications/securityext/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,6 @@ under the License.
<!-- 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>

<!-- ================================================================== -->
Expand Down
10 changes: 0 additions & 10 deletions applications/workeffort/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,6 @@ under the License.

<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>

<!-- ================================================================== -->
Expand Down
10 changes: 0 additions & 10 deletions framework/appserver/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,6 @@ under the License.

<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>

<!-- ================================================================== -->
Expand Down
22 changes: 13 additions & 9 deletions framework/base/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,16 +62,20 @@ under the License.
<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>

<!-- ================================================================== -->
Expand Down
8 changes: 0 additions & 8 deletions framework/bi/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,6 @@ under the License.

<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>

<!-- ================================================================== -->
Expand Down
10 changes: 0 additions & 10 deletions framework/catalina/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,6 @@ under the License.

<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>

<!-- ================================================================== -->
Expand Down
10 changes: 0 additions & 10 deletions framework/common/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,6 @@ under the License.

<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>

<!-- ================================================================== -->
Expand Down
9 changes: 0 additions & 9 deletions framework/datafile/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,6 @@ under the License.

<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>

<!-- ================================================================== -->
Expand Down
9 changes: 0 additions & 9 deletions framework/entity/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,6 @@ under the License.
<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>

<!-- ================================================================== -->
Expand Down
10 changes: 0 additions & 10 deletions framework/entityext/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,6 @@ under the License.

<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>

<!-- ================================================================== -->
Expand Down
9 changes: 0 additions & 9 deletions framework/example/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,6 @@ under the License.

<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>

<!-- ================================================================== -->
Expand Down
10 changes: 0 additions & 10 deletions framework/geronimo/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,6 @@ under the License.

<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>

<!-- ================================================================== -->
Expand Down
9 changes: 0 additions & 9 deletions framework/guiapp/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,6 @@ under the License.

<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>

<!-- ================================================================== -->
Expand Down
10 changes: 0 additions & 10 deletions framework/jetty/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,6 @@ under the License.

<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>

<!-- ================================================================== -->
Expand Down
Loading

0 comments on commit 7606cab

Please sign in to comment.