geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: r353802 [1/2] - in /geronimo/trunk: applications/console-core/src/java/org/apache/geronimo/console/core/jms/ applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/ applications/console-standard/src/java/org/...
Date Sun, 04 Dec 2005 02:36:25 GMT
Author: ammulder
Date: Sat Dec  3 18:35:42 2005
New Revision: 353802

URL: http://svn.apache.org/viewcvs?rev=353802&view=rev
Log:
More cleanup of startup output
Now the console log level is set to INFO by default, with -v and -vv
  setting it to DEBUG or TRACE respectively.  You'd have to be insane
  to use those, though, as DEBUG generates like 3000 lines during
  startup.
Includes a hack to avoid the Jetty startup output where the logger
  name is set to the context path -- this should be removed as soon
  as we get a Jetty update that lets us suppress that some other way

Modified:
    geronimo/trunk/applications/console-core/src/java/org/apache/geronimo/console/core/jms/JMSConnectionFactoryBean.java
    geronimo/trunk/applications/console-core/src/java/org/apache/geronimo/console/core/jms/TopicBrowserGBean.java
    geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/CreateDestinationHandler.java
    geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/servermanager/ServerManagerPortlet.java
    geronimo/trunk/modules/assembly/src/var/log/server-log4j.properties
    geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/HeavyweightTypeInfoBuilder.java
    geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/SchemaInfoBuilder.java
    geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/server/AxisWebServiceContainer.java
    geronimo/trunk/modules/clustering/src/java/org/apache/geronimo/clustering/Node.java
    geronimo/trunk/modules/clustering/src/java/org/apache/geronimo/clustering/Tier.java
    geronimo/trunk/modules/clustering/src/java/org/apache/geronimo/clustering/web/HttpSessionManager.java
    geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorPlanRectifier.java
    geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/GeronimoConnectionEventListener.java
    geronimo/trunk/modules/core/src/java/org/apache/geronimo/pool/ClockPool.java
    geronimo/trunk/modules/hot-deploy/src/java/org/apache/geronimo/deployment/hot/DirectoryHotDeployer.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/InteropGBean.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/adapter/CorbaAdapter.java
    geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/adapter/HomeAdapter.txt
    geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
    geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JAASJettyRealm.java
    geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/interceptor/SecurityContextBeforeAfter.java
    geronimo/trunk/modules/jmx-remoting/src/java/org/apache/geronimo/jmxremoting/JMXConnector.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/log/GeronimoLog.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/log/GeronimoLogging.java
    geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/IMAPStoreGBean.java
    geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/MailGBean.java
    geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/POP3StoreGBean.java
    geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/ProtocolGBean.java
    geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/SMTPTransportGBean.java
    geronimo/trunk/modules/spring-builder/src/java/org/apache/geronimo/spring/deployment/SPRConfigBuilder.java
    geronimo/trunk/modules/spring/src/java/org/apache/geronimo/spring/SpringGBean.java
    geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/FileConfigurationList.java
    geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/jmx/MBeanServerKernelBridge.java
    geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/main/Daemon.java
    geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/main/ProgressBarStartupMonitor.java
    geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/ExecutorFeedingTimerTask.java
    geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/NontransactionalExecutorTask.java
    geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/ThreadPooledTimer.java
    geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/TransactionalExecutorTask.java
    geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java
    geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatEJBWebServiceContext.java
    geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
    geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/cluster/CatalinaClusterGBean.java
    geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/cluster/ClusterDeployerGBean.java
    geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/cluster/MembershipServiceGBean.java
    geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/cluster/MessageListenerGBean.java
    geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/cluster/ReceiverGBean.java
    geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/cluster/SenderGBean.java

Modified: geronimo/trunk/applications/console-core/src/java/org/apache/geronimo/console/core/jms/JMSConnectionFactoryBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-core/src/java/org/apache/geronimo/console/core/jms/JMSConnectionFactoryBean.java?rev=353802&r1=353801&r2=353802&view=diff
==============================================================================
--- geronimo/trunk/applications/console-core/src/java/org/apache/geronimo/console/core/jms/JMSConnectionFactoryBean.java (original)
+++ geronimo/trunk/applications/console-core/src/java/org/apache/geronimo/console/core/jms/JMSConnectionFactoryBean.java Sat Dec  3 18:35:42 2005
@@ -52,7 +52,7 @@
         connectionFactory = (ConnectionFactory) managedConnectionFactoryWrapper
                 .$getResource();
 
-        log.info("JMSConnection started");
+        log.debug("JMSConnection started");
 
     }
 

