donaldp 2002/10/19 18:00:15
Modified: src/java/org/apache/avalon/phoenix/metadata Tag:
FACTORY-branch BlockMetaData.java
src/java/org/apache/avalon/phoenix/tools/assembler Tag:
FACTORY-branch Assembler.java
src/java/org/apache/avalon/phoenix/tools/infobuilder Tag:
FACTORY-branch InterceptorInfoBuilder.java
src/test/org/apache/avalon/phoenix/tools/assembler/test Tag:
FACTORY-branch AssemblerTestCase.java
Added: src/java/org/apache/avalon/phoenix/metadata Tag:
FACTORY-branch InterceptorMetaData.java
Removed: src/java/org/apache/avalon/phoenix/metainfo Tag:
FACTORY-branch InterceptorInfo.java
Log:
Rename InterceptorInfo to InterceptorMetaData as it comes out of the assembly file
rather than out of the blockinfo file.
Revision Changes Path
No revision
No revision
1.16.4.2 +4 -5
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/metadata/BlockMetaData.java
Index: BlockMetaData.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/metadata/BlockMetaData.java,v
retrieving revision 1.16.4.1
retrieving revision 1.16.4.2
diff -u -r1.16.4.1 -r1.16.4.2
--- BlockMetaData.java 15 Oct 2002 22:14:06 -0000 1.16.4.1
+++ BlockMetaData.java 20 Oct 2002 01:00:14 -0000 1.16.4.2
@@ -8,7 +8,6 @@
package org.apache.avalon.phoenix.metadata;
import org.apache.avalon.phoenix.metainfo.BlockInfo;
-import org.apache.avalon.phoenix.metainfo.InterceptorInfo;
/**
* This is the structure describing each block.
@@ -21,13 +20,13 @@
private final DependencyMetaData[] m_dependencies;
private final boolean m_disableProxy;
private final BlockInfo m_blockInfo;
- private final InterceptorInfo[] m_interceptors;
+ private final InterceptorMetaData[] m_interceptors;
public BlockMetaData( final String name,
final DependencyMetaData[] dependencies,
final boolean disableProxy,
final BlockInfo blockInfo,
- final InterceptorInfo[] interceptors )
+ final InterceptorMetaData[] interceptors )
{
m_name = name;
m_dependencies = dependencies;
@@ -85,9 +84,9 @@
/**
* Returns the interceptors.
*
- * @return InterceptorInfo[]
+ * @return InterceptorMetaData[]
*/
- public InterceptorInfo[] getInterceptors()
+ public InterceptorMetaData[] getInterceptors()
{
return m_interceptors;
}
No revision
No revision
1.1.4.1 +29 -0
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/metadata/Attic/InterceptorMetaData.java
No revision
No revision
1.22.4.2 +3 -3
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/assembler/Assembler.java
Index: Assembler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/assembler/Assembler.java,v
retrieving revision 1.22.4.1
retrieving revision 1.22.4.2
diff -u -r1.22.4.1 -r1.22.4.2
--- Assembler.java 15 Oct 2002 22:14:07 -0000 1.22.4.1
+++ Assembler.java 20 Oct 2002 01:00:14 -0000 1.22.4.2
@@ -21,7 +21,7 @@
import org.apache.avalon.phoenix.metadata.DependencyMetaData;
import org.apache.avalon.phoenix.metadata.SarMetaData;
import org.apache.avalon.phoenix.metainfo.BlockInfo;
-import org.apache.avalon.phoenix.metainfo.InterceptorInfo;
+import org.apache.avalon.phoenix.metadata.InterceptorMetaData;
import org.apache.avalon.phoenix.tools.configuration.ConfigurationBuilder;
import org.apache.avalon.phoenix.tools.infobuilder.BlockInfoBuilder;
import org.apache.avalon.phoenix.tools.infobuilder.InterceptorInfoBuilder;
@@ -125,7 +125,7 @@
final Configuration proxy = block.getChild( "proxy" );
final boolean disableProxy =
proxy.getAttributeAsBoolean( "disable", false );
- final InterceptorInfo[] interceptors = m_interceptorBuilder.build(
proxy );
+ final InterceptorMetaData[] interceptors = m_interceptorBuilder.build(
proxy );
final DependencyMetaData[] roles = buildDependencyMetaDatas( provides );
final BlockInfo info = getBlockInfo( name, classname, classLoader );
No revision
No revision
1.1.2.2 +12 -12
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/infobuilder/Attic/InterceptorInfoBuilder.java
Index: InterceptorInfoBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/infobuilder/Attic/InterceptorInfoBuilder.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- InterceptorInfoBuilder.java 15 Oct 2002 22:14:07 -0000 1.1.2.1
+++ InterceptorInfoBuilder.java 20 Oct 2002 01:00:15 -0000 1.1.2.2
@@ -13,10 +13,10 @@
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.phoenix.metainfo.InterceptorInfo;
+import org.apache.avalon.phoenix.metadata.InterceptorMetaData;
/**
- * A InterceptorInfoBuilder is responsible for building {@link InterceptorInfo}.
+ * A InterceptorInfoBuilder is responsible for building {@link
org.apache.avalon.phoenix.metadata.InterceptorMetaData}.
*
* @author <a href="mailto:igorfie at yahoo.com">Igor Fedorenko</a>
* @version $Revision$ $Date$
@@ -27,14 +27,14 @@
ResourceManager.getPackageResources( InterceptorInfoBuilder.class );
/**
- * A utility method to build an array of {@link InterceptorInfo}
+ * A utility method to build an array of {@link
org.apache.avalon.phoenix.metadata.InterceptorMetaData}
* objects from specified configuraiton.
*
* @param configuration the interceptors configuration
- * @return the created InterceptorInfo array
+ * @return the created InterceptorMetaData array
* @throws ConfigurationException if an error occurs
*/
- public InterceptorInfo[] build( Configuration configuration )
+ public InterceptorMetaData[] build( Configuration configuration )
throws ConfigurationException
{
final boolean proxyDisabled =
configuration.getAttributeAsBoolean("disable", false);
@@ -49,27 +49,27 @@
for( int i = 0; i < elements.length; i++ )
{
- final InterceptorInfo interceptor = buildInterceptor( elements[ i ] );
+ final InterceptorMetaData interceptor = buildInterceptor( elements[ i ]
);
interceptors.add( interceptor );
}
- return (InterceptorInfo[])interceptors.toArray( new InterceptorInfo[ 0 ] );
+ return (InterceptorMetaData[])interceptors.toArray( new
InterceptorMetaData[ 0 ] );
}
/**
- * A utility method to build a {@link InterceptorInfo}
+ * A utility method to build a {@link
org.apache.avalon.phoenix.metadata.InterceptorMetaData}
* object from specified configuraiton.
*
* @param interceptor the interceptor configuration
- * @return the created InterceptorInfo
+ * @return the created InterceptorMetaData
* @throws ConfigurationException if an error occurs
*/
- private InterceptorInfo buildInterceptor( final Configuration interceptor )
+ private InterceptorMetaData buildInterceptor( final Configuration interceptor )
throws ConfigurationException
{
String classname = interceptor.getAttribute( "class" );
- return new InterceptorInfo( classname );
+ return new InterceptorMetaData( classname );
}
}
No revision
No revision
1.6.4.2 +4 -4
jakarta-avalon-phoenix/src/test/org/apache/avalon/phoenix/tools/assembler/test/AssemblerTestCase.java
Index: AssemblerTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/test/org/apache/avalon/phoenix/tools/assembler/test/AssemblerTestCase.java,v
retrieving revision 1.6.4.1
retrieving revision 1.6.4.2
diff -u -r1.6.4.1 -r1.6.4.2
--- AssemblerTestCase.java 15 Oct 2002 22:14:07 -0000 1.6.4.1
+++ AssemblerTestCase.java 20 Oct 2002 01:00:15 -0000 1.6.4.2
@@ -10,7 +10,7 @@
import org.apache.avalon.phoenix.metadata.BlockMetaData;
import org.apache.avalon.phoenix.metadata.DependencyMetaData;
import org.apache.avalon.phoenix.metadata.SarMetaData;
-import org.apache.avalon.phoenix.metainfo.InterceptorInfo;
+import org.apache.avalon.phoenix.metadata.InterceptorMetaData;
import org.apache.avalon.phoenix.test.AbstractContainerTestCase;
import org.apache.avalon.phoenix.test.data.Component1;
import org.apache.avalon.phoenix.test.data.Component2;
@@ -148,8 +148,8 @@
final BlockMetaData block1 = blocks[ 0 ];
final BlockMetaData block2 = blocks[ 1 ];
- final InterceptorInfo[] interceptor1 = block1.getInterceptors();
- final InterceptorInfo[] interceptor2 = block2.getInterceptors();
+ final InterceptorMetaData[] interceptor1 = block1.getInterceptors();
+ final InterceptorMetaData[] interceptor2 = block2.getInterceptors();
assertEquals( "Block1 Interceptor count", 1, interceptor1.length );
assertEquals( "Block1 Interceptor class",
--
To unsubscribe, e-mail: <mailto:avalon-cvs-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@;jakarta.apache.org>
