mcconnell 2002/09/11 04:39:25
Modified: assembly/src/java/org/apache/excalibur/merlin Main.java
assembly/src/java/org/apache/excalibur/merlin/assembly
ContainerManager.java TypeRegistry.java
Removed: assembly/src/java/org/apache/excalibur/merlin/assembly
ProfileRegistry.java
Log:
Merged profile registry into the container manager.
Revision Changes Path
1.18 +2 -2
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/Main.java
Index: Main.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/Main.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Main.java 10 Sep 2002 23:07:20 -0000 1.17
+++ Main.java 11 Sep 2002 11:39:25 -0000 1.18
@@ -99,7 +99,7 @@
}
else
{
- throw new RuntimeException("Missing kernel configuration path
argument.");
+ filename = "kernel.xml";
}
//
1.33 +1 -9
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/ContainerManager.java
Index: ContainerManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/ContainerManager.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ContainerManager.java 9 Sep 2002 04:33:53 -0000 1.32
+++ ContainerManager.java 11 Sep 2002 11:39:25 -0000 1.33
@@ -163,7 +163,6 @@
* Utility class that we use to offload the management of profiles
* and which provides the actual assembly process.
*/
- //private ProfileRegistry m_registry;
/**
* Internal reference to the supplied context object. This is the
@@ -303,13 +302,6 @@
m_deployment = new DeploymentHelper( getLoggingManager(), this );
m_deployment.enableLogging( getLocalLogger().getChildLogger("deployment") );
-
- //
- // setup the assembly sub-system
- //
-
- //m_registry = new ProfileRegistry( this );
- //m_registry.enableLogging( getLocalLogger().getChildLogger( "assembly") );
//
// build the packaged and implicit profiles
1.12 +13 -3
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/TypeRegistry.java
Index: TypeRegistry.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/TypeRegistry.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- TypeRegistry.java 11 Sep 2002 06:57:24 -0000 1.11
+++ TypeRegistry.java 11 Sep 2002 11:39:25 -0000 1.12
@@ -156,7 +156,10 @@
//=======================================================================
/**
- * Return the set of classes for a given type.
+ * Return the set of interface classes for a given type that are declared
+ * or default to the "native" service access protocol and "implements"
+ * access mode.
+ *
* @param type the component type
* @return an array of classes represnting the type's service interfaces
*/
@@ -169,7 +172,14 @@
ServiceDescriptor service = services[i];
if(
service.getAttribute("avalon:service.protocol","native").equals("native") )
{
- vector.add( getServiceClass( services[i] ) );
+ if(
service.getAttribute("avalon.service:mode","implements").equals("implements") )
+ {
+ vector.add( getServiceClass( services[i] ) );
+ }
+ else
+ {
+ // its a dynamic lookup access policy
+ }
}
}
return (Class[]) vector.toArray( new Class[0] );
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
