mcconnell 2003/01/27 15:52:33
Modified: assembly build.xml default.properties
merlin build.xml default.properties
merlin/src/test/org/apache/avalon/playground
StandardComponent.java
meta build.xml default.properties
Log:
Synchronizing with excalibur.
Revision Changes Path
1.13 +2 -2 avalon-sandbox/assembly/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/assembly/build.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- build.xml 27 Jan 2003 03:18:25 -0000 1.12
+++ build.xml 27 Jan 2003 23:52:32 -0000 1.13
@@ -28,7 +28,7 @@
<pathelement location="${excalibur-logger.jar}"/>
<pathelement location="${excalibur-extension.jar}"/>
<pathelement location="${excalibur-configuration.jar}"/>
- <pathelement location="${excalibur-thread.jar}"/>
+ <!-- <pathelement location="${excalibur-thread.jar}"/> -->
<pathelement location="${excalibur-event.jar}"/>
<pathelement location="${util.concurrent.jar}"/>
<pathelement location="${commons-collections.jar}"/>
@@ -394,7 +394,7 @@
<copy todir="${lib.dir}" file="${excalibur-event.jar}"/>
<copy todir="${lib.dir}" file="${commons-collections.jar}"/>
<copy todir="${lib.dir}" file="${util.concurrent.jar}"/>
- <copy todir="${lib.dir}" file="${excalibur-thread.jar}"/>
+ <!--<copy todir="${lib.dir}" file="${excalibur-thread.jar}"/>-->
<copy todir="${lib.dir}" file="${avalon-lifecycle.jar}"/>
<copy todir="${lib.dir}" file="${avalon-assembly.jar}"/>
1.12 +4 -4 avalon-sandbox/assembly/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/avalon-sandbox/assembly/default.properties,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- default.properties 24 Jan 2003 18:38:45 -0000 1.11
+++ default.properties 27 Jan 2003 23:52:32 -0000 1.12
@@ -61,16 +61,16 @@
# ----- Excalibur event, version 1.0 or later -----
excalibur-event.home=${excalibur.home}/event
excalibur-event.lib=${excalibur-event.home}/build/lib
-excalibur-event.jar=${excalibur-event.lib}/excalibur-event-1.0.1.jar
+excalibur-event.jar=${excalibur-event.lib}/excalibur-event-1.0.2.jar
util.concurrent.jar=${excalibur-event.home}/lib/util.concurrent-1.3.1.jar
# ----- Commons collections -----
commons-collections.jar=${excalibur-event.home}/lib/commons-collections-2.1.jar
# ----- Excalibur thread, version 1.0 or later -----
-excalibur-thread.home=${excalibur.home}/thread
-excalibur-thread.lib=${excalibur-thread.home}/build/lib
-excalibur-thread.jar=${excalibur-thread.lib}/excalibur-thread-1.1.jar
+#excalibur-thread.home=${excalibur.home}/thread
+#excalibur-thread.lib=${excalibur-thread.home}/build/lib
+#excalibur-thread.jar=${excalibur-thread.lib}/excalibur-thread-1.1.jar
# ----- Logkit -----
logkit.home=${basedir}/../../jakarta-avalon-logkit
1.14 +2 -2 avalon-sandbox/merlin/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/build.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- build.xml 27 Jan 2003 03:51:00 -0000 1.13
+++ build.xml 27 Jan 2003 23:52:32 -0000 1.14
@@ -35,7 +35,7 @@
<pathelement location="${excalibur-logger.jar}"/>
<pathelement location="${excalibur-configuration.jar}"/>
<pathelement location="${excalibur-pool.jar}"/>
- <pathelement location="${excalibur-thread.jar}"/>
+ <!-- <pathelement location="${excalibur-thread.jar}"/> -->
<pathelement location="${excalibur-event.jar}"/>
<pathelement location="${excalibur-sourceresolve.jar}"/>
<pathelement location="${util.concurrent.jar}"/>
@@ -261,7 +261,7 @@
<copy todir="${lib.dir}" file="${excalibur-threadcontext.jar}"/>
<copy todir="${lib.dir}" file="${excalibur-sourceresolve.jar}"/>
<copy todir="${lib.dir}" file="${excalibur-pool.jar}"/>
- <copy todir="${lib.dir}" file="${excalibur-thread.jar}"/>
+ <!-- <copy todir="${lib.dir}" file="${excalibur-thread.jar}"/> -->
<copy todir="${lib.dir}" file="${avalon-lifecycle.jar}"/>
<copy todir="${lib.dir}" file="${avalon-assembly.jar}"/>
<copy todir="${lib.dir}" preservelastmodified="true">
1.13 +4 -4 avalon-sandbox/merlin/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/default.properties,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- default.properties 27 Jan 2003 07:11:56 -0000 1.12
+++ default.properties 27 Jan 2003 23:52:33 -0000 1.13
@@ -72,7 +72,7 @@
# ----- Excalibur event, version 1.0 or later -----
excalibur-event.home=${excalibur.home}/event
excalibur-event.lib=${excalibur-event.home}/build/lib
-excalibur-event.jar=${excalibur-event.lib}/excalibur-event-1.0.1.jar
+excalibur-event.jar=${excalibur-event.lib}/excalibur-event-1.0.2.jar
util.concurrent.jar=${excalibur-event.home}/lib/util.concurrent-1.3.1.jar
commons-collections.jar=${excalibur-event.home}/lib/commons-collections-2.1.jar
@@ -82,9 +82,9 @@
excalibur-collections.jar=${excalibur-collections.lib}/excalibur-collections-1.0.jar
# ----- Excalibur thread, version 1.0 or later -----
-excalibur-thread.home=${excalibur.home}/thread
-excalibur-thread.lib=${excalibur-thread.home}/build/lib
-excalibur-thread.jar=${excalibur-thread.lib}/excalibur-thread-1.1.jar
+#excalibur-thread.home=${excalibur.home}/thread
+#excalibur-thread.lib=${excalibur-thread.home}/build/lib
+#excalibur-thread.jar=${excalibur-thread.lib}/excalibur-thread-1.1.jar
# ----- Excalibur threadcontext, version 1.0 or later -----
excalibur-threadcontext.home=${excalibur.home}/threadcontext
1.8 +0 -2
avalon-sandbox/merlin/src/test/org/apache/avalon/playground/StandardComponent.java
Index: StandardComponent.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/src/test/org/apache/avalon/playground/StandardComponent.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- StandardComponent.java 19 Jan 2003 18:18:50 -0000 1.7
+++ StandardComponent.java 27 Jan 2003 23:52:33 -0000 1.8
@@ -66,8 +66,6 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-//import org.apache.avalon.excalibur.thread.impl.DefaultThreadPool;
-
/**
* This is a minimal demonstration component that implements the
* <code>BasicService</code> interface and has no dependencies.
1.5 +1 -0 avalon-sandbox/meta/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/meta/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.xml 27 Dec 2002 16:33:49 -0000 1.4
+++ build.xml 27 Jan 2003 23:52:33 -0000 1.5
@@ -11,6 +11,7 @@
<!-- Classpath for product -->
<path id="project.class.path">
+ <pathelement location="${qdox.jar}"/>
<pathelement location="${avalon-framework.jar}"/>
<pathelement location="${excalibur-i18n.jar}"/>
<pathelement location="${excalibur-configuration.jar}"/>
1.4 +5 -0 avalon-sandbox/meta/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/avalon-sandbox/meta/default.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- default.properties 27 Jan 2003 07:11:57 -0000 1.3
+++ default.properties 27 Jan 2003 23:52:33 -0000 1.4
@@ -37,6 +37,11 @@
excalibur-configuration.lib=${excalibur-configuration.home}/build/lib
excalibur-configuration.jar=${excalibur-configuration.lib}/excalibur-configuration-1.0.jar
+# ----- QDOX -----
+qdox.home=.
+qdox.lib=${qdox.home}/tools
+qdox.jar=${qdox.lib}/qdox-1.0.jar
+
# --------------------------------------------------
# Settings used to configure compile environment
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
