diff options
Diffstat (limited to '')
| -rw-r--r-- | sca-java-1.x/trunk/tutorials/travelsample/antdefs.xml | 33 |
1 files changed, 9 insertions, 24 deletions
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/antdefs.xml b/sca-java-1.x/trunk/tutorials/travelsample/antdefs.xml index 004e777ab1..6f98e87885 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/antdefs.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/antdefs.xml @@ -65,7 +65,7 @@ "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
+ If the build.xml file defines a property named "package-path", this
path is used for the Class-Path manifest entry.
"clean" Deletes all the files produced by the build.
@@ -613,43 +613,28 @@ </war>
</target>
- <!-- 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>
+ <target name="#package-jar-path" unless="#webapp" if="package-path">
<jar destfile="target/${ant.project.name}.jar" basedir="target/classes"
excludes="**/*.cbp">
<manifest>
- <attribute name="Class-Path" value="${#package-classpath}"/>
+ <attribute name="Class-Path" value="${package-path}"/>
</manifest>
</jar>
</target>
+ <target name="#not-package-path" unless="package-path">
+ <property name="#no-package-path" value=""/>
+ </target>
+
<!-- create a jar file without a Class-Path attribute -->
- <target name="#create-jar-nopath" unless="#package-path">
+ <target name="#package-jar-nopath" unless="#webapp" if="#no-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"/>
+ <target name="#build-package" depends="#check-webapp, #package-war, #package-jar-path, #not-package-path, #package-jar-nopath"/>
<!-- If running from a downloaded distribution, the OpenEJB jars are in lib/openejb -->
<target name="#lib-openejb">
|