You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gr...@apache.org on 2012/05/26 17:48:35 UTC
svn commit: r1342917 [2/2] - in /logging/log4j/companions:
component/trunk/src/main/java/org/apache/log4j/
component/trunk/src/test/java/org/apache/log4j/
component/trunk/src/test/resources/org/apache/log4j/ extras/trunk/
extras/trunk/src/main/java/org...
Modified: logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/component/plugins/MockReceiver.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/component/plugins/MockReceiver.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/component/plugins/MockReceiver.java (original)
+++ logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/component/plugins/MockReceiver.java Sat May 26 15:48:32 2012
@@ -14,9 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.log4j.plugins;
-
-import org.apache.log4j.plugins.PluginSkeleton;
+package org.apache.log4j.component.plugins;
/**
* Mock receiver used by PluginConfiguratorTest.
Modified: logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/component/plugins/PluginTestCase.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/component/plugins/PluginTestCase.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/component/plugins/PluginTestCase.java (original)
+++ logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/component/plugins/PluginTestCase.java Sat May 26 15:48:32 2012
@@ -15,15 +15,11 @@
* limitations under the License.
*/
-package org.apache.log4j.plugins;
+package org.apache.log4j.component.plugins;
import junit.framework.TestCase;
-import org.apache.log4j.FileAppender;
-import org.apache.log4j.Level;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.apache.log4j.*;
import org.apache.log4j.LoggerRepositoryExImpl;
-import org.apache.log4j.SimpleLayout;
import org.apache.log4j.util.Compare;
import java.beans.PropertyChangeEvent;
Modified: logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/component/util/Compare.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/component/util/Compare.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/component/util/Compare.java (original)
+++ logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/component/util/Compare.java Sat May 26 15:48:32 2012
@@ -15,14 +15,8 @@
* limitations under the License.
*/
-package org.apache.log4j.util;
+package org.apache.log4j.component.util;
-import java.io.BufferedReader;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
import java.io.*;
Modified: logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/receivers/VectorAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/receivers/VectorAppender.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/receivers/VectorAppender.java (original)
+++ logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/receivers/VectorAppender.java Sat May 26 15:48:32 2012
@@ -15,11 +15,13 @@
* limitations under the License.
*/
-package org.apache.log4j;
+package org.apache.log4j.receivers;
-import java.util.Vector;
+import org.apache.log4j.AppenderSkeleton;
import org.apache.log4j.spi.LoggingEvent;
+import java.util.Vector;
+
/**
An appender that appends logging events to a vector.
@author Ceki Gülcü
Modified: logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/receivers/db/FullCycleDBTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/receivers/db/FullCycleDBTest.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/receivers/db/FullCycleDBTest.java (original)
+++ logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/receivers/db/FullCycleDBTest.java Sat May 26 15:48:32 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.log4j.db;
+package org.apache.log4j.receivers.db;
import junit.framework.Test;
import junit.framework.TestCase;
@@ -22,26 +22,26 @@ import junit.framework.TestSuite;
import org.apache.log4j.Hierarchy;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
-import org.apache.log4j.MDC;
-import org.apache.log4j.VectorAppender;
import org.apache.log4j.LoggerRepositoryExImpl;
-import org.apache.log4j.helpers.Constants;
-import org.apache.log4j.xml.DOMConfigurator;
+import org.apache.log4j.MDC;
+import org.apache.log4j.component.helpers.Constants;
+import org.apache.log4j.receivers.VectorAppender;
import org.apache.log4j.spi.LocationInfo;
+import org.apache.log4j.spi.LoggerRepository;
import org.apache.log4j.spi.LoggingEvent;
import org.apache.log4j.spi.RootLogger;
-import org.apache.log4j.spi.LoggerRepository;
+import org.apache.log4j.xml.DOMConfigurator;
+import java.io.IOException;
+import java.io.InputStream;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.SQLException;
import java.sql.Statement;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.Vector;
-import java.util.HashMap;
-import java.io.InputStream;
-import java.io.IOException;
/**
@@ -194,7 +194,7 @@ public class FullCycleDBTest
long startTime = System.currentTimeMillis();
// Write out just one log message
- MDC.put("key1", "value1-"+startTime);
+ MDC.put("key1", "value1-" + startTime);
MDC.put("key2", "value2-"+startTime);
Map mdcMap = MDC.getContext();
// LogLog.info("**********"+mdcMap.size());
@@ -203,7 +203,7 @@ public class FullCycleDBTest
Logger out = lrWrite.getLogger("out"+startTime);
out.debug("some message"+startTime);
- MDC.put("key3", "value2-"+startTime);
+ MDC.put("key3", "value2-" + startTime);
out.error("some error message"+startTime, new Exception("testing"));
// we clear the MDC to avoid interference with the events read back from
Modified: logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/receivers/helpers/UtilLoggingLevelTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/receivers/helpers/UtilLoggingLevelTest.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/receivers/helpers/UtilLoggingLevelTest.java (original)
+++ logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/receivers/helpers/UtilLoggingLevelTest.java Sat May 26 15:48:32 2012
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.log4j.helpers;
+package org.apache.log4j.receivers.helpers;
-import junit.framework.*;
+import junit.framework.TestCase;
/**
Modified: logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/receivers/rewrite/RewriteAppenderTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/receivers/rewrite/RewriteAppenderTest.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/receivers/rewrite/RewriteAppenderTest.java (original)
+++ logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/receivers/rewrite/RewriteAppenderTest.java Sat May 26 15:48:32 2012
@@ -14,20 +14,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.log4j.rewrite;
+package org.apache.log4j.receivers.rewrite;
-import junit.framework.*;
-import org.apache.log4j.*;
+import junit.framework.TestCase;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
+import org.apache.log4j.MDC;
import org.apache.log4j.util.Compare;
-import org.apache.log4j.xml.*;
+import org.apache.log4j.xml.DOMConfigurator;
+import org.w3c.dom.Document;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
import java.io.InputStream;
+import java.util.Hashtable;
import java.util.Map;
-import java.util.HashMap;
import java.util.TreeMap;
-import java.util.Hashtable;
-import javax.xml.parsers.*;
-import org.w3c.dom.*;
public class RewriteAppenderTest extends TestCase {
public RewriteAppenderTest(final String name) {
Modified: logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/receivers/util/Compare.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/receivers/util/Compare.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/receivers/util/Compare.java (original)
+++ logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/receivers/util/Compare.java Sat May 26 15:48:32 2012
@@ -15,16 +15,9 @@
* limitations under the License.
*/
-package org.apache.log4j.util;
+package org.apache.log4j.receivers.util;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
+import java.io.*;
import java.util.zip.GZIPInputStream;
Modified: logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/receivers/xml/XMLDecoderTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/receivers/xml/XMLDecoderTest.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/receivers/xml/XMLDecoderTest.java (original)
+++ logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/receivers/xml/XMLDecoderTest.java Sat May 26 15:48:32 2012
@@ -14,16 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.log4j.xml;
+package org.apache.log4j.receivers.xml;
import junit.framework.TestCase;
import java.io.FileNotFoundException;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.net.URL;
import java.nio.CharBuffer;
import java.util.Vector;
-import java.net.URL;
/**
* Tests for XMLDecoder.
Modified: logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/receivers/db/append-with-drivermanager1.xml
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/receivers/db/append-with-drivermanager1.xml?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/receivers/db/append-with-drivermanager1.xml (original)
+++ logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/receivers/db/append-with-drivermanager1.xml Sat May 26 15:48:32 2012
@@ -22,7 +22,7 @@
<appender name="DB" class="org.apache.log4j.db.DBAppender">
<param name="locationInfo" value="true"/>
- <connectionSource class="org.apache.log4j.db.DriverManagerConnectionSource">
+ <connectionSource class="org.apache.log4j.receivers.db.DriverManagerConnectionSource">
<param name="driverClass" value="org.hsqldb.jdbcDriver"/>
<param name="url" value="jdbc:hsqldb:mem:testdb"/>
<param name="user" value="sa"/>
@@ -30,7 +30,7 @@
</connectionSource>
</appender>
- <appender name="VECTOR" class="org.apache.log4j.VectorAppender">
+ <appender name="VECTOR" class="org.apache.log4j.receivers.VectorAppender">
</appender>
<!-- Prevent internal log4j DEBUG messages from polluting the output. -->