CVS: jcontainer/loom/engine/src/java/org/jcontainer/loom/components/kernel DefaultApplicationContext.java,1.13,1.14 DefaultKernel.java,1.19,1.20 SarEntry.java,1.4,1.5

Update of /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/components/kernel
In directory hogshead.codehaus.org:/tmp/cvs-serv31016/loom/engine/src/java/org/jcontainer/loom/components/kernel

Modified Files:
	DefaultApplicationContext.java DefaultKernel.java 
	SarEntry.java 
Log Message:
Remove email addie

Index: DefaultApplicationContext.java
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/components/kernel/DefaultApplicationContext.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- DefaultApplicationContext.java	25 Oct 2003 16:23:20 -0000	1.13
+++ DefaultApplicationContext.java	29 Nov 2003 13:44:21 -0000	1.14
@@ -91,7 +91,6 @@
 import java.io.FileNotFoundException;
 import java.io.InputStream;
 import java.util.Map;
-
 import org.apache.avalon.framework.logger.Logger;
 import org.apache.excalibur.instrument.InstrumentManager;
 import org.jcomponent.alchemist.LoggerAlchemist;
@@ -114,7 +113,7 @@
 /**
  * Manage the "frame" in which Applications operate.
  *
- * @author <a href="mailto:peter at realityforge.org">Peter Donald</a>
+ * @author Peter Donald
  * @author <a href="mailto:[email protected]">Peter Royal</a>
  */
 class DefaultApplicationContext
@@ -142,14 +141,10 @@
     private final File m_workDirectory;
     private final File m_homeDirectory;
 
-    /**
-     * The map containing all the named loaders.
-     */
+    /** The map containing all the named loaders. */
     private final Map m_loaders;
 
-    /**
-     * The kernel associate with context
-     */
+    /** The kernel associate with context */
     private Kernel m_kernel;
 
     protected DefaultApplicationContext( final PartitionProfile profile,
@@ -198,7 +193,8 @@
         m_systemManager = (SystemManager)locator.
             lookup( SystemManager.class.getName() );
         m_kernel = (Kernel)locator.lookup( Kernel.class.getName() );
-        m_instrumentManager = (InstrumentManager)locator.lookup( InstrumentManager.class.getName() );
+        m_instrumentManager =
+        (InstrumentManager)locator.lookup( InstrumentManager.class.getName() );
     }
 
     public void initialize()
@@ -289,8 +285,8 @@
     }
 
     /**
-     * Get logger with category for application.
-     * Note that this name may not be the absolute category.
+     * Get logger with category for application. Note that this name may not be
+     * the absolute category.
      *
      * @param category the logger category
      * @return the Logger
@@ -302,9 +298,8 @@
     }
 
     /**
-     * Export specified object into management system.
-     * The object is exported using specifed interface
-     * and using the specified name.
+     * Export specified object into management system. The object is exported
+     * using specifed interface and using the specified name.
      *
      * @param name the name of object to export
      * @param object the actual object to export
@@ -342,10 +337,10 @@
     }
 
     /**
-     *  Returns the local SystemManager where the blocks should be registered
-     *  for management.
+     * Returns the local SystemManager where the blocks should be registered for
+     * management.
      *
-     *  TODO: context should probably be passed in by reference from the kernel
+     * TODO: context should probably be passed in by reference from the kernel
      */
     private SystemManager getManagementContext()
         throws LoomException
@@ -373,7 +368,11 @@
      */
     public String getInstrumentableName( String component )
     {
-        return ContainerConstants.ROOT_INSTRUMENT_CATEGORY + "." + getName() + "." + component;
+        return ContainerConstants.ROOT_INSTRUMENT_CATEGORY +
+            "." +
+            getName() +
+            "." +
+            component;
     }
 
     private String getName()

