geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: r351845 - in /geronimo/trunk: applications/console-core/src/java/org/apache/geronimo/console/core/keystore/ modules/assembly/src/var/log/ modules/derby/src/java/org/apache/geronimo/derby/ modules/directory/src/java/org/apache/geronimo/direc...
Date Fri, 02 Dec 2005 22:34:40 GMT
Author: ammulder
Date: Fri Dec  2 14:34:16 2005
New Revision: 351845

URL: http://svn.apache.org/viewcvs?rev=351845&view=rev
Log:
Start cleaning up INFO level log output.  The easy stuff is done.  Now need
  to look at catching stuff like Jetty logging where the logger name is
  the web app context, so it's impossible to configure around.

Modified:
    geronimo/trunk/applications/console-core/src/java/org/apache/geronimo/console/core/keystore/KeyStoreGBean.java
    geronimo/trunk/modules/assembly/src/var/log/server-log4j.properties
    geronimo/trunk/modules/derby/src/java/org/apache/geronimo/derby/DerbyNetworkGBean.java
    geronimo/trunk/modules/derby/src/java/org/apache/geronimo/derby/DerbySystemGBean.java
    geronimo/trunk/modules/directory/src/java/org/apache/geronimo/directory/DirectoryGBean.java
    geronimo/trunk/modules/directory/src/java/org/apache/geronimo/directory/ServerContextFactory.java
    geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/basic/BasicKernel.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/Configuration.java
    geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/SecurityServiceImpl.java
    geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/GeronimoLoginConfiguration.java
    geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingServer.java
    geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java
    geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/LocalConfigStore.java
    geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/main/Daemon.java
    geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/repository/ReadOnlyRepository.java
    geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/rmi/RMIRegistryService.java
    geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/ConnectorGBean.java
    geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/EngineGBean.java
    geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/HostGBean.java
    geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java
    geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/ValveGBean.java
    geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/log/HOWLLog.java

Modified: geronimo/trunk/applications/console-core/src/java/org/apache/geronimo/console/core/keystore/KeyStoreGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-core/src/java/org/apache/geronimo/console/core/keystore/KeyStoreGBean.java?rev=351845&r1=351844&r2=351845&view=diff
==============================================================================
--- geronimo/trunk/applications/console-core/src/java/org/apache/geronimo/console/core/keystore/KeyStoreGBean.java (original)
+++ geronimo/trunk/applications/console-core/src/java/org/apache/geronimo/console/core/keystore/KeyStoreGBean.java Fri Dec  2 14:34:16 2005
@@ -29,7 +29,6 @@
 import java.security.KeyStoreException;
 import java.security.PrivateKey;
 import java.security.PublicKey;
-import java.security.Security;
 import java.security.cert.Certificate;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
@@ -41,32 +40,21 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Vector;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.gbean.WaitingException;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.system.serverinfo.ServerInfo;
-/*
-import org.bouncycastle.asn1.ASN1Set;
-import org.bouncycastle.asn1.DEROutputStream;
-import org.bouncycastle.asn1.x509.X509Name;
-import org.bouncycastle.jce.PKCS10CertificationRequest;
-import org.bouncycastle.jce.X509Principal;
-import org.bouncycastle.jce.X509V1CertificateGenerator;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.encoders.Base64;
-*/
 import org.apache.geronimo.util.asn1.ASN1Set;
 import org.apache.geronimo.util.asn1.DEROutputStream;
 import org.apache.geronimo.util.asn1.x509.X509Name;
+import org.apache.geronimo.util.encoders.Base64;
 import org.apache.geronimo.util.jce.PKCS10CertificationRequest;
 import org.apache.geronimo.util.jce.X509Principal;
 import org.apache.geronimo.util.jce.X509V1CertificateGenerator;
