donaldp 01/04/02 02:11:02
Modified: lib avalonapi.jar
src/java/org/apache/phoenix/engine DefaultSarDeployer.java
src/java/org/apache/phoenix/engine/blocks
DefaultBlockDeployer.java
src/java/org/apache/phoenix/metainfo BlockInfo.java
BlockInfoBuilder.java Contributor.java
DefaultBlockInfo.java DependencyInfo.java
ServiceInfo.java
Log:
Updated phoenix to match terminology changes that occured in camelot.
Revision Changes Path
1.9 +207 -201 jakarta-avalon-phoenix/lib/avalonapi.jar
<<Binary file>>
1.4 +6 -8
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultSarDeployer.java 2001/03/18 08:26:59 1.3
+++ DefaultSarDeployer.java 2001/04/02 09:10:56 1.4
@@ -30,13 +30,11 @@
import org.apache.avalon.camelot.AbstractCamelotDeployer;
import org.apache.avalon.camelot.CamelotUtil;
import org.apache.avalon.camelot.ContainerException;
-import org.apache.avalon.camelot.DefaultLocatorRegistry;
import org.apache.avalon.camelot.DefaultRegistry;
import org.apache.avalon.camelot.Deployer;
import org.apache.avalon.camelot.DeployerUtil;
import org.apache.avalon.camelot.DeploymentException;
import org.apache.avalon.camelot.Locator;
-import org.apache.avalon.camelot.LocatorRegistry;
import org.apache.avalon.camelot.Registry;
import org.apache.avalon.camelot.RegistryException;
import org.apache.avalon.util.io.FileUtil;
@@ -185,8 +183,8 @@
final DefaultComponentManager componentManager = new
DefaultComponentManager();
componentManager.put( "org.apache.avalon.camelot.Registry",
new DefaultRegistry( BlockInfo.class ) );
- componentManager.put( "org.apache.avalon.camelot.LocatorRegistry",
- new DefaultLocatorRegistry() );
+ componentManager.put( "org.apache.avalon.camelot.Registry/Locator",
+ new DefaultRegistry( Locator.class ) );
entry.setComponentManager( componentManager );
//setup the ServerApplications configuration manager
@@ -284,8 +282,8 @@
final Registry infoRegistry =
(Registry)componentManager.lookup( "org.apache.avalon.camelot.Registry"
);
- final LocatorRegistry locatorRegistry = (LocatorRegistry)componentManager.
- lookup( "org.apache.avalon.camelot.LocatorRegistry" );
+ final Registry locatorRegistry = (Registry)componentManager.
+ lookup( "org.apache.avalon.camelot.Registry/Locator" );
for( int i = 0; i < blocks.length; i++ )
{
@@ -295,7 +293,7 @@
BlockInfo info = null;
- try { info = (BlockInfo)infoRegistry.getInfo( className ); }
+ try { info = (BlockInfo)infoRegistry.getInfo( className,
BlockInfo.class ); }
catch( final RegistryException re )
{
throw new DeploymentException( "Failed to aquire BlockInfo for " +
className,
@@ -303,7 +301,7 @@
}
Locator locator = null;
- try { locator = locatorRegistry.getLocator( className ); }
+ try { locator = (Locator)locatorRegistry.getInfo( className,
Locator.class ); }
catch( final RegistryException re )
{
throw new DeploymentException( "Failed to aquire Locator for " +
className,
1.2 +0 -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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultBlockDeployer.java 2001/02/24 04:31:00 1.1
+++ DefaultBlockDeployer.java 2001/04/02 09:10:57 1.2
@@ -18,7 +18,6 @@
import org.apache.avalon.camelot.AbstractZipDeployer;
import org.apache.avalon.camelot.DeployerUtil;
import org.apache.avalon.camelot.DeploymentException;
-import org.apache.avalon.camelot.LocatorRegistry;
import org.apache.avalon.camelot.Registry;
import org.apache.avalon.camelot.RegistryException;
import org.apache.avalon.util.io.IOUtil;
1.2 +5 -3
jakarta-avalon-phoenix/src/java/org/apache/phoenix/metainfo/BlockInfo.java
Index: BlockInfo.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/metainfo/BlockInfo.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BlockInfo.java 2001/02/24 04:31:02 1.1
+++ BlockInfo.java 2001/04/02 09:10:58 1.2
@@ -7,22 +7,24 @@
*/
package org.apache.phoenix.metainfo;
+import org.apache.avalon.camelot.Info;
+
/**
* This descrbes information about the block that is used by administration tools
and kernel.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
public interface BlockInfo
- extends org.apache.avalon.camelot.MetaInfo
+ extends Info
{
/**
* Return meta information that is generallly only required by administration
tools.
*
* It should be loaded on demand and not always present in memory.
*
- * @return the MetaInfo
+ * @return the BlockDescriptor
*/
- MetaInfo getMetaInfo();
+ BlockDescriptor getBlockDescriptor();
/**
* This returns a list of Services that this block exports.
1.2 +3 -3
jakarta-avalon-phoenix/src/java/org/apache/phoenix/metainfo/BlockInfoBuilder.java
Index: BlockInfoBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/metainfo/BlockInfoBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BlockInfoBuilder.java 2001/02/24 04:31:02 1.1
+++ BlockInfoBuilder.java 2001/04/02 09:10:58 1.2
@@ -39,9 +39,9 @@
final DependencyInfo dependencies[] = buildDependencies( configuration );
configuration = info.getChild( "meta" );
- final MetaInfo metaInfo = buildMetaInfo( configuration );
+ final BlockDescriptor descriptor = buildBlockDescriptor( configuration );
- return new DefaultBlockInfo( metaInfo, services, dependencies );
+ return new DefaultBlockInfo( descriptor, services, dependencies );
}
protected DependencyInfo[] buildDependencies( final Configuration configuration
)
@@ -127,7 +127,7 @@
return new Version( major, minor, revision );
}
- protected MetaInfo buildMetaInfo( final Configuration meta )
+ protected BlockDescriptor buildBlockDescriptor( final Configuration meta )
{
if( null == meta ) return null;
1.2 +0 -1
jakarta-avalon-phoenix/src/java/org/apache/phoenix/metainfo/Contributor.java
Index: Contributor.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/metainfo/Contributor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Contributor.java 2001/02/24 04:31:02 1.1
+++ Contributor.java 2001/04/02 09:10:59 1.2
@@ -13,7 +13,6 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
public interface Contributor
- extends org.apache.avalon.camelot.MetaInfo
{
/**
* Retrieve name of identity/person.
1.2 +10 -11
jakarta-avalon-phoenix/src/java/org/apache/phoenix/metainfo/DefaultBlockInfo.java
Index: DefaultBlockInfo.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/metainfo/DefaultBlockInfo.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultBlockInfo.java 2001/02/24 04:31:02 1.1
+++ DefaultBlockInfo.java 2001/04/02 09:10:59 1.2
@@ -15,32 +15,31 @@
public class DefaultBlockInfo
implements BlockInfo
{
- protected final MetaInfo m_meta;
- protected final ServiceInfo m_services[];
- protected final DependencyInfo m_dependencies[];
+ protected final BlockDescriptor m_descriptor;
+ protected final ServiceInfo[] m_services;
+ protected final DependencyInfo[] m_dependencies;
/**
* Basic constructor that takes as parameters all parts.
*/
- public DefaultBlockInfo( final MetaInfo meta,
- final ServiceInfo services[],
- final DependencyInfo dependencies[] )
+ public DefaultBlockInfo( final BlockDescriptor descriptor,
+ final ServiceInfo[] services,
+ final DependencyInfo[] dependencies )
{
- m_meta = meta;
+ m_descriptor = descriptor;
m_services = services;
m_dependencies = dependencies;
}
-
/**
* Return meta information that is generallly only required by administration
tools.
*
* It should be loaded on demand and not always present in memory.
*
- * @return the MetaInfo
+ * @return the BlockDescriptor
*/
- public MetaInfo getMetaInfo()
+ public BlockDescriptor getBlockDescriptor()
{
- return m_meta;
+ return m_descriptor;
}
/**
1.2 +4 -2
jakarta-avalon-phoenix/src/java/org/apache/phoenix/metainfo/DependencyInfo.java
Index: DependencyInfo.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/metainfo/DependencyInfo.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DependencyInfo.java 2001/02/24 04:31:02 1.1
+++ DependencyInfo.java 2001/04/02 09:11:00 1.2
@@ -7,13 +7,15 @@
*/
package org.apache.phoenix.metainfo;
+import org.apache.avalon.camelot.Descriptor;
+
/**
* This interface describes a dependency of Block.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
-public interface DependencyInfo
- extends org.apache.avalon.camelot.MetaInfo
+public interface DependencyInfo
+ extends Descriptor
{
/**
* Return name of dependency.
1.2 +2 -1
jakarta-avalon-phoenix/src/java/org/apache/phoenix/metainfo/ServiceInfo.java
Index: ServiceInfo.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/metainfo/ServiceInfo.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ServiceInfo.java 2001/02/24 04:31:02 1.1
+++ ServiceInfo.java 2001/04/02 09:11:00 1.2
@@ -8,6 +8,7 @@
package org.apache.phoenix.metainfo;
import org.apache.avalon.util.Version;
+import org.apache.avalon.camelot.Descriptor;
/**
* This interface describes a particular service that a component offers.
@@ -15,7 +16,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
public interface ServiceInfo
- extends org.apache.avalon.camelot.MetaInfo
+ extends Descriptor
{
/**
* Return version of interface
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
