You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2008/04/25 21:13:26 UTC
svn commit: r651684 [2/8] - in /geronimo/server/trunk: ./
assemblies/geronimo-boilerplate-minimal/
assemblies/geronimo-boilerplate-minimal/src/main/assembly/
assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/
assemblies/geronimo-boilerplate...
Modified: geronimo/server/trunk/framework/modules/geronimo-cli/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-cli/pom.xml?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-cli/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-cli/pom.xml Fri Apr 25 12:11:52 2008
@@ -32,7 +32,6 @@
<name>Geronimo Framework, Modules :: CLI</name>
<dependencies>
-
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-kernel</artifactId>
@@ -43,7 +42,6 @@
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
</dependency>
-
</dependencies>
</project>
Modified: geronimo/server/trunk/framework/modules/geronimo-cli/src/main/java/org/apache/geronimo/cli/AbstractCLI.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-cli/src/main/java/org/apache/geronimo/cli/AbstractCLI.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-cli/src/main/java/org/apache/geronimo/cli/AbstractCLI.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-cli/src/main/java/org/apache/geronimo/cli/AbstractCLI.java Fri Apr 25 12:11:52 2008
@@ -19,7 +19,6 @@
import java.io.PrintStream;
import org.apache.geronimo.cli.CLParserException;
-import org.apache.geronimo.kernel.log.GeronimoLogging;
import org.apache.geronimo.kernel.util.MainConfigurationBootstrapper;
@@ -72,6 +71,11 @@
}
protected void initializeLogging(CLParser parser) {
+ //
+ // FIXME: Update for new logging muck
+ //
+
+ /*
GeronimoLogging level = GeronimoLogging.WARN;
if (parser.isVerboseInfo()) {
level = GeronimoLogging.INFO;
@@ -81,6 +85,7 @@
level = GeronimoLogging.TRACE;
}
GeronimoLogging.initialize(level);
+ */
}
protected abstract MainConfigurationBootstrapper newMainConfigurationBootstrapper();
Added: geronimo/server/trunk/framework/modules/geronimo-cli/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-cli/src/main/resources/log4j.properties?rev=651684&view=auto
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-cli/src/main/resources/log4j.properties (added)
+++ geronimo/server/trunk/framework/modules/geronimo-cli/src/main/resources/log4j.properties Fri Apr 25 12:11:52 2008
@@ -0,0 +1,36 @@
+##
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+##
+## $Rev$ $Date$
+##
+
+##
+## NOTE: This is the bootstrap LOG4J configuration
+##
+
+log4j.rootLogger=INFO, CONSOLE
+
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+#
+# FIXME: Need to suppor this for bootstrapping
+#
+#log4j.appender.CONSOLE.Threshold=${org.apache.geronimo.log.ConsoleLogLevel}
+log4j.appender.CONSOLE.Threshold=ERROR
+
+log4j.appender.CONSOLE.Target=System.out
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n
+
Propchange: geronimo/server/trunk/framework/modules/geronimo-cli/src/main/resources/log4j.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/framework/modules/geronimo-cli/src/main/resources/log4j.properties
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/server/trunk/framework/modules/geronimo-cli/src/main/resources/log4j.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/server/trunk/framework/modules/geronimo-commands/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-commands/pom.xml?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-commands/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-commands/pom.xml Fri Apr 25 12:11:52 2008
@@ -36,26 +36,9 @@
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-kernel</artifactId>
<version>${version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.geronimo.gshell</groupId>
<artifactId>gshell-command-api</artifactId>
</dependency>
@@ -87,24 +70,12 @@
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-cli</artifactId>
<version>${version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-deploy-tool</artifactId>
<version>${version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/framework/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/MapEditor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/MapEditor.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/MapEditor.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/MapEditor.java Fri Apr 25 12:11:52 2008
@@ -23,8 +23,8 @@
import java.util.Properties;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A property editor for {@link java.util.Map}.
@@ -34,7 +34,7 @@
public class MapEditor
extends TextPropertyEditorSupport
{
- private static final Log log = LogFactory.getLog(MapEditor.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
/**
*
* @throws PropertyEditorException An IOException occured.
Modified: geronimo/server/trunk/framework/modules/geronimo-crypto/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-crypto/pom.xml?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-crypto/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-crypto/pom.xml Fri Apr 25 12:11:52 2008
@@ -30,13 +30,6 @@
<artifactId>geronimo-crypto</artifactId>
<name>Geronimo Framework, Modules :: Crypto</name>
-
- <dependencies>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- </dependencies>
-
+
</project>
Modified: geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/AbstractEncryption.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/AbstractEncryption.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/AbstractEncryption.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/AbstractEncryption.java Fri Apr 25 12:11:52 2008
@@ -31,15 +31,15 @@
import javax.crypto.SealedObject;
import org.apache.geronimo.crypto.encoders.Base64;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @version $Rev$ $Date$
*/
public abstract class AbstractEncryption implements Encryption {
- private final static Log log = LogFactory.getLog(SimpleEncryption.class);
-
+ private Logger log = LoggerFactory.getLogger(getClass());
+
/**
* Gets a String which contains the Base64-encoded form of the source,
* encrypted with the key from getSecretKeySpec().
Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/ConfigIDExtractor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/ConfigIDExtractor.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/ConfigIDExtractor.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/ConfigIDExtractor.java Fri Apr 25 12:11:52 2008
@@ -37,8 +37,8 @@
import org.apache.geronimo.kernel.repository.Artifact;
import org.apache.geronimo.kernel.repository.Version;
import org.apache.geronimo.kernel.util.XmlUtil;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -51,7 +51,7 @@
*/
public class ConfigIDExtractor {
- private static final Log log = LogFactory.getLog(ConfigIDExtractor.class);
+ private static final Logger log = LoggerFactory.getLogger(ConfigIDExtractor.class);
/**
* Attempt to calculate the Geronimo ModuleID for a J2EE application
Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/factories/BaseDeploymentFactory.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/factories/BaseDeploymentFactory.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/factories/BaseDeploymentFactory.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/factories/BaseDeploymentFactory.java Fri Apr 25 12:11:52 2008
@@ -30,8 +30,8 @@
import javax.management.remote.JMXConnectorFactory;
import javax.management.remote.JMXServiceURL;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.deployment.ModuleConfigurer;
import org.apache.geronimo.deployment.plugin.DisconnectedDeploymentManager;
import org.apache.geronimo.deployment.plugin.jmx.LocalDeploymentManager;
@@ -48,7 +48,7 @@
* @version $Rev$ $Date$
*/
public class BaseDeploymentFactory implements DeploymentFactory {
- private static final Log log = LogFactory.getLog(BaseDeploymentFactory.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
public static final String URI_PREFIX = "deployer:geronimo:";
private static final int DEFAULT_PORT = 1099;
@@ -178,10 +178,10 @@
}
return manager;
} catch (IOException e) {
- log.fatal("caught ", e);
+ log.error("caught ", e);
DeploymentManagerCreationException deploymentManagerCreationException =
(DeploymentManagerCreationException) new DeploymentManagerCreationException(e.getMessage()).initCause(e);
- log.fatal("throwing ", deploymentManagerCreationException);
+ log.error("throwing ", deploymentManagerCreationException);
throw deploymentManagerCreationException;
} catch (SecurityException e) {
if (log.isDebugEnabled()) {
Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/LocalDeploymentManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/LocalDeploymentManager.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/LocalDeploymentManager.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/LocalDeploymentManager.java Fri Apr 25 12:11:52 2008
@@ -20,8 +20,8 @@
import java.util.Collection;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.deployment.ModuleConfigurer;
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.AbstractNameQuery;
@@ -34,7 +34,7 @@
* @version $Rev$ $Date$
*/
public class LocalDeploymentManager extends JMXDeploymentManager {
- private static final Log log = LogFactory.getLog(LocalDeploymentManager.class);
+ private static final Logger log = LoggerFactory.getLogger(LocalDeploymentManager.class);
private static final AbstractNameQuery CONFIGURER_QUERY = new AbstractNameQuery(ModuleConfigurer.class.getName());
public LocalDeploymentManager(Kernel kernel) {
Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/RemoteDeploymentManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/RemoteDeploymentManager.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/RemoteDeploymentManager.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/RemoteDeploymentManager.java Fri Apr 25 12:11:52 2008
@@ -39,8 +39,8 @@
import javax.management.remote.JMXConnector;
import javax.security.auth.login.FailedLoginException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.deployment.ModuleConfigurer;
import org.apache.geronimo.deployment.plugin.GeronimoDeploymentManager;
import org.apache.geronimo.deployment.plugin.local.AbstractDeployCommand;
@@ -73,7 +73,7 @@
* @version $Rev$ $Date$
*/
public class RemoteDeploymentManager extends JMXDeploymentManager implements GeronimoDeploymentManager, ServerArchiver {
- private static final Log log = LogFactory.getLog(RemoteDeploymentManager.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private JMXConnector jmxConnector;
private boolean isSameMachine;
Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/remote/FileUploadServletClient.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/remote/FileUploadServletClient.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/remote/FileUploadServletClient.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/remote/FileUploadServletClient.java Fri Apr 25 12:11:52 2008
@@ -34,8 +34,8 @@
import java.util.List;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.AbstractNameQuery;
import org.apache.geronimo.kernel.Kernel;
@@ -46,7 +46,7 @@
* @version $Rev:$ $Date:$
*/
public class FileUploadServletClient implements FileUploadClient {
- private static final Log log = LogFactory.getLog(FileUploadServletClient.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
/** Note: The below versions should be kept in sync with those in FileUploadServlet.java **/
// Starting RemoteDeploy datastream versions
Modified: geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/Deployer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/Deployer.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/Deployer.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/Deployer.java Fri Apr 25 12:11:52 2008
@@ -37,8 +37,8 @@
import javax.management.ObjectName;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.deployment.util.DeploymentUtil;
import org.apache.geronimo.gbean.AbstractName;
@@ -66,7 +66,7 @@
* @version $Rev$ $Date$
*/
public class Deployer implements GBeanLifecycle {
- private static final Log log = LogFactory.getLog(Deployer.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private final int REAPER_INTERVAL = 60 * 1000;
private DeployerReaper reaper;
private final String remoteDeployAddress;
Modified: geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/SingleFileHotDeployer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/SingleFileHotDeployer.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/SingleFileHotDeployer.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/SingleFileHotDeployer.java Fri Apr 25 12:11:52 2008
@@ -26,8 +26,8 @@
import java.util.LinkedList;
import java.util.jar.JarFile;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.deployment.util.DeploymentUtil;
import org.apache.geronimo.kernel.config.ConfigurationData;
@@ -47,7 +47,7 @@
* @version $Rev$ $Date$
*/
public class SingleFileHotDeployer {
- private static final Log log = LogFactory.getLog(SingleFileHotDeployer.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private static final String LINE_SEP = System.getProperty("line.separator");
private final File dir;
private final String[] watchPaths;
Modified: geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/xml/LocalEntityResolver.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/xml/LocalEntityResolver.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/xml/LocalEntityResolver.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/xml/LocalEntityResolver.java Fri Apr 25 12:11:52 2008
@@ -24,8 +24,8 @@
import java.net.URI;
import java.util.Vector;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.xml.resolver.Catalog;
@@ -62,7 +62,7 @@
/**
* used Logger
*/
- private static final Log log = LogFactory.getLog(LocalEntityResolver.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
/**
* The used Catalog Manager
Modified: geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/xml/ParserFactoryImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/xml/ParserFactoryImpl.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/xml/ParserFactoryImpl.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/xml/ParserFactoryImpl.java Fri Apr 25 12:11:52 2008
@@ -21,8 +21,8 @@
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.kernel.util.XmlUtil;
@@ -38,7 +38,7 @@
* */
public class ParserFactoryImpl implements ParserFactory {
- private static final Log log = LogFactory.getLog(ParserFactoryImpl.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private final DocumentBuilderFactory factory;
private EntityResolver entityResolver;
Modified: geronimo/server/trunk/framework/modules/geronimo-jmx-remoting/src/main/java/org/apache/geronimo/jmxremoting/JMXConnector.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-jmx-remoting/src/main/java/org/apache/geronimo/jmxremoting/JMXConnector.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-jmx-remoting/src/main/java/org/apache/geronimo/jmxremoting/JMXConnector.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-jmx-remoting/src/main/java/org/apache/geronimo/jmxremoting/JMXConnector.java Fri Apr 25 12:11:52 2008
@@ -27,8 +27,8 @@
import javax.management.remote.JMXConnectorServerFactory;
import javax.management.remote.JMXServiceURL;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.gbean.GBeanLifecycle;
@@ -41,7 +41,7 @@
*/
public class JMXConnector implements JMXConnectorInfo, GBeanLifecycle {
private final MBeanServer mbeanServer;
- private final Log log;
+ private final Logger log;
private final ClassLoader classLoader;
private String applicationConfigName;
private Authenticator authenticator;
@@ -70,7 +70,7 @@
public JMXConnector(MBeanServer mbeanServer, String objectName, ClassLoader classLoader) {
this.mbeanServer = mbeanServer;
this.classLoader = classLoader;
- log = LogFactory.getLog(objectName);
+ log = LoggerFactory.getLogger(objectName);
}
/**
Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml Fri Apr 25 12:11:52 2008
@@ -48,11 +48,6 @@
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
-
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/AbstractGBeanReference.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/AbstractGBeanReference.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/AbstractGBeanReference.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/AbstractGBeanReference.java Fri Apr 25 12:11:52 2008
@@ -23,8 +23,8 @@
import org.apache.geronimo.kernel.GBeanNotFoundException;
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.kernel.management.State;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
@@ -38,7 +38,7 @@
*/
protected static final boolean NO_PROXY;
static {
- Log log = LogFactory.getLog(AbstractGBeanReference.class);
+ Logger log = LoggerFactory.getLogger(AbstractGBeanReference.class);
String no_proxy = System.getProperty("Xorg.apache.geronimo.gbean.NoProxy", "true");
NO_PROXY = no_proxy.equalsIgnoreCase("true");
if (NO_PROXY) {
Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanDependency.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanDependency.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanDependency.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanDependency.java Fri Apr 25 12:11:52 2008
@@ -16,8 +16,8 @@
*/
package org.apache.geronimo.gbean.runtime;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.AbstractNameQuery;
import org.apache.geronimo.gbean.InvalidConfigurationException;
@@ -33,7 +33,7 @@
public final class GBeanDependency {
- private static final Log log = LogFactory.getLog(GBeanDependency.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
/**
* The GBeanInstance to which this reference belongs.
Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java Fri Apr 25 12:11:52 2008
@@ -31,8 +31,8 @@
import javax.management.ObjectName;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.AbstractNameQuery;
import org.apache.geronimo.gbean.GAttributeInfo;
@@ -64,7 +64,7 @@
* @version $Rev:385718 $ $Date$
*/
public final class GBeanInstance implements StateManageable {
- private static final Log log = LogFactory.getLog(GBeanInstance.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private static final int DESTROYED = 0;
private static final int CREATING = 1;
Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanInstanceState.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanInstanceState.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanInstanceState.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanInstanceState.java Fri Apr 25 12:11:52 2008
@@ -16,8 +16,8 @@
*/
package org.apache.geronimo.gbean.runtime;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.kernel.DependencyManager;
import org.apache.geronimo.kernel.GBeanNotFoundException;
@@ -31,7 +31,7 @@
* @version $Rev$ $Date$
*/
public class GBeanInstanceState {
- private static final Log log = LogFactory.getLog(GBeanInstanceState.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
/**
* The GBeanInstance in which this server is registered.
Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanSingleReference.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanSingleReference.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanSingleReference.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanSingleReference.java Fri Apr 25 12:11:52 2008
@@ -17,8 +17,8 @@
package org.apache.geronimo.gbean.runtime;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.GReferenceInfo;
import org.apache.geronimo.gbean.InvalidConfigurationException;
@@ -30,7 +30,7 @@
* @version $Rev$ $Date$
*/
public class GBeanSingleReference extends AbstractGBeanReference {
- private static final Log log = LogFactory.getLog(GBeanSingleReference.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
/**
* The object to which the proxy is bound
Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/ProxyCollection.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/ProxyCollection.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/ProxyCollection.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/ProxyCollection.java Fri Apr 25 12:11:52 2008
@@ -16,8 +16,8 @@
*/
package org.apache.geronimo.gbean.runtime;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.ReferenceCollection;
import org.apache.geronimo.gbean.ReferenceCollectionEvent;
@@ -39,7 +39,7 @@
* @version $Rev$ $Date$
*/
class ProxyCollection implements ReferenceCollection {
- private static final Log log = LogFactory.getLog(ProxyCollection.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private final String name;
private final Kernel kernel;
private final Map proxies = new HashMap();
Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/basic/BasicKernel.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/basic/BasicKernel.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/basic/BasicKernel.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/basic/BasicKernel.java Fri Apr 25 12:11:52 2008
@@ -24,8 +24,8 @@
import java.util.Set;
import javax.management.ObjectName;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.AbstractNameQuery;
@@ -75,18 +75,15 @@
*/
private static final String[] NO_TYPES = new String[0];
private static final Object[] NO_ARGS = new Object[0];
-
+
+ private final Logger log = LoggerFactory.getLogger(getClass());
+
/**
* Name of this kernel
*/
private final String kernelName;
/**
- * The log
- */
- private Log log;
-
- /**
* Is this kernel running?
*/
private boolean running;
@@ -592,7 +589,6 @@
return;
}
bootTime = new Date();
- log = LogFactory.getLog(BasicKernel.class.getName());
log.debug("Starting boot");
// todo cleanup when boot fails
Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/basic/BasicLifecycleMonitor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/basic/BasicLifecycleMonitor.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/basic/BasicLifecycleMonitor.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/basic/BasicLifecycleMonitor.java Fri Apr 25 12:11:52 2008
@@ -27,8 +27,8 @@
import java.util.ArrayList;
import java.util.Collection;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.kernel.GBeanNotFoundException;
import org.apache.geronimo.kernel.lifecycle.LifecycleMonitor;
@@ -42,7 +42,7 @@
* @version $Rev$ $Date$
*/
public class BasicLifecycleMonitor implements LifecycleMonitor {
- private static final Log log = LogFactory.getLog(BasicLifecycleMonitor.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
// todo we should only hold weak references to the listeners
Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/basic/BasicProxyManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/basic/BasicProxyManager.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/basic/BasicProxyManager.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/basic/BasicProxyManager.java Fri Apr 25 12:11:52 2008
@@ -27,8 +27,8 @@
import net.sf.cglib.proxy.Enhancer;
import net.sf.cglib.proxy.MethodInterceptor;
import net.sf.cglib.reflect.FastClass;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.kernel.ClassLoading;
@@ -46,7 +46,7 @@
*/
public class BasicProxyManager implements ProxyManager {
private final static String MANAGED_BEAN_NAME = "org.apache.geronimo.kernel.proxy.GeronimoManagedBean";
- private final static Log log = LogFactory.getLog(BasicProxyManager.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private final Kernel kernel;
private final Map interceptors = Collections.synchronizedMap(new BasicProxyMap());
Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/classloader/UrlResourceFinder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/classloader/UrlResourceFinder.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/classloader/UrlResourceFinder.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/classloader/UrlResourceFinder.java Fri Apr 25 12:11:52 2008
@@ -34,8 +34,8 @@
import java.util.jar.Attributes;
import java.util.jar.Manifest;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @version $Rev$ $Date$
@@ -43,7 +43,7 @@
public class UrlResourceFinder implements ResourceFinder {
private final Object lock = new Object();
- private static final Log log = LogFactory.getLog(UrlResourceFinder.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private final LinkedHashSet<URL> urls = new LinkedHashSet<URL>();
private final LinkedHashMap<URL,ResourceLocation> classPath = new LinkedHashMap<URL,ResourceLocation>();
private final LinkedHashSet<File> watchedFiles = new LinkedHashSet<File>();
@@ -203,7 +203,7 @@
} catch (UnsupportedOperationException ex) {
// the protocol for the JAR file's URL is not supported. This can occur when
// the jar file is embedded in an EAR or CAR file. Proceed but log the message.
- log.error(ex);
+ log.error("The protocol for the JAR file's URL is not supported", ex);
continue;
}
}
Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/Configuration.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/Configuration.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/Configuration.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/Configuration.java Fri Apr 25 12:11:52 2008
@@ -37,8 +37,8 @@
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.AbstractNameQuery;
import org.apache.geronimo.gbean.GBeanData;
@@ -86,7 +86,7 @@
* @version $Rev:385718 $ $Date$
*/
public class Configuration implements GBeanLifecycle, ConfigurationParent {
- private static final Log log = LogFactory.getLog(Configuration.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
/**
* Converts an Artifact to an AbstractName for a configuration. Does not
Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationClassLoader.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationClassLoader.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationClassLoader.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationClassLoader.java Fri Apr 25 12:11:52 2008
@@ -26,7 +26,7 @@
import java.util.Map;
import java.lang.reflect.Field;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.kernel.util.ClassLoaderRegistry;
@@ -48,12 +48,11 @@
}
public void destroy() {
- LogFactory.release(this);
clearSoftCache(ObjectInputStream.class, "subclassAudits");
clearSoftCache(ObjectOutputStream.class, "subclassAudits");
clearSoftCache(ObjectStreamClass.class, "localDescs");
clearSoftCache(ObjectStreamClass.class, "reflectors");
- ClassLoaderRegistry.remove(this);
+ ClassLoaderRegistry.remove(this);
}
public String toString() {
@@ -72,7 +71,7 @@
synchronized (lock) {
if (!clearSoftCacheFailed) {
clearSoftCacheFailed = true;
- LogFactory.getLog(ConfigurationClassLoader.class).debug("Unable to clear SoftCache field " + fieldName + " in class " + clazz);
+ LoggerFactory.getLogger(ConfigurationClassLoader.class).debug("Unable to clear SoftCache field {} in class {}", fieldName, clazz);
}
}
}
Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationUtil.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationUtil.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationUtil.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationUtil.java Fri Apr 25 12:11:52 2008
@@ -35,8 +35,8 @@
import java.util.Properties;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.AbstractNameQuery;
import org.apache.geronimo.gbean.GAttributeInfo;
@@ -61,7 +61,7 @@
* @version $Rev:386276 $ $Date$
*/
public final class ConfigurationUtil {
- private static final Log log = LogFactory.getLog(ConfigurationUtil.class);
+ private static final Logger log = LoggerFactory.getLogger(ConfigurationUtil.class);
private static final ConfigurationMarshaler configurationMarshaler;
static {
Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/DebugLoggingLifecycleMonitor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/DebugLoggingLifecycleMonitor.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/DebugLoggingLifecycleMonitor.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/DebugLoggingLifecycleMonitor.java Fri Apr 25 12:11:52 2008
@@ -21,16 +21,16 @@
package org.apache.geronimo.kernel.config;
import org.apache.geronimo.kernel.repository.Artifact;
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
/**
* @version $Rev$ $Date$
*/
public class DebugLoggingLifecycleMonitor implements LifecycleMonitor {
- private final Log log;
+ private final Logger log;
- public DebugLoggingLifecycleMonitor(Log log) {
+ public DebugLoggingLifecycleMonitor(Logger log) {
this.log = log;
}
Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/IOUtil.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/IOUtil.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/IOUtil.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/IOUtil.java Fri Apr 25 12:11:52 2008
@@ -36,14 +36,14 @@
import java.util.jar.JarFile;
import java.util.zip.ZipEntry;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @version $Rev$ $Date$
*/
public class IOUtil {
- private final static Log log = LogFactory.getLog(IOUtil.class);
+ private static final Logger log = LoggerFactory.getLogger(IOUtil.class);
public static void recursiveCopy(File srcDir, File destDir) throws IOException {
if (srcDir == null) throw new NullPointerException("sourceDir is null");
Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/KernelConfigurationManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/KernelConfigurationManager.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/KernelConfigurationManager.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/KernelConfigurationManager.java Fri Apr 25 12:11:52 2008
@@ -23,6 +23,8 @@
import java.util.Map;
import java.util.Set;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.AbstractNameQuery;
import org.apache.geronimo.gbean.GBeanData;
@@ -298,7 +300,9 @@
private static class ShutdownHook implements Runnable {
private final Kernel kernel;
-
+
+ private final Logger log = LoggerFactory.getLogger(getClass());
+
public ShutdownHook(Kernel kernel) {
this.kernel = kernel;
}
Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/MultiParentClassLoader.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/MultiParentClassLoader.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/MultiParentClassLoader.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/MultiParentClassLoader.java Fri Apr 25 12:11:52 2008
@@ -35,8 +35,8 @@
import java.util.Map;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.kernel.classloader.UnionEnumeration;
import org.apache.geronimo.kernel.repository.Artifact;
import org.apache.geronimo.kernel.util.ClassLoaderRegistry;
@@ -51,7 +51,7 @@
* @version $Rev$ $Date$
*/
public class MultiParentClassLoader extends URLClassLoader {
- private static final Log log = LogFactory.getLog(MultiParentClassLoader.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private final Artifact id;
private final ClassLoader[] parents;
private final boolean inverseClassLoading;
@@ -81,7 +81,8 @@
}
classLoaderSearchMode = runtimeMode;
- log.info("ClassLoading behaviour has changed. The "+runtimeModeMessage+" mode is in effect. If you are experiencing a problem\n"+
+ LoggerFactory.getLogger(MultiParentClassLoader.class).info(
+ "ClassLoading behaviour has changed. The "+runtimeModeMessage+" mode is in effect. If you are experiencing a problem\n"+
"you can change the behaviour by specifying -DXorg.apache.geronimo.kernel.config.MPCLSearchOption= property. Specify \n"+
"=\"safe\" to revert to the original behaviour. This is a temporary change until we decide whether or not to make it\n"+
"permanent for the 2.0 release");
@@ -649,7 +650,6 @@
destroyed = true;
}
- LogFactory.release(this);
clearSoftCache(ObjectInputStream.class, "subclassAudits");
clearSoftCache(ObjectOutputStream.class, "subclassAudits");
clearSoftCache(ObjectStreamClass.class, "localDescs");
@@ -676,7 +676,7 @@
synchronized (lock) {
if (!clearSoftCacheFailed) {
clearSoftCacheFailed = true;
- LogFactory.getLog(MultiParentClassLoader.class).debug("Unable to clear SoftCache field " + fieldName + " in class " + clazz);
+ LoggerFactory.getLogger(MultiParentClassLoader.class).debug("Unable to clear SoftCache field {} in class {}", fieldName, clazz);
}
}
}
Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/SimpleConfigurationManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/SimpleConfigurationManager.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/SimpleConfigurationManager.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/SimpleConfigurationManager.java Fri Apr 25 12:11:52 2008
@@ -29,8 +29,8 @@
import java.util.Map;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
@@ -48,7 +48,7 @@
* @version $Rev$ $Date$
*/
public class SimpleConfigurationManager implements ConfigurationManager {
- protected static final Log log = LogFactory.getLog(SimpleConfigurationManager.class);
+ protected final Logger log = LoggerFactory.getLogger(getClass());
protected final Collection stores;
private final ArtifactResolver artifactResolver;
protected final Map configurations = new LinkedHashMap();
Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/repository/AbstractRepository.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/repository/AbstractRepository.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/repository/AbstractRepository.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/repository/AbstractRepository.java Fri Apr 25 12:11:52 2008
@@ -34,8 +34,8 @@
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.kernel.util.XmlUtil;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -48,7 +48,7 @@
* @version $Rev: 506425 $ $Date: 2007-02-12 22:49:46 +1100 (Mon, 12 Feb 2007) $
*/
public abstract class AbstractRepository implements WriteableRepository {
- protected static final Log log = LogFactory.getLog(AbstractRepository.class);
+ protected final Logger log = LoggerFactory.getLogger(getClass());
private final static ArtifactTypeHandler DEFAULT_TYPE_HANDLER = new CopyArtifactTypeHandler();
protected final File rootFile;
private final Map<String, ArtifactTypeHandler> typeHandlers = new HashMap<String, ArtifactTypeHandler>();
Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/rmi/RMIRegistryService.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/rmi/RMIRegistryService.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/rmi/RMIRegistryService.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/rmi/RMIRegistryService.java Fri Apr 25 12:11:52 2008
@@ -21,8 +21,8 @@
import java.rmi.server.UnicastRemoteObject;
import java.net.InetSocketAddress;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.gbean.GBeanLifecycle;
@@ -33,7 +33,7 @@
* @version $Rev$ $Date$
*/
public class RMIRegistryService implements GBeanLifecycle {
- private static final Log log = LogFactory.getLog(RMIRegistryService.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private int port = Registry.REGISTRY_PORT;
private String host = "0.0.0.0";
private Registry registry;
Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/repository/AbstractRepositoryTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/repository/AbstractRepositoryTest.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/repository/AbstractRepositoryTest.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/repository/AbstractRepositoryTest.java Fri Apr 25 12:11:52 2008
@@ -26,14 +26,14 @@
import org.apache.geronimo.kernel.repository.ListableRepository;
import org.apache.geronimo.kernel.repository.Version;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @version $Rev: 476049 $ $Date: 2006-11-17 15:35:17 +1100 (Fri, 17 Nov 2006) $
*/
public class AbstractRepositoryTest extends TestCase {
- private static final Log log = LogFactory.getLog(AbstractRepositoryTest.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
protected ListableRepository repository;
protected File rootRepoDir;
Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImplTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImplTest.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImplTest.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImplTest.java Fri Apr 25 12:11:52 2008
@@ -27,8 +27,8 @@
import junit.framework.TestCase;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.kernel.rmi.RMIClassLoaderSpiImpl;
/**
@@ -37,7 +37,7 @@
* @version $Rev$ $Date$
*/
public class RMIClassLoaderSpiImplTest extends TestCase {
- private static final Log log = LogFactory.getLog(RMIClassLoaderSpiImplTest.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private String baseURL;
private String normalizedBaseURL;
Modified: geronimo/server/trunk/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/gjndi/KernelContextGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/gjndi/KernelContextGBean.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/gjndi/KernelContextGBean.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/gjndi/KernelContextGBean.java Fri Apr 25 12:11:52 2008
@@ -27,8 +27,8 @@
import javax.naming.NamingException;
import javax.naming.ContextNotEmptyException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.AbstractNameQuery;
import org.apache.geronimo.gbean.GBeanInfo;
@@ -45,7 +45,7 @@
* @version $Rev$ $Date$
*/
public class KernelContextGBean extends WritableContext implements GBeanLifecycle {
- private static final Log log = LogFactory.getLog(KernelContextGBean.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private final Kernel kernel;
private final AbstractNameQuery abstractNameQuery;
Modified: geronimo/server/trunk/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/gjndi/binding/GBeanBinding.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/gjndi/binding/GBeanBinding.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/gjndi/binding/GBeanBinding.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/gjndi/binding/GBeanBinding.java Fri Apr 25 12:11:52 2008
@@ -24,8 +24,8 @@
import javax.naming.Context;
import javax.naming.NamingException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.AbstractNameQuery;
import org.apache.geronimo.gbean.GBeanInfo;
@@ -40,7 +40,7 @@
* @version $Rev$ $Date$
*/
public class GBeanBinding implements GBeanLifecycle {
- private static final Log log = LogFactory.getLog(GBeanBinding.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private final Context context;
private final String name;
Modified: geronimo/server/trunk/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/gjndi/binding/GBeanFormatBinding.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/gjndi/binding/GBeanFormatBinding.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/gjndi/binding/GBeanFormatBinding.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/gjndi/binding/GBeanFormatBinding.java Fri Apr 25 12:11:52 2008
@@ -28,8 +28,8 @@
import javax.naming.Name;
import javax.naming.NamingException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.AbstractNameQuery;
import org.apache.geronimo.gbean.GBeanInfo;
@@ -39,10 +39,10 @@
import org.apache.geronimo.kernel.repository.Artifact;
/**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
*/
public class GBeanFormatBinding extends KernelContextGBean {
- protected static final Log log = LogFactory.getLog(GBeanFormatBinding.class);
+ protected final Logger log = LoggerFactory.getLogger(getClass());
private static final Pattern PATTERN = Pattern.compile("(\\{)(\\w+)(})");
protected final String format;
Modified: geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java Fri Apr 25 12:11:52 2008
@@ -50,8 +50,8 @@
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.gbean.ReferenceCollection;
@@ -110,7 +110,7 @@
* @version $Rev$ $Date$
*/
public class PluginInstallerGBean implements PluginInstaller {
- private final static Log log = LogFactory.getLog(PluginInstallerGBean.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private static int counter;
Modified: geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginRepositoryDownloader.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginRepositoryDownloader.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginRepositoryDownloader.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginRepositoryDownloader.java Fri Apr 25 12:11:52 2008
@@ -27,8 +27,8 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
@@ -41,7 +41,7 @@
* @version $Rev$ $Date$
*/
public class PluginRepositoryDownloader implements PluginRepositoryList {
- private final static Log log = LogFactory.getLog(PluginRepositoryDownloader.class);
+ private static final Logger log = LoggerFactory.getLogger(PluginRepositoryDownloader.class);
private List<String> downloadRepositories = new ArrayList<String>();
private List<String> userRepositories = new ArrayList<String>();
private Kernel kernel;
Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/SecurityServiceImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/SecurityServiceImpl.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/SecurityServiceImpl.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/SecurityServiceImpl.java Fri Apr 25 12:11:52 2008
@@ -20,8 +20,8 @@
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.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
@@ -41,7 +41,7 @@
public static boolean POLICY_INSTALLED = false;
- private final Log log = LogFactory.getLog(SecurityServiceImpl.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
/**
* Permissions that protect access to sensitive security information
Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/ca/FileCertificateRequestStore.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/ca/FileCertificateRequestStore.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/ca/FileCertificateRequestStore.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/ca/FileCertificateRequestStore.java Fri Apr 25 12:11:52 2008
@@ -28,8 +28,8 @@
import java.util.Map;
import java.util.Properties;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
@@ -45,7 +45,7 @@
* @version $Rev$ $Date$
*/
public class FileCertificateRequestStore implements CertificateRequestStore, GBeanLifecycle {
- private final static Log log = LogFactory.getLog(FileCertificateRequestStore.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
// File name to store certificate request status
private static final String CSR_STATUS_FILENAME = "csr-status.properties";
Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/ca/FileCertificateStore.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/ca/FileCertificateStore.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/ca/FileCertificateStore.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/ca/FileCertificateStore.java Fri Apr 25 12:11:52 2008
@@ -28,8 +28,8 @@
import java.security.cert.X509Certificate;
import java.util.Properties;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
@@ -48,7 +48,7 @@
*/
public class FileCertificateStore implements CertificateStore, GBeanLifecycle {
- private static final Log log = LogFactory.getLog(FileCertificateStore.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private ServerInfo serverInfo;
private Kernel kernel;
Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/ca/GeronimoCertificationAuthority.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/ca/GeronimoCertificationAuthority.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/ca/GeronimoCertificationAuthority.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/ca/GeronimoCertificationAuthority.java Fri Apr 25 12:11:52 2008
@@ -29,8 +29,8 @@
import javax.security.auth.x500.X500Principal;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
@@ -67,7 +67,7 @@
* @version $Rev$ $Date$
*/
public class GeronimoCertificationAuthority implements CertificationAuthority, GBeanLifecycle {
- private final static Log log = LogFactory.getLog(GeronimoCertificationAuthority.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private ServerInfo serverInfo;
private Kernel kernel;
Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/ConfiguredIdentityNamedUsernamePasswordLoginModule.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/ConfiguredIdentityNamedUsernamePasswordLoginModule.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/ConfiguredIdentityNamedUsernamePasswordLoginModule.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/ConfiguredIdentityNamedUsernamePasswordLoginModule.java Fri Apr 25 12:11:52 2008
@@ -27,8 +27,8 @@
import javax.security.auth.login.LoginException;
import javax.security.auth.callback.CallbackHandler;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* ConfiguredIdentityNamedUsernamePasswordLoginModule adds a geronimo-specific NamedUsernamePasswordCredential
@@ -46,7 +46,7 @@
* @version $Rev$ $Date$
*/
public class ConfiguredIdentityNamedUsernamePasswordLoginModule implements LoginModule {
- private static Log log = LogFactory.getLog(ConfiguredIdentityNamedUsernamePasswordLoginModule.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
public static final String CREDENTIAL_NAME = "org.apache.geronimo.jaas.NamedUsernamePasswordCredential.Name";
public static final String USER_NAME = "org.apache.geronimo.jaas.NamedUsernamePasswordCredential.Username";
Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/GeronimoLoginConfiguration.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/GeronimoLoginConfiguration.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/GeronimoLoginConfiguration.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/GeronimoLoginConfiguration.java Fri Apr 25 12:11:52 2008
@@ -25,8 +25,8 @@
import javax.security.auth.login.AppConfigurationEntry;
import javax.security.auth.login.Configuration;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.gbean.GBeanLifecycle;
@@ -47,7 +47,7 @@
*/
public class GeronimoLoginConfiguration extends Configuration implements GBeanLifecycle, ReferenceCollectionListener {
- private final Log log = LogFactory.getLog(GeronimoLoginConfiguration.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private static Map<String, AppConfigurationEntry[]> entries = new Hashtable<String, AppConfigurationEntry[]>();
private Configuration oldConfiguration;
private Collection<ConfigurationEntryFactory> configurations = Collections.emptySet();
Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/NamedUPCredentialLoginModule.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/NamedUPCredentialLoginModule.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/NamedUPCredentialLoginModule.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/NamedUPCredentialLoginModule.java Fri Apr 25 12:11:52 2008
@@ -32,8 +32,8 @@
import javax.security.auth.login.LoginException;
import javax.security.auth.spi.LoginModule;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -52,7 +52,7 @@
*/
@Deprecated
public class NamedUPCredentialLoginModule implements LoginModule {
- private static Log log = LogFactory.getLog(NamedUPCredentialLoginModule.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
public static final String CREDENTIAL_NAME = "org.apache.geronimo.jaas.NamedUPCredentialLoginModule.Name";
public final static List<String> supportedOptions = Collections.unmodifiableList(Arrays.asList(CREDENTIAL_NAME));
Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jacc/mappingprovider/GeronimoPolicyConfigurationFactory.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jacc/mappingprovider/GeronimoPolicyConfigurationFactory.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jacc/mappingprovider/GeronimoPolicyConfigurationFactory.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jacc/mappingprovider/GeronimoPolicyConfigurationFactory.java Fri Apr 25 12:11:52 2008
@@ -23,8 +23,8 @@
import javax.security.jacc.PolicyConfigurationFactory;
import javax.security.jacc.PolicyContextException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.security.GeronimoSecurityPermission;
@@ -33,7 +33,7 @@
*/
public class GeronimoPolicyConfigurationFactory extends PolicyConfigurationFactory implements PrincipalRoleConfigurationFactory {
- private static final Log log = LogFactory.getLog(GeronimoPolicyConfigurationFactory.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private static GeronimoPolicyConfigurationFactory singleton;
private Map<String, GeronimoPolicyConfiguration> configurations = new HashMap<String, GeronimoPolicyConfiguration>();
Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreInstance.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreInstance.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreInstance.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreInstance.java Fri Apr 25 12:11:52 2008
@@ -59,8 +59,8 @@
import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.TrustManager;
import javax.net.ssl.TrustManagerFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.gbean.GBeanLifecycle;
@@ -91,7 +91,7 @@
* @version $Rev$ $Date$
*/
public class FileKeystoreInstance implements KeystoreInstance, GBeanLifecycle {
- private static final Log log = LogFactory.getLog(FileKeystoreInstance.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
final static String JKS = "JKS";
private URI keystorePath; // relative path
private ServerInfo serverInfo; // used to decode relative path
Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreManager.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreManager.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreManager.java Fri Apr 25 12:11:52 2008
@@ -46,8 +46,8 @@
import javax.net.ssl.SSLEngine;
import javax.net.ssl.SSLContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.gbean.GBeanInfo;
@@ -75,7 +75,7 @@
* @version $Rev$ $Date$
*/
public class FileKeystoreManager implements KeystoreManager, GBeanLifecycle {
- private static final Log log = LogFactory.getLog(FileKeystoreManager.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private File directory;
private ServerInfo serverInfo;
private URI configuredDir;
Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/CertificateChainCallbackHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/CertificateChainCallbackHandler.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/CertificateChainCallbackHandler.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/CertificateChainCallbackHandler.java Fri Apr 25 12:11:52 2008
@@ -24,14 +24,14 @@
import javax.security.auth.callback.UnsupportedCallbackException;
import javax.security.auth.callback.CallbackHandler;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @version $Rev$ $Date$
*/
public class CertificateChainCallbackHandler implements CallbackHandler {
- private static final Log log = LogFactory.getLog(CertificateChainCallbackHandler.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
Certificate[] certificateChain;
public CertificateChainCallbackHandler(Certificate[] certificateChain) {
Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/CertificateChainLoginModule.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/CertificateChainLoginModule.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/CertificateChainLoginModule.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/CertificateChainLoginModule.java Fri Apr 25 12:11:52 2008
@@ -36,8 +36,8 @@
import javax.security.auth.spi.LoginModule;
import javax.security.auth.x500.X500Principal;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.security.jaas.JaasLoginModuleUse;
import org.apache.geronimo.security.jaas.WrappingLoginModule;
@@ -54,7 +54,7 @@
* @version $Rev$ $Date$
*/
public class CertificateChainLoginModule implements LoginModule {
- private static Log log = LogFactory.getLog(CertificateChainLoginModule.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
// Note: If this LoginModule supports any options, the Collections.EMPTY_LIST in the following should be
// replaced with the list of supported options for e.g. Arrays.asList(option1, option2, ...) etc.