Author: psmith
Date: Thu Apr 26 20:05:43 2007
New Revision: 532941
URL: http://svn.apache.org/viewvc?view=rev&rev=532941
Log:
Renaming complete, all tests passing again.
Added:
logging/sandbox/juli-to-log4j-bridge/src/test/java/org/apache/logging/julbridge/JULLog4jBridgeTest.java
- copied, changed from r532939,
logging/sandbox/juli-to-log4j-bridge/src/test/java/org/apache/logging/julbridge/JuliLog4jBridgeTest.java
Removed:
logging/sandbox/juli-to-log4j-bridge/src/test/java/org/apache/logging/julbridge/JuliLog4jBridgeTest.java
Modified:
logging/sandbox/juli-to-log4j-bridge/src/main/java/org/apache/logging/julbridge/JULBridgeFilter.java
logging/sandbox/juli-to-log4j-bridge/src/main/java/org/apache/logging/julbridge/JULBridgeHandler.java
logging/sandbox/juli-to-log4j-bridge/src/main/java/org/apache/logging/julbridge/JULLevelConverter.java
logging/sandbox/juli-to-log4j-bridge/src/main/java/org/apache/logging/julbridge/JULLog4jBridge.java
logging/sandbox/juli-to-log4j-bridge/src/main/java/org/apache/logging/julbridge/JULLog4jEventConverter.java
logging/sandbox/juli-to-log4j-bridge/src/test/java/org/apache/logging/julbridge/MockAppender.java
logging/sandbox/juli-to-log4j-bridge/src/test/java/org/apache/logging/julbridge/TestLogPosting.java
Modified:
logging/sandbox/juli-to-log4j-bridge/src/main/java/org/apache/logging/julbridge/JULBridgeFilter.java
URL:
http://svn.apache.org/viewvc/logging/sandbox/juli-to-log4j-bridge/src/main/java/org/apache/logging/julbridge/JULBridgeFilter.java?view=diff&rev=532941&r1=532940&r2=532941
==============================================================================
---
logging/sandbox/juli-to-log4j-bridge/src/main/java/org/apache/logging/julbridge/JULBridgeFilter.java
(original)
+++
logging/sandbox/juli-to-log4j-bridge/src/main/java/org/apache/logging/julbridge/JULBridgeFilter.java
Thu Apr 26 20:05:43 2007
@@ -8,7 +8,7 @@
* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied. See the License
* for the specific language governing permissions and limitations under the
License.
*/
-package org.apache.logging.julibridge;
+package org.apache.logging.julbridge;
import java.util.logging.Filter;
import java.util.logging.LogRecord;
@@ -34,14 +34,14 @@
*
* @author psmith
*/
-class JuliBridgeFilter implements Filter {
+class JULBridgeFilter implements Filter {
private final Logger loggerToPostTo;
- private final JuliLog4jEventConverter converter;
+ private final JULLog4jEventConverter converter;
private final Filter existingJuliFilter;
- public JuliBridgeFilter(final Filter existingJuliFilter, Logger
loggerToPostTo,
- JuliLog4jEventConverter converter) {
+ public JULBridgeFilter(final Filter existingJuliFilter, Logger
loggerToPostTo,
+ JULLog4jEventConverter converter) {
this.existingJuliFilter = existingJuliFilter;
this.loggerToPostTo = loggerToPostTo;
this.converter = converter;
Modified:
logging/sandbox/juli-to-log4j-bridge/src/main/java/org/apache/logging/julbridge/JULBridgeHandler.java
URL:
http://svn.apache.org/viewvc/logging/sandbox/juli-to-log4j-bridge/src/main/java/org/apache/logging/julbridge/JULBridgeHandler.java?view=diff&rev=532941&r1=532940&r2=532941
==============================================================================
---
logging/sandbox/juli-to-log4j-bridge/src/main/java/org/apache/logging/julbridge/JULBridgeHandler.java
(original)
+++
logging/sandbox/juli-to-log4j-bridge/src/main/java/org/apache/logging/julbridge/JULBridgeHandler.java
Thu Apr 26 20:05:43 2007
@@ -8,7 +8,7 @@
* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied. See the License
* for the specific language governing permissions and limitations under the
License.
*/
-package org.apache.logging.julibridge;
+package org.apache.logging.julbridge;
import java.util.logging.Handler;
import java.util.logging.LogRecord;
@@ -26,12 +26,12 @@
* @author psmith
*
*/
-class JuliBridgeHandler extends Handler{
+class JULBridgeHandler extends Handler{
private final LoggerRepository repository;
- private final JuliLog4jEventConverter converter;
+ private final JULLog4jEventConverter converter;
- public JuliBridgeHandler(LoggerRepository repository,
JuliLog4jEventConverter converter) {
+ public JULBridgeHandler(LoggerRepository repository,
JULLog4jEventConverter converter) {
this.repository = repository;
this.converter = converter;
}
Modified:
logging/sandbox/juli-to-log4j-bridge/src/main/java/org/apache/logging/julbridge/JULLevelConverter.java
URL:
http://svn.apache.org/viewvc/logging/sandbox/juli-to-log4j-bridge/src/main/java/org/apache/logging/julbridge/JULLevelConverter.java?view=diff&rev=532941&r1=532940&r2=532941
==============================================================================
---
logging/sandbox/juli-to-log4j-bridge/src/main/java/org/apache/logging/julbridge/JULLevelConverter.java
(original)
+++
logging/sandbox/juli-to-log4j-bridge/src/main/java/org/apache/logging/julbridge/JULLevelConverter.java
Thu Apr 26 20:05:43 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.logging.julibridge;
+package org.apache.logging.julbridge;
import org.apache.log4j.Level;
@@ -25,7 +25,7 @@
* @author psmith
*
*/
-public interface JuliLevelConverter {
+public interface JULLevelConverter {
/**
* Convertes a java.util.logging.Level class into an appropriate
Modified:
logging/sandbox/juli-to-log4j-bridge/src/main/java/org/apache/logging/julbridge/JULLog4jBridge.java
URL:
http://svn.apache.org/viewvc/logging/sandbox/juli-to-log4j-bridge/src/main/java/org/apache/logging/julbridge/JULLog4jBridge.java?view=diff&rev=532941&r1=532940&r2=532941
==============================================================================
---
logging/sandbox/juli-to-log4j-bridge/src/main/java/org/apache/logging/julbridge/JULLog4jBridge.java
(original)
+++
logging/sandbox/juli-to-log4j-bridge/src/main/java/org/apache/logging/julbridge/JULLog4jBridge.java
Thu Apr 26 20:05:43 2007
@@ -8,7 +8,7 @@
* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied. See the License
* for the specific language governing permissions and limitations under the
License.
*/
-package org.apache.logging.julibridge;
+package org.apache.logging.julbridge;
import java.util.logging.Filter;
import java.util.logging.Level;
@@ -34,16 +34,16 @@
* </p>
* <p>
* The <code>assimilate</code>-style methods are much more dramatic, in that
they are designed to
- * completely take over the juli-logging, and route all events into log4j.
This mechanism resets the
+ * completely take over the JUL-logging, and route all events into log4j. This
mechanism resets the
* java.util.logging framework configuration to it's default state, which has
default [EMAIL PROTECTED] Level}
- * configured at INFO, and then configures the root juli Logger with the
matching Level that the
- * provided LoggerRepository has been configured. You should, therefore,
assimilate the juli logging
+ * configured at INFO, and then configures the root JUL Logger with the
matching Level that the
+ * provided LoggerRepository has been configured. You should, therefore,
assimilate the JUL logging
* system after the log4j system has been properly configured. You should
consider whether the
- * default [EMAIL PROTECTED] JuliLevelConverter} is appropriate to your needs,
you may optionally provide your
+ * default [EMAIL PROTECTED] JULLevelConverter} is appropriate to your needs,
you may optionally provide your
* own conversion instance to map the 2 Level classes.
* </p>
* <p>
- * The assimilate approach is very useful for the general case where you wish
to forget about juli
+ * The assimilate approach is very useful for the general case where you wish
to forget about JUL
* logging and use the flexibility of the log4j system. There is an ever so
slightly higher cost in
* routing the event into log4j using this approach because each LogRecord
received must
* lookup a named [EMAIL PROTECTED] Logger}. The <code>bridge</code>-style
approach is slightly faster
@@ -52,44 +52,44 @@
* to specify each and every Logger you want to bridge.
* </p>
*
- * @see JuliLevelConverter
- * @see JuliLog4jEventConverter#DEFAULT_LEVEL_CONVERTER
+ * @see JULLevelConverter
+ * @see JULLog4jEventConverter#DEFAULT_LEVEL_CONVERTER
* @author psmith
*/
-public class JuliLog4jBridge {
+public class JULLog4jBridge {
/**
* Convenience method that gathers the default LoggerRepository and uses a
default Level
* Converter implemenation.
*
- * @param juliLoggerName
+ * @param JULLoggerName
*/
- public static void bridgeJuliLogger(String juliLoggerName) {
- bridgeJuliLogger(juliLoggerName, LogManager.getLoggerRepository(),
- JuliLog4jEventConverter.DEFAULT_LEVEL_CONVERTER);
+ public static void bridgeJULLogger(String JULLoggerName) {
+ bridgeJULLogger(JULLoggerName, LogManager.getLoggerRepository(),
+ JULLog4jEventConverter.DEFAULT_LEVEL_CONVERTER);
}
- public static void bridgeJuliLogger(String juliLoggerName,
LoggerRepository repository) {
- bridgeJuliLogger(juliLoggerName, repository,
- JuliLog4jEventConverter.DEFAULT_LEVEL_CONVERTER);
+ public static void bridgeJULLogger(String JULLoggerName, LoggerRepository
repository) {
+ bridgeJULLogger(JULLoggerName, repository,
+ JULLog4jEventConverter.DEFAULT_LEVEL_CONVERTER);
}
/**
* Creates a bridge between the named java.util.logging Logger name, and
an equivalent inside
- * the log4j LoggerRepository, using the provided level converter class.
If the juli Logger
+ * the log4j LoggerRepository, using the provided level converter class.
If the JUL Logger
* already has a configured Filter, then it is replaced by this bridge,
and a WARN level event
- * is triggered on the JuliLog4jBridge own Logger
+ * is triggered on the JULLog4jBridge own Logger
*
- * @param juliLoggerName
+ * @param JULLoggerName
* @param repository
*/
- public static void bridgeJuliLogger(String juliLoggerName,
LoggerRepository repository,
- JuliLevelConverter levelConverter) {
- Logger log4jLogger = repository.getLogger(juliLoggerName);
- java.util.logging.Logger juliLogger =
java.util.logging.Logger.getLogger(juliLoggerName);
+ public static void bridgeJULLogger(String JULLoggerName, LoggerRepository
repository,
+ JULLevelConverter levelConverter) {
+ Logger log4jLogger = repository.getLogger(JULLoggerName);
+ java.util.logging.Logger JULLogger =
java.util.logging.Logger.getLogger(JULLoggerName);
- juliLogger.setFilter(new JuliBridgeFilter(juliLogger.getFilter(),
log4jLogger,
- new JuliLog4jEventConverter(repository, levelConverter)));
+ JULLogger.setFilter(new JULBridgeFilter(JULLogger.getFilter(),
log4jLogger,
+ new JULLog4jEventConverter(repository, levelConverter)));
}
/**
@@ -97,19 +97,19 @@
* configuration is reset, and a top level Handler is registered that
gathers all LogRecords and
* converts them into log4j LoggingEvents.
*/
- public static void assimilate(LoggerRepository repository,
JuliLevelConverter levelConverter) {
+ public static void assimilate(LoggerRepository repository,
JULLevelConverter levelConverter) {
java.util.logging.LogManager.getLogManager().reset();
java.util.logging.Logger.getLogger("").setLevel(
levelConverter.convertLog4jLevel(repository.getThreshold()));
java.util.logging.Logger.getLogger("").addHandler(
- new JuliBridgeHandler(repository, new
JuliLog4jEventConverter(repository,
+ new JULBridgeHandler(repository, new
JULLog4jEventConverter(repository,
levelConverter)));
}
public static void assimilate(LoggerRepository repository) {
- assimilate(repository,
JuliLog4jEventConverter.DEFAULT_LEVEL_CONVERTER);
+ assimilate(repository, JULLog4jEventConverter.DEFAULT_LEVEL_CONVERTER);
}
public static void assimilate() {
Modified:
logging/sandbox/juli-to-log4j-bridge/src/main/java/org/apache/logging/julbridge/JULLog4jEventConverter.java
URL:
http://svn.apache.org/viewvc/logging/sandbox/juli-to-log4j-bridge/src/main/java/org/apache/logging/julbridge/JULLog4jEventConverter.java?view=diff&rev=532941&r1=532940&r2=532941
==============================================================================
---
logging/sandbox/juli-to-log4j-bridge/src/main/java/org/apache/logging/julbridge/JULLog4jEventConverter.java
(original)
+++
logging/sandbox/juli-to-log4j-bridge/src/main/java/org/apache/logging/julbridge/JULLog4jEventConverter.java
Thu Apr 26 20:05:43 2007
@@ -8,7 +8,7 @@
* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied. See the License
* for the specific language governing permissions and limitations under the
License.
*/
-package org.apache.logging.julibridge;
+package org.apache.logging.julbridge;
import java.util.Properties;
import java.util.logging.LogRecord;
@@ -26,7 +26,7 @@
*
* @author psmith
*/
-public class JuliLog4jEventConverter {
+public class JULLog4jEventConverter {
/**
* A default implementation of a converter that converts:
@@ -39,7 +39,7 @@
* <li> OFF -> OFF</li>
* Anything else is defaulted to DEBUG
*/
- private static final class DefaultLevelConverter implements
JuliLevelConverter {
+ private static final class DefaultLevelConverter implements
JULLevelConverter {
public Level convertJuliLevel(java.util.logging.Level juliLevel) {
@@ -87,23 +87,23 @@
}
private final LoggerRepository repository;
- private final JuliLevelConverter levelConverter;
+ private final JULLevelConverter levelConverter;
- public static final JuliLevelConverter DEFAULT_LEVEL_CONVERTER = new
DefaultLevelConverter();
+ public static final JULLevelConverter DEFAULT_LEVEL_CONVERTER = new
DefaultLevelConverter();
/**
* Creates a default converter implementation that uses the default [EMAIL
PROTECTED] LoggerRepository},
* ad the default [EMAIL PROTECTED] JuliLevelConverter}
*/
- public JuliLog4jEventConverter() {
+ public JULLog4jEventConverter() {
this(LogManager.getLoggerRepository());
}
- public JuliLog4jEventConverter(LoggerRepository repository) {
+ public JULLog4jEventConverter(LoggerRepository repository) {
this(repository, DEFAULT_LEVEL_CONVERTER);
}
- public JuliLog4jEventConverter(LoggerRepository repository,
JuliLevelConverter levelConverter) {
+ public JULLog4jEventConverter(LoggerRepository repository,
JULLevelConverter levelConverter) {
this.repository = repository;
this.levelConverter = levelConverter;
}
Copied:
logging/sandbox/juli-to-log4j-bridge/src/test/java/org/apache/logging/julbridge/JULLog4jBridgeTest.java
(from r532939,
logging/sandbox/juli-to-log4j-bridge/src/test/java/org/apache/logging/julbridge/JuliLog4jBridgeTest.java)
URL:
http://svn.apache.org/viewvc/logging/sandbox/juli-to-log4j-bridge/src/test/java/org/apache/logging/julbridge/JULLog4jBridgeTest.java?view=diff&rev=532941&p1=logging/sandbox/juli-to-log4j-bridge/src/test/java/org/apache/logging/julbridge/JuliLog4jBridgeTest.java&r1=532939&p2=logging/sandbox/juli-to-log4j-bridge/src/test/java/org/apache/logging/julbridge/JULLog4jBridgeTest.java&r2=532941
==============================================================================
---
logging/sandbox/juli-to-log4j-bridge/src/test/java/org/apache/logging/julbridge/JuliLog4jBridgeTest.java
(original)
+++
logging/sandbox/juli-to-log4j-bridge/src/test/java/org/apache/logging/julbridge/JULLog4jBridgeTest.java
Thu Apr 26 20:05:43 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.logging.julibridge;
+package org.apache.logging.julbridge;
import java.util.logging.Level;
@@ -25,14 +25,14 @@
import org.apache.log4j.spi.LocationInfo;
import org.apache.log4j.spi.LoggingEvent;
-public class JuliLog4jBridgeTest extends TestCase {
+public class JULLog4jBridgeTest extends TestCase {
private static final String PARENT_LOGGER = "foo";
private static final String LOGGER_NAME = PARENT_LOGGER + ".beep";
private MockAppender mockAppender;
- private java.util.logging.Logger juliLogger;
+ private java.util.logging.Logger JULLogger;
private java.util.logging.Logger parentLogger;
- private java.util.logging.Logger juliRootLogger;
+ private java.util.logging.Logger JULRootLogger;
protected void setUp() throws Exception {
@@ -41,9 +41,9 @@
mockAppender = new MockAppender();
Logger.getRootLogger().addAppender(mockAppender);
- juliLogger = java.util.logging.Logger.getLogger(LOGGER_NAME);
+ JULLogger = java.util.logging.Logger.getLogger(LOGGER_NAME);
parentLogger = java.util.logging.Logger.getLogger(PARENT_LOGGER);
- juliRootLogger = java.util.logging.Logger.getLogger("");
+ JULRootLogger = java.util.logging.Logger.getLogger("");
}
@@ -54,17 +54,17 @@
* It's pretty dumb, but
java.util.logging.LogManager.getLogManager().reset();
* does NOT remove any Filter set
*/
- juliLogger.setFilter(null);
+ JULLogger.setFilter(null);
}
- public void testBridgeJuliLogger() {
+ public void testBridgeJULLogger() {
- juliLogger.warning("boo");
+ JULLogger.warning("boo");
assertEquals("Shouldn't expect a bridged event", 0,
mockAppender.observedLoggingEvents.size());
- JuliLog4jBridge.bridgeJuliLogger(LOGGER_NAME);
+ JULLog4jBridge.bridgeJULLogger(LOGGER_NAME);
- juliLogger.warning("boo2");
+ JULLogger.warning("boo2");
assertEquals(1, mockAppender.observedLoggingEvents.size());
assertEquals("boo2",
((LoggingEvent)mockAppender.observedLoggingEvents.get(0)).getMessage());
@@ -72,8 +72,8 @@
}
public void testLocationInfo(){
- JuliLog4jBridge.bridgeJuliLogger(LOGGER_NAME);
- juliLogger.logp(Level.INFO, "com.mycompany.MyClass", "doBar",
"something");
+ JULLog4jBridge.bridgeJULLogger(LOGGER_NAME);
+ JULLogger.logp(Level.INFO, "com.mycompany.MyClass", "doBar",
"something");
assertEquals(1, mockAppender.observedLoggingEvents.size());
LoggingEvent loggingEvent =
((LoggingEvent)mockAppender.observedLoggingEvents.get(0));
@@ -93,9 +93,9 @@
}
public void testAbsorbedIntoTheLog4jCollective(){
- JuliLog4jBridge.assimilate();
+ JULLog4jBridge.assimilate();
- juliLogger.logp(Level.INFO, "com.mycompany.MyClass", "doBar",
"something");
+ JULLogger.logp(Level.INFO, "com.mycompany.MyClass", "doBar",
"something");
assertEquals(1, mockAppender.observedLoggingEvents.size());
LoggingEvent loggingEvent =
((LoggingEvent)mockAppender.observedLoggingEvents.get(0));
@@ -117,14 +117,14 @@
assertEquals("Hello World", loggingEvent.getMessage());
}
- public void testJuliLevelConfigurationChanges(){
- assertEquals(Level.INFO, juliRootLogger.getLevel());
+ public void testJULLevelConfigurationChanges(){
+ assertEquals(Level.INFO, JULRootLogger.getLevel());
LogManager.getLoggerRepository().setThreshold(org.apache.log4j.Level.WARN);
- JuliLog4jBridge.assimilate();
+ JULLog4jBridge.assimilate();
- assertEquals(Level.WARNING, juliRootLogger.getLevel());
+ assertEquals(Level.WARNING, JULRootLogger.getLevel());
}
Modified:
logging/sandbox/juli-to-log4j-bridge/src/test/java/org/apache/logging/julbridge/MockAppender.java
URL:
http://svn.apache.org/viewvc/logging/sandbox/juli-to-log4j-bridge/src/test/java/org/apache/logging/julbridge/MockAppender.java?view=diff&rev=532941&r1=532940&r2=532941
==============================================================================
---
logging/sandbox/juli-to-log4j-bridge/src/test/java/org/apache/logging/julbridge/MockAppender.java
(original)
+++
logging/sandbox/juli-to-log4j-bridge/src/test/java/org/apache/logging/julbridge/MockAppender.java
Thu Apr 26 20:05:43 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.logging.julibridge;
+package org.apache.logging.julbridge;
import java.util.ArrayList;
import java.util.List;
Modified:
logging/sandbox/juli-to-log4j-bridge/src/test/java/org/apache/logging/julbridge/TestLogPosting.java
URL:
http://svn.apache.org/viewvc/logging/sandbox/juli-to-log4j-bridge/src/test/java/org/apache/logging/julbridge/TestLogPosting.java?view=diff&rev=532941&r1=532940&r2=532941
==============================================================================
---
logging/sandbox/juli-to-log4j-bridge/src/test/java/org/apache/logging/julbridge/TestLogPosting.java
(original)
+++
logging/sandbox/juli-to-log4j-bridge/src/test/java/org/apache/logging/julbridge/TestLogPosting.java
Thu Apr 26 20:05:43 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.logging.julibridge;
+package org.apache.logging.julbridge;
import org.apache.log4j.Level;
@@ -42,7 +42,7 @@
}
public void testBasicObservedEvent() {
- juliLog.setFilter(new JuliBridgeFilter(juliLog.getFilter(), log, new
JuliLog4jEventConverter()));
+ juliLog.setFilter(new JULBridgeFilter(juliLog.getFilter(), log, new
JULLog4jEventConverter()));
String expectedMessage = "foo";
juliLog.warning(expectedMessage);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
