donaldp 01/04/02 20:50:38
Modified: src/java/org/apache/phoenix/engine
DefaultServerApplication.java
src/java/org/apache/phoenix/engine/blocks BlockDAG.java
src/java/org/apache/phoenix/engine/facilities
DefaultComponentBuilder.java
DefaultComponentManagerBuilder.java
src/java/org/apache/phoenix/engine/listeners
SAErrorHandler.java
src/java/org/apache/phoenix/metainfo BlockInfo.java
BlockInfoBuilder.java BlockUtil.java
DefaultBlockInfo.java
Added: src/java/org/apache/phoenix/metainfo
DefaultDependencyDescriptor.java
DefaultServiceDescriptor.java
DependencyDescriptor.java ServiceDescriptor.java
Removed: src/java/org/apache/phoenix/metainfo
DefaultDependencyInfo.java DefaultServiceInfo.java
DependencyInfo.java ServiceInfo.java
Log:
Finished converting metainfo to use the same style of names used with BeanInfo
framework.
Revision Changes Path
1.8 +4 -4
jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/DefaultServerApplication.java
Index: DefaultServerApplication.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/DefaultServerApplication.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultServerApplication.java 2001/03/18 08:35:02 1.7
+++ DefaultServerApplication.java 2001/04/03 03:50:35 1.8
@@ -51,7 +51,7 @@
import org.apache.phoenix.engine.phases.DefaultPhase;
import org.apache.phoenix.engine.phases.Phase;
import org.apache.phoenix.engine.phases.Traversal;
-import org.apache.phoenix.metainfo.DependencyInfo;
+import org.apache.phoenix.metainfo.DependencyDescriptor;
/**
* This is the basic container of blocks. A server application
@@ -336,9 +336,9 @@
for( int i = 0; i < roleEntrys.length; i++ )
{
final String role = roleEntrys[ i ].getRole();
- final DependencyInfo info = entry.getBlockInfo().getDependency( role );
+ final DependencyDescriptor descriptor =
entry.getBlockInfo().getDependency( role );
- if( null == info )
+ if( null == descriptor )
{
final String message = "Unknown dependency " + roleEntrys[ i
].getName() +
" with role " + role + " declared for Block " + name;
@@ -349,7 +349,7 @@
}
//Make sure all dependencies in BlockInfo file are satisfied
- final DependencyInfo[] dependencies =
entry.getBlockInfo().getDependencies();
+ final DependencyDescriptor[] dependencies =
entry.getBlockInfo().getDependencies();
for( int i = 0; i < dependencies.length; i++ )
{
final RoleEntry roleEntry =
1.5 +7 -7
jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/blocks/BlockDAG.java
Index: BlockDAG.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/blocks/BlockDAG.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BlockDAG.java 2001/03/28 03:47:30 1.4
+++ BlockDAG.java 2001/04/03 03:50:35 1.5
@@ -15,8 +15,8 @@
import org.apache.avalon.camelot.ContainerException;
import org.apache.phoenix.Block;
import org.apache.phoenix.engine.ServerApplication;
-import org.apache.phoenix.metainfo.DependencyInfo;
-import org.apache.phoenix.metainfo.ServiceInfo;
+import org.apache.phoenix.metainfo.DependencyDescriptor;
+import org.apache.phoenix.metainfo.ServiceDescriptor;
/**
* This is the dependency graph for blocks.
@@ -68,14 +68,14 @@
{
getLogger().debug( "Traversing dependencies for " + name );
- final DependencyInfo[] infos = entry.getBlockInfo().getDependencies();
- for( int i = 0; i < infos.length; i++ )
+ final DependencyDescriptor[] descriptors =
entry.getBlockInfo().getDependencies();
+ for( int i = 0; i < descriptors.length; i++ )
{
- final ServiceInfo serviceInfo = infos[ i ].getService();
- final String role = infos[ i ].getRole();
+ final ServiceDescriptor serviceDescriptor = descriptors[ i
].getService();
+ final String role = descriptors[ i ].getRole();
getLogger().debug( "Traversing dependency of " + name + " with role " +
role +
- " to provide service " + serviceInfo.getName() );
+ " to provide service " + serviceDescriptor.getName()
);
//roleEntry should NEVER be null as it is checked when
//entry is added to container
1.2 +2 -2
jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/facilities/DefaultComponentBuilder.java
Index: DefaultComponentBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/facilities/DefaultComponentBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultComponentBuilder.java 2001/03/18 08:35:04 1.1
+++ DefaultComponentBuilder.java 2001/04/03 03:50:36 1.2
@@ -23,7 +23,7 @@
import org.apache.phoenix.Block;
import org.apache.phoenix.engine.blocks.BlockEntry;
import org.apache.phoenix.metainfo.BlockUtil;
-import org.apache.phoenix.metainfo.ServiceInfo;
+import org.apache.phoenix.metainfo.ServiceDescriptor;
/**
* Component responsible for building componentManager information for entry.
@@ -89,7 +89,7 @@
final Block block )
throws ApplicationException
{
- final ServiceInfo[] services = blockEntry.getBlockInfo().getServices();
+ final ServiceDescriptor[] services =
blockEntry.getBlockInfo().getServices();
for( int i = 0; i < services.length; i++ )
{
if( false == BlockUtil.implementsService( block, services[ i ] ) )
1.4 +5 -5
jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/facilities/DefaultComponentManagerBuilder.java
Index: DefaultComponentManagerBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/facilities/DefaultComponentManagerBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultComponentManagerBuilder.java 2001/03/22 04:57:06 1.3
+++ DefaultComponentManagerBuilder.java 2001/04/03 03:50:36 1.4
@@ -20,7 +20,7 @@
import org.apache.phoenix.engine.blocks.RoleEntry;
import org.apache.phoenix.metainfo.BlockInfo;
import org.apache.phoenix.metainfo.BlockUtil;
-import org.apache.phoenix.metainfo.ServiceInfo;
+import org.apache.phoenix.metainfo.ServiceDescriptor;
/**
* Component responsible for building componentManager information for entry.
@@ -58,7 +58,7 @@
for( int i = 0; i < roleEntrys.length; i++ )
{
final String dependencyName = roleEntrys[ i ].getName();
- final ServiceInfo serviceInfo =
+ final ServiceDescriptor serviceDescriptor =
info.getDependency( roleEntrys[ i ].getRole() ).getService();
try
@@ -69,12 +69,12 @@
(BlockEntry)m_serverApplication.getEntry( dependencyName );
//make sure that the block offers service it supposed to be
providing
- final ServiceInfo[] services =
dependency.getBlockInfo().getServices();
- if( !BlockUtil.hasMatchingService( services, serviceInfo ) )
+ final ServiceDescriptor[] services =
dependency.getBlockInfo().getServices();
+ if( !BlockUtil.hasMatchingService( services, serviceDescriptor ) )
{
throw new ComponentManagerException( "Dependency " +
dependencyName +
" does not offer service
required: " +
- serviceInfo );
+ serviceDescriptor );
}
componentManager.put( roleEntrys[ i ].getRole(),
dependency.getBlock() );
1.2 +3 -3
jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/listeners/SAErrorHandler.java
Index: SAErrorHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/engine/listeners/SAErrorHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SAErrorHandler.java 2001/04/02 01:40:31 1.1
+++ SAErrorHandler.java 2001/04/03 03:50:37 1.2
@@ -7,7 +7,7 @@
*/
package org.apache.phoenix.engine.listeners;
-import org.apache.phoenix.metainfo.ServiceInfo;
+import org.apache.phoenix.metainfo.ServiceDescriptor;
/**
* This interface abstracts handling of container errors.
@@ -20,7 +20,7 @@
void missingDependency( String block, String missingDependency );
void unknownDependency( String block, String unknownDependency );
- void unimplementedService( String block, ServiceInfo service );
+ void unimplementedService( String block, ServiceDescriptor service );
void startPhase( String phase );
void endPhase( String phase );
@@ -40,6 +40,6 @@
void beginBlocksPhase( String block );
void blockNotPreparedForPhase();
void blockUsingClassLoader( ClassLoader classLoader );
- void serviceNotOffered( String dependency, ServiceInfo service );
+ void serviceNotOffered( String dependency, ServiceDescriptor service );
void endBlocksPhase();
}
1.3 +3 -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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BlockInfo.java 2001/04/02 09:10:58 1.2
+++ BlockInfo.java 2001/04/03 03:50:37 1.3
@@ -31,14 +31,14 @@
*
* @return an array of Services (can be null)
*/
- ServiceInfo[] getServices();
+ ServiceDescriptor[] getServices();
/**
* Return an array of Service dependencies that this Block depends upon.
*
* @return an array of Service dependencies (may be null)
*/
- DependencyInfo[] getDependencies();
+ DependencyDescriptor[] getDependencies();
/**
* Retrieve a dependency with a particular role.
@@ -46,5 +46,5 @@
* @param role the role
* @return the dependency or null if it does not exist
*/
- DependencyInfo getDependency( String role );
+ DependencyDescriptor getDependency( String role );
}
1.3 +19 -19
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BlockInfoBuilder.java 2001/04/02 09:10:58 1.2
+++ BlockInfoBuilder.java 2001/04/03 03:50:37 1.3
@@ -33,10 +33,10 @@
Configuration configuration = null;
configuration = info.getChild( "services" );
- final ServiceInfo services[] = buildServices( configuration );
+ final ServiceDescriptor services[] = buildServices( configuration );
configuration = info.getChild( "dependencies" );
- final DependencyInfo dependencies[] = buildDependencies( configuration );
+ final DependencyDescriptor dependencies[] = buildDependencies(
configuration );
configuration = info.getChild( "meta" );
final BlockDescriptor descriptor = buildBlockDescriptor( configuration );
@@ -44,55 +44,55 @@
return new DefaultBlockInfo( descriptor, services, dependencies );
}
- protected DependencyInfo[] buildDependencies( final Configuration configuration
)
+ protected DependencyDescriptor[] buildDependencies( final Configuration
configuration )
throws ConfigurationException
{
- if( null == configuration ) return new DependencyInfo[0];
+ if( null == configuration ) return new DependencyDescriptor[0];
final Configuration[] elements = configuration.getChildren( "dependency" );
- final ArrayList infos = new ArrayList();
+ final ArrayList descriptors = new ArrayList();
for( int i = 0; i < elements.length; i++ )
{
- final DependencyInfo info = buildDependency( elements[ i ] );
- infos.add( info );
+ final DependencyDescriptor descriptor = buildDependency( elements[ i ]
);
+ descriptors.add( descriptor );
}
- return (DependencyInfo[]) infos.toArray( new DependencyInfo[0] );
+ return (DependencyDescriptor[]) descriptors.toArray( new
DependencyDescriptor[0] );
}
- protected DependencyInfo buildDependency( final Configuration dependency )
+ protected DependencyDescriptor buildDependency( final Configuration dependency )
throws ConfigurationException
{
final String role = dependency.getChild( "role" ).getValue();
- final ServiceInfo serviceInfo = buildService( dependency.getChild(
"service" ) );
+ final ServiceDescriptor serviceDescriptor = buildService(
dependency.getChild( "service" ) );
- return new DefaultDependencyInfo( role, serviceInfo );
+ return new DefaultDependencyDescriptor( role, serviceDescriptor );
}
- protected ServiceInfo[] buildServices( final Configuration servicesSet )
+ protected ServiceDescriptor[] buildServices( final Configuration servicesSet )
throws ConfigurationException
{
- if( null == servicesSet ) return new ServiceInfo[0];
+ if( null == servicesSet ) return new ServiceDescriptor[0];
final Configuration[] elements = servicesSet.getChildren( "service" );
- final ArrayList infos = new ArrayList();
+ final ArrayList descriptors = new ArrayList();
for( int i = 0; i < elements.length; i++ )
{
- final ServiceInfo info = buildService( elements[ i ] );
- infos.add( info );
+ final ServiceDescriptor descriptor = buildService( elements[ i ] );
+ descriptors.add( descriptor );
}
- return (ServiceInfo[])infos.toArray( new ServiceInfo[0] );
+ return (ServiceDescriptor[])descriptors.toArray( new ServiceDescriptor[0] );
}
- protected ServiceInfo buildService( final Configuration service )
+ protected ServiceDescriptor buildService( final Configuration service )
throws ConfigurationException
{
final String name = service.getAttribute( "name" );
final Version version = buildVersion( service.getAttribute( "version" ) );
- return new DefaultServiceInfo( name, version );
+ return new DefaultServiceDescriptor( name, version );
}
protected Version buildVersion( final String version )
1.2 +3 -3
jakarta-avalon-phoenix/src/java/org/apache/phoenix/metainfo/BlockUtil.java
Index: BlockUtil.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/phoenix/metainfo/BlockUtil.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BlockUtil.java 2001/02/24 04:31:02 1.1
+++ BlockUtil.java 2001/04/03 03:50:37 1.2
@@ -23,7 +23,7 @@
{
}
- public static boolean implementsService( final Block block, final ServiceInfo
service )
+ public static boolean implementsService( final Block block, final
ServiceDescriptor service )
{
try
{
@@ -37,8 +37,8 @@
return false;
}
- public static boolean hasMatchingService( final ServiceInfo[] candidates,
- final ServiceInfo service )
+ public static boolean hasMatchingService( final ServiceDescriptor[] candidates,
+ final ServiceDescriptor service )
{
for( int i = 0; i < candidates.length; i++ )
{
1.3 +7 -7
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultBlockInfo.java 2001/04/02 09:10:59 1.2
+++ DefaultBlockInfo.java 2001/04/03 03:50:38 1.3
@@ -16,15 +16,15 @@
implements BlockInfo
{
protected final BlockDescriptor m_descriptor;
- protected final ServiceInfo[] m_services;
- protected final DependencyInfo[] m_dependencies;
+ protected final ServiceDescriptor[] m_services;
+ protected final DependencyDescriptor[] m_dependencies;
/**
* Basic constructor that takes as parameters all parts.
*/
public DefaultBlockInfo( final BlockDescriptor descriptor,
- final ServiceInfo[] services,
- final DependencyInfo[] dependencies )
+ final ServiceDescriptor[] services,
+ final DependencyDescriptor[] dependencies )
{
m_descriptor = descriptor;
m_services = services;
@@ -47,7 +47,7 @@
*
* @return an array of Services (can be null)
*/
- public ServiceInfo[] getServices()
+ public ServiceDescriptor[] getServices()
{
return m_services;
}
@@ -57,7 +57,7 @@
*
* @return an array of Service dependencies (may be null)
*/
- public DependencyInfo[] getDependencies()
+ public DependencyDescriptor[] getDependencies()
{
return m_dependencies;
}
@@ -68,7 +68,7 @@
* @param role the role
* @return the dependency or null if it does not exist
*/
- public DependencyInfo getDependency( final String role )
+ public DependencyDescriptor getDependency( final String role )
{
for( int i = 0; i < m_dependencies.length; i++ )
{
1.1
jakarta-avalon-phoenix/src/java/org/apache/phoenix/metainfo/DefaultDependencyDescriptor.java
Index: DefaultDependencyDescriptor.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 file.
*/
package org.apache.phoenix.metainfo;
import org.apache.avalon.util.Version;
/**
* This is implementation of DependencyDescriptor.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
public class DefaultDependencyDescriptor
implements DependencyDescriptor
{
protected final String m_role;
protected final ServiceDescriptor m_service;
/**
* Constructor that has all parts as parameters.
*/
public DefaultDependencyDescriptor( final String role, final ServiceDescriptor
service )
{
m_role = role;
m_service = service;
}
/**
* Return role of dependency.
*
* The role is what is used by block implementor to
* aquire dependency in ComponentManager.
*
* @return the name of the dependency
*/
public String getRole()
{
return m_role;
}
/**
* Return Service dependency provides.
*
* @return the service dependency provides
*/
public ServiceDescriptor getService()
{
return m_service;
}
}
1.1
jakarta-avalon-phoenix/src/java/org/apache/phoenix/metainfo/DefaultServiceDescriptor.java
Index: DefaultServiceDescriptor.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 file.
*/
package org.apache.phoenix.metainfo;
import org.apache.avalon.util.Version;
/**
* This is default implementaion of ServiceInfo interface.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
public final class DefaultServiceDescriptor
implements ServiceDescriptor
{
protected final Version m_version;
protected final String m_name;
public DefaultServiceDescriptor( final String name, final Version version )
{
m_name = name;
m_version = version;
}
/**
* Return version of interface
*
* @return the version of interface
*/
public Version getVersion()
{
return m_version;
}
/**
* Return name of Service (which coresponds to the interface
* name eg org.apache.block.Logger)
*
* @return the name of the Service
*/
public String getName()
{
return m_name;
}
/**
* Determine if other service will match this service.
* To match a service has to have same name and must comply with version.
*
* @param other the other ServiceInfo
* @return true if matches, false otherwise
*/
public boolean matches( final ServiceDescriptor other )
{
return
other.getName().equals( m_name ) &&
other.getVersion().complies( m_version );
}
/**
* Convert to a string of format name/version
*
* @return string describing service
*/
public String toString()
{
return m_name + "/" + m_version;
}
}
1.1
jakarta-avalon-phoenix/src/java/org/apache/phoenix/metainfo/DependencyDescriptor.java
Index: DependencyDescriptor.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 file.
*/
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 DependencyDescriptor
extends Descriptor
{
/**
* Return name of dependency.
*
* The name is what is used by block implementor to aquire dependency in
ComponentManager.
*
* @return the name of the dependency
*/
String getRole();
/**
* Return Service dependency provides.
*
* @return the service dependency provides
*/
ServiceDescriptor getService();
}
1.1
jakarta-avalon-phoenix/src/java/org/apache/phoenix/metainfo/ServiceDescriptor.java
Index: ServiceDescriptor.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 file.
*/
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.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
public interface ServiceDescriptor
extends Descriptor
{
/**
* Return version of interface
*
* @return the version of interface
*/
Version getVersion();
/**
* Return name of Service (which coresponds to the interface name
* eg org.apache.block.Logger).
*
* @return the name of the Service
*/
String getName();
/**
* Determine if other service will match this service.
* To match a service has to have same name and must comply with version.
*
* @param other the other ServiceDescriptor
* @return true if matches, false otherwise
*/
boolean matches( ServiceDescriptor other );
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
