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 [1/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...
Author: grobmeier
Date: Sat May 26 15:48:32 2012
New Revision: 1342917
URL: http://svn.apache.org/viewvc?rev=1342917&view=rev
Log:
moved components to extras
Added:
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/
- copied from r1342903, logging/log4j/companions/component/trunk/src/main/java/org/apache/log4j/
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/
- copied from r1342903, logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/component/
- copied from r1342903, logging/log4j/companions/component/trunk/src/test/java/org/apache/log4j/
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/receivers/
- copied from r1342903, logging/log4j/companions/receivers/trunk/src/test/java/org/apache/log4j/
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/component/
- copied from r1342903, logging/log4j/companions/component/trunk/src/test/resources/org/apache/log4j/
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/receivers/
- copied from r1342903, logging/log4j/companions/receivers/trunk/src/test/resources/org/apache/log4j/
Removed:
logging/log4j/companions/component/trunk/src/main/java/org/apache/log4j/
logging/log4j/companions/component/trunk/src/test/java/org/apache/log4j/
logging/log4j/companions/component/trunk/src/test/resources/org/apache/log4j/
logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/
logging/log4j/companions/receivers/trunk/src/test/java/org/apache/log4j/
logging/log4j/companions/receivers/trunk/src/test/resources/org/apache/log4j/
Modified:
logging/log4j/companions/extras/trunk/pom.xml
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/ULogger.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/helpers/Constants.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/helpers/MessageFormatter.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/plugins/Pauseable.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/plugins/Plugin.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/plugins/PluginEvent.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/plugins/PluginListener.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/plugins/PluginRegistry.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/plugins/PluginSkeleton.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/plugins/Receiver.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/scheduler/Job.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/scheduler/Scheduler.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/spi/Component.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/spi/ComponentBase.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/spi/ErrorItem.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/spi/Log4JULogger.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/spi/LoggerEventListener.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/spi/LoggerRepositoryEventListener.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/spi/LoggerRepositoryEx.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/spi/NOPULogger.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/spi/SimpleULogger.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/spi/Thresholdable.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/ConnectionSource.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/ConnectionSourceSkeleton.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/CustomSQLDBReceiver.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/DBAppender.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/DBHelper.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/DBReceiver.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/DBReceiverJob.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/DataSourceConnectionSource.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/DriverManagerConnectionSource.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/JNDIConnectionSource.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/dialect/HSQLDBDialect.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/dialect/MsSQLDialect.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/dialect/MySQLDialect.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/dialect/OracleDialect.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/dialect/PostgreSQLDialect.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/dialect/SQLDialect.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/dialect/SybaseDialect.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/dialect/Util.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/helpers/UtilLoggingLevel.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/AddressBased.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/JMSReceiver.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/JMSReceiverBeanInfo.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/MulticastAppender.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/MulticastReceiver.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/MulticastReceiverBeanInfo.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/NetworkBased.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/PortBased.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/SocketHubReceiver.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/SocketNode13.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/SocketNodeEventListener.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/SocketReceiver.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/UDPAppender.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/UDPReceiver.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/XMLSocketNode.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/XMLSocketReceiver.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/rewrite/MapRewritePolicy.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/rewrite/PropertyRewritePolicy.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/rewrite/ReflectionRewritePolicy.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/rewrite/RewriteAppender.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/rewrite/RewritePolicy.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/spi/Decoder.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/varia/ListModelAppender.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/varia/LogFilePatternReceiver.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/varia/LogFilePatternReceiverBeanInfo.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/xml/LogFileXMLReceiver.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/xml/UtilLoggingEntityResolver.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/xml/UtilLoggingXMLDecoder.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/xml/XMLDecoder.java
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/component/plugins/MockReceiver.java
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/component/plugins/PluginTestCase.java
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/component/util/Compare.java
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/receivers/VectorAppender.java
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/receivers/db/FullCycleDBTest.java
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/receivers/helpers/UtilLoggingLevelTest.java
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/receivers/rewrite/RewriteAppenderTest.java
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/receivers/util/Compare.java
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/receivers/xml/XMLDecoderTest.java
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/receivers/db/append-with-drivermanager1.xml
Modified: logging/log4j/companions/extras/trunk/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/pom.xml?rev=1342917&r1=1342916&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/pom.xml (original)
+++ logging/log4j/companions/extras/trunk/pom.xml Sat May 26 15:48:32 2012
@@ -328,6 +328,20 @@
</plugin>
</plugins>
</build>
+ <dependencies>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.8.0.7</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ <version>1.0</version>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
<distributionManagement>
<repository>
<id>logging.repo</id>
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/ULogger.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/ULogger.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/ULogger.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/ULogger.java Sat May 26 15:48:32 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.log4j;
+package org.apache.log4j.component;
/**
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/helpers/Constants.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/helpers/Constants.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/helpers/Constants.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/helpers/Constants.java Sat May 26 15:48:32 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.log4j.helpers;
+package org.apache.log4j.component.helpers;
/**
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/helpers/MessageFormatter.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/helpers/MessageFormatter.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/helpers/MessageFormatter.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/helpers/MessageFormatter.java Sat May 26 15:48:32 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.log4j.helpers;
+package org.apache.log4j.component.helpers;
/**
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/plugins/Pauseable.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/plugins/Pauseable.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/plugins/Pauseable.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/plugins/Pauseable.java Sat May 26 15:48:32 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.log4j.plugins;
+package org.apache.log4j.component.plugins;
/**
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/plugins/Plugin.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/plugins/Plugin.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/plugins/Plugin.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/plugins/Plugin.java Sat May 26 15:48:32 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.log4j.plugins;
+package org.apache.log4j.component.plugins;
import org.apache.log4j.spi.LoggerRepository;
import org.apache.log4j.spi.OptionHandler;
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/plugins/PluginEvent.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/plugins/PluginEvent.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/plugins/PluginEvent.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/plugins/PluginEvent.java Sat May 26 15:48:32 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.log4j.plugins;
+package org.apache.log4j.component.plugins;
import java.util.EventObject;
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/plugins/PluginListener.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/plugins/PluginListener.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/plugins/PluginListener.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/plugins/PluginListener.java Sat May 26 15:48:32 2012
@@ -17,7 +17,7 @@
/*
*/
-package org.apache.log4j.plugins;
+package org.apache.log4j.component.plugins;
import java.util.EventListener;
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/plugins/PluginRegistry.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/plugins/PluginRegistry.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/plugins/PluginRegistry.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/plugins/PluginRegistry.java Sat May 26 15:48:32 2012
@@ -14,18 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.log4j.plugins;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+package org.apache.log4j.component.plugins;
+import org.apache.log4j.component.spi.LoggerRepositoryEventListener;
+import org.apache.log4j.component.spi.LoggerRepositoryEx;
import org.apache.log4j.spi.LoggerRepository;
-import org.apache.log4j.spi.LoggerRepositoryEx;
-import org.apache.log4j.spi.LoggerRepositoryEventListener;
+
+
+import java.util.*;
/**
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/plugins/PluginSkeleton.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/plugins/PluginSkeleton.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/plugins/PluginSkeleton.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/plugins/PluginSkeleton.java Sat May 26 15:48:32 2012
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.log4j.plugins;
+package org.apache.log4j.component.plugins;
-import org.apache.log4j.spi.ComponentBase;
+import org.apache.log4j.component.spi.ComponentBase;
import org.apache.log4j.spi.LoggerRepository;
import java.beans.PropertyChangeEvent;
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/plugins/Receiver.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/plugins/Receiver.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/plugins/Receiver.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/plugins/Receiver.java Sat May 26 15:48:32 2012
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.log4j.plugins;
+package org.apache.log4j.component.plugins;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.apache.log4j.spi.LoggingEvent;
-import org.apache.log4j.spi.Thresholdable;
+import org.apache.log4j.component.spi.Thresholdable;
/**
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/scheduler/Job.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/scheduler/Job.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/scheduler/Job.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/scheduler/Job.java Sat May 26 15:48:32 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.log4j.scheduler;
+package org.apache.log4j.component.scheduler;
/**
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/scheduler/Scheduler.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/scheduler/Scheduler.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/scheduler/Scheduler.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/scheduler/Scheduler.java Sat May 26 15:48:32 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.log4j.scheduler;
+package org.apache.log4j.component.scheduler;
import java.util.List;
import java.util.Vector;
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/spi/Component.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/spi/Component.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/spi/Component.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/spi/Component.java Sat May 26 15:48:32 2012
@@ -14,9 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.log4j.spi;
+package org.apache.log4j.component.spi;
+import org.apache.log4j.spi.LoggerRepository;
+
/**
* A common interface shared by log4j components.
*
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/spi/ComponentBase.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/spi/ComponentBase.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/spi/ComponentBase.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/spi/ComponentBase.java Sat May 26 15:48:32 2012
@@ -14,10 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.log4j.spi;
+package org.apache.log4j.component.spi;
-import org.apache.log4j.ULogger;
import org.apache.log4j.Logger;
+import org.apache.log4j.component.ULogger;
+import org.apache.log4j.spi.LoggerRepository;
/**
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/spi/ErrorItem.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/spi/ErrorItem.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/spi/ErrorItem.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/spi/ErrorItem.java Sat May 26 15:48:32 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.log4j.spi;
+package org.apache.log4j.component.spi;
import java.io.PrintStream;
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/spi/Log4JULogger.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/spi/Log4JULogger.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/spi/Log4JULogger.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/spi/Log4JULogger.java Sat May 26 15:48:32 2012
@@ -14,13 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.log4j.spi;
+package org.apache.log4j.component.spi;
-import org.apache.log4j.Logger;
-import org.apache.log4j.ULogger;
-import org.apache.log4j.helpers.MessageFormatter;
import org.apache.log4j.Level;
-
+import org.apache.log4j.Logger;
+import org.apache.log4j.component.ULogger;
+import org.apache.log4j.component.helpers.MessageFormatter;
/**
* An implementation of ULogger on org.apache.log4j.Logger.
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/spi/LoggerEventListener.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/spi/LoggerEventListener.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/spi/LoggerEventListener.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/spi/LoggerEventListener.java Sat May 26 15:48:32 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.log4j.spi;
+package org.apache.log4j.component.spi;
import org.apache.log4j.Appender;
import org.apache.log4j.Logger;
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/spi/LoggerRepositoryEventListener.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/spi/LoggerRepositoryEventListener.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/spi/LoggerRepositoryEventListener.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/spi/LoggerRepositoryEventListener.java Sat May 26 15:48:32 2012
@@ -15,9 +15,11 @@
* limitations under the License.
*/
-package org.apache.log4j.spi;
+package org.apache.log4j.component.spi;
+import org.apache.log4j.spi.LoggerRepository;
+
/**
Interface used to listen for LoggerRepository related
events such as startup, reset, and shutdown. Clients register
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/spi/LoggerRepositoryEx.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/spi/LoggerRepositoryEx.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/spi/LoggerRepositoryEx.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/spi/LoggerRepositoryEx.java Sat May 26 15:48:32 2012
@@ -15,13 +15,16 @@
* limitations under the License.
*/
-package org.apache.log4j.spi;
+package org.apache.log4j.component.spi;
import org.apache.log4j.Appender;
import org.apache.log4j.Category;
import org.apache.log4j.Logger;
-import org.apache.log4j.plugins.PluginRegistry;
-import org.apache.log4j.scheduler.Scheduler;
+import org.apache.log4j.component.plugins.PluginRegistry;
+import org.apache.log4j.component.scheduler.Scheduler;
+
+import org.apache.log4j.spi.LoggerFactory;
+import org.apache.log4j.spi.LoggerRepository;
import java.util.List;
import java.util.Map;
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/spi/NOPULogger.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/spi/NOPULogger.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/spi/NOPULogger.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/spi/NOPULogger.java Sat May 26 15:48:32 2012
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.log4j.spi;
+package org.apache.log4j.component.spi;
-import org.apache.log4j.ULogger;
+import org.apache.log4j.component.ULogger;
/**
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/spi/SimpleULogger.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/spi/SimpleULogger.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/spi/SimpleULogger.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/spi/SimpleULogger.java Sat May 26 15:48:32 2012
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.log4j.spi;
+package org.apache.log4j.component.spi;
-import org.apache.log4j.ULogger;
-import org.apache.log4j.helpers.MessageFormatter;
+import org.apache.log4j.component.ULogger;
+import org.apache.log4j.component.helpers.MessageFormatter;
/**
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/spi/Thresholdable.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/spi/Thresholdable.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/spi/Thresholdable.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/component/spi/Thresholdable.java Sat May 26 15:48:32 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.log4j.spi;
+package org.apache.log4j.component.spi;
import org.apache.log4j.Level;
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/ConnectionSource.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/ConnectionSource.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/ConnectionSource.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/ConnectionSource.java Sat May 26 15:48:32 2012
@@ -15,9 +15,10 @@
* limitations under the License.
*/
-package org.apache.log4j.db;
+package org.apache.log4j.receivers.db;
-import org.apache.log4j.spi.Component;
+
+import org.apache.log4j.component.spi.Component;
import org.apache.log4j.spi.OptionHandler;
import java.sql.Connection;
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/ConnectionSourceSkeleton.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/ConnectionSourceSkeleton.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/ConnectionSourceSkeleton.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/ConnectionSourceSkeleton.java Sat May 26 15:48:32 2012
@@ -15,15 +15,16 @@
* limitations under the License.
*/
-package org.apache.log4j.db;
+package org.apache.log4j.receivers.db;
+
+
+import org.apache.log4j.component.spi.ComponentBase;
+import org.apache.log4j.receivers.db.dialect.Util;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
import java.sql.SQLException;
-import org.apache.log4j.db.dialect.Util;
-import org.apache.log4j.spi.ComponentBase;
-
/**
* @author Ceki Gülcü
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/CustomSQLDBReceiver.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/CustomSQLDBReceiver.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/CustomSQLDBReceiver.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/CustomSQLDBReceiver.java Sat May 26 15:48:32 2012
@@ -15,30 +15,31 @@
* limitations under the License.
*/
-package org.apache.log4j.db;
-
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.Hashtable;
-import java.util.Properties;
-import java.util.StringTokenizer;
+package org.apache.log4j.receivers.db;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
-import org.apache.log4j.plugins.Pauseable;
-import org.apache.log4j.plugins.Receiver;
-import org.apache.log4j.scheduler.Job;
-import org.apache.log4j.scheduler.Scheduler;
+import org.apache.log4j.component.plugins.Pauseable;
+import org.apache.log4j.component.plugins.Receiver;
+import org.apache.log4j.component.scheduler.Job;
+import org.apache.log4j.component.scheduler.Scheduler;
+import org.apache.log4j.component.spi.LoggerRepositoryEx;
import org.apache.log4j.spi.LocationInfo;
-import org.apache.log4j.spi.LoggerRepositoryEx;
+
import org.apache.log4j.spi.LoggingEvent;
import org.apache.log4j.spi.ThrowableInformation;
import org.apache.log4j.xml.DOMConfigurator;
import org.apache.log4j.xml.UnrecognizedElementHandler;
import org.w3c.dom.Element;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Hashtable;
+import java.util.Properties;
+import java.util.StringTokenizer;
+
/**
* Converts log data stored in a database into LoggingEvents.
* <p>
@@ -162,7 +163,7 @@ public class CustomSQLDBReceiver extends
public static final String LOG4J_ID_KEY = "log4jid";
- private Job customReceiverJob;
+ private CustomReceiverJob customReceiverJob;
public void activateOptions() {
@@ -183,7 +184,7 @@ public class CustomSQLDBReceiver extends
if (repository instanceof LoggerRepositoryEx) {
Scheduler scheduler = ((LoggerRepositoryEx) repository).getScheduler();
-
+
scheduler.schedule(
customReceiverJob, System.currentTimeMillis() + 500, refreshMillis);
}
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/DBAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/DBAppender.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/DBAppender.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/DBAppender.java Sat May 26 15:48:32 2012
@@ -18,9 +18,11 @@
package org.apache.log4j.db;
import org.apache.log4j.AppenderSkeleton;
-import org.apache.log4j.db.dialect.SQLDialect;
-import org.apache.log4j.db.dialect.Util;
import org.apache.log4j.helpers.LogLog;
+import org.apache.log4j.receivers.db.ConnectionSource;
+import org.apache.log4j.receivers.db.DBHelper;
+import org.apache.log4j.receivers.db.dialect.SQLDialect;
+import org.apache.log4j.receivers.db.dialect.Util;
import org.apache.log4j.spi.LocationInfo;
import org.apache.log4j.spi.LoggingEvent;
import org.apache.log4j.xml.DOMConfigurator;
@@ -29,11 +31,7 @@ import org.w3c.dom.Element;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
+import java.sql.*;
import java.util.Iterator;
import java.util.Properties;
import java.util.Set;
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/DBHelper.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/DBHelper.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/DBHelper.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/DBHelper.java Sat May 26 15:48:32 2012
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.log4j.db;
+package org.apache.log4j.receivers.db;
+
+import org.apache.log4j.spi.LoggingEvent;
import java.sql.Connection;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.Set;
-import org.apache.log4j.spi.LoggingEvent;
-
/**
* @author Ceki Gülcü
*
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/DBReceiver.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/DBReceiver.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/DBReceiver.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/DBReceiver.java Sat May 26 15:48:32 2012
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.log4j.db;
+package org.apache.log4j.receivers.db;
-import org.apache.log4j.plugins.Pauseable;
-import org.apache.log4j.plugins.Receiver;
-import org.apache.log4j.scheduler.Scheduler;
-import org.apache.log4j.spi.LoggerRepositoryEx;
+import org.apache.log4j.component.plugins.Pauseable;
+import org.apache.log4j.component.plugins.Receiver;
+import org.apache.log4j.component.scheduler.Scheduler;
+import org.apache.log4j.component.spi.LoggerRepositoryEx;
import org.apache.log4j.xml.DOMConfigurator;
import org.apache.log4j.xml.UnrecognizedElementHandler;
import org.w3c.dom.Element;
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/DBReceiverJob.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/DBReceiverJob.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/DBReceiverJob.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/DBReceiverJob.java Sat May 26 15:48:32 2012
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.log4j.db;
+package org.apache.log4j.receivers.db;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
-import org.apache.log4j.scheduler.Job;
-import org.apache.log4j.spi.ComponentBase;
+import org.apache.log4j.component.scheduler.Job;
+import org.apache.log4j.component.spi.ComponentBase;
import org.apache.log4j.spi.LocationInfo;
import org.apache.log4j.spi.LoggingEvent;
import org.apache.log4j.spi.ThrowableInformation;
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/DataSourceConnectionSource.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/DataSourceConnectionSource.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/DataSourceConnectionSource.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/DataSourceConnectionSource.java Sat May 26 15:48:32 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.log4j.db;
+package org.apache.log4j.receivers.db;
import org.apache.log4j.xml.DOMConfigurator;
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/DriverManagerConnectionSource.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/DriverManagerConnectionSource.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/DriverManagerConnectionSource.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/DriverManagerConnectionSource.java Sat May 26 15:48:32 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.log4j.db;
+package org.apache.log4j.receivers.db;
import java.sql.Connection;
import java.sql.DriverManager;
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/JNDIConnectionSource.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/JNDIConnectionSource.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/JNDIConnectionSource.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/JNDIConnectionSource.java Sat May 26 15:48:32 2012
@@ -14,18 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.log4j.db;
-
-import java.sql.Connection;
-import java.sql.SQLException;
+package org.apache.log4j.receivers.db;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
+import javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.SQLException;
// PortableRemoteObject was introduced in JDK 1.3. We won't use it.
// import javax.rmi.PortableRemoteObject;
-import javax.sql.DataSource;
/**
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/dialect/HSQLDBDialect.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/dialect/HSQLDBDialect.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/dialect/HSQLDBDialect.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/dialect/HSQLDBDialect.java Sat May 26 15:48:32 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.log4j.db.dialect;
+package org.apache.log4j.receivers.db.dialect;
/**
* The HSQLDB dialect.
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/dialect/MsSQLDialect.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/dialect/MsSQLDialect.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/dialect/MsSQLDialect.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/dialect/MsSQLDialect.java Sat May 26 15:48:32 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.log4j.db.dialect;
+package org.apache.log4j.receivers.db.dialect;
/**
* The MS SQL Server dialect is untested.
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/dialect/MySQLDialect.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/dialect/MySQLDialect.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/dialect/MySQLDialect.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/dialect/MySQLDialect.java Sat May 26 15:48:32 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.log4j.db.dialect;
+package org.apache.log4j.receivers.db.dialect;
/**
*
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/dialect/OracleDialect.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/dialect/OracleDialect.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/dialect/OracleDialect.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/dialect/OracleDialect.java Sat May 26 15:48:32 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.log4j.db.dialect;
+package org.apache.log4j.receivers.db.dialect;
/**
* The Oracle dialect. Tested successfully on Oracle9i Release 9.2.0.3.0 by
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/dialect/PostgreSQLDialect.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/dialect/PostgreSQLDialect.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/dialect/PostgreSQLDialect.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/dialect/PostgreSQLDialect.java Sat May 26 15:48:32 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.log4j.db.dialect;
+package org.apache.log4j.receivers.db.dialect;
/**
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/dialect/SQLDialect.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/dialect/SQLDialect.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/dialect/SQLDialect.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/dialect/SQLDialect.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.dialect;
+package org.apache.log4j.receivers.db.dialect;
/**
* @author ceki
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/dialect/SybaseDialect.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/dialect/SybaseDialect.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/dialect/SybaseDialect.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/dialect/SybaseDialect.java Sat May 26 15:48:32 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.log4j.db.dialect;
+package org.apache.log4j.receivers.db.dialect;
/**
* The Sybase dialect.
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/dialect/Util.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/dialect/Util.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/dialect/Util.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/db/dialect/Util.java Sat May 26 15:48:32 2012
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.log4j.db.dialect;
+package org.apache.log4j.receivers.db.dialect;
-import org.apache.log4j.db.ConnectionSource;
-import org.apache.log4j.spi.ComponentBase;
+import org.apache.log4j.component.spi.ComponentBase;
+import org.apache.log4j.receivers.db.ConnectionSource;
import java.sql.DatabaseMetaData;
import java.sql.SQLException;
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/helpers/UtilLoggingLevel.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/helpers/UtilLoggingLevel.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/helpers/UtilLoggingLevel.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/helpers/UtilLoggingLevel.java Sat May 26 15:48:32 2012
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.log4j.helpers;
+package org.apache.log4j.receivers.helpers;
+
+import org.apache.log4j.Level;
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Level;
-
/**
* An extension of the Level class that provides support for java.util.logging
* Levels.
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/AddressBased.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/AddressBased.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/AddressBased.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/AddressBased.java Sat May 26 15:48:32 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.log4j.net;
+package org.apache.log4j.receivers.net;
/**
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/JMSReceiver.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/JMSReceiver.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/JMSReceiver.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/JMSReceiver.java Sat May 26 15:48:32 2012
@@ -15,29 +15,19 @@
* limitations under the License.
*/
-package org.apache.log4j.net;
+package org.apache.log4j.receivers.net;
-import java.io.FileInputStream;
-import java.util.Properties;
-
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.TopicConnection;
-import javax.jms.Topic;
-import javax.jms.TopicConnectionFactory;
-import javax.jms.TopicSubscriber;
-import javax.jms.Session;
-import javax.jms.TopicSession;
-import javax.jms.ObjectMessage;
+import org.apache.log4j.component.plugins.Plugin;
+import org.apache.log4j.component.plugins.Receiver;
+import org.apache.log4j.spi.LoggingEvent;
-import javax.naming.InitialContext;
+import javax.jms.*;
import javax.naming.Context;
+import javax.naming.InitialContext;
import javax.naming.NameNotFoundException;
import javax.naming.NamingException;
-
-import org.apache.log4j.spi.LoggingEvent;
-import org.apache.log4j.plugins.Plugin;
-import org.apache.log4j.plugins.Receiver;
+import java.io.FileInputStream;
+import java.util.Properties;
/**
JMSReceiver receives a remote logging event on a configured
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/JMSReceiverBeanInfo.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/JMSReceiverBeanInfo.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/JMSReceiverBeanInfo.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/JMSReceiverBeanInfo.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.net;
+package org.apache.log4j.receivers.net;
import java.beans.PropertyDescriptor;
import java.beans.SimpleBeanInfo;
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/MulticastAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/MulticastAppender.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/MulticastAppender.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/MulticastAppender.java Sat May 26 15:48:32 2012
@@ -15,7 +15,15 @@
* limitations under the License.
*/
-package org.apache.log4j.net;
+package org.apache.log4j.receivers.net;
+
+import org.apache.log4j.AppenderSkeleton;
+
+import org.apache.log4j.component.helpers.Constants;
+import org.apache.log4j.helpers.LogLog;
+import org.apache.log4j.net.ZeroConfSupport;
+import org.apache.log4j.spi.LoggingEvent;
+import org.apache.log4j.xml.XMLLayout;
import java.io.IOException;
import java.net.DatagramPacket;
@@ -23,15 +31,8 @@ import java.net.InetAddress;
import java.net.MulticastSocket;
import java.net.UnknownHostException;
import java.util.HashMap;
-import java.util.Hashtable;
import java.util.Map;
-import org.apache.log4j.AppenderSkeleton;
-import org.apache.log4j.helpers.Constants;
-import org.apache.log4j.spi.LoggingEvent;
-import org.apache.log4j.helpers.LogLog;
-import org.apache.log4j.xml.XMLLayout;
-
/**
* Multicast-based Appender. Works in conjunction with the MulticastReceiver, which expects
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/MulticastReceiver.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/MulticastReceiver.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/MulticastReceiver.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/MulticastReceiver.java Sat May 26 15:48:32 2012
@@ -15,23 +15,21 @@
* limitations under the License.
*/
-package org.apache.log4j.net;
+package org.apache.log4j.receivers.net;
+
+
+import org.apache.log4j.component.plugins.Pauseable;
+import org.apache.log4j.component.plugins.Receiver;
+import org.apache.log4j.net.ZeroConfSupport;
+import org.apache.log4j.receivers.spi.Decoder;
+import org.apache.log4j.spi.LoggingEvent;
import java.io.IOException;
-import java.net.DatagramPacket;
-import java.net.InetAddress;
-import java.net.MulticastSocket;
-import java.net.SocketException;
-import java.net.UnknownHostException;
+import java.net.*;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.apache.log4j.plugins.Pauseable;
-import org.apache.log4j.plugins.Receiver;
-import org.apache.log4j.spi.Decoder;
-import org.apache.log4j.spi.LoggingEvent;
-
/**
* Multicast-based receiver. Accepts LoggingEvents encoded using
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/MulticastReceiverBeanInfo.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/MulticastReceiverBeanInfo.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/MulticastReceiverBeanInfo.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/MulticastReceiverBeanInfo.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.net;
+package org.apache.log4j.receivers.net;
import java.beans.PropertyDescriptor;
import java.beans.SimpleBeanInfo;
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/NetworkBased.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/NetworkBased.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/NetworkBased.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/NetworkBased.java Sat May 26 15:48:32 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.log4j.net;
+package org.apache.log4j.receivers.net;
/**
* The parent of all the Network based interfaces.
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/PortBased.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/PortBased.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/PortBased.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/PortBased.java Sat May 26 15:48:32 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.log4j.net;
+package org.apache.log4j.receivers.net;
/**
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/SocketHubReceiver.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/SocketHubReceiver.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/SocketHubReceiver.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/SocketHubReceiver.java Sat May 26 15:48:32 2012
@@ -15,10 +15,12 @@
* limitations under the License.
*/
-package org.apache.log4j.net;
+package org.apache.log4j.receivers.net;
-import org.apache.log4j.plugins.Plugin;
-import org.apache.log4j.plugins.Receiver;
+
+import org.apache.log4j.component.plugins.Plugin;
+import org.apache.log4j.component.plugins.Receiver;
+import org.apache.log4j.net.ZeroConfSupport;
import org.apache.log4j.spi.LoggerRepository;
import java.io.IOException;
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/SocketNode13.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/SocketNode13.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/SocketNode13.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/SocketNode13.java Sat May 26 15:48:32 2012
@@ -15,7 +15,15 @@
* limitations under the License.
*/
-package org.apache.log4j.net;
+package org.apache.log4j.receivers.net;
+
+import org.apache.log4j.Logger;
+import org.apache.log4j.component.helpers.Constants;
+import org.apache.log4j.component.plugins.Pauseable;
+import org.apache.log4j.component.plugins.Receiver;
+import org.apache.log4j.component.spi.ComponentBase;
+import org.apache.log4j.spi.LoggerRepository;
+import org.apache.log4j.spi.LoggingEvent;
import java.io.BufferedInputStream;
import java.io.IOException;
@@ -26,14 +34,6 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import org.apache.log4j.Logger;
-import org.apache.log4j.helpers.Constants;
-import org.apache.log4j.plugins.Pauseable;
-import org.apache.log4j.plugins.Receiver;
-import org.apache.log4j.spi.ComponentBase;
-import org.apache.log4j.spi.LoggerRepository;
-import org.apache.log4j.spi.LoggingEvent;
-
// Contributors: Moses Hohman <mm...@rainbow.uchicago.edu>
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/SocketNodeEventListener.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/SocketNodeEventListener.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/SocketNodeEventListener.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/SocketNodeEventListener.java Sat May 26 15:48:32 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.log4j.net;
+package org.apache.log4j.receivers.net;
import java.util.EventListener;
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/SocketReceiver.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/SocketReceiver.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/SocketReceiver.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/SocketReceiver.java Sat May 26 15:48:32 2012
@@ -15,25 +15,20 @@
* limitations under the License.
*/
-package org.apache.log4j.net;
+package org.apache.log4j.receivers.net;
+
+
+import org.apache.log4j.component.plugins.Pauseable;
+import org.apache.log4j.component.plugins.Plugin;
+import org.apache.log4j.component.plugins.Receiver;
+import org.apache.log4j.net.ZeroConfSupport;
+import org.apache.log4j.spi.LoggerRepository;
+import org.apache.log4j.spi.LoggingEvent;
import java.io.IOException;
import java.net.ServerSocket;
import java.net.Socket;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import org.apache.log4j.plugins.Pauseable;
-import org.apache.log4j.plugins.Plugin;
-import org.apache.log4j.plugins.Receiver;
-import org.apache.log4j.spi.LoggerRepository;
-import org.apache.log4j.spi.LoggingEvent;
+import java.util.*;
/**
@@ -50,7 +45,7 @@ import org.apache.log4j.spi.LoggingEvent
@author Paul Smith (psmith@apache.org)
*/
public class SocketReceiver extends Receiver implements Runnable, PortBased,
- Pauseable {
+ Pauseable {
/**
* socket map.
*/
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/UDPAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/UDPAppender.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/UDPAppender.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/UDPAppender.java Sat May 26 15:48:32 2012
@@ -15,12 +15,14 @@
* limitations under the License.
*/
-package org.apache.log4j.net;
+package org.apache.log4j.receivers.net;
import org.apache.log4j.AppenderSkeleton;
-import org.apache.log4j.helpers.Constants;
-import org.apache.log4j.spi.LoggingEvent;
+import org.apache.log4j.component.helpers.Constants;
import org.apache.log4j.helpers.LogLog;
+
+import org.apache.log4j.net.ZeroConfSupport;
+import org.apache.log4j.spi.LoggingEvent;
import org.apache.log4j.xml.XMLLayout;
import java.io.IOException;
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/UDPReceiver.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/UDPReceiver.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/UDPReceiver.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/UDPReceiver.java Sat May 26 15:48:32 2012
@@ -15,7 +15,13 @@
* limitations under the License.
*/
-package org.apache.log4j.net;
+package org.apache.log4j.receivers.net;
+
+import org.apache.log4j.component.plugins.Pauseable;
+import org.apache.log4j.component.plugins.Receiver;
+import org.apache.log4j.net.ZeroConfSupport;
+import org.apache.log4j.receivers.spi.Decoder;
+import org.apache.log4j.spi.LoggingEvent;
import java.io.IOException;
import java.net.DatagramPacket;
@@ -25,11 +31,6 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.apache.log4j.plugins.Pauseable;
-import org.apache.log4j.plugins.Receiver;
-import org.apache.log4j.spi.Decoder;
-import org.apache.log4j.spi.LoggingEvent;
-
/**
* Receive LoggingEvents encoded with an XMLLayout, convert the XML data to a
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/XMLSocketNode.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/XMLSocketNode.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/XMLSocketNode.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/XMLSocketNode.java Sat May 26 15:48:32 2012
@@ -15,18 +15,21 @@
* limitations under the License.
*/
-package org.apache.log4j.net;
+package org.apache.log4j.receivers.net;
-import org.apache.log4j.*;
-import org.apache.log4j.helpers.Constants;
-import org.apache.log4j.plugins.Receiver;
-import org.apache.log4j.spi.*;
+import org.apache.log4j.Logger;
+
+
+import org.apache.log4j.component.helpers.Constants;
+import org.apache.log4j.component.plugins.Receiver;
+import org.apache.log4j.component.spi.ComponentBase;
+import org.apache.log4j.receivers.spi.Decoder;
+import org.apache.log4j.spi.LoggerRepository;
+import org.apache.log4j.spi.LoggingEvent;
import java.io.IOException;
import java.io.InputStream;
-
import java.net.Socket;
-
import java.util.Iterator;
import java.util.List;
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/XMLSocketReceiver.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/XMLSocketReceiver.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/XMLSocketReceiver.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/net/XMLSocketReceiver.java Sat May 26 15:48:32 2012
@@ -15,19 +15,20 @@
* limitations under the License.
*/
-package org.apache.log4j.net;
+package org.apache.log4j.receivers.net;
+
+import org.apache.log4j.component.plugins.Pauseable;
+import org.apache.log4j.component.plugins.Plugin;
+import org.apache.log4j.component.plugins.Receiver;
+import org.apache.log4j.net.ZeroConfSupport;
+import org.apache.log4j.spi.LoggerRepository;
+import org.apache.log4j.spi.LoggingEvent;
import java.net.ServerSocket;
import java.net.Socket;
import java.util.List;
import java.util.Vector;
-import org.apache.log4j.plugins.Pauseable;
-import org.apache.log4j.plugins.Plugin;
-import org.apache.log4j.plugins.Receiver;
-import org.apache.log4j.spi.LoggerRepository;
-import org.apache.log4j.spi.LoggingEvent;
-
/**
XMLSocketReceiver receives a remote logging event via XML on a configured
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/rewrite/MapRewritePolicy.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/rewrite/MapRewritePolicy.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/rewrite/MapRewritePolicy.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/rewrite/MapRewritePolicy.java Sat May 26 15:48:32 2012
@@ -14,15 +14,15 @@
* 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 org.apache.log4j.Logger;
+import org.apache.log4j.spi.LoggingEvent;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import org.apache.log4j.Logger;
-import org.apache.log4j.spi.LoggingEvent;
-
/**
* This policy rewrites events where the message of the
* original event implementes java.util.Map.
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/rewrite/PropertyRewritePolicy.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/rewrite/PropertyRewritePolicy.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/rewrite/PropertyRewritePolicy.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/rewrite/PropertyRewritePolicy.java Sat May 26 15:48:32 2012
@@ -14,17 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.log4j.rewrite;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.StringTokenizer;
+package org.apache.log4j.receivers.rewrite;
import org.apache.log4j.Logger;
import org.apache.log4j.spi.LoggingEvent;
+import java.util.*;
+
/**
* This policy rewrites events by adding
* a user-specified list of properties to the event.
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/rewrite/ReflectionRewritePolicy.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/rewrite/ReflectionRewritePolicy.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/rewrite/ReflectionRewritePolicy.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/rewrite/ReflectionRewritePolicy.java Sat May 26 15:48:32 2012
@@ -14,17 +14,17 @@
* 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 org.apache.log4j.Logger;
+import org.apache.log4j.helpers.LogLog;
+import org.apache.log4j.spi.LoggingEvent;
import java.beans.Introspector;
import java.beans.PropertyDescriptor;
import java.util.HashMap;
import java.util.Map;
-import org.apache.log4j.Logger;
-import org.apache.log4j.helpers.LogLog;
-import org.apache.log4j.spi.LoggingEvent;
-
/**
* This policy rewrites events by evaluating any
* JavaBean properties on the message object and adding them
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/rewrite/RewriteAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/rewrite/RewriteAppender.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/rewrite/RewriteAppender.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/rewrite/RewriteAppender.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.rewrite;
+package org.apache.log4j.receivers.rewrite;
import org.apache.log4j.Appender;
import org.apache.log4j.AppenderSkeleton;
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/rewrite/RewritePolicy.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/rewrite/RewritePolicy.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/rewrite/RewritePolicy.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/rewrite/RewritePolicy.java Sat May 26 15:48:32 2012
@@ -1,4 +1,4 @@
-package org.apache.log4j.rewrite;
+package org.apache.log4j.receivers.rewrite;
import org.apache.log4j.spi.LoggingEvent;
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/spi/Decoder.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/spi/Decoder.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/spi/Decoder.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/spi/Decoder.java Sat May 26 15:48:32 2012
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.log4j.spi;
+package org.apache.log4j.receivers.spi;
-import java.io.IOException;
+import org.apache.log4j.spi.LoggingEvent;
+import java.io.IOException;
import java.net.URL;
-
import java.util.Map;
import java.util.Vector;
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/varia/ListModelAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/varia/ListModelAppender.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/varia/ListModelAppender.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/varia/ListModelAppender.java Sat May 26 15:48:32 2012
@@ -15,13 +15,12 @@
* limitations under the License.
*/
-package org.apache.log4j.varia;
+package org.apache.log4j.receivers.varia;
import org.apache.log4j.AppenderSkeleton;
import org.apache.log4j.spi.LoggingEvent;
-import javax.swing.DefaultListModel;
-import javax.swing.ListModel;
+import javax.swing.*;
/**
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/varia/LogFilePatternReceiver.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/varia/LogFilePatternReceiver.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/varia/LogFilePatternReceiver.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/varia/LogFilePatternReceiver.java Sat May 26 15:48:32 2012
@@ -15,38 +15,28 @@
* limitations under the License.
*/
-package org.apache.log4j.varia;
-
-import java.io.BufferedReader;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.StringTokenizer;
-import java.util.regex.MatchResult;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.regex.PatternSyntaxException;
+package org.apache.log4j.receivers.varia;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
-import org.apache.log4j.helpers.Constants;
-import org.apache.log4j.plugins.Receiver;
+import org.apache.log4j.component.helpers.Constants;
+import org.apache.log4j.component.plugins.Receiver;
import org.apache.log4j.rule.ExpressionRule;
import org.apache.log4j.rule.Rule;
import org.apache.log4j.spi.LocationInfo;
import org.apache.log4j.spi.LoggingEvent;
import org.apache.log4j.spi.ThrowableInformation;
+import java.io.*;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.regex.MatchResult;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
+
/**
* LogFilePatternReceiver can parse and tail log files, converting entries into
* LoggingEvents. If the file doesn't exist when the receiver is initialized, the
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/varia/LogFilePatternReceiverBeanInfo.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/varia/LogFilePatternReceiverBeanInfo.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/varia/LogFilePatternReceiverBeanInfo.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/varia/LogFilePatternReceiverBeanInfo.java Sat May 26 15:48:32 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.log4j.varia;
+package org.apache.log4j.receivers.varia;
import java.beans.PropertyDescriptor;
import java.beans.SimpleBeanInfo;
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/xml/LogFileXMLReceiver.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/xml/LogFileXMLReceiver.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/xml/LogFileXMLReceiver.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/xml/LogFileXMLReceiver.java Sat May 26 15:48:32 2012
@@ -15,25 +15,21 @@
* limitations under the License.
*/
-package org.apache.log4j.xml;
+package org.apache.log4j.receivers.xml;
-import java.io.BufferedReader;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Reader;
+import org.apache.log4j.component.helpers.Constants;
+import org.apache.log4j.component.plugins.Receiver;
+import org.apache.log4j.rule.ExpressionRule;
+import org.apache.log4j.rule.Rule;
+import org.apache.log4j.receivers.spi.Decoder;
+import org.apache.log4j.spi.LoggingEvent;
+
+import java.io.*;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Collection;
import java.util.Iterator;
-import org.apache.log4j.helpers.Constants;
-import org.apache.log4j.plugins.Receiver;
-import org.apache.log4j.rule.ExpressionRule;
-import org.apache.log4j.rule.Rule;
-import org.apache.log4j.spi.Decoder;
-import org.apache.log4j.spi.LoggingEvent;
-
/**
* LogFileXMLReceiver will read an xml-formated log file and make the events in the log file
* available to the log4j framework.
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/xml/UtilLoggingEntityResolver.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/xml/UtilLoggingEntityResolver.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/xml/UtilLoggingEntityResolver.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/xml/UtilLoggingEntityResolver.java Sat May 26 15:48:32 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.log4j.xml;
+package org.apache.log4j.receivers.xml;
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/xml/UtilLoggingXMLDecoder.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/xml/UtilLoggingXMLDecoder.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/xml/UtilLoggingXMLDecoder.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/xml/UtilLoggingXMLDecoder.java Sat May 26 15:48:32 2012
@@ -15,40 +15,32 @@
* limitations under the License.
*/
-package org.apache.log4j.xml;
-
-import java.awt.Component;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.LineNumberReader;
-import java.io.StringReader;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Vector;
-import java.util.zip.ZipInputStream;
-
-import javax.swing.ProgressMonitorInputStream;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
+package org.apache.log4j.receivers.xml;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.apache.log4j.helpers.UtilLoggingLevel;
-import org.apache.log4j.spi.Decoder;
+
+import org.apache.log4j.receivers.spi.Decoder;
+import org.apache.log4j.spi.LocationInfo;
import org.apache.log4j.spi.LoggingEvent;
import org.apache.log4j.spi.ThrowableInformation;
-import org.apache.log4j.spi.LocationInfo;
+import org.apache.log4j.xml.SAXErrorHandler;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;
+import javax.swing.*;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import java.awt.*;
+import java.io.*;
+import java.net.URL;
+import java.util.*;
+import java.util.zip.ZipInputStream;
+
/**
* Decodes JDK 1.4's java.util.logging package events
Modified: logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/xml/XMLDecoder.java
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/xml/XMLDecoder.java?rev=1342917&r1=1342903&r2=1342917&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/xml/XMLDecoder.java (original)
+++ logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/receivers/xml/XMLDecoder.java Sat May 26 15:48:32 2012
@@ -15,38 +15,31 @@
* limitations under the License.
*/
-package org.apache.log4j.xml;
-
-import java.awt.Component;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.LineNumberReader;
-import java.io.StringReader;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Vector;
-import java.util.zip.ZipInputStream;
-
-import javax.swing.ProgressMonitorInputStream;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
+package org.apache.log4j.receivers.xml;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
-import org.apache.log4j.spi.Decoder;
+import org.apache.log4j.receivers.spi.Decoder;
import org.apache.log4j.spi.LocationInfo;
import org.apache.log4j.spi.LoggingEvent;
import org.apache.log4j.spi.ThrowableInformation;
+import org.apache.log4j.xml.Log4jEntityResolver;
+import org.apache.log4j.xml.SAXErrorHandler;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;
+import javax.swing.*;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import java.awt.*;
+import java.io.*;
+import java.net.URL;
+import java.util.*;
+import java.util.zip.ZipInputStream;
+
/**
* Decodes Logging Events in XML formated into elements that are used by