donaldp 01/04/16 20:09:54
Modified: lib avalonapi.jar
src/java/org/apache/phoenix BlockContext.java
src/java/org/apache/phoenix/engine DefaultSarDeployer.java
src/java/org/apache/phoenix/engine/blocks
DefaultBlockContext.java DefaultBlockDeployer.java
src/java/org/apache/phoenix/engine/facilities
ThreadManager.java
src/java/org/apache/phoenix/engine/facilities/classloader
SarClassLoader.java
src/java/org/apache/phoenix/engine/facilities/policy
AbstractPolicy.java
src/java/org/apache/phoenix/engine/facilities/thread
DefaultThreadManager.java
src/java/org/apache/phoenix/engine/phases ShutdownPhase.java
StartupPhase.java
Log:
Updated to excalibur hierarchy
Revision Changes Path
1.15 +375 -400 jakarta-avalon-phoenix/lib/avalonapi.jar
<<Binary file>>
1.4 +1 -1
jakarta-avalon-phoenix/src/java/org/apache/phoenix/BlockContext.java
Index: BlockContext.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/BlockContext.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BlockContext.java 2001/04/11 10:06:56 1.3
+++ BlockContext.java 2001/04/17 03:09:44 1.4
@@ -9,7 +9,7 @@
import java.io.File;
import org.apache.avalon.Context;
-import org.apache.avalon.util.thread.ThreadPool;
+import org.apache.excalibur.thread.ThreadPool;
import org.apache.log.Logger;
/**
1.10 +2 -2
jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/DefaultSarDeployer.java
Index: DefaultSarDeployer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/DefaultSarDeployer.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DefaultSarDeployer.java 2001/04/16 08:23:23 1.9
+++ DefaultSarDeployer.java 2001/04/17 03:09:45 1.10
@@ -42,8 +42,8 @@
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
import org.apache.avalon.configuration.DefaultConfigurationBuilder;
-import org.apache.avalon.util.io.FileUtil;
-import org.apache.avalon.util.io.IOUtil;
+import org.apache.excalibur.io.FileUtil;
+import org.apache.excalibur.io.IOUtil;
import org.apache.phoenix.BlockContext;
import org.apache.phoenix.engine.blocks.BlockEntry;
import org.apache.phoenix.engine.blocks.DefaultBlockDeployer;
1.5 +1 -1
jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/blocks/DefaultBlockContext.java
Index: DefaultBlockContext.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/blocks/DefaultBlockContext.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultBlockContext.java 2001/04/15 13:29:57 1.4
+++ DefaultBlockContext.java 2001/04/17 03:09:47 1.5
@@ -10,7 +10,7 @@
import java.io.File;
import org.apache.avalon.Context;
import org.apache.avalon.DefaultContext;
-import org.apache.avalon.util.thread.ThreadPool;
+import org.apache.excalibur.thread.ThreadPool;
import org.apache.log.Logger;
import org.apache.phoenix.BlockContext;
import org.apache.phoenix.engine.facilities.ThreadManager;
1.4 +1 -1
jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/blocks/DefaultBlockDeployer.java
Index: DefaultBlockDeployer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/blocks/DefaultBlockDeployer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultBlockDeployer.java 2001/04/16 08:23:23 1.3
+++ DefaultBlockDeployer.java 2001/04/17 03:09:47 1.4
@@ -23,7 +23,7 @@
import org.apache.avalon.camelot.DefaultLocator;
import org.apache.avalon.camelot.Registry;
import org.apache.avalon.camelot.RegistryException;
-import org.apache.avalon.util.io.IOUtil;
+import org.apache.excalibur.io.IOUtil;
import org.apache.phoenix.metainfo.BlockInfo;
import org.apache.phoenix.metainfo.BlockInfoBuilder;
import org.apache.avalon.ComponentManager;
1.2 +1 -1
jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/facilities/ThreadManager.java
Index: ThreadManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/facilities/ThreadManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ThreadManager.java 2001/04/15 12:11:16 1.1
+++ ThreadManager.java 2001/04/17 03:09:49 1.2
@@ -8,7 +8,7 @@
package org.apache.phoenix.engine.facilities;
import org.apache.avalon.atlantis.Facility;
-import org.apache.avalon.util.thread.ThreadPool;
+import org.apache.excalibur.thread.ThreadPool;
/**
* This facility manages the policy for an application instance.
1.2 +1 -1
jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/facilities/classloader/SarClassLoader.java
Index: SarClassLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/facilities/classloader/SarClassLoader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SarClassLoader.java 2001/04/15 13:27:43 1.1
+++ SarClassLoader.java 2001/04/17 03:09:50 1.2
@@ -18,7 +18,7 @@
import org.apache.avalon.Contextualizable;
import org.apache.avalon.Initializable;
import org.apache.avalon.atlantis.Facility;
-import org.apache.avalon.util.io.ExtensionFileFilter;
+import org.apache.excalibur.io.ExtensionFileFilter;
import org.apache.phoenix.engine.SarContextResources;
import org.apache.phoenix.engine.facilities.PolicyManager;
1.2 +1 -1
jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/facilities/policy/AbstractPolicy.java
Index: AbstractPolicy.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/facilities/policy/AbstractPolicy.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractPolicy.java 2001/04/15 12:12:39 1.1
+++ AbstractPolicy.java 2001/04/17 03:09:51 1.2
@@ -24,7 +24,7 @@
import java.util.PropertyPermission;
import org.apache.avalon.Component;
import org.apache.avalon.Loggable;
-import org.apache.avalon.util.io.FileUtil;
+import org.apache.excalibur.io.FileUtil;
import org.apache.log.Logger;
/**
1.2 +2 -2
jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/facilities/thread/DefaultThreadManager.java
Index: DefaultThreadManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/facilities/thread/DefaultThreadManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultThreadManager.java 2001/04/15 13:51:49 1.1
+++ DefaultThreadManager.java 2001/04/17 03:09:52 1.2
@@ -14,8 +14,8 @@
import org.apache.avalon.configuration.Configurable;
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.util.thread.DefaultThreadPool;
-import org.apache.avalon.util.thread.ThreadPool;
+import org.apache.excalibur.thread.DefaultThreadPool;
+import org.apache.excalibur.thread.ThreadPool;
import org.apache.phoenix.engine.facilities.ThreadManager;
/**
1.5 +1 -1
jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/phases/ShutdownPhase.java
Index: ShutdownPhase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/phases/ShutdownPhase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ShutdownPhase.java 2001/04/15 13:29:58 1.4
+++ ShutdownPhase.java 2001/04/17 03:09:53 1.5
@@ -14,7 +14,7 @@
import org.apache.avalon.Disposable;
import org.apache.avalon.Stoppable;
import org.apache.avalon.atlantis.ApplicationException;
-import org.apache.avalon.util.thread.ThreadContext;
+import org.apache.excalibur.thread.ThreadContext;
import org.apache.phoenix.engine.facilities.ThreadManager;
import org.apache.phoenix.engine.blocks.BlockEntry;
import org.apache.phoenix.engine.blocks.BlockVisitor;
1.7 +1 -1
jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/phases/StartupPhase.java
Index: StartupPhase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/phases/StartupPhase.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- StartupPhase.java 2001/04/16 08:02:32 1.6
+++ StartupPhase.java 2001/04/17 03:09:53 1.7
@@ -28,7 +28,7 @@
import org.apache.avalon.component.ComponentException;
import org.apache.avalon.configuration.Configurable;
import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.util.thread.ThreadContext;
+import org.apache.excalibur.thread.ThreadContext;
import org.apache.phoenix.Block;
import org.apache.phoenix.BlockContext;
import org.apache.phoenix.engine.SarContextResources;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
