You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by bl...@apache.org on 2002/08/08 15:23:22 UTC
cvs commit: jakarta-avalon-excalibur/fortress build.xml default.properties
bloritsch 2002/08/08 06:23:22
Modified: fortress build.xml default.properties
Log:
Prune unecessary jars due to mpool move
Revision Changes Path
1.41 +3 -13 jakarta-avalon-excalibur/fortress/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/build.xml,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- build.xml 8 Aug 2002 07:31:12 -0000 1.40
+++ build.xml 8 Aug 2002 13:23:22 -0000 1.41
@@ -20,12 +20,10 @@
<pathelement location="${excalibur-instrument-manager.jar}"/>
<pathelement location="${excalibur-instrument-manager-interfaces.jar}"/>
<pathelement location="${excalibur-event.jar}"/>
- <pathelement location="${excalibur-pool.jar}"/>
<pathelement location="${excalibur-util.jar}"/>
<pathelement location="${excalibur-logger.jar}"/>
<pathelement location="${excalibur-sourceresolve.jar}"/>
<pathelement location="${excalibur-concurrent.jar}"/>
- <pathelement location="${excalibur-thread.jar}"/>
<pathelement location="${checkstyle.jar}"/>
<pathelement path="${java.class.path}"/>
</path>
@@ -47,6 +45,7 @@
<pathelement location="${excalibur-altrmi-client-interfaces.jar}"/>
<pathelement location="${excalibur-testcase.jar}"/>
<pathelement location="${excalibur-component.jar}"/>
+ <pathelement location="${excalibur-pool.jar}"/>
<pathelement location="${excalibur-datasource.jar}"/>
<pathelement location="${excalibur-cache.jar}"/>
<pathelement location="${excalibur-monitor.jar}"/>
@@ -63,12 +62,6 @@
<target name="rebuild" depends="clean,main" description="Rebuild the project"/>
<target name="big-jar" depends="jar" description="Build the big jar with all dependencies included">
-<!-- <ant antfile="../build.xml" target="clean">
- <property name="basedir" value="../"/>
- </ant>
-
- <ant target="jar"/>-->
-
<copy file="${excalibur-collections.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"/>
@@ -79,12 +72,10 @@
<copy file="${excalibur-instrument-manager.jar}" todir="${build.dir}/tempjars"/>
<copy file="${excalibur-instrument-manager-interfaces.jar}" todir="${build.dir}/tempjars"/>
<copy file="${excalibur-event.jar}" todir="${build.dir}/tempjars"/>
- <copy file="${excalibur-pool.jar}" todir="${build.dir}/tempjars"/>
<copy file="${excalibur-util.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="${excalibur-concurrent.jar}" todir="${build.dir}/tempjars"/>
- <copy file="${excalibur-thread.jar}" todir="${build.dir}/tempjars"/>
<copy file="${excalibur-threadcontext.jar}" todir="${build.dir}/tempjars"/>
<copy file="${build.lib}/${jar.name}" todir="${build.dir}/tempjars"/>
@@ -109,15 +100,12 @@
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkLogkit"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkAltrmi"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCollections"/>
- <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkPool"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkInstrument"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkManagerInterfaces"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkManager"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkSourceResolve"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkEvent"/>
- <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkThread"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkThreadcontext"/>
- <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkComponent"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkLogger"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredClass">
<property name="proj.jar.name" value="xml-apis.jar"/>
@@ -131,6 +119,8 @@
description="Check unit test dependencies" unless="skip.dependencies">
<!-- Need the jar to prevent recursive deps. -->
+ <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkComponent"/>
+ <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkPool"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkJUnit"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkTestcase"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkDatasource"/>
1.31 +10 -20 jakarta-avalon-excalibur/fortress/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/default.properties,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- default.properties 7 Aug 2002 22:48:27 -0000 1.30
+++ default.properties 8 Aug 2002 13:23:22 -0000 1.31
@@ -49,11 +49,6 @@
excalibur-sourceresolve.lib=${excalibur-sourceresolve.home}
excalibur-sourceresolve.jar=${excalibur-sourceresolve.lib}/excalibur-sourceresolve-1.0.jar
-# ----- Excalibur component, version 1.0 or later -----
-excalibur-component.home=${basedir}/../component/dist
-excalibur-component.lib=${excalibur-component.home}
-excalibur-component.jar=${excalibur-component.lib}/excalibur-component-1.0.jar
-
# ----- Excalibur XMLUtil, version 1.0 or later -----
excalibur-xmlutil.home=${basedir}/../xmlutil/dist
excalibur-xmlutil.lib=${excalibur-xmlutil.home}
@@ -70,16 +65,6 @@
excalibur-logger.lib=${excalibur-logger.home}
excalibur-logger.jar=${excalibur-logger.lib}/excalibur-logger-1.0.jar
-# ----- Excalibur Pool, version 1.0 or later -----
-excalibur-pool.home=${basedir}/../pool/dist
-excalibur-pool.lib=${excalibur-pool.home}
-excalibur-pool.jar=${excalibur-pool.lib}/excalibur-pool-1.1.jar
-
-# ----- Excalibur thread, version 1.0 or later -----
-excalibur-thread.home=${basedir}/../thread/dist
-excalibur-thread.lib=${excalibur-thread.home}
-excalibur-thread.jar=${excalibur-thread.lib}/excalibur-thread-1.0.jar
-
# ----- Excalibur threadcontext, version 1.0 or later -----
excalibur-threadcontext.home=${basedir}/../threadcontext/dist
excalibur-threadcontext.lib=${excalibur-threadcontext.home}
@@ -120,6 +105,16 @@
excalibur-datasource.lib=${excalibur-datasource.home}
excalibur-datasource.jar=${excalibur-datasource.lib}/excalibur-datasource-1.0.jar
+# ----- Excalibur Pool, version 1.0 or later -----
+excalibur-pool.home=${basedir}/../pool/dist
+excalibur-pool.lib=${excalibur-pool.home}
+excalibur-pool.jar=${excalibur-pool.lib}/excalibur-pool-1.1.jar
+
+# ----- Excalibur component, version 1.0 or later -----
+excalibur-component.home=${basedir}/../component/dist
+excalibur-component.lib=${excalibur-component.home}
+excalibur-component.jar=${excalibur-component.lib}/excalibur-component-1.0.jar
+
# ----- Excalibur cache, version 1.0 or later -----
excalibur-cache.home=${basedir}/../cache/dist
excalibur-cache.lib=${excalibur-cache.home}
@@ -129,11 +124,6 @@
excalibur-testcase.home=${basedir}/../testcase/dist
excalibur-testcase.lib=${excalibur-testcase.home}
excalibur-testcase.jar=${excalibur-testcase.lib}/excalibur-testcase-1.0.jar
-
-# ----- Excalibur Monitor, version 1.0 or later -----
-excalibur-monitor.home=${basedir}/../monitor/dist
-excalibur-monitor.lib=${excalibur-monitor.home}
-excalibur-monitor.jar=${excalibur-monitor.lib}/excalibur-monitor-1.0.jar
# ----- Excalibur Monitor, version 1.0 or later -----
excalibur-monitor.home=${basedir}/../monitor/dist
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>