proyal 2002/12/10 10:19:49
Modified: fortress build.xml default.properties
Log:
Patch from Berin to remove unneeded deps
Revision Changes Path
1.63 +8 -8 jakarta-avalon-excalibur/fortress/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/build.xml,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- build.xml 3 Dec 2002 02:17:49 -0000 1.62
+++ build.xml 10 Dec 2002 18:19:49 -0000 1.63
@@ -22,7 +22,7 @@
<pathelement location="${excalibur-event.jar}"/>
<pathelement location="${excalibur-logger.jar}"/>
<pathelement location="${excalibur-sourceresolve.jar}"/>
- <pathelement location="${excalibur-concurrent.jar}"/>
+<!-- <pathelement location="${excalibur-concurrent.jar}"/> -->
<pathelement location="${excalibur-container.jar}"/>
<pathelement location="${checkstyle.jar}"/>
<pathelement path="${java.class.path}"/>
@@ -57,7 +57,7 @@
<pathelement location="${excalibur-monitor.jar}"/>
<pathelement location="${excalibur-xmlutil.jar}"/>
<pathelement location="${excalibur-scratchpad.jar}"/>
- <pathelement location="${excalibur-i18n.jar}"/>
+<!-- <pathelement location="${excalibur-i18n.jar}"/> -->
<pathelement location="${xalan.jar}"/>
<pathelement location="${jaxen-full.jar}"/>
<path refid="project.class.path"/>
@@ -87,8 +87,8 @@
<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-threadcontext.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"/>
@@ -102,13 +102,13 @@
</manifest>
<zipgroupfileset dir="${build.dir}/tempjars">
<include name="*.jar"/>
- <include name="merlin*/*.jar"/>
+<!-- <include name="merlin*/*.jar"/> -->
</zipgroupfileset>
</jar>
</target>
<target name="optional.dependencies" description="Check dependencies"
if="include.meta">
- <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkMeta"/>
+<!-- <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkMeta"/>
-->
</target>
<target name="dependencies" depends="optional.dependencies" description="Check
dependencies" unless="skip.dependencies">
@@ -120,10 +120,10 @@
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkInstrumentManager"/>
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkSourceResolve"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkEvent"/>
- <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkThreadcontext"/>
+<!-- <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkThreadcontext"/> -->
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkLogger"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkContainer"/>
- <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkMeta"/>
+<!-- <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkMeta"/>
-->
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkRequiredClass">
<property name="proj.jar.name" value="xml-apis.jar"/>
<property name="class" value="org.xml.sax.InputSource"/>
1.47 +12 -12 jakarta-avalon-excalibur/fortress/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/default.properties,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- default.properties 3 Dec 2002 02:17:49 -0000 1.46
+++ default.properties 10 Dec 2002 18:19:49 -0000 1.47
@@ -25,9 +25,9 @@
excalibur-container.jar=${excalibur-container.lib}/excalibur-container-1.0.jar
# ----- Excalibur Meta -----
-excalibur-meta.home=${basedir}/../meta
-excalibur-meta.lib=${excalibur-meta.home}/build/lib
-excalibur-meta.jar=${excalibur-meta.lib}/excalibur-meta-1.0.jar
+#excalibur-meta.home=${basedir}/../meta
+#excalibur-meta.lib=${excalibur-meta.home}/build/lib
+#excalibur-meta.jar=${excalibur-meta.lib}/excalibur-meta-1.0.jar
# ----- Excalibur instrument, version 1.0 or later -----
excalibur-instrument.home=${basedir}/../instrument/dist
@@ -71,9 +71,9 @@
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}
-excalibur-threadcontext.jar=${excalibur-threadcontext.lib}/excalibur-threadcontext-1.0.jar
+#excalibur-threadcontext.home=${basedir}/../threadcontext/dist
+#excalibur-threadcontext.lib=${excalibur-threadcontext.home}
+#excalibur-threadcontext.jar=${excalibur-threadcontext.lib}/excalibur-threadcontext-1.0.jar
# ----- AltRMI -----
excalibur-altrmi.home=${basedir}/../altrmi/dist
@@ -96,9 +96,9 @@
logkit.jar=${logkit.lib}/logkit.jar
# ----- Excalibur Concurrent, version 1.0 or later -----
-excalibur-concurrent.home=${basedir}/../concurrent/dist
-excalibur-concurrent.lib=${excalibur-concurrent.home}
-excalibur-concurrent.jar=${excalibur-concurrent.lib}/excalibur-concurrent-1.0.jar
+#excalibur-concurrent.home=${basedir}/../concurrent/dist
+#excalibur-concurrent.lib=${excalibur-concurrent.home}
+#excalibur-concurrent.jar=${excalibur-concurrent.lib}/excalibur-concurrent-1.0.jar
# --------------------------------------------------
# REQUIRED LIBRARIES FOR UNIT TESTS
@@ -137,9 +137,9 @@
excalibur-monitor.jar=${excalibur-monitor.lib}/excalibur-monitor-1.0.jar
# ----- Excalibur i18n, version 1.0 or later -----
-excalibur-i18n.home=${basedir}/../i18n/dist
-excalibur-i18n.lib=${excalibur-i18n.home}
-excalibur-i18n.jar=${excalibur-i18n.lib}/excalibur-i18n-1.0.jar
+#excalibur-i18n.home=${basedir}/../i18n/dist
+#excalibur-i18n.lib=${excalibur-i18n.home}
+#excalibur-i18n.jar=${excalibur-i18n.lib}/excalibur-i18n-1.0.jar
xml-apis.jar = ${basedir}/../lib/xml-apis.jar
xalan.jar = ${basedir}/../lib/xalan-2.3.1.jar
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
