donaldp 2002/06/04 00:51:07
Modified: src/java/org/apache/avalon/phoenix/components/application
BlockAccessor.java DefaultApplication.java
ListenerAccessor.java
src/java/org/apache/avalon/phoenix/components/deployer
DefaultDeployer.java
src/java/org/apache/avalon/phoenix/tools/verifier
SarVerifier.java
Log:
Update import statements to reflect new packaging of containerkit
Revision Changes Path
1.8 +2 -2
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/BlockAccessor.java
Index: BlockAccessor.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/BlockAccessor.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- BlockAccessor.java 4 Jun 2002 06:58:11 -0000 1.7
+++ BlockAccessor.java 4 Jun 2002 07:51:07 -0000 1.8
@@ -25,14 +25,14 @@
import org.apache.avalon.phoenix.interfaces.ApplicationContext;
import org.apache.avalon.phoenix.metadata.BlockMetaData;
import org.apache.avalon.phoenix.metadata.DependencyMetaData;
-import org.apache.excalibur.containerkit.ResourceAccessor;
+import org.apache.excalibur.containerkit.lifecycle.ResourceAccessor;
/**
* The accessor used to access resources for a particular
* Block or Listener.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.7 $ $Date: 2002/06/04 06:58:11 $
+ * @version $Revision: 1.8 $ $Date: 2002/06/04 07:51:07 $
*/
class BlockAccessor
extends AbstractLogEnabled
1.27 +2 -2
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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- DefaultApplication.java 4 Jun 2002 06:33:00 -0000 1.26
+++ DefaultApplication.java 4 Jun 2002 07:51:07 -0000 1.27
@@ -27,8 +27,8 @@
import org.apache.avalon.phoenix.metadata.BlockMetaData;
import org.apache.avalon.phoenix.metadata.SarMetaData;
import org.apache.excalibur.threadcontext.ThreadContext;
-import org.apache.excalibur.containerkit.LifecycleException;
-import org.apache.excalibur.containerkit.LifecycleHelper;
+import org.apache.excalibur.containerkit.lifecycle.LifecycleHelper;
+import org.apache.excalibur.containerkit.lifecycle.LifecycleException;
/**
* This is the basic container of blocks. A server application
1.9 +2 -2
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/ListenerAccessor.java
Index: ListenerAccessor.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/ListenerAccessor.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ListenerAccessor.java 4 Jun 2002 06:33:00 -0000 1.8
+++ ListenerAccessor.java 4 Jun 2002 07:51:07 -0000 1.9
@@ -20,14 +20,14 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.phoenix.interfaces.ApplicationContext;
import org.apache.avalon.phoenix.metadata.BlockListenerMetaData;
-import org.apache.excalibur.containerkit.ResourceAccessor;
+import org.apache.excalibur.containerkit.lifecycle.ResourceAccessor;
/**
* The accessor used to access resources for a particular
* Block or Listener.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.8 $ $Date: 2002/06/04 06:33:00 $
+ * @version $Revision: 1.9 $ $Date: 2002/06/04 07:51:07 $
*/
class ListenerAccessor
extends AbstractLogEnabled
1.39 +1 -1
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/DefaultDeployer.java
Index: DefaultDeployer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/DefaultDeployer.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- DefaultDeployer.java 4 Jun 2002 06:33:00 -0000 1.38
+++ DefaultDeployer.java 4 Jun 2002 07:51:07 -0000 1.39
@@ -46,7 +46,7 @@
import org.apache.avalon.phoenix.tools.configuration.ConfigurationBuilder;
import org.apache.avalon.phoenix.tools.verifier.SarVerifier;
import org.apache.log.Hierarchy;
-import org.apache.excalibur.containerkit.VerifyException;
+import org.apache.excalibur.containerkit.verifier.VerifyException;
/**
* Deploy .sar files into a kernel using this class.
1.21 +3 -3
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/verifier/SarVerifier.java
Index: SarVerifier.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/verifier/SarVerifier.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- SarVerifier.java 4 Jun 2002 06:58:11 -0000 1.20
+++ SarVerifier.java 4 Jun 2002 07:51:07 -0000 1.21
@@ -30,8 +30,8 @@
import org.apache.avalon.phoenix.metainfo.BlockInfo;
import org.apache.avalon.phoenix.metainfo.DependencyDescriptor;
import org.apache.avalon.phoenix.metainfo.ServiceDescriptor;
-import org.apache.excalibur.containerkit.VerifyException;
-import org.apache.excalibur.containerkit.Verifier;
+import org.apache.excalibur.containerkit.verifier.VerifyException;
+import org.apache.excalibur.containerkit.verifier.Verifier;
/**
* This Class verifies that Sars are valid. It performs a number
@@ -59,7 +59,7 @@
* </ul>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.20 $ $Date: 2002/06/04 06:58:11 $
+ * @version $Revision: 1.21 $ $Date: 2002/06/04 07:51:07 $
*/
public class SarVerifier
extends AbstractLogEnabled
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
