You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2003/07/12 16:12:53 UTC
cvs commit: avalon-sandbox/meta/impl/src/test/org/apache/avalon/meta/legacy LegacyTestCase.java
mcconnell 2003/07/12 07:12:53
Modified: meta/impl/src/java/org/apache/avalon/meta/info/builder
Resources.properties TypeBuilder.java
XMLTypeCreator.java
meta/impl/src/test/org/apache/avalon/meta/classic
ClassicTestCase.java
meta/impl/src/test/org/apache/avalon/meta/compat
CompatTestCase.java
meta/impl/src/test/org/apache/avalon/meta/legacy
LegacyTestCase.java
Log:
Housekeeping (code cleanup).
Revision Changes Path
1.2 +1 -1 avalon-sandbox/meta/impl/src/java/org/apache/avalon/meta/info/builder/Resources.properties
Index: Resources.properties
===================================================================
RCS file: /home/cvs/avalon-sandbox/meta/impl/src/java/org/apache/avalon/meta/info/builder/Resources.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Resources.properties 10 Jul 2003 12:10:03 -0000 1.1
+++ Resources.properties 12 Jul 2003 14:12:52 -0000 1.2
@@ -4,7 +4,7 @@
builder.bad-toplevel-element.error=Error the component implemented by "{0}" has an invalid element at top level of component info descriptor. Expected: "type". Actual: "{1}"
builder.bad-toplevel-block-element.error=Error the component implemented by "{0}" has an invalid element at top level of component info descriptor. Expected: "blockinfo". Actual: "{1}"
builder.missing-info.error=Unable to locate resource from which to load info for component implemented by class "{0}".
-builder.missing-xml-creator.error=Unable to create XMLTypeCreator, usually due to not having XML classes on Classpath. Thus unable to lookup XML descriptor for component type "{0}".
+builder.missing-xml-creator.error=Unable to create XMLTypeCreator, usually due to non-availablity of XML classes on Classpath.
builder.creating-facility.notice=Creating a Facility from class "{0}".
builder.created-facility.notice=Constructed Facility from class {0} with {1} services, {2} dependencies, {3} context entries, {4} loggers, {5} extended phases dependecies, and {6} phase extensions.
1.2 +18 -36 avalon-sandbox/meta/impl/src/java/org/apache/avalon/meta/info/builder/TypeBuilder.java
Index: TypeBuilder.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/meta/impl/src/java/org/apache/avalon/meta/info/builder/TypeBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TypeBuilder.java 10 Jul 2003 12:10:06 -0000 1.1
+++ TypeBuilder.java 12 Jul 2003 14:12:52 -0000 1.2
@@ -87,7 +87,7 @@
* @return the created Type
* @throws Exception if an error occurs
*/
- public Type build( final Class clazz )
+ public Type buildType( final Class clazz )
throws Exception
{
//
@@ -95,30 +95,14 @@
// supply these as arguments to thye type build
//
- return build( clazz.getName(), clazz.getClassLoader() );
- }
-
- /**
- * Create a {@link Type} object for specified
- * classname, in specified ClassLoader.
- *
- * @param classname The classname of Component
- * @param classLoader the ClassLoader to load info from
- * @return the created Type
- * @throws Exception if an error occurs
- */
- public Type build( final String classname,
- final ClassLoader classLoader )
- throws Exception
- {
- final Type info = buildFromSerDescriptor( classname, classLoader );
+ final Type info = buildFromSerDescriptor( clazz );
if( null != info )
{
return info;
}
else
{
- return buildFromXMLDescriptor( classname, classLoader );
+ return buildFromXMLDescriptor( clazz );
}
}
@@ -130,27 +114,26 @@
* @return the created Type
* @throws Exception if an error occurs
*/
- private Type buildFromSerDescriptor(
- final String classname, final ClassLoader classLoader )
+ private Type buildFromSerDescriptor( final Class clazz )
throws Exception
{
- Type type = buildFromSerDescriptor( classname, classLoader, ".ztype" );
+ Type type = buildFromSerDescriptor( clazz, ".ztype" );
if( type != null )
{
return type;
}
else
{
- return buildFromSerDescriptor( classname, classLoader, ".zinfo" );
+ return buildFromSerDescriptor( clazz, ".zinfo" );
}
}
- private Type buildFromSerDescriptor(
- final String classname, final ClassLoader classLoader, String form )
+ private Type buildFromSerDescriptor( final Class clazz, String form )
throws Exception
{
- final String address =
- classname.replace( '.', '/' ) + form;
+ final String classname = clazz.getName();
+ final ClassLoader classLoader = clazz.getClassLoader();
+ final String address = classname.replace( '.', '/' ) + form;
final InputStream stream =
classLoader.getResourceAsStream( address );
if( null == stream )
@@ -174,12 +157,13 @@
* @return the created Type
* @throws Exception if an error occurs
*/
- private Type buildFromXMLDescriptor( final String classname,
- final ClassLoader classLoader )
+ private Type buildFromXMLDescriptor( Class clazz )
throws Exception
{
+ final String classname = clazz.getName();
+ final ClassLoader classLoader = clazz.getClassLoader();
- final TypeFactory xmlTypeFactory = getXMLTypeFactory( classname );
+ final TypeFactory xmlTypeFactory = getXMLTypeFactory();
//
// get the input stream for the .xtype resource
@@ -201,8 +185,7 @@
if( null == inputStream )
{
final String message =
- REZ.getString( "builder.missing-info.error",
- classname );
+ REZ.getString( "builder.missing-info.error" );
throw new Exception( message );
}
@@ -286,7 +269,7 @@
*
* @return the TypeCreator
*/
- private TypeFactory getXMLTypeFactory( final String classname )
+ private TypeFactory getXMLTypeFactory()
throws Exception
{
if( null != m_xmlTypeFactory )
@@ -296,8 +279,7 @@
else
{
final String message =
- REZ.getString( "builder.missing-xml-creator.error",
- classname );
+ REZ.getString( "builder.missing-xml-creator.error" );
throw new Exception( message );
}
}
1.3 +2 -3 avalon-sandbox/meta/impl/src/java/org/apache/avalon/meta/info/builder/XMLTypeCreator.java
Index: XMLTypeCreator.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/meta/impl/src/java/org/apache/avalon/meta/info/builder/XMLTypeCreator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XMLTypeCreator.java 10 Jul 2003 21:19:08 -0000 1.2
+++ XMLTypeCreator.java 12 Jul 2003 14:12:52 -0000 1.3
@@ -82,8 +82,7 @@
* @version $Revision$ $Date$
*/
public class XMLTypeCreator
- extends XMLServiceCreator
- implements TypeFactory
+ extends XMLServiceCreator implements TypeFactory
{
private static final Resources REZ =
ResourceManager.getPackageResources( XMLTypeCreator.class );
1.2 +1 -1 avalon-sandbox/meta/impl/src/test/org/apache/avalon/meta/classic/ClassicTestCase.java
Index: ClassicTestCase.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/meta/impl/src/test/org/apache/avalon/meta/classic/ClassicTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ClassicTestCase.java 10 Jul 2003 12:10:19 -0000 1.1
+++ ClassicTestCase.java 12 Jul 2003 14:12:52 -0000 1.2
@@ -27,7 +27,7 @@
TypeBuilder builder = new TypeBuilder();
ClassLoader loader = Thread.currentThread().getContextClassLoader();
Class clazz = loader.loadClass( "org.apache.avalon.meta.classic.Test" );
- m_type = builder.build( clazz );
+ m_type = builder.buildType( clazz );
}
public void testName() throws Exception
1.2 +1 -1 avalon-sandbox/meta/impl/src/test/org/apache/avalon/meta/compat/CompatTestCase.java
Index: CompatTestCase.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/meta/impl/src/test/org/apache/avalon/meta/compat/CompatTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CompatTestCase.java 10 Jul 2003 12:10:19 -0000 1.1
+++ CompatTestCase.java 12 Jul 2003 14:12:53 -0000 1.2
@@ -27,7 +27,7 @@
TypeBuilder builder = new TypeBuilder();
ClassLoader loader = Thread.currentThread().getContextClassLoader();
Class clazz = loader.loadClass( "org.apache.avalon.meta.compat.Test" );
- m_type = builder.build( clazz );
+ m_type = builder.buildType( clazz );
}
public void testName() throws Exception
1.2 +1 -1 avalon-sandbox/meta/impl/src/test/org/apache/avalon/meta/legacy/LegacyTestCase.java
Index: LegacyTestCase.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/meta/impl/src/test/org/apache/avalon/meta/legacy/LegacyTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LegacyTestCase.java 10 Jul 2003 12:10:19 -0000 1.1
+++ LegacyTestCase.java 12 Jul 2003 14:12:53 -0000 1.2
@@ -27,7 +27,7 @@
TypeBuilder builder = new TypeBuilder();
ClassLoader loader = Thread.currentThread().getContextClassLoader();
Class clazz = loader.loadClass( "org.apache.avalon.meta.legacy.Test" );
- m_type = builder.build( clazz );
+ m_type = builder.buildType( clazz );
}
public void testName() throws Exception
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org