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 2002/08/22 12:44:05 UTC
cvs commit: jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/container ContainerFactory.java
mcconnell 2002/08/22 03:44:05
Modified: assembly/src/java/org/apache/excalibur/merlin/container
ContainerFactory.java
Log:
checkstyle ok
Revision Changes Path
1.4 +23 -64 jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/container/ContainerFactory.java
Index: ContainerFactory.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/container/ContainerFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ContainerFactory.java 20 Aug 2002 23:23:08 -0000 1.3
+++ ContainerFactory.java 22 Aug 2002 10:44:05 -0000 1.4
@@ -8,76 +8,23 @@
package org.apache.excalibur.merlin.container;
-import java.io.InputStream;
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.net.JarURLConnection;
-import java.net.URLClassLoader;
import java.util.Map;
-import java.util.List;
-import java.util.LinkedList;
import java.util.Hashtable;
-import java.util.Properties;
-import java.util.ArrayList;
-import java.util.Vector;
-import java.util.Iterator;
-import java.util.jar.Attributes;
-import java.util.jar.Manifest;
-import java.security.Policy;
-import java.io.FileInputStream;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
-import org.apache.excalibur.configuration.ConfigurationUtil;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.logger.AvalonFormatter;
-import org.apache.avalon.framework.logger.LogKitLogger;
-import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.activity.Executable;
-import org.apache.avalon.framework.activity.Startable;
-import org.apache.avalon.framework.activity.Suspendable;
-import org.apache.avalon.framework.CascadingRuntimeException;
import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.DefaultConfiguration;
-import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.framework.context.DefaultContext;
-import org.apache.avalon.framework.service.Serviceable;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.DefaultServiceManager;
-import org.apache.avalon.framework.service.ServiceException;
-import org.apache.avalon.framework.Version;
-import org.apache.avalon.excalibur.logger.LoggerManager;
import org.apache.excalibur.meta.info.Type;
-import org.apache.excalibur.meta.info.ServiceDescriptor;
-import org.apache.excalibur.meta.info.DependencyDescriptor;
-import org.apache.excalibur.meta.info.ReferenceDescriptor;
-import org.apache.excalibur.merlin.assembly.TypeManager;
import org.apache.excalibur.merlin.assembly.KernelManager;
import org.apache.excalibur.merlin.assembly.TypeException;
import org.apache.excalibur.merlin.assembly.ContainerManager;
import org.apache.excalibur.merlin.assembly.DefaultLoggerManager;
-import org.apache.excalibur.merlin.assembly.DependencyGraph;
-import org.apache.excalibur.merlin.resource.LifestyleManager;
import org.apache.excalibur.merlin.model.ContainerDescriptor;
import org.apache.excalibur.merlin.model.ClasspathDescriptor;
import org.apache.excalibur.merlin.model.Profile;
-import org.apache.excalibur.merlin.model.Resource;
-import org.apache.excalibur.merlin.model.ContextDirective;
-import org.apache.excalibur.merlin.model.CategoriesDescriptor;
-import org.apache.excalibur.merlin.model.builder.XMLContainerUtil;
import org.apache.excalibur.merlin.model.builder.XMLContainerCreator;
-import org.apache.excalibur.merlin.model.builder.ContainerBuilder;
-import org.apache.excalibur.merlin.Controller;
-import org.apache.excalibur.configuration.ConfigurationUtil;
+import org.apache.excalibur.merlin.resource.LifestyleManager;
/**
* Utility class that provides support for the creation of subsidiary containers
@@ -145,18 +92,25 @@
*
* @param manager the context type manager
* @param logging the logging manager
+ * @param lifestyles the lifestyle manager
+ * @exception NullPointerException if the manager or logging arguments are null
*/
public ContainerFactory(
ContainerManager manager,
DefaultLoggerManager logging,
LifestyleManager lifestyles )
+ throws NullPointerException
{
if( manager == null )
- throw new NullPointerException("manager");
+ {
+ throw new NullPointerException("manager");
+ }
if( logging == null )
- throw new NullPointerException("logging");
+ {
+ throw new NullPointerException("logging");
+ }
m_manager = manager;
m_logging = logging;
@@ -166,21 +120,27 @@
/**
* Utility to create an subsidiary container manager.
*
- * @param config the subsidiary container configuration
+ * @param descriptor the subsidiary container descriptor
+ * @param classpath the classpath descriptor
* @return the resource holding the container
*
* @exception Exception is an error occurs
+ * @exception NullPointerException if the descriptor or classpath argument is null
*/
public ContainerService build(
ContainerDescriptor descriptor,
ClasspathDescriptor classpath )
- throws Exception
+ throws Exception, NullPointerException
{
if( descriptor == null )
- throw new NullPointerException( "descriptor" );
+ {
+ throw new NullPointerException( "descriptor" );
+ }
if( classpath == null )
- throw new NullPointerException( "classpath" );
+ {
+ throw new NullPointerException( "classpath" );
+ }
final ContainerManager manager =
m_manager.createContainerManager( descriptor, classpath, m_lifestyles );
@@ -190,9 +150,8 @@
/**
- * Create a container descriptor and associated manager using a supplied parent
- * manager and container configuration.
- * @param parent the parent manager
+ * Create a container descriptor and associated manager using a supplied
+ * configuration.
* @param config the container configuration
* @return the fully populated <code>ContainerDescriptor</code>
* @exception Exception if an error occurs
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>