Modified: geronimo/trunk/applications/console-core/src/java/org/apache/geronimo/console/core/jms/TopicBrowserGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-core/src/java/org/apache/geronimo/console/core/jms/TopicBrowserGBean.java?rev=353802&r1=353801&r2=353802&view=diff
==============================================================================
--- geronimo/trunk/applications/console-core/src/java/org/apache/geronimo/console/core/jms/TopicBrowserGBean.java (original)
+++ geronimo/trunk/applications/console-core/src/java/org/apache/geronimo/console/core/jms/TopicBrowserGBean.java Sat Dec  3 18:35:42 2005
@@ -133,7 +133,7 @@
     public void doStart() throws WaitingException, Exception {
         t = new Thread(this);
         t.start();
-        log.info("Subscribed to topic.");
+        log.debug("Subscribed to topic.");
     }
 
     /**
@@ -143,7 +143,7 @@
      */
     public void doStop() throws WaitingException, Exception {
         stop = true;
-        log.info("Unsubscribed to topic.");
+        log.debug("Unsubscribed to topic.");
     }
 
     public void doFail() {
@@ -179,8 +179,7 @@
             tSubscriber.close();
             if (tSession != null) {
                 tSession.unsubscribe(subscriberName);
-                log.info(subscriberName + " unsubscribed from Topic "
-                        + topic.getTopicName() + ".");
+                log.debug(subscriberName + " unsubscribed from Topic " + topic.getTopicName() + ".");
             }
         }
     }

Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/CreateDestinationHandler.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/CreateDestinationHandler.java?rev=353802&r1=353801&r2=353802&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/CreateDestinationHandler.java (original)
+++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/CreateDestinationHandler.java Sat Dec  3 18:35:42 2005
@@ -160,7 +160,6 @@
             configurationManager.start(configId);
 
         } catch (Exception e) {
-            log.info("problem", e);
             log.error("problem", e);
         }
         response.setRenderParameter("processAction", "viewDestinations");

Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/servermanager/ServerManagerPortlet.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/servermanager/ServerManagerPortlet.java?rev=353802&r1=353801&r2=353802&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/servermanager/ServerManagerPortlet.java (original)
+++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/servermanager/ServerManagerPortlet.java Sat Dec  3 18:35:42 2005
@@ -49,8 +49,7 @@
     public void processAction(ActionRequest actionRequest,
             ActionResponse actionResponse) throws PortletException, IOException {
         if (actionRequest.getParameter("reboot") != null) {
-            log.info("Reboot initiated by user request: "
-                    + actionRequest.getUserPrincipal());
+            log.info("Reboot initiated by user request: " + actionRequest.getUserPrincipal());
             new Thread() {
                 public void run() {
                     try {
@@ -67,8 +66,7 @@
     protected void doView(RenderRequest request, RenderResponse response)
             throws PortletException, IOException {
         if (request.getParameter("shutdown") != null) {
-            log.info("Shutting down by user request: "
-                    + request.getUserPrincipal());
+            log.info("Shutting down by user request: " + request.getUserPrincipal());
             shutdownView.include(request, response);
             response.flushBuffer();
             kernel.shutdown();

Modified: geronimo/trunk/modules/assembly/src/var/log/server-log4j.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/var/log/server-log4j.properties?rev=353802&r1=353801&r2=353802&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/var/log/server-log4j.properties (original)
+++ geronimo/trunk/modules/assembly/src/var/log/server-log4j.properties Sat Dec  3 18:35:42 2005
@@ -69,11 +69,12 @@
 log4j.category.org.apache.pluto=INFO
 log4j.category.org.apache.jasper=INFO
 
-# Various Jetty startup output
+# Various Jetty startup/shutdown output
 log4j.category.org.mortbay.http.HttpServer=WARN
 log4j.category.org.mortbay.http.SocketListener=WARN
 log4j.category.org.mortbay.util.Container=WARN
 log4j.category.org.mortbay.util.Credential=WARN
+log4j.category.org.mortbay.util.ThreadedServer=WARN
 log4j.category.org.mortbay.jetty.servlet.WebApplicationContext=WARN
 
 # Various Tomcat startup output
@@ -96,3 +97,6 @@
 # Prints the RMI connection URL
 log4j.category.javax.management.remote.rmi.RMIConnectorServer=WARN
 log4j.category.javax.management.remote.JMXServiceURL=WARN
+
+# Prints various stuff during startup
+log4j.category.org.apache.juddi.registry.RegistryServlet=WARN

Modified: geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/HeavyweightTypeInfoBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/HeavyweightTypeInfoBuilder.java?rev=353802&r1=353801&r2=353802&view=diff
==============================================================================
--- geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/HeavyweightTypeInfoBuilder.java (original)
+++ geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/HeavyweightTypeInfoBuilder.java Sat Dec  3 18:35:42 2005
@@ -264,9 +264,9 @@
                     SOAPArrayType soapArrayType = wsdlArrayType.getWSDLArrayType();
                     if (soapArrayType != null) {
                         componentType = soapArrayType.getQName();
-                        log.info("extracted componentType " + componentType + " from schemaType " + schemaType);
+                        log.debug("extracted componentType " + componentType + " from schemaType " + schemaType);
                     } else {
-                    log.info("no SOAPArrayType for component from schemaType " + schemaType);
+                        log.info("no SOAPArrayType for component from schemaType " + schemaType);
                     }
                 } else {
                     log.warn("No soap array info for schematype: " + schemaType);
@@ -289,7 +289,7 @@
                             throw new DeploymentException("more than one element inside array definition: " + schemaType);
                         }
                         componentType = properties[0].getType().getName();
-                        log.info("determined component type from element type");
+                        log.debug("determined component type from element type");
                     }
 
                 }

Modified: geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/SchemaInfoBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/SchemaInfoBuilder.java?rev=353802&r1=353801&r2=353802&view=diff
==============================================================================
--- geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/SchemaInfoBuilder.java (original)
+++ geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/SchemaInfoBuilder.java Sat Dec  3 18:35:42 2005
@@ -273,9 +273,13 @@
                 boolean wasError = false;
                 for (Iterator iterator = errors.iterator(); iterator.hasNext();) {
                     XmlError xmlError = (XmlError) iterator.next();
-                    log.info("Severity: " + errorNames[xmlError.getSeverity()] + ", message: " + xmlError);
-                    if (xmlError.getSeverity() == XmlError.SEVERITY_ERROR) {
+                    if(xmlError.getSeverity() == XmlError.SEVERITY_ERROR) {
+                        log.error(xmlError);
                         wasError = true;
+                    } else if(xmlError.getSeverity() == XmlError.SEVERITY_WARNING) {
+                        log.warn(xmlError);
+                    } else if(xmlError.getSeverity() == XmlError.SEVERITY_INFO) {
+                        log.debug(xmlError);
                     }
                 }
                 if (wasError) {

Modified: geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/server/AxisWebServiceContainer.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/server/AxisWebServiceContainer.java?rev=353802&r1=353801&r2=353802&view=diff
==============================================================================
--- geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/server/AxisWebServiceContainer.java (original)
+++ geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/server/AxisWebServiceContainer.java Sat Dec  3 18:35:42 2005
@@ -162,7 +162,7 @@
                         getSOAPConstants());
                 responseMessage.writeTo(res.getOutputStream());
             } catch (Exception e) {
-                log.info(Messages.getMessage("exception00"), e);
+                log.warn(Messages.getMessage("exception00"), e);
             }
         } finally {
             Thread.currentThread().setContextClassLoader(oldClassLoader);
@@ -175,13 +175,13 @@
         responseMessage = context.getResponseMessage();
         res.setStatusCode(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
         Message responseMsg = responseMessage;
-        log.info(Messages.getMessage("exception00"), e);
+        log.warn(Messages.getMessage("exception00"), e);
         if (responseMsg == null) {
             AxisFault fault = AxisFault.makeFault(e);
             //log the fault
             Element runtimeException = fault.lookupFaultDetail(Constants.QNAME_FAULTDETAIL_RUNTIMEEXCEPTION);
             if (runtimeException != null) {
-                log.info(Messages.getMessage("axisFault00"), fault);
+                log.debug(Messages.getMessage("axisFault00"), fault);
                 //strip runtime details
                 fault.removeFaultDetail(Constants.QNAME_FAULTDETAIL_RUNTIMEEXCEPTION);
             }
@@ -197,12 +197,10 @@
         Message responseMessage;
         Element runtimeException = fault.lookupFaultDetail(Constants.QNAME_FAULTDETAIL_RUNTIMEEXCEPTION);
 
+        log.warn(Messages.getMessage("axisFault00"), fault);
         if (runtimeException != null) {
-            log.info(Messages.getMessage("axisFault00"), fault);
             //strip runtime details
             fault.removeFaultDetail(Constants.QNAME_FAULTDETAIL_RUNTIMEEXCEPTION);
-        } else if (log.isDebugEnabled()) {
-            log.debug(Messages.getMessage("axisFault00"), fault);
         }
 
         int status = fault.getFaultCode().getLocalPart().startsWith("Server.Unauth")

Modified: geronimo/trunk/modules/clustering/src/java/org/apache/geronimo/clustering/Node.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/clustering/src/java/org/apache/geronimo/clustering/Node.java?rev=353802&r1=353801&r2=353802&view=diff
==============================================================================
--- geronimo/trunk/modules/clustering/src/java/org/apache/geronimo/clustering/Node.java (original)
+++ geronimo/trunk/modules/clustering/src/java/org/apache/geronimo/clustering/Node.java Sat Dec  3 18:35:42 2005
@@ -31,165 +31,145 @@
  *
  * @version $Rev$ $Date$
  */
-public class
-  Node
-  extends NamedMBeanImpl
-  implements MetaDataListener, DataListener, DataDeltaListener
-{
-  protected Log     _log=LogFactory.getLog(Node.class);
-
-  /**
-   * Makes an ObjectName for a Node MBean with the given parameters.
-   *
-   * @param clusterName a <code>String</code> value
-   * @param nodeName a <code>String</code> value
-   * @return an <code>ObjectName</code> value
-   * @exception Exception if an error occurs
-   */
-  public static ObjectName
-    makeObjectName(String clusterName, String nodeName)
-    throws Exception
-  {
-    return new ObjectName("geronimo.clustering:role=Node,name="+nodeName+",cluster="+clusterName);
-  }
-
-  //----------------------------------------
-  // Node
-  //----------------------------------------
-
-  protected Cluster _cluster;
-  /**
-   * Returns the Node's Cluster's MBean's unique identifier.
-   *
-   * @return a <code>String</code> value
-   */
-  public String getClusterName(){return _objectName.getKeyProperty("cluster");}
-
-  public Cluster getCluster(){return _cluster;}
-
-  public ObjectName getClusterObjectName(){return _cluster==null?null:_cluster.getObjectName();}
-
-  //----------------------------------------
-  // MetaDataListener
-  //----------------------------------------
-
-  public void
-    setMetaData(List members)
-  {
-    _log.info("membership changed: "+members);
-  }
-
-  //----------------------------------------
-  // DataListener
-  //----------------------------------------
-
-  protected Data _data;
-
-  public Data getData() {return _data;}
-
-  public void
-    setData(Data data)
-  {
-    String xtra="we must be the first node up";
+public class Node extends NamedMBeanImpl implements MetaDataListener, DataListener, DataDeltaListener {
+    protected Log _log = LogFactory.getLog(Node.class);
 
-    if (data!=null)
-    {
-      xtra="we are joining an extant cluster";
-      _data=data;
+    /**
+     * Makes an ObjectName for a Node MBean with the given parameters.
+     *
+     * @param clusterName a <code>String</code> value
+     * @param nodeName    a <code>String</code> value
+     * @return an <code>ObjectName</code> value
+     * @throws Exception if an error occurs
+     */
+    public static ObjectName makeObjectName(String clusterName, String nodeName) throws Exception {
+        return new ObjectName("geronimo.clustering:role=Node,name=" + nodeName + ",cluster=" + clusterName);
     }
-    else
-    {
-      _data=new Data();
+
+    //----------------------------------------
+    // Node
+    //----------------------------------------
+
+    protected Cluster _cluster;
+
+    /**
+     * Returns the Node's Cluster's MBean's unique identifier.
+     *
+     * @return a <code>String</code> value
+     */
+    public String getClusterName() {
+        return _objectName.getKeyProperty("cluster");
     }
 
-    _log.debug("initialising data - "+xtra);
-  }
+    public Cluster getCluster() {
+        return _cluster;
+    }
 
-  //----------------------------------------
-  // DataDeltaListener
-  //----------------------------------------
+    public ObjectName getClusterObjectName() {
+        return _cluster == null ? null : _cluster.getObjectName();
+    }
 
-  public void
-    applyDataDelta(DataDelta delta)
-  {
-    _log.trace("applying data delta - "+delta);
-  }
+    //----------------------------------------
+    // MetaDataListener
+    //----------------------------------------
 
-  //----------------------------------------
-  // GeronimoMBeanTarget
-  //----------------------------------------
+    public void setMetaData(List members) {
+        _log.debug("membership changed: " + members);
+    }
 
-  public boolean
-    canStart()
-  {
-    if (!super.canStart()) return false;
+    //----------------------------------------
+    // DataListener
+    //----------------------------------------
 
-    if (_objectName.getKeyProperty("cluster")==null)
-    {
-      _log.warn("NodeMBean name must contain a 'cluster' property");
-      return false;
+    protected Data _data;
+
+    public Data getData() {
+        return _data;
     }
 
-    // should we really be altering our state in this method ?
-    try
-    {
-      _cluster=(Cluster)_server.getAttribute(Cluster.makeObjectName(_objectName.getKeyProperty("cluster")), "Reference");
+    public void setData(Data data) {
+        String xtra = "we must be the first node up";
+
+        if (data != null) {
+            xtra = "we are joining an extant cluster";
+            _data = data;
+        } else {
+            _data = new Data();
+        }
+
+        _log.debug("initialising data - " + xtra);
     }
-    catch (Exception e)
-    {
-      _log.error("could not find Cluster", e);
-      return false;
+
+    //----------------------------------------
+    // DataDeltaListener
+    //----------------------------------------
+
+    public void applyDataDelta(DataDelta delta) {
+        _log.trace("applying data delta - " + delta);
+    }
+
+    //----------------------------------------
+    // GeronimoMBeanTarget
+    //----------------------------------------
+
+    public boolean canStart() {
+        if (!super.canStart()) return false;
+
+        if (_objectName.getKeyProperty("cluster") == null) {
+            _log.warn("NodeMBean name must contain a 'cluster' property");
+            return false;
+        }
+
+        // should we really be altering our state in this method ?
+        try {
+            _cluster = (Cluster) _server.getAttribute(Cluster.makeObjectName(_objectName.getKeyProperty("cluster")), "Reference");
+        } catch (Exception e) {
+            _log.error("could not find Cluster", e);
+            return false;
+        }
+
+        return true;
     }
 
-    return true;
-  }
+    public void doStart() {
+        _log.debug("starting");
 
-  public void
-    doStart()
-  {
-    _log.info("starting");
+        synchronized (_cluster) {
+            Data data = _cluster.getData();
+            _log.debug("state transfer - sending: " + data);
+            setData(data);
+            _cluster.join(this);
+        }
+    }
 
-    synchronized (_cluster)
+    public void doStop() {
+        _log.debug("stopping");
+        _cluster.leave(this);
+    }
+
+    public void doFail() {
+        _log.warn("failing");
+        _cluster.leave(this);    // TODO - ??
+    }
+    /*
+    public void
+      setMBeanContext(GeronimoMBeanContext context)
     {
-      Data data=_cluster.getData();
-      _log.info("state transfer - sending: "+data);
-      setData(data);
-      _cluster.join(this);
-    }
-  }
-
-  public void
-    doStop()
-  {
-    _log.info("stopping");
-    _cluster.leave(this);
-  }
-
-  public void
-    doFail()
-  {
-    _log.info("failing");
-    _cluster.leave(this);	// TODO - ??
-  }
-  /*
-  public void
-    setMBeanContext(GeronimoMBeanContext context)
-  {
-    super.setMBeanContext(context);
-    _log=LogFactory.getLog(getClass().getName()+"#"+getClusterName()+"/"+getName());
-  }
-  */
-  /*
-  public static GeronimoMBeanInfo
-    getGeronimoMBeanInfo()
-  {
-    GeronimoMBeanInfo mbeanInfo=MBeanImpl.getGeronimoMBeanInfo();
-    mbeanInfo.setTargetClass(Node.class);
-    mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("ClusterName",       true, false, "Node's Cluster's Name"));
-    mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("ClusterObjectName", true, false, "Node's Cluster's ObjectName"));
-    mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("Data",              true, false, "Node's state"));
-
-    return mbeanInfo;
-  }
-  */
+      super.setMBeanContext(context);
+      _log=LogFactory.getLog(getClass().getName()+"#"+getClusterName()+"/"+getName());
+    }
+    */
+    /*
+    public static GeronimoMBeanInfo
+      getGeronimoMBeanInfo()
+    {
+      GeronimoMBeanInfo mbeanInfo=MBeanImpl.getGeronimoMBeanInfo();
+      mbeanInfo.setTargetClass(Node.class);
+      mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("ClusterName",       true, false, "Node's Cluster's Name"));
+      mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("ClusterObjectName", true, false, "Node's Cluster's ObjectName"));
+      mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("Data",              true, false, "Node's state"));
+
+      return mbeanInfo;
+    }
+    */
 }

Modified: geronimo/trunk/modules/clustering/src/java/org/apache/geronimo/clustering/Tier.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/clustering/src/java/org/apache/geronimo/clustering/Tier.java?rev=353802&r1=353801&r2=353802&view=diff
==============================================================================
--- geronimo/trunk/modules/clustering/src/java/org/apache/geronimo/clustering/Tier.java (original)
+++ geronimo/trunk/modules/clustering/src/java/org/apache/geronimo/clustering/Tier.java Sat Dec  3 18:35:42 2005
@@ -28,115 +28,110 @@
  * Tier abstracts code common to different Tier impls
  * into the same abstract base.
  *
- *
  * @version $Rev$ $Date$
  */
-public abstract class
-  Tier
-  extends NamedMBeanImpl
-{
-  protected Log    _log=LogFactory.getLog(Tier.class);
-  protected Data   _data;
-  protected Map    _tiers;
-  protected Object _tier;
-
-
-  /**
-   * Makes an ObjectName for a Tier MBean with the given parameters.
-   *
-   * @param clusterName a <code>String</code> value
-   * @param nodeName a <code>String</code> value
-   * @param tierName a <code>String</code> value
-   * @return an <code>ObjectName</code> value
-   * @exception Exception if an error occurs
-   */
-  public static ObjectName
-    makeObjectName(String clusterName, String nodeName, String tierName)
-    throws Exception
-  {
-    return new ObjectName("geronimo.clustering:role=Tier,name="+tierName+",node="+nodeName+",cluster="+clusterName);
-  }
-
-  //----------------------------------------
-  // Tier
-  //----------------------------------------
-
-  protected Node   _node;
-  public Node getNode(){return _node;}
-
-  public ObjectName getNodeObjectName(){return _node==null?null:_node.getObjectName();}
-
-  public String getClusterName(){return _objectName.getKeyProperty("cluster");}
-  public String getNodeName(){return _objectName.getKeyProperty("node");}
-
-  protected abstract Object alloc();
-  public abstract Object registerData(String uid, Object data);
-  public abstract Object deregisterData(String uid);
-
-  //----------------------------------------
-  // GeronimoMBeanTarget
-  //----------------------------------------
-
-  public boolean
-    canStart()
-  {
-    if (!super.canStart()) return false;
+public abstract class Tier extends NamedMBeanImpl {
+    protected Log _log = LogFactory.getLog(Tier.class);
+    protected Data _data;
+    protected Map _tiers;
+    protected Object _tier;
+
+
+    /**
+     * Makes an ObjectName for a Tier MBean with the given parameters.
+     *
+     * @param clusterName a <code>String</code> value
+     * @param nodeName    a <code>String</code> value
+     * @param tierName    a <code>String</code> value
+     * @return an <code>ObjectName</code> value
+     * @throws Exception if an error occurs
+     */
+    public static ObjectName makeObjectName(String clusterName, String nodeName, String tierName) throws Exception {
+        return new ObjectName("geronimo.clustering:role=Tier,name=" + tierName + ",node=" + nodeName + ",cluster=" + clusterName);
+    }
 
-    if (_objectName.getKeyProperty("cluster")==null)
-    {
-      _log.warn("Tier MBean name must contain a 'cluster' property");
-      return false;
+    //----------------------------------------
+    // Tier
+    //----------------------------------------
+
+    protected Node _node;
+
+    public Node getNode() {
+        return _node;
     }
 
-    if (_objectName.getKeyProperty("node")==null)
-    {
-      _log.warn("Tier MBean name must contain a 'node' property");
-      return false;
+    public ObjectName getNodeObjectName() {
+        return _node == null ? null : _node.getObjectName();
     }
 
-    try
-    {
-      _node=(Node)_server.getAttribute(Node.makeObjectName(getClusterName(), getNodeName()), "Reference");
-      _log.debug("Node: "+_node);
+    public String getClusterName() {
+        return _objectName.getKeyProperty("cluster");
     }
-    catch (Exception e)
-    {
-      _log.error("could not find Node", e);
-      return false;
+
+    public String getNodeName() {
+        return _objectName.getKeyProperty("node");
     }
 
-    return true;
-  }
+    protected abstract Object alloc();
 
-  public synchronized void
-    doStart()
-  {
-    _log.info("starting");
-
-    // register our session map with it's Data object
-    Data data=_node.getData();
-    _tiers=data.getTiers(); // immutable, so doesn't need synchronisation
-    _tier=null;
-    synchronized (_tiers)
+    public abstract Object registerData(String uid, Object data);
+
+    public abstract Object deregisterData(String uid);
+
+    //----------------------------------------
+    // GeronimoMBeanTarget
+    //----------------------------------------
+
+    public boolean canStart() {
+        if (!super.canStart()) return false;
+
+        if (_objectName.getKeyProperty("cluster") == null) {
+            _log.warn("Tier MBean name must contain a 'cluster' property");
+            return false;
+        }
+
+        if (_objectName.getKeyProperty("node") == null) {
+            _log.warn("Tier MBean name must contain a 'node' property");
+            return false;
+        }
+
+        try {
+            _node = (Node) _server.getAttribute(Node.makeObjectName(getClusterName(), getNodeName()), "Reference");
+            _log.debug("Node: " + _node);
+        }
+        catch (Exception e) {
+            _log.error("could not find Node", e);
+            return false;
+        }
+
+        return true;
+    }
+
+    public synchronized void doStart() {
+        _log.debug("starting");
+
+        // register our session map with it's Data object
+        Data data = _node.getData();
+        _tiers = data.getTiers(); // immutable, so doesn't need synchronisation
+        _tier = null;
+        synchronized (_tiers) {
+            _tier = _tiers.get(getName());
+            if (_tier == null) {
+                _tier = alloc();
+                _tiers.put(getName(), _tier);
+            }
+            // tier storage now initialised...
+        }
+        _log.debug("Node Data:" + data);
+    }
+    /*
+    public void
+      setMBeanContext(GeronimoMBeanContext context)
     {
-      _tier=_tiers.get(getName());
-      if (_tier==null)
-      {
-	_tier=alloc();
-	_tiers.put(getName(), _tier);
-      }
-      // tier storage now initialised...
-    }
-    _log.info("Node Data:"+data);
-  }
-  /*
-  public void
-    setMBeanContext(GeronimoMBeanContext context)
-  {
-    super.setMBeanContext(context);
-    _log=LogFactory.getLog(getClass().getName()+"#"+getClusterName()+"/"+getNodeName()+"/"+getName());
-  }
-  */
+      super.setMBeanContext(context);
+      _log=LogFactory.getLog(getClass().getName()+"#"+getClusterName()+"/"+getNodeName()+"/"+getName());
+    }
+    */
     /*
   public static GeronimoMBeanInfo
     getGeronimoMBeanInfo()

Modified: geronimo/trunk/modules/clustering/src/java/org/apache/geronimo/clustering/web/HttpSessionManager.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/clustering/src/java/org/apache/geronimo/clustering/web/HttpSessionManager.java?rev=353802&r1=353801&r2=353802&view=diff
==============================================================================
--- geronimo/trunk/modules/clustering/src/java/org/apache/geronimo/clustering/web/HttpSessionManager.java (original)
+++ geronimo/trunk/modules/clustering/src/java/org/apache/geronimo/clustering/web/HttpSessionManager.java Sat Dec  3 18:35:42 2005
@@ -33,107 +33,130 @@
  *
  * @version $Rev$ $Date$
  */
-public class
-  HttpSessionManager
-  extends MBeanImpl
-{
-  protected Log _log=LogFactory.getLog(HttpSessionManager.class);
-  //----------------------------------------
-  // HttpSessionManager
-  //----------------------------------------
+public class HttpSessionManager extends MBeanImpl {
+    protected Log _log = LogFactory.getLog(HttpSessionManager.class);
+    //----------------------------------------
+    // HttpSessionManager
+    //----------------------------------------
 
-  protected Map _sessions=new HashMap();
+    protected Map _sessions = new HashMap();
 
-  public int getSize(){return _sessions.size();}
+    public int getSize() {
+        return _sessions.size();
+    }
+
+    protected Tier _tier;
 
-  protected Tier _tier;
-  public Tier getTier(){return _tier;}
+    public Tier getTier() {
+        return _tier;
+    }
 
-  public ObjectName getTierObjectName() {return _tier==null?null:_tier.getObjectName();}
+    public ObjectName getTierObjectName() {
+        return _tier == null ? null : _tier.getObjectName();
+    }
 
-  protected String _clusterName;
-  public String getClusterName(){return _clusterName;}
-  public void setClusterName(String clusterName){_clusterName=clusterName;}
+    protected String _clusterName;
 
-  protected String _nodeName;
-  public String getNodeName(){return _nodeName;}
-  public void setNodeName(String nodeName){_nodeName=nodeName;}
+    public String getClusterName() {
+        return _clusterName;
+    }
+
+    public void setClusterName(String clusterName) {
+        _clusterName = clusterName;
+    }
 
-  protected String _tierName="web";
-  public String getTierName(){return _tierName;}
-  public void setTierName(String tierName){_tierName=tierName;}
+    protected String _nodeName;
 
-  protected String _contextPath;
-  public String getContextPath(){return _contextPath;}
-  public void setContextPath(String contextPath){_contextPath=contextPath;}
+    public String getNodeName() {
+        return _nodeName;
+    }
 
-  protected String _uid;
-  public String getUID(){return _uid;}
+    public void setNodeName(String nodeName) {
+        _nodeName = nodeName;
+    }
 
-  //----------------------------------------
-  // GeronimoMBeanTarget
-  //----------------------------------------
+    protected String _tierName = "web";
 
-  public boolean
-    canStart()
-  {
-    if (!super.canStart()) return false;
+    public String getTierName() {
+        return _tierName;
+    }
 
-    try
-    {
-      // find our tier
-      _tier=(Tier)_server.getAttribute(Tier.makeObjectName(getClusterName(), getNodeName(), getTierName()), "Reference");
-      _log.debug("Tier: "+_tier);
+    public void setTierName(String tierName) {
+        _tierName = tierName;
     }
-    catch (Exception e)
-    {
-      _log.error("could not find Tier", e);
-      return false;
+
+    protected String _contextPath;
+
+    public String getContextPath() {
+        return _contextPath;
     }
 
-    return true;
-  }
+    public void setContextPath(String contextPath) {
+        _contextPath = contextPath;
+    }
+
+    protected String _uid;
+
+    public String getUID() {
+        return _uid;
+    }
+
+    //----------------------------------------
+    // GeronimoMBeanTarget
+    //----------------------------------------
+
+    public boolean canStart() {
+        if (!super.canStart()) return false;
+
+        try {
+            // find our tier
+            _tier = (Tier) _server.getAttribute(Tier.makeObjectName(getClusterName(), getNodeName(), getTierName()), "Reference");
+            _log.debug("Tier: " + _tier);
+        }
+        catch (Exception e) {
+            _log.error("could not find Tier", e);
+            return false;
+        }
+
+        return true;
+    }
 
-  public void
-    doStart()
-  {
-    _uid=_contextPath;		// TODO - what does Greg say ?
-    _log=LogFactory.getLog(getClass().getName()+"#"+getUID());
-    _log.info("starting");
-    _tier.registerData(getUID(),_sessions);
-    _log.info("sessions registered: "+getUID());
-
-      // test stuff
-    _sessions.put("aaa", new Object());
-    _sessions.put("bbb", new Object());
-    _sessions.put("ccc", new Object());
-  }
-
-  public void
-    doStop()
-  {
-    _log.info("stopping");
-
-    _tier.deregisterData(getUID());
-    // TODO - leave cluster
-  }
-  /*
-  public static GeronimoMBeanInfo
-    getGeronimoMBeanInfo()
-  {
-    GeronimoMBeanInfo mbeanInfo=MBeanImpl.getGeronimoMBeanInfo();
-    mbeanInfo.setTargetClass(HttpSessionManager.class);
-    mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("Size",           true, false, "number of extant HttpSessions within this webapp"));
-    mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("UID",            true, false, "unique identity for this webapp within this vm"));
-    mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("TierObjectName", true, false, "ObjectName of Tier to which this webapp is attached"));
-
-    // TODO - these should probably become RO...
-    mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("ClusterName",    true, true, "name of Cluster upon which this webapp is deployed"));
-    mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("NodeName",       true, true, "name of Cluster Node upon which this webapp is deployed"));
-    mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("TierName",       true, true, "name of Tier to which this webapp is attached"));
-    mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("ContextPath",    true, true, "context path at which this webapp is deployed"));
-
-    return mbeanInfo;
-  }
-  */
+    public void doStart() {
+        _uid = _contextPath;        // TODO - what does Greg say ?
+        _log = LogFactory.getLog(getClass().getName() + "#" + getUID());
+        _log.debug("starting");
+        _tier.registerData(getUID(), _sessions);
+        _log.debug("sessions registered: " + getUID());
+
+        // test stuff
+        _sessions.put("aaa", new Object());
+        _sessions.put("bbb", new Object());
+        _sessions.put("ccc", new Object());
+    }
+
+    public void doStop() {
+        _log.debug("stopping");
+
+        _tier.deregisterData(getUID());
+        // TODO - leave cluster
+    }
+    /*
+    public static GeronimoMBeanInfo
+      getGeronimoMBeanInfo()
+    {
+      GeronimoMBeanInfo mbeanInfo=MBeanImpl.getGeronimoMBeanInfo();
+      mbeanInfo.setTargetClass(HttpSessionManager.class);
+      mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("Size",           true, false, "number of extant HttpSessions within this webapp"));
+      mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("UID",            true, false, "unique identity for this webapp within this vm"));
+      mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("TierObjectName", true, false, "ObjectName of Tier to which this webapp is attached"));
+
+      // TODO - these should probably become RO...
+      mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("ClusterName",    true, true, "name of Cluster upon which this webapp is deployed"));
+      mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("NodeName",       true, true, "name of Cluster Node upon which this webapp is deployed"));
+      mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("TierName",       true, true, "name of Tier to which this webapp is attached"));
+      mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("ContextPath",    true, true, "context path at which this webapp is deployed"));
+
+      return mbeanInfo;
+    }
+    */
 }

Modified: geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorPlanRectifier.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorPlanRectifier.java?rev=353802&r1=353801&r2=353802&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorPlanRectifier.java (original)
+++ geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorPlanRectifier.java Sat Dec  3 18:35:42 2005
@@ -76,7 +76,7 @@
             }
         }
         if (updated) {
-            log.info("Your connector plan has obsolete elements or attributes in it.  Please remove version attributes, global-jndi-name elements, and credential-interface elements");
+            log.warn("Your connector plan has obsolete elements or attributes in it.  Please remove version attributes, global-jndi-name elements, and credential-interface elements");
         }
     }
 

Modified: geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/GeronimoConnectionEventListener.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/GeronimoConnectionEventListener.java?rev=353802&r1=353801&r2=353802&view=diff
==============================================================================
--- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/GeronimoConnectionEventListener.java (original)
+++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/GeronimoConnectionEventListener.java Sat Dec  3 18:35:42 2005
@@ -36,8 +36,7 @@
  *
  * @version 1.0
  */
-public class GeronimoConnectionEventListener
-        implements ConnectionEventListener {
+public class GeronimoConnectionEventListener implements ConnectionEventListener {
 
     private static Log log = LogFactory.getLog(GeronimoConnectionEventListener.class.getName());
 
@@ -76,7 +75,7 @@
                     + ", actual "
                     + connectionEvent.getSource());
         }
-        log.info("connectionErrorOccurred called with " + connectionEvent.getConnectionHandle(), connectionEvent.getException());
+        log.warn("connectionErrorOccurred called with " + connectionEvent.getConnectionHandle(), connectionEvent.getException());
         ConnectionInfo ci = new ConnectionInfo(managedConnectionInfo);
         ci.setConnectionHandle(connectionEvent.getConnectionHandle());
         stack.returnConnection(ci, ConnectionReturnAction.DESTROY);

Modified: geronimo/trunk/modules/core/src/java/org/apache/geronimo/pool/ClockPool.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/core/src/java/org/apache/geronimo/pool/ClockPool.java?rev=353802&r1=353801&r2=353802&view=diff
==============================================================================
--- geronimo/trunk/modules/core/src/java/org/apache/geronimo/pool/ClockPool.java (original)
+++ geronimo/trunk/modules/core/src/java/org/apache/geronimo/pool/ClockPool.java Sat Dec  3 18:35:42 2005
@@ -61,12 +61,12 @@
                 return t;
             }
         });
-        log.info("Clock pool " + poolName + " started");
+        log.debug("Clock pool " + poolName + " started");
     }
 
     public void doStop() throws Exception {
         clockDaemon.shutDown();
-        log.info("Clock pool " + poolName + " stopped");
+        log.debug("Clock pool " + poolName + " stopped");
     }
 
     public void doFail() {

Modified: geronimo/trunk/modules/hot-deploy/src/java/org/apache/geronimo/deployment/hot/DirectoryHotDeployer.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/hot-deploy/src/java/org/apache/geronimo/deployment/hot/DirectoryHotDeployer.java?rev=353802&r1=353801&r2=353802&view=diff
==============================================================================
--- geronimo/trunk/modules/hot-deploy/src/java/org/apache/geronimo/deployment/hot/DirectoryHotDeployer.java (original)
+++ geronimo/trunk/modules/hot-deploy/src/java/org/apache/geronimo/deployment/hot/DirectoryHotDeployer.java Sat Dec  3 18:35:42 2005
@@ -161,7 +161,7 @@
             DeployUtils.identifyTargetModuleIDs(startupModules, configId).toArray(new TargetModuleID[0]);
             return true;
         } catch (DeploymentException e) {
-            log.info("Found new file in deploy directory on startup with ID "+configId);
+            log.debug("Found new file in deploy directory on startup with ID "+configId);
             return false;
         }
     }

Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/InteropGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/InteropGBean.java?rev=353802&r1=353801&r2=353802&view=diff
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/InteropGBean.java (original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/InteropGBean.java Sat Dec  3 18:35:42 2005
@@ -104,15 +104,15 @@
      */
 
     public void doStart() throws Exception {
-        log.info("Started " + getName());
+        log.debug("Started " + getName());
     }
 
     public void doStop() throws Exception {
-        log.info("Stopped " + getName());
+        log.debug("Stopped " + getName());
     }
 
     public void doFail() {
-        log.info("Failed " + getName());
+        log.warn("Failed " + getName());
     }
 
     /*

Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/adapter/CorbaAdapter.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/adapter/CorbaAdapter.java?rev=353802&r1=353801&r2=353802&view=diff
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/adapter/CorbaAdapter.java (original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/adapter/CorbaAdapter.java Sat Dec  3 18:35:42 2005
@@ -27,22 +27,22 @@
 
     private final Log log = LogFactory.getLog(CorbaAdapter.class);
 
-    private ClassLoader     classLoader;
+    private ClassLoader classLoader;
 
-    private NameService     nameService = NameService.getInstance();
+    private NameService nameService = NameService.getInstance();
 
-    private String          bindNames[];
-    private String          ids[];
-    private String          remoteClassName;
-    private String          remoteInterfaceClassName;
+    private String bindNames[];
+    private String ids[];
+    private String remoteClassName;
+    private String remoteInterfaceClassName;
 
-    private Class           remoteClassClass;
-    private Class           remoteInterfaceClass;
+    private Class remoteClassClass;
+    private Class remoteInterfaceClass;
     private RemoteInterface remoteInterfaceObject;
-    private Object          remoteClassObject;
+    private Object remoteClassObject;
 
-    public CorbaAdapter( String[] bindNames, String[] ids, String remoteClassName,
-                         String remoteInterfaceName, ClassLoader classLoader ) {
+    public CorbaAdapter(String[] bindNames, String[] ids, String remoteClassName,
+                        String remoteInterfaceName, ClassLoader classLoader) {
         this.bindNames = bindNames;
         this.ids = ids;
         this.remoteClassName = remoteClassName;
@@ -55,8 +55,7 @@
         loadRemoteObject();
     }
 
-    public Object getAdapterID()
-    {
+    public Object getAdapterID() {
         return "CorbaAdapter";
     }
 
@@ -99,20 +98,17 @@
         }
     }
 
-    public void start()
-    {
-        log.info( "Starting CorbaAdapter: " );
-        nameService.bindAdapter( this );
+    public void start() {
+        log.debug("Starting CorbaAdapter: ");
+        nameService.bindAdapter(this);
     }
 
-    public void stop()
-    {
-        log.info( "Stopping CorbaAdapter: " );
-        nameService.unbindAdapter( this );
+    public void stop() {
+        log.debug("Stopping CorbaAdapter: ");
+        nameService.unbindAdapter(this);
     }
 
-    public ObjectRef getObjectRef()
-    {
+    public ObjectRef getObjectRef() {
         return remoteInterfaceObject.getObjectRef();
         //org.apache.geronimo.interop.rmi.iiop.ObjectRef or = new ObjectRef();
         //or.$setID("RMI:org.apache.geronimo.interop.CosNaming.NamingContext:0000000000000000");
@@ -120,15 +116,13 @@
         //return or;
     }
 
-    protected void loadRemoteInterface()
-    {
-        remoteInterfaceClass = loadClass( remoteInterfaceClassName, classLoader );
+    protected void loadRemoteInterface() {
+        remoteInterfaceClass = loadClass(remoteInterfaceClassName, classLoader);
 
-        if (remoteInterfaceClass != null)
-        {
+        if (remoteInterfaceClass != null) {
             remoteInterfaceObject = null;
             try {
-                remoteInterfaceObject = (RemoteInterface)remoteInterfaceClass.newInstance();
+                remoteInterfaceObject = (RemoteInterface) remoteInterfaceClass.newInstance();
             } catch (IllegalAccessException e) {
                 e.printStackTrace();
             } catch (InstantiationException e) {
@@ -137,12 +131,10 @@
         }
     }
 
-    protected void loadRemoteObject()
-    {
-        remoteClassClass = loadClass( remoteClassName, classLoader );
+    protected void loadRemoteObject() {
+        remoteClassClass = loadClass(remoteClassName, classLoader);
 
-        if (remoteClassClass != null)
-        {
+        if (remoteClassClass != null) {
             remoteClassObject = null;
             try {
                 remoteClassObject = remoteClassClass.newInstance();
@@ -154,18 +146,15 @@
         }
     }
 
-    public Object getServant()
-    {
+    public Object getServant() {
         return remoteClassObject;
     }
 
-    public Object getEJBContainer()
-    {
+    public Object getEJBContainer() {
         return null;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
-    public Object getEJBHome()
-    {
+    public Object getEJBHome() {
         return null;  //To change body of implemented methods use File | Settings | File Templates.
     }
 

Modified: geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/adapter/HomeAdapter.txt
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/adapter/HomeAdapter.txt?rev=353802&r1=353801&r2=353802&view=diff
==============================================================================
--- geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/adapter/HomeAdapter.txt (original)
+++ geronimo/trunk/modules/interop/src/java/org/apache/geronimo/interop/adapter/HomeAdapter.txt Sat Dec  3 18:35:42 2005
@@ -247,15 +247,13 @@
 //        return c;
 //    }
 
-    public void start()
-    {
-        log.info( "Starting HomeAdapter: " + ejbContainer.getEJBName() + " - " + getAdapterID() );
+    public void start() {
+        log.debug( "Starting HomeAdapter: " + ejbContainer.getEJBName() + " - " + getAdapterID() );
         nameService.bindAdapter( this );
     }
 
-    public void stop()
-    {
-        log.info( "Stopping HomeAdapter: " + ejbContainer.getEJBName() + " - " + getAdapterID() );
+    public void stop() {
+        log.debug( "Stopping HomeAdapter: " + ejbContainer.getEJBName() + " - " + getAdapterID() );
         nameService.unbindAdapter( this );
     }
 

Modified: geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java?rev=353802&r1=353801&r2=353802&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java (original)
+++ geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java Sat Dec  3 18:35:42 2005
@@ -510,6 +510,7 @@
                 ParamValueType contextParam = contextParamArray[i];
                 contextParams.put(contextParam.getParamName().getStringValue().trim(), contextParam.getParamValue().getStringValue().trim());
             }
+            contextParams.put("org.mortbay.jetty.servlet.Context.LogSink", "foo");
             webModuleData.setAttribute("contextParamMap", contextParams);
 
             ListenerType[] listenerArray = webApp.getListenerArray();

Modified: geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JAASJettyRealm.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JAASJettyRealm.java?rev=353802&r1=353801&r2=353802&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JAASJettyRealm.java (original)
+++ geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JAASJettyRealm.java Sat Dec  3 18:35:42 2005
@@ -103,7 +103,7 @@
 
             return userPrincipal;
         } catch (LoginException e) {
-            log.info("problem", e);
+            log.warn("Login Failed", e);
             return null;
         }
     }

Modified: geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/interceptor/SecurityContextBeforeAfter.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/interceptor/SecurityContextBeforeAfter.java?rev=353802&r1=353801&r2=353802&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/interceptor/SecurityContextBeforeAfter.java (original)
+++ geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/interceptor/SecurityContextBeforeAfter.java Sat Dec  3 18:35:42 2005
@@ -112,7 +112,7 @@
 
 
         this.realm = realm;
-//        log.info("JettyWebAppJACCContext started with JACC policy '" + policyContextID + "'");
+//        log.debug("JettyWebAppJACCContext started with JACC policy '" + policyContextID + "'");
     }
 
     public void stop() {

Modified: geronimo/trunk/modules/jmx-remoting/src/java/org/apache/geronimo/jmxremoting/JMXConnector.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jmx-remoting/src/java/org/apache/geronimo/jmxremoting/JMXConnector.java?rev=353802&r1=353801&r2=353802&view=diff
==============================================================================
--- geronimo/trunk/modules/jmx-remoting/src/java/org/apache/geronimo/jmxremoting/JMXConnector.java (original)
+++ geronimo/trunk/modules/jmx-remoting/src/java/org/apache/geronimo/jmxremoting/JMXConnector.java Sat Dec  3 18:35:42 2005
@@ -120,13 +120,13 @@
         filter.enableType(JMXConnectionNotification.FAILED);
         server.addNotificationListener(authenticator, filter, null);
         server.start();
-        log.info("Started JMXConnector " + server.getAddress());
+        log.debug("Started JMXConnector " + server.getAddress());
     }
 
     public void doStop() throws Exception {
         server.stop();
         server = null;
-        log.info("Stopped JMXConnector " + url);
+        log.debug("Stopped JMXConnector " + url);
     }
 
     public void doFail() {

Modified: geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/log/GeronimoLog.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/log/GeronimoLog.java?rev=353802&r1=353801&r2=353802&view=diff
==============================================================================
--- geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/log/GeronimoLog.java (original)
+++ geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/log/GeronimoLog.java Sat Dec  3 18:35:42 2005
@@ -75,7 +75,9 @@
     }
 
     public void info(Object message) {
-        log.info(message);
+        if(!name.startsWith("/")) { //todo: temporary fix to work around Jetty logging issue
+            log.info(message);
+        }
     }
 
     public void info(Object message, Throwable throwable) {

Modified: geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/log/GeronimoLogging.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/log/GeronimoLogging.java?rev=353802&r1=353801&r2=353802&view=diff
==============================================================================
--- geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/log/GeronimoLogging.java (original)
+++ geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/log/GeronimoLogging.java Sat Dec  3 18:35:42 2005
@@ -67,7 +67,10 @@
 
             initialized = true;
         }
+    }
 
+    public static void setDefaultLogLevel(GeronimoLogging level) {
+        defaultLevel = level;
     }
 
     public static GeronimoLogging getDefaultLevel() {

Modified: geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/IMAPStoreGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/IMAPStoreGBean.java?rev=353802&r1=353801&r2=353802&view=diff
==============================================================================
--- geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/IMAPStoreGBean.java (original)
+++ geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/IMAPStoreGBean.java Sat Dec  3 18:35:42 2005
@@ -749,15 +749,15 @@
     }
 
     public void doStart() throws Exception {
-        log.info("Started " + getObjectName());
+        log.debug("Started " + getObjectName());
     }
 
     public void doStop() throws Exception {
-        log.info("Stopped " + getObjectName());
+        log.debug("Stopped " + getObjectName());
     }
 
     public void doFail() {
-        log.info("Failed " + getObjectName());
+        log.warn("Failed " + getObjectName());
     }
 
     public static final GBeanInfo GBEAN_INFO;

Modified: geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/MailGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/MailGBean.java?rev=353802&r1=353801&r2=353802&view=diff
==============================================================================
--- geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/MailGBean.java (original)
+++ geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/MailGBean.java Sat Dec  3 18:35:42 2005
@@ -324,7 +324,7 @@
     }
 
     public void doStart() throws Exception {
-        log.info("Started " + objectName + " - will return "
+        log.debug("Started " + objectName + " - will return "
                  + (Boolean.TRUE.equals(useDefault) ? "default" : "new")
                  + " JavaMail Session "
                  + (authenticator == null ? "without" : "with")
@@ -332,11 +332,11 @@
     }
 
     public void doStop() throws Exception {
-        log.info("Stopped " + objectName);
+        log.debug("Stopped " + objectName);
     }
 
     public void doFail() {
-        log.info("Failed " + objectName);
+        log.warn("Failed " + objectName);
     }
 
     /**

Modified: geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/POP3StoreGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/POP3StoreGBean.java?rev=353802&r1=353801&r2=353802&view=diff
==============================================================================
--- geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/POP3StoreGBean.java (original)
+++ geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/POP3StoreGBean.java Sat Dec  3 18:35:42 2005
@@ -412,15 +412,15 @@
     }
 
     public void doStart() throws Exception {
-        log.info("Started " + getObjectName());
+        log.debug("Started " + getObjectName());
     }
 
     public void doStop() throws Exception {
-        log.info("Stopped " + getObjectName());
+        log.debug("Stopped " + getObjectName());
     }
 
     public void doFail() {
-        log.info("Failed " + getObjectName());
+        log.warn("Failed " + getObjectName());
     }
 
     public static final GBeanInfo GBEAN_INFO;

Modified: geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/ProtocolGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/ProtocolGBean.java?rev=353802&r1=353801&r2=353802&view=diff
==============================================================================
--- geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/ProtocolGBean.java (original)
+++ geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/ProtocolGBean.java Sat Dec  3 18:35:42 2005
@@ -151,15 +151,15 @@
     }
 
     public void doStart() throws Exception {
-        log.info("Started " + objectName);
+        log.debug("Started " + objectName);
     }
 
     public void doStop() throws Exception {
-        log.info("Stopped " + objectName);
+        log.debug("Stopped " + objectName);
     }
 
     public void doFail() {
-        log.info("Failed " + objectName);
+        log.warn("Failed " + objectName);
     }
 
     public static final GBeanInfo GBEAN_INFO;

Modified: geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/SMTPTransportGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/SMTPTransportGBean.java?rev=353802&r1=353801&r2=353802&view=diff
==============================================================================
--- geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/SMTPTransportGBean.java (original)
+++ geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/SMTPTransportGBean.java Sat Dec  3 18:35:42 2005
@@ -716,15 +716,15 @@
     }
 
     public void doStart() throws Exception {
-        log.info("Started " + getObjectName());
+        log.debug("Started " + getObjectName());
     }
 
     public void doStop() throws Exception {
-        log.info("Stopped " + getObjectName());
+        log.debug("Stopped " + getObjectName());
     }
 
     public void doFail() {
-        log.info("Failed " + getObjectName());
+        log.warn("Failed " + getObjectName());
     }
 
     public static final GBeanInfo GBEAN_INFO;

Modified: geronimo/trunk/modules/spring-builder/src/java/org/apache/geronimo/spring/deployment/SPRConfigBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/spring-builder/src/java/org/apache/geronimo/spring/deployment/SPRConfigBuilder.java?rev=353802&r1=353801&r2=353802&view=diff
==============================================================================
--- geronimo/trunk/modules/spring-builder/src/java/org/apache/geronimo/spring/deployment/SPRConfigBuilder.java (original)
+++ geronimo/trunk/modules/spring-builder/src/java/org/apache/geronimo/spring/deployment/SPRConfigBuilder.java Sat Dec  3 18:35:42 2005
@@ -46,138 +46,123 @@
 /**
  * @version $Rev: 126313 $ $Date: 2005-01-24 21:03:52 +0000 (Mon, 24 Jan 2005) $
  */
-public class SPRConfigBuilder
-  implements ConfigurationBuilder
-{
-  protected static final Log    _log=LogFactory.getLog(SPRConfigBuilder.class);
-  protected static final String _defaultConfigPath="META-INF/spring.xml";
-
-  protected final Kernel     _kernel;
-  protected final Repository _repository;
-  protected final List        _defaultParentId;
-
-  public
-    SPRConfigBuilder(List defaultParentId, Repository repository, Kernel kernel)
-  {
-    _kernel         =kernel;
-    _repository     =repository;
-    _defaultParentId=defaultParentId;
-  }
-
-  //----------------------------------------
-  // RTTI
-
-  public static final GBeanInfo GBEAN_INFO;
-
-  static
-  {
-    GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(SPRConfigBuilder.class, NameFactory.CONFIG_BUILDER);
-    infoFactory.addAttribute("defaultParentId" , List.class, true);
-    infoFactory.addReference("Repository"      , Repository.class, NameFactory.GERONIMO_SERVICE);
-    infoFactory.addAttribute("kernel"          , Kernel.class, false);
-    infoFactory.addInterface(ConfigurationBuilder.class);
-    infoFactory.setConstructor(new String[]{"defaultParentId", "Repository", "kernel"});
-
-    GBEAN_INFO = infoFactory.getBeanInfo();
-  }
-
-  public static GBeanInfo getGBeanInfo() {return GBEAN_INFO;}
-
-  //----------------------------------------
-
-  public Object
-    getDeploymentPlan(File planFile, JarFile sprFile)
-    throws DeploymentException
-  {
-    if (sprFile==null || !sprFile.getName().endsWith(".spr")) return null;
-
-    _log.info("Planning: "+sprFile.getName());
-
-    // N.B.
-    // - we should check that META-INF/spring.xml exists here (we can't really validate it)
-    // - we should check out META-INF/geronimo-spring.xml
-    // - could we inject stuff about environment into BeanFactory ?
+public class SPRConfigBuilder implements ConfigurationBuilder {
+    protected static final Log _log = LogFactory.getLog(SPRConfigBuilder.class);
+    protected static final String _defaultConfigPath = "META-INF/spring.xml";
+
+    protected final Kernel _kernel;
+    protected final Repository _repository;
+    protected final List _defaultParentId;
+
+    public SPRConfigBuilder(List defaultParentId, Repository repository, Kernel kernel) {
+        _kernel = kernel;
+        _repository = repository;
+        _defaultParentId = defaultParentId;
+    }
+
+    //----------------------------------------
+    // RTTI
+
+    public static final GBeanInfo GBEAN_INFO;
+
+    static {
+        GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(SPRConfigBuilder.class, NameFactory.CONFIG_BUILDER);
+        infoFactory.addAttribute("defaultParentId", List.class, true);
+        infoFactory.addReference("Repository", Repository.class, NameFactory.GERONIMO_SERVICE);
+        infoFactory.addAttribute("kernel", Kernel.class, false);
+        infoFactory.addInterface(ConfigurationBuilder.class);
+        infoFactory.setConstructor(new String[]{"defaultParentId", "Repository", "kernel"});
+
+        GBEAN_INFO = infoFactory.getBeanInfo();
+    }
+
+    public static GBeanInfo getGBeanInfo() {
+        return GBEAN_INFO;
+    }
+
+    //----------------------------------------
+
+    public Object getDeploymentPlan(File planFile, JarFile sprFile) throws DeploymentException {
+        if (sprFile == null || !sprFile.getName().endsWith(".spr")) return null;
 
-    return this;		// token passed to buildConfiguration()...
-  }
+        _log.debug("Planning: " + sprFile.getName());
+
+        // N.B.
+        // - we should check that META-INF/spring.xml exists here (we can't really validate it)
+        // - we should check out META-INF/geronimo-spring.xml
+        // - could we inject stuff about environment into BeanFactory ?
+
+        return this;        // token passed to buildConfiguration()...
+    }
 
     public URI getConfigurationID(Object plan, JarFile sprFile) throws IOException, DeploymentException {
-        String uid=sprFile.getName();
+        String uid = sprFile.getName();
         try {
             return new URI(uid);
         } catch (URISyntaxException e) {
-            throw new DeploymentException("Unable to construct configuration ID "+sprFile.getName());
+            throw new DeploymentException("Unable to construct configuration ID " + sprFile.getName());
         }
     }
 
-  public ConfigurationData
-    buildConfiguration(Object plan, JarFile sprFile, File outfile)
-    throws IOException, DeploymentException
-  {
-    if (!(plan instanceof SPRConfigBuilder)) // hacky...
-      return null;
-
-    String uid=sprFile.getName(); // should be overrideable in geronimo-spring.xml
-
-    _log.info("Building: "+uid);
-
-    SPRContext ctx=null;
-    try
-    {
-      URI configId=new URI(sprFile.getName());	// could be overridden in META-INF/geronimo-spring.xml
-      List parentId= new ArrayList(_defaultParentId); // could be overridden in META-INF/geronimo-spring.xml
-      URI configPath=new URI(_defaultConfigPath);
-
-      ctx=new SPRContext(outfile, configId, ConfigurationModuleType.SPR, parentId, _kernel);
-
-      // set up classpath and files that we want available in final
-      // distribution...
-      List classPath=new ArrayList();
-      classPath.add(new URI("."));
-
-      for (Enumeration e=sprFile.entries(); e.hasMoreElements();)
-      {
-       	ZipEntry entry = (ZipEntry) e.nextElement();
-       	String name=entry.getName();
-       	ctx.addFile(URI.create(name), sprFile, entry);
-
-	if (name.endsWith(".jar"))
-	  classPath.add(new URI(name));
-      }
-
-      // now we can get ClassLoader...
-      //ClassLoader cl=ctx.getClassLoader(_repository);
-
-      // managed Object for this Spring Application
-      {
-	ObjectName name=new ObjectName("geronimo.config", "name", uid);
-	GBeanData gbeanData=new GBeanData(name, SpringApplicationImpl.GBEAN_INFO);
-	ctx.addGBean(gbeanData);
-      }
-
-      // the actual Application...
-      {
-	Hashtable props=new Hashtable();
-        props.put("J2EEServer"      , "geronimo");
-        props.put("J2EEApplication" , "null");
-        props.put("j2eeType"        , "SpringModule");
-        props.put("name"            , uid);
-	ObjectName on=new ObjectName("geronimo.server", props);
-	GBeanData gbeanData=new GBeanData(on, SpringGBean.GBEAN_INFO);
-        gbeanData.setAttribute("classPath"  , classPath.toArray(new URI[classPath.size()]));
-        gbeanData.setAttribute("configPath" , configPath);
-	ctx.addGBean(gbeanData);
-      }
-    }
-    catch (Exception e)
-    {
-      throw new DeploymentException(e);
-    }
-    finally
-    {
-      if (ctx!=null) ctx.close();
-    }
+    public ConfigurationData buildConfiguration(Object plan, JarFile sprFile, File outfile) throws IOException, DeploymentException {
+        if (!(plan instanceof SPRConfigBuilder)) // hacky...
+            return null;
+
+        String uid = sprFile.getName(); // should be overrideable in geronimo-spring.xml
 
-    return ctx.getConfigurationData();
-  }
+        _log.debug("Building: " + uid);
+
+        SPRContext ctx = null;
+        try {
+            URI configId = new URI(sprFile.getName());    // could be overridden in META-INF/geronimo-spring.xml
+            List parentId = new ArrayList(_defaultParentId); // could be overridden in META-INF/geronimo-spring.xml
+            URI configPath = new URI(_defaultConfigPath);
+
+            ctx = new SPRContext(outfile, configId, ConfigurationModuleType.SPR, parentId, _kernel);
+
+            // set up classpath and files that we want available in final
+            // distribution...
+            List classPath = new ArrayList();
+            classPath.add(new URI("."));
+
+            for (Enumeration e = sprFile.entries(); e.hasMoreElements();) {
+                ZipEntry entry = (ZipEntry) e.nextElement();
+                String name = entry.getName();
+                ctx.addFile(URI.create(name), sprFile, entry);
+
+                if (name.endsWith(".jar"))
+                    classPath.add(new URI(name));
+            }
+
+            // now we can get ClassLoader...
+            //ClassLoader cl=ctx.getClassLoader(_repository);
+
+            // managed Object for this Spring Application
+            {
+                ObjectName name = new ObjectName("geronimo.config", "name", uid);
+                GBeanData gbeanData = new GBeanData(name, SpringApplicationImpl.GBEAN_INFO);
+                ctx.addGBean(gbeanData);
+            }
+
+            // the actual Application...
+            {
+                Hashtable props = new Hashtable();
+                props.put("J2EEServer", "geronimo");
+                props.put("J2EEApplication", "null");
+                props.put("j2eeType", "SpringModule");
+                props.put("name", uid);
+                ObjectName on = new ObjectName("geronimo.server", props);
+                GBeanData gbeanData = new GBeanData(on, SpringGBean.GBEAN_INFO);
+                gbeanData.setAttribute("classPath", classPath.toArray(new URI[classPath.size()]));
+                gbeanData.setAttribute("configPath", configPath);
+                ctx.addGBean(gbeanData);
+            }
+        } catch (Exception e) {
+            throw new DeploymentException(e);
+        } finally {
+            if (ctx != null) ctx.close();
+        }
+
+        return ctx.getConfigurationData();
+    }
 }



Mime
View raw message