donaldp 02/04/09 03:55:51
Modified: . build.xml
src/java/org/apache/avalon/phoenix/components/application
DefaultApplication.java
src/java/org/apache/avalon/phoenix/components/kernel
DefaultApplicationContext.java
src/java/org/apache/avalon/phoenix/interfaces
ApplicationContext.java
Added: lib excalibur-extension-1.0a.jar excalibur-io-1.0.jar
excalibur-stripped.jar
Removed: lib avalon-excalibur-4.1.jar avalon-scratchpad-4.1.jar
Log:
Update to new ThreadContext location.
Revision Changes Path
1.112 +5 -6 jakarta-avalon-phoenix/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-phoenix/build.xml,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- build.xml 3 Apr 2002 09:06:53 -0000 1.111
+++ build.xml 9 Apr 2002 10:55:50 -0000 1.112
@@ -58,8 +58,6 @@
<property name="xerces.jar" value="${xerces.dir}/${xerces.file}"/>
<property name="xalan.jar" value="${tools.dir}/lib/xalan-2.2.0-D8.jar"/>
<property name="framework.jar"
value="${lib.dir}/avalon-framework-20022103.jar"/>
- <property name="excalibur.jar"
value="${lib.dir}/avalon-excalibur-4.1.jar"/>
- <property name="scratchpad.jar"
value="${lib.dir}/avalon-scratchpad-4.1.jar"/>
<property name="logkit.jar" value="${lib.dir}/logkit-1.0.1.jar"/>
<property name="jmxri.jar" value="${lib.dir}/jmxri.jar"/>
<property name="jmxtools.jar" value="${lib.dir}/jmxtools.jar"/>
@@ -68,8 +66,6 @@
<path id="project.class.path">
<pathelement location="${xerces.jar}"/>
<pathelement location="${framework.jar}"/>
- <pathelement location="${excalibur.jar}"/>
- <pathelement location="${scratchpad.jar}"/>
<pathelement location="${logkit.jar}"/>
<pathelement location="${jmxri.jar}"/>
<pathelement location="${jmxtools.jar}"/>
@@ -299,8 +295,11 @@
<copy file="${lib.dir}/excalibur-baxter-1.0a.jar"
todir="${bin.dist.lib}"/>
<copy file="${logkit.jar}" todir="${bin.dist.lib}"/>
<copy file="${framework.jar}" todir="${bin.dist.lib}"/>
- <copy file="${excalibur.jar}" todir="${bin.dist.lib}"/>
- <copy file="${scratchpad.jar}" todir="${bin.dist.lib}"/>
+ <copy todir="${bin.dist.lib}">
+ <fileset dir="lib">
+ <include name="excalibur*.jar"/>
+ </fileset>
+ </copy>
<copy file="${xerces.jar}" todir="${bin.dist.lib}"/>
<copy file="${conf.dir}/kernel.xml" todir="${bin.dist.conf}"/>
<!--
1.1 jakarta-avalon-phoenix/lib/excalibur-extension-1.0a.jar
<<Binary file>>
1.1 jakarta-avalon-phoenix/lib/excalibur-io-1.0.jar
<<Binary file>>
1.1 jakarta-avalon-phoenix/lib/excalibur-stripped.jar
<<Binary file>>
1.11 +1 -1
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/DefaultApplication.java
Index: DefaultApplication.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/DefaultApplication.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DefaultApplication.java 16 Mar 2002 00:11:54 -0000 1.10
+++ DefaultApplication.java 9 Apr 2002 10:55:50 -0000 1.11
@@ -12,7 +12,7 @@
import java.util.List;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
-import org.apache.avalon.excalibur.lang.ThreadContext;
+import org.apache.excalibur.threadcontext.ThreadContext;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.phoenix.ApplicationEvent;
import org.apache.avalon.phoenix.Block;
1.11 +3 -3
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/DefaultApplicationContext.java
Index: DefaultApplicationContext.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/DefaultApplicationContext.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DefaultApplicationContext.java 16 Mar 2002 00:11:55 -0000 1.10
+++ DefaultApplicationContext.java 9 Apr 2002 10:55:50 -0000 1.11
@@ -10,9 +10,9 @@
import java.util.HashMap;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
-import org.apache.avalon.excalibur.lang.DefaultThreadContextPolicy;
-import org.apache.avalon.excalibur.lang.ThreadContext;
-import org.apache.avalon.excalibur.lang.ThreadContextPolicy;
+import org.apache.excalibur.threadcontext.DefaultThreadContextPolicy;
+import org.apache.excalibur.threadcontext.ThreadContext;
+import org.apache.excalibur.threadcontext.ThreadContextPolicy;
import org.apache.avalon.excalibur.thread.ThreadPool;
import org.apache.avalon.excalibur.thread.impl.DefaultThreadPool;
import org.apache.avalon.framework.component.ComponentException;
1.7 +1 -1
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/ApplicationContext.java
Index: ApplicationContext.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/ApplicationContext.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ApplicationContext.java 17 Feb 2002 11:15:28 -0000 1.6
+++ ApplicationContext.java 9 Apr 2002 10:55:50 -0000 1.7
@@ -7,7 +7,7 @@
*/
package org.apache.avalon.phoenix.interfaces;
-import org.apache.avalon.excalibur.lang.ThreadContext;
+import org.apache.excalibur.threadcontext.ThreadContext;
import org.apache.avalon.excalibur.thread.ThreadPool;
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.configuration.Configuration;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
