mcconnell 2003/07/08 07:06:43
Modified: merlin/meta-spi/src/java/org/apache/avalon/meta/data
ContextDirective.java
merlin/meta-spi/src/java/org/apache/avalon/meta/info
ContextDescriptor.java InfoDescriptor.java
Log:
Remove reference to default context class.
Revision Changes Path
1.2 +1 -9
avalon-sandbox/merlin/meta-spi/src/java/org/apache/avalon/meta/data/ContextDirective.java
Index: ContextDirective.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/meta-spi/src/java/org/apache/avalon/meta/data/ContextDirective.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ContextDirective.java 3 Jul 2003 04:28:55 -0000 1.1
+++ ContextDirective.java 8 Jul 2003 14:06:42 -0000 1.2
@@ -80,14 +80,6 @@
*/
public class ContextDirective implements Serializable
{
-
- /**
- * The default context implementation class to be used if not
- * no context class is defined.
- */
- public static final String DEFAULT_CONTEXT_CLASS =
- "org.apache.avalon.framework.context.DefaultContext";
-
/**
* The set of entry directives.
*/
1.5 +5 -2
avalon-sandbox/merlin/meta-spi/src/java/org/apache/avalon/meta/info/ContextDescriptor.java
Index: ContextDescriptor.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/meta-spi/src/java/org/apache/avalon/meta/info/ContextDescriptor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ContextDescriptor.java 7 Jul 2003 18:45:36 -0000 1.4
+++ ContextDescriptor.java 8 Jul 2003 14:06:43 -0000 1.5
@@ -73,6 +73,9 @@
*/
public class ContextDescriptor extends Descriptor
{
+ public static final String STRATEGY_KEY =
+ "urn:avalon:context.strategy";
+
private final ReferenceDescriptor m_reference;
private final EntryDescriptor[] m_entries;
@@ -91,7 +94,7 @@
* Create a descriptor.
* @param reference the reference descriptor describing the context type
* @param entries the set of entries required within the context
- * @param attributes supplimentary atrtributes associated with the context
+ * @param attributes supplimentary attributes associated with the context
* @exception NullPointerException if type or entries argument is null
* @exception IllegalArgumentException if the classname format is invalid
*/
1.6 +2 -1
avalon-sandbox/merlin/meta-spi/src/java/org/apache/avalon/meta/info/InfoDescriptor.java
Index: InfoDescriptor.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/meta-spi/src/java/org/apache/avalon/meta/info/InfoDescriptor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- InfoDescriptor.java 22 Jun 2003 00:39:00 -0000 1.5
+++ InfoDescriptor.java 8 Jul 2003 14:06:43 -0000 1.6
@@ -84,6 +84,7 @@
public static final String POOLED = "pooled";
+
/**
* The short name of the Component Type. Useful for displaying
* human readable strings describing the type in
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