-import org.apache.geronimo.util.encoders.Base64;
-import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 
 public class KeyStoreGBean implements GBeanLifecycle {
 
@@ -101,7 +89,7 @@
         InputStream is = null;
 
         try {
-            log.info("loading keystore from "
+            log.debug("loading keystore from "
                     + serverInfo.resolvePath(this.keyStoreLocation));
             is = new java.io.FileInputStream(serverInfo
                     .resolvePath(this.keyStoreLocation));

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=351845&r1=351844&r2=351845&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/var/log/server-log4j.properties (original)
+++ geronimo/trunk/modules/assembly/src/var/log/server-log4j.properties Fri Dec  2 14:34:16 2005
@@ -49,15 +49,50 @@
 #
 #log4j.category.foo.bar=TRACE#org.apache.geronimo.system.logging.log4j.XLevel
 
-# Suppress warnings that DB is already initialized; remove this if that output is removed from ActiveMQ
-log4j.category.org.activemq.store.jdbc.adapter.DefaultJDBCAdapter=ERROR
 
+#### Eliminate any INFO level output during normal operation -- except the really relevant stuff ####
+#    We can change the Geronimo code to avoid this, but we have to just adjust the log levels for
+#    any third-party libraries.
 log4j.category.org.apache.commons.digester=ERROR
 
+# ActiveMQ
+log4j.category.org.activemq.store.jdbc.adapter.DefaultJDBCAdapter=WARN
+log4j.category.org.activemq.store.jdbc.JDBCPersistenceAdapter=WARN
+log4j.category.org.activemq.store.journal.JournalPersistenceAdapter=WARN
+log4j.category.org.activemq.broker.impl.BrokerContainerImpl=WARN
+log4j.category.org.activemq.broker.impl.BrokerConnectorImpl=WARN
+log4j.category.org.activemq.transport.tcp.TcpTransportServerChannel=WARN
+log4j.category.org.activemq.transport.vm.VmTransportServerChannel=WARN
+
 # Don't need so much info on every web page that's rendered
 log4j.category.org.mortbay=INFO
 log4j.category.org.apache.pluto=INFO
 log4j.category.org.apache.jasper=INFO
 
+# Various Jetty startup 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.jetty.servlet.WebApplicationContext=WARN
+
+# Various Tomcat startup output
+log4j.category.org.apache.catalina.realm.JAASRealm=WARN
+log4j.category.org.apache.catalina.realm.RealmBase=WARN
+log4j.category.org.apache.catalina.loader.WebappLoader=WARN
+log4j.category.org.apache.catalina.startup.Embedded=WARN
+log4j.category.org.apache.catalina.core.StandardEngine=WARN
+log4j.category.org.apache.catalina.core.StandardHost=WARN
+log4j.category.org.apache.jk.common.ChannelSocket=WARN
+log4j.category.org.apache.jk.server.JkMain=WARN
+log4j.category.org.apache.coyote.http11.Http11BaseProtocol=WARN
+
 # Emits a spurious WARN during startup on /some-path/* security mappings
 log4j.category.org.apache.catalina.deploy.SecurityCollection=ERROR
+
+# Prints the MBean Server ID
+log4j.category.javax.management.MBeanServerFactory=WARN
+
+# Prints the RMI connection URL
+log4j.category.javax.management.remote.rmi.RMIConnectorServer=WARN
+log4j.category.javax.management.remote.JMXServiceURL=WARN

Modified: geronimo/trunk/modules/derby/src/java/org/apache/geronimo/derby/DerbyNetworkGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/derby/src/java/org/apache/geronimo/derby/DerbyNetworkGBean.java?rev=351845&r1=351844&r2=351845&view=diff
==============================================================================
--- geronimo/trunk/modules/derby/src/java/org/apache/geronimo/derby/DerbyNetworkGBean.java (original)
+++ geronimo/trunk/modules/derby/src/java/org/apache/geronimo/derby/DerbyNetworkGBean.java Fri Dec  2 14:34:16 2005
@@ -66,7 +66,7 @@
         InetAddress address = InetAddress.getByName(host);
         network = new NetworkServerControl(address, port);
         network.start(null); // todo work out how to add this to our log stream
-        log.info("Started on host " + host + ':' + port);
+        log.debug("Started on host " + host + ':' + port);
     }
 
     public void doStop() throws Exception {
@@ -77,7 +77,7 @@
                 network = null;
             }
         }
-        log.info("Stopped");
+        log.debug("Stopped");
     }
 
     public void doFail() {

Modified: geronimo/trunk/modules/derby/src/java/org/apache/geronimo/derby/DerbySystemGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/derby/src/java/org/apache/geronimo/derby/DerbySystemGBean.java?rev=351845&r1=351844&r2=351845&view=diff
==============================================================================
--- geronimo/trunk/modules/derby/src/java/org/apache/geronimo/derby/DerbySystemGBean.java (original)
+++ geronimo/trunk/modules/derby/src/java/org/apache/geronimo/derby/DerbySystemGBean.java Fri Dec  2 14:34:16 2005
@@ -60,7 +60,7 @@
 
         // load the Embedded driver to initialize the home
         new org.apache.derby.jdbc.EmbeddedDriver();
-        log.info("Started in " + actualHome);
+        log.debug("Started in " + actualHome);
     }
 
     public void doStop() throws Exception {
@@ -70,7 +70,7 @@
             // SQLException gets thrown on successful shutdown so ignore
         }
         System.gc();  // Added per recommendation Derby documentation
-	log.info("Stopped");
+        log.debug("Stopped");
     }
 
     public void doFail() {
@@ -80,7 +80,7 @@
             // SQLException gets thrown on successful shutdown so ignore
         }
         System.gc();  // Added per recommendation Derby documentation
-        log.info("Failed");
+        log.warn("Failed");
     }
 
     public static final GBeanInfo GBEAN_INFO;

Modified: geronimo/trunk/modules/directory/src/java/org/apache/geronimo/directory/DirectoryGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/directory/src/java/org/apache/geronimo/directory/DirectoryGBean.java?rev=351845&r1=351844&r2=351845&view=diff
==============================================================================
--- geronimo/trunk/modules/directory/src/java/org/apache/geronimo/directory/DirectoryGBean.java (original)
+++ geronimo/trunk/modules/directory/src/java/org/apache/geronimo/directory/DirectoryGBean.java Fri Dec  2 14:34:16 2005
@@ -18,25 +18,16 @@
 package org.apache.geronimo.directory;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.net.InetAddress;
-import java.util.HashSet;
-import java.util.Hashtable;
 import java.util.Properties;
-import java.util.Set;
-
 import javax.naming.Context;
-import javax.naming.directory.BasicAttribute;
-import javax.naming.directory.BasicAttributes;
 import javax.naming.directory.InitialDirContext;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.system.serverinfo.ServerInfo;
-import org.apache.ldap.server.configuration.MutableContextPartitionConfiguration;
 import org.apache.ldap.server.configuration.ShutdownConfiguration;
 import org.apache.ldap.server.jndi.CoreContextFactory;
 
@@ -162,7 +153,7 @@
     }
 
     public void doFail() {
-        log.info("Service failed");
+        log.warn("Service failed");
         //Insert failure code here
     }
 
@@ -186,7 +177,7 @@
     }
     
     public void doStart() throws Exception {
-        log.info("Starting LDAP Directory service");
+        log.debug("Starting LDAP Directory service");
         
         MutableServerStartupConfiguration startup = new MutableServerStartupConfiguration();
         // put some mandatory JNDI properties here
@@ -216,11 +207,11 @@
         
         //Set it back
         Thread.currentThread().setContextClassLoader(oldCL);
-        log.info("LDAP Directory service started.");
+        log.debug("LDAP Directory service started.");
     }
 
     public void doStop() throws Exception {
-        log.info("Stopping LDAP Directory service");
+        log.debug("Stopping LDAP Directory service");
         //Insert stopping code here
         Properties env = new Properties();
         env.putAll(new ShutdownConfiguration().toJndiEnvironment());

Modified: geronimo/trunk/modules/directory/src/java/org/apache/geronimo/directory/ServerContextFactory.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/directory/src/java/org/apache/geronimo/directory/ServerContextFactory.java?rev=351845&r1=351844&r2=351845&view=diff
==============================================================================
--- geronimo/trunk/modules/directory/src/java/org/apache/geronimo/directory/ServerContextFactory.java (original)
+++ geronimo/trunk/modules/directory/src/java/org/apache/geronimo/directory/ServerContextFactory.java Fri Dec  2 14:34:16 2005
@@ -56,58 +56,43 @@
  * @version $Rev: 233391 $ $Date: 2005-08-18 16:38:47 -0600 (Thu, 18 Aug 2005) $
  * @see javax.naming.spi.InitialContextFactory
  */
-public class ServerContextFactory extends CoreContextFactory
-{
+public class ServerContextFactory extends CoreContextFactory {
     private static final Log log = LogFactory.getLog(ServerContextFactory.class);
     private static Service ldapService;
     private static Service kerberosService;
     private static ServiceRegistry minaRegistry;
 
-    protected ServiceRegistry getMinaRegistry()
-    {
+    protected ServiceRegistry getMinaRegistry() {
         return minaRegistry;
     }
 
-    public void afterShutdown( ContextFactoryService service )
-    {
-        if ( minaRegistry != null )
-        {
-            if ( ldapService != null )
-            {
-                minaRegistry.unbind( ldapService );
-                if ( log.isInfoEnabled() )
-                {
-                    log.info( "Unbind of LDAP Service complete: " + ldapService );
-                }
+    public void afterShutdown(ContextFactoryService service) {
+        if (minaRegistry != null) {
+            if (ldapService != null) {
+                minaRegistry.unbind(ldapService);
+                log.debug("Unbind of LDAP Service complete: " + ldapService);
                 ldapService = null;
             }
 
-            if ( kerberosService != null )
-            {
-                minaRegistry.unbind( kerberosService );
-                if ( log.isInfoEnabled() )
-                {
-                    log.info( "Unbind of KRB5 Service complete: " + kerberosService );
-                }
+            if (kerberosService != null) {
+                minaRegistry.unbind(kerberosService);
+                log.debug("Unbind of KRB5 Service complete: " + kerberosService);
                 kerberosService = null;
             }
         }
     }
-    
-    public void afterStartup( ContextFactoryService service ) throws NamingException
-    {
+
+    public void afterStartup(ContextFactoryService service) throws NamingException {
         ServerStartupConfiguration cfg =
-            ( ServerStartupConfiguration ) service.getConfiguration().getStartupConfiguration();
+                (ServerStartupConfiguration) service.getConfiguration().getStartupConfiguration();
         Hashtable env = service.getConfiguration().getEnvironment();
 
-        if ( cfg.isEnableNetworking() )
-        {
-            setupRegistry( cfg );
-            startLdapProtocol( cfg, env );
-
-            if ( cfg.isEnableKerberos() )
-            {
-                startKerberosProtocol( env );
+        if (cfg.isEnableNetworking()) {
+            setupRegistry(cfg);
+            startLdapProtocol(cfg, env);
+
+            if (cfg.isEnableKerberos()) {
+                startKerberosProtocol(env);
             }
         }
     }
@@ -115,8 +100,7 @@
     /**
      * Starts up the MINA registry so various protocol providers can be started.
      */
-    private void setupRegistry( ServerStartupConfiguration cfg )
-    {
+    private void setupRegistry(ServerStartupConfiguration cfg) {
         minaRegistry = cfg.getMinaServiceRegistry();
     }
 
@@ -126,45 +110,37 @@
      *
      * @throws NamingException if there are problems starting up the Kerberos provider
      */
-    private void startKerberosProtocol( Hashtable env ) throws NamingException
-    {
+    private void startKerberosProtocol(Hashtable env) throws NamingException {
         /*
          * Looks like KdcConfiguration takes properties and we use Hashtable for JNDI
          * so I'm copying over the String based properties into a new Properties obj.
          */
         Properties props = new Properties();
         Iterator list = env.keySet().iterator();
-        while ( list.hasNext() )
-        {
-            String key = ( String ) list.next();
-
-            if ( env.get( key ) instanceof String )
-            {
-                props.setProperty( key, ( String ) env.get( key ) );
+        while (list.hasNext()) {
+            String key = (String) list.next();
+
+            if (env.get(key) instanceof String) {
+                props.setProperty(key, (String) env.get(key));
             }
         }
 
         // construct the configuration, get the port, create the service, and prepare kdc objects
-        KdcConfiguration config = new KdcConfiguration( props );
-        int port = PropertiesUtils.get( env, KdcConfiguration.KERBEROS_PORT_KEY, KdcConfiguration.DEFAULT_KERBEROS_PORT );
-        Service service= new Service( "kerberos", TransportType.DATAGRAM, new InetSocketAddress( port ) );
-        LdapContext ctx = getBaseRealmContext( config, env );
-        PrincipalStore store = new JndiPrincipalStoreImpl( ctx, new LdapName( "ou=Users" ) );
-        SamSubsystem.getInstance().setUserContext( ( DirContext ) ctx, "ou=Users" );
-
-        try
-        {
-            minaRegistry.bind( service, new KerberosProtocolProvider( config, store ) );
+        KdcConfiguration config = new KdcConfiguration(props);
+        int port = PropertiesUtils.get(env, KdcConfiguration.KERBEROS_PORT_KEY, KdcConfiguration.DEFAULT_KERBEROS_PORT);
+        Service service = new Service("kerberos", TransportType.DATAGRAM, new InetSocketAddress(port));
+        LdapContext ctx = getBaseRealmContext(config, env);
+        PrincipalStore store = new JndiPrincipalStoreImpl(ctx, new LdapName("ou=Users"));
+        SamSubsystem.getInstance().setUserContext((DirContext) ctx, "ou=Users");
+
+        try {
+            minaRegistry.bind(service, new KerberosProtocolProvider(config, store));
             kerberosService = service;
-            if ( log.isInfoEnabled() )
-            {
-                log.info( "Successful bind of KRB5 Service completed: " + kerberosService );
-            }
+            log.debug("Successful bind of KRB5 Service completed: " + kerberosService);
         }
-        catch ( IOException e )
-        {
-            log.error( "Could not start the kerberos service on port " +
-                    KdcConfiguration.DEFAULT_KERBEROS_PORT, e );
+        catch (IOException e) {
+            log.error("Could not start the kerberos service on port " +
+                    KdcConfiguration.DEFAULT_KERBEROS_PORT, e);
         }
     }
 
@@ -174,22 +150,18 @@
      * the KDC will use this area for configuration and for storing user entries.
      *
      * @param config the KDC's configuration
-     * @param env the JNDI environment properties
+     * @param env    the JNDI environment properties
      * @return the base context for the primary realm of the KDC
      * @throws NamingException
      */
-    private LdapContext getBaseRealmContext( KdcConfiguration config, Hashtable env ) throws NamingException
-    {
-        Hashtable cloned = ( Hashtable ) env.clone();
-        String dn = NamespaceTools.inferLdapName( config.getPrimaryRealm() );
-        cloned.put( Context.PROVIDER_URL, dn );
-
-        if ( log.isInfoEnabled() )
-        {
-            log.info( "Getting initial context for realm base at " + dn + " for " + config.getPrimaryRealm() );
-        }
+    private LdapContext getBaseRealmContext(KdcConfiguration config, Hashtable env) throws NamingException {
+        Hashtable cloned = (Hashtable) env.clone();
+        String dn = NamespaceTools.inferLdapName(config.getPrimaryRealm());
+        cloned.put(Context.PROVIDER_URL, dn);
 
-        return new InitialLdapContext( cloned, new Control[]{} );
+        log.debug("Getting initial context for realm base at " + dn + " for " + config.getPrimaryRealm());
+
+        return new InitialLdapContext(cloned, new Control[]{});
     }
 
 
@@ -198,28 +170,22 @@
      *
      * @throws NamingException if there are problems starting the LDAP provider
      */
-    private void startLdapProtocol( ServerStartupConfiguration cfg, Hashtable env ) throws NamingException
-    {
+    private void startLdapProtocol(ServerStartupConfiguration cfg, Hashtable env) throws NamingException {
         int port = cfg.getLdapPort();
         InetAddress host = cfg.getHost();
-        Service service = new Service( "ldap", TransportType.SOCKET, new InetSocketAddress( host, port ) );
+        Service service = new Service("ldap", TransportType.SOCKET, new InetSocketAddress(host, port));
 //        Service service = new Service( "ldap", TransportType.SOCKET, new InetSocketAddress( port ) );
 
-        try
-        {
-            minaRegistry.bind( service, new LdapProtocolProvider( ( Hashtable ) env.clone() ) );
+        try {
+            minaRegistry.bind(service, new LdapProtocolProvider((Hashtable) env.clone()));
             ldapService = service;
-            if ( log.isInfoEnabled() )
-            {
-                log.info( "Successful bind of LDAP Service completed: " + ldapService );
-            }
+            log.debug("Successful bind of LDAP Service completed: " + ldapService);
         }
-        catch ( IOException e )
-        {
+        catch (IOException e) {
             String msg = "Failed to bind the LDAP protocol service to the service registry: " + service;
-            LdapConfigurationException lce = new LdapConfigurationException( msg );
-            lce.setRootCause( e );
-            log.error( msg, e );
+            LdapConfigurationException lce = new LdapConfigurationException(msg);
+            lce.setRootCause(e);
+            log.error(msg, e);
             throw lce;
         }
     }

Modified: geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java?rev=351845&r1=351844&r2=351845&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java (original)
+++ geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java Fri Dec  2 14:34:16 2005
@@ -336,7 +336,7 @@
         //super.doStart sets welcomefiles to null!!
         setWelcomeFiles(welcomeFiles);
 
-        log.info("JettyWebAppContext started");
+        log.debug("JettyWebAppContext started");
     }
 
     public void doStop() throws Exception {
@@ -360,7 +360,7 @@
         // No more logging will occur for this ClassLoader. Inform the LogFactory to avoid a memory leak.
         LogFactory.release(webClassLoader);
 
-        log.info("JettyWebAppContext stopped");
+        log.debug("JettyWebAppContext stopped");
     }
 
     public void doFail() {
@@ -370,7 +370,7 @@
         } catch (InterruptedException e) {
         }
 
-        log.info("JettyWebAppContext failed");
+        log.warn("JettyWebAppContext failed");
     }
 
 

Modified: geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/basic/BasicKernel.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/basic/BasicKernel.java?rev=351845&r1=351844&r2=351845&view=diff
==============================================================================
--- geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/basic/BasicKernel.java (original)
+++ geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/basic/BasicKernel.java Fri Dec  2 14:34:16 2005
@@ -23,10 +23,8 @@
 import java.util.LinkedList;
 import java.util.Map;
 import java.util.Set;
-import java.util.Collections;
-import javax.management.ObjectName;
 import javax.management.MalformedObjectNameException;
-
+import javax.management.ObjectName;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.gbean.GBeanData;
@@ -333,7 +331,7 @@
         }
         bootTime = new Date();
         log = LogFactory.getLog(BasicKernel.class.getName());
-        log.info("Starting boot");
+        log.debug("Starting boot");
 
         // todo cleanup when boot fails
         KernelRegistry.registerKernel(this);
@@ -351,7 +349,7 @@
         startGBean(KERNEL);
 
         running = true;
-        log.info("Booted");
+        log.debug("Booted");
     }
 
     public Date getBootTime() {
@@ -380,7 +378,7 @@
             return;
         }
         running = false;
-        log.info("Starting kernel shutdown");
+        log.debug("Starting kernel shutdown");
 
         notifyShutdownHooks();
 
@@ -395,7 +393,7 @@
 
         KernelRegistry.unregisterKernel(this);
 
-        log.info("Kernel shutdown complete");
+        log.debug("Kernel shutdown complete");
     }
 
     private void notifyShutdownHooks() {

Modified: geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/Configuration.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/Configuration.java?rev=351845&r1=351844&r2=351845&view=diff
==============================================================================
--- geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/Configuration.java (original)
+++ geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/Configuration.java Fri Dec  2 14:34:16 2005
@@ -279,7 +279,7 @@
             configurationClassLoader = new MultiParentClassLoader(id, urls, getClassLoaders(parentId), inverseClassLoading, hiddenClasses, nonOverridableClasses);
         }
 
-        log.info("Started configuration " + id);
+        log.debug("Started configuration " + id);
     }
 
     public void loadGBeans(ManageableAttributeStore attributeStore) throws InvalidConfigException, GBeanAlreadyExistsException {
@@ -402,7 +402,7 @@
     }
 
     public synchronized void doStop() throws Exception {
-        log.info("Stopping configuration " + id);
+        log.debug("Stopping configuration " + id);
         // shutdown the configuration and unload all beans
         shutdown();
 
@@ -583,7 +583,7 @@
         try {
             gbeanState = storeGBeans(gbeans);
         } catch (InvalidConfigException e) {
-            log.info("Unable to update persistent state during shutdown", e);
+            log.warn("Unable to update persistent state during shutdown", e);
         }
         return gbeans;
     }

Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/SecurityServiceImpl.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/SecurityServiceImpl.java?rev=351845&r1=351844&r2=351845&view=diff
==============================================================================
--- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/SecurityServiceImpl.java (original)
+++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/SecurityServiceImpl.java Fri Dec  2 14:34:16 2005
@@ -17,20 +17,19 @@
 
 package org.apache.geronimo.security;
 
+import java.security.Policy;
+import javax.security.jacc.PolicyConfigurationFactory;
+import javax.security.jacc.PolicyContextException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.security.jacc.PolicyContextHandlerContainerSubject;
 import org.apache.geronimo.security.jacc.PolicyContextHandlerHttpServletRequest;
 import org.apache.geronimo.security.jacc.PolicyContextHandlerSOAPMessage;
 import org.apache.geronimo.security.util.ConfigurationUtil;
 import org.apache.geronimo.system.serverinfo.ServerInfo;
-import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-
-import javax.security.jacc.PolicyConfigurationFactory;
-import javax.security.jacc.PolicyContextException;
-import java.security.Policy;
 
 
 /**
@@ -94,7 +93,7 @@
         log.debug(KEYSTORE + ": " + System.getProperty(KEYSTORE));
         log.debug(TRUSTSTORE + ": " + System.getProperty(TRUSTSTORE));
 
-        log.info("JACC factory registered");
+        log.debug("JACC factory registered");
     }
 
     private String sysOverRide(String attribute, String sysVar) {

Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/GeronimoLoginConfiguration.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/GeronimoLoginConfiguration.java?rev=351845&r1=351844&r2=351845&view=diff
==============================================================================
--- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/GeronimoLoginConfiguration.java (original)
+++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/GeronimoLoginConfiguration.java Fri Dec  2 14:34:16 2005
@@ -101,7 +101,7 @@
         ConfigurationEntryFactory factory = (ConfigurationEntryFactory) event.getMember();
 
         entries.remove(factory.getConfigurationName());
-        log.info("Removed Application Configuration Entry " + factory.getConfigurationName());
+        log.debug("Removed Application Configuration Entry " + factory.getConfigurationName());
     }
 
     private final void addConfiguration(ConfigurationEntryFactory factory) {
@@ -115,7 +115,7 @@
         AppConfigurationEntry ace = new AppConfigurationEntry(config.getLoginModuleClassName(), config.getFlag().getFlag(), config.getOptions());
 
         entries.put(factory.getConfigurationName(), ace);
-        log.info("Added Application Configuration Entry " + factory.getConfigurationName());
+        log.debug("Added Application Configuration Entry " + factory.getConfigurationName());
     }
 
     public void doStart() throws Exception {
@@ -125,23 +125,23 @@
             oldConfiguration = null;
         }
         Configuration.setConfiguration(this);
-        log.info("Installed Geronimo login configuration");
+        log.debug("Installed Geronimo login configuration");
     }
 
     public void doStop() throws Exception {
         Configuration.setConfiguration(oldConfiguration);
 
         for (Iterator iter = entries.keySet().iterator(); iter.hasNext();){
-            log.info("Removed Application Configuration Entry " + iter.next());
+            log.debug("Removed Application Configuration Entry " + iter.next());
         }
         entries.clear();
 
-        log.info("Uninstalled Geronimo login configuration");
+        log.debug("Uninstalled Geronimo login configuration");
     }
 
     public void doFail() {
         Configuration.setConfiguration(oldConfiguration);
-        log.info("Uninstalled Geronimo login configuration");
+        log.debug("Uninstalled Geronimo login configuration");
     }
 
     public static GBeanInfo getGBeanInfo() {

Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingServer.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingServer.java?rev=351845&r1=351844&r2=351845&view=diff
==============================================================================
--- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingServer.java (original)
+++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingServer.java Fri Dec  2 14:34:16 2005
@@ -17,6 +17,11 @@
 
 package org.apache.geronimo.security.remoting.jmx;
 
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.URI;
+import java.net.URISyntaxException;
+import javax.management.ObjectName;
 import org.activeio.AcceptListener;
 import org.activeio.AsyncChannelServer;
 import org.activeio.Channel;
@@ -41,12 +46,6 @@
 import org.apache.geronimo.proxy.ReflexiveInterceptor;
 import org.apache.geronimo.security.jaas.server.JaasLoginServiceMBean;
 
-import javax.management.ObjectName;
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.URI;
-import java.net.URISyntaxException;
-
 
 /**
  * A server-side utility that exposes a JaasLoginService to remote clients.
@@ -128,7 +127,7 @@
                     requestChannel.setRequestListener(invoker);
                     requestChannel.start();
                 } catch (IOException e) {
-                    log.info("Failed to accept connection.", e);
+                    log.warn("Failed to accept connection.", e);
                     if (requestChannel != null)
                         requestChannel.dispose();
                     else
@@ -137,12 +136,12 @@
             }
 
             public void onAcceptError(IOException error) {
-                log.info("Accept Failed: " + error);
+                log.warn("Accept Failed: " + error);
             }
         });
 
         server.start();
-        log.info("Remote login service started on: " + server.getConnectURI() + " clients can connect to: " + server.getConnectURI());
+        log.debug("Remote login service started on: " + server.getConnectURI() + " clients can connect to: " + server.getConnectURI());
     }
 
     private AsyncChannelServer createAsyncChannelServer() throws IOException, URISyntaxException {
@@ -167,7 +166,7 @@
     public void doStop() {
         server.dispose();
         server = null;
-        log.info("Stopped remote login service.");
+        log.debug("Stopped remote login service.");
     }
 
     public void doFail() {
@@ -175,7 +174,7 @@
             server.dispose();
             server = null;
         }
-        log.info("Failed remote login service.");
+        log.warn("Failed remote login service.");
     }
 
     public static final GBeanInfo GBEAN_INFO;

Modified: geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java?rev=351845&r1=351844&r2=351845&view=diff
==============================================================================
--- geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java (original)
+++ geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java Fri Dec  2 14:34:16 2005
@@ -16,28 +16,6 @@
  */
 package org.apache.geronimo.system.configuration;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.common.propertyeditor.PropertyEditors;
-import org.apache.geronimo.gbean.GAttributeInfo;
-import org.apache.geronimo.gbean.GBeanData;
-import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoBuilder;
-import org.apache.geronimo.gbean.GBeanLifecycle;
-import org.apache.geronimo.gbean.GReferenceInfo;
-import org.apache.geronimo.kernel.config.InvalidConfigException;
-import org.apache.geronimo.kernel.config.ManageableAttributeStore;
-import org.apache.geronimo.kernel.config.PersistentConfigurationList;
-import org.apache.geronimo.system.serverinfo.ServerInfo;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
 import java.beans.PropertyEditor;
 import java.io.File;
 import java.io.FileInputStream;
@@ -53,9 +31,30 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.Timer;
 import java.util.TimerTask;
-import java.util.Set;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.common.propertyeditor.PropertyEditors;
+import org.apache.geronimo.gbean.GAttributeInfo;
+import org.apache.geronimo.gbean.GBeanData;
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.gbean.GBeanLifecycle;
+import org.apache.geronimo.gbean.GReferenceInfo;
+import org.apache.geronimo.kernel.config.InvalidConfigException;
+import org.apache.geronimo.kernel.config.ManageableAttributeStore;
+import org.apache.geronimo.kernel.config.PersistentConfigurationList;
+import org.apache.geronimo.system.serverinfo.ServerInfo;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
 
 /**
  * Stores managed attributes in an XML file on the local filesystem.
@@ -418,7 +417,7 @@
         if (!readOnly) {
             timer = new Timer();
         }
-        log.info("Started LocalAttributeManager with data on " + serverOverride.getConfigurations().size() + " configurations");
+        log.debug("Started LocalAttributeManager with data on " + serverOverride.getConfigurations().size() + " configurations");
     }
 
     public synchronized void doStop() throws Exception {
@@ -435,7 +434,7 @@
         if (doSave) {
             save();
         }
-        log.info("Stopped LocalAttributeManager with data on " + serverOverride.getConfigurations().size() + " configurations");
+        log.debug("Stopped LocalAttributeManager with data on " + serverOverride.getConfigurations().size() + " configurations");
         serverOverride = new ServerOverride();
     }
 

Modified: geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/LocalConfigStore.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/LocalConfigStore.java?rev=351845&r1=351844&r2=351845&view=diff
==============================================================================
--- geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/LocalConfigStore.java (original)
+++ geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/LocalConfigStore.java Fri Dec  2 14:34:16 2005
@@ -202,7 +202,7 @@
             saveIndex();
         }
 
-        log.info("Installed configuration (URL) " + configId + " in location " + configurationDir.getName());
+        log.debug("Installed configuration (URL) " + configId + " in location " + configurationDir.getName());
         return config;
     }
 
@@ -222,7 +222,7 @@
             saveIndex();
         }
 
-        log.info("Installed configuration (file) " + configurationData.getId() + " in location " + source.getName());
+        log.debug("Installed configuration (file) " + configurationData.getId() + " in location " + source.getName());
     }
 
     public void uninstall(URI configID) throws NoSuchConfigException, IOException {
@@ -241,7 +241,7 @@
             index.remove(id);
             saveIndex();
         }
-        log.info("Uninstalled configuration " + configID);
+        log.debug("Uninstalled configuration " + configID);
         delete(configDir);
     }
 
@@ -263,7 +263,7 @@
             throw new InvalidConfigException("Unable to register configuration", e);
         }
 
-        log.info("Loaded Configuration " + name);
+        log.debug("Loaded Configuration " + name);
 
         return name;
     }
@@ -295,7 +295,7 @@
                     configs.add(new ConfigurationInfo(objectName, configId, state, type));
                 } catch (Exception e) {
                     // bad configuration in store - ignored for this purpose
-                    log.info("Unable get configuration info for configuration " + configId, e);
+                    log.warn("Unable get configuration info for configuration " + configId, e);
                 }
             }
         }

Modified: geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/main/Daemon.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/main/Daemon.java?rev=351845&r1=351844&r2=351845&view=diff
==============================================================================
--- geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/main/Daemon.java (original)
+++ geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/main/Daemon.java Fri Dec  2 14:34:16 2005
@@ -179,7 +179,7 @@
             GeronimoEnvironment.init();
 
             // This MUST be done before the first log is acquired (WHICH THE STARTUP MONITOR 5 LINES LATER DOES!)
-            GeronimoLogging.initialize(verboseArg == null ? GeronimoLogging.WARN : verboseArg == ARGUMENT_VERBOSE ? GeronimoLogging.INFO : GeronimoLogging.DEBUG);
+            GeronimoLogging.initialize(verboseArg == null ? GeronimoLogging.WARN : verboseArg.equals(ARGUMENT_VERBOSE) ? GeronimoLogging.INFO : GeronimoLogging.DEBUG);
             log = LogFactory.getLog(Daemon.class.getName());
         }
 

Modified: geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/repository/ReadOnlyRepository.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/repository/ReadOnlyRepository.java?rev=351845&r1=351844&r2=351845&view=diff
==============================================================================
--- geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/repository/ReadOnlyRepository.java (original)
+++ geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/repository/ReadOnlyRepository.java Fri Dec  2 14:34:16 2005
@@ -86,7 +86,7 @@
         if (rootURI == null) {
             rootURI = serverInfo.resolve(root);
         }
-        log.info("Repository root is " + rootURI);
+        log.debug("Repository root is " + rootURI);
     }
 
     public void doStop() throws Exception {

Modified: geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/rmi/RMIRegistryService.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/rmi/RMIRegistryService.java?rev=351845&r1=351844&r2=351845&view=diff
==============================================================================
--- geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/rmi/RMIRegistryService.java (original)
+++ geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/rmi/RMIRegistryService.java Fri Dec  2 14:34:16 2005
@@ -56,12 +56,12 @@
     public void doStart() throws Exception {
         System.setProperty("java.rmi.server.RMIClassLoaderSpi",RMIClassLoaderSpiImpl.class.getName());
         registry = LocateRegistry.createRegistry(port);
-        log.info("Started RMI Registry on port " + port);
+        log.debug("Started RMI Registry on port " + port);
     }
 
     public void doStop() throws Exception {
         UnicastRemoteObject.unexportObject(registry, true);
-        log.info("Stopped RMI Registry");
+        log.debug("Stopped RMI Registry");
     }
 
     public void doFail() {

Modified: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/ConnectorGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/ConnectorGBean.java?rev=351845&r1=351844&r2=351845&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/ConnectorGBean.java (original)
+++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/ConnectorGBean.java Fri Dec  2 14:34:16 2005
@@ -128,7 +128,7 @@
     public void doStart() throws LifecycleException {
         container.addConnector(connector);
         connector.start();
-        log.info(name + " connector started");
+        log.debug(name + " connector started");
    }
 
     public void doStop() {
@@ -138,11 +138,11 @@
             log.error(e);
         }
         container.removeConnector(connector);
-        log.info(name + " connector stopped");
+        log.debug(name + " connector stopped");
     }
 
     public void doFail() {
-        log.info(name + " connector failed");
+        log.warn(name + " connector failed");
         doStop();
     }
 

Modified: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/EngineGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/EngineGBean.java?rev=351845&r1=351844&r2=351845&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/EngineGBean.java (original)
+++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/EngineGBean.java Fri Dec  2 14:34:16 2005
@@ -19,13 +19,11 @@
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.Map;
-
 import org.apache.catalina.Cluster;
 import org.apache.catalina.Engine;
 import org.apache.catalina.Host;
 import org.apache.catalina.Realm;
 import org.apache.catalina.Valve;
-import org.apache.catalina.cluster.CatalinaCluster;
 import org.apache.catalina.core.StandardEngine;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -33,8 +31,8 @@
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.gbean.ReferenceCollection;
-import org.apache.geronimo.gbean.ReferenceCollectionListener;
 import org.apache.geronimo.gbean.ReferenceCollectionEvent;
+import org.apache.geronimo.gbean.ReferenceCollectionListener;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.tomcat.cluster.CatalinaClusterGBean;
 
@@ -145,15 +143,15 @@
     }
 
     public void doFail() {
-        log.info("Failed");
+        log.warn("Failed");
     }
 
     public void doStart() throws Exception {
-        log.info("Started");
+        log.debug("Started");
     }
 
     public void doStop() throws Exception {
-        log.info("Stopped");
+        log.debug("Stopped");
     }
 
     public static final GBeanInfo GBEAN_INFO;

Modified: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/HostGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/HostGBean.java?rev=351845&r1=351844&r2=351845&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/HostGBean.java (original)
+++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/HostGBean.java Fri Dec  2 14:34:16 2005
@@ -17,10 +17,8 @@
 package org.apache.geronimo.tomcat;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
-
 import org.apache.catalina.Cluster;
 import org.apache.catalina.Host;
 import org.apache.catalina.Realm;
@@ -113,15 +111,15 @@
     }
 
     public void doFail() {
-        log.info("Failed");
+        log.warn("Failed");
     }
 
     public void doStart() throws Exception {
-        log.info("Started host name '" + host.getName() + "'");
+        log.debug("Started host name '" + host.getName() + "'");
     }
 
     public void doStop() throws Exception {
-        log.info("Stopped host '" + host.getName() + "'");
+        log.debug("Stopped host '" + host.getName() + "'");
     }
 
     public static final GBeanInfo GBEAN_INFO;

Modified: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java?rev=351845&r1=351844&r2=351845&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java (original)
+++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java Fri Dec  2 14:34:16 2005
@@ -140,7 +140,7 @@
     public void doStart() throws Exception {
         log.debug("doStart()");
 
-        log.info("Endorsed Dirs set to:" + System.getProperty("java.endorsed.dirs"));
+        log.debug("Endorsed Dirs set to:" + System.getProperty("java.endorsed.dirs"));
 
         // The comments are from the javadoc of the Embedded class
 

Modified: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/ValveGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/ValveGBean.java?rev=351845&r1=351844&r2=351845&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/ValveGBean.java (original)
+++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/ValveGBean.java Fri Dec  2 14:34:16 2005
@@ -72,15 +72,15 @@
     }
     
     public void doStart() throws Exception {
-        log.info(className + " started.");
+        log.debug(className + " started.");
     }
 
     public void doStop() throws Exception {
-        log.info(className + " stopped.");
+        log.debug(className + " stopped.");
     }
 
     public void doFail() {
-        log.info(className + " failed.");
+        log.warn(className + " failed.");
     }
 
     public Object getInternalObject() {

Modified: geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/log/HOWLLog.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/log/HOWLLog.java?rev=351845&r1=351844&r2=351845&view=diff
==============================================================================
--- geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/log/HOWLLog.java (original)
+++ geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/log/HOWLLog.java Fri Dec  2 14:34:16 2005
@@ -211,7 +211,7 @@
     public void doStart() throws Exception {
         started = true;
         setLogFileDir(logFileDir);
-        log.info("Initiating transaction manager recovery");
+        log.debug("Initiating transaction manager recovery");
         recovered = new HashMap();
 
         logger.open(null);
@@ -219,7 +219,7 @@
         ReplayListener replayListener = new GeronimoReplayListener(xidFactory, recovered);
         logger.replayActiveTx(replayListener);
 
-        log.info("In doubt transactions recovered from log");
+        log.debug("In doubt transactions recovered from log");
     }
 
     public void doStop() throws Exception {
@@ -363,7 +363,7 @@
 
                 Recovery.XidBranchesPair xidBranchesPair = new Recovery.XidBranchesPair(masterXid, tx);
                 recoveredTx.put(masterXid, xidBranchesPair);
-                log.info("recovered prepare record for master xid: " + masterXid);
+                log.debug("recovered prepare record for master xid: " + masterXid);
                 for (int i = 3; i < data.length; i += 2) {
                     byte[] branchBranchId = data[i];
                     String name = new String(data[i + 1]);
@@ -371,7 +371,7 @@
                     Xid branchXid = xidFactory.recover(formatId, globalId, branchBranchId);
                     TransactionBranchInfoImpl branchInfo = new TransactionBranchInfoImpl(branchXid, name);
                     xidBranchesPair.addBranch(branchInfo);
-                    log.info("recovered branch for resource manager, branchId " + name + ", " + branchXid);
+                    log.debug("recovered branch for resource manager, branchId " + name + ", " + branchXid);
                 }
             } else {
                 if(recordType != LogRecordType.END_OF_LOG) { // This value crops up every time the server is started



Mime
View raw message