mcconnell 2003/07/31 11:54:45
Modified: meta/impl/src/java/org/apache/avalon/meta/info/builder
XMLLegacyCreator.java XMLTypeCreator.java
meta/tools/src/java/org/apache/avalon/meta/info/builder/tags
ContextTag.java
Log:
Fix a bug in the legacy type builder that was incorectly assigning the partition
name to the home directory context key.
Revision Changes Path
1.10 +3 -4
avalon-sandbox/meta/impl/src/java/org/apache/avalon/meta/info/builder/XMLLegacyCreator.java
Index: XMLLegacyCreator.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/meta/impl/src/java/org/apache/avalon/meta/info/builder/XMLLegacyCreator.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XMLLegacyCreator.java 28 Jul 2003 13:26:57 -0000 1.9
+++ XMLLegacyCreator.java 31 Jul 2003 18:54:45 -0000 1.10
@@ -217,11 +217,10 @@
"java.lang.String", false, false, "app.name" );
EntryDescriptor home =
new EntryDescriptor(
- ContextDescriptor.PARTITION_KEY,
+ ContextDescriptor.HOME_KEY,
"java.io.File", false, false, "app.home" );
- return new ContextDescriptor(
- null, new EntryDescriptor[]{ name, partition, home }, null );
+ return new ContextDescriptor( new EntryDescriptor[]{ name, partition, home
} );
}
/**
1.11 +3 -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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XMLTypeCreator.java 28 Jul 2003 13:26:58 -0000 1.10
+++ XMLTypeCreator.java 31 Jul 2003 18:54:45 -0000 1.11
@@ -386,9 +386,9 @@
final Properties attributes =
buildAttributes( context.getChild( "attributes" ) );
- String reference = context.getAttribute( "type", null );
+ String classname = context.getAttribute( "type", null );
- return new ContextDescriptor( reference, entrys, attributes );
+ return new ContextDescriptor( classname, entrys, attributes );
}
1.4 +2 -2
avalon-sandbox/meta/tools/src/java/org/apache/avalon/meta/info/builder/tags/ContextTag.java
Index: ContextTag.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/meta/tools/src/java/org/apache/avalon/meta/info/builder/tags/ContextTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ContextTag.java 28 Jul 2003 13:26:58 -0000 1.3
+++ ContextTag.java 31 Jul 2003 18:54:45 -0000 1.4
@@ -124,7 +124,7 @@
getLifecycleMethods( "contextualize", CONTEXT_CLASS );
if( methods.length == 0 )
{
- return new ContextDescriptor( null, new EntryDescriptor[0] );
+ return new ContextDescriptor( new EntryDescriptor[0] );
}
else
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
