You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-dev@logging.apache.org by ps...@apache.org on 2008/09/15 04:51:22 UTC

svn commit: r695330 - in /logging/sandbox/jul-to-log4j-bridge: pom.xml src/test/java/org/apache/log4j/jul/JULAppenderTest.java src/test/java/org/apache/log4j/jul/JULReceiverTest.java src/test/java/org/apache/logging/julbridge/JULLog4jBridgeTest.java

Author: psmith
Date: Sun Sep 14 19:51:21 2008
New Revision: 695330

URL: http://svn.apache.org/viewvc?rev=695330&view=rev
Log:
Set dependency to log4j component, since it's not yet released.

Ensure tests tear down properly by reinstating sane jul settings.


Modified:
    logging/sandbox/jul-to-log4j-bridge/pom.xml
    logging/sandbox/jul-to-log4j-bridge/src/test/java/org/apache/log4j/jul/JULAppenderTest.java
    logging/sandbox/jul-to-log4j-bridge/src/test/java/org/apache/log4j/jul/JULReceiverTest.java
    logging/sandbox/jul-to-log4j-bridge/src/test/java/org/apache/logging/julbridge/JULLog4jBridgeTest.java

Modified: logging/sandbox/jul-to-log4j-bridge/pom.xml
URL: http://svn.apache.org/viewvc/logging/sandbox/jul-to-log4j-bridge/pom.xml?rev=695330&r1=695329&r2=695330&view=diff
==============================================================================
--- logging/sandbox/jul-to-log4j-bridge/pom.xml (original)
+++ logging/sandbox/jul-to-log4j-bridge/pom.xml Sun Sep 14 19:51:21 2008
@@ -176,7 +176,7 @@
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>apache-log4j-component</artifactId>
-      <version>1.0</version>
+      <version>1.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
   <reporting>

Modified: logging/sandbox/jul-to-log4j-bridge/src/test/java/org/apache/log4j/jul/JULAppenderTest.java
URL: http://svn.apache.org/viewvc/logging/sandbox/jul-to-log4j-bridge/src/test/java/org/apache/log4j/jul/JULAppenderTest.java?rev=695330&r1=695329&r2=695330&view=diff
==============================================================================
--- logging/sandbox/jul-to-log4j-bridge/src/test/java/org/apache/log4j/jul/JULAppenderTest.java (original)
+++ logging/sandbox/jul-to-log4j-bridge/src/test/java/org/apache/log4j/jul/JULAppenderTest.java Sun Sep 14 19:51:21 2008
@@ -49,6 +49,7 @@
         // The logger is set to log only INFO-level events or higher.
         // During testing, a JUL handler will verify the activity of the logger.
         LogManager.resetConfiguration();
+        JULLog4jBridge.repatriate();
         String julLoggerName = JULAppenderTest.class.getName();
         julLogger = java.util.logging.Logger.getLogger(julLoggerName);
         julLogger.setLevel(java.util.logging.Level.INFO);

Modified: logging/sandbox/jul-to-log4j-bridge/src/test/java/org/apache/log4j/jul/JULReceiverTest.java
URL: http://svn.apache.org/viewvc/logging/sandbox/jul-to-log4j-bridge/src/test/java/org/apache/log4j/jul/JULReceiverTest.java?rev=695330&r1=695329&r2=695330&view=diff
==============================================================================
--- logging/sandbox/jul-to-log4j-bridge/src/test/java/org/apache/log4j/jul/JULReceiverTest.java (original)
+++ logging/sandbox/jul-to-log4j-bridge/src/test/java/org/apache/log4j/jul/JULReceiverTest.java Sun Sep 14 19:51:21 2008
@@ -23,9 +23,9 @@
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
 import org.apache.log4j.LoggerRepositoryExImpl;
-import org.apache.log4j.plugins.PluginConfigurator;
 import org.apache.log4j.spi.LoggerRepository;
 import org.apache.log4j.spi.RepositorySelector;
+import org.apache.log4j.xml.DOMConfigurator;
 import org.apache.logging.julbridge.JULLog4jBridge;
 import org.apache.logging.julbridge.MockAppender;
 
@@ -56,7 +56,7 @@
 
     public void testJULReceiverPluginConfiguration() {
         URL resource = this.getClass().getResource("JULReceiverPluginTest.xml");
-        PluginConfigurator.configure(resource);
+        DOMConfigurator.configure(resource);
 
         Logger.getRootLogger().addAppender(mockAppender);
         java.util.logging.Logger juliLogger = java.util.logging.Logger

Modified: logging/sandbox/jul-to-log4j-bridge/src/test/java/org/apache/logging/julbridge/JULLog4jBridgeTest.java
URL: http://svn.apache.org/viewvc/logging/sandbox/jul-to-log4j-bridge/src/test/java/org/apache/logging/julbridge/JULLog4jBridgeTest.java?rev=695330&r1=695329&r2=695330&view=diff
==============================================================================
--- logging/sandbox/jul-to-log4j-bridge/src/test/java/org/apache/logging/julbridge/JULLog4jBridgeTest.java (original)
+++ logging/sandbox/jul-to-log4j-bridge/src/test/java/org/apache/logging/julbridge/JULLog4jBridgeTest.java Sun Sep 14 19:51:21 2008
@@ -55,6 +55,7 @@
          * does NOT remove any Filter set
          */
         JULLogger.setFilter(null);
+        JULLog4jBridge.repatriate();
     }
 
     public void testBridgeJULLogger() {



---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org