mcconnell 2002/08/22 23:57:49
Modified: assembly build.xml
assembly/src/java/org/apache/excalibur/merlin
Verifiable.java
assembly/src/java/org/apache/excalibur/merlin/resource
LifecycleHelper.java PooledLifestyleHandler.java
ResourceException.java ResourceProvider.java
ResourceRuntimeException.java
SingletonLifestyleHandler.java
ThreadLocalLifestyleHandler.java
TransientLifestyleHandler.java
assembly/src/java/org/apache/excalibur/playground
ComplexComponent.java DemoManager.java
EmbeddedDemo.java
Log:
Checkstyle updates complete.
Revision Changes Path
1.52 +1 -1 jakarta-avalon-excalibur/assembly/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/build.xml,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- build.xml 23 Aug 2002 06:25:12 -0000 1.51
+++ build.xml 23 Aug 2002 06:57:48 -0000 1.52
@@ -275,7 +275,7 @@
allowProtected="false"
allowPackage="false"
allowNoAuthor="false"
- maxLineLen="200"
+ maxLineLen="250"
maxMethodLen="180"
maxConstructorLen="100"
memberPattern="^m_[a-z][a-zA-Z0-9]*$"
1.2 +2 -2
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/Verifiable.java
Index: Verifiable.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/Verifiable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Verifiable.java 12 Jul 2002 10:16:19 -0000 1.1
+++ Verifiable.java 23 Aug 2002 06:57:48 -0000 1.2
@@ -22,7 +22,7 @@
* Method invoked by a parent container to request type level validation
of
* the container.
*
- * @exception ValidationException if a validation failure occurs
+ * @exception VerifyException if a validation failure occurs
*/
void verify() throws VerifyException;
1.9 +1 -0
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/LifecycleHelper.java
Index: LifecycleHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/LifecycleHelper.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- LifecycleHelper.java 23 Aug 2002 06:25:13 -0000 1.8
+++ LifecycleHelper.java 23 Aug 2002 06:57:48 -0000 1.9
@@ -71,6 +71,7 @@
* @param profile representing the instance criteria
* @param object the component to process through the startup phase
* @param provider the resource provider
+ * @return the object that was started // ## this can be removed
*
* @throws LifecycleException if an error occurs when the component passes
* through a specific lifecycle stage
1.4 +6 -8
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/PooledLifestyleHandler.java
Index: PooledLifestyleHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/PooledLifestyleHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PooledLifestyleHandler.java 23 Aug 2002 06:25:13 -0000 1.3
+++ PooledLifestyleHandler.java 23 Aug 2002 06:57:48 -0000 1.4
@@ -8,14 +8,9 @@
package org.apache.excalibur.merlin.resource;
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.context.Context;
import org.apache.excalibur.merlin.assembly.ContainerManager;
import org.apache.excalibur.merlin.model.Profile;
-import org.apache.excalibur.merlin.model.Resource;
-import org.apache.excalibur.meta.info.StageDescriptor;
-import org.apache.excalibur.meta.info.ExtensionDescriptor;
import org.apache.excalibur.mpool.PoolManager;
import org.apache.excalibur.mpool.Pool;
import org.apache.excalibur.mpool.ObjectFactory;
@@ -41,10 +36,12 @@
/**
* Creation of a new singleton lifecycle manager.
* @param manager the type manager
- * @param provider the resource provider
+ * @param deployment the deployment helper
* @param helper the lifecycle helper
* @param profile the profile defining the object type
* @param context the establishment context
+ * @param poolManager the pool manager
+ * @exception Exception if an exception occurs while establishing the
handler
*/
public PooledLifestyleHandler(
final ContainerManager manager,
@@ -67,6 +64,7 @@
* manager to the client.
*
* @return an instance of the type defined by the profile
+ * @exception Exception if an error occurs while aquiring the object
*/
public Object get() throws Exception
{
@@ -121,7 +119,7 @@
/**
* Return a new instance.
* @return the new instance
- * @exception if an instantiation error occurs
+ * @exception Exception if an instantiation error occurs
*/
public Object newInstance() throws Exception
{
@@ -131,7 +129,7 @@
/**
* Handle disposal of the supplied object.
* @param object the object to dispose of
- * @exception if an error in disposal occurs
+ * @exception Exception if an error in disposal occurs
*/
public void dispose( Object object ) throws Exception
{
1.2 +1 -5
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/ResourceException.java
Index: ResourceException.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/ResourceException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ResourceException.java 12 Aug 2002 08:11:09 -0000 1.1
+++ ResourceException.java 23 Aug 2002 06:57:48 -0000 1.2
@@ -7,10 +7,6 @@
*/
package org.apache.excalibur.merlin.resource;
-import java.util.Enumeration;
-import java.util.Dictionary;
-import java.util.Hashtable;
-
import org.apache.avalon.framework.CascadingException;
/**
1.5 +22 -72
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/ResourceProvider.java
Index: ResourceProvider.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/ResourceProvider.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ResourceProvider.java 21 Aug 2002 17:00:52 -0000 1.4
+++ ResourceProvider.java 23 Aug 2002 06:57:48 -0000 1.5
@@ -8,78 +8,19 @@
package org.apache.excalibur.merlin.resource;
-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.Vector;
-import java.util.Iterator;
-import java.util.jar.Attributes;
-import java.util.jar.Manifest;
-import java.security.Policy;
-import java.io.FileInputStream;
-import java.util.HashMap;
-import java.lang.reflect.Constructor;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
-import org.apache.avalon.framework.Version;
-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.CascadingRuntimeException;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.parameters.Parameters;
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.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.logger.Logger;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.ServiceException;
-import org.apache.excalibur.configuration.ConfigurationUtil;
-import org.apache.excalibur.meta.verifier.VerifyException;
-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.meta.info.ContextDescriptor;
-import org.apache.excalibur.meta.info.EntryDescriptor;
-import org.apache.excalibur.meta.info.ExtensionDescriptor;
-import org.apache.excalibur.meta.info.LoggerDescriptor;
import org.apache.excalibur.meta.info.StageDescriptor;
-import org.apache.excalibur.merlin.resource.ResourceException;
-import org.apache.excalibur.merlin.assembly.KernelManager;
-import org.apache.excalibur.merlin.assembly.ContainerManager;
-import org.apache.excalibur.merlin.assembly.DefaultLoggerManager;
-import org.apache.excalibur.merlin.resource.DefaultComponentManager;
-import org.apache.excalibur.merlin.resource.DefaultServiceManager;
-import org.apache.excalibur.merlin.model.ContainerDescriptor;
-import org.apache.excalibur.merlin.model.ContextDirective;
import org.apache.excalibur.merlin.model.Profile;
-import org.apache.excalibur.merlin.model.Association;
-import org.apache.excalibur.merlin.model.Resource;
-import org.apache.excalibur.merlin.model.Import;
-import org.apache.excalibur.merlin.model.Entry;
/**
@@ -96,7 +37,7 @@
// state
//=======================================================================
- private final static Resources REZ =
+ private static final Resources REZ =
ResourceManager.getPackageResources( ResourceProvider.class );
//=======================================================================
@@ -183,7 +124,9 @@
throws Exception
{
if( m_logger != null )
- return m_logger;
+ {
+ return m_logger;
+ }
m_logger = m_helper.createLogger( m_profile );
return m_logger;
}
@@ -203,6 +146,7 @@
/**
* Create the context for a extension stage.
*
+ * @param stage the stage descriptor
* @return a new Context for service
* @throws Exception if an error occurs in standard context creation
*/
@@ -222,7 +166,9 @@
throws Exception
{
if( m_componentManager != null )
- return m_componentManager;
+ {
+ return m_componentManager;
+ }
m_componentManager = m_helper.createComponentManager( m_profile );
return m_componentManager;
}
@@ -237,7 +183,9 @@
throws Exception
{
if( m_serviceManager != null )
- return m_serviceManager ;
+ {
+ return m_serviceManager ;
+ }
m_serviceManager = m_helper.createServiceManager( m_profile );
return m_serviceManager ;
}
@@ -245,7 +193,6 @@
/**
* Create a new Configuration object for component.
*
- * @param entry the entry
* @return a new Configuration object for component
* @throws Exception if unable to create resource
*/
@@ -253,15 +200,16 @@
throws Exception
{
if( m_config != null )
- return m_config;
+ {
+ return m_config;
+ }
m_config = m_helper.createConfiguration( m_profile );
return m_config;
}
/**
- * Create a new Parameters object for component.
+ * Create a new Parameters object.
*
- * @param entry the entry
* @return a new Parameters object for component
* @throws Exception if unable to create resource
*/
@@ -269,7 +217,9 @@
throws Exception
{
if( m_params != null )
- return m_params;
+ {
+ return m_params;
+ }
m_params = m_helper.createParameters( m_profile );
return m_params;
}
1.2 +1 -5
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/ResourceRuntimeException.java
Index: ResourceRuntimeException.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/ResourceRuntimeException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ResourceRuntimeException.java 12 Aug 2002 08:11:09 -0000 1.1
+++ ResourceRuntimeException.java 23 Aug 2002 06:57:48 -0000 1.2
@@ -7,10 +7,6 @@
*/
package org.apache.excalibur.merlin.resource;
-import java.util.Enumeration;
-import java.util.Dictionary;
-import java.util.Hashtable;
-
import org.apache.avalon.framework.CascadingRuntimeException;
/**
1.7 +2 -7
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/SingletonLifestyleHandler.java
Index: SingletonLifestyleHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/SingletonLifestyleHandler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SingletonLifestyleHandler.java 23 Aug 2002 06:25:13 -0000 1.6
+++ SingletonLifestyleHandler.java 23 Aug 2002 06:57:48 -0000 1.7
@@ -9,15 +9,9 @@
*/
package org.apache.excalibur.merlin.resource;
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.context.Context;
import org.apache.excalibur.merlin.assembly.ContainerManager;
import org.apache.excalibur.merlin.model.Profile;
-import org.apache.excalibur.merlin.model.Resource;
-import org.apache.excalibur.meta.info.StageDescriptor;
-import org.apache.excalibur.meta.info.ExtensionDescriptor;
/**
@@ -37,7 +31,7 @@
/**
* Creation of a new singleton lifecycle manager.
* @param manager the type manager
- * @param provider the resource provider
+ * @param deployment the deployment helper
* @param helper the lifecycle helper
* @param profile the profile defining the object type
* @param context the establishment context
@@ -59,6 +53,7 @@
* manager to the client.
*
* @return an instance of the type defined by the profile
+ * @exception Exception if an access stage error occurs
*/
public Object get() throws Exception
{
1.4 +2 -7
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/ThreadLocalLifestyleHandler.java
Index: ThreadLocalLifestyleHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/ThreadLocalLifestyleHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ThreadLocalLifestyleHandler.java 23 Aug 2002 06:25:13 -0000 1.3
+++ ThreadLocalLifestyleHandler.java 23 Aug 2002 06:57:48 -0000 1.4
@@ -9,15 +9,9 @@
*/
package org.apache.excalibur.merlin.resource;
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.context.Context;
import org.apache.excalibur.merlin.assembly.ContainerManager;
import org.apache.excalibur.merlin.model.Profile;
-import org.apache.excalibur.merlin.model.Resource;
-import org.apache.excalibur.meta.info.StageDescriptor;
-import org.apache.excalibur.meta.info.ExtensionDescriptor;
/**
@@ -42,7 +36,7 @@
/**
* Creation of a new singleton lifecycle manager.
* @param manager the type manager
- * @param provider the resource provider
+ * @param deployment the deployment helper
* @param helper the lifecycle helper
* @param profile the profile defining the object type
* @param context the establishment context
@@ -65,6 +59,7 @@
* manager to the client.
*
* @return an instance of the type defined by the profile
+ * @exception Exception if an access phase error occurs
*/
public Object get() throws Exception
{
1.6 +2 -7
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/TransientLifestyleHandler.java
Index: TransientLifestyleHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/resource/TransientLifestyleHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TransientLifestyleHandler.java 23 Aug 2002 06:25:13 -0000 1.5
+++ TransientLifestyleHandler.java 23 Aug 2002 06:57:48 -0000 1.6
@@ -11,15 +11,9 @@
import java.util.ArrayList;
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.context.Context;
import org.apache.excalibur.merlin.assembly.ContainerManager;
import org.apache.excalibur.merlin.model.Profile;
-import org.apache.excalibur.merlin.model.Resource;
-import org.apache.excalibur.meta.info.StageDescriptor;
-import org.apache.excalibur.meta.info.ExtensionDescriptor;
/**
@@ -39,7 +33,7 @@
/**
* Creation of a new singleton lifecycle manager.
* @param manager the type manager
- * @param provider the resource provider
+ * @param deployment the deployment helper
* @param helper the lifecycle helper
* @param profile the profile defining the object type
* @param context the establishment context
@@ -61,6 +55,7 @@
* manager to the client.
*
* @return an instance of the type defined by the profile
+ * @exception Exception if an access phase exception is thrown
*/
public Object get() throws Exception
{
1.3 +13 -11
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/ComplexComponent.java
Index: ComplexComponent.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/ComplexComponent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ComplexComponent.java 22 Aug 2002 05:01:57 -0000 1.2
+++ ComplexComponent.java 23 Aug 2002 06:57:48 -0000 1.3
@@ -4,14 +4,12 @@
package org.apache.excalibur.playground;
-import org.apache.avalon.framework.activity.Executable;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.activity.Startable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.ServiceException;
/**
* This is a demonstration component that declares no interface but
@@ -29,7 +27,7 @@
private SimpleService m_simple;
private BasicService m_basic;
private Thread m_thread;
- private boolean CONTINUE = false;
+ private boolean m_continue = false;
//=================================================================
// Serviceable
@@ -45,13 +43,12 @@
* <code>Serviceable</code> uses.
*/
public void service( ServiceManager manager )
- throws ServiceException
{
if( getLogger().isDebugEnabled() )
{
getLogger().debug("service");
}
- m_manager = manager;
+ m_manager = manager;
}
@@ -59,6 +56,10 @@
// Initializable
//=======================================================================
+ /**
+ * Initialization of the componet.
+ * @exception Exception if an initialization error occurs
+ */
public void initialize()
throws Exception
{
@@ -96,7 +97,7 @@
getLogger().info("ready");
}
}
-
+
//=======================================================================
// Startable
//=======================================================================
@@ -108,12 +109,12 @@
public void start() throws Exception
{
getLogger().debug( "starting" );
- CONTINUE = true;
+ m_continue = true;
m_thread = new Thread(
new Runnable() {
public void run()
{
- while( CONTINUE )
+ while( m_continue )
{
try
{
@@ -136,7 +137,7 @@
public void stop()
{
getLogger().debug( "stopping" );
- CONTINUE = false;
+ m_continue = false;
try
{
m_thread.join();
@@ -157,9 +158,10 @@
public void dispose()
{
if( getLogger().isDebugEnabled() )
- getLogger().debug("dispose");
+ {
+ getLogger().debug("dispose");
+ }
-
m_manager.release( m_simple );
m_manager.release( m_basic );
m_manager = null;
1.4 +2 -0
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/DemoManager.java
Index: DemoManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/DemoManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DemoManager.java 22 Aug 2002 13:43:02 -0000 1.3
+++ DemoManager.java 23 Aug 2002 06:57:48 -0000 1.4
@@ -42,6 +42,7 @@
* @param target the object to handle
* @param context the context supplied to the extension by container
* corresponding to its extension context criteria
+ * @exception Exception if an error occurs
*/
public void create( Object target, Context context ) throws Exception
{
@@ -74,6 +75,7 @@
* @param target the object to handle
* @param context the context supplied to the extension by container
* corresponding to its extension context criteria
+ * @exception Exception if an error occurs
*/
public void access( Object target, Context context ) throws Exception
{
1.4 +0 -1
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/EmbeddedDemo.java
Index: EmbeddedDemo.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/EmbeddedDemo.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EmbeddedDemo.java 22 Aug 2002 13:43:02 -0000 1.3
+++ EmbeddedDemo.java 23 Aug 2002 06:57:49 -0000 1.4
@@ -19,7 +19,6 @@
import org.apache.excalibur.merlin.container.Container;
import org.apache.excalibur.merlin.model.Profile;
import org.apache.excalibur.merlin.assembly.ContainerManager;
-import org.apache.excalibur.merlin.container.ContainerFactory;
import org.apache.excalibur.meta.info.ReferenceDescriptor;
/**
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
