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/05/09 07:43:05 UTC
cvs commit: avalon-sandbox/merlin/merlin-spi/src/java/org/apache/avalon/merlin/kernel Kernel.java KernelLoader.java
mcconnell 2003/05/08 22:43:05
Modified: merlin/merlin-spi/src/java/org/apache/avalon/merlin/kernel
Kernel.java KernelLoader.java
Log:
Update kernel to include getURL() operation.
Revision Changes Path
1.6 +11 -5 avalon-sandbox/merlin/merlin-spi/src/java/org/apache/avalon/merlin/kernel/Kernel.java
Index: Kernel.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-spi/src/java/org/apache/avalon/merlin/kernel/Kernel.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Kernel.java 8 May 2003 03:02:40 -0000 1.5
+++ Kernel.java 9 May 2003 05:43:05 -0000 1.6
@@ -50,6 +50,7 @@
package org.apache.avalon.merlin.kernel;
+import java.net.URL;
import org.apache.avalon.merlin.block.Block;
/**
@@ -68,12 +69,17 @@
//=======================================================================
/**
- * When deploying merlin in a simulation mode the kernel can be established
- * with a URL referencing a base directory from which classes and scanned
- * for type, service and profile defintions.
+ * Standard key used to reference the kernel base URL. This key is typically
+ * used within embedding applications as key to the URL returned from the
+ * Kernel.getURL() operation.
*/
- static final String BASE_KEY = "urn:merlin:base";
+ static final String BASE_URL_KEY = "urn:merlin:base.url";
+ /**
+ * Return the base URL from which services can be resolved.
+ * @return the base url
+ */
+ URL getURL();
/**
* Return the root block.
1.3 +2 -0 avalon-sandbox/merlin/merlin-spi/src/java/org/apache/avalon/merlin/kernel/KernelLoader.java
Index: KernelLoader.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-spi/src/java/org/apache/avalon/merlin/kernel/KernelLoader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- KernelLoader.java 16 Apr 2003 14:22:45 -0000 1.2
+++ KernelLoader.java 9 May 2003 05:43:05 -0000 1.3
@@ -13,6 +13,8 @@
public interface KernelLoader
{
+ static final String BASE_KEY = "urn:merlin:base";
+
/**
* Creation of a new Kernel instance. Arguments passed
* passed to the kernel build operation are detailed in the following
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org