Index: DefaultKernel.java
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/components/kernel/DefaultKernel.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- DefaultKernel.java	26 Oct 2003 08:11:32 -0000	1.19
+++ DefaultKernel.java	29 Nov 2003 13:44:21 -0000	1.20
@@ -114,16 +114,16 @@
 import org.realityforge.salt.i18n.Resources;
 
 /**
- * The ServerKernel is the core of the container system.
- * The kernel is responsible for orchestrating low level services
- * such as loading, configuring and destroying blocks. It also
- * gives access to basic facilities such as scheduling sub-systems,
- * protected execution contexts, naming and directory services etc.
+ * The ServerKernel is the core of the container system. The kernel is
+ * responsible for orchestrating low level services such as loading, configuring
+ * and destroying blocks. It also gives access to basic facilities such as
+ * scheduling sub-systems, protected execution contexts, naming and directory
+ * services etc.
  *
  * Note that no facilities are available until after the Kernel has been
  * configured and initialized.
  *
- * @author <a href="mailto:peter at realityforge.org">Peter Donald</a>
+ * @author Peter Donald
  * @author <a href="mailto:[email protected]">Leo Simons</a>
  * @dna.component
  * @mx.component
@@ -169,25 +169,30 @@
     public void compose( final ResourceLocator locator )
         throws MissingResourceException
     {
-        m_systemManager = (SystemManager)locator.lookup( SystemManager.class.getName() );
+        m_systemManager =
+        (SystemManager)locator.lookup( SystemManager.class.getName() );
         m_repository = (ConfigurationInterceptor)locator.
             lookup( ConfigurationInterceptor.class.getName() );
-        m_validator = (ConfigurationValidator)locator.lookup( ConfigurationValidator.class.getName() );
-        m_instrumentManager = (InstrumentManager)locator.lookup( InstrumentManager.class.getName() );
+        m_validator =
+        (ConfigurationValidator)locator.lookup(
+            ConfigurationValidator.class.getName() );
+        m_instrumentManager =
+        (InstrumentManager)locator.lookup( InstrumentManager.class.getName() );
     }
 
     public void configure( final Configuration configuration )
         throws ConfigurationException
     {
         m_addInvalidApplications =
-            configuration.getChild( "add-invalid-applications" ).getValueAsBoolean( false );
+        configuration.getChild( "add-invalid-applications" ).getValueAsBoolean(
+            false );
     }
 
     public void initialize()
         throws Exception
     {
         m_applicationManager =
-            m_systemManager.getSubContext( null, "application" );
+        m_systemManager.getSubContext( null, "application" );
     }
 
     public void dispose()
@@ -202,14 +207,16 @@
             }
             catch( final Exception e )
             {
-                final String message = REZ.format( "kernel.error.entry.dispose", names[ i ] );
+                final String message = REZ.format(
+                    "kernel.error.entry.dispose", names[ i ] );
                 getLogger().warn( message, e );
             }
         }
     }
 
     /**
-     * Lock the kernel, temporarily preserving the list of applications running in the container
+     * Lock the kernel, temporarily preserving the list of applications running
+     * in the container
      */
     public void lock()
     {
@@ -226,7 +233,8 @@
     }
 
     /**
-     * Unlock the kernel, restoring the list of applications to be the current active list
+     * Unlock the kernel, restoring the list of applications to be the current
+     * active list
      */
     public void unlock()
     {
@@ -236,18 +244,21 @@
 
             if( m_lockCount < 0 )
             {
-                throw new IllegalStateException( REZ.getString( "kernel.error.negativelock" ) );
+                throw new IllegalStateException(
+                    REZ.getString( "kernel.error.negativelock" ) );
             }
 
             if( getLogger().isDebugEnabled() )
             {
-                getLogger().debug( "Kernel unlocked [count:" + m_lockCount + "]" );
+                getLogger().debug(
+                    "Kernel unlocked [count:" + m_lockCount + "]" );
             }
         }
     }
 
     /**
-     * @mx.attribute description="the list of applications running in the container"
+     * @mx.attribute description="the list of applications running in the
+     * container"
      */
     public String[] getApplicationNames()
     {
@@ -280,7 +291,8 @@
     }
 
     /**
-     * Create and initialize the application instance if it is not already initialized.
+     * Create and initialize the application instance if it is not already
+     * initialized.
      *
      * @param entry the entry for application
      * @throws Exception if an error occurs
@@ -301,7 +313,8 @@
                     final Application newApp = new DefaultApplication();
                     final Logger childLogger =
                         getLogger().getChildLogger( name );
-                    org.jcontainer.dna.impl.ContainerUtil.enableLogging( newApp, childLogger );
+                    org.jcontainer.dna.impl.ContainerUtil.enableLogging(
+                        newApp, childLogger );
 
                     final ApplicationContext context =
                         createApplicationContext( entry );
@@ -387,12 +400,13 @@
         }
     }
 
-    public void addApplication( final org.jcontainer.loom.components.util.profile.PartitionProfile profile,
-                                final File homeDirectory,
-                                final File workDirectory,
-                                final ClassLoader classLoader,
-                                final LoggerStore store,
-                                final Map classloaders )
+    public void addApplication(
+        final org.jcontainer.loom.components.util.profile.PartitionProfile profile,
+        final File homeDirectory,
+        final File workDirectory,
+        final ClassLoader classLoader,
+        final LoggerStore store,
+        final Map classloaders )
         throws Exception
     {
 
@@ -409,7 +423,8 @@
         }
         catch( final Exception e )
         {
-            final String message = REZ.format( "kernel.error.entry.start", name );
+            final String message = REZ.format( "kernel.error.entry.start",
+                                               name );
             getLogger().warn( message, e );
             throw e;
         }
@@ -428,8 +443,11 @@
                                            entry.getLoggerStore(),
                                            entry.getClassLoaders() );
 
-        org.jcontainer.dna.impl.ContainerUtil.enableLogging( context, createContextLogger( name ) );
-        org.jcontainer.dna.impl.ContainerUtil.compose( context, createResourceLocator() );
+        org.jcontainer.dna.impl.ContainerUtil.enableLogging( context,
+                                                             createContextLogger(
+                                                                 name ) );
+        org.jcontainer.dna.impl.ContainerUtil.compose( context,
+                                                       createResourceLocator() );
         org.jcontainer.dna.impl.ContainerUtil.initialize( context );
         return context;
     }
@@ -452,9 +470,12 @@
     {
         final DefaultResourceLocator serviceManager = new DefaultResourceLocator();
         serviceManager.put( SystemManager.class.getName(), m_systemManager );
-        serviceManager.put( ConfigurationInterceptor.class.getName(), m_repository );
-        serviceManager.put( ConfigurationValidator.class.getName(), m_validator );
-        serviceManager.put( InstrumentManager.class.getName(), m_instrumentManager );
+        serviceManager.put( ConfigurationInterceptor.class.getName(),
+                            m_repository );
+        serviceManager.put( ConfigurationValidator.class.getName(),
+                            m_validator );
+        serviceManager.put( InstrumentManager.class.getName(),
+                            m_instrumentManager );
         serviceManager.put( Kernel.class.getName(), this );
         serviceManager.makeReadOnly();
         return serviceManager;
@@ -462,7 +483,8 @@
 
     /**
      * @mx.operation description="Removes the application from the container"
-     * @mx.parameter name="name" description="the name of application to remove"
+     * @mx.parameter name="name" description="the name of application to
+     * remove"
      */
     public void removeApplication( final String name )
         throws Exception

Index: SarEntry.java
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/components/kernel/SarEntry.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- SarEntry.java	16 Oct 2003 14:45:46 -0000	1.4
+++ SarEntry.java	29 Nov 2003 13:44:21 -0000	1.5
@@ -92,9 +92,10 @@
 import org.jcontainer.loom.interfaces.Application;
 
 /**
- * This is the structure describing each server application before it is loaded.
+ * This is the structure describing each server application before it is
+ * loaded.
  *
- * @author <a href="mailto:peter at realityforge.org">Peter Donald</a>
+ * @author Peter Donald
  */
 final class SarEntry
 {
@@ -106,12 +107,13 @@
     private final Map m_classLoaders;
     private Application m_application;
 
-    protected SarEntry( final org.jcontainer.loom.components.util.profile.PartitionProfile profile,
-                        final File homeDirectory,
-                        final File workDirectory,
-                        final ClassLoader classLoader,
-                        final LoggerStore store,
-                        final Map classLoaders )
+    protected SarEntry(
+        final org.jcontainer.loom.components.util.profile.PartitionProfile profile,
+        final File homeDirectory,
+        final File workDirectory,
+        final ClassLoader classLoader,
+        final LoggerStore store,
+        final Map classLoaders )
     {
         if( null == profile )
         {