[jboss-svn-commits] JBoss Common SVN: r4821 - in jboss-logging/trunk: src/main/java/org/jboss/logging and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Jul 29 19:24:50 EDT 2010
Author: david.lloyd at jboss.com
Date: 2010-07-29 19:24:50 -0400 (Thu, 29 Jul 2010)
New Revision: 4821
Modified:
jboss-logging/trunk/pom.xml
jboss-logging/trunk/src/main/java/org/jboss/logging/JBossLogManagerLogger.java
jboss-logging/trunk/src/main/java/org/jboss/logging/JBossLogManagerProvider.java
jboss-logging/trunk/src/main/java/org/jboss/logging/JDKLogger.java
jboss-logging/trunk/src/main/java/org/jboss/logging/JDKLoggerProvider.java
jboss-logging/trunk/src/main/java/org/jboss/logging/Log4jLogger.java
jboss-logging/trunk/src/main/java/org/jboss/logging/Log4jLoggerProvider.java
jboss-logging/trunk/src/main/java/org/jboss/logging/Logger.java
jboss-logging/trunk/src/main/java/org/jboss/logging/LoggerProvider.java
jboss-logging/trunk/src/main/java/org/jboss/logging/SerializedLogger.java
jboss-logging/trunk/src/main/java/org/jboss/logging/Slf4jLocationAwareLogger.java
jboss-logging/trunk/src/main/java/org/jboss/logging/Slf4jLogger.java
jboss-logging/trunk/src/main/java/org/jboss/logging/Slf4jLoggerProvider.java
Log:
Cleanup: use newer logmanager, clean up POM, remove deprecated methods
Modified: jboss-logging/trunk/pom.xml
===================================================================
--- jboss-logging/trunk/pom.xml 2010-07-29 22:21:59 UTC (rev 4820)
+++ jboss-logging/trunk/pom.xml 2010-07-29 23:24:50 UTC (rev 4821)
@@ -34,15 +34,17 @@
<connection>scm:svn:https://svn.jboss.org/repos/common/jboss-logging/trunk/</connection>
</scm>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
+ <parent>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-parent</artifactId>
+ <version>5</version>
+ </parent>
<dependencies>
<dependency>
<groupId>org.jboss.logmanager</groupId>
<artifactId>jboss-logmanager</artifactId>
- <version>1.2.0.CR1</version>
+ <version>1.2.0.CR4</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -72,39 +74,13 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
- <version>2.1.1</version>
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>verify</phase>
- <goals>
- <goal>jar-no-fork</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.6.1</version>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <phase>verify</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
<configuration>
<detectJavaApiLink>false</detectJavaApiLink>
<detectLinks>false</detectLinks>
@@ -114,9 +90,9 @@
<artifactId>apiviz</artifactId>
<version>1.2.5.GA</version>
</docletArtifact>
- <doctitle><![CDATA[JBoss Logging ]]>${version}</doctitle>
- <header><![CDATA[JBoss Logging ]]>${version}</header>
- <footer><![CDATA[JBoss Logging ]]>${version}</footer>
+ <doctitle><![CDATA[JBoss Logging ]]>${project.version}</doctitle>
+ <header><![CDATA[JBoss Logging ]]>${project.version}</header>
+ <footer><![CDATA[JBoss Logging ]]>${project.version}</footer>
<bottom><![CDATA[<i>Copyright © 2010 JBoss, a division of Red Hat, Inc.</i>]]></bottom>
<links>
<link>http://java.sun.com/javase/6/docs/api/</link>
@@ -125,13 +101,4 @@
</plugin>
</plugins>
</build>
-
- <distributionManagement>
- <repository>
- <id>repository.jboss.org</id>
- <name>JBoss Maven2 Repository</name>
- <url>http://repository.jboss.org/maven2</url>
- </repository>
- </distributionManagement>
-
</project>
\ No newline at end of file
Modified: jboss-logging/trunk/src/main/java/org/jboss/logging/JBossLogManagerLogger.java
===================================================================
--- jboss-logging/trunk/src/main/java/org/jboss/logging/JBossLogManagerLogger.java 2010-07-29 22:21:59 UTC (rev 4820)
+++ jboss-logging/trunk/src/main/java/org/jboss/logging/JBossLogManagerLogger.java 2010-07-29 23:24:50 UTC (rev 4821)
@@ -30,8 +30,8 @@
private final org.jboss.logmanager.Logger logger;
- JBossLogManagerLogger(final String name, final String resourceBundleName, final String prefix, final org.jboss.logmanager.Logger logger) {
- super(name, resourceBundleName, prefix);
+ JBossLogManagerLogger(final String name, final org.jboss.logmanager.Logger logger) {
+ super(name);
this.logger = logger;
}
Modified: jboss-logging/trunk/src/main/java/org/jboss/logging/JBossLogManagerProvider.java
===================================================================
--- jboss-logging/trunk/src/main/java/org/jboss/logging/JBossLogManagerProvider.java 2010-07-29 22:21:59 UTC (rev 4820)
+++ jboss-logging/trunk/src/main/java/org/jboss/logging/JBossLogManagerProvider.java 2010-07-29 23:24:50 UTC (rev 4821)
@@ -25,6 +25,7 @@
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.Map;
+import org.jboss.logmanager.LogContext;
import org.jboss.logmanager.MDC;
import org.jboss.logmanager.NDC;
@@ -34,47 +35,32 @@
private static final AttachmentKey<Logger> KEY = new AttachmentKey<Logger>();
- public Logger getLogger(final String name, final String resourceBundleName, final String prefix) {
+ public Logger getLogger(final String name) {
final SecurityManager sm = System.getSecurityManager();
if (sm != null) {
return AccessController.doPrivileged(new PrivilegedAction<Logger>() {
public Logger run() {
- return doGetLogger(name, resourceBundleName, prefix);
+ return doGetLogger(name);
}
});
} else {
- return doGetLogger(name, resourceBundleName, prefix);
+ return doGetLogger(name);
}
}
- private static Logger doGetLogger(final String name, final String resourceBundleName, final String prefix) {
- final org.jboss.logmanager.Logger logger;
- if (resourceBundleName != null) {
- logger = org.jboss.logmanager.Logger.getLogger(name, resourceBundleName);
+ private static Logger doGetLogger(final String name) {
+ Logger l = LogContext.getLogContext().getAttachment(name, KEY);
+ if (l != null) {
+ return l;
+ }
+ final org.jboss.logmanager.Logger logger = org.jboss.logmanager.Logger.getLogger(name);
+ l = new JBossLogManagerLogger(name, logger);
+ Logger a = logger.attachIfAbsent(KEY, l);
+ if (a == null) {
+ return l;
} else {
- logger = org.jboss.logmanager.Logger.getLogger(name);
+ return a;
}
- Logger l = logger.getAttachment(KEY);
- for (;;) {
- if (l != null) {
- if (prefix == null) {
- if (l.getPrefix() == null) {
- return l;
- }
- } else if (prefix.equals(l.getPrefix())) {
- return l;
- }
- return new JBossLogManagerLogger(name, resourceBundleName, prefix, logger);
- } else {
- l = new JBossLogManagerLogger(name, resourceBundleName, prefix, logger);
- Logger a = logger.attachIfAbsent(KEY, l);
- if (a == null) {
- return l;
- }
- l = a;
- // try again...
- }
- }
}
public Object putMdc(final String key, final Object value) {
Modified: jboss-logging/trunk/src/main/java/org/jboss/logging/JDKLogger.java
===================================================================
--- jboss-logging/trunk/src/main/java/org/jboss/logging/JDKLogger.java 2010-07-29 22:21:59 UTC (rev 4820)
+++ jboss-logging/trunk/src/main/java/org/jboss/logging/JDKLogger.java 2010-07-29 23:24:50 UTC (rev 4821)
@@ -32,13 +32,9 @@
@SuppressWarnings({ "NonConstantLogger" })
private transient final java.util.logging.Logger logger;
- public JDKLogger(final String name, final String resourceBundleName, final String prefix) {
- super(name, resourceBundleName, prefix);
- if (resourceBundleName == null) {
- logger = java.util.logging.Logger.getLogger(name);
- } else {
- logger = java.util.logging.Logger.getLogger(name, resourceBundleName);
- }
+ public JDKLogger(final String name) {
+ super(name);
+ logger = java.util.logging.Logger.getLogger(name);
}
protected void doLog(final Level level, final String loggerClassName, final Object message, final Object[] parameters, final Throwable thrown) {
Modified: jboss-logging/trunk/src/main/java/org/jboss/logging/JDKLoggerProvider.java
===================================================================
--- jboss-logging/trunk/src/main/java/org/jboss/logging/JDKLoggerProvider.java 2010-07-29 22:21:59 UTC (rev 4820)
+++ jboss-logging/trunk/src/main/java/org/jboss/logging/JDKLoggerProvider.java 2010-07-29 23:24:50 UTC (rev 4821)
@@ -24,7 +24,7 @@
final class JDKLoggerProvider extends AbstractMdcLoggerProvider implements LoggerProvider {
- public Logger getLogger(final String name, final String resourceBundleName, final String prefix) {
- return new JDKLogger(name, resourceBundleName, prefix);
+ public Logger getLogger(final String name) {
+ return new JDKLogger(name);
}
}
Modified: jboss-logging/trunk/src/main/java/org/jboss/logging/Log4jLogger.java
===================================================================
--- jboss-logging/trunk/src/main/java/org/jboss/logging/Log4jLogger.java 2010-07-29 22:21:59 UTC (rev 4820)
+++ jboss-logging/trunk/src/main/java/org/jboss/logging/Log4jLogger.java 2010-07-29 23:24:50 UTC (rev 4821)
@@ -30,8 +30,8 @@
private final org.apache.log4j.Logger logger;
- Log4jLogger(final String name, final String resourceBundleName, final String prefix) {
- super(name, resourceBundleName, prefix);
+ Log4jLogger(final String name) {
+ super(name);
logger = org.apache.log4j.Logger.getLogger(name);
}
Modified: jboss-logging/trunk/src/main/java/org/jboss/logging/Log4jLoggerProvider.java
===================================================================
--- jboss-logging/trunk/src/main/java/org/jboss/logging/Log4jLoggerProvider.java 2010-07-29 22:21:59 UTC (rev 4820)
+++ jboss-logging/trunk/src/main/java/org/jboss/logging/Log4jLoggerProvider.java 2010-07-29 23:24:50 UTC (rev 4821)
@@ -29,8 +29,8 @@
final class Log4jLoggerProvider implements LoggerProvider {
- public Logger getLogger(final String name, final String resourceBundleName, final String prefix) {
- return new Log4jLogger(name, resourceBundleName, prefix);
+ public Logger getLogger(final String name) {
+ return new Log4jLogger(name);
}
public Object getMdc(String key) {
Modified: jboss-logging/trunk/src/main/java/org/jboss/logging/Logger.java
===================================================================
--- jboss-logging/trunk/src/main/java/org/jboss/logging/Logger.java 2010-07-29 22:21:59 UTC (rev 4820)
+++ jboss-logging/trunk/src/main/java/org/jboss/logging/Logger.java 2010-07-29 23:24:50 UTC (rev 4821)
@@ -49,20 +49,14 @@
}
private final String name;
- private final String resourceBundleName;
- private final String prefix;
/**
* Construct a new instance.
*
* @param name the logger category name
- * @param resourceBundleName the resource bundle name or {@code null} for none
- * @param prefix the log message prefix string
*/
- protected Logger(final String name, final String resourceBundleName, final String prefix) {
+ protected Logger(final String name) {
this.name = name;
- this.resourceBundleName = resourceBundleName;
- this.prefix = prefix;
}
/**
@@ -75,15 +69,6 @@
}
/**
- * Get the log message prefix string.
- *
- * @return the log message prefix string
- */
- public String getPrefix() {
- return prefix;
- }
-
- /**
* Implementation log method (standard parameter formatting).
*
* @param level the level
@@ -2165,53 +2150,10 @@
* @return the canonical logger instance
*/
protected final Object writeReplace() {
- return new SerializedLogger(name, resourceBundleName);
+ return new SerializedLogger(name);
}
/**
- * Get a logger instance with the given name using the given resource bundle (if supported by the underlying
- * framework).
- *
- * @param name the logger category name
- * @param resourceBundleName the resource bundle name
- *
- * @return the logger
- */
- @Deprecated
- public static Logger getI18nLogger(String name, String resourceBundleName) {
- return LoggerProviders.PROVIDER.getLogger(name, resourceBundleName, null);
- }
-
- /**
- * Get a logger instance with the given name using the given resource bundle (if supported by the underlying
- * framework).
- *
- * @param name the logger category name
- * @param resourceBundleName the resource bundle name
- * @param prefix the log message ID subsystem prefix to use
- *
- * @return the logger
- */
- @Deprecated
- public static Logger getI18nLogger(String name, String resourceBundleName, String prefix) {
- return LoggerProviders.PROVIDER.getLogger(name, resourceBundleName, prefix);
- }
-
- /**
- * Get a logger instance with the given name using the given resource bundle (if supported by the underlying
- * framework).
- *
- * @param clazz the class whose name will be used as the logger category name
- * @param resourceBundleName the resource bundle name
- *
- * @return the logger
- */
- @Deprecated
- public static Logger getI18nLogger(Class<?> clazz, String resourceBundleName) {
- return LoggerProviders.PROVIDER.getLogger(clazz.getName(), resourceBundleName, null);
- }
-
- /**
* Get a Logger instance given the logger name.
*
* @param name the logger name
@@ -2219,7 +2161,7 @@
* @return the logger
*/
public static Logger getLogger(String name) {
- return LoggerProviders.PROVIDER.getLogger(name, null, null);
+ return LoggerProviders.PROVIDER.getLogger(name);
}
/**
Modified: jboss-logging/trunk/src/main/java/org/jboss/logging/LoggerProvider.java
===================================================================
--- jboss-logging/trunk/src/main/java/org/jboss/logging/LoggerProvider.java 2010-07-29 22:21:59 UTC (rev 4820)
+++ jboss-logging/trunk/src/main/java/org/jboss/logging/LoggerProvider.java 2010-07-29 23:24:50 UTC (rev 4821)
@@ -25,7 +25,7 @@
import java.util.Map;
public interface LoggerProvider {
- Logger getLogger(String name, String resourceBundleName, String prefix);
+ Logger getLogger(String name);
Object putMdc(String key, Object value);
Modified: jboss-logging/trunk/src/main/java/org/jboss/logging/SerializedLogger.java
===================================================================
--- jboss-logging/trunk/src/main/java/org/jboss/logging/SerializedLogger.java 2010-07-29 22:21:59 UTC (rev 4820)
+++ jboss-logging/trunk/src/main/java/org/jboss/logging/SerializedLogger.java 2010-07-29 23:24:50 UTC (rev 4821)
@@ -29,18 +29,12 @@
private static final long serialVersionUID = 508779982439435831L;
private final String name;
- private final String resourceBundleName;
- SerializedLogger(final String name, final String resourceBundleName) {
+ SerializedLogger(final String name) {
this.name = name;
- this.resourceBundleName = resourceBundleName;
}
protected Object readResolve() {
- if (resourceBundleName != null) {
- return Logger.getI18nLogger(name, resourceBundleName);
- } else {
- return Logger.getLogger(name);
- }
+ return Logger.getLogger(name);
}
}
Modified: jboss-logging/trunk/src/main/java/org/jboss/logging/Slf4jLocationAwareLogger.java
===================================================================
--- jboss-logging/trunk/src/main/java/org/jboss/logging/Slf4jLocationAwareLogger.java 2010-07-29 22:21:59 UTC (rev 4820)
+++ jboss-logging/trunk/src/main/java/org/jboss/logging/Slf4jLocationAwareLogger.java 2010-07-29 23:24:50 UTC (rev 4821)
@@ -31,8 +31,8 @@
private final LocationAwareLogger logger;
- Slf4jLocationAwareLogger(final String name, final String resourceBundleName, final String prefix, final LocationAwareLogger logger) {
- super(name, resourceBundleName, prefix);
+ Slf4jLocationAwareLogger(final String name, final LocationAwareLogger logger) {
+ super(name);
this.logger = logger;
}
Modified: jboss-logging/trunk/src/main/java/org/jboss/logging/Slf4jLogger.java
===================================================================
--- jboss-logging/trunk/src/main/java/org/jboss/logging/Slf4jLogger.java 2010-07-29 22:21:59 UTC (rev 4820)
+++ jboss-logging/trunk/src/main/java/org/jboss/logging/Slf4jLogger.java 2010-07-29 23:24:50 UTC (rev 4821)
@@ -30,8 +30,8 @@
private final org.slf4j.Logger logger;
- Slf4jLogger(final String name, final String resourceBundleName, final String prefix, final org.slf4j.Logger logger) {
- super(name, resourceBundleName, prefix);
+ Slf4jLogger(final String name, final org.slf4j.Logger logger) {
+ super(name);
this.logger = logger;
}
Modified: jboss-logging/trunk/src/main/java/org/jboss/logging/Slf4jLoggerProvider.java
===================================================================
--- jboss-logging/trunk/src/main/java/org/jboss/logging/Slf4jLoggerProvider.java 2010-07-29 22:21:59 UTC (rev 4820)
+++ jboss-logging/trunk/src/main/java/org/jboss/logging/Slf4jLoggerProvider.java 2010-07-29 23:24:50 UTC (rev 4821)
@@ -29,12 +29,12 @@
final class Slf4jLoggerProvider extends AbstractLoggerProvider implements LoggerProvider {
- public Logger getLogger(final String name, final String resourceBundleName, final String prefix) {
+ public Logger getLogger(final String name) {
org.slf4j.Logger l = LoggerFactory.getLogger(name);
if (l instanceof LocationAwareLogger) {
- return new Slf4jLocationAwareLogger(name, resourceBundleName, prefix, (LocationAwareLogger) l);
+ return new Slf4jLocationAwareLogger(name, (LocationAwareLogger) l);
} else {
- return new Slf4jLogger(name, resourceBundleName, prefix, l);
+ return new Slf4jLogger(name, l);
}
}
More information about the jboss-svn-commits
mailing list