mcconnell 2002/07/14 03:40:40
Modified: assembly/src/java/org/apache/excalibur/merlin/model/builder
KernelCreator.java
Added: assembly/src/java/org/apache/excalibur/merlin/model
Parent.java
Removed: assembly/src/java/org/apache/excalibur/merlin/model
AbstractContainer.java
Log:
AbstractContainer replacxed by Parent
Revision Changes Path
1.1
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/Parent.java
Index: Parent.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
package org.apache.excalibur.merlin.model;
import java.io.Serializable;
/**
* Abstract class for types that can act as logical parents.
*
* @see KernelDescriptor
* @see ContainerDescriptor
* @author <a href="mailto:[EMAIL PROTECTED]";>Stephen McConnell</a>
* @version $Revision: 1.1 $ $Date: 2002/07/14 10:40:40 $
*/
public abstract class Parent implements Serializable
{
/**
* The kernel name
*/
private final String m_name;
/**
* The logging categories.
*/
private CategoryDescriptor m_categories;
/**
* Abstract constructor that handles name and logging category assignment. The
logging
* category supplied under this constructor will be used as the parent to
subsidary
* objects (enabling the creation of logging category chains.
*
* @param name the name of the instance
* @param categories the logging categories descriptor
*/
public Parent( final String name,
final CategoryDescriptor categories )
{
if( name == null )
throw new NullPointerException("name");
if( categories == null )
throw new NullPointerException("loggers");
m_name = name;
m_categories = categories;
}
/**
* Return the instance name.
*
* @return the name of the container
*/
String getName()
{
return m_name;
}
/**
* Return the logging catagory descriptor.
*
* @return the {@link CategoryDescriptor}.
*/
CategoryDescriptor getCategoryDescriptor()
{
return m_categories;
}
}
1.3 +3 -3
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/builder/KernelCreator.java
Index: KernelCreator.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/builder/KernelCreator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- KernelCreator.java 12 Jul 2002 19:09:27 -0000 1.2
+++ KernelCreator.java 14 Jul 2002 10:40:40 -0000 1.3
@@ -12,7 +12,7 @@
import org.apache.excalibur.merlin.model.builder.TypeManager;
/**
- * Simple interface used to create {@link
org.apache.excalibur.merlin.model.ContainerDescriptor}
+ * Simple interface used to create {@link
org.apache.excalibur.merlin.model.KernelDescriptor}
* from a Configuration sorce.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Stephen McConnell</a>
@@ -24,7 +24,7 @@
* Create a {@link KernelDescriptor} from configuration
*
* @param config the confiugration source
- * @return the newly created {@link
org.apache.excalibur.merlin.model.ContainerDescriptor}
+ * @return the newly created {@link
org.apache.excalibur.merlin.model.KernelDescriptor}
* @throws Exception
*/
KernelDescriptor createKernelDescriptor( Configuration config, TypeManager
manager )
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
