mcconnell 2002/07/02 18:18:47
Modified: assembly/src/java/org/apache/excalibur/merlin/registry
DefaultRegistry.java
Log:
cleanup of context and service key usage
Revision Changes Path
1.4 +18 -2
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/registry/DefaultRegistry.java
Index: DefaultRegistry.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/registry/DefaultRegistry.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultRegistry.java 3 Jul 2002 00:53:15 -0000 1.3
+++ DefaultRegistry.java 3 Jul 2002 01:18:47 -0000 1.4
@@ -88,6 +88,22 @@
// static
//=======================================================================
+ /**
+ * Registry key used in dependency lookup for a parent registry
+ * during servicing phase.
+ */
+ public static final String REGISTRY_KEY = "registry";
+
+ /**
+ * Context key used to locate the application classloader.
+ */
+ public static final String CLASSLOADER_KEY = "classloader";
+
+ /**
+ * Context key value used to locate the extension repository.
+ */
+ public static final String EXTENSIONS_KEY = "extensions";
+
private static final ComponentType[] EMPTY_DEFS = new ComponentType[0];
private static final Profile[] EMPTY_PROFILES = new Profile[0];
private static final Resources REZ =
@@ -187,7 +203,7 @@
try
{
- m_repository = (PackageRepository) context.get( Registry.EXTENSIONS_KEY
);
+ m_repository = (PackageRepository) context.get( EXTENSIONS_KEY );
}
catch( ContextException ce )
{
@@ -223,7 +239,7 @@
{
try
{
- m_parent = (Registry) manager.lookup( Registry.ROLE );
+ m_parent = (Registry) manager.lookup( REGISTRY_KEY );
}
catch( ServiceException se )
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
