bloritsch 02/04/11 10:36:23
Modified: . build.xml depchecker.xml dependencies.txt
event ant.properties.sample build.xml default.properties
event/src/java/org/apache/avalon/excalibur/event/command
Command.java CommandManager.java
DelayedCommand.java EventPipeline.java
RepeatedCommand.java TPCThreadManager.java
TPSPThreadManager.java ThreadManager.java
Removed: command BUILDING.txt README.txt ant.properties.sample
build.bat build.sh build.xml default.properties
project.properties
command/examples README.txt
Log:
Move command to a child of event as we agreed upon much earlier
Revision Changes Path
1.148 +4 -9 jakarta-avalon-excalibur/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/build.xml,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- build.xml 10 Apr 2002 05:33:56 -0000 1.147
+++ build.xml 11 Apr 2002 17:36:22 -0000 1.148
@@ -30,12 +30,11 @@
<ant dir="component" target="dist"/> <!-- collections,
logger, instrument, pool -->
<ant dir="util" target="dist"/> <!-- component -->
<ant dir="testcase" target="dist"/> <!-- logger, component
-->
- <ant dir="event" target="dist"/> <!-- collections,
concurrent -->
- <ant dir="command" target="dist"/> <!-- collections,
concurrent, lang, pool, thread, util, event -->
+ <ant dir="event" target="dist"/> <!-- collections,
concurrent, lang, pool, thread, util, event -->
<ant dir="instrument-manager" target="dist"/> <!-- altrmi,
collections, instrument, logger, pool, component -->
<ant dir="instrument-client" target="dist"/> <!--
instrument-manager -->
- <ant dir="all"/> <!-- collections, command,
concurrent, event, instrument -->
+ <ant dir="all"/> <!-- collections, concurrent, event,
instrument -->
<ant dir="baxter" target="dist"/>
<ant dir="bzip2" target="dist"/>
@@ -179,12 +178,11 @@
<ant dir="component" target="jar"/> <!-- collections,
logger, instrument, pool -->
<ant dir="util" target="jar"/> <!-- component -->
<ant dir="testcase" target="jar"/> <!-- logger, component
-->
- <ant dir="event" target="jar"/> <!-- collections,
concurrent -->
- <ant dir="command" target="jar"/> <!-- collections,
concurrent, lang, pool, thread, util, event -->
+ <ant dir="event" target="jar"/> <!-- collections,
concurrent, lang, pool, thread, util, event -->
<ant dir="instrument-manager" target="jar"/> <!-- altrmi,
collections, instrument, logger, pool, component -->
<ant dir="instrument-client" target="jar"/> <!-- instrument-manager
-->
- <ant dir="all" target="all"/> <!-- collections,
command, concurrent, event, instrument -->
+ <ant dir="all" target="all"/> <!-- collections,
concurrent, event, instrument -->
<ant dir="baxter" target="jar"/>
<ant dir="bzip2" target="jar"/>
@@ -223,7 +221,6 @@
<ant dir="cache" target="docs"/>
<ant dir="cli" target="docs"/>
<ant dir="collections" target="docs"/>
- <ant dir="command" target="docs"/>
<ant dir="component" target="docs"/>
<ant dir="concurrent" target="docs"/>
<ant dir="datasource" target="docs"/>
@@ -270,7 +267,6 @@
<ant dir="cache" target="site"/>
<ant dir="cli" target="site"/>
<ant dir="collections" target="site"/>
- <ant dir="command" target="site"/>
<ant dir="component" target="site"/>
<ant dir="concurrent" target="site"/>
<ant dir="datasource" target="site"/>
@@ -310,7 +306,6 @@
<ant dir="cache" target="real-clean"/>
<ant dir="cli" target="real-clean"/>
<ant dir="collections" target="real-clean"/>
- <ant dir="command" target="real-clean"/>
<ant dir="component" target="real-clean"/>
<ant dir="concurrent" target="real-clean"/>
<ant dir="datasource" target="real-clean"/>
1.11 +0 -7 jakarta-avalon-excalibur/depchecker.xml
Index: depchecker.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/depchecker.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- depchecker.xml 9 Apr 2002 12:05:42 -0000 1.10
+++ depchecker.xml 11 Apr 2002 17:36:22 -0000 1.11
@@ -270,13 +270,6 @@
<property name="proj.home" value="${basedir}/../threadcontext"/>
</ant>
</target>
- <target name="checkCommand">
- <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkRequiredFile">
- <property name="name" value="excalibur-command.jar"/>
- <property name="path" value="${excalibur-command.jar}"/>
- <property name="proj.home" value="${basedir}/../command"/>
- </ant>
- </target>
<!-- ====================================================== -->
<!-- Call to ensure a class is present in the classpath -->
<!-- ====================================================== -->
1.7 +2 -3 jakarta-avalon-excalibur/dependencies.txt
Index: dependencies.txt
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/dependencies.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dependencies.txt 10 Apr 2002 22:49:04 -0000 1.6
+++ dependencies.txt 11 Apr 2002 17:36:22 -0000 1.7
@@ -20,11 +20,10 @@
* altrmi -> framework
* util -> framework
* baxter -> jmxri.jar
-* event -> collections, concurrent
+* event -> collections, concurrent, core, framework, event, util, thread,
pool
* all -> collections, concurrent, instrument, event, component, pool,
logkit, logger, (recursive on fortress, commented out)
-* command -> collections, concurrent, core, framework, event, util, thread,
pool
* component -> logkit, framework, collections, logger, pool [Unit tests:
junit, util, testcase]
-** fortress -> instrument, instrument-manager, framework, testcase, command,
event (recursive on mpool in scratchpad), component (test class), logger, util
+** fortress -> instrument, instrument-manager, framework, testcase, event
(recursive on mpool in scratchpad), component (test class), logger, util
instrument-client -> altrmi-client-impl
* instrument-manager -> logkit, logger, framework, core, collections,
instrument, altrmi-common, altrmi-server-impl, altrmi-server-interfaces,
component, pool
* logger -> logkit, framework. [Unit tests: junit, testcase, component,
collections, pool]
1.6 +37 -3 jakarta-avalon-excalibur/event/ant.properties.sample
Index: ant.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/event/ant.properties.sample,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ant.properties.sample 8 Apr 2002 10:32:09 -0000 1.5
+++ ant.properties.sample 11 Apr 2002 17:36:22 -0000 1.6
@@ -10,7 +10,7 @@
# It is overridden by ../ant.properties and ~/build.properties
# It overrides all default.properties files and ~/.ant.properties
#
-# $Id: ant.properties.sample,v 1.5 2002/04/08 10:32:09 jefft Exp $
+# $Id: ant.properties.sample,v 1.6 2002/04/11 17:36:22 bloritsch Exp $
#
-----------------------------------------------------------------------------
# ----- Compile Control Flags -----
@@ -25,16 +25,50 @@
# --------------------------------------------------
# REQUIRED LIBRARIES
# --------------------------------------------------
+# ----- Excalibur util, version 1.0 or later -----
+excalibur-util.home=${basedir}/../util/dist
+excalibur-util.lib=${excalibur-util.home}
+excalibur-util.jar=${excalibur-util.lib}/excalibur-util-1.0.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 Collections, version 1.0 or later -----
-excalibur-collections.home=../collections/build/lib
+excalibur-collections.home=${basedir}/../collections/dist
excalibur-collections.lib=${excalibur-collections.home}
excalibur-collections.jar=${excalibur-collections.lib}/excalibur-collections-1.0.jar
# ----- Excalibur Concurrent, version 1.0 or later -----
-excalibur-concurrent.home=../concurrent/build/lib
+excalibur-concurrent.home=${basedir}/../concurrent/dist
excalibur-concurrent.lib=${excalibur-concurrent.home}
excalibur-concurrent.jar=${excalibur-concurrent.lib}/excalibur-concurrent-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.0.jar
+
+# ----- Excalibur Util, version 1.0 or later -----
+excalibur-util.home=${basedir}/../util/build/lib
+excalibur-util.lib=${excalibur-util.home}
+excalibur-util.jar=${excalibur-util.lib}/excalibur-util-1.0.jar
+
+# ----- Excalibur Scratchpad -----
+excalibur-scratchpad.home=${basedir}/../all
+excalibur-scratchpad.lib=${excalibur-scratchpad.home}/build/lib
+excalibur-scratchpad.jar=${excalibur-scratchpad.lib}/excalibur-scratchpad.jar
+
+# ----- Excalibur Core -----
+excalibur-core.home=${basedir}/../all
+excalibur-core.lib=${excalibur-core.home}/build/lib
+excalibur-core.jar=${excalibur-core.lib}/excalibur-core.jar
+
+# ----- Avalon Framework, version 4.1 or later -----
+avalon-framework.home=${basedir}/../../jakarta-avalon
+avalon-framework.lib=${avalon-framework.home}/build/lib
+avalon-framework.jar=${avalon-framework.lib}/avalon-framework.jar
# --------------------------------------------------
1.13 +12 -2 jakarta-avalon-excalibur/event/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/event/build.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- build.xml 8 Apr 2002 12:15:41 -0000 1.12
+++ build.xml 11 Apr 2002 17:36:22 -0000 1.13
@@ -15,7 +15,13 @@
<pathelement location="${build.classes}"/>
<pathelement location="${junit.jar}"/>
<pathelement location="${excalibur-collections.jar}"/>
- <pathelement location="${excalibur-concurrent.jar}"/>
+ <pathelement location="${excalibur-concurrent.jar}"/>
+ <pathelement location="${excalibur-thread.jar}"/>
+ <pathelement location="${excalibur-pool.jar}"/>
+ <pathelement location="${excalibur-scratchpad.jar}"/>
+ <pathelement location="${excalibur-core.jar}"/>
+ <pathelement location="${avalon-framework.jar}"/>
+ <pathelement location="${excalibur-util.jar}"/>
<pathelement location="${checkstyle.jar}"/>
</path>
<property name="cp" refid="project.class.path"/>
@@ -33,7 +39,11 @@
<target name="dependencies" description="Check dependencies"
unless="skip.dependencies">
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkCommon"/>
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkCollections"/>
- <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkConcurrent"/>
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkConcurrent"/>
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkUtil"/>
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkThread"/>
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkPool"/>
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkFramework"/>
</target>
<!-- Compiles the source code -->
1.4 +36 -2 jakarta-avalon-excalibur/event/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/event/default.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- default.properties 8 Apr 2002 10:32:09 -0000 1.3
+++ default.properties 11 Apr 2002 17:36:23 -0000 1.4
@@ -13,16 +13,50 @@
# --------------------------------------------------
# REQUIRED LIBRARIES
# --------------------------------------------------
+# ----- Excalibur util, version 1.0 or later -----
+excalibur-util.home=${basedir}/../util/dist
+excalibur-util.lib=${excalibur-util.home}
+excalibur-util.jar=${excalibur-util.lib}/excalibur-util-1.0.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 Collections, version 1.0 or later -----
-excalibur-collections.home=../collections/dist
+excalibur-collections.home=${basedir}/../collections/dist
excalibur-collections.lib=${excalibur-collections.home}
excalibur-collections.jar=${excalibur-collections.lib}/excalibur-collections-1.0.jar
# ----- Excalibur Concurrent, version 1.0 or later -----
-excalibur-concurrent.home=../concurrent/dist
+excalibur-concurrent.home=${basedir}/../concurrent/dist
excalibur-concurrent.lib=${excalibur-concurrent.home}
excalibur-concurrent.jar=${excalibur-concurrent.lib}/excalibur-concurrent-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.0.jar
+
+# ----- Excalibur Util, version 1.0 or later -----
+excalibur-util.home=${basedir}/../util/build/lib
+excalibur-util.lib=${excalibur-util.home}
+excalibur-util.jar=${excalibur-util.lib}/excalibur-util-1.0.jar
+
+# ----- Excalibur Scratchpad -----
+excalibur-scratchpad.home=${basedir}/../all
+excalibur-scratchpad.lib=${excalibur-scratchpad.home}/build/lib
+excalibur-scratchpad.jar=${excalibur-scratchpad.lib}/excalibur-scratchpad.jar
+
+# ----- Excalibur Core -----
+excalibur-core.home=${basedir}/../all
+excalibur-core.lib=${excalibur-core.home}/build/lib
+excalibur-core.jar=${excalibur-core.lib}/excalibur-core.jar
+
+# ----- Avalon Framework, version 4.1 or later -----
+avalon-framework.home=${basedir}/../../jakarta-avalon
+avalon-framework.lib=${avalon-framework.home}/build/lib
+avalon-framework.jar=${avalon-framework.lib}/avalon-framework.jar
# --------------------------------------------------
1.4 +2 -2
jakarta-avalon-excalibur/event/src/java/org/apache/avalon/excalibur/event/command/Command.java
Index: Command.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/event/src/java/org/apache/avalon/excalibur/event/command/Command.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Command.java 16 Mar 2002 00:05:45 -0000 1.3
+++ Command.java 11 Apr 2002 17:36:23 -0000 1.4
@@ -5,7 +5,7 @@
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
-package org.apache.avalon.excalibur.command;
+package org.apache.avalon.excalibur.event.command;
import org.apache.avalon.excalibur.event.Signal;
import org.apache.avalon.framework.activity.Executable;
@@ -18,4 +18,4 @@
*/
public interface Command extends Signal, Executable
{
-}
\ No newline at end of file
+}
1.7 +2 -2
jakarta-avalon-excalibur/event/src/java/org/apache/avalon/excalibur/event/command/CommandManager.java
Index: CommandManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/event/src/java/org/apache/avalon/excalibur/event/command/CommandManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CommandManager.java 26 Mar 2002 10:45:22 -0000 1.6
+++ CommandManager.java 11 Apr 2002 17:36:23 -0000 1.7
@@ -5,7 +5,7 @@
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
-package org.apache.avalon.excalibur.command;
+package org.apache.avalon.excalibur.event.command;
import java.util.ArrayList;
import java.util.Collections;
@@ -224,4 +224,4 @@
protected int m_numExecutions;
protected boolean m_repeatable;
}
-}
\ No newline at end of file
+}
1.3 +2 -2
jakarta-avalon-excalibur/event/src/java/org/apache/avalon/excalibur/event/command/DelayedCommand.java
Index: DelayedCommand.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/event/src/java/org/apache/avalon/excalibur/event/command/DelayedCommand.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DelayedCommand.java 16 Mar 2002 00:05:45 -0000 1.2
+++ DelayedCommand.java 11 Apr 2002 17:36:23 -0000 1.3
@@ -5,7 +5,7 @@
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
-package org.apache.avalon.excalibur.command;
+package org.apache.avalon.excalibur.event.command;
/**
* A DelayedCommand is a specific type of Command that denotes a an execution
@@ -21,4 +21,4 @@
* The value must be positive.
*/
long getDelayInterval();
-}
\ No newline at end of file
+}
1.4 +2 -2
jakarta-avalon-excalibur/event/src/java/org/apache/avalon/excalibur/event/command/EventPipeline.java
Index: EventPipeline.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/event/src/java/org/apache/avalon/excalibur/event/command/EventPipeline.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EventPipeline.java 16 Mar 2002 00:05:45 -0000 1.3
+++ EventPipeline.java 11 Apr 2002 17:36:23 -0000 1.4
@@ -5,7 +5,7 @@
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
-package org.apache.avalon.excalibur.command;
+package org.apache.avalon.excalibur.event.command;
import org.apache.avalon.excalibur.event.EventHandler;
import org.apache.avalon.excalibur.event.Source;
@@ -30,4 +30,4 @@
* Sinks get merged into.
*/
EventHandler getEventHandler();
-}
\ No newline at end of file
+}
1.2 +2 -2
jakarta-avalon-excalibur/event/src/java/org/apache/avalon/excalibur/event/command/RepeatedCommand.java
Index: RepeatedCommand.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/event/src/java/org/apache/avalon/excalibur/event/command/RepeatedCommand.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RepeatedCommand.java 28 Jan 2002 16:01:00 -0000 1.1
+++ RepeatedCommand.java 11 Apr 2002 17:36:23 -0000 1.2
@@ -5,7 +5,7 @@
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
-package org.apache.avalon.excalibur.command;
+package org.apache.avalon.excalibur.event.command;
/**
* A Signal is a specific type of QueueElement that denotes a Control code
for
@@ -28,4 +28,4 @@
* amount of time before enqueuing it again. This value must not be
negative.
*/
long getRepeatInterval();
-}
\ No newline at end of file
+}
1.11 +1 -1
jakarta-avalon-excalibur/event/src/java/org/apache/avalon/excalibur/event/command/TPCThreadManager.java
Index: TPCThreadManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/event/src/java/org/apache/avalon/excalibur/event/command/TPCThreadManager.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TPCThreadManager.java 30 Mar 2002 22:10:39 -0000 1.10
+++ TPCThreadManager.java 11 Apr 2002 17:36:23 -0000 1.11
@@ -5,7 +5,7 @@
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
-package org.apache.avalon.excalibur.command;
+package org.apache.avalon.excalibur.event.command;
import java.util.HashMap;
import java.util.Iterator;
1.8 +2 -2
jakarta-avalon-excalibur/event/src/java/org/apache/avalon/excalibur/event/command/TPSPThreadManager.java
Index: TPSPThreadManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/event/src/java/org/apache/avalon/excalibur/event/command/TPSPThreadManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TPSPThreadManager.java 26 Mar 2002 10:45:22 -0000 1.7
+++ TPSPThreadManager.java 11 Apr 2002 17:36:23 -0000 1.8
@@ -5,7 +5,7 @@
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
-package org.apache.avalon.excalibur.command;
+package org.apache.avalon.excalibur.event.command;
import java.util.HashMap;
import java.util.Iterator;
@@ -190,4 +190,4 @@
}
}
}
-}
\ No newline at end of file
+}
1.2 +2 -2
jakarta-avalon-excalibur/event/src/java/org/apache/avalon/excalibur/event/command/ThreadManager.java
Index: ThreadManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/event/src/java/org/apache/avalon/excalibur/event/command/ThreadManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ThreadManager.java 28 Jan 2002 18:42:25 -0000 1.1
+++ ThreadManager.java 11 Apr 2002 17:36:23 -0000 1.2
@@ -5,7 +5,7 @@
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
-package org.apache.avalon.excalibur.command;
+package org.apache.avalon.excalibur.event.command;
/**
* A ThreadManager handles the thread policies for EventPipelines. It works
@@ -30,4 +30,4 @@
* Deregisters all EventPipelines from this ThreadManager
*/
void deregisterAll();
-}
\ No newline at end of file
+}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
