This is an automated email from the ASF dual-hosted git repository. grobmeier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/logging-chainsaw.git
commit d7314d7249a6127f92c2192b1fadce77225735f8 Author: Christian Grobmeier <[email protected]> AuthorDate: Tue Nov 28 23:02:04 2023 +0100 moed receivers to their own package --- .../apache/log4j/chainsaw/ChainsawAppender.java | 8 +++-- .../log4j/chainsaw/ChainsawReceiverNode.java | 29 --------------- .../java/org/apache/log4j/chainsaw/Generator.java | 1 + src/main/java/org/apache/log4j/chainsaw/LogUI.java | 2 ++ .../log4j/chainsaw/ReceiverEventListener.java | 2 ++ .../chainsaw/components/logpanel/LogPanel.java | 1 + .../log4j/chainsaw/prefs/SettingsManager.java | 4 +-- .../chainsaw/{ => receiver}/ChainsawReceiver.java | 41 +++++++++++----------- .../{ => receiver}/ChainsawReceiverFactory.java | 10 +++--- .../{ => receiver}/ChainsawReceiverSkeleton.java | 11 +++--- .../chainsaw/receivers/NewReceiverDialogPanel.java | 4 +-- .../receivers/PluginPropertyEditorPanel.java | 11 ++---- .../receivers/ReceiverTreeCellRenderer.java | 2 +- .../log4j/chainsaw/receivers/ReceiversPanel.java | 4 +-- .../chainsaw/receivers/ReceiversTreeModel.java | 5 ++- .../log4j/chainsaw/zeroconf/ZeroConfPlugin.java | 2 +- .../java/org/apache/log4j/net/JsonReceiver.java | 2 +- .../org/apache/log4j/net/JsonReceiverFactory.java | 4 +-- .../org/apache/log4j/net/MulticastReceiver.java | 2 +- .../apache/log4j/net/MulticastReceiverFactory.java | 4 +-- .../java/org/apache/log4j/net/UDPReceiver.java | 2 +- .../org/apache/log4j/net/UDPReceiverFactory.java | 4 +-- .../org/apache/log4j/net/XMLReceiverFactory.java | 4 +-- .../org/apache/log4j/net/XMLSocketReceiver.java | 2 +- .../apache/log4j/varia/LogFilePatternReceiver.java | 2 +- .../log4j/varia/LogFilePatternReceiverFactory.java | 4 +-- .../org/apache/log4j/xml/LogFileXMLReceiver.java | 2 +- ...og4j.chainsaw.receiver.ChainsawReceiverFactory} | 0 28 files changed, 70 insertions(+), 99 deletions(-) diff --git a/src/main/java/org/apache/log4j/chainsaw/ChainsawAppender.java b/src/main/java/org/apache/log4j/chainsaw/ChainsawAppender.java index ebe366b..9d41f58 100755 --- a/src/main/java/org/apache/log4j/chainsaw/ChainsawAppender.java +++ b/src/main/java/org/apache/log4j/chainsaw/ChainsawAppender.java @@ -18,6 +18,8 @@ package org.apache.log4j.chainsaw; import java.time.Instant; import org.apache.log4j.chainsaw.logevents.ChainsawLoggingEventBuilder; +import org.apache.log4j.chainsaw.receiver.ChainsawReceiver; +import org.apache.log4j.chainsaw.receiver.ChainsawReceiverSkeleton; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.appender.AbstractOutputStreamAppender; import org.apache.logging.log4j.core.config.plugins.Plugin; @@ -27,7 +29,7 @@ import org.apache.logging.log4j.core.config.plugins.PluginFactory; @Plugin(name = "ChainsawAppender", category = "Core", elementType = "appender", printObject = true) public final class ChainsawAppender extends AbstractOutputStreamAppender { - private ChainsawAppenderReceiver m_receiver = new ChainsawAppenderReceiver(); + private ChainsawAppenderReceiver receiver = new ChainsawAppenderReceiver(); private ChainsawAppender(String name) { super(name, null, null, true, true, null); @@ -55,11 +57,11 @@ public final class ChainsawAppender extends AbstractOutputStreamAppender { .setThreadName( event.getThreadName() ) .setTimestamp( Instant.ofEpochMilli(event.getInstant().getEpochMillisecond()) ); - m_receiver.append(builder.create()); + receiver.append(builder.create()); } public ChainsawReceiver getReceiver(){ - return m_receiver; + return receiver; } class ChainsawAppenderReceiver extends ChainsawReceiverSkeleton { diff --git a/src/main/java/org/apache/log4j/chainsaw/ChainsawReceiverNode.java b/src/main/java/org/apache/log4j/chainsaw/ChainsawReceiverNode.java deleted file mode 100644 index ea1d748..0000000 --- a/src/main/java/org/apache/log4j/chainsaw/ChainsawReceiverNode.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.log4j.chainsaw; - -/** - * Each ChainsawReceiver may have multiple Nodes associated with it. For example, - * if a ChainsawReceiver listens on a port for incoming connections, each - * incoming connection will create a new ChainsawReceiverNode that will read and - * parse messages. - * - * Other receivers may not need to create sub-nodes. - */ -public interface ChainsawReceiverNode { - -} diff --git a/src/main/java/org/apache/log4j/chainsaw/Generator.java b/src/main/java/org/apache/log4j/chainsaw/Generator.java index 7d8e7ea..ab6812a 100644 --- a/src/main/java/org/apache/log4j/chainsaw/Generator.java +++ b/src/main/java/org/apache/log4j/chainsaw/Generator.java @@ -22,6 +22,7 @@ import org.apache.log4j.chainsaw.logevents.ChainsawLoggingEvent; import org.apache.log4j.chainsaw.logevents.ChainsawLoggingEventBuilder; import org.apache.log4j.chainsaw.logevents.Level; import org.apache.log4j.chainsaw.logevents.LocationInfo; +import org.apache.log4j.chainsaw.receiver.ChainsawReceiverSkeleton; /** diff --git a/src/main/java/org/apache/log4j/chainsaw/LogUI.java b/src/main/java/org/apache/log4j/chainsaw/LogUI.java index 0543222..139169b 100644 --- a/src/main/java/org/apache/log4j/chainsaw/LogUI.java +++ b/src/main/java/org/apache/log4j/chainsaw/LogUI.java @@ -32,6 +32,8 @@ import org.apache.log4j.chainsaw.icons.LineIconFactory; import org.apache.log4j.chainsaw.logevents.ChainsawLoggingEvent; import org.apache.log4j.chainsaw.osx.OSXIntegration; import org.apache.log4j.chainsaw.prefs.SettingsManager; +import org.apache.log4j.chainsaw.receiver.ChainsawReceiver; +import org.apache.log4j.chainsaw.receiver.ChainsawReceiverFactory; import org.apache.log4j.chainsaw.receivers.ReceiversPanel; import org.apache.log4j.chainsaw.zeroconf.ZeroConfPlugin; import org.apache.log4j.rule.ExpressionRule; diff --git a/src/main/java/org/apache/log4j/chainsaw/ReceiverEventListener.java b/src/main/java/org/apache/log4j/chainsaw/ReceiverEventListener.java index 5d0af86..309f72a 100644 --- a/src/main/java/org/apache/log4j/chainsaw/ReceiverEventListener.java +++ b/src/main/java/org/apache/log4j/chainsaw/ReceiverEventListener.java @@ -16,6 +16,8 @@ */ package org.apache.log4j.chainsaw; +import org.apache.log4j.chainsaw.receiver.ChainsawReceiver; + /** * A ReceiverEventListener is an interface that lets you listen to events, such * as receivers being added or removed. diff --git a/src/main/java/org/apache/log4j/chainsaw/components/logpanel/LogPanel.java b/src/main/java/org/apache/log4j/chainsaw/components/logpanel/LogPanel.java index 3f807bd..1a41317 100644 --- a/src/main/java/org/apache/log4j/chainsaw/components/logpanel/LogPanel.java +++ b/src/main/java/org/apache/log4j/chainsaw/components/logpanel/LogPanel.java @@ -33,6 +33,7 @@ import org.apache.log4j.chainsaw.layout.LayoutEditorPane; import org.apache.log4j.chainsaw.prefs.LoadSettingsEvent; import org.apache.log4j.chainsaw.prefs.Profileable; import org.apache.log4j.chainsaw.prefs.SettingsManager; +import org.apache.log4j.chainsaw.receiver.ChainsawReceiver; import org.apache.log4j.helpers.Constants; import org.apache.log4j.rule.ColorRule; import org.apache.log4j.rule.ExpressionRule; diff --git a/src/main/java/org/apache/log4j/chainsaw/prefs/SettingsManager.java b/src/main/java/org/apache/log4j/chainsaw/prefs/SettingsManager.java index b468efd..7012ed8 100644 --- a/src/main/java/org/apache/log4j/chainsaw/prefs/SettingsManager.java +++ b/src/main/java/org/apache/log4j/chainsaw/prefs/SettingsManager.java @@ -25,8 +25,8 @@ import org.apache.commons.configuration2.builder.fluent.Parameters; import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.commons.configuration2.tree.OverrideCombiner; -import org.apache.log4j.chainsaw.ChainsawReceiver; -import org.apache.log4j.chainsaw.ChainsawReceiverFactory; +import org.apache.log4j.chainsaw.receiver.ChainsawReceiver; +import org.apache.log4j.chainsaw.receiver.ChainsawReceiverFactory; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/org/apache/log4j/chainsaw/ChainsawReceiver.java b/src/main/java/org/apache/log4j/chainsaw/receiver/ChainsawReceiver.java similarity index 61% rename from src/main/java/org/apache/log4j/chainsaw/ChainsawReceiver.java rename to src/main/java/org/apache/log4j/chainsaw/receiver/ChainsawReceiver.java index 69f34e7..9caede2 100644 --- a/src/main/java/org/apache/log4j/chainsaw/ChainsawReceiver.java +++ b/src/main/java/org/apache/log4j/chainsaw/receiver/ChainsawReceiver.java @@ -14,59 +14,58 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.log4j.chainsaw; +package org.apache.log4j.chainsaw.receiver; -import java.beans.PropertyChangeListener; -import org.apache.commons.configuration2.AbstractConfiguration; +import org.apache.log4j.chainsaw.ChainsawEventBatchListener; import org.apache.log4j.chainsaw.logevents.Level; +import java.beans.PropertyChangeListener; + /** * A receiver receives log events from a source. */ public interface ChainsawReceiver { - public void addChainsawEventBatchListener( ChainsawEventBatchListener listen ); + void addChainsawEventBatchListener( ChainsawEventBatchListener listen ); - public void removeEventBatchListener( ChainsawEventBatchListener listen ); + void removeEventBatchListener( ChainsawEventBatchListener listen ); - public void setThreshold(final Level level); + void setThreshold(final Level level); - public Level getThreshold(); + Level getThreshold(); - public String getName(); + String getName(); - public void setName(String name); + void setName(String name); - public int getQueueInterval(); + int getQueueInterval(); - public void setQueueInterval(int interval); + void setQueueInterval(int interval); - public void setPaused(boolean paused); + void setPaused(boolean paused); - public boolean getPaused(); + boolean getPaused(); /** * Start this receiver by(for example) opening a network socket. */ - public void start(); + void start(); /** * Stop this receiver by(for example) closing network sockets. */ - public void shutdown(); + void shutdown(); - public void addPropertyChangeListener(final PropertyChangeListener listener); + void addPropertyChangeListener(final PropertyChangeListener listener); - public void addPropertyChangeListener( + void addPropertyChangeListener( final String propertyName, final PropertyChangeListener listener); - public void removePropertyChangeListener( + void removePropertyChangeListener( final PropertyChangeListener listener); - public void removePropertyChangeListener( + void removePropertyChangeListener( final String propertyName, final PropertyChangeListener listener); - -// public void setConfiguration(AbstractConfiguration conf); } diff --git a/src/main/java/org/apache/log4j/chainsaw/ChainsawReceiverFactory.java b/src/main/java/org/apache/log4j/chainsaw/receiver/ChainsawReceiverFactory.java similarity index 85% rename from src/main/java/org/apache/log4j/chainsaw/ChainsawReceiverFactory.java rename to src/main/java/org/apache/log4j/chainsaw/receiver/ChainsawReceiverFactory.java index 035e8d6..f1e77bc 100644 --- a/src/main/java/org/apache/log4j/chainsaw/ChainsawReceiverFactory.java +++ b/src/main/java/org/apache/log4j/chainsaw/receiver/ChainsawReceiverFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.log4j.chainsaw; +package org.apache.log4j.chainsaw.receiver; import java.beans.IntrospectionException; import java.beans.PropertyDescriptor; @@ -28,25 +28,25 @@ public interface ChainsawReceiverFactory { * Create a new ChainsawReceiver from this factory. * @return */ - public ChainsawReceiver create(); + ChainsawReceiver create(); /** * For the type of ChainsawReceiver that this factory creates, * get the property descriptors for the class. * @return */ - public PropertyDescriptor[] getPropertyDescriptors() throws IntrospectionException; + PropertyDescriptor[] getPropertyDescriptors() throws IntrospectionException; /** * Get the name of the receiver that this factory will create * @return */ - public String getReceiverName(); + String getReceiverName(); /** * Documentation string in HTML format that will be displayed to the user. * * @return */ - public String getReceiverDocumentation(); + String getReceiverDocumentation(); } diff --git a/src/main/java/org/apache/log4j/chainsaw/ChainsawReceiverSkeleton.java b/src/main/java/org/apache/log4j/chainsaw/receiver/ChainsawReceiverSkeleton.java similarity index 97% rename from src/main/java/org/apache/log4j/chainsaw/ChainsawReceiverSkeleton.java rename to src/main/java/org/apache/log4j/chainsaw/receiver/ChainsawReceiverSkeleton.java index 589b32b..ea580df 100644 --- a/src/main/java/org/apache/log4j/chainsaw/ChainsawReceiverSkeleton.java +++ b/src/main/java/org/apache/log4j/chainsaw/receiver/ChainsawReceiverSkeleton.java @@ -14,15 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.log4j.chainsaw; +package org.apache.log4j.chainsaw.receiver; + +import org.apache.log4j.chainsaw.ChainsawEventBatchListener; +import org.apache.log4j.chainsaw.logevents.ChainsawLoggingEvent; +import org.apache.log4j.chainsaw.logevents.Level; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; import java.util.ArrayList; import java.util.List; -import org.apache.commons.configuration2.AbstractConfiguration; -import org.apache.log4j.chainsaw.logevents.ChainsawLoggingEvent; -import org.apache.log4j.chainsaw.logevents.Level; /** * @@ -146,7 +147,7 @@ public abstract class ChainsawReceiverSkeleton implements ChainsawReceiver { * * @param event */ - protected void append(final ChainsawLoggingEvent event){ + public void append(final ChainsawLoggingEvent event){ if( m_paused ) return; m_worker.enqueue(event); } diff --git a/src/main/java/org/apache/log4j/chainsaw/receivers/NewReceiverDialogPanel.java b/src/main/java/org/apache/log4j/chainsaw/receivers/NewReceiverDialogPanel.java index 03667dd..ae9f1c6 100644 --- a/src/main/java/org/apache/log4j/chainsaw/receivers/NewReceiverDialogPanel.java +++ b/src/main/java/org/apache/log4j/chainsaw/receivers/NewReceiverDialogPanel.java @@ -17,8 +17,8 @@ package org.apache.log4j.chainsaw.receivers; -import org.apache.log4j.chainsaw.ChainsawReceiver; -import org.apache.log4j.chainsaw.ChainsawReceiverFactory; +import org.apache.log4j.chainsaw.receiver.ChainsawReceiver; +import org.apache.log4j.chainsaw.receiver.ChainsawReceiverFactory; import org.apache.log4j.chainsaw.helper.OkCancelPanel; import javax.swing.*; diff --git a/src/main/java/org/apache/log4j/chainsaw/receivers/PluginPropertyEditorPanel.java b/src/main/java/org/apache/log4j/chainsaw/receivers/PluginPropertyEditorPanel.java index ed9e8ea..fcbdb29 100644 --- a/src/main/java/org/apache/log4j/chainsaw/receivers/PluginPropertyEditorPanel.java +++ b/src/main/java/org/apache/log4j/chainsaw/receivers/PluginPropertyEditorPanel.java @@ -20,7 +20,6 @@ import org.apache.log4j.chainsaw.logevents.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.log4j.chainsaw.ChainsawConstants; -import org.apache.log4j.chainsaw.Generator; import org.apache.log4j.chainsaw.helper.TableCellEditorFactory; import javax.swing.*; @@ -29,17 +28,11 @@ import javax.swing.table.DefaultTableModel; import javax.swing.table.TableCellEditor; import javax.swing.table.TableModel; import java.awt.*; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import java.beans.BeanInfo; -import java.beans.IntrospectionException; -import java.beans.Introspector; import java.beans.PropertyDescriptor; import java.util.*; import java.util.List; -import javax.swing.event.CellEditorListener; -import javax.swing.table.TableCellRenderer; -import org.apache.log4j.chainsaw.ChainsawReceiver; + +import org.apache.log4j.chainsaw.receiver.ChainsawReceiver; /** diff --git a/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiverTreeCellRenderer.java b/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiverTreeCellRenderer.java index 4ae0f5b..4f6b299 100644 --- a/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiverTreeCellRenderer.java +++ b/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiverTreeCellRenderer.java @@ -25,7 +25,7 @@ import javax.swing.*; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeCellRenderer; import java.awt.*; -import org.apache.log4j.chainsaw.ChainsawReceiver; +import org.apache.log4j.chainsaw.receiver.ChainsawReceiver; /** diff --git a/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java b/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java index b0f1212..ce70d58 100644 --- a/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java +++ b/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java @@ -17,8 +17,8 @@ package org.apache.log4j.chainsaw.receivers; -import org.apache.log4j.chainsaw.ChainsawReceiver; -import org.apache.log4j.chainsaw.ChainsawReceiverFactory; +import org.apache.log4j.chainsaw.receiver.ChainsawReceiver; +import org.apache.log4j.chainsaw.receiver.ChainsawReceiverFactory; import org.apache.log4j.chainsaw.ChainsawStatusBar; import org.apache.log4j.chainsaw.LogUI; import org.apache.log4j.chainsaw.PopupListener; diff --git a/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversTreeModel.java b/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversTreeModel.java index 73f11d6..0701ad4 100644 --- a/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversTreeModel.java +++ b/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversTreeModel.java @@ -24,10 +24,9 @@ import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreeNode; import java.beans.PropertyChangeListener; -import java.util.Collection; import java.util.Enumeration; -import java.util.Vector; -import org.apache.log4j.chainsaw.ChainsawReceiver; + +import org.apache.log4j.chainsaw.receiver.ChainsawReceiver; import org.apache.log4j.chainsaw.ReceiverEventListener; diff --git a/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPlugin.java b/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPlugin.java index 3337b11..c01906a 100644 --- a/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPlugin.java +++ b/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPlugin.java @@ -17,7 +17,7 @@ package org.apache.log4j.chainsaw.zeroconf; import org.apache.log4j.chainsaw.ChainsawConstants; -import org.apache.log4j.chainsaw.ChainsawReceiver; +import org.apache.log4j.chainsaw.receiver.ChainsawReceiver; import org.apache.log4j.chainsaw.DockablePanel; import org.apache.log4j.chainsaw.components.elements.SmallButton; import org.apache.log4j.chainsaw.help.HelpManager; diff --git a/src/main/java/org/apache/log4j/net/JsonReceiver.java b/src/main/java/org/apache/log4j/net/JsonReceiver.java index 3b527cd..360b901 100644 --- a/src/main/java/org/apache/log4j/net/JsonReceiver.java +++ b/src/main/java/org/apache/log4j/net/JsonReceiver.java @@ -22,7 +22,7 @@ import java.io.InputStream; import java.net.ServerSocket; import java.net.Socket; import java.util.Iterator; -import org.apache.log4j.chainsaw.ChainsawReceiverSkeleton; +import org.apache.log4j.chainsaw.receiver.ChainsawReceiverSkeleton; import org.apache.log4j.chainsaw.logevents.ChainsawLoggingEventBuilder; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/org/apache/log4j/net/JsonReceiverFactory.java b/src/main/java/org/apache/log4j/net/JsonReceiverFactory.java index 2b1e419..8003886 100644 --- a/src/main/java/org/apache/log4j/net/JsonReceiverFactory.java +++ b/src/main/java/org/apache/log4j/net/JsonReceiverFactory.java @@ -18,8 +18,8 @@ package org.apache.log4j.net; import java.beans.IntrospectionException; import java.beans.PropertyDescriptor; -import org.apache.log4j.chainsaw.ChainsawReceiver; -import org.apache.log4j.chainsaw.ChainsawReceiverFactory; +import org.apache.log4j.chainsaw.receiver.ChainsawReceiver; +import org.apache.log4j.chainsaw.receiver.ChainsawReceiverFactory; /** * diff --git a/src/main/java/org/apache/log4j/net/MulticastReceiver.java b/src/main/java/org/apache/log4j/net/MulticastReceiver.java index eb911e7..d37f45a 100644 --- a/src/main/java/org/apache/log4j/net/MulticastReceiver.java +++ b/src/main/java/org/apache/log4j/net/MulticastReceiver.java @@ -23,7 +23,7 @@ import java.io.IOException; import java.net.*; import java.util.ArrayList; import java.util.List; -import org.apache.log4j.chainsaw.ChainsawReceiverSkeleton; +import org.apache.log4j.chainsaw.receiver.ChainsawReceiverSkeleton; import org.apache.log4j.chainsaw.logevents.ChainsawLoggingEvent; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/org/apache/log4j/net/MulticastReceiverFactory.java b/src/main/java/org/apache/log4j/net/MulticastReceiverFactory.java index 1eee73e..4f9086d 100644 --- a/src/main/java/org/apache/log4j/net/MulticastReceiverFactory.java +++ b/src/main/java/org/apache/log4j/net/MulticastReceiverFactory.java @@ -18,8 +18,8 @@ package org.apache.log4j.net; import java.beans.IntrospectionException; import java.beans.PropertyDescriptor; -import org.apache.log4j.chainsaw.ChainsawReceiver; -import org.apache.log4j.chainsaw.ChainsawReceiverFactory; +import org.apache.log4j.chainsaw.receiver.ChainsawReceiver; +import org.apache.log4j.chainsaw.receiver.ChainsawReceiverFactory; /** * diff --git a/src/main/java/org/apache/log4j/net/UDPReceiver.java b/src/main/java/org/apache/log4j/net/UDPReceiver.java index fdda4c4..d99ec43 100644 --- a/src/main/java/org/apache/log4j/net/UDPReceiver.java +++ b/src/main/java/org/apache/log4j/net/UDPReceiver.java @@ -22,7 +22,7 @@ import java.net.DatagramPacket; import java.net.DatagramSocket; import java.net.SocketException; import java.util.List; -import org.apache.log4j.chainsaw.ChainsawReceiverSkeleton; +import org.apache.log4j.chainsaw.receiver.ChainsawReceiverSkeleton; import org.apache.log4j.chainsaw.logevents.ChainsawLoggingEvent; import org.apache.log4j.spi.Decoder; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/org/apache/log4j/net/UDPReceiverFactory.java b/src/main/java/org/apache/log4j/net/UDPReceiverFactory.java index 19d4891..2fe3729 100644 --- a/src/main/java/org/apache/log4j/net/UDPReceiverFactory.java +++ b/src/main/java/org/apache/log4j/net/UDPReceiverFactory.java @@ -18,8 +18,8 @@ package org.apache.log4j.net; import java.beans.IntrospectionException; import java.beans.PropertyDescriptor; -import org.apache.log4j.chainsaw.ChainsawReceiver; -import org.apache.log4j.chainsaw.ChainsawReceiverFactory; +import org.apache.log4j.chainsaw.receiver.ChainsawReceiver; +import org.apache.log4j.chainsaw.receiver.ChainsawReceiverFactory; /** * diff --git a/src/main/java/org/apache/log4j/net/XMLReceiverFactory.java b/src/main/java/org/apache/log4j/net/XMLReceiverFactory.java index 4e6f718..0a74820 100644 --- a/src/main/java/org/apache/log4j/net/XMLReceiverFactory.java +++ b/src/main/java/org/apache/log4j/net/XMLReceiverFactory.java @@ -18,8 +18,8 @@ package org.apache.log4j.net; import java.beans.IntrospectionException; import java.beans.PropertyDescriptor; -import org.apache.log4j.chainsaw.ChainsawReceiver; -import org.apache.log4j.chainsaw.ChainsawReceiverFactory; +import org.apache.log4j.chainsaw.receiver.ChainsawReceiver; +import org.apache.log4j.chainsaw.receiver.ChainsawReceiverFactory; /** * diff --git a/src/main/java/org/apache/log4j/net/XMLSocketReceiver.java b/src/main/java/org/apache/log4j/net/XMLSocketReceiver.java index 54e46b3..ca4c382 100644 --- a/src/main/java/org/apache/log4j/net/XMLSocketReceiver.java +++ b/src/main/java/org/apache/log4j/net/XMLSocketReceiver.java @@ -22,7 +22,7 @@ import java.net.ServerSocket; import java.net.Socket; import java.util.List; import java.util.Vector; -import org.apache.log4j.chainsaw.ChainsawReceiverSkeleton; +import org.apache.log4j.chainsaw.receiver.ChainsawReceiverSkeleton; import org.apache.log4j.chainsaw.logevents.ChainsawLoggingEvent; import org.apache.log4j.spi.Decoder; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java b/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java index 4821133..8e3559f 100644 --- a/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java +++ b/src/main/java/org/apache/log4j/varia/LogFilePatternReceiver.java @@ -31,7 +31,7 @@ import java.util.regex.MatchResult; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; -import org.apache.log4j.chainsaw.ChainsawReceiverSkeleton; +import org.apache.log4j.chainsaw.receiver.ChainsawReceiverSkeleton; import org.apache.log4j.chainsaw.logevents.ChainsawLoggingEvent; import org.apache.log4j.chainsaw.logevents.ChainsawLoggingEventBuilder; import org.apache.log4j.chainsaw.logevents.Level; diff --git a/src/main/java/org/apache/log4j/varia/LogFilePatternReceiverFactory.java b/src/main/java/org/apache/log4j/varia/LogFilePatternReceiverFactory.java index be66aeb..fd51599 100644 --- a/src/main/java/org/apache/log4j/varia/LogFilePatternReceiverFactory.java +++ b/src/main/java/org/apache/log4j/varia/LogFilePatternReceiverFactory.java @@ -18,8 +18,8 @@ package org.apache.log4j.varia; import java.beans.IntrospectionException; import java.beans.PropertyDescriptor; -import org.apache.log4j.chainsaw.ChainsawReceiver; -import org.apache.log4j.chainsaw.ChainsawReceiverFactory; +import org.apache.log4j.chainsaw.receiver.ChainsawReceiver; +import org.apache.log4j.chainsaw.receiver.ChainsawReceiverFactory; /** * diff --git a/src/main/java/org/apache/log4j/xml/LogFileXMLReceiver.java b/src/main/java/org/apache/log4j/xml/LogFileXMLReceiver.java index 132c090..e9f917a 100644 --- a/src/main/java/org/apache/log4j/xml/LogFileXMLReceiver.java +++ b/src/main/java/org/apache/log4j/xml/LogFileXMLReceiver.java @@ -26,7 +26,7 @@ import java.io.*; import java.net.MalformedURLException; import java.net.URL; import java.util.Collection; -import org.apache.log4j.chainsaw.ChainsawReceiverSkeleton; +import org.apache.log4j.chainsaw.receiver.ChainsawReceiverSkeleton; import org.apache.log4j.chainsaw.logevents.ChainsawLoggingEvent; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/resources/META-INF/services/org.apache.log4j.chainsaw.ChainsawReceiverFactory b/src/main/resources/META-INF/services/org.apache.log4j.chainsaw.receiver.ChainsawReceiverFactory similarity index 100% rename from src/main/resources/META-INF/services/org.apache.log4j.chainsaw.ChainsawReceiverFactory rename to src/main/resources/META-INF/services/org.apache.log4j.chainsaw.receiver.ChainsawReceiverFactory
