donaldp 2002/06/03 23:33:01
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
Added: lib excalibur-containerkit-1.0.jar
Removed: src/java/org/apache/avalon/phoenix/components/container/metainfo
ComponentDescriptor.java ComponentInfo.java
DependencyDescriptor.java ServiceDescriptor.java
src/java/org/apache/avalon/phoenix/components/container/lifecycle
LifecycleException.java LifecycleHelper.java
ResourceAccessor.java Resources.properties
src/java/org/apache/avalon/phoenix/components/container/verifier
Resources.properties Verifier.java
VerifyException.java
Log:
Use Excalibur ContainerKit to implement generic portion of container
Revision Changes Path
1.6 +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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BlockAccessor.java 4 Jun 2002 04:36:13 -0000 1.5
+++ BlockAccessor.java 4 Jun 2002 06:33:00 -0000 1.6
@@ -21,18 +21,18 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.DefaultServiceManager;
import org.apache.avalon.framework.service.ServiceManager;
-import
org.apache.avalon.phoenix.components.container.lifecycle.ResourceAccessor;
import org.apache.avalon.phoenix.interfaces.Application;
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;
/**
* The accessor used to access resources for a particular
* Block or Listener.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.5 $ $Date: 2002/06/04 04:36:13 $
+ * @version $Revision: 1.6 $ $Date: 2002/06/04 06:33:00 $
*/
class BlockAccessor
extends AbstractLogEnabled
1.26 +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.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- DefaultApplication.java 4 Jun 2002 04:36:13 -0000 1.25
+++ DefaultApplication.java 4 Jun 2002 06:33:00 -0000 1.26
@@ -19,8 +19,6 @@
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.phoenix.ApplicationListener;
import org.apache.avalon.phoenix.BlockListener;
-import
org.apache.avalon.phoenix.components.container.lifecycle.LifecycleException;
-import
org.apache.avalon.phoenix.components.container.lifecycle.LifecycleHelper;
import org.apache.avalon.phoenix.interfaces.Application;
import org.apache.avalon.phoenix.interfaces.ApplicationContext;
import org.apache.avalon.phoenix.interfaces.ApplicationException;
@@ -29,6 +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;
/**
* This is the basic container of blocks. A server application
1.8 +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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ListenerAccessor.java 4 Jun 2002 04:36:13 -0000 1.7
+++ ListenerAccessor.java 4 Jun 2002 06:33:00 -0000 1.8
@@ -18,16 +18,16 @@
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.ServiceManager;
-import
org.apache.avalon.phoenix.components.container.lifecycle.ResourceAccessor;
import org.apache.avalon.phoenix.interfaces.ApplicationContext;
import org.apache.avalon.phoenix.metadata.BlockListenerMetaData;
+import org.apache.excalibur.containerkit.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 04:36:13 $
+ * @version $Revision: 1.8 $ $Date: 2002/06/04 06:33:00 $
*/
class ListenerAccessor
extends AbstractLogEnabled
1.38 +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.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- DefaultDeployer.java 4 Jun 2002 04:36:13 -0000 1.37
+++ DefaultDeployer.java 4 Jun 2002 06:33:00 -0000 1.38
@@ -30,7 +30,6 @@
import org.apache.avalon.phoenix.components.deployer.installer.Installation;
import org.apache.avalon.phoenix.components.deployer.installer.Installer;
import
org.apache.avalon.phoenix.components.deployer.installer.InstallationException;
-import
org.apache.avalon.phoenix.components.container.verifier.VerifyException;
import org.apache.avalon.phoenix.interfaces.Application;
import org.apache.avalon.phoenix.interfaces.ClassLoaderManager;
import org.apache.avalon.phoenix.interfaces.ConfigurationRepository;
@@ -47,6 +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;
/**
* Deploy .sar files into a kernel using this class.
1.1 jakarta-avalon-phoenix/lib/excalibur-containerkit-1.0.jar
<<Binary file>>
1.19 +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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- SarVerifier.java 4 Jun 2002 04:36:13 -0000 1.18
+++ SarVerifier.java 4 Jun 2002 06:33:00 -0000 1.19
@@ -23,8 +23,6 @@
import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.phoenix.Block;
import org.apache.avalon.phoenix.BlockListener;
-import org.apache.avalon.phoenix.components.container.verifier.Verifier;
-import
org.apache.avalon.phoenix.components.container.verifier.VerifyException;
import org.apache.avalon.phoenix.metadata.BlockListenerMetaData;
import org.apache.avalon.phoenix.metadata.BlockMetaData;
import org.apache.avalon.phoenix.metadata.DependencyMetaData;
@@ -32,6 +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;
/**
* 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.18 $ $Date: 2002/06/04 04:36:13 $
+ * @version $Revision: 1.19 $ $Date: 2002/06/04 06:33:00 $
*/
public class SarVerifier
extends AbstractLogEnabled
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
