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/12/02 08:58:43 UTC
cvs commit: avalon-sandbox/kernel/api/src/java/org/apache/avalon/merlin KernelCriteria.java Kernel.java
mcconnell 2003/12/01 23:58:43
Modified: kernel/api/src/java/org/apache/avalon/merlin Kernel.java
Added: kernel/api/src/java/org/apache/avalon/merlin
KernelCriteria.java
Log:
Move KernelCriteria from SPI to API.
Revision Changes Path
1.2 +8 -21 avalon-sandbox/kernel/api/src/java/org/apache/avalon/merlin/Kernel.java
Index: Kernel.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/kernel/api/src/java/org/apache/avalon/merlin/Kernel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Kernel.java 30 Nov 2003 05:55:30 -0000 1.1
+++ Kernel.java 2 Dec 2003 07:58:42 -0000 1.2
@@ -50,9 +50,8 @@
package org.apache.avalon.merlin;
+import org.apache.avalon.activation.appliance.Appliance;
import org.apache.avalon.activation.appliance.Block;
-import org.apache.avalon.composition.model.ContainmentModel;
-import org.apache.avalon.framework.logger.Logger;
/**
* A Kernel is the root of a containment solution. This interfaces
@@ -65,27 +64,15 @@
public interface Kernel extends KernelController
{
/**
- * Return the root containment model.
- * @return the containment model
- */
- ContainmentModel getContainmentModel();
-
- /**
- * Return the block matching the supplied model.
- * @return the containment block
- */
- Block getBlock( ContainmentModel model ) throws KernelException;
-
- /**
* Return the root block.
- * @return the containment block
+ * @return the root application containment block
*/
- Block getRootBlock();
+ Block getBlock();
/**
- * Return the Logger for the specified category.
- * @param category the category path
- * @return the logging channel
+ * Return the applicance matching the supplied path.
+ * @return the appliance
*/
- Logger getLoggerForCategory( final String category );
+ Appliance locate( String path ) throws KernelException;
+
}
1.1 avalon-sandbox/kernel/api/src/java/org/apache/avalon/merlin/KernelCriteria.java
Index: KernelCriteria.java
===================================================================
/*
============================================================================
The Apache Software License, Version 1.1
============================================================================
Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
Redistribution and use in source and binary forms, with or without modifica-
tion, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
3. The end-user documentation included with the redistribution, if any, must
include the following acknowledgment: "This product includes software
developed by the Apache Software Foundation (http://www.apache.org/)."
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
4. The names "Jakarta", "Apache Avalon", "Avalon Framework" and
"Apache Software Foundation" must not be used to endorse or promote
products derived from this software without prior written
permission. For written permission, please contact apache@apache.org.
5. Products derived from this software may not be called "Apache", nor may
"Apache" appear in their name, without prior written permission of the
Apache Software Foundation.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation. For more information on the
Apache Software Foundation, please see <http://www.apache.org/>.
*/
package org.apache.avalon.merlin;
import java.net.URL;
import java.io.File;
import java.util.Map;
/**
* A service that provides access to versioned resources.
* @author <a href="mailto:mcconnell@osm.net">Stephen McConnell</a>
* @version $Revision: 1.1 $ $Date: 2003/12/02 07:58:42 $
*/
public interface KernelCriteria extends Map
{
/**
* Return the root directory to the shared repository.
* @return the root common repository directory
*/
File getRepositoryDirectory();
/**
* Return the root directory to the merlin installation
* @return the merlin home directory
*/
File getHomeDirectory();
/**
* Return the root directory to the merlin system repository
* @return the merlin system repository directory
*/
File getSystemDirectory();
/**
* Return the set of block URLs to be included in the root application
* @return the block deployment urls
*/
URL[] getDeploymentURLs();
/**
* Return the root directory to the merlin configurations
* @return the merlin configuration directory
*/
File getConfigDirectory();
/**
* Return the url to the kernel confiuration
* @return the kernel configuration url
*/
URL getKernelURL();
/**
* Return the working client directory.
* @return the working directory
*/
File getWorkingDirectory();
/**
* Return the temporary client directory.
* @return the temp directory
*/
File getTempDirectory();
/**
* Return the context directory from which relative
* runtrime home directories will be established for
* components referencing urn:avalon:home
*
* @return the working directory
*/
File getContextDirectory();
/**
* Return the anchor directory to be used when resolving
* library declarations in classload specifications.
*
* @return the anchor directory
*/
File getAnchorDirectory();
/**
* Return info generation policy. If TRUE the parameters
* related to deployment will be listed on startup.
*
* @return the info policy
*/
boolean isInfoEnabled();
/**
* Return debug policy. If TRUE all logging channels will be
* set to debug level (useful for debugging).
*
* @return the debug policy
*/
boolean isDebugEnabled();
/**
* Return server execution policy. If TRUE the kernel will
* continue until explicitly terminated. If FALSE the kernel
* will initiate decommissioning on completion of deployment.
*
* @return the server execution mode
*/
boolean isServerEnabled();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org