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 [3/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-security/src/main/java/org/apache/geronimo/security/realm/providers/CertificatePropertiesFileLoginModule.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/CertificatePropertiesFileLoginModule.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/CertificatePropertiesFileLoginModule.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/CertificatePropertiesFileLoginModule.java Fri Apr 25 12:11:52 2008
@@ -41,8 +41,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.common.GeronimoSecurityException;
import org.apache.geronimo.security.jaas.JaasLoginModuleUse;
import org.apache.geronimo.security.jaas.WrappingLoginModule;
@@ -68,7 +68,7 @@
* @version $Rev$ $Date$
*/
public class CertificatePropertiesFileLoginModule implements LoginModule {
- private static Log log = LogFactory.getLog(CertificatePropertiesFileLoginModule.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
public final static String USERS_URI = "usersURI";
public final static String GROUPS_URI = "groupsURI";
public final static List<String> supportedOptions = Collections.unmodifiableList(Arrays.asList(USERS_URI, GROUPS_URI));
@@ -97,7 +97,7 @@
URI groupsURI = new URI((String)options.get(GROUPS_URI));
loadProperties(serverInfo, usersURI, groupsURI);
} catch (Exception e) {
- log.error(e);
+ log.error("Failed to load properties", e);
throw new IllegalArgumentException("Unable to configure properties file login module: "+e.getMessage(), e);
}
}
Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/FileAuditLoginModule.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/FileAuditLoginModule.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/FileAuditLoginModule.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/FileAuditLoginModule.java Fri Apr 25 12:11:52 2008
@@ -36,8 +36,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;
import org.apache.geronimo.security.jaas.JaasLoginModuleUse;
import org.apache.geronimo.security.jaas.WrappingLoginModule;
import org.apache.geronimo.system.serverinfo.ServerInfo;
@@ -59,7 +59,7 @@
* @version $Rev$ $Date$
*/
public class FileAuditLoginModule implements LoginModule {
- private static Log log = LogFactory.getLog(FileAuditLoginModule.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
public static final String LOG_FILE_OPTION = "file";
public final static List<String> supportedOptions = Collections.unmodifiableList(Arrays.asList(LOG_FILE_OPTION));
Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/GeronimoPasswordCredentialLoginModule.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/GeronimoPasswordCredentialLoginModule.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/GeronimoPasswordCredentialLoginModule.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/GeronimoPasswordCredentialLoginModule.java Fri Apr 25 12:11:52 2008
@@ -31,8 +31,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;
import org.apache.geronimo.security.jaas.JaasLoginModuleUse;
import org.apache.geronimo.security.jaas.WrappingLoginModule;
@@ -48,7 +48,7 @@
* @version $Rev$ $Date$
*/
public class GeronimoPasswordCredentialLoginModule implements LoginModule {
- private static Log log = LogFactory.getLog(GeronimoPasswordCredentialLoginModule.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.
Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/GeronimoPropertiesFileMappedPasswordCredentialLoginModule.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/GeronimoPropertiesFileMappedPasswordCredentialLoginModule.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/GeronimoPropertiesFileMappedPasswordCredentialLoginModule.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/GeronimoPropertiesFileMappedPasswordCredentialLoginModule.java Fri Apr 25 12:11:52 2008
@@ -41,8 +41,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;
import org.apache.geronimo.common.GeronimoSecurityException;
import org.apache.geronimo.security.jaas.JaasLoginModuleUse;
import org.apache.geronimo.security.jaas.NamedUsernamePasswordCredential;
@@ -70,7 +70,7 @@
*/
public class GeronimoPropertiesFileMappedPasswordCredentialLoginModule implements LoginModule {
- private static final Log log = LogFactory.getLog(GeronimoPropertiesFileMappedPasswordCredentialLoginModule.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
public final static String CREDENTIALS_URI = "credentialsURI";
public final static List<String> supportedOptions = Collections.unmodifiableList(Arrays.asList(CREDENTIALS_URI));
private final static Pattern pattern = Pattern.compile("([^:,=]*):([^:,=]*)=([^:,=]*)");
Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/LDAPLoginModule.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/LDAPLoginModule.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/LDAPLoginModule.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/LDAPLoginModule.java Fri Apr 25 12:11:52 2008
@@ -52,8 +52,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;
import org.apache.geronimo.security.jaas.JaasLoginModuleUse;
import org.apache.geronimo.security.jaas.WrappingLoginModule;
@@ -68,7 +68,7 @@
*/
public class LDAPLoginModule implements LoginModule {
- private static Log log = LogFactory.getLog(LDAPLoginModule.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private Subject subject;
private CallbackHandler handler;
@@ -253,7 +253,7 @@
try {
context.close();
} catch (Exception e) {
- log.error(e);
+ log.error("Failed to close context", e);
}
}
@@ -452,9 +452,8 @@
env.put(Context.PROVIDER_URL, connectionURL == null ? "" : connectionURL);
env.put(Context.SECURITY_AUTHENTICATION, authentication == null ? "" : authentication);
context = new InitialDirContext(env);
-
} catch (NamingException e) {
- log.error(e);
+ log.error("Failed to open context", e);
throw e;
}
return context;
Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/NamedUsernamePasswordCredentialLoginModule.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/NamedUsernamePasswordCredentialLoginModule.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/NamedUsernamePasswordCredentialLoginModule.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/NamedUsernamePasswordCredentialLoginModule.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;
import org.apache.geronimo.security.jaas.JaasLoginModuleUse;
import org.apache.geronimo.security.jaas.NamedUsernamePasswordCredential;
import org.apache.geronimo.security.jaas.WrappingLoginModule;
@@ -51,7 +51,7 @@
* @version $Revision$ $Date$
*/
public class NamedUsernamePasswordCredentialLoginModule implements LoginModule {
- private static Log log = LogFactory.getLog(NamedUsernamePasswordCredentialLoginModule.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
public static final String CREDENTIAL_NAME = "Name";
public static final String CREDENTIAL_NAME_LONG = NamedUsernamePasswordCredentialLoginModule.class.getName() + "." + CREDENTIAL_NAME;
Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/PropertiesFileLoginModule.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/PropertiesFileLoginModule.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/PropertiesFileLoginModule.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/PropertiesFileLoginModule.java Fri Apr 25 12:11:52 2008
@@ -43,8 +43,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;
import org.apache.geronimo.common.GeronimoSecurityException;
import org.apache.geronimo.security.jaas.JaasLoginModuleUse;
import org.apache.geronimo.security.jaas.WrappingLoginModule;
@@ -72,7 +72,7 @@
public final static String ENCODING = "encoding";
public final static List<String> supportedOptions = Collections.unmodifiableList(Arrays.asList(USERS_URI, GROUPS_URI, DIGEST, ENCODING));
- private static Log log = LogFactory.getLog(PropertiesFileLoginModule.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
final Properties users = new Properties();
final Map<String, Set<String>> groups = new HashMap<String, Set<String>>();
private String digest;
Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/RepeatedFailureLockoutLoginModule.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/RepeatedFailureLockoutLoginModule.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/RepeatedFailureLockoutLoginModule.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/RepeatedFailureLockoutLoginModule.java Fri Apr 25 12:11:52 2008
@@ -32,8 +32,8 @@
import javax.security.auth.login.FailedLoginException;
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;
import org.apache.geronimo.security.jaas.JaasLoginModuleUse;
import org.apache.geronimo.security.jaas.WrappingLoginModule;
@@ -67,7 +67,7 @@
* @version $Rev$ $Date$
*/
public class RepeatedFailureLockoutLoginModule implements LoginModule {
- private static Log log = LogFactory.getLog(RepeatedFailureLockoutLoginModule.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
public static final String FAILURE_COUNT_OPTION = "failureCount";
public static final String FAILURE_PERIOD_OPTION = "failurePeriodSecs";
Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/SQLLoginModule.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/SQLLoginModule.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/SQLLoginModule.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/providers/SQLLoginModule.java Fri Apr 25 12:11:52 2008
@@ -45,8 +45,8 @@
import javax.security.auth.spi.LoginModule;
import javax.sql.DataSource;
-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.j2ee.j2eeobjectnames.NameFactory;
@@ -85,7 +85,7 @@
* @version $Rev$ $Date$
*/
public class SQLLoginModule implements LoginModule {
- private static Log log = LogFactory.getLog(SQLLoginModule.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
public final static String USER_SELECT = "userSelect";
public final static String GROUP_SELECT = "groupSelect";
public final static String CONNECTION_URL = "jdbcURL";
Modified: geronimo/server/trunk/framework/modules/geronimo-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/pom.xml?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/pom.xml Fri Apr 25 12:11:52 2008
@@ -63,7 +63,7 @@
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>commons-jexl</groupId>
<artifactId>commons-jexl</artifactId>
@@ -93,6 +93,14 @@
<dependency>
<groupId>woodstox</groupId>
<artifactId>wstx-asl</artifactId>
+ </dependency>
+
+ <!--
+ Some dependencies require JCL, so use this adapter to force them into SLF4J.
+ -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/ConfigurationStoreUtil.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/ConfigurationStoreUtil.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/ConfigurationStoreUtil.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/ConfigurationStoreUtil.java Fri Apr 25 12:11:52 2008
@@ -27,8 +27,8 @@
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Utility methods for dealing with checksums (hashes) of files in the
@@ -37,7 +37,7 @@
* @version $Rev$ $Date$
*/
public class ConfigurationStoreUtil {
- private static final Log log = LogFactory.getLog(ConfigurationStoreUtil.class);
+ private static final Logger log = LoggerFactory.getLogger(ConfigurationStoreUtil.class);
public static void writeChecksumFor(File file) throws IOException {
// check if the sum already exists
Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/GBeanOverride.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/GBeanOverride.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/GBeanOverride.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/GBeanOverride.java Fri Apr 25 12:11:52 2008
@@ -33,8 +33,8 @@
import javax.xml.bind.JAXBException;
import javax.xml.stream.XMLStreamException;
-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.propertyeditor.PropertyEditors;
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.AbstractNameQuery;
@@ -58,7 +58,7 @@
*/
public class GBeanOverride implements Serializable {
- private static final Log log = LogFactory.getLog(GBeanOverride.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
public static final String ATTRIBUTE_NAMESPACE = "http://geronimo.apache.org/xml/ns/attributes-1.2";
private final Object name;
Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java Fri Apr 25 12:11:52 2008
@@ -40,8 +40,8 @@
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.stream.XMLStreamException;
-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.GAttributeInfo;
import org.apache.geronimo.gbean.GBeanData;
@@ -71,7 +71,7 @@
* @version $Rev$ $Date$
*/
public class LocalAttributeManager implements LocalPluginAttributeStore, PersistentConfigurationList, GBeanLifecycle {
- private static final Log log = LogFactory.getLog(LocalAttributeManager.class);
+ private static final Logger log = LoggerFactory.getLogger(LocalAttributeManager.class);
private static final String CONFIG_FILE_PROPERTY = "org.apache.geronimo.config.file";
private final static String SUBSTITUTIONS_FILE_PROPERTY = "org.apache.geronimo.config.substitutions.file";
Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/RepositoryConfigurationStore.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/RepositoryConfigurationStore.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/RepositoryConfigurationStore.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/RepositoryConfigurationStore.java Fri Apr 25 12:11:52 2008
@@ -48,8 +48,8 @@
import org.apache.geronimo.kernel.config.IOUtil;
import org.apache.geronimo.kernel.repository.Artifact;
import org.apache.geronimo.kernel.repository.WritableListableRepository;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Implementation of ConfigurationStore GBean that installs/loads Configurations from a
@@ -58,7 +58,7 @@
* @version $Rev$ $Date$
*/
public class RepositoryConfigurationStore implements ConfigurationStore {
- private final static Log log = LogFactory.getLog(RepositoryConfigurationStore.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private final Kernel kernel;
private final ObjectName objectName;
private final AbstractName abstractName;
Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JavaVariable.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JavaVariable.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JavaVariable.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JavaVariable.java Fri Apr 25 12:11:52 2008
@@ -16,8 +16,8 @@
*/
package org.apache.geronimo.system.configuration.condition;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Provides access to Java version details for use in condition expressions.
@@ -26,7 +26,7 @@
*/
public class JavaVariable
{
- private static final Log log = LogFactory.getLog(JavaVariable.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
public String getVendor() {
return SystemUtils.JAVA_VENDOR;
Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JexlConditionParser.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JexlConditionParser.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JexlConditionParser.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JexlConditionParser.java Fri Apr 25 12:11:52 2008
@@ -25,8 +25,8 @@
import org.apache.commons.jexl.JexlContext;
import org.apache.commons.jexl.JexlHelper;
import org.apache.commons.jexl.context.HashMapContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Provides a simple facility to evaluate condition expressions using the
@@ -41,7 +41,7 @@
public class JexlConditionParser
implements ConditionParser
{
- private static final Log log = LogFactory.getLog(JexlConditionParser.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private final Map<String, Object> vars;
Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JexlExpressionParser.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JexlExpressionParser.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JexlExpressionParser.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/JexlExpressionParser.java Fri Apr 25 12:11:52 2008
@@ -23,8 +23,8 @@
import org.apache.commons.jexl.JexlContext;
import org.apache.commons.jexl.JexlHelper;
import org.apache.commons.jexl.resolver.FlatResolver;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Parses expressions using <a href="http://jakarta.apache.org/commons/jexl/">Commons Jexl</a>.
@@ -32,7 +32,7 @@
* @version $Rev$ $Date$
*/
public class JexlExpressionParser {
- private static final Log log = LogFactory.getLog(JexlExpressionParser.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
protected JexlContext context;
Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/OgnlConditionParser.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/OgnlConditionParser.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/OgnlConditionParser.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/OgnlConditionParser.java Fri Apr 25 12:11:52 2008
@@ -23,8 +23,8 @@
import ognl.Ognl;
import ognl.OgnlContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Provides a simple facility to evaluate condition expressions using the
@@ -39,7 +39,7 @@
public class OgnlConditionParser
implements ConditionParser
{
- private static final Log log = LogFactory.getLog(OgnlConditionParser.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private final Map<String, Object> vars;
Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/ParserUtils.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/ParserUtils.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/ParserUtils.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/condition/ParserUtils.java Fri Apr 25 12:11:52 2008
@@ -20,8 +20,8 @@
import java.util.Properties;
import org.apache.commons.jexl.context.HashMapContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Basic parser utility functions.
@@ -41,7 +41,7 @@
}
public static class DebugHashMapContext extends HashMapContext {
- private static final Log LOG = LogFactory.getLog(DebugHashMapContext.class);
+ private final Logger LOG = LoggerFactory.getLogger(getClass());
public Object get(Object o) {
Object r = super.get(o);
LOG.debug("Get property: " + o + " " + r);
Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/jmx/MBeanGBeanBridge.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/jmx/MBeanGBeanBridge.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/jmx/MBeanGBeanBridge.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/jmx/MBeanGBeanBridge.java Fri Apr 25 12:11:52 2008
@@ -36,8 +36,8 @@
import javax.management.MBeanRegistration;
import javax.management.MBeanServer;
-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.GOperationSignature;
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.AbstractNameQuery;
@@ -51,7 +51,7 @@
* @version $Rev$ $Date$
*/
public final class MBeanGBeanBridge implements MBeanRegistration, DynamicMBean, NotificationEmitter {
- private static final Log log = LogFactory.getLog(MBeanGBeanBridge.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
/**
* The kernel
Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/jmx/MBeanServerKernelBridge.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/jmx/MBeanServerKernelBridge.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/jmx/MBeanServerKernelBridge.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/jmx/MBeanServerKernelBridge.java Fri Apr 25 12:11:52 2008
@@ -30,8 +30,8 @@
import javax.management.NotificationBroadcasterSupport;
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.GBeanLifecycle;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
@@ -45,7 +45,7 @@
* @version $Rev$ $Date$
*/
public class MBeanServerKernelBridge implements GBeanLifecycle {
- private static final Log log = LogFactory.getLog(MBeanServerKernelBridge.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private static final AbstractNameQuery ALL = new AbstractNameQuery(null, Collections.EMPTY_MAP, Collections.EMPTY_SET);
private final HashMap registry = new HashMap();
Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/log4j/Log4jService.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/log4j/Log4jService.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/log4j/Log4jService.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/log4j/Log4jService.java Fri Apr 25 12:11:52 2008
@@ -42,14 +42,9 @@
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogConfigurationException;
-import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.gbean.GBeanLifecycle;
-import org.apache.geronimo.kernel.log.GeronimoLogFactory;
-import org.apache.geronimo.kernel.log.GeronimoLogging;
import org.apache.geronimo.system.logging.SystemLog;
import org.apache.geronimo.system.properties.JvmVendor;
import org.apache.geronimo.system.serverinfo.DirectoryUtils;
@@ -85,7 +80,7 @@
// Pattern that matches a single line (used to calculate line numbers and check for follow-on stack traces)
private final static Pattern FULL_LINE_PATTERN = Pattern.compile("^.*", Pattern.MULTILINE);
- private final static Log log = LogFactory.getLog(Log4jService.class);
+ private final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(getClass());
private static final String LOG4JSERVICE_CONFIG_PROPERTY = "org.apache.geronimo.log4jservice.configuration";
@@ -531,24 +526,11 @@
lastChanged = file.lastModified();
}
- // Record the default console log level
- System.setProperty("org.apache.geronimo.log.ConsoleLogLevel", GeronimoLogging.getConsoleLogLevel().toString());
-
try {
URLConfigurator.configure(file.toURL());
} catch (MalformedURLException e) {
e.printStackTrace();
}
-
- // refresh the level info for every log
- GeronimoLogFactory logFactory = (GeronimoLogFactory) LogFactory.getFactory();
- Set instances = logFactory.getInstances();
- for (Iterator iterator = instances.iterator(); iterator.hasNext();) {
- Object log = iterator.next();
- if (log instanceof CachingLog4jLog) {
- ((CachingLog4jLog)log).updateLevelInfo();
- }
- }
}
private synchronized void schedule() {
@@ -567,39 +549,25 @@
}
public void doStart() {
- LogFactory logFactory = LogFactory.getFactory();
- if (logFactory instanceof GeronimoLogFactory) {
- // Make sure the root Logger has loaded
- Logger logger = LogManager.getRootLogger();
-
- // Change all of the loggers over to use log4j
- GeronimoLogFactory geronimoLogFactory = (GeronimoLogFactory) logFactory;
- synchronized (geronimoLogFactory) {
- if (!(geronimoLogFactory.getLogFactory() instanceof CachingLog4jLogFactory)) {
- geronimoLogFactory.setLogFactory(new CachingLog4jLogFactory());
- }
- }
-
- // Allow users to override the configurationFile which is hardcoded
- // in config.ser and cannot be updated by config.xml, as the
- // AttrbiuteManager comes up after this GBean
- String cfgFile = System.getProperty(LOG4JSERVICE_CONFIG_PROPERTY);
- if ((cfgFile != null) && (!cfgFile.equals(""))) {
- this.configurationFile = cfgFile;
- }
-
- synchronized (this) {
- reconfigure();
+ // Allow users to override the configurationFile which is hardcoded
+ // in config.ser and cannot be updated by config.xml, as the
+ // AttrbiuteManager comes up after this GBean
+ String cfgFile = System.getProperty(LOG4JSERVICE_CONFIG_PROPERTY);
+ if ((cfgFile != null) && (!cfgFile.equals(""))) {
+ this.configurationFile = cfgFile;
+ }
- timer = new Timer(true);
+ synchronized (this) {
+ reconfigure();
- // Periodically check the configuration file
- schedule();
- }
+ timer = new Timer(true);
- logEnvInfo();
+ // Periodically check the configuration file
+ schedule();
}
+ logEnvInfo();
+
synchronized (this) {
running = true;
}
@@ -631,7 +599,6 @@
private void logEnvInfo() {
try {
- Log log = LogFactory.getLog(Log4jService.class);
log.info("----------------------------------------------");
log.info("Started Logging Service");
if (log.isDebugEnabled()) {
@@ -693,34 +660,7 @@
}
}
}
-
- private static class CachingLog4jLogFactory extends LogFactory {
- public Log getInstance(Class clazz) throws LogConfigurationException {
- return getInstance(clazz.getName());
- }
-
- public Log getInstance(String name) throws LogConfigurationException {
- return new CachingLog4jLog(name);
- }
-
- public Object getAttribute(String name) {
- return null;
- }
-
- public String[] getAttributeNames() {
- return new String[0];
- }
-
- public void release() {
- }
-
- public void removeAttribute(String name) {
- }
-
- public void setAttribute(String name, Object value) {
- }
- }
-
+
public static final GBeanInfo GBEAN_INFO;
static {
Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/log4j/URLConfigurator.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/log4j/URLConfigurator.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/log4j/URLConfigurator.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/log4j/URLConfigurator.java Fri Apr 25 12:11:52 2008
@@ -24,8 +24,8 @@
import java.net.URL;
import java.net.URLConnection;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.log4j.LogManager;
import org.apache.log4j.PropertyConfigurator;
import org.apache.log4j.spi.Configurator;
@@ -38,7 +38,7 @@
* @version $Rev$ $Date$
*/
public class URLConfigurator implements Configurator {
- private static final Log log = LogFactory.getLog(URLConfigurator.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
public static void configure(final URL url) {
new URLConfigurator().doConfigure(url, LogManager.getLoggerRepository());
Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/CommandLine.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/CommandLine.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/CommandLine.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/CommandLine.java Fri Apr 25 12:11:52 2008
@@ -26,8 +26,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.common.GeronimoEnvironment;
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.AbstractNameQuery;
@@ -42,7 +42,6 @@
import org.apache.geronimo.kernel.config.NoSuchConfigException;
import org.apache.geronimo.kernel.config.LifecycleMonitor;
import org.apache.geronimo.kernel.config.DebugLoggingLifecycleMonitor;
-import org.apache.geronimo.kernel.log.GeronimoLogging;
import org.apache.geronimo.kernel.repository.Artifact;
import org.apache.geronimo.kernel.repository.MissingDependencyException;
@@ -51,22 +50,15 @@
* @version $Rev$ $Date$
*/
public class CommandLine {
- protected static final Log log;
-
- static {
- // Perform initialization tasks common with the various Geronimo environments.
- GeronimoEnvironment.init();
-
- // This MUST be done before the first log is acquired
- GeronimoLogging.initialize(GeronimoLogging.ERROR);
- log = LogFactory.getLog(CommandLine.class.getName());
- }
-
+ protected final Logger log = LoggerFactory.getLogger(getClass());
+
/**
* Command line entry point called by executable jar
* @param args command line args
*/
public static void main(String[] args) {
+ Logger log = LoggerFactory.getLogger(CommandLine.class);
+
log.info("Server startup begun");
try {
// the interesting entries from the manifest
Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/EmbeddedDaemon.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/EmbeddedDaemon.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/EmbeddedDaemon.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/EmbeddedDaemon.java Fri Apr 25 12:11:52 2008
@@ -25,8 +25,8 @@
import java.util.Set;
import java.util.LinkedHashSet;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.cli.daemon.DaemonCLParser;
import org.apache.geronimo.common.GeronimoEnvironment;
import org.apache.geronimo.gbean.AbstractName;
@@ -48,7 +48,7 @@
* @version $Rev:385659 $ $Date: 2007-03-07 14:40:07 +1100 (Wed, 07 Mar 2007) $
*/
public class EmbeddedDaemon implements Main {
- private static final Log log = LogFactory.getLog(EmbeddedDaemon.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
protected final Kernel kernel;
private StartupMonitor monitor;
Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/SilentStartupMonitor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/SilentStartupMonitor.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/SilentStartupMonitor.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/SilentStartupMonitor.java Fri Apr 25 12:11:52 2008
@@ -19,8 +19,8 @@
import java.util.Iterator;
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.GBeanNotFoundException;
@@ -32,7 +32,7 @@
* @version $Rev$ $Date$
*/
public class SilentStartupMonitor implements StartupMonitor {
- private final static Log log = LogFactory.getLog(SilentStartupMonitor.class.getName());
+ private final Logger log = LoggerFactory.getLogger(getClass());
private Kernel kernel;
Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/StartupMonitorUtil.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/StartupMonitorUtil.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/StartupMonitorUtil.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/StartupMonitorUtil.java Fri Apr 25 12:11:52 2008
@@ -26,8 +26,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.AbstractNameQuery;
import org.apache.geronimo.gbean.GAttributeInfo;
@@ -40,7 +40,7 @@
* @version $Rev$ $Date$
*/
public class StartupMonitorUtil {
- private final static Log log = LogFactory.getLog(StartupMonitor.class.getName());
+ private static final Logger log = LoggerFactory.getLogger(StartupMonitorUtil.class);
public static synchronized void wrapUp(PrintStream out, Kernel kernel) {
List apps = new ArrayList(); // type = String (message)
Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/properties/JvmVendor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/properties/JvmVendor.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/properties/JvmVendor.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/properties/JvmVendor.java Fri Apr 25 12:11:52 2008
@@ -19,15 +19,15 @@
import java.security.Provider;
import java.security.Security;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @version $Rev: 5066 $ $Date: 2007-04-27 12:07:23 -0400 (Fri, 27 Apr 2007) $
*/
public class JvmVendor {
- private static final Log log = LogFactory.getLog(JvmVendor.class);
+ private static final Logger log = LoggerFactory.getLogger(JvmVendor.class);
private static final String JVM_VENDOR_PROPERTY_NAME = "java.vm.vendor";
Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/properties/SystemProperties.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/properties/SystemProperties.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/properties/SystemProperties.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/properties/SystemProperties.java Fri Apr 25 12:11:52 2008
@@ -20,8 +20,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;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.system.serverinfo.ServerInfo;
@@ -31,7 +31,7 @@
*/
public class SystemProperties {
- private final Log log = LogFactory.getLog(SystemProperties.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
public SystemProperties(Properties systemProperties, Properties systemPathProperties, ServerInfo serverInfo, Properties sunSystemProperties, Properties ibmSystemProperties, Properties apacheSystemProperties) {
if (log.isDebugEnabled()) log.debug("Setting systemProperties");
Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/repository/AbstractRepository.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/repository/AbstractRepository.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/repository/AbstractRepository.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/repository/AbstractRepository.java Fri Apr 25 12:11:52 2008
@@ -19,15 +19,15 @@
import java.io.File;
import java.net.URI;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.system.serverinfo.ServerInfo;
/**
* @version $Rev$ $Date$
*/
public abstract class AbstractRepository extends org.apache.geronimo.kernel.repository.AbstractRepository {
- protected static final Log log = LogFactory.getLog(AbstractRepository.class);
+ protected final Logger log = LoggerFactory.getLogger(getClass());
public AbstractRepository(URI root, ServerInfo serverInfo, boolean resolveToServer) {
super(new ServerInfoRootResolver(serverInfo, resolveToServer).resolve(root));
Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/repository/Maven2Repository.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/repository/Maven2Repository.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/repository/Maven2Repository.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/repository/Maven2Repository.java Fri Apr 25 12:11:52 2008
@@ -19,8 +19,8 @@
import java.io.File;
import java.net.URI;
-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.system.serverinfo.ServerInfo;
@@ -30,7 +30,7 @@
*/
public class Maven2Repository extends org.apache.geronimo.kernel.repository.Maven2Repository {
- private static final Log log = LogFactory.getLog(Maven2Repository.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
public Maven2Repository(URI root, ServerInfo serverInfo, boolean resolveToServer) {
super(new ServerInfoRootResolver(serverInfo, resolveToServer).resolve(root));
log.debug("Maven2Repository(root = " + root + ", resolveToServer = "
Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/serverinfo/DirectoryUtils.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/serverinfo/DirectoryUtils.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/serverinfo/DirectoryUtils.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/serverinfo/DirectoryUtils.java Fri Apr 25 12:11:52 2008
@@ -21,14 +21,14 @@
import java.net.URI;
import java.net.URL;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @version $Rev$ $Date$
*/
public final class DirectoryUtils {
- private static final Log log = LogFactory.getLog(DirectoryUtils.class);
+ private static final Logger log = LoggerFactory.getLogger(DirectoryUtils.class);
private static final File geronimoInstallDirectory;
static {
Modified: geronimo/server/trunk/framework/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/pom.xml?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/pom.xml Fri Apr 25 12:11:52 2008
@@ -32,6 +32,19 @@
<name>Geronimo Framework, Modules</name>
<packaging>pom</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
<modules>
<module>geronimo-cli</module>
<module>geronimo-commands</module>
Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml Fri Apr 25 12:11:52 2008
@@ -46,7 +46,6 @@
<dependency>
<groupId>org.apache.pluto</groupId>
<artifactId>pluto-taglib</artifactId>
- <version>${plutoVersion}</version>
<scope>provided</scope>
</dependency>
Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/activemqCF/ActiveMQConnectorHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/activemqCF/ActiveMQConnectorHelper.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/activemqCF/ActiveMQConnectorHelper.java (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/activemqCF/ActiveMQConnectorHelper.java Fri Apr 25 12:11:52 2008
@@ -17,8 +17,8 @@
package org.apache.geronimo.console.jmsmanager.activemqCF;
-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.console.util.ObjectNameConstants;
import org.apache.geronimo.console.util.PortletManager;
@@ -45,7 +45,7 @@
public class ActiveMQConnectorHelper {
//todo: this class is horrible and needs to be burned!
- private final static Log log = LogFactory.getLog(ActiveMQConnectorHelper.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private static String MODULE_FILE;
Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/handlers/CreateDestinationHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/handlers/CreateDestinationHandler.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/handlers/CreateDestinationHandler.java (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/handlers/CreateDestinationHandler.java Fri Apr 25 12:11:52 2008
@@ -28,8 +28,8 @@
import javax.portlet.ActionResponse;
import javax.portlet.PortletException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.console.core.jms.TopicBrowserGBean;
import org.apache.geronimo.console.jmsmanager.AbstractJMSManager;
import org.apache.geronimo.gbean.AbstractName;
@@ -43,8 +43,7 @@
import org.apache.geronimo.kernel.repository.ImportType;
public class CreateDestinationHandler extends AbstractJMSManager implements PortletResponseHandler {
- protected static Log log = LogFactory
- .getLog(CreateDestinationHandler.class);
+ protected final Logger log = LoggerFactory.getLogger(getClass());
private static final Artifact parentId = new Artifact("geronimo", "activemq-broker", org.apache.geronimo.system.serverinfo.ServerConstants.getVersion(), "car");
Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/handlers/RemoveDestinationHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/handlers/RemoveDestinationHandler.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/handlers/RemoveDestinationHandler.java (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/handlers/RemoveDestinationHandler.java Fri Apr 25 12:11:52 2008
@@ -27,8 +27,8 @@
import javax.portlet.ActionResponse;
import javax.portlet.PortletException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.console.jmsmanager.AbstractJMSManager;
import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.gbean.AbstractName;
@@ -41,8 +41,7 @@
public class RemoveDestinationHandler extends AbstractJMSManager implements
PortletResponseHandler {
- protected static Log log = LogFactory
- .getLog(RemoveDestinationHandler.class);
+ protected final Logger log = LoggerFactory.getLogger(getClass());
public void processAction(ActionRequest request, ActionResponse response)
throws IOException, PortletException {
Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/handlers/StatisticsHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/handlers/StatisticsHandler.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/handlers/StatisticsHandler.java (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/handlers/StatisticsHandler.java Fri Apr 25 12:11:52 2008
@@ -23,14 +23,14 @@
import javax.portlet.ActionResponse;
import javax.portlet.PortletException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.console.jmsmanager.AbstractJMSManager;
public class StatisticsHandler extends AbstractJMSManager implements
PortletResponseHandler {
- protected static Log log = LogFactory.getLog(StatisticsHandler.class);
+ protected final Logger log = LoggerFactory.getLogger(getClass());
public void processAction(ActionRequest request, ActionResponse response)
throws IOException, PortletException {
Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/helper/AmqJMSMessageHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/helper/AmqJMSMessageHelper.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/helper/AmqJMSMessageHelper.java (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/helper/AmqJMSMessageHelper.java Fri Apr 25 12:11:52 2008
@@ -32,14 +32,14 @@
import org.apache.activemq.broker.jmx.BrokerViewMBean;
import org.apache.activemq.broker.jmx.QueueViewMBean;
import org.apache.activemq.broker.jmx.TopicViewMBean;
-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 AmqJMSMessageHelper extends JMSMessageHelper {
- private static final Log log = LogFactory.getLog(AmqJMSMessageHelper.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
public void purge(PortletRequest renderRequest, String type, String physicalQName) {
try {
@@ -66,7 +66,7 @@
}
} catch (Exception ex) {
// ignoring the exception
- log.error(ex);
+ log.error("Failed to purge", ex);
}
}
Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/helper/JMSMessageHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/helper/JMSMessageHelper.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/helper/JMSMessageHelper.java (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/helper/JMSMessageHelper.java Fri Apr 25 12:11:52 2008
@@ -40,8 +40,8 @@
import javax.portlet.PortletRequest;
import javax.portlet.RenderRequest;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.console.core.jms.TopicBrowserGBean;
import org.apache.geronimo.console.jmsmanager.JMSMessageInfo;
import org.apache.geronimo.console.util.PortletManager;
@@ -59,7 +59,7 @@
*/
public abstract class JMSMessageHelper {
protected static final Kernel kernel = KernelRegistry.getSingleKernel();
- private static final Log log = LogFactory.getLog(JMSMessageHelper.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
public void sendMessage(RenderRequest request, JMSMessageInfo messageInfo) throws Exception {
Destination dest = getDestination(request, messageInfo.getAdapterObjectName(), messageInfo.getPhysicalName());
@@ -266,7 +266,7 @@
}
} catch (Exception ex) {
// ignore exception
- log.error(ex);
+ log.error("Failed to get destination", ex);
}
return dest;
}
Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/helper/JMSMessageHelperFactory.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/helper/JMSMessageHelperFactory.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/helper/JMSMessageHelperFactory.java (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/helper/JMSMessageHelperFactory.java Fri Apr 25 12:11:52 2008
@@ -20,8 +20,8 @@
import javax.portlet.PortletRequest;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.console.util.PortletManager;
import org.apache.geronimo.management.geronimo.ResourceAdapterModule;
@@ -29,7 +29,7 @@
* @version $Rev$ $Date$
*/
public class JMSMessageHelperFactory {
- private static final Log log = LogFactory.getLog(JMSMessageHelperFactory.class);
+ private static final Logger log = LoggerFactory.getLogger(JMSMessageHelperFactory.class);
public static JMSMessageHelper getMessageHelper(PortletRequest renderRequest, String raName) {
JMSMessageHelper messageHelper = null;
@@ -63,11 +63,11 @@
return messageHelper;
} catch (IllegalAccessException e) {
- log.error(e);
+ log.error(e.toString(), e);
} catch (InstantiationException e) {
- log.error(e);
+ log.error(e.toString(), e);
} catch (ClassNotFoundException e) {
- log.error(e);
+ log.error(e.toString(), e);
}
return messageHelper;
}
Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/renderers/CreateDestinationRenderer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/renderers/CreateDestinationRenderer.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/renderers/CreateDestinationRenderer.java (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/renderers/CreateDestinationRenderer.java Fri Apr 25 12:11:52 2008
@@ -23,15 +23,14 @@
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.console.jmsmanager.AbstractJMSManager;
public class CreateDestinationRenderer extends AbstractJMSManager implements
PortletRenderer {
- protected static Log log = LogFactory
- .getLog(CreateDestinationRenderer.class);
+ protected final Logger log = LoggerFactory.getLogger(getClass());
public String render(RenderRequest request, RenderResponse response)
throws PortletException, IOException {
Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/renderers/StatisticsRenderer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/renderers/StatisticsRenderer.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/renderers/StatisticsRenderer.java (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/renderers/StatisticsRenderer.java Fri Apr 25 12:11:52 2008
@@ -24,14 +24,14 @@
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.console.jmsmanager.AbstractJMSManager;
public class StatisticsRenderer extends AbstractJMSManager implements
PortletRenderer {
- protected static Log log = LogFactory.getLog(StatisticsRenderer.class);
+ protected final Logger log = LoggerFactory.getLogger(getClass());
public String render(RenderRequest request, RenderResponse response)
throws PortletException, IOException {
Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/renderers/ViewDLQRenderer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/renderers/ViewDLQRenderer.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/renderers/ViewDLQRenderer.java (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/renderers/ViewDLQRenderer.java Fri Apr 25 12:11:52 2008
@@ -38,12 +38,12 @@
import org.apache.geronimo.console.jmsmanager.AbstractJMSManager;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.gbean.AbstractName;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ViewDLQRenderer extends AbstractJMSManager implements PortletRenderer {
- private static final Log log = LogFactory.getLog(ViewDLQRenderer.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private Destination dlq = null;
Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/renderers/ViewDestinationsRenderer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/renderers/ViewDestinationsRenderer.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/renderers/ViewDestinationsRenderer.java (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/renderers/ViewDestinationsRenderer.java Fri Apr 25 12:11:52 2008
@@ -30,8 +30,8 @@
import javax.portlet.RenderResponse;
import javax.jms.Destination;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.console.jmsmanager.AbstractJMSManager;
import org.apache.geronimo.console.jmsmanager.DestinationInfo;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
@@ -44,8 +44,7 @@
public class ViewDestinationsRenderer extends AbstractJMSManager implements
PortletRenderer {
- protected static Log log = LogFactory
- .getLog(ViewDestinationsRenderer.class);
+ protected final Logger log = LoggerFactory.getLogger(getClass());
public String render(RenderRequest request, RenderResponse response)
throws PortletException, IOException {
@@ -105,7 +104,7 @@
configURI);
destinationInfos.add(info);
} catch (Exception e) {
- log.error(e);
+ log.error("Failed to get destinations list", e);
}
}
Collections.sort(destinationInfos);
Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/renderers/ViewMessagesRenderer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/renderers/ViewMessagesRenderer.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/renderers/ViewMessagesRenderer.java (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/renderers/ViewMessagesRenderer.java Fri Apr 25 12:11:52 2008
@@ -43,13 +43,13 @@
import org.apache.geronimo.console.jmsmanager.AbstractJMSManager;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.gbean.AbstractName;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ViewMessagesRenderer extends AbstractJMSManager implements
PortletRenderer {
- private static final Log log = LogFactory.getLog(ViewMessagesRenderer.class);
+ private static final Logger log = LoggerFactory.getLogger(ViewMessagesRenderer.class);
private static final TopicListener topicListener = new TopicListener();
Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/server/JMSBrokerPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/server/JMSBrokerPortlet.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/server/JMSBrokerPortlet.java (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/server/JMSBrokerPortlet.java Fri Apr 25 12:11:52 2008
@@ -30,8 +30,8 @@
import org.apache.geronimo.console.util.PortletManager;
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.management.geronimo.JMSManager;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Basic list of JMS brokers
@@ -39,7 +39,7 @@
* @version $Rev$ $Date$
*/
public class JMSBrokerPortlet extends BaseJMSPortlet {
- private final static Log log = LogFactory.getLog(JMSBrokerPortlet.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private PortletRequestDispatcher normalView;
private PortletRequestDispatcher maximizedView;
Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/server/JMSConnectorPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/server/JMSConnectorPortlet.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/server/JMSConnectorPortlet.java (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/server/JMSConnectorPortlet.java Fri Apr 25 12:11:52 2008
@@ -37,8 +37,8 @@
import org.apache.geronimo.management.geronimo.JMSManager;
import org.apache.geronimo.management.geronimo.JMSBroker;
import org.apache.geronimo.gbean.AbstractName;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* List, edit, add, remove JMS network connectors
@@ -46,7 +46,7 @@
* @version $Rev$ $Date$
*/
public class JMSConnectorPortlet extends BaseJMSPortlet {
- private final static Log log = LogFactory.getLog(JMSConnectorPortlet.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
private PortletRequestDispatcher normalView;
Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/AbstractHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/AbstractHandler.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/AbstractHandler.java (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/AbstractHandler.java Fri Apr 25 12:11:52 2008
@@ -36,8 +36,8 @@
import javax.portlet.ActionResponse;
import javax.portlet.PortletRequest;
import javax.portlet.PortletSession;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.connector.deployment.jsr88.AdminObjectDCB;
import org.apache.geronimo.connector.deployment.jsr88.AdminObjectInstance;
import org.apache.geronimo.connector.deployment.jsr88.ConnectionDefinition;
@@ -62,7 +62,7 @@
* @version $Rev$ $Date$
*/
public abstract class AbstractHandler extends MultiPageAbstractHandler {
- private final static Log log = LogFactory.getLog(AbstractHandler.class);
+ private static final Logger log = LoggerFactory.getLogger(AbstractHandler.class);
// ********** This part specific to JMS portlets **********
protected final static String LIST_MODE="list";
Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/JMSProviderData.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/JMSProviderData.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/JMSProviderData.java (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/JMSProviderData.java Fri Apr 25 12:11:52 2008
@@ -33,8 +33,8 @@
import javax.xml.parsers.DocumentBuilder;
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.console.util.PortletManager;
import org.apache.geronimo.kernel.util.XmlUtil;
import org.w3c.dom.Document;
@@ -50,7 +50,7 @@
* @version $Rev$ $Date$
*/
public class JMSProviderData implements Serializable {
- private final static Log log = LogFactory.getLog(JMSProviderData.class);
+ private static final Logger log = LoggerFactory.getLogger(JMSProviderData.class);
private String name;
private final String raURI;
private final String dependency;
Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/ListScreenHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/ListScreenHandler.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/ListScreenHandler.java (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/ListScreenHandler.java Fri Apr 25 12:11:52 2008
@@ -42,8 +42,8 @@
import org.apache.geronimo.management.geronimo.JCAResource;
import org.apache.geronimo.management.geronimo.ResourceAdapter;
import org.apache.geronimo.management.geronimo.ResourceAdapterModule;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A handles for the front page that lists available resources.
@@ -51,7 +51,7 @@
* @version $Rev$ $Date$
*/
public class ListScreenHandler extends AbstractHandler {
- private static final Log log = LogFactory.getLog(ListScreenHandler.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
public ListScreenHandler() {
super(LIST_MODE, "/WEB-INF/view/jmswizard/list.jsp");
@@ -182,8 +182,7 @@
try {
physicalName = (String) admins[j].getConfigProperty("PhysicalName");
} catch (Exception e) {
- log.warn(e);
- log.warn("PhysicalName undefined, using queueName as PhysicalName");
+ log.warn("PhysicalName undefined, using queueName as PhysicalName", e);
physicalName = queueName;
}
target.getAdminObjects().add(
Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/SendMessageHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/SendMessageHandler.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/SendMessageHandler.java (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/SendMessageHandler.java Fri Apr 25 12:11:52 2008
@@ -26,8 +26,8 @@
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.geronimo.console.MultiPageModel;
import org.apache.geronimo.console.jmsmanager.JMSMessageInfo;
import org.apache.geronimo.console.jmsmanager.helper.AmqJMSMessageHelper;
@@ -40,7 +40,7 @@
* @version $Rev$ $Date$
*/
public class SendMessageHandler extends AbstractHandler {
- private static final Log log = LogFactory.getLog(SendMessageHandler.class);
+ private final Logger log = LoggerFactory.getLogger(getClass());
public SendMessageHandler() {
super(SEND_MESSAGE, "/WEB-INF/view/jmsmanager/sendMessage.jsp");
@@ -136,7 +136,7 @@
request.setAttribute(STATUS, "success");
} catch (Exception e) {
request.setAttribute(STATUS, "error");
- log.error(e);
+ log.error("Failed to render view", e);
// throw new PortletException(e);
}
}
Modified: geronimo/server/trunk/plugins/activemq/geronimo-activemq/src/main/java/org/apache/geronimo/activemq/BrokerServiceGBeanImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/geronimo-activemq/src/main/java/org/apache/geronimo/activemq/BrokerServiceGBeanImpl.java?rev=651684&r1=651683&r2=651684&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/geronimo-activemq/src/main/java/org/apache/geronimo/activemq/BrokerServiceGBeanImpl.java (original)
+++ geronimo/server/trunk/plugins/activemq/geronimo-activemq/src/main/java/org/apache/geronimo/activemq/BrokerServiceGBeanImpl.java Fri Apr 25 12:11:52 2008
@@ -28,8 +28,8 @@
import org.apache.activemq.broker.jmx.ManagementContext;
import org.apache.activemq.store.DefaultPersistenceAdapterFactory;
import org.apache.activemq.transport.TransportDisposedIOException;
-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;
@@ -46,7 +46,7 @@
*/
public class BrokerServiceGBeanImpl implements GBeanLifecycle, BrokerServiceGBean {
- private Log log = LogFactory.getLog(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
private String brokerName;
private String brokerUri;