You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by sp...@apache.org on 2006/08/31 15:36:07 UTC
svn commit: r438913 - in /geronimo/server/branches/sachin: ./
assemblies/geronimo-boilerplate-minimal/src/main/resources/var/log/
modules/geronimo-activation/src/test/java/org/apache/geronimo/activation/handlers/
modules/geronimo-connector/src/test/jav...
Author: sppatel
Date: Thu Aug 31 06:36:06 2006
New Revision: 438913
URL: http://svn.apache.org/viewvc?rev=438913&view=rev
Log:
merge from head
Added:
geronimo/server/branches/sachin/KEYS
- copied unchanged from r438847, geronimo/server/trunk/KEYS
Modified:
geronimo/server/branches/sachin/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/log/client-log4j.properties
geronimo/server/branches/sachin/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/log/server-log4j.properties
geronimo/server/branches/sachin/modules/geronimo-activation/src/test/java/org/apache/geronimo/activation/handlers/AbstractHandler.java
geronimo/server/branches/sachin/modules/geronimo-activation/src/test/java/org/apache/geronimo/activation/handlers/TextHtmlTest.java
geronimo/server/branches/sachin/modules/geronimo-activation/src/test/java/org/apache/geronimo/activation/handlers/TextPlainTest.java
geronimo/server/branches/sachin/modules/geronimo-activation/src/test/java/org/apache/geronimo/activation/handlers/TextXmlTest.java
geronimo/server/branches/sachin/modules/geronimo-connector/src/test/java/org/apache/geronimo/connector/work/PooledWorkManagerTest.java
geronimo/server/branches/sachin/modules/geronimo-j2ee/src/test/java/org/apache/geronimo/j2ee/management/Abstract77Test.java
geronimo/server/branches/sachin/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/log/BootstrapJdk14Log.java
geronimo/server/branches/sachin/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/log/BootstrapLog4jLog.java
geronimo/server/branches/sachin/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/log/GeronimoLogging.java
geronimo/server/branches/sachin/modules/geronimo-security/pom.xml
geronimo/server/branches/sachin/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java
geronimo/server/branches/sachin/pom.xml
Modified: geronimo/server/branches/sachin/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/log/client-log4j.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/log/client-log4j.properties?rev=438913&r1=438912&r2=438913&view=diff
==============================================================================
--- geronimo/server/branches/sachin/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/log/client-log4j.properties (original)
+++ geronimo/server/branches/sachin/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/log/client-log4j.properties Thu Aug 31 06:36:06 2006
@@ -16,7 +16,7 @@
## $Rev$ $Date$
##
-log4j.rootCategory=DEBUG, CONSOLE, FILE
+log4j.rootLogger=DEBUG, CONSOLE, FILE
log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
log4j.appender.CONSOLE.Threshold=INFO
@@ -47,4 +47,4 @@
#
# Example: enable trace messages from foo.bar category
#
-#log4j.category.foo.bar=TRACE#org.apache.geronimo.system.logging.log4j.XLevel
+#log4j.logger.foo.bar=TRACE#org.apache.geronimo.system.logging.log4j.XLevel
Modified: geronimo/server/branches/sachin/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/log/server-log4j.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/log/server-log4j.properties?rev=438913&r1=438912&r2=438913&view=diff
==============================================================================
--- geronimo/server/branches/sachin/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/log/server-log4j.properties (original)
+++ geronimo/server/branches/sachin/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/log/server-log4j.properties Thu Aug 31 06:36:06 2006
@@ -16,7 +16,7 @@
## $Rev$ $Date$
##
-log4j.rootCategory=INFO, CONSOLE, FILE
+log4j.rootLogger=INFO, CONSOLE, FILE
log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
log4j.appender.CONSOLE.Threshold=${org.apache.geronimo.log.ConsoleLogLevel}
@@ -47,74 +47,74 @@
#
# Example: enable trace messages from foo.bar category
#
-#log4j.category.foo.bar=TRACE#org.apache.geronimo.system.logging.log4j.XLevel
+#log4j.logger.foo.bar=TRACE#org.apache.geronimo.system.logging.log4j.XLevel
#### Show key debug messages in the log ####
-log4j.category.org.apache.geronimo.gbean.runtime.GBeanSingleReference=DEBUG
+log4j.logger.org.apache.geronimo.gbean.runtime.GBeanSingleReference=DEBUG
#### 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
-log4j.category.org.apache.jasper.compiler.SmapUtil=WARN
+log4j.logger.org.apache.commons.digester=ERROR
+log4j.logger.org.apache.jasper.compiler.SmapUtil=WARN
# ActiveMQ
-log4j.category.org.activemq.ActiveMQConnection=WARN
-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.TcpTransportChannel=ERROR
-log4j.category.org.activemq.transport.tcp.TcpTransportServerChannel=WARN
-log4j.category.org.activemq.transport.vm.VmTransportServerChannel=WARN
+log4j.logger.org.activemq.ActiveMQConnection=WARN
+log4j.logger.org.activemq.store.jdbc.adapter.DefaultJDBCAdapter=WARN
+log4j.logger.org.activemq.store.jdbc.JDBCPersistenceAdapter=WARN
+log4j.logger.org.activemq.store.journal.JournalPersistenceAdapter=WARN
+log4j.logger.org.activemq.broker.impl.BrokerContainerImpl=WARN
+log4j.logger.org.activemq.broker.impl.BrokerConnectorImpl=WARN
+log4j.logger.org.activemq.transport.tcp.TcpTransportChannel=ERROR
+log4j.logger.org.activemq.transport.tcp.TcpTransportServerChannel=WARN
+log4j.logger.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
+log4j.logger.org.mortbay=INFO
+log4j.logger.org.apache.pluto=INFO
+log4j.logger.org.apache.jasper=INFO
# Various Jetty startup/shutdown output
-log4j.category.org.mortbay.http.HttpServer=WARN
-log4j.category.org.mortbay.http.SocketListener=WARN
-log4j.category.org.mortbay.http.ajp.AJP13Listener=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
-log4j.category.org.mortbay.jetty.context=WARN
+log4j.logger.org.mortbay.http.HttpServer=WARN
+log4j.logger.org.mortbay.http.SocketListener=WARN
+log4j.logger.org.mortbay.http.ajp.AJP13Listener=WARN
+log4j.logger.org.mortbay.util.Container=WARN
+log4j.logger.org.mortbay.util.Credential=WARN
+log4j.logger.org.mortbay.util.ThreadedServer=WARN
+log4j.logger.org.mortbay.jetty.servlet.WebApplicationContext=WARN
+log4j.logger.org.mortbay.jetty.context=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
-log4j.category.org.apache.coyote.http11.Http11Protocol=WARN
-log4j.category.org.apache.catalina.core.ContainerBase=WARN
-log4j.category.org.apache.catalina.core.StandardContext=WARN
+log4j.logger.org.apache.catalina.realm.JAASRealm=WARN
+log4j.logger.org.apache.catalina.realm.RealmBase=WARN
+log4j.logger.org.apache.catalina.loader.WebappLoader=WARN
+log4j.logger.org.apache.catalina.startup.Embedded=WARN
+log4j.logger.org.apache.catalina.core.StandardEngine=WARN
+log4j.logger.org.apache.catalina.core.StandardHost=WARN
+log4j.logger.org.apache.jk.common.ChannelSocket=WARN
+log4j.logger.org.apache.jk.server.JkMain=WARN
+log4j.logger.org.apache.coyote.http11.Http11BaseProtocol=WARN
+log4j.logger.org.apache.coyote.http11.Http11Protocol=WARN
+log4j.logger.org.apache.catalina.core.ContainerBase=WARN
+log4j.logger.org.apache.catalina.core.StandardContext=WARN
# Emits a spurious WARN during startup on /some-path/* security mappings
-log4j.category.org.apache.catalina.deploy.SecurityCollection=ERROR
+log4j.logger.org.apache.catalina.deploy.SecurityCollection=ERROR
# Prints the MBean Server ID
-log4j.category.javax.management.MBeanServerFactory=WARN
+log4j.logger.javax.management.MBeanServerFactory=WARN
# Prints the RMI connection URL
-log4j.category.javax.management.remote.rmi.RMIConnectorServer=WARN
-log4j.category.javax.management.remote.JMXServiceURL=WARN
+log4j.logger.javax.management.remote.rmi.RMIConnectorServer=WARN
+log4j.logger.javax.management.remote.JMXServiceURL=WARN
# Prints various stuff during startup
-log4j.category.org.apache.juddi.registry.RegistryServlet=WARN
+log4j.logger.org.apache.juddi.registry.RegistryServlet=WARN
# Prints various stuff when the portal is used
-log4j.category.org.apache.pluto.portalImpl.Servlet=WARN
+log4j.logger.org.apache.pluto.portalImpl.Servlet=WARN
# Prints stuff for AJAX calls
-log4j.category.uk.ltd.getahead.dwr.impl.DefaultConfiguration=WARN
-log4j.category.uk.ltd.getahead.dwr.impl.ExecuteQuery=WARN
-log4j.category.uk.ltd.getahead.dwr.util.Logger=WARN
+log4j.logger.uk.ltd.getahead.dwr.impl.DefaultConfiguration=WARN
+log4j.logger.uk.ltd.getahead.dwr.impl.ExecuteQuery=WARN
+log4j.logger.uk.ltd.getahead.dwr.util.Logger=WARN
Modified: geronimo/server/branches/sachin/modules/geronimo-activation/src/test/java/org/apache/geronimo/activation/handlers/AbstractHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-activation/src/test/java/org/apache/geronimo/activation/handlers/AbstractHandler.java?rev=438913&r1=438912&r2=438913&view=diff
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-activation/src/test/java/org/apache/geronimo/activation/handlers/AbstractHandler.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-activation/src/test/java/org/apache/geronimo/activation/handlers/AbstractHandler.java Thu Aug 31 06:36:06 2006
@@ -24,12 +24,12 @@
import javax.activation.DataContentHandler;
import javax.activation.DataSource;
-import junit.framework.TestCase;
+import org.apache.geronimo.testsupport.TestSupport;
/**
* @version $Rev$ $Date$
*/
-public abstract class AbstractHandler extends TestCase {
+public abstract class AbstractHandler extends TestSupport {
protected DataContentHandler dch;
protected String mimeType;
Modified: geronimo/server/branches/sachin/modules/geronimo-activation/src/test/java/org/apache/geronimo/activation/handlers/TextHtmlTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-activation/src/test/java/org/apache/geronimo/activation/handlers/TextHtmlTest.java?rev=438913&r1=438912&r2=438913&view=diff
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-activation/src/test/java/org/apache/geronimo/activation/handlers/TextHtmlTest.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-activation/src/test/java/org/apache/geronimo/activation/handlers/TextHtmlTest.java Thu Aug 31 06:36:06 2006
@@ -32,6 +32,8 @@
}
protected void setUp() throws Exception {
+ super.setUp();
+
dch = new TextHtmlHandler();
}
}
Modified: geronimo/server/branches/sachin/modules/geronimo-activation/src/test/java/org/apache/geronimo/activation/handlers/TextPlainTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-activation/src/test/java/org/apache/geronimo/activation/handlers/TextPlainTest.java?rev=438913&r1=438912&r2=438913&view=diff
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-activation/src/test/java/org/apache/geronimo/activation/handlers/TextPlainTest.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-activation/src/test/java/org/apache/geronimo/activation/handlers/TextPlainTest.java Thu Aug 31 06:36:06 2006
@@ -32,6 +32,8 @@
}
protected void setUp() throws Exception {
+ super.setUp();
+
dch = new TextPlainHandler();
}
}
Modified: geronimo/server/branches/sachin/modules/geronimo-activation/src/test/java/org/apache/geronimo/activation/handlers/TextXmlTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-activation/src/test/java/org/apache/geronimo/activation/handlers/TextXmlTest.java?rev=438913&r1=438912&r2=438913&view=diff
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-activation/src/test/java/org/apache/geronimo/activation/handlers/TextXmlTest.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-activation/src/test/java/org/apache/geronimo/activation/handlers/TextXmlTest.java Thu Aug 31 06:36:06 2006
@@ -32,6 +32,8 @@
}
protected void setUp() throws Exception {
+ super.setUp();
+
dch = new TextXmlHandler();
}
}
Modified: geronimo/server/branches/sachin/modules/geronimo-connector/src/test/java/org/apache/geronimo/connector/work/PooledWorkManagerTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-connector/src/test/java/org/apache/geronimo/connector/work/PooledWorkManagerTest.java?rev=438913&r1=438912&r2=438913&view=diff
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-connector/src/test/java/org/apache/geronimo/connector/work/PooledWorkManagerTest.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-connector/src/test/java/org/apache/geronimo/connector/work/PooledWorkManagerTest.java Thu Aug 31 06:36:06 2006
@@ -236,22 +236,22 @@
public void workAccepted(WorkEvent e) {
acceptedEvent = e;
- log.debug("accepted" + e);
+ log.debug("accepted: " + e);
}
public void workRejected(WorkEvent e) {
rejectedEvent = e;
- log.debug("rejected" + e);
+ log.debug("rejected: " + e);
}
public void workStarted(WorkEvent e) {
startedEvent = e;
- log.debug("started" + e);
+ log.debug("started: " + e);
}
public void workCompleted(WorkEvent e) {
completedEvent = e;
- log.debug("completed" + e);
+ log.debug("completed: " + e);
}
}
}
Modified: geronimo/server/branches/sachin/modules/geronimo-j2ee/src/test/java/org/apache/geronimo/j2ee/management/Abstract77Test.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-j2ee/src/test/java/org/apache/geronimo/j2ee/management/Abstract77Test.java?rev=438913&r1=438912&r2=438913&view=diff
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-j2ee/src/test/java/org/apache/geronimo/j2ee/management/Abstract77Test.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-j2ee/src/test/java/org/apache/geronimo/j2ee/management/Abstract77Test.java Thu Aug 31 06:36:06 2006
@@ -49,10 +49,6 @@
import org.apache.geronimo.management.geronimo.J2EEApplication;
import org.apache.geronimo.management.geronimo.J2EEServer;
import org.apache.geronimo.management.geronimo.JVM;
-import org.apache.log4j.Logger;
-import org.apache.log4j.Level;
-import org.apache.log4j.ConsoleAppender;
-import org.apache.log4j.PatternLayout;
/**
* @version $Rev$ $Date$
@@ -90,8 +86,6 @@
}
protected void setUp() throws Exception {
- Logger.getRootLogger().setLevel(Level.WARN);
- Logger.getRootLogger().addAppender(new ConsoleAppender(new PatternLayout("%p [%t] %m %n")));
super.setUp();
kernel = KernelFactory.newInstance().createKernel(DOMAIN);
kernel.boot();
Modified: geronimo/server/branches/sachin/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/log/BootstrapJdk14Log.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/log/BootstrapJdk14Log.java?rev=438913&r1=438912&r2=438913&view=diff
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/log/BootstrapJdk14Log.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/log/BootstrapJdk14Log.java Thu Aug 31 06:36:06 2006
@@ -25,34 +25,38 @@
import org.apache.commons.logging.Log;
/**
+ * Bootstrap log implementation for use with JDK 1.4 logging.
+ *
* @version $Rev$ $Date$
*/
public class BootstrapJdk14Log implements Log {
static {
- Logger root = Logger.getLogger("");
+ if (GeronimoLogging.isBootstrapLoggingInitializationEnabled()) {
+ Logger root = Logger.getLogger("");
- GeronimoLogging geronimoLevel = GeronimoLogging.getDefaultLevel();
- Level javaLevel;
- if (geronimoLevel == GeronimoLogging.TRACE) {
- javaLevel = Level.FINEST;
- } else if (geronimoLevel == GeronimoLogging.DEBUG) {
- javaLevel = Level.FINE;
- } else if (geronimoLevel == GeronimoLogging.INFO) {
- javaLevel = Level.INFO;
- } else if (geronimoLevel == GeronimoLogging.WARN) {
- javaLevel = Level.WARNING;
- } else {
- javaLevel = Level.SEVERE;
- }
+ GeronimoLogging geronimoLevel = GeronimoLogging.getDefaultLevel();
+ Level javaLevel;
+ if (geronimoLevel == GeronimoLogging.TRACE) {
+ javaLevel = Level.FINEST;
+ } else if (geronimoLevel == GeronimoLogging.DEBUG) {
+ javaLevel = Level.FINE;
+ } else if (geronimoLevel == GeronimoLogging.INFO) {
+ javaLevel = Level.INFO;
+ } else if (geronimoLevel == GeronimoLogging.WARN) {
+ javaLevel = Level.WARNING;
+ } else {
+ javaLevel = Level.SEVERE;
+ }
- // set the root level
- root.setLevel(javaLevel);
+ // set the root level
+ root.setLevel(javaLevel);
- // set the console handler level (if present)
- Handler[] handlers = root.getHandlers();
- for (int index = 0; index < handlers.length; index++) {
- if (handlers[index] instanceof ConsoleHandler) {
- handlers[index].setLevel(javaLevel);
+ // set the console handler level (if present)
+ Handler[] handlers = root.getHandlers();
+ for (int index = 0; index < handlers.length; index++) {
+ if (handlers[index] instanceof ConsoleHandler) {
+ handlers[index].setLevel(javaLevel);
+ }
}
}
}
Modified: geronimo/server/branches/sachin/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/log/BootstrapLog4jLog.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/log/BootstrapLog4jLog.java?rev=438913&r1=438912&r2=438913&view=diff
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/log/BootstrapLog4jLog.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/log/BootstrapLog4jLog.java Thu Aug 31 06:36:06 2006
@@ -24,30 +24,33 @@
import org.apache.log4j.PatternLayout;
/**
+ * Bootstrap log implementation for use with Log4j.
+ *
* @version $Rev$ $Date$
*/
public class BootstrapLog4jLog implements Log {
static {
- Logger root = Logger.getRootLogger();
- root.addAppender(new ConsoleAppender(new PatternLayout("%d{ABSOLUTE} %-5p [%c{1}] %m%n")));
+ if (GeronimoLogging.isBootstrapLoggingInitializationEnabled()) {
+ Logger root = Logger.getRootLogger();
+ root.addAppender(new ConsoleAppender(new PatternLayout("%d{ABSOLUTE} %-5p [%c{1}] %m%n")));
- GeronimoLogging level = GeronimoLogging.getDefaultLevel();
- if (level == null) {
- root.setLevel(Level.ERROR);
- } else if (level == GeronimoLogging.TRACE) {
- root.setLevel(Level.DEBUG);
- } else if (level == GeronimoLogging.DEBUG) {
- root.setLevel(Level.DEBUG);
- } else if (level == GeronimoLogging.INFO) {
- root.setLevel(Level.INFO);
- } else if (level == GeronimoLogging.WARN) {
- root.setLevel(Level.WARN);
- } else if (level == GeronimoLogging.ERROR) {
- root.setLevel(Level.ERROR);
- } else if (level == GeronimoLogging.FATAL) {
- root.setLevel(Level.FATAL);
+ GeronimoLogging level = GeronimoLogging.getDefaultLevel();
+ if (level == null) {
+ root.setLevel(Level.ERROR);
+ } else if (level == GeronimoLogging.TRACE) {
+ root.setLevel(Level.DEBUG);
+ } else if (level == GeronimoLogging.DEBUG) {
+ root.setLevel(Level.DEBUG);
+ } else if (level == GeronimoLogging.INFO) {
+ root.setLevel(Level.INFO);
+ } else if (level == GeronimoLogging.WARN) {
+ root.setLevel(Level.WARN);
+ } else if (level == GeronimoLogging.ERROR) {
+ root.setLevel(Level.ERROR);
+ } else if (level == GeronimoLogging.FATAL) {
+ root.setLevel(Level.FATAL);
+ }
}
-
}
private static final String FQCN = BootstrapLog4jLog.class.getName();
Modified: geronimo/server/branches/sachin/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/log/GeronimoLogging.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/log/GeronimoLogging.java?rev=438913&r1=438912&r2=438913&view=diff
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/log/GeronimoLogging.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/log/GeronimoLogging.java Thu Aug 31 06:36:06 2006
@@ -42,7 +42,6 @@
private static GeronimoLogging consoleLogLevel = ERROR;
private static GeronimoLogging defaultLevel;
-
/**
* Initializes the logging system used by Geronimo. This MUST be called in
* in the main class used to start the geronimo server. This method forces
@@ -84,7 +83,6 @@
return defaultLevel;
}
-
public static GeronimoLogging getConsoleLogLevel() {
return consoleLogLevel;
}
@@ -106,5 +104,23 @@
public String toString() {
return level;
+ }
+
+ /**
+ * Check if the Geronimo bootstrap logging initialization is enabled.
+ *
+ * <p>Checks the system property <tt>geronimo.bootstrap.logging.enabled</tt>
+ * if not set, or set to "true" then bootstrap logging initialization is enabled.
+ *
+ * @return True of bootstrap logging initialization is enabled.
+ */
+ public static boolean isBootstrapLoggingInitializationEnabled() {
+ String value = System.getProperty("geronimo.bootstrap.logging.enabled");
+ if (value == null) {
+ return true;
+ }
+ else {
+ return Boolean.valueOf(value).booleanValue();
+ }
}
}
Modified: geronimo/server/branches/sachin/modules/geronimo-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-security/pom.xml?rev=438913&r1=438912&r2=438913&view=diff
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-security/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/geronimo-security/pom.xml Thu Aug 31 06:36:06 2006
@@ -104,19 +104,6 @@
<value>${pom.basedir}/src/test/data/data/login.config</value>
</property>
</systemProperties>
-
- <!-- FIXME: Some tests fail with fork=once -->
- <forkMode>pertest</forkMode>
-
- <excludes>
- <exclude>**/Abstract*.java</exclude>
-
- <!--
- | FIXME: This test was disabled because it is failing in non-obvious ways
- | and requires someone with more insight to resolve
- -->
- <exclude>**/ConfigurationEntryTest.java</exclude>
- </excludes>
</configuration>
</plugin>
</plugins>
Modified: geronimo/server/branches/sachin/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java?rev=438913&r1=438912&r2=438913&view=diff
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java Thu Aug 31 06:36:06 2006
@@ -29,11 +29,6 @@
import org.apache.geronimo.testsupport.TestSupport;
-import org.apache.log4j.ConsoleAppender;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.apache.log4j.PatternLayout;
-
import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.AbstractName;
@@ -135,8 +130,6 @@
}
protected void setUp() throws Exception {
- Logger.getRootLogger().addAppender(new ConsoleAppender(new PatternLayout("%p [%t] %m %n")));
- Logger.getRootLogger().setLevel(Level.DEBUG);
kernel = KernelFactory.newInstance().createKernel("test.kernel");
kernel.boot();
@@ -194,7 +187,7 @@
gbean.setAttribute("loginModuleClass", "org.apache.geronimo.security.realm.providers.FileAuditLoginModule");
gbean.setAttribute("serverSide", new Boolean(true));
props = new Properties();
- props.put("file", "target/login-audit.log");
+ props.put("file", new File(BASEDIR, "target/login-audit.log").getPath());
gbean.setAttribute("options", props);
kernel.loadGBean(gbean, LoginModuleGBean.class.getClassLoader());
Modified: geronimo/server/branches/sachin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/pom.xml?rev=438913&r1=438912&r2=438913&view=diff
==============================================================================
--- geronimo/server/branches/sachin/pom.xml (original)
+++ geronimo/server/branches/sachin/pom.xml Thu Aug 31 06:36:06 2006
@@ -843,7 +843,7 @@
</dependencies>
</dependencyManagement>
-
+
<build>
<pluginManagement>
<plugins>
@@ -873,7 +873,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jspc-maven-plugin</artifactId>
- <version>1.4.4</version>
+ <version>1.4.5</version>
<executions>
<execution>
<id>jspc</id>