donaldp 2003/03/22 16:19:49
Modified: src/java/org/apache/avalon/phoenix/components/application
BlockEntry.java DefaultApplication.java
src/java/org/apache/avalon/phoenix/components/assembler
Assembler.java
src/java/org/apache/avalon/phoenix/components/deployer
DefaultDeployer.java PhoenixProfileBuilder.java
src/java/org/apache/avalon/phoenix/components/embeddor
DefaultEmbeddor.java
src/java/org/apache/avalon/phoenix/components/kernel
DefaultApplicationContext.java
src/java/org/apache/avalon/phoenix/components/util
ComponentMetaDataConverter.java
src/java/org/apache/avalon/phoenix/frontends CLIMain.java
src/java/org/apache/avalon/phoenix/tools/verifier
SarVerifier.java
src/test/org/apache/avalon/phoenix/test
AbstractContainerTestCase.java
src/test/org/apache/avalon/phoenix/tools/assembler/test
AssemblerTestCase.java
Added: src/java/org/apache/avalon/phoenix/interfaces
ContainerConstants.java
Removed: src/java/org/apache/avalon/phoenix/components
ContainerConstants.java
Log:
Migrate ContainerConstants into interfaces package.
Revision Changes Path
1.31 +1 -1
avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/BlockEntry.java
Index: BlockEntry.java
===================================================================
RCS file:
/home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/BlockEntry.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- BlockEntry.java 22 Mar 2003 12:07:07 -0000 1.30
+++ BlockEntry.java 23 Mar 2003 00:19:48 -0000 1.31
@@ -53,7 +53,7 @@
import org.apache.avalon.phoenix.framework.info.Attribute;
import org.apache.avalon.phoenix.framework.info.ComponentInfo;
import org.apache.avalon.phoenix.framework.info.ServiceDescriptor;
-import org.apache.avalon.phoenix.components.ContainerConstants;
+import org.apache.avalon.phoenix.interfaces.ContainerConstants;
import org.apache.avalon.phoenix.containerkit.profile.ComponentProfile;
/**
1.45 +1 -1
avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/DefaultApplication.java
Index: DefaultApplication.java
===================================================================
RCS file:
/home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/DefaultApplication.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- DefaultApplication.java 22 Mar 2003 12:07:07 -0000 1.44
+++ DefaultApplication.java 23 Mar 2003 00:19:48 -0000 1.45
@@ -63,7 +63,7 @@
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.ContainerConstants;
+import org.apache.avalon.phoenix.interfaces.ContainerConstants;
import org.apache.avalon.phoenix.components.util.ComponentMetaDataConverter;
import org.apache.avalon.phoenix.containerkit.lifecycle.LifecycleException;
import org.apache.avalon.phoenix.containerkit.lifecycle.LifecycleHelper;
1.8 +4 -4
avalon-phoenix/src/java/org/apache/avalon/phoenix/components/assembler/Assembler.java
Index: Assembler.java
===================================================================
RCS file:
/home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/assembler/Assembler.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Assembler.java 22 Mar 2003 12:07:08 -0000 1.7
+++ Assembler.java 23 Mar 2003 00:19:48 -0000 1.8
@@ -59,7 +59,7 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.phoenix.framework.info.Attribute;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.phoenix.components.ContainerConstants;
+import org.apache.avalon.phoenix.interfaces.ContainerConstants;
import org.apache.avalon.phoenix.containerkit.metadata.ComponentMetaData;
import org.apache.avalon.phoenix.containerkit.metadata.DependencyMetaData;
import org.apache.avalon.phoenix.containerkit.metadata.MetaDataBuilder;
@@ -83,9 +83,9 @@
/**
* Create a [EMAIL PROTECTED] PartitionMetaData} object based on specified
* name and assembly configuration. This implementation takes two
- * parameters. [EMAIL PROTECTED] ContainerConstants#ASSEMBLY_NAME} specifies
+ * parameters. [EMAIL PROTECTED]
org.apache.avalon.phoenix.interfaces.ContainerConstants#ASSEMBLY_NAME} specifies
* the name of the assembly and
- * [EMAIL PROTECTED] ContainerConstants#ASSEMBLY_CONFIG} specifies the
configuration
+ * [EMAIL PROTECTED]
org.apache.avalon.phoenix.interfaces.ContainerConstants#ASSEMBLY_CONFIG} specifies the
configuration
* tree to use when assembling Partition.
*
* @param parameters the parameters for constructing assembly
1.74 +2 -2
avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/DefaultDeployer.java
Index: DefaultDeployer.java
===================================================================
RCS file:
/home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/DefaultDeployer.java,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- DefaultDeployer.java 22 Mar 2003 12:07:09 -0000 1.73
+++ DefaultDeployer.java 23 Mar 2003 00:19:48 -0000 1.74
@@ -70,7 +70,7 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.phoenix.BlockContext;
-import org.apache.avalon.phoenix.components.ContainerConstants;
+import org.apache.avalon.phoenix.interfaces.ContainerConstants;
import org.apache.avalon.phoenix.containerkit.metadata.PartitionMetaData;
import org.apache.avalon.phoenix.containerkit.profile.ComponentProfile;
import org.apache.avalon.phoenix.containerkit.profile.PartitionProfile;
@@ -303,7 +303,7 @@
//Load hierarchy before classloader placed in context as
//that way the logFactory will not try to use the application
//specific classloader to load the targets which will cause
- //CastClassExceptions
+ //CastClassExceptions
final Logger logger =
m_logManager.createHierarchy( logs, context );
1.6 +2 -2
avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/PhoenixProfileBuilder.java
Index: PhoenixProfileBuilder.java
===================================================================
RCS file:
/home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/PhoenixProfileBuilder.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PhoenixProfileBuilder.java 22 Mar 2003 12:07:09 -0000 1.5
+++ PhoenixProfileBuilder.java 23 Mar 2003 00:19:48 -0000 1.6
@@ -58,7 +58,7 @@
import org.apache.avalon.phoenix.containerkit.factory.ComponentFactory;
import org.apache.avalon.phoenix.containerkit.factory.ComponentBundle;
import org.apache.avalon.phoenix.components.assembler.Assembler;
-import org.apache.avalon.phoenix.components.ContainerConstants;
+import org.apache.avalon.phoenix.interfaces.ContainerConstants;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.phoenix.framework.info.ComponentInfo;
1.87 +1 -1
avalon-phoenix/src/java/org/apache/avalon/phoenix/components/embeddor/DefaultEmbeddor.java
Index: DefaultEmbeddor.java
===================================================================
RCS file:
/home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/embeddor/DefaultEmbeddor.java,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- DefaultEmbeddor.java 22 Mar 2003 12:07:09 -0000 1.86
+++ DefaultEmbeddor.java 23 Mar 2003 00:19:48 -0000 1.87
@@ -74,7 +74,7 @@
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.ContainerConstants;
+import org.apache.avalon.phoenix.interfaces.ContainerConstants;
import org.apache.avalon.phoenix.interfaces.Deployer;
import org.apache.avalon.phoenix.interfaces.Embeddor;
import org.apache.avalon.phoenix.interfaces.EmbeddorMBean;
1.39 +1 -1
avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/DefaultApplicationContext.java
Index: DefaultApplicationContext.java
===================================================================
RCS file:
/home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/DefaultApplicationContext.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- DefaultApplicationContext.java 22 Mar 2003 12:07:10 -0000 1.38
+++ DefaultApplicationContext.java 23 Mar 2003 00:19:48 -0000 1.39
@@ -67,7 +67,7 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
-import org.apache.avalon.phoenix.components.ContainerConstants;
+import org.apache.avalon.phoenix.interfaces.ContainerConstants;
import org.apache.avalon.phoenix.components.util.ResourceUtil;
import org.apache.avalon.phoenix.containerkit.metadata.PartitionMetaData;
import org.apache.avalon.phoenix.containerkit.profile.PartitionProfile;
1.9 +2 -2
avalon-phoenix/src/java/org/apache/avalon/phoenix/components/util/ComponentMetaDataConverter.java
Index: ComponentMetaDataConverter.java
===================================================================
RCS file:
/home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/util/ComponentMetaDataConverter.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ComponentMetaDataConverter.java 22 Mar 2003 12:07:11 -0000 1.8
+++ ComponentMetaDataConverter.java 23 Mar 2003 00:19:49 -0000 1.9
@@ -54,7 +54,7 @@
import java.util.ArrayList;
import org.apache.avalon.phoenix.framework.info.Attribute;
import org.apache.avalon.phoenix.framework.info.ComponentInfo;
-import org.apache.avalon.phoenix.components.ContainerConstants;
+import org.apache.avalon.phoenix.interfaces.ContainerConstants;
import org.apache.avalon.phoenix.containerkit.metadata.ComponentMetaData;
import org.apache.avalon.phoenix.containerkit.profile.ComponentProfile;
import org.apache.avalon.phoenix.containerkit.profile.PartitionProfile;
1.49 +1 -1
avalon-phoenix/src/java/org/apache/avalon/phoenix/frontends/CLIMain.java
Index: CLIMain.java
===================================================================
RCS file:
/home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/frontends/CLIMain.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- CLIMain.java 22 Mar 2003 12:07:14 -0000 1.48
+++ CLIMain.java 23 Mar 2003 00:19:49 -0000 1.49
@@ -65,7 +65,7 @@
import org.apache.avalon.framework.logger.LogKitLogger;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.phoenix.components.ContainerConstants;
+import org.apache.avalon.phoenix.interfaces.ContainerConstants;
import org.apache.avalon.phoenix.interfaces.Embeddor;
import org.apache.log.Hierarchy;
import org.apache.log.LogTarget;
1.1
avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/ContainerConstants.java
Index: ContainerConstants.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
package org.apache.avalon.phoenix.interfaces;
/**
* A set of constants that are used internally in the container to communicate
* about different artefacts. They usually act as keys into maps.
*
* @author <a href="mailto:peter at apache.org">Peter Donald</a>
*/
public interface ContainerConstants
{
/**
* The name of the software. (Usually phoenix but different
* users may overide this).
*/
String SOFTWARE = "@@NAME@@";
/**
* The version of the software.
*/
String VERSION = "@@VERSION@@";
/**
* The date on which software was built.
*/
String DATE = "@@DATE@@";
/**
* The name of the attribute used to determine whether
* a block is not proxied.
*/
String DISABLE_PROXY_ATTR = "phoenix:disable-proxy";
/**
* The name which the assembly is registered into phoenix
* using.
*/
String ASSEMBLY_NAME = "phoenix:assembly-name";
/**
* The name of the config file which is used
* to load assembly data.
*/
String ASSEMBLY_CONFIG = "phoenix:config";
/**
* The default classloader to use to load components.
*/
String ASSEMBLY_CLASSLOADER = "phoenix:classloader";
/**
* The name of the partition in which blocks are contained.
*/
String BLOCK_PARTITION = "block";
/**
* The name of the partition in which listeners are contained.
*/
String LISTENER_PARTITION = "listener";
String ROOT_INSTRUMENT_CATEGORY = "applications";
}
1.36 +2 -2
avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/verifier/SarVerifier.java
Index: SarVerifier.java
===================================================================
RCS file:
/home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/verifier/SarVerifier.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- SarVerifier.java 22 Mar 2003 12:07:16 -0000 1.35
+++ SarVerifier.java 23 Mar 2003 00:19:49 -0000 1.36
@@ -55,7 +55,7 @@
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.phoenix.framework.tools.verifier.InfoVerifier;
import org.apache.avalon.phoenix.framework.tools.verifier.VerifyException;
-import org.apache.avalon.phoenix.components.ContainerConstants;
+import org.apache.avalon.phoenix.interfaces.ContainerConstants;
import org.apache.avalon.phoenix.containerkit.metadata.ComponentMetaData;
import org.apache.avalon.phoenix.containerkit.profile.ComponentProfile;
import org.apache.avalon.phoenix.containerkit.profile.PartitionProfile;
1.8 +2 -2
avalon-phoenix/src/test/org/apache/avalon/phoenix/test/AbstractContainerTestCase.java
Index: AbstractContainerTestCase.java
===================================================================
RCS file:
/home/cvs/avalon-phoenix/src/test/org/apache/avalon/phoenix/test/AbstractContainerTestCase.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AbstractContainerTestCase.java 22 Mar 2003 12:07:17 -0000 1.7
+++ AbstractContainerTestCase.java 23 Mar 2003 00:19:49 -0000 1.8
@@ -56,7 +56,7 @@
import junit.framework.TestCase;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.logger.ConsoleLogger;
-import org.apache.avalon.phoenix.components.ContainerConstants;
+import org.apache.avalon.phoenix.interfaces.ContainerConstants;
import org.apache.avalon.phoenix.components.deployer.PhoenixProfileBuilder;
import org.apache.avalon.phoenix.containerkit.profile.PartitionProfile;
import org.apache.avalon.phoenix.tools.configuration.ConfigurationBuilder;
1.12 +2 -2
avalon-phoenix/src/test/org/apache/avalon/phoenix/tools/assembler/test/AssemblerTestCase.java
Index: AssemblerTestCase.java
===================================================================
RCS file:
/home/cvs/avalon-phoenix/src/test/org/apache/avalon/phoenix/tools/assembler/test/AssemblerTestCase.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AssemblerTestCase.java 22 Mar 2003 12:07:18 -0000 1.11
+++ AssemblerTestCase.java 23 Mar 2003 00:19:49 -0000 1.12
@@ -58,7 +58,7 @@
import org.apache.avalon.phoenix.containerkit.profile.PartitionProfile;
import org.apache.avalon.phoenix.containerkit.profile.ComponentProfile;
import org.apache.avalon.phoenix.containerkit.metadata.DependencyMetaData;
-import org.apache.avalon.phoenix.components.ContainerConstants;
+import org.apache.avalon.phoenix.interfaces.ContainerConstants;
/**
* An basic test case for the LogManager.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
