Author: nash
Date: Sun May 16 22:37:56 2010
New Revision: 944931
URL: http://svn.apache.org/viewvc?rev=944931&view=rev
Log:
Restore package-path setting previously removed under r931717 (TUSCANY-3412)
Modified:
tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/antdefs.xml
Modified: tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/antdefs.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/antdefs.xml?rev=944931&r1=944930&r2=944931&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/antdefs.xml
(original)
+++ tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/antdefs.xml Sun May
16 22:37:56 2010
@@ -65,6 +65,8 @@
"package" Creates a jar file containing the compiled Java class
files (excluding unit test code) and any files in or under the
resource directory, unless the jar file is already up to date.
+ If the build.xml file defines a path with id "package-path", this
+ path is used for the Class-Path manifest entry.
"clean" Deletes all the files produced by the build.
This file also defines the following targets for invocation by <antcall>
@@ -613,10 +615,39 @@
<!-- build a jar file if there are no files in the webapp directory -->
<target name="#package-jar" unless="#webapp">
+ <antcall target="#create-jar"/>
+ </target>
+
+ <!-- check whether a dependency path for the package target was specified
-->
+ <target name="#check-package-path">
+ <condition property="#package-path">
+ <isreference refid="package-path"/>
+ </condition>
+ </target>
+
+ <!-- create a jar file with a Class-Path attribute -->
+ <target name="#create-jar-path" if="#package-path">
+ <property name="#parentdir" location=".."/>
+ <pathconvert property="#package-classpath" refid="package-path"
pathsep=" " dirsep="/">
+ <map from="${#parentdir}" to=".."/>
+ </pathconvert>
+ <jar destfile="target/${ant.project.name}.jar" basedir="target/classes"
+ excludes="**/*.cbp">
+ <manifest>
+ <attribute name="Class-Path" value="${#package-classpath}"/>
+ </manifest>
+ </jar>
+ </target>
+
+ <!-- create a jar file without a Class-Path attribute -->
+ <target name="#create-jar-nopath" unless="#package-path">
<jar destfile="target/${ant.project.name}.jar" basedir="target/classes"
excludes="**/*.cbp"/>
</target>
+ <!-- create a jar file with or without a Class-Path attribute -->
+ <target name="#create-jar" depends="#check-package-path, #create-jar-path,
#create-jar-nopath"/>
+
<!-- build a packaged jar file or war file -->
<target name="#build-package" depends="#check-webapp, #package-war,
#package-jar"/>
