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/04/17 05:37:22 UTC
cvs commit: avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance DefaultAppliance.java DefaultApplianceFactory.java DefaultApplianceRepository.java
mcconnell 2003/04/16 20:37:22
Modified: merlin/assembly/src/java/org/apache/avalon/assembly/appliance
DefaultAppliance.java DefaultApplianceFactory.java
DefaultApplianceRepository.java
Log:
Javadoc updates including a more complete description of the appliance repository.
Revision Changes Path
1.11 +7 -1 avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/DefaultAppliance.java
Index: DefaultAppliance.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/DefaultAppliance.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DefaultAppliance.java 15 Apr 2003 02:52:12 -0000 1.10
+++ DefaultAppliance.java 17 Apr 2003 03:37:22 -0000 1.11
@@ -234,6 +234,11 @@
*/
private ApplianceRepository m_repository;
+ /**
+ * The base url.
+ */
+ //private URL m_base;
+
//=====================================================================
// Contextualizable
//=====================================================================
@@ -250,6 +255,7 @@
m_lifestyle = (LifestyleService) context.get( "urn:assembly:lifestyle.service" );
m_system = (Locator) context.get( "urn:assembly:appliance.system" );
m_repository = (ApplianceRepository) context.get( "urn:assembly:appliance.repository" );
+ //m_base = (URL) context.get( "urn:assembly:appliance.base-url" );
}
//=====================================================================
1.6 +1 -2 avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/DefaultApplianceFactory.java
Index: DefaultApplianceFactory.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/DefaultApplianceFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultApplianceFactory.java 11 Apr 2003 19:26:01 -0000 1.5
+++ DefaultApplianceFactory.java 17 Apr 2003 03:37:22 -0000 1.6
@@ -278,7 +278,6 @@
// we are building a custom appliance
//
-
LifestyleService lifestyle = createLifestyleService( engine, m_pool );
DefaultLocator locator = null;
try
1.10 +14 -6 avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/DefaultApplianceRepository.java
Index: DefaultApplianceRepository.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/DefaultApplianceRepository.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DefaultApplianceRepository.java 15 Apr 2003 14:33:39 -0000 1.9
+++ DefaultApplianceRepository.java 17 Apr 2003 03:37:22 -0000 1.10
@@ -63,7 +63,12 @@
/**
* The default appliance manager provides support for {@link Appliance}
- * registration and retrival.
+ * registration and retrival. The appliance repository holds references
+ * to appliances created locally (i.e. within the scope of the current
+ * classloader). When resolving requests for an appliance the implementation
+ * brings together candidate appliance instances based on the local content
+ * together with the aggregation of appliance instances available from the
+ * parent(s) repositories.
*
* @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
* @version $Revision$ $Date$
@@ -359,8 +364,6 @@
{
final String key = appliance.getURL().getPath().substring( local.length() );
m_appliances.put( key, appliance );
- //System.out.println(
- // "## ADD: " + appliance + ", KEY: '" + key + "', in: " + getURL() );
} else
{
final String error =
@@ -383,10 +386,12 @@
String path = uri.substring( m_url.getPath().length() );
-
if( path.indexOf( "/" ) > -1 )
{
+ //
// looking for a child
+ //
+
String name = path.substring( 0, path.indexOf( "/" ) + 1 );
ApplianceRepository child = (ApplianceRepository) m_children.get( name );
if( child != null )
@@ -399,7 +404,10 @@
throw new IllegalArgumentException( error );
} else
{
- // looking for an appliance
+ //
+ // looking for a local appliance
+ //
+
Appliance appliance = (Appliance) m_appliances.get( path );
if( appliance != null )
{
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org