(logging-chainsaw) branch master updated: moved Generator classes to tutorial package
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
The following commit(s) were added to refs/heads/master by this push:
new 11b0b94 moved Generator classes to tutorial package
11b0b94 is described below
commit 11b0b943e30374380f3b27449c212da16fecdcf7
Author: Christian Grobmeier
AuthorDate: Sat Dec 2 18:35:31 2023 +0100
moved Generator classes to tutorial package
---
.../org/apache/log4j/chainsaw/{ => components/tutorial}/Generator.java | 2 +-
.../log4j/chainsaw/{ => components/tutorial}/GeneratorBeanInfo.java | 2 +-
.../org/apache/log4j/chainsaw/components/tutorial/TutorialFrame.java| 1 -
.../org/apache/log4j/chainsaw/receivers/ReceiverTreeCellRenderer.java | 2 +-
4 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/log4j/chainsaw/Generator.java
b/src/main/java/org/apache/log4j/chainsaw/components/tutorial/Generator.java
similarity index 98%
rename from src/main/java/org/apache/log4j/chainsaw/Generator.java
rename to
src/main/java/org/apache/log4j/chainsaw/components/tutorial/Generator.java
index ab6812a..8e3f4e5 100644
--- a/src/main/java/org/apache/log4j/chainsaw/Generator.java
+++ b/src/main/java/org/apache/log4j/chainsaw/components/tutorial/Generator.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.log4j.chainsaw;
+package org.apache.log4j.chainsaw.components.tutorial;
import java.time.Instant;
import org.apache.log4j.chainsaw.logevents.ChainsawLoggingEvent;
diff --git a/src/main/java/org/apache/log4j/chainsaw/GeneratorBeanInfo.java
b/src/main/java/org/apache/log4j/chainsaw/components/tutorial/GeneratorBeanInfo.java
similarity index 96%
rename from src/main/java/org/apache/log4j/chainsaw/GeneratorBeanInfo.java
rename to
src/main/java/org/apache/log4j/chainsaw/components/tutorial/GeneratorBeanInfo.java
index fd9fd16..2ee1cba 100644
--- a/src/main/java/org/apache/log4j/chainsaw/GeneratorBeanInfo.java
+++
b/src/main/java/org/apache/log4j/chainsaw/components/tutorial/GeneratorBeanInfo.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.components.tutorial;
import java.beans.PropertyDescriptor;
import java.beans.SimpleBeanInfo;
diff --git
a/src/main/java/org/apache/log4j/chainsaw/components/tutorial/TutorialFrame.java
b/src/main/java/org/apache/log4j/chainsaw/components/tutorial/TutorialFrame.java
index 4c029e8..0f2abd3 100644
---
a/src/main/java/org/apache/log4j/chainsaw/components/tutorial/TutorialFrame.java
+++
b/src/main/java/org/apache/log4j/chainsaw/components/tutorial/TutorialFrame.java
@@ -2,7 +2,6 @@ package org.apache.log4j.chainsaw.components.tutorial;
import org.apache.log4j.chainsaw.ChainsawConstants;
import org.apache.log4j.chainsaw.ChainsawStatusBar;
-import org.apache.log4j.chainsaw.Generator;
import org.apache.log4j.chainsaw.JTextComponentFormatter;
import org.apache.log4j.chainsaw.LogUI;
import org.apache.log4j.chainsaw.ReceiverEventListener;
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 4f6b299..f7ecc63 100644
---
a/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiverTreeCellRenderer.java
+++
b/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiverTreeCellRenderer.java
@@ -17,7 +17,7 @@
package org.apache.log4j.chainsaw.receivers;
-import org.apache.log4j.chainsaw.Generator;
+import org.apache.log4j.chainsaw.components.tutorial.Generator;
import org.apache.log4j.chainsaw.icons.ChainsawIcons;
import org.apache.log4j.chainsaw.icons.LevelIconFactory;
(logging-chainsaw) branch master updated: renamed variables to modern standards
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
The following commit(s) were added to refs/heads/master by this push:
new 1fdbda7 renamed variables to modern standards
1fdbda7 is described below
commit 1fdbda7cbc574e2a86efeb3b6a81006fc3fc6f07
Author: Christian Grobmeier
AuthorDate: Sat Dec 2 18:18:38 2023 +0100
renamed variables to modern standards
---
.../java/org/apache/log4j/chainsaw/ChainsawAbout.java | 6 +++---
.../apache/log4j/chainsaw/receivers/ReceiversPanel.java | 17 -
2 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/main/java/org/apache/log4j/chainsaw/ChainsawAbout.java
b/src/main/java/org/apache/log4j/chainsaw/ChainsawAbout.java
index 27a9199..643e3b1 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ChainsawAbout.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ChainsawAbout.java
@@ -45,8 +45,8 @@ class ChainsawAbout extends JDialog {
private final Object guard = new Object();
-ChainsawAbout(JFrame parent) {
-super(parent, "About Chainsaw v2", true);
+ChainsawAbout(LogUI logUI) {
+super(logUI, "About Chainsaw v2", true);
// setResizable(false);
setBackground(Color.white);
getContentPane().setLayout(new BorderLayout());
@@ -76,7 +76,7 @@ class ChainsawAbout extends JDialog {
new Thread(new Scroller()).start();
scrollPane.getViewport().setViewPosition(new Point(0, 0));
-setLocationRelativeTo(parent);
+setLocationRelativeTo(logUI);
}
private class Scroller implements Runnable {
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 535e31e..ce8faa0 100644
--- a/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java
@@ -100,14 +100,14 @@ public class ReceiversPanel extends JPanel implements
SettingsListener {
private final Map m_classToProperties =
new HashMap<>();
private SettingsManager settingsManager;
-private List m_receivers;
-private final ChainsawStatusBar m_statusBar;
+private List receivers;
+private final ChainsawStatusBar statusBar;
-public ReceiversPanel(SettingsManager settingsManager,
List m_receivers, LogUI parentUi, ChainsawStatusBar sb) {
+public ReceiversPanel(SettingsManager settingsManager,
List receivers, LogUI parentUi, ChainsawStatusBar statusBar) {
super(new BorderLayout());
this.settingsManager = settingsManager;
-this.m_receivers = m_receivers;
-m_statusBar = sb;
+this.receivers = receivers;
+this.statusBar = statusBar;
m_parent = parentUi;
final ReceiversTreeModel model = new ReceiversTreeModel();
m_parent.addReceiverEventListener(model);
@@ -328,8 +328,7 @@ public class ReceiversPanel extends JPanel implements
SettingsListener {
rx.start();
}
-m_statusBar.setMessage(
-"All Receivers have been (re)started");
+statusBar.setMessage("All Receivers have been
(re)started");
}).start();
}
}
@@ -381,7 +380,7 @@ public class ReceiversPanel extends JPanel implements
SettingsListener {
rootElement.setAttribute("xmlns:log4j",
"http://jakarta.apache.org/log4j/;);
rootElement.setAttribute("debug", "true");
-for (ChainsawReceiver receiver : m_receivers) {
+for (ChainsawReceiver receiver : receivers) {
Element pluginElement = document.createElement("plugin");
pluginElement.setAttribute("name", receiver.getName());
pluginElement.setAttribute("class",
receiver.getClass().getName());
@@ -643,7 +642,7 @@ public class ReceiversPanel extends JPanel implements
SettingsListener {
m_parent.addReceiver(receiver);
receiver.start();
m_classToProperties.put(receiver.getClass(), descriptors);
-m_statusBar.setMessage("Receiver
'" + receiver.getName() + "' started");
+statusBar.setMessage("Receiver '"
+ receiver.getName() + "' started");
} else {
logger.error("Name required to
create receiver");
}
(logging-chainsaw) 01/02: moved related classes to their own sorttable package
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 520b7bb2017cb8153444bd49dc1fb87321e8b653
Author: Christian Grobmeier
AuthorDate: Sat Dec 2 17:52:38 2023 +0100
moved related classes to their own sorttable package
---
.../chainsaw/components/elements/{ => sorttable}/JSortTable.java | 3 +--
.../chainsaw/{ => components/elements/sorttable}/SortArrowIcon.java | 2 +-
.../{ => components/elements/sorttable}/SortHeaderRenderer.java | 4 +---
.../java/org/apache/log4j/chainsaw/components/logpanel/LogPanel.java | 2 +-
4 files changed, 4 insertions(+), 7 deletions(-)
diff --git
a/src/main/java/org/apache/log4j/chainsaw/components/elements/JSortTable.java
b/src/main/java/org/apache/log4j/chainsaw/components/elements/sorttable/JSortTable.java
similarity index 98%
rename from
src/main/java/org/apache/log4j/chainsaw/components/elements/JSortTable.java
rename to
src/main/java/org/apache/log4j/chainsaw/components/elements/sorttable/JSortTable.java
index 5d1c807..fc0b760 100644
---
a/src/main/java/org/apache/log4j/chainsaw/components/elements/JSortTable.java
+++
b/src/main/java/org/apache/log4j/chainsaw/components/elements/sorttable/JSortTable.java
@@ -15,10 +15,9 @@
* limitations under the License.
*/
-package org.apache.log4j.chainsaw.components.elements;
+package org.apache.log4j.chainsaw.components.elements.sorttable;
import org.apache.log4j.chainsaw.ChainsawColumns;
-import org.apache.log4j.chainsaw.SortHeaderRenderer;
import org.apache.log4j.chainsaw.SortTableModel;
import org.apache.log4j.chainsaw.helper.SwingHelper;
diff --git a/src/main/java/org/apache/log4j/chainsaw/SortArrowIcon.java
b/src/main/java/org/apache/log4j/chainsaw/components/elements/sorttable/SortArrowIcon.java
similarity index 97%
rename from src/main/java/org/apache/log4j/chainsaw/SortArrowIcon.java
rename to
src/main/java/org/apache/log4j/chainsaw/components/elements/sorttable/SortArrowIcon.java
index 8d768eb..2642ecc 100644
--- a/src/main/java/org/apache/log4j/chainsaw/SortArrowIcon.java
+++
b/src/main/java/org/apache/log4j/chainsaw/components/elements/sorttable/SortArrowIcon.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.log4j.chainsaw;
+package org.apache.log4j.chainsaw.components.elements.sorttable;
import javax.swing.*;
import java.awt.*;
diff --git a/src/main/java/org/apache/log4j/chainsaw/SortHeaderRenderer.java
b/src/main/java/org/apache/log4j/chainsaw/components/elements/sorttable/SortHeaderRenderer.java
similarity index 96%
rename from src/main/java/org/apache/log4j/chainsaw/SortHeaderRenderer.java
rename to
src/main/java/org/apache/log4j/chainsaw/components/elements/sorttable/SortHeaderRenderer.java
index 32f6caa..c5bc87a 100644
--- a/src/main/java/org/apache/log4j/chainsaw/SortHeaderRenderer.java
+++
b/src/main/java/org/apache/log4j/chainsaw/components/elements/sorttable/SortHeaderRenderer.java
@@ -15,9 +15,7 @@
* limitations under the License.
*/
-package org.apache.log4j.chainsaw;
-
-import org.apache.log4j.chainsaw.components.elements.JSortTable;
+package org.apache.log4j.chainsaw.components.elements.sorttable;
import javax.swing.*;
import javax.swing.table.DefaultTableCellRenderer;
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 f3b0bef..8bac866 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
@@ -21,7 +21,7 @@ import org.apache.commons.configuration2.event.EventListener;
import org.apache.log4j.chainsaw.*;
import org.apache.log4j.chainsaw.color.ColorPanel;
import org.apache.log4j.chainsaw.color.RuleColorizer;
-import org.apache.log4j.chainsaw.components.elements.JSortTable;
+import org.apache.log4j.chainsaw.components.elements.sorttable.JSortTable;
import org.apache.log4j.chainsaw.components.elements.SmallButton;
import org.apache.log4j.chainsaw.components.elements.SmallToggleButton;
import org.apache.log4j.chainsaw.filter.FilterModel;
(logging-chainsaw) 02/02: corrected javadoc
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 9636163e0bb84df6dbf15235bf8d25ed72fd9e5e
Author: Christian Grobmeier
AuthorDate: Sat Dec 2 17:52:50 2023 +0100
corrected javadoc
---
src/main/java/org/apache/log4j/chainsaw/ShutdownListener.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/log4j/chainsaw/ShutdownListener.java
b/src/main/java/org/apache/log4j/chainsaw/ShutdownListener.java
index 59ddd4e..d334e5f 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ShutdownListener.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ShutdownListener.java
@@ -29,7 +29,7 @@ import java.util.EventListener;
* however (i.e. do not call System.exit()).
*
* @author Paul Smith psm...@apache.org
- * @see LogUI#setShutdownAction(Action)
+ * @see LogUI#addShutdownListener(ShutdownListener)
*/
public interface ShutdownListener extends EventListener {
(logging-chainsaw) branch master updated (e9a18b5 -> 9636163)
This is an automated email from the ASF dual-hosted git repository.
grobmeier pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/logging-chainsaw.git
from e9a18b5 organized imports
new 520b7bb moved related classes to their own sorttable package
new 9636163 corrected javadoc
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/main/java/org/apache/log4j/chainsaw/ShutdownListener.java | 2 +-
.../chainsaw/components/elements/{ => sorttable}/JSortTable.java | 3 +--
.../chainsaw/{ => components/elements/sorttable}/SortArrowIcon.java | 2 +-
.../{ => components/elements/sorttable}/SortHeaderRenderer.java | 4 +---
.../java/org/apache/log4j/chainsaw/components/logpanel/LogPanel.java | 2 +-
5 files changed, 5 insertions(+), 8 deletions(-)
rename src/main/java/org/apache/log4j/chainsaw/components/elements/{ =>
sorttable}/JSortTable.java (98%)
rename src/main/java/org/apache/log4j/chainsaw/{ =>
components/elements/sorttable}/SortArrowIcon.java (97%)
rename src/main/java/org/apache/log4j/chainsaw/{ =>
components/elements/sorttable}/SortHeaderRenderer.java (96%)
(logging-chainsaw) 01/02: moved ChainsawTabbedPane to a new package, reenabled loading/writing settings
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 d8a47b591755217dfb30076d6fd44f3f9133ad84
Author: Christian Grobmeier
AuthorDate: Sat Dec 2 17:38:29 2023 +0100
moved ChainsawTabbedPane to a new package, reenabled loading/writing
settings
---
.../tabbedpane}/ChainsawTabbedPane.java| 122 +++--
.../tabbedpane}/SavableTabSetting.java | 2 +-
2 files changed, 66 insertions(+), 58 deletions(-)
diff --git a/src/main/java/org/apache/log4j/chainsaw/ChainsawTabbedPane.java
b/src/main/java/org/apache/log4j/chainsaw/components/tabbedpane/ChainsawTabbedPane.java
similarity index 63%
rename from src/main/java/org/apache/log4j/chainsaw/ChainsawTabbedPane.java
rename to
src/main/java/org/apache/log4j/chainsaw/components/tabbedpane/ChainsawTabbedPane.java
index 4b0777e..751129c 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ChainsawTabbedPane.java
+++
b/src/main/java/org/apache/log4j/chainsaw/components/tabbedpane/ChainsawTabbedPane.java
@@ -19,18 +19,24 @@
* @author Paul Smith psm...@apache.org
*
*/
-package org.apache.log4j.chainsaw;
+package org.apache.log4j.chainsaw.components.tabbedpane;
+import com.owlike.genson.Genson;
+import org.apache.log4j.chainsaw.LogUI;
import org.apache.log4j.chainsaw.prefs.LoadSettingsEvent;
import org.apache.log4j.chainsaw.prefs.SaveSettingsEvent;
import org.apache.log4j.chainsaw.prefs.SettingsListener;
import org.apache.log4j.chainsaw.prefs.SettingsManager;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import javax.swing.*;
import java.awt.*;
import java.io.File;
import java.io.FileReader;
import java.io.FileWriter;
+import java.io.IOException;
+import java.nio.file.Files;
/**
@@ -52,25 +58,19 @@ import java.io.FileWriter;
* @author Scott Deboy sde...@apache.org
*/
-class ChainsawTabbedPane extends JTabbedPane implements SettingsListener {
+public class ChainsawTabbedPane extends JTabbedPane implements
SettingsListener {
+private static Logger logger =
LogManager.getLogger(ChainsawTabbedPane.class);
public SavableTabSetting tabSetting;
public static final String WELCOME_TAB = "Welcome";
public static final String ZEROCONF = "Zeroconf";
-/**
- * Create the tabbed pane.
- */
-public ChainsawTabbedPane() {
-super();
-}
-
/**
* Returns true if this TabbedPane has an instance of the WelcomePanel
* in it
*
* @return true/false
*/
-boolean containsWelcomePanel() {
+public boolean containsWelcomePanel() {
return indexOfTab("Welcome") > -1;
}
@@ -123,37 +123,41 @@ class ChainsawTabbedPane extends JTabbedPane implements
SettingsListener {
* panels as they are the panel which are always running. Saves
* whether they are hidden or not
*/
-
public void saveSettings(SaveSettingsEvent event) {
-File file = new File(SettingsManager.getSettingsDirectory(),
"tab-settings.xml");
-//XStream stream = new XStream(new DomDriver());
-//try {
-//FileWriter writer = new FileWriter(file);
-//int count = super.getTabCount();
-//String title;
-//SavableTabSetting setting = new SavableTabSetting();
-//for (int i = 0; i < count; i++) {
-//title = super.getTitleAt(i);
-//switch (title) {
-//case WELCOME_TAB:
-//setting.setWelcome(true);
-//break;
-//case "chainsaw-log":
-//setting.setChainsawLog(true);
-//break;
-//case ZEROCONF:
-//setting.setZeroconf(true);
-//break;
-//}
-//}
-//
-//stream.toXML(setting, writer);
-//writer.close();
-//
-//} catch (Exception e) {
-//file.delete();
-//e.printStackTrace();
-//}
+File file = new File(SettingsManager.getSettingsDirectory(),
"tab-settings.json");
+
+int count = super.getTabCount();
+String title;
+
+SavableTabSetting setting = new SavableTabSetting();
+for (int i = 0; i < count; i++) {
+title = super.getTitleAt(i);
+switch (title) {
+case WELCOME_TAB:
+setting.setWelcome(true);
+break;
+case "chainsaw-log":
+setting.setChainsawLog(true);
+break;
+case ZEROCONF:
+setting.setZeroconf(true);
+break;
+}
+}
+
+Genson genson = new Genson();
+String serialize = genson.serialize(setting);
+
+try
(logging-chainsaw) branch master updated (a0f4c9b -> e9a18b5)
This is an automated email from the ASF dual-hosted git repository.
grobmeier pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/logging-chainsaw.git
from a0f4c9b removed unused lombok dependency
new d8a47b5 moved ChainsawTabbedPane to a new package, reenabled
loading/writing settings
new e9a18b5 organized imports
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/main/java/org/apache/log4j/chainsaw/LogUI.java | 18 +--
.../tabbedpane}/ChainsawTabbedPane.java| 122 +++--
.../tabbedpane}/SavableTabSetting.java | 2 +-
3 files changed, 67 insertions(+), 75 deletions(-)
rename src/main/java/org/apache/log4j/chainsaw/{ =>
components/tabbedpane}/ChainsawTabbedPane.java (63%)
rename src/main/java/org/apache/log4j/chainsaw/{ =>
components/tabbedpane}/SavableTabSetting.java (96%)
(logging-chainsaw) 02/02: organized imports
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 e9a18b5aa3e40602e5b9261efd9aec86a35aa34e Author: Christian Grobmeier AuthorDate: Sat Dec 2 17:38:37 2023 +0100 organized imports --- src/main/java/org/apache/log4j/chainsaw/LogUI.java | 18 +- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/src/main/java/org/apache/log4j/chainsaw/LogUI.java b/src/main/java/org/apache/log4j/chainsaw/LogUI.java index 38f9c2c..8b0fa57 100644 --- a/src/main/java/org/apache/log4j/chainsaw/LogUI.java +++ b/src/main/java/org/apache/log4j/chainsaw/LogUI.java @@ -21,8 +21,8 @@ import org.apache.commons.configuration2.AbstractConfiguration; import org.apache.commons.configuration2.event.ConfigurationEvent; import org.apache.log4j.chainsaw.color.RuleColorizer; import org.apache.log4j.chainsaw.components.elements.SmallButton; -import org.apache.log4j.chainsaw.components.elements.SmallToggleButton; import org.apache.log4j.chainsaw.components.logpanel.LogPanel; +import org.apache.log4j.chainsaw.components.tabbedpane.ChainsawTabbedPane; import org.apache.log4j.chainsaw.components.tutorial.TutorialFrame; import org.apache.log4j.chainsaw.components.welcome.WelcomePanel; import org.apache.log4j.chainsaw.dnd.FileDnDTarget; @@ -41,21 +41,11 @@ import org.apache.log4j.rule.ExpressionRule; import org.apache.log4j.rule.Rule; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.w3c.dom.Document; -import org.w3c.dom.Element; import javax.swing.*; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import javax.swing.event.EventListenerList; -import javax.swing.event.HyperlinkEvent; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.transform.OutputKeys; -import javax.xml.transform.Transformer; -import javax.xml.transform.TransformerFactory; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.InputEvent; @@ -64,16 +54,10 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import java.beans.BeanInfo; -import java.beans.Introspector; import java.beans.PropertyChangeListener; -import java.beans.PropertyDescriptor; import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; import java.net.URL; import java.util.ArrayList; -import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map;
(logging-chainsaw) branch master updated: removed unused lombok dependency
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 The following commit(s) were added to refs/heads/master by this push: new a0f4c9b removed unused lombok dependency a0f4c9b is described below commit a0f4c9b3bff4c48eeb6d3882f847d6725d645317 Author: Christian Grobmeier AuthorDate: Sat Dec 2 17:16:06 2023 +0100 removed unused lombok dependency --- pom.xml | 6 -- 1 file changed, 6 deletions(-) diff --git a/pom.xml b/pom.xml index 179cd90..6070a1a 100644 --- a/pom.xml +++ b/pom.xml @@ -190,12 +190,6 @@ true provided - - org.projectlombok - lombok - 1.18.28 - provided - com.owlike genson
(logging-chainsaw) branch master updated: Prevent calling static methods using object
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
The following commit(s) were added to refs/heads/master by this push:
new 32e0490 Prevent calling static methods using object
32e0490 is described below
commit 32e049064ab5a83fafe305b4c7aba09eebc327f0
Author: Christian Grobmeier
AuthorDate: Sat Dec 2 17:12:16 2023 +0100
Prevent calling static methods using object
---
src/main/java/org/apache/log4j/chainsaw/ChainsawTabbedPane.java | 2 +-
src/main/java/org/apache/log4j/chainsaw/LogUI.java| 4 ++--
.../java/org/apache/log4j/chainsaw/ReceiverConfigurationPanel.java| 2 +-
src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java | 2 +-
src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPlugin.java | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/apache/log4j/chainsaw/ChainsawTabbedPane.java
b/src/main/java/org/apache/log4j/chainsaw/ChainsawTabbedPane.java
index 014c453..4b0777e 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ChainsawTabbedPane.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ChainsawTabbedPane.java
@@ -125,7 +125,7 @@ class ChainsawTabbedPane extends JTabbedPane implements
SettingsListener {
*/
public void saveSettings(SaveSettingsEvent event) {
-//File file = new
File(SettingsManager.getInstance().getSettingsDirectory(), "tab-settings.xml");
+File file = new File(SettingsManager.getSettingsDirectory(),
"tab-settings.xml");
//XStream stream = new XStream(new DomDriver());
//try {
//FileWriter writer = new FileWriter(file);
diff --git a/src/main/java/org/apache/log4j/chainsaw/LogUI.java
b/src/main/java/org/apache/log4j/chainsaw/LogUI.java
index e3d753e..38f9c2c 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LogUI.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LogUI.java
@@ -987,7 +987,7 @@ public class LogUI extends JFrame {
public void loadReceiver() {
Runnable r = () -> {
-JFileChooser jfc = new
JFileChooser(settingsManager.getSettingsDirectory());
+JFileChooser jfc = new
JFileChooser(SettingsManager.getSettingsDirectory());
int returnVal = jfc.showOpenDialog(this);
if(returnVal != JFileChooser.APPROVE_OPTION) {
return;
@@ -1470,7 +1470,7 @@ public class LogUI extends JFrame {
}
}
}
-
+
public void addReceiver(ChainsawReceiver rx){
m_receivers.add(rx);
List list = new ArrayList<>();
diff --git
a/src/main/java/org/apache/log4j/chainsaw/ReceiverConfigurationPanel.java
b/src/main/java/org/apache/log4j/chainsaw/ReceiverConfigurationPanel.java
index a21b756..5a26abc 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ReceiverConfigurationPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ReceiverConfigurationPanel.java
@@ -673,7 +673,7 @@ class ReceiverConfigurationPanel extends JPanel {
private File saveConfigFile;
public PanelModel(SettingsManager settingsManager) {
-file = new File(settingsManager.getSettingsDirectory(),
"receiver-config.xml");
+file = new File(SettingsManager.getSettingsDirectory(),
"receiver-config.xml");
}
boolean isNetworkReceiverMode() {
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 38f7e65..535e31e 100644
--- a/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/receivers/ReceiversPanel.java
@@ -594,7 +594,7 @@ public class ReceiversPanel extends JPanel implements
SettingsListener {
*/
public void saveSettings(SaveSettingsEvent event) {
-File file = new File(settingsManager.getSettingsDirectory(),
"receiver-config.xml");
+File file = new File(SettingsManager.getSettingsDirectory(),
"receiver-config.xml");
saveReceiversToFile(file);
}
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 c01906a..4b2701f 100644
--- a/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPlugin.java
+++ b/src/main/java/org/apache/log4j/chainsaw/zeroconf/ZeroConfPlugin.java
@@ -109,7 +109,7 @@ public class ZeroConfPlugin extends DockablePanel {
}
private File getPreferenceFileLocation() {
-return new File(settingsManager.getSettingsDirectory(),
"zeroconfprefs.xml");
+return new File(SettingsManager.getSettingsDirectory(),
"zeroconfprefs.xml");
}
private void activateOptions() throws IOException {
(logging-chainsaw) branch master updated: simplified code, typo, keyword order
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
The following commit(s) were added to refs/heads/master by this push:
new c73f27b simplified code, typo, keyword order
c73f27b is described below
commit c73f27bffe445c237e79745f84c6d391fe46353b
Author: Christian Grobmeier
AuthorDate: Sat Dec 2 17:00:01 2023 +0100
simplified code, typo, keyword order
---
.../org/apache/log4j/chainsaw/help/HelpLocator.java | 17 +++--
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/apache/log4j/chainsaw/help/HelpLocator.java
b/src/main/java/org/apache/log4j/chainsaw/help/HelpLocator.java
index cd1ba79..e97bfa2 100644
--- a/src/main/java/org/apache/log4j/chainsaw/help/HelpLocator.java
+++ b/src/main/java/org/apache/log4j/chainsaw/help/HelpLocator.java
@@ -35,8 +35,8 @@ import java.util.List;
* psm...@apache.org
*/
class HelpLocator {
-private List classLoaders = new ArrayList<>();
-private final static Logger logger =
LogManager.getLogger(HelpLocator.class);
+private final List classLoaders = new ArrayList<>();
+private static final Logger logger =
LogManager.getLogger(HelpLocator.class);
/**
* Adds a ClassLoader to be used as a help resource locator
@@ -55,7 +55,7 @@ class HelpLocator {
classLoaders.add(new HelpResourceLoader(url));
} catch (Exception e) {
logger.error(
-"Failed to setup the resoure loaders for the Help Subsystem");
+"Failed to setup the resource loaders for the Help Subsystem");
}
}
@@ -65,18 +65,15 @@ class HelpLocator {
* @return URL of the located resource, or null if it cannot be located.
*/
URL findResource(String name) {
-URL url = null;
-
-for (Object classLoader : classLoaders) {
-ClassLoader loader = (ClassLoader) classLoader;
-url = loader.getResource(name);
+for (ClassLoader classLoader : classLoaders) {
+URL url = classLoader.getResource(name);
if (url != null) {
-break;
+return url;
}
}
-return url;
+return null;
}
private static class HelpResourceLoader extends ClassLoader {
(logging-chainsaw) branch master updated: added @Override, final and made use of logger
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
The following commit(s) were added to refs/heads/master by this push:
new 99c66f3 added @Override, final and made use of logger
99c66f3 is described below
commit 99c66f3e7f01bb4d6af1f0b64d2c3a1e7c1c9142
Author: Christian Grobmeier
AuthorDate: Sat Dec 2 16:57:16 2023 +0100
added @Override, final and made use of logger
---
src/main/java/org/apache/log4j/chainsaw/help/HelpLocator.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/log4j/chainsaw/help/HelpLocator.java
b/src/main/java/org/apache/log4j/chainsaw/help/HelpLocator.java
index 97cf20f..cd1ba79 100644
--- a/src/main/java/org/apache/log4j/chainsaw/help/HelpLocator.java
+++ b/src/main/java/org/apache/log4j/chainsaw/help/HelpLocator.java
@@ -80,7 +80,7 @@ class HelpLocator {
}
private static class HelpResourceLoader extends ClassLoader {
-private URL root;
+private final URL root;
private HelpResourceLoader(URL root) {
this.root = root;
@@ -91,6 +91,7 @@ class HelpLocator {
*
* @see java.lang.ClassLoader#findResource(java.lang.String)
*/
+@Override
protected URL findResource(String name) {
URL url = super.findResource(name);
@@ -105,7 +106,7 @@ class HelpLocator {
logger.debug("urlArray={}", Arrays.asList(urlArray));
return new URLClassLoader(urlArray).findResource(name);
} catch (MalformedURLException e) {
-e.printStackTrace();
+logger.error(e, e);
}
return null;
(logging-site) branch asf-site updated (1f4bb6f9 -> 020fe51d)
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a change to branch asf-site
in repository https://gitbox.apache.org/repos/asf/logging-site.git
from 1f4bb6f9 Automatic Site Publish by Buildbot
add 020fe51d Automatic Site Publish by Buildbot
No new revisions were added by this update.
Summary of changes:
.../02/apache-common-logging-1.3.0.html} | 122 ++---
content/blog/index.html| 12 ++
content/feed.xml | 95 +++-
3 files changed, 191 insertions(+), 38 deletions(-)
copy content/blog/2023/{11/17/flume-joins-logging-services.html =>
12/02/apache-common-logging-1.3.0.html} (54%)
(logging-site) branch asf-site updated (2d514928 -> 1f4bb6f9)
This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/logging-site.git from 2d514928 Automatic Site Publish by Buildbot add ce79a3aa Automatic Site Publish by Buildbot add 34ffc7dd Automatic Site Publish by Buildbot add bfa32478 Automatic Site Publish by Buildbot add 1f744d2d Automatic Site Publish by Buildbot add 1f4bb6f9 Automatic Site Publish by Buildbot No new revisions were added by this update. Summary of changes: content/README.md | 13 + content/feed.xml | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-)
(logging-site) branch asf-staging updated: Automatic Site Publish by Buildbot
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-staging in repository https://gitbox.apache.org/repos/asf/logging-site.git The following commit(s) were added to refs/heads/asf-staging by this push: new 020fe51d Automatic Site Publish by Buildbot 020fe51d is described below commit 020fe51d5bf587659cf3f93bbbc8bb211450a04c Author: buildbot AuthorDate: Sat Dec 2 13:00:02 2023 + Automatic Site Publish by Buildbot --- .../12/02/apache-common-logging-1.3.0.html}| 137 +++-- content/blog/index.html| 12 ++ content/feed.xml | 95 +- 3 files changed, 207 insertions(+), 37 deletions(-) diff --git a/content/blog/index.html b/content/blog/2023/12/02/apache-common-logging-1.3.0.html similarity index 54% copy from content/blog/index.html copy to content/blog/2023/12/02/apache-common-logging-1.3.0.html index e1b96a76..e1dea370 100644 --- a/content/blog/index.html +++ b/content/blog/2023/12/02/apache-common-logging-1.3.0.html @@ -151,50 +151,115 @@ - - + -Apache Logging Services Blog -Latest news from all Logging Services projects +Upgrade to Apache Commons Logging 1.3.0 +Instructions to upgrade application to Apache Commons Logging 1.3.0. + +02 Dec 2023 + + + Apache Commons Logging +https://commons.apache.org/proper/commons-logging/;>Apache Commons Logging (JCL) is one of the oldest Java logging API +available. +Released for the first time in 2002, it immediately saw a widespread adoption in the Java community. - - - -28 Nov 2023 -Welcoming Stephen Webb to the Apache Logging Services PMC - -#Logging Services - -#Apache - -#Community - -#Open Source - - - - -17 Nov 2023 -Welcoming Apache Flume to Apache Logging Services - -#Logging Services - -#Flume - - - - - - +While newer APIs, like SLF4J and our own Log4j API, appeared over time, even in 2023 it is hard to find an application stack +that does not depend on JCL. +According to Sonatype, Apache Commons Logging is used in https://central.sonatype.com/artifact/commons-logging/commons-logging;>over 1 million artifacts, +while the second place is taken by SLF4J with https://central.sonatype.com/artifact/org.slf4j/slf4j-api;>almost 40 thousand artifacts. +Version 1.3.0 - - +After more than 9 years since its previous release (version 1.2 released in July 2014), Apache Commons Logging released +a new 1.3.0 version today (cf. https://lists.apache.org/thread/wx6v7wwhbnk64nx708hszctzv8fdsvdl;>announcement). +Among the most prominent changes, the new version: + + + forwards logging to the Log4j API out-of-the-box (if present), + also supports forwarding to SLF4J, + adds support for the Java Platform Module System (JPMS) with the module name org.apache.commons.logging. + + +Upgrade instructions (Log4j Core/Logback) + +The upgrade path for users of the Log4j Core and Logback logging backends is easy. +The first step is upgrading commons-logging. +In Maven this can be done using dependency management. + +dependencyManagement +dependencies +dependency +groupIdcommons-logging/groupId +artifactIdcommons-logging/artifactId +version1.3.0/version +/dependency +/dependencies +/dependencyManagement + + +The second step consists in removing obsolete dependencies. +Since version 1.2 only supported old generation logging backends out-of-the-box (Log4j 1.x, +Avalon and https://javalogging.sourceforge.net;>Lumberjack), the Java community developed +many LogFactory implementations and complete Apache Commons Logging replacements: + + + https://mvnrepository.com/artifact/org.slf4j/jcl-over-slf4j;>org.slf4j:jcl-over-slf4j (replacement), + https://mvnrepository.com/artifact/org.springframework/spring-jcl;>org.springframework:spring-jcl (replacement), + our own https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-jcl;>org.apache.logging.log4j:log4j-jcl +(LogFactory implementation). + + +These artifacts can be safely removed from your dependency stack. +For JPMS users this operation is even required. +To do so Maven users can use exclusions: + +dependency +groupIdorg.springframework/groupId +artifactIdspring-jcl/artifactId +exclusions +exclusion +groupIdorg.springframework/groupId +artifactIdspring-jcl/artifactId +/exclusion +/exclusions +/dependency + + +and to prevent
(logging-site) branch jekyll updated: Update announcement link
This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch jekyll in repository https://gitbox.apache.org/repos/asf/logging-site.git The following commit(s) were added to refs/heads/jekyll by this push: new 27757366 Update announcement link 27757366 is described below commit 27757366a03ed90a8d7c1580d186e6630f087ab3 Author: Piotr P. Karwasz AuthorDate: Sat Dec 2 13:59:43 2023 +0100 Update announcement link --- ...ommon-logging-1.3.0.md => 2023-12-02-apache-common-logging-1.3.0.md} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_posts/2023-12-01-apache-common-logging-1.3.0.md b/_posts/2023-12-02-apache-common-logging-1.3.0.md similarity index 99% rename from _posts/2023-12-01-apache-common-logging-1.3.0.md rename to _posts/2023-12-02-apache-common-logging-1.3.0.md index b3ccc43c..285db57c 100644 --- a/_posts/2023-12-01-apache-common-logging-1.3.0.md +++ b/_posts/2023-12-02-apache-common-logging-1.3.0.md @@ -40,7 +40,7 @@ while the second place is taken by SLF4J with [almost 40 thousand artifacts](htt ## Version 1.3.0 After more than 9 years since its previous release (version 1.2 released in July 2014), Apache Commons Logging released -a new 1.3.0 version today (cf. [announcement](https://lists.apache.org/thread/XXX)). +a new 1.3.0 version today (cf. [announcement](https://lists.apache.org/thread/wx6v7wwhbnk64nx708hszctzv8fdsvdl)). Among the most prominent changes, the new version: * forwards logging to the Log4j API out-of-the-box (if present),
