donaldp 2002/08/26 03:39:56
Modified: src/java/org/apache/avalon/phoenix/components/application
BlockResourceProvider.java
src/java/org/apache/avalon/phoenix/components/deployer
DefaultDeployer.java
src/java/org/apache/avalon/phoenix/metadata
BlockMetaData.java
src/java/org/apache/avalon/phoenix/metainfo
BlockDescriptor.java
src/java/org/apache/avalon/phoenix/tools/verifier
SarVerifier.java
Log:
Rename the "classname" fields to implementationKey. Deprecated old accessors and add
new bean accessors for field.
Submitted by: Igor Fedorenko <[EMAIL PROTECTED]>
Revision Changes Path
1.5 +2 -2
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/BlockResourceProvider.java
Index: BlockResourceProvider.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/BlockResourceProvider.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BlockResourceProvider.java 6 Aug 2002 11:57:39 -0000 1.4
+++ BlockResourceProvider.java 26 Aug 2002 10:39:55 -0000 1.5
@@ -80,7 +80,7 @@
{
final BlockMetaData metaData = getMetaDataFor( entry );
final ClassLoader classLoader = m_context.getClassLoader();
- String classname =
metaData.getBlockInfo().getBlockDescriptor().getClassname();
+ String classname =
metaData.getBlockInfo().getBlockDescriptor().getImplementationKey();
final Class clazz = classLoader.loadClass( classname );
return clazz.newInstance();
}
1.51 +1 -1
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/DefaultDeployer.java
Index: DefaultDeployer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/DefaultDeployer.java,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- DefaultDeployer.java 6 Aug 2002 11:57:40 -0000 1.50
+++ DefaultDeployer.java 26 Aug 2002 10:39:55 -0000 1.51
@@ -389,7 +389,7 @@
name,
type,
getConfigurationSchemaURL( name,
-
descriptor.getClassname(),
+
descriptor.getImplementationKey(),
classLoader )
);
}
1.14 +9 -1
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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- BlockMetaData.java 18 Aug 2002 08:23:33 -0000 1.13
+++ BlockMetaData.java 26 Aug 2002 10:39:56 -0000 1.14
@@ -40,9 +40,17 @@
return m_name;
}
+ /**
+ * @deprecated Please use {@link #getImplementationKey} instead.
+ */
public String getClassname()
{
- return getBlockInfo().getBlockDescriptor().getClassname();
+ return getImplementationKey();
+ }
+
+ public String getImplementationKey()
+ {
+ return getBlockInfo().getBlockDescriptor().getImplementationKey();
}
public BlockInfo getBlockInfo()
1.11 +17 -7
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/metainfo/BlockDescriptor.java
Index: BlockDescriptor.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/metainfo/BlockDescriptor.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- BlockDescriptor.java 6 Aug 2002 11:57:41 -0000 1.10
+++ BlockDescriptor.java 26 Aug 2002 10:39:56 -0000 1.11
@@ -21,20 +21,17 @@
* assembly tools or generators.
*/
private final String m_name;
-
- private final String m_classname;
-
+ private final String m_implementationKey;
private final Version m_version;
-
private final String m_schemaType;
public BlockDescriptor( final String name,
- final String classname,
+ final String implementationKey,
final String schemaType,
final Version version )
{
m_name = name;
- m_classname = classname;
+ m_implementationKey = implementationKey;
m_version = version;
m_schemaType = schemaType;
}
@@ -53,10 +50,23 @@
* Retrieve the Class Name of Block.
*
* @return the Class Name of block
+ * @see #getImplementationKey
+ * @deprecated Deprecated and replaced by {@link #getImplementationKey}
*/
public String getClassname()
{
- return m_classname;
+ return getImplementationKey();
+ }
+
+ /**
+ * Retrieve the implementation key for the Block.
+ * Usually the keys is a classname.
+ *
+ * @return the implementation key for the Block
+ */
+ public String getImplementationKey()
+ {
+ return m_implementationKey;
}
/**
1.27 +2 -2
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/verifier/SarVerifier.java
Index: SarVerifier.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/verifier/SarVerifier.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- SarVerifier.java 6 Aug 2002 11:57:42 -0000 1.26
+++ SarVerifier.java 26 Aug 2002 10:39:56 -0000 1.27
@@ -360,7 +360,7 @@
throws VerifyException
{
final String name = block.getName();
- final String classname = block.getClassname();
+ final String classname = block.getImplementationKey();
Class clazz = null;
try
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
