donaldp 2003/03/01 00:39:16
Modified: src/java/org/apache/avalon/phoenix/components/application
BlockEntry.java BlockResourceProvider.java
DefaultApplication.java DependencyGraph.java
ExportHelper.java ListenerResourceProvider.java
ListenerSupport.java
src/java/org/apache/avalon/phoenix/components/deployer
DefaultDeployer.java PhoenixProfileBuilder.java
src/java/org/apache/avalon/phoenix/components/kernel
DefaultApplicationContext.java DefaultKernel.java
SarEntry.java
src/java/org/apache/avalon/phoenix/components/kernel/beanshell
BeanShellKernelProxy.java
src/java/org/apache/avalon/phoenix/components/manager
ExtendedMX4JSystemManager.java
MX4JSystemManager.java
src/java/org/apache/avalon/phoenix/components/util
ComponentMetaDataConverter.java
src/java/org/apache/avalon/phoenix/containerkit/kernel
AbstractServiceKernel.java ComponentEntry.java
ComponentStore.java
src/java/org/apache/avalon/phoenix/containerkit/kernel/processor
DependencyMap.java
src/java/org/apache/avalon/phoenix/containerkit/verifier
AssemblyVerifier.java
src/java/org/apache/avalon/phoenix/interfaces
ApplicationContext.java Kernel.java
src/java/org/apache/avalon/phoenix/tools/verifier
SarVerifier.java
src/test/org/apache/avalon/phoenix/components/application/test
ApplicationTestCase.java
MockApplicationContext.java
src/test/org/apache/avalon/phoenix/test
AbstractContainerTestCase.java
src/test/org/apache/avalon/phoenix/tools/assembler/test
AssemblerTestCase.java
src/test/org/apache/avalon/phoenix/tools/verifier/test
VerifierTestCase.java
Added: src/java/org/apache/avalon/phoenix/containerkit/profile
ComponentProfile.java PartitionProfile.java
ProfileBuilder.java
Removed: src/java/org/apache/avalon/phoenix/containerkit/registry
ComponentProfile.java PartitionProfile.java
ProfileBuilder.java
Log:
Migrate the profile stuff into a package named ... profile
Revision Changes Path
1.28 +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.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- BlockEntry.java 1 Mar 2003 04:51:56 -0000 1.27
+++ BlockEntry.java 1 Mar 2003 08:39:14 -0000 1.28
@@ -11,7 +11,7 @@
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.containerkit.registry.ComponentProfile;
+import org.apache.avalon.phoenix.containerkit.profile.ComponentProfile;
/**
* This is the structure describing each block before it is loaded.
1.17 +2 -2
avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/BlockResourceProvider.java
Index: BlockResourceProvider.java
===================================================================
RCS file:
/home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/BlockResourceProvider.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- BlockResourceProvider.java 1 Mar 2003 03:39:45 -0000 1.16
+++ BlockResourceProvider.java 1 Mar 2003 08:39:14 -0000 1.17
@@ -29,7 +29,7 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.phoenix.containerkit.lifecycle.ResourceProvider;
import org.apache.avalon.phoenix.containerkit.metadata.DependencyMetaData;
-import org.apache.avalon.phoenix.containerkit.registry.ComponentProfile;
+import org.apache.avalon.phoenix.containerkit.profile.ComponentProfile;
import org.apache.avalon.phoenix.interfaces.Application;
import org.apache.avalon.phoenix.interfaces.ApplicationContext;
1.42 +2 -2
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.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- DefaultApplication.java 22 Feb 2003 04:03:25 -0000 1.41
+++ DefaultApplication.java 1 Mar 2003 08:39:14 -0000 1.42
@@ -24,8 +24,8 @@
import org.apache.avalon.phoenix.components.util.ComponentMetaDataConverter;
import org.apache.avalon.phoenix.containerkit.lifecycle.LifecycleException;
import org.apache.avalon.phoenix.containerkit.lifecycle.LifecycleHelper;
-import org.apache.avalon.phoenix.containerkit.registry.ComponentProfile;
-import org.apache.avalon.phoenix.containerkit.registry.PartitionProfile;
+import org.apache.avalon.phoenix.containerkit.profile.ComponentProfile;
+import org.apache.avalon.phoenix.containerkit.profile.PartitionProfile;
import org.apache.avalon.phoenix.interfaces.Application;
import org.apache.avalon.phoenix.interfaces.ApplicationContext;
import org.apache.avalon.phoenix.interfaces.ApplicationException;
1.12 +1 -1
avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/DependencyGraph.java
Index: DependencyGraph.java
===================================================================
RCS file:
/home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/DependencyGraph.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DependencyGraph.java 1 Mar 2003 03:39:45 -0000 1.11
+++ DependencyGraph.java 1 Mar 2003 08:39:14 -0000 1.12
@@ -10,7 +10,7 @@
import java.util.ArrayList;
import org.apache.avalon.phoenix.framework.info.DependencyDescriptor;
import org.apache.avalon.phoenix.containerkit.metadata.DependencyMetaData;
-import org.apache.avalon.phoenix.containerkit.registry.ComponentProfile;
+import org.apache.avalon.phoenix.containerkit.profile.ComponentProfile;
/**
*
1.7 +2 -2
avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/ExportHelper.java
Index: ExportHelper.java
===================================================================
RCS file:
/home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/ExportHelper.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ExportHelper.java 1 Mar 2003 03:39:45 -0000 1.6
+++ ExportHelper.java 1 Mar 2003 08:39:14 -0000 1.7
@@ -14,7 +14,7 @@
import org.apache.avalon.phoenix.framework.info.ServiceDescriptor;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.phoenix.framework.tools.infobuilder.LegacyUtil;
-import org.apache.avalon.phoenix.containerkit.registry.ComponentProfile;
+import org.apache.avalon.phoenix.containerkit.profile.ComponentProfile;
import org.apache.avalon.phoenix.interfaces.ApplicationContext;
/**
1.8 +2 -2
avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/ListenerResourceProvider.java
Index: ListenerResourceProvider.java
===================================================================
RCS file:
/home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/ListenerResourceProvider.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ListenerResourceProvider.java 22 Feb 2003 04:03:25 -0000 1.7
+++ ListenerResourceProvider.java 1 Mar 2003 08:39:14 -0000 1.8
@@ -19,7 +19,7 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.phoenix.containerkit.lifecycle.ResourceProvider;
import org.apache.avalon.phoenix.containerkit.metadata.ComponentMetaData;
-import org.apache.avalon.phoenix.containerkit.registry.ComponentProfile;
+import org.apache.avalon.phoenix.containerkit.profile.ComponentProfile;
import org.apache.avalon.phoenix.interfaces.ApplicationContext;
/**
1.7 +1 -1
avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/ListenerSupport.java
Index: ListenerSupport.java
===================================================================
RCS file:
/home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/ListenerSupport.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ListenerSupport.java 22 Feb 2003 04:03:25 -0000 1.6
+++ ListenerSupport.java 1 Mar 2003 08:39:14 -0000 1.7
@@ -12,7 +12,7 @@
import org.apache.avalon.phoenix.BlockEvent;
import org.apache.avalon.phoenix.BlockListener;
import org.apache.avalon.phoenix.components.util.ComponentInfoConverter;
-import org.apache.avalon.phoenix.containerkit.registry.ComponentProfile;
+import org.apache.avalon.phoenix.containerkit.profile.ComponentProfile;
import org.apache.avalon.phoenix.metadata.SarMetaData;
import org.apache.avalon.phoenix.metainfo.BlockInfo;
1.70 +3 -3
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.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- DefaultDeployer.java 1 Mar 2003 08:34:55 -0000 1.69
+++ DefaultDeployer.java 1 Mar 2003 08:39:14 -0000 1.70
@@ -29,9 +29,9 @@
import org.apache.avalon.phoenix.BlockContext;
import org.apache.avalon.phoenix.components.ContainerConstants;
import org.apache.avalon.phoenix.containerkit.metadata.PartitionMetaData;
-import org.apache.avalon.phoenix.containerkit.registry.ComponentProfile;
-import org.apache.avalon.phoenix.containerkit.registry.PartitionProfile;
-import org.apache.avalon.phoenix.containerkit.registry.ProfileBuilder;
+import org.apache.avalon.phoenix.containerkit.profile.ComponentProfile;
+import org.apache.avalon.phoenix.containerkit.profile.PartitionProfile;
+import org.apache.avalon.phoenix.containerkit.profile.ProfileBuilder;
import org.apache.avalon.phoenix.framework.info.SchemaDescriptor;
import org.apache.avalon.phoenix.interfaces.Application;
import org.apache.avalon.phoenix.interfaces.ClassLoaderManager;
1.3 +4 -4
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PhoenixProfileBuilder.java 1 Mar 2003 03:39:45 -0000 1.2
+++ PhoenixProfileBuilder.java 1 Mar 2003 08:39:14 -0000 1.3
@@ -7,9 +7,9 @@
*/
package org.apache.avalon.phoenix.components.deployer;
-import org.apache.avalon.phoenix.containerkit.registry.ProfileBuilder;
-import org.apache.avalon.phoenix.containerkit.registry.PartitionProfile;
-import org.apache.avalon.phoenix.containerkit.registry.ComponentProfile;
+import org.apache.avalon.phoenix.containerkit.profile.ProfileBuilder;
+import org.apache.avalon.phoenix.containerkit.profile.PartitionProfile;
+import org.apache.avalon.phoenix.containerkit.profile.ComponentProfile;
import org.apache.avalon.phoenix.containerkit.metadata.PartitionMetaData;
import org.apache.avalon.phoenix.containerkit.metadata.ComponentMetaData;
import org.apache.avalon.phoenix.containerkit.factory.ComponentFactory;
1.35 +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.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- DefaultApplicationContext.java 22 Feb 2003 05:34:45 -0000 1.34
+++ DefaultApplicationContext.java 1 Mar 2003 08:39:14 -0000 1.35
@@ -26,7 +26,7 @@
import org.apache.avalon.phoenix.components.ContainerConstants;
import org.apache.avalon.phoenix.components.util.ResourceUtil;
import org.apache.avalon.phoenix.containerkit.metadata.PartitionMetaData;
-import org.apache.avalon.phoenix.containerkit.registry.PartitionProfile;
+import org.apache.avalon.phoenix.containerkit.profile.PartitionProfile;
import org.apache.avalon.phoenix.interfaces.ApplicationContext;
import org.apache.avalon.phoenix.interfaces.ConfigurationRepository;
import org.apache.avalon.phoenix.interfaces.ConfigurationValidator;
1.86 +1 -1
avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/DefaultKernel.java
Index: DefaultKernel.java
===================================================================
RCS file:
/home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/DefaultKernel.java,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- DefaultKernel.java 22 Feb 2003 04:03:27 -0000 1.85
+++ DefaultKernel.java 1 Mar 2003 08:39:14 -0000 1.86
@@ -26,7 +26,7 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.phoenix.components.application.DefaultApplication;
-import org.apache.avalon.phoenix.containerkit.registry.PartitionProfile;
+import org.apache.avalon.phoenix.containerkit.profile.PartitionProfile;
import org.apache.avalon.phoenix.interfaces.Application;
import org.apache.avalon.phoenix.interfaces.ApplicationContext;
import org.apache.avalon.phoenix.interfaces.ApplicationMBean;
1.20 +1 -1
avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/SarEntry.java
Index: SarEntry.java
===================================================================
RCS file:
/home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/SarEntry.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- SarEntry.java 22 Feb 2003 04:03:27 -0000 1.19
+++ SarEntry.java 1 Mar 2003 08:39:14 -0000 1.20
@@ -10,7 +10,7 @@
import java.io.File;
import java.util.Map;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.phoenix.containerkit.registry.PartitionProfile;
+import org.apache.avalon.phoenix.containerkit.profile.PartitionProfile;
import org.apache.avalon.phoenix.interfaces.Application;
/**
1.11 +1 -1
avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/beanshell/BeanShellKernelProxy.java
Index: BeanShellKernelProxy.java
===================================================================
RCS file:
/home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/beanshell/BeanShellKernelProxy.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- BeanShellKernelProxy.java 22 Feb 2003 04:03:27 -0000 1.10
+++ BeanShellKernelProxy.java 1 Mar 2003 08:39:15 -0000 1.11
@@ -10,7 +10,7 @@
import java.io.File;
import java.util.Map;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.phoenix.containerkit.registry.PartitionProfile;
+import org.apache.avalon.phoenix.containerkit.profile.PartitionProfile;
import org.apache.avalon.phoenix.interfaces.Application;
import org.apache.avalon.phoenix.interfaces.Kernel;
1.7 +1 -1
avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/ExtendedMX4JSystemManager.java
Index: ExtendedMX4JSystemManager.java
===================================================================
RCS file:
/home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/ExtendedMX4JSystemManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ExtendedMX4JSystemManager.java 22 Feb 2003 05:34:45 -0000 1.6
+++ ExtendedMX4JSystemManager.java 1 Mar 2003 08:39:15 -0000 1.7
@@ -35,7 +35,7 @@
ResourceManager.getPackageResources( ExtendedMX4JSystemManager.class );
private static final String DEFAULT_NAMING_FACTORY =
- "com.sun.jndi.rmi.registry.RegistryContextFactory";
+ "com.sun.jndi.rmi.profile.RegistryContextFactory";
private Configuration m_configuration;
private Map m_mBeanScripters;
1.25 +1 -1
avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/MX4JSystemManager.java
Index: MX4JSystemManager.java
===================================================================
RCS file:
/home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/components/manager/MX4JSystemManager.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- MX4JSystemManager.java 22 Feb 2003 05:34:45 -0000 1.24
+++ MX4JSystemManager.java 1 Mar 2003 08:39:15 -0000 1.25
@@ -44,7 +44,7 @@
ResourceManager.getPackageResources( MX4JSystemManager.class );
private static final String DEFAULT_NAMING_FACTORY =
- "com.sun.jndi.rmi.registry.RegistryContextFactory";
+ "com.sun.jndi.rmi.profile.RegistryContextFactory";
private static final String DEFAULT_HTTPADAPTER_HOST = "localhost";
private static final int DEFAULT_HTTPADAPTER_PORT =
Integer.getInteger( "phoenix.adapter.http", 8082 ).intValue();
1.6 +3 -3
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ComponentMetaDataConverter.java 1 Mar 2003 03:39:45 -0000 1.5
+++ ComponentMetaDataConverter.java 1 Mar 2003 08:39:15 -0000 1.6
@@ -13,8 +13,8 @@
import org.apache.avalon.phoenix.framework.info.ComponentInfo;
import org.apache.avalon.phoenix.components.ContainerConstants;
import org.apache.avalon.phoenix.containerkit.metadata.ComponentMetaData;
-import org.apache.avalon.phoenix.containerkit.registry.ComponentProfile;
-import org.apache.avalon.phoenix.containerkit.registry.PartitionProfile;
+import org.apache.avalon.phoenix.containerkit.profile.ComponentProfile;
+import org.apache.avalon.phoenix.containerkit.profile.PartitionProfile;
import org.apache.avalon.phoenix.metadata.BlockListenerMetaData;
import org.apache.avalon.phoenix.metadata.BlockMetaData;
import org.apache.avalon.phoenix.metadata.DependencyMetaData;
1.5 +2 -2
avalon-phoenix/src/java/org/apache/avalon/phoenix/containerkit/kernel/AbstractServiceKernel.java
Index: AbstractServiceKernel.java
===================================================================
RCS file:
/home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/containerkit/kernel/AbstractServiceKernel.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractServiceKernel.java 1 Mar 2003 03:39:46 -0000 1.4
+++ AbstractServiceKernel.java 1 Mar 2003 08:39:15 -0000 1.5
@@ -24,7 +24,7 @@
import org.apache.avalon.phoenix.containerkit.lifecycle.LifecycleHelper;
import org.apache.avalon.phoenix.containerkit.lifecycle.ResourceProvider;
import org.apache.avalon.phoenix.containerkit.metadata.ComponentMetaData;
-import org.apache.avalon.phoenix.containerkit.registry.ComponentProfile;
+import org.apache.avalon.phoenix.containerkit.profile.ComponentProfile;
/**
* The <code>AbstractServiceKernel</code> defines an application scope through
1.2 +2 -2
avalon-phoenix/src/java/org/apache/avalon/phoenix/containerkit/kernel/ComponentEntry.java
Index: ComponentEntry.java
===================================================================
RCS file:
/home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/containerkit/kernel/ComponentEntry.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ComponentEntry.java 18 Jan 2003 16:43:43 -0000 1.1
+++ ComponentEntry.java 1 Mar 2003 08:39:15 -0000 1.2
@@ -7,7 +7,7 @@
*/
package org.apache.avalon.phoenix.containerkit.kernel;
-import org.apache.avalon.phoenix.containerkit.registry.ComponentProfile;
+import org.apache.avalon.phoenix.containerkit.profile.ComponentProfile;
/**
* This is the structure that components are contained within when
1.2 +2 -2
avalon-phoenix/src/java/org/apache/avalon/phoenix/containerkit/kernel/ComponentStore.java
Index: ComponentStore.java
===================================================================
RCS file:
/home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/containerkit/kernel/ComponentStore.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ComponentStore.java 18 Jan 2003 16:43:43 -0000 1.1
+++ ComponentStore.java 1 Mar 2003 08:39:15 -0000 1.2
@@ -12,7 +12,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.avalon.phoenix.containerkit.registry.ComponentProfile;
+import org.apache.avalon.phoenix.containerkit.profile.ComponentProfile;
/**
*
1.3 +2 -2
avalon-phoenix/src/java/org/apache/avalon/phoenix/containerkit/kernel/processor/DependencyMap.java
Index: DependencyMap.java
===================================================================
RCS file:
/home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/containerkit/kernel/processor/DependencyMap.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DependencyMap.java 1 Mar 2003 03:39:46 -0000 1.2
+++ DependencyMap.java 1 Mar 2003 08:39:15 -0000 1.3
@@ -14,7 +14,7 @@
import org.apache.avalon.phoenix.containerkit.kernel.ComponentStore;
import org.apache.avalon.phoenix.containerkit.metadata.ComponentMetaData;
import org.apache.avalon.phoenix.containerkit.metadata.DependencyMetaData;
-import org.apache.avalon.phoenix.containerkit.registry.ComponentProfile;
+import org.apache.avalon.phoenix.containerkit.profile.ComponentProfile;
/**
* Utility class to help aquire a ordered graph of
1.1
avalon-phoenix/src/java/org/apache/avalon/phoenix/containerkit/profile/ComponentProfile.java
Index: ComponentProfile.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.containerkit.profile;
import org.apache.avalon.phoenix.framework.info.ComponentInfo;
import org.apache.avalon.phoenix.containerkit.metadata.ComponentMetaData;
/**
* The ComponentProfile defines a component as a conjunction
* of the [EMAIL PROTECTED] ComponentInfo} and [EMAIL PROTECTED] ComponentMetaData}.
* The [EMAIL PROTECTED] ComponentInfo} defines the type of the component
* and the [EMAIL PROTECTED] ComponentMetaData} defines the data required to
* construct a specific instance of the component.
*
* @author <a href="mailto:peter at apache.org">Peter Donald</a>
* @version $Revision: 1.1 $ $Date: 2003/03/01 08:39:15 $
*/
public class ComponentProfile
{
/**
* The [EMAIL PROTECTED] ComponentInfo} that describes
* the type of this component.
*/
private final ComponentInfo m_info;
/**
* The [EMAIL PROTECTED] ComponentMetaData} that describes
* this component.
*/
private final ComponentMetaData m_metaData;
/**
* Creation of a new <code>ComponentProfile</code> instance.
*
* @param metaData the [EMAIL PROTECTED] ComponentMetaData} instance defining
the component.
*/
public ComponentProfile( final ComponentInfo info,
final ComponentMetaData metaData )
{
m_info = info;
m_metaData = metaData;
}
/**
* Returns the underlying [EMAIL PROTECTED] ComponentInfo} instance.
*
* @return the component info instance
*/
public ComponentInfo getInfo()
{
return m_info;
}
/**
* Returns the underlying [EMAIL PROTECTED] ComponentMetaData} instance.
* @return the component meta data instance
*/
public ComponentMetaData getMetaData()
{
return m_metaData;
}
}
1.1
avalon-phoenix/src/java/org/apache/avalon/phoenix/containerkit/profile/PartitionProfile.java
Index: PartitionProfile.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.containerkit.profile;
import org.apache.avalon.phoenix.containerkit.metadata.PartitionMetaData;
/**
* The PartitionProfile contains the set of data required
* to construct a specific instance of a Profile. It contains
* a set of child PartitionProfile and [EMAIL PROTECTED] ComponentProfile}
* objects.
*
* @author <a href="mailto:peter at apache.org">Peter Donald</a>
* @version $Revision: 1.1 $ $Date: 2003/03/01 08:39:15 $
*/
public class PartitionProfile
{
/**
* Constant for an empty set of partitions.
*/
public static final PartitionProfile[] EMPTY_SET = new PartitionProfile[ 0 ];
/**
* The [EMAIL PROTECTED] PartitionMetaData} for this partition.
*/
private final PartitionMetaData m_metaData;
/**
* An array of partitions that are contained by this
* object.
*/
private final PartitionProfile[] m_partitions;
/**
* An array of partitions that are contained by this
* object.
*/
private final ComponentProfile[] m_components;
/**
* Create a PartitionProfile.
*
* @param metaData the meta data about this profile
* @param partitions the partitions contained by this partition
* @param components the components contained by this partition
*/
public PartitionProfile( final PartitionMetaData metaData,
final PartitionProfile[] partitions,
final ComponentProfile[] components )
{
if( null == metaData )
{
throw new NullPointerException( "metaData" );
}
if( null == partitions )
{
throw new NullPointerException( "partitions" );
}
if( null == components )
{
throw new NullPointerException( "components" );
}
m_metaData = metaData;
m_partitions = partitions;
m_components = components;
}
/**
* Return the metaData about this profile.
*
* @return the metaData about this profile.
*/
public PartitionMetaData getMetaData()
{
return m_metaData;
}
/**
* Return the set of partitions contained in this partition.
*
* @return the set of partitions contained in this partition.
*/
public PartitionProfile[] getPartitions()
{
return m_partitions;
}
/**
* Return the set of components contained in this partition.
*
* @return the set of components contained in this partition.
*/
public ComponentProfile[] getComponents()
{
return m_components;
}
/**
* Return the partition with specified name.
*
* @return the partition with specified name.
*/
public PartitionProfile getPartition( final String name )
{
for( int i = 0; i < m_partitions.length; i++ )
{
final PartitionProfile partition = m_partitions[ i ];
if( partition.getMetaData().getName().equals( name ) )
{
return partition;
}
}
return null;
}
/**
* Return the component with specified name.
*
* @return the component with specified name.
*/
public ComponentProfile getComponent( final String name )
{
for( int i = 0; i < m_components.length; i++ )
{
final ComponentProfile component = m_components[ i ];
if( component.getMetaData().getName().equals( name ) )
{
return component;
}
}
return null;
}
}
1.1
avalon-phoenix/src/java/org/apache/avalon/phoenix/containerkit/profile/ProfileBuilder.java
Index: ProfileBuilder.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.containerkit.profile;
import java.util.Map;
/**
* Load metadata for an Assembly from some source.
* The source is usually one or more xml config files.
*
* @author <a href="mailto:peter at apache.org">Peter Donald</a>
* @version $Revision: 1.1 $ $Date: 2003/03/01 08:39:15 $
*/
public interface ProfileBuilder
{
/**
* Load metadata from a particular source
* using specified map of parameters. The content
* of the parameters is left unspecified.
*
* @param parameters the parameters indicating method to load meta data source
* @return the set of components in metadata
* @throws Exception if unable to load or resolve
* meta data for any reason
*/
PartitionProfile buildProfile( Map parameters )
throws Exception;
}
1.5 +2 -2
avalon-phoenix/src/java/org/apache/avalon/phoenix/containerkit/verifier/AssemblyVerifier.java
Index: AssemblyVerifier.java
===================================================================
RCS file:
/home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/containerkit/verifier/AssemblyVerifier.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AssemblyVerifier.java 1 Mar 2003 03:39:46 -0000 1.4
+++ AssemblyVerifier.java 1 Mar 2003 08:39:15 -0000 1.5
@@ -17,7 +17,7 @@
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.phoenix.framework.tools.verifier.VerifyException;
import org.apache.avalon.phoenix.containerkit.metadata.DependencyMetaData;
-import org.apache.avalon.phoenix.containerkit.registry.ComponentProfile;
+import org.apache.avalon.phoenix.containerkit.profile.ComponentProfile;
/**
* This Class verifies that Sars are valid. It performs a number
1.22 +1 -1
avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/ApplicationContext.java
Index: ApplicationContext.java
===================================================================
RCS file:
/home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/ApplicationContext.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ApplicationContext.java 22 Feb 2003 04:03:29 -0000 1.21
+++ ApplicationContext.java 1 Mar 2003 08:39:15 -0000 1.22
@@ -12,7 +12,7 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.phoenix.containerkit.registry.PartitionProfile;
+import org.apache.avalon.phoenix.containerkit.profile.PartitionProfile;
import org.apache.excalibur.threadcontext.ThreadContext;
/**
1.20 +1 -1
avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/Kernel.java
Index: Kernel.java
===================================================================
RCS file:
/home/cvs/avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/Kernel.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Kernel.java 22 Feb 2003 05:34:46 -0000 1.19
+++ Kernel.java 1 Mar 2003 08:39:15 -0000 1.20
@@ -10,7 +10,7 @@
import java.io.File;
import java.util.Map;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.phoenix.containerkit.registry.PartitionProfile;
+import org.apache.avalon.phoenix.containerkit.profile.PartitionProfile;
/**
* @author <a href="mailto:peter at apache.org">Peter Donald</a>
1.33 +3 -3
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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- SarVerifier.java 1 Mar 2003 03:39:48 -0000 1.32
+++ SarVerifier.java 1 Mar 2003 08:39:15 -0000 1.33
@@ -14,8 +14,8 @@
import org.apache.avalon.phoenix.framework.tools.verifier.VerifyException;
import org.apache.avalon.phoenix.components.ContainerConstants;
import org.apache.avalon.phoenix.containerkit.metadata.ComponentMetaData;
-import org.apache.avalon.phoenix.containerkit.registry.ComponentProfile;
-import org.apache.avalon.phoenix.containerkit.registry.PartitionProfile;
+import org.apache.avalon.phoenix.containerkit.profile.ComponentProfile;
+import org.apache.avalon.phoenix.containerkit.profile.PartitionProfile;
import org.apache.avalon.phoenix.containerkit.verifier.AssemblyVerifier;
/**
1.4 +2 -2
avalon-phoenix/src/test/org/apache/avalon/phoenix/components/application/test/ApplicationTestCase.java
Index: ApplicationTestCase.java
===================================================================
RCS file:
/home/cvs/avalon-phoenix/src/test/org/apache/avalon/phoenix/components/application/test/ApplicationTestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ApplicationTestCase.java 28 Feb 2003 23:48:16 -0000 1.3
+++ ApplicationTestCase.java 1 Mar 2003 08:39:15 -0000 1.4
@@ -9,7 +9,7 @@
import org.apache.avalon.framework.logger.ConsoleLogger;
import org.apache.avalon.phoenix.components.application.DefaultApplication;
-import org.apache.avalon.phoenix.containerkit.registry.PartitionProfile;
+import org.apache.avalon.phoenix.containerkit.profile.PartitionProfile;
import org.apache.avalon.phoenix.test.AbstractContainerTestCase;
/**
1.6 +2 -2
avalon-phoenix/src/test/org/apache/avalon/phoenix/components/application/test/MockApplicationContext.java
Index: MockApplicationContext.java
===================================================================
RCS file:
/home/cvs/avalon-phoenix/src/test/org/apache/avalon/phoenix/components/application/test/MockApplicationContext.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MockApplicationContext.java 28 Feb 2003 23:47:46 -0000 1.5
+++ MockApplicationContext.java 1 Mar 2003 08:39:15 -0000 1.6
@@ -13,7 +13,7 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.phoenix.containerkit.registry.PartitionProfile;
+import org.apache.avalon.phoenix.containerkit.profile.PartitionProfile;
import org.apache.avalon.phoenix.interfaces.ApplicationContext;
import org.apache.excalibur.threadcontext.ThreadContext;
import org.apache.excalibur.threadcontext.impl.DefaultThreadContextPolicy;
1.5 +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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractContainerTestCase.java 1 Mar 2003 01:07:44 -0000 1.4
+++ AbstractContainerTestCase.java 1 Mar 2003 08:39:15 -0000 1.5
@@ -15,7 +15,7 @@
import org.apache.avalon.framework.logger.ConsoleLogger;
import org.apache.avalon.phoenix.components.ContainerConstants;
import org.apache.avalon.phoenix.components.deployer.PhoenixProfileBuilder;
-import org.apache.avalon.phoenix.containerkit.registry.PartitionProfile;
+import org.apache.avalon.phoenix.containerkit.profile.PartitionProfile;
import org.apache.avalon.phoenix.tools.configuration.ConfigurationBuilder;
/**
1.9 +3 -3
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AssemblerTestCase.java 1 Mar 2003 01:47:10 -0000 1.8
+++ AssemblerTestCase.java 1 Mar 2003 08:39:16 -0000 1.9
@@ -12,8 +12,8 @@
import org.apache.avalon.phoenix.test.data.Component2;
import org.apache.avalon.phoenix.test.data.Component3;
import org.apache.avalon.phoenix.test.data.Service2;
-import org.apache.avalon.phoenix.containerkit.registry.PartitionProfile;
-import org.apache.avalon.phoenix.containerkit.registry.ComponentProfile;
+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;
1.4 +2 -2
avalon-phoenix/src/test/org/apache/avalon/phoenix/tools/verifier/test/VerifierTestCase.java
Index: VerifierTestCase.java
===================================================================
RCS file:
/home/cvs/avalon-phoenix/src/test/org/apache/avalon/phoenix/tools/verifier/test/VerifierTestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- VerifierTestCase.java 28 Feb 2003 23:35:59 -0000 1.3
+++ VerifierTestCase.java 1 Mar 2003 08:39:16 -0000 1.4
@@ -8,7 +8,7 @@
package org.apache.avalon.phoenix.tools.verifier.test;
import org.apache.avalon.framework.logger.ConsoleLogger;
-import org.apache.avalon.phoenix.containerkit.registry.PartitionProfile;
+import org.apache.avalon.phoenix.containerkit.profile.PartitionProfile;
import org.apache.avalon.phoenix.test.AbstractContainerTestCase;
import org.apache.avalon.phoenix.tools.verifier.SarVerifier;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
