bloritsch 2002/10/02 10:49:20
Modified: event build.xml default.properties
event/src/java/org/apache/excalibur/event/command
AbstractThreadManager.java CommandManager.java
TPSPThreadManager.java
event/src/java/org/apache/excalibur/event/impl
DefaultQueue.java FixedSizeQueue.java
Added: event/lib util.concurrent-1.3.1.jar
Log:
remove requirement for Excalibur Concurrent
Revision Changes Path
1.39 +7 -2 jakarta-avalon-excalibur/event/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/event/build.xml,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- build.xml 2 Oct 2002 15:39:28 -0000 1.38
+++ build.xml 2 Oct 2002 17:49:19 -0000 1.39
@@ -13,7 +13,7 @@
<path id="project.class.path">
<pathelement location="${commons-collections.jar}"/>
<pathelement location="${build.classes}"/>
- <pathelement location="${excalibur-concurrent.jar}"/>
+ <pathelement location="${util.concurrent.jar}"/>
<pathelement location="${excalibur-thread.jar}"/>
<pathelement location="${excalibur-scratchpad.jar}"/>
<pathelement location="${avalon-framework.jar}"/>
@@ -44,7 +44,6 @@
<target name="dependencies" description="Check dependencies"
unless="skip.dependencies">
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
- <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkConcurrent"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkFramework"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkThread"/>
</target>
@@ -300,6 +299,12 @@
<mkdir dir="${dist.dir}"/>
<copy todir="${dist.dir}">
<fileset dir="${build.lib}">
+ <include name="*.jar"/>
+ </fileset>
+ </copy>
+ <mkdir dir="${dist.dir}/lib"/>
+ <copy todir="${dist.dir}/lib">
+ <fileset dir="lib">
<include name="*.jar"/>
</fileset>
</copy>
1.23 +4 -6 jakarta-avalon-excalibur/event/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/event/default.properties,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- default.properties 2 Oct 2002 15:39:28 -0000 1.22
+++ default.properties 2 Oct 2002 17:49:19 -0000 1.23
@@ -9,7 +9,7 @@
Name=Excalibur Event
dir-name=event
version=1.0
-package-version=1.0
+package-version=1.0.1
year=2002
# --------------------------------------------------
@@ -21,13 +21,11 @@
excalibur-thread.lib=${excalibur-thread.home}
excalibur-thread.jar=${excalibur-thread.lib}/excalibur-thread-1.0.jar
-# ----- Commons Collections, version 1.0 or later -----
+# ----- Commons Collections, version 2.1 or later -----
commons-collections.jar=lib/commons-collections-20021002.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
+# ----- Doug Lea's Concurrent Utils, version 1.3 or later -----
+util.concurrent.jar=lib/util.concurrent-1.3.1.jar
# ----- Excalibur Core -----
excalibur-core.home=${basedir}/../all
1.1 jakarta-avalon-excalibur/event/lib/util.concurrent-1.3.1.jar
<<Binary file>>
1.11 +2 -2
jakarta-avalon-excalibur/event/src/java/org/apache/excalibur/event/command/AbstractThreadManager.java
Index: AbstractThreadManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/event/src/java/org/apache/excalibur/event/command/AbstractThreadManager.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- AbstractThreadManager.java 2 Oct 2002 01:46:57 -0000 1.10
+++ AbstractThreadManager.java 2 Oct 2002 17:49:20 -0000 1.11
@@ -52,7 +52,7 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
-import org.apache.avalon.excalibur.concurrent.Mutex;
+import EDU.oswego.cs.dl.util.concurrent.ReentrantLock;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
@@ -72,7 +72,7 @@
implements Runnable, ThreadManager, Initializable, Disposable
{
/** The Mutex used in this ThreadManager */
- private final Mutex m_mutex = new Mutex();
+ private final ReentrantLock m_mutex = new ReentrantLock();
/** The pipelines we are managing */
private final HashMap m_pipelines = new HashMap();
1.21 +3 -3
jakarta-avalon-excalibur/event/src/java/org/apache/excalibur/event/command/CommandManager.java
Index: CommandManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/event/src/java/org/apache/excalibur/event/command/CommandManager.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- CommandManager.java 2 Oct 2002 15:39:28 -0000 1.20
+++ CommandManager.java 2 Oct 2002 17:49:20 -0000 1.21
@@ -56,7 +56,7 @@
import java.util.Map;
import org.apache.commons.collections.Buffer;
import org.apache.commons.collections.UnboundedFifoBuffer;
-import org.apache.avalon.excalibur.concurrent.Mutex;
+import EDU.oswego.cs.dl.util.concurrent.ReentrantLock;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.excalibur.event.EventHandler;
import org.apache.excalibur.event.Queue;
@@ -101,7 +101,7 @@
{
private final Queue m_queue;
private final HashMap m_signalHandlers;
- private final Mutex m_mutex;
+ private final ReentrantLock m_mutex;
private final EventHandler m_eventHandler;
private final Source[] m_sources;
@@ -112,7 +112,7 @@
{
m_queue = new DefaultQueue();
m_signalHandlers = new HashMap();
- m_mutex = new Mutex();
+ m_mutex = new ReentrantLock();
m_eventHandler = new CommandEventHandler( Collections.unmodifiableMap(
m_signalHandlers ) );
m_sources = new Source[]{m_queue};
}
1.18 +2 -2
jakarta-avalon-excalibur/event/src/java/org/apache/excalibur/event/command/TPSPThreadManager.java
Index: TPSPThreadManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/event/src/java/org/apache/excalibur/event/command/TPSPThreadManager.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- TPSPThreadManager.java 2 Oct 2002 01:46:57 -0000 1.17
+++ TPSPThreadManager.java 2 Oct 2002 17:49:20 -0000 1.18
@@ -51,7 +51,7 @@
import java.util.HashMap;
import java.util.Iterator;
-import org.apache.avalon.excalibur.concurrent.Mutex;
+import EDU.oswego.cs.dl.util.concurrent.ReentrantLock;
import org.apache.excalibur.event.EventHandler;
import org.apache.excalibur.event.Source;
import org.apache.excalibur.thread.ThreadControl;
@@ -68,7 +68,7 @@
public final class TPSPThreadManager implements Runnable, ThreadManager
{
private final ThreadPool m_threadPool;
- private final Mutex m_mutex = new Mutex();
+ private final ReentrantLock m_mutex = new ReentrantLock();
private final HashMap m_pipelines = new HashMap();
private ThreadControl m_threadControl;
private boolean m_done = false;
1.5 +5 -5
jakarta-avalon-excalibur/event/src/java/org/apache/excalibur/event/impl/DefaultQueue.java
Index: DefaultQueue.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/event/src/java/org/apache/excalibur/event/impl/DefaultQueue.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultQueue.java 2 Oct 2002 15:39:29 -0000 1.4
+++ DefaultQueue.java 2 Oct 2002 17:49:20 -0000 1.5
@@ -51,7 +51,7 @@
import org.apache.commons.collections.Buffer;
import org.apache.commons.collections.UnboundedFifoBuffer;
-import org.apache.avalon.excalibur.concurrent.Mutex;
+import EDU.oswego.cs.dl.util.concurrent.ReentrantLock;
import org.apache.excalibur.event.PreparedEnqueue;
import org.apache.excalibur.event.SinkException;
import org.apache.excalibur.event.SinkFullException;
@@ -66,7 +66,7 @@
public final class DefaultQueue extends AbstractQueue
{
private final Buffer m_elements;
- private final Mutex m_mutex;
+ private final ReentrantLock m_mutex;
private int m_reserve;
private final int m_maxSize;
@@ -94,7 +94,7 @@
maxSize = -1;
}
- m_mutex = new Mutex();
+ m_mutex = new ReentrantLock();
m_reserve = 0;
m_maxSize = maxSize;
}
@@ -313,7 +313,7 @@
for( int i = 0; i < count; i++ )
{
- elements[ i ] = (Object)buf.remove();
+ elements[ i ] = buf.remove();
}
return elements;
@@ -331,7 +331,7 @@
{
if( size() > 0 )
{
- element = (Object)m_elements.remove();
+ element = m_elements.remove();
}
}
finally
1.5 +3 -3
jakarta-avalon-excalibur/event/src/java/org/apache/excalibur/event/impl/FixedSizeQueue.java
Index: FixedSizeQueue.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/event/src/java/org/apache/excalibur/event/impl/FixedSizeQueue.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FixedSizeQueue.java 2 Oct 2002 01:46:58 -0000 1.4
+++ FixedSizeQueue.java 2 Oct 2002 17:49:20 -0000 1.5
@@ -49,7 +49,7 @@
*/
package org.apache.excalibur.event.impl;
-import org.apache.avalon.excalibur.concurrent.Mutex;
+import EDU.oswego.cs.dl.util.concurrent.ReentrantLock;
import org.apache.excalibur.event.PreparedEnqueue;
import org.apache.excalibur.event.SinkException;
import org.apache.excalibur.event.SinkFullException;
@@ -65,7 +65,7 @@
extends AbstractQueue
{
private final Object[] m_elements;
- private final Mutex m_mutex;
+ private final ReentrantLock m_mutex;
private int m_start = 0;
private int m_end = 0;
private int m_reserve = 0;
@@ -82,7 +82,7 @@
throw new IllegalArgumentException( "Cannot specify an unbounded Queue"
);
m_elements = new Object[ size + 1 ];
- m_mutex = new Mutex();
+ m_mutex = new ReentrantLock();
}
public int size()
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
