CVS: jcontainer/loom/engine/src/java/org/jcontainer/loom/components/kernel DefaultApplicationContext.java,1.15,1.16 DefaultKernel.java,1.21,1.22 SarEntry.java,1.5,1.6

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

Modified Files:
	DefaultApplicationContext.java DefaultKernel.java 
	SarEntry.java 
Log Message:
Upgrade to 1.0-b3 of LoggerStore


Index: DefaultApplicationContext.java
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/components/kernel/DefaultApplicationContext.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- DefaultApplicationContext.java	3 Dec 2003 02:54:42 -0000	1.15
+++ DefaultApplicationContext.java	3 Dec 2003 07:40:19 -0000	1.16
@@ -94,7 +94,6 @@
 import org.apache.avalon.framework.logger.Logger;
 import org.apache.excalibur.instrument.InstrumentManager;
 import org.jcomponent.alchemist.LoggerAlchemist;
-import org.jcomponent.loggerstore.LoggerStore;
 import org.jcontainer.dna.AbstractLogEnabled;
 import org.jcontainer.dna.Active;
 import org.jcontainer.dna.Composable;
@@ -109,6 +108,7 @@
 import org.jcontainer.loom.interfaces.SystemManager;
 import org.codehaus.spice.salt.i18n.ResourceManager;
 import org.codehaus.spice.salt.i18n.Resources;
+import org.codehaus.spice.loggerstore.LoggerStore;
 
 /**
  * Manage the "frame" in which Applications operate.
@@ -193,8 +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()

Index: DefaultKernel.java
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/components/kernel/DefaultKernel.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- DefaultKernel.java	3 Dec 2003 02:54:42 -0000	1.21
+++ DefaultKernel.java	3 Dec 2003 07:40:19 -0000	1.22
@@ -91,7 +91,9 @@
 import java.util.Map;
 import org.apache.avalon.framework.container.ContainerUtil;
 import org.apache.excalibur.instrument.InstrumentManager;
-import org.jcomponent.loggerstore.LoggerStore;
+import org.codehaus.spice.loggerstore.LoggerStore;
+import org.codehaus.spice.salt.i18n.ResourceManager;
+import org.codehaus.spice.salt.i18n.Resources;
 import org.jcontainer.dna.AbstractLogEnabled;
 import org.jcontainer.dna.Active;
 import org.jcontainer.dna.Composable;
@@ -103,6 +105,7 @@
 import org.jcontainer.dna.ResourceLocator;
 import org.jcontainer.dna.impl.DefaultResourceLocator;
 import org.jcontainer.loom.components.application.DefaultApplication;
+import org.jcontainer.loom.components.util.profile.PartitionProfile;
 import org.jcontainer.loom.interfaces.Application;
 import org.jcontainer.loom.interfaces.ApplicationContext;
 import org.jcontainer.loom.interfaces.ConfigurationInterceptor;
@@ -110,8 +113,6 @@
 import org.jcontainer.loom.interfaces.Kernel;
 import org.jcontainer.loom.interfaces.LoomException;
 import org.jcontainer.loom.interfaces.SystemManager;
-import org.codehaus.spice.salt.i18n.ResourceManager;
-import org.codehaus.spice.salt.i18n.Resources;
 
 /**
  * The ServerKernel is the core of the container system. The kernel is
@@ -169,15 +170,14 @@
     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 )
@@ -400,13 +400,12 @@
         }
     }
 
-    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 PartitionProfile profile,
+                                final File homeDirectory,
+                                final File workDirectory,
+                                final ClassLoader classLoader,
+                                final LoggerStore store,
+                                final Map classloaders )
         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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- SarEntry.java	29 Nov 2003 13:44:21 -0000	1.5
+++ SarEntry.java	3 Dec 2003 07:40:19 -0000	1.6
@@ -88,8 +88,9 @@
 
 import java.io.File;
 import java.util.Map;
-import org.jcomponent.loggerstore.LoggerStore;
 import org.jcontainer.loom.interfaces.Application;
+import org.jcontainer.loom.components.util.profile.PartitionProfile;
+import org.codehaus.spice.loggerstore.LoggerStore;
 
 /**
  * This is the structure describing each server application before it is
@@ -99,7 +100,7 @@
  */
 final class SarEntry
 {
-    private final org.jcontainer.loom.components.util.profile.PartitionProfile m_profile;
+    private final PartitionProfile m_profile;
     private final ClassLoader m_classLoader;
     private final LoggerStore m_store;
     private final File m_homeDirectory;
@@ -107,8 +108,7 @@
     private final Map m_classLoaders;
     private Application m_application;
 
-    protected SarEntry(
-        final org.jcontainer.loom.components.util.profile.PartitionProfile profile,
+    protected SarEntry( final PartitionProfile profile,
         final File homeDirectory,
         final File workDirectory,
         final ClassLoader classLoader,