bloritsch 2003/01/21 05:30:50
Modified: fortress build.xml
fortress/examples ant.properties build.xml
Log:
remove the two third-party jars from fortress-complete
Revision Changes Path
1.65 +3 -4 jakarta-avalon-excalibur/fortress/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/build.xml,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- build.xml 5 Jan 2003 15:10:00 -0000 1.64
+++ build.xml 21 Jan 2003 13:30:50 -0000 1.65
@@ -72,8 +72,8 @@
</target>
<target name="big-jar" depends="jar,copy-optional-libs" description="Build the
big jar with all dependencies included">
- <copy file="${commons-collections.jar}" todir="${build.dir}/tempjars"/>
- <copy file="${util.concurrent.jar}" todir="${build.dir}/tempjars"/>
+ <!-- <copy file="${commons-collections.jar}" todir="${build.dir}/tempjars"/>
+ <copy file="${util.concurrent.jar}" todir="${build.dir}/tempjars"/> -->
<copy file="${excalibur-altrmi-registry.jar}" todir="${build.dir}/tempjars"/>
<copy file="${excalibur-altrmi-common.jar}" todir="${build.dir}/tempjars"/>
<copy file="${excalibur-altrmi-server-impl.jar}"
todir="${build.dir}/tempjars"/>
@@ -87,8 +87,7 @@
<copy file="${excalibur-event.jar}" todir="${build.dir}/tempjars"/>
<copy file="${excalibur-logger.jar}" todir="${build.dir}/tempjars"/>
<copy file="${excalibur-sourceresolve.jar}" todir="${build.dir}/tempjars"/>
- <copy file="${util.concurrent.jar}" todir="${build.dir}/tempjars"/>
-<!-- <copy file="${excalibur-container.jar}" todir="${build.dir}/tempjars"/>
-->
+ <copy file="${excalibur-container.jar}" todir="${build.dir}/tempjars"/>
<!-- <copy file="${excalibur-threadcontext.jar}"
todir="${build.dir}/tempjars"/> -->
<copy file="${excalibur-thread.jar}" todir="${build.dir}/tempjars"/>
<copy file="${build.lib}/${jar.name}" todir="${build.dir}/tempjars"/>
1.10 +5 -4 jakarta-avalon-excalibur/fortress/examples/ant.properties
Index: ant.properties
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/examples/ant.properties,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ant.properties 5 Jan 2003 14:01:04 -0000 1.9
+++ ant.properties 21 Jan 2003 13:30:50 -0000 1.10
@@ -18,10 +18,11 @@
excalibur-fortress.lib=${excalibur-fortress.home}
excalibur-fortress.jar=${excalibur-fortress.lib}/excalibur-fortress-complete-1.0.jar
-# ----- Excalibur Container, version 1.0 or later -----
-excalibur-container.home=${basepath}/../container
-excalibur-container.lib=${excalibur-container.home}/build/lib
-excalibur-container.jar=${excalibur-container.lib}/excalibur-container-1.0.jar
+# ----- External JARS, version 1.0 or later -----
+excalibur-event.home=${basepath}/../event
+excalibur-event.lib=${excalibur-event.home}/lib
+util.concurrent.jar=${excalibur-event.lib}/util.concurrent-1.3.1.jar
+commons-collections.jar=${excalibur-event.lib}/commons-collections-2.1.jar
# ----- Logkit -----
logkit.home=${basepath}/../../jakarta-avalon-logkit
1.13 +11 -5 jakarta-avalon-excalibur/fortress/examples/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/examples/build.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- build.xml 5 Jan 2003 14:01:04 -0000 1.12
+++ build.xml 21 Jan 2003 13:30:50 -0000 1.13
@@ -58,13 +58,19 @@
todir="${lib.dir}" preservelastmodified="yes"/>
<!-- Container jar -->
- <copy file="${excalibur-container.jar}"
+<!-- <copy file="${excalibur-container.jar}"
todir="${lib.dir}" preservelastmodified="yes"/>
-
+-->
<!-- xml-apis -->
<copy file="${xml-apis.jar}"
todir="${lib.dir}" preservelastmodified="yes"/>
+ <copy file="${commons-collections.jar}"
+ todir="${lib.dir}" preservelastmodified="yes"/>
+
+ <copy file="${util.concurrent.jar}"
+ todir="${lib.dir}" preservelastmodified="yes"/>
+
<!-- Xerces jar -->
<copy file="${xerces.jar}"
todir="${lib.dir}" preservelastmodified="yes"/>
@@ -197,7 +203,7 @@
includes="**/*.*">
<manifest>
<attribute name="Main-Class"
value="org.apache.excalibur.fortress.examples.viewer.Main"/>
- <attribute name="Class-Path" value="logkit.jar avalon-framework.jar
excalibur-fortress-complete-1.0.jar"/>
+ <attribute name="Class-Path" value="logkit.jar avalon-framework.jar
excalibur-fortress-complete-1.0.jar util.concurrent-1.3.1.jar
commons-collections-2.1.jar"/>
</manifest>
</jar>
@@ -206,7 +212,7 @@
includes="**/*.*">
<manifest>
<attribute name="Main-Class"
value="org.apache.excalibur.fortress.examples.swing.Main"/>
- <attribute name="Class-Path" value="logkit.jar avalon-framework.jar
excalibur-fortress-complete-1.0.jar"/>
+ <attribute name="Class-Path" value="logkit.jar avalon-framework.jar
excalibur-fortress-complete-1.0.jar util.concurrent-1.3.1.jar
commons-collections-2.1.jar"/>
</manifest>
</jar>
@@ -215,7 +221,7 @@
includes="**/*.*">
<manifest>
<attribute name="Main-Class"
value="org.apache.excalibur.fortress.examples.extended.Main"/>
- <attribute name="Class-Path" value="logkit.jar avalon-framework.jar
excalibur-fortress-complete-1.0.jar"/>
+ <attribute name="Class-Path" value="logkit.jar avalon-framework.jar
excalibur-fortress-complete-1.0.jar util.concurrent-1.3.1.jar
commons-collections-2.1.jar"/>
</manifest>
</jar>
</target>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
