diff options
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/gui')
42 files changed, 208 insertions, 138 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/GraphicalCertHandler.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/GraphicalCertHandler.java index c1432614..48b6a14a 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/GraphicalCertHandler.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/GraphicalCertHandler.java @@ -12,7 +12,8 @@ import javax.net.ssl.SSLContext; import javax.net.ssl.TrustManager; import javax.net.ssl.X509TrustManager; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.openslx.dozmod.authentication.FingerprintManager; import org.openslx.dozmod.gui.Gui.GuiCallable; import org.openslx.dozmod.gui.helper.I18n; @@ -20,7 +21,7 @@ import org.openslx.dozmod.gui.helper.MessageType; public class GraphicalCertHandler { - private static final Logger LOGGER = Logger.getLogger(GraphicalCertHandler.GuiTrustManager.class); + private static final Logger LOGGER = LogManager.getLogger(GraphicalCertHandler.GuiTrustManager.class); private class GuiTrustManager implements X509TrustManager { diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/Gui.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/Gui.java index b61f961d..1d1dd90e 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/Gui.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/Gui.java @@ -29,7 +29,8 @@ import javax.swing.event.HyperlinkEvent; import javax.swing.event.HyperlinkListener; import javax.swing.text.html.HTMLDocument; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openslx.dozmod.Config; import org.openslx.dozmod.gui.helper.MessageType; import org.openslx.dozmod.util.DesktopEnvironment; @@ -38,7 +39,7 @@ import org.openslx.util.QuickTimer; public class Gui { - private static final Logger LOGGER = Logger.getLogger(Gui.class); + private static final Logger LOGGER = LogManager.getLogger(Gui.class); private static long lastUserActivity = System.currentTimeMillis(); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java index 24b0cb01..d8e7f797 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java @@ -30,7 +30,8 @@ import javax.swing.JPanel; import javax.swing.JSeparator; import javax.swing.SwingUtilities; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.thrift.TException; import org.openslx.bwlp.thrift.iface.SatelliteStatus; import org.openslx.bwlp.thrift.iface.TransferState; @@ -72,7 +73,7 @@ import org.openslx.util.QuickTimer.Task; public abstract class MainWindow { - private final static Logger LOGGER = Logger.getLogger(MainWindow.class); + private final static Logger LOGGER = LogManager.getLogger(MainWindow.class); private static final JFrame mainWindow; private static final JPanel mainContainer; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/UploadPanel.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/UploadPanel.java index b0d9b1c3..000e004e 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/UploadPanel.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/UploadPanel.java @@ -6,7 +6,8 @@ import java.awt.event.ActionListener; import javax.swing.Box; import javax.swing.JCheckBox; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.thrift.TException; import org.openslx.bwlp.thrift.iface.SscMode; import org.openslx.bwlp.thrift.iface.TAuthorizationException; @@ -31,7 +32,7 @@ public class UploadPanel extends TransferPanel implements QuitNotification { */ private static final long serialVersionUID = -8905745015422520339L; - private static final Logger LOGGER = Logger.getLogger(UploadPanel.class); + private static final Logger LOGGER = LogManager.getLogger(UploadPanel.class); private final UploadInitiator state; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/changemonitor/DialogChangeMonitor.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/changemonitor/DialogChangeMonitor.java index 6e2df962..a9c8ee37 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/changemonitor/DialogChangeMonitor.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/changemonitor/DialogChangeMonitor.java @@ -12,7 +12,8 @@ import javax.swing.JTable; import javax.swing.text.JTextComponent; import javax.swing.tree.TreePath; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.jdatepicker.JDatePicker; import org.openslx.dozmod.gui.control.ComboBox; import org.openslx.dozmod.gui.control.JCheckBoxTree; @@ -20,7 +21,7 @@ import org.openslx.util.Util; public class DialogChangeMonitor { - private static final Logger LOGGER = Logger.getLogger(DialogChangeMonitor.class); + private static final Logger LOGGER = LogManager.getLogger(DialogChangeMonitor.class); private final Callback callback; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/ContainerBindMountConfigurator.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/ContainerBindMountConfigurator.java index a58df382..adfc8f22 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/ContainerBindMountConfigurator.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/ContainerBindMountConfigurator.java @@ -1,6 +1,7 @@ package org.openslx.dozmod.gui.configurator; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openslx.dozmod.gui.Gui; import org.openslx.dozmod.gui.changemonitor.GenericControlWindow; import org.openslx.dozmod.gui.control.QLabel; @@ -26,7 +27,7 @@ public class ContainerBindMountConfigurator extends JPanel */ private static final long serialVersionUID = -3439578767452418382L; - private final Logger LOGGER = Logger.getLogger(ContainerBindMountConfigurator.class); + private final Logger LOGGER = LogManager.getLogger(ContainerBindMountConfigurator.class); private final ContainerBindMountTable bindMountTable; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/ImagePermissionConfigurator.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/ImagePermissionConfigurator.java index dd47b19d..40a59ca1 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/ImagePermissionConfigurator.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/ImagePermissionConfigurator.java @@ -25,7 +25,8 @@ import javax.swing.SwingUtilities; import javax.swing.UIManager; import javax.swing.event.ChangeListener; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openslx.bwlp.thrift.iface.ImagePermissions; import org.openslx.bwlp.thrift.iface.UserInfo; import org.openslx.dozmod.gui.changemonitor.GenericControlWindow; @@ -61,7 +62,7 @@ public class ImagePermissionConfigurator extends JPanel implements GenericContro private ImagePermissions defaultPermissions; - private static final Logger LOGGER = Logger.getLogger(ImagePermissionConfigurator.class); + private static final Logger LOGGER = LogManager.getLogger(ImagePermissionConfigurator.class); public ImagePermissionConfigurator() { super(); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/LdapFilterConfigurator.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/LdapFilterConfigurator.java index 817289be..bd3905da 100755 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/LdapFilterConfigurator.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/LdapFilterConfigurator.java @@ -19,7 +19,8 @@ import javax.swing.event.ListSelectionListener; import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openslx.bwlp.thrift.iface.LdapFilter; import org.openslx.dozmod.gui.Gui; import org.openslx.dozmod.gui.changemonitor.DialogChangeMonitor; @@ -39,7 +40,7 @@ import org.openslx.dozmod.thrift.cache.MetaDataCache; public class LdapFilterConfigurator extends LdapFilterConfiguratorLayout { private static final long serialVersionUID = -3336605759245603655L; - private final static Logger LOGGER = Logger.getLogger(LdapFilterConfigurator.class); + private final static Logger LOGGER = LogManager.getLogger(LdapFilterConfigurator.class); public LdapFilterConfigurator() { diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/LecturePermissionConfigurator.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/LecturePermissionConfigurator.java index 27a7e9f7..dc5ea326 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/LecturePermissionConfigurator.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/LecturePermissionConfigurator.java @@ -23,7 +23,8 @@ import javax.swing.SwingUtilities; import javax.swing.UIManager; import javax.swing.event.ChangeListener; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openslx.bwlp.thrift.iface.LecturePermissions; import org.openslx.bwlp.thrift.iface.UserInfo; import org.openslx.dozmod.gui.changemonitor.GenericControlWindow; @@ -66,7 +67,7 @@ public class LecturePermissionConfigurator extends JPanel implements GenericCont private String ownerId = null; - private static final Logger LOGGER = Logger.getLogger(LecturePermissionConfigurator.class); + private static final Logger LOGGER = LogManager.getLogger(LecturePermissionConfigurator.class); public LecturePermissionConfigurator() { super(); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/NetrulesConfigurator.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/NetrulesConfigurator.java index c24a3edb..c2d67ea9 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/NetrulesConfigurator.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/NetrulesConfigurator.java @@ -41,7 +41,8 @@ import javax.swing.text.StyleConstants; import javax.swing.text.TabSet; import javax.swing.text.TabStop; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openslx.bwlp.thrift.iface.LectureRead; import org.openslx.bwlp.thrift.iface.NetDirection; import org.openslx.bwlp.thrift.iface.NetRule; @@ -93,7 +94,7 @@ public class NetrulesConfigurator extends NetrulesConfiguratorLayout implements } private static final long serialVersionUID = -3497629601818983994L; - private final static Logger LOGGER = Logger.getLogger(NetrulesConfigurator.class); + private final static Logger LOGGER = LogManager.getLogger(NetrulesConfigurator.class); private boolean checkChange = false; private StateWrapper currentState = new StateWrapper(); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/NetshareConfigurator.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/NetshareConfigurator.java index 284f637d..7e318aa1 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/NetshareConfigurator.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/NetshareConfigurator.java @@ -26,7 +26,8 @@ import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; import javax.swing.event.TableModelListener; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openslx.bwlp.thrift.iface.NetShare; import org.openslx.bwlp.thrift.iface.NetShareAuth; import org.openslx.dozmod.gui.Gui; @@ -49,7 +50,7 @@ import org.openslx.dozmod.util.FormatHelper; public class NetshareConfigurator extends NetshareConfiguratorLayout { private static final long serialVersionUID = -3336605759245603655L; - private final static Logger LOGGER = Logger.getLogger(NetshareConfigurator.class); + private final static Logger LOGGER = LogManager.getLogger(NetshareConfigurator.class); public static final Character EMPTY_MARKER = '-'; public static final String PRINTER_MARKER = "PRINTER"; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/LocationSelector.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/LocationSelector.java index e62bbde8..101dbde9 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/LocationSelector.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/LocationSelector.java @@ -19,7 +19,8 @@ import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreeNode; import javax.swing.tree.TreePath; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openslx.bwlp.thrift.iface.Location; import org.openslx.dozmod.gui.Gui; import org.openslx.dozmod.gui.changemonitor.AbstractControlWrapper; @@ -49,7 +50,7 @@ public class LocationSelector extends JPanel { */ private static final long serialVersionUID = 3847194308363804953L; - private final static Logger LOGGER = Logger.getLogger(LocationSelector.class); + private final static Logger LOGGER = LogManager.getLogger(LocationSelector.class); private final JRadioButton btnLimitToLocations; private final JRadioButton btnPrioritizeInLocations; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/QDatePickerImpl.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/QDatePickerImpl.java index d698f076..451a843c 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/QDatePickerImpl.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/QDatePickerImpl.java @@ -11,7 +11,8 @@ import java.util.Set; import javax.swing.JButton; import javax.swing.JTextField; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.jdatepicker.ComponentColorDefaults; import org.jdatepicker.ComponentColorDefaults.Key; import org.jdatepicker.JDatePicker; @@ -25,7 +26,7 @@ public class QDatePickerImpl extends JDatePicker { */ private static final long serialVersionUID = -5858434848990729141L; - private static final Logger LOGGER = Logger.getLogger(QDatePickerImpl.class); + private static final Logger LOGGER = LogManager.getLogger(QDatePickerImpl.class); private final JButton pickButton; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/DebugWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/DebugWindow.java index f740b83d..be8c992c 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/DebugWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/DebugWindow.java @@ -3,6 +3,7 @@ package org.openslx.dozmod.gui.helper; import java.awt.BorderLayout; import java.awt.Color; import java.awt.Insets; +import java.io.Serializable; import javax.swing.BorderFactory; import javax.swing.JPanel; @@ -15,15 +16,85 @@ import javax.swing.text.SimpleAttributeSet; import javax.swing.text.StyleConstants; import javax.swing.text.StyledDocument; -import org.apache.log4j.Appender; -import org.apache.log4j.AppenderSkeleton; -import org.apache.log4j.BasicConfigurator; -import org.apache.log4j.Level; -import org.apache.log4j.spi.LoggingEvent; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.core.Appender; +import org.apache.logging.log4j.core.Core; +import org.apache.logging.log4j.core.Filter; +import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.LogEvent; +import org.apache.logging.log4j.core.LoggerContext; +import org.apache.logging.log4j.core.appender.AbstractAppender; +import org.apache.logging.log4j.core.config.Configuration; +import org.apache.logging.log4j.core.config.Property; +import org.apache.logging.log4j.core.config.plugins.Plugin; import org.joda.time.format.DateTimeFormat; import org.joda.time.format.DateTimeFormatter; import org.openslx.dozmod.gui.Gui; +@Plugin(name = "DebugAppender", category = Core.CATEGORY_NAME, elementType = Appender.ELEMENT_TYPE) +class DebugAppender extends AbstractAppender +{ + private static final DateTimeFormatter formatter = DateTimeFormat.forPattern("HH:mm:ss"); + private final JTextPane textPane; + + protected DebugAppender(final String name, final Filter filter, final Layout<? extends Serializable> layout, + final boolean ignoreExceptions, final Property[] properties, final JTextPane textPane) + { + super(name, filter, layout, ignoreExceptions, properties); + this.textPane = textPane; + } + + protected DebugAppender(final String name, final Filter filter, final JTextPane textPane) + { + this(name, filter, null, true, null, textPane); + } + + @Override + public void append(LogEvent event) + { + final Level eventLevel = event.getLevel(); + final Color eventColor; + + if (eventLevel.isMoreSpecificThan(Level.ERROR)) { + eventColor = Color.RED; + } else if (eventLevel.isMoreSpecificThan(Level.WARN)) { + eventColor = Color.ORANGE; + } else if (eventLevel.isMoreSpecificThan(Level.INFO)) { + eventColor = Color.BLACK; + } else { + eventColor = Color.GRAY; + } + + final long eventTimestamp = event.getTimeMillis(); + final String eventThreadName = event.getThreadName(); + final String eventLoggerName = event.getLoggerName(); + final String eventMessage = event.getMessage().getFormattedMessage(); + + Gui.asyncExec( new Runnable() { + @Override + public void run() + { + printEvent("[" + formatter.print( eventTimestamp ) + "] ", Color.BLACK); + printEvent(eventThreadName + "@" + eventLoggerName.replaceAll("^.*\\.", ""), Color.GRAY); + printEvent(" " + eventMessage + "\n", eventColor); + } + } ); + } + + private void printEvent(String msg, Color c) { + StyledDocument doc = this.textPane.getStyledDocument(); + SimpleAttributeSet keyWord = new SimpleAttributeSet(); + StyleConstants.setForeground(keyWord, c); + try { + doc.insertString(doc.getLength(), msg, keyWord); + } catch (BadLocationException e) { + e.printStackTrace(); // Do not use LOGGER here to prevent infinite loop + } + this.textPane.setCaretPosition(doc.getLength()); + } +} + public class DebugWindow extends JPanel { /** @@ -31,8 +102,6 @@ public class DebugWindow extends JPanel { */ private static final long serialVersionUID = 2602474207529142616L; - private static final DateTimeFormatter formatter = DateTimeFormat.forPattern("HH:mm:ss"); - private final JTextPane txtLog; public DebugWindow() { @@ -51,56 +120,17 @@ public class DebugWindow extends JPanel { } private void registerLogger() { - Appender appender = new AppenderSkeleton() { + final LoggerContext loggingContext = LoggerContext.class.cast(LogManager.getContext(false)); + final Configuration loggingConfig = loggingContext.getConfiguration(); + + // add debug logging appender + final DebugAppender debugAppender = new DebugAppender("logToDebug", null, this.txtLog); + debugAppender.start(); + + // register debug logging appender + loggingConfig.addAppender(debugAppender); + loggingConfig.getRootLogger().addAppender(debugAppender, Level.ALL, null); - @Override - public boolean requiresLayout() { - return false; - } - - @Override - public void close() { - // Nothing to do - } - - @Override - protected void append(final LoggingEvent event) { - final Level l = event.getLevel(); - final Color c; - if (l.isGreaterOrEqual(Level.ERROR)) { - c = Color.RED; - } else if (l.isGreaterOrEqual(Level.WARN)) { - c = Color.ORANGE; - } else if (l.isGreaterOrEqual(Level.INFO)) { - c = Color.BLACK; - } else { - c = Color.GRAY; - } - Gui.asyncExec(new Runnable() { - @Override - public void run() { - - log("[" + formatter.print(event.getTimeStamp()) + "] ", Color.BLACK); - log(event.getThreadName() + "@" + event.getLoggerName().replaceAll("^.*\\.", ""), - Color.GRAY); - log(" " + event.getMessage() + "\n", c); - } - }); - } - }; - BasicConfigurator.configure(appender); + loggingContext.updateLoggers(loggingConfig); } - - private void log(String msg, Color c) { - StyledDocument doc = txtLog.getStyledDocument(); - SimpleAttributeSet keyWord = new SimpleAttributeSet(); - StyleConstants.setForeground(keyWord, c); - try { - doc.insertString(doc.getLength(), msg, keyWord); - } catch (BadLocationException e) { - e.printStackTrace(); // Do not use LOGGER here to prevent infinite loop - } - txtLog.setCaretPosition(doc.getLength()); - } - } diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/ExpiryDateChooser.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/ExpiryDateChooser.java index f97298f3..f2dd9535 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/ExpiryDateChooser.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/ExpiryDateChooser.java @@ -11,14 +11,15 @@ import javax.swing.JSlider; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openslx.dozmod.gui.control.QLabel; import org.openslx.dozmod.thrift.Session; import org.openslx.dozmod.util.FormatHelper; public class ExpiryDateChooser { - private static final Logger LOGGER = Logger.getLogger(ExpiryDateChooser.class); + private static final Logger LOGGER = LogManager.getLogger(ExpiryDateChooser.class); /** * Helper to ask the user for the number of days to extend a date with. If diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/I18n.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/I18n.java index 61fdb049..ccd28c85 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/I18n.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/I18n.java @@ -1,6 +1,7 @@ package org.openslx.dozmod.gui.helper; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import java.text.MessageFormat; import java.util.ResourceBundle; @@ -26,7 +27,7 @@ public enum I18n { /** * Logger for this class */ - private final static Logger LOGGER = Logger.getLogger(I18n.class); + private final static Logger LOGGER = LogManager.getLogger(I18n.class); private final ResourceBundle resourceBundle; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/MessageType.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/MessageType.java index 0e0d2dc8..58037430 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/MessageType.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/MessageType.java @@ -2,7 +2,7 @@ package org.openslx.dozmod.gui.helper; import javax.swing.JOptionPane; -import org.apache.log4j.Level; +import org.apache.logging.log4j.Level; public enum MessageType { DEBUG(JOptionPane.INFORMATION_MESSAGE, -1, I18n.HELPER.getString("MessageType.debug"), Level.DEBUG), diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/QFileChooser.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/QFileChooser.java index ddac98f0..7dadd3ca 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/QFileChooser.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/QFileChooser.java @@ -7,7 +7,8 @@ import javax.swing.JFileChooser; import javax.swing.LookAndFeel; import javax.swing.UIManager; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class QFileChooser extends JFileChooser { @@ -16,7 +17,7 @@ public class QFileChooser extends JFileChooser { */ private static final long serialVersionUID = 3856532034624815076L; - private static final Logger LOGGER = Logger.getLogger(QFileChooser.class); + private static final Logger LOGGER = LogManager.getLogger(QFileChooser.class); public QFileChooser(String path, boolean dirMode) { super(path); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/panel/ContainerPanel.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/panel/ContainerPanel.java index 63d4a075..0bea8587 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/panel/ContainerPanel.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/panel/ContainerPanel.java @@ -1,6 +1,7 @@ package org.openslx.dozmod.gui.panel; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.thrift.TException; import org.openslx.bwlp.thrift.iface.ImageDetailsRead; import org.openslx.dozmod.gui.Gui; @@ -31,7 +32,7 @@ public class ContainerPanel extends JPanel { public static final String IMAGE_CONTEXT = "IMAGE"; public static final String CONTAINER_CONTEXT = "CONTAINER"; - private final Logger LOGGER = Logger.getLogger(ContainerPanel.class); + private final Logger LOGGER = LogManager.getLogger(ContainerPanel.class); private final QLabel lblContainerImageType; private final ComboBox<ContainerMeta.ContainerImageType> cboContainerImageType; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ConfigWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ConfigWindow.java index 6e94735d..c64fbfca 100755 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ConfigWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ConfigWindow.java @@ -11,7 +11,8 @@ import javax.swing.UIManager; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.thrift.TException; import org.openslx.bwlp.thrift.iface.SatelliteUserConfig; import org.openslx.dozmod.Config; @@ -34,7 +35,7 @@ public class ConfigWindow extends ConfigWindowLayout implements UiFeedback, Acti */ private static final long serialVersionUID = 1528773221604107054L; - private final static Logger LOGGER = Logger.getLogger(ConfigWindow.class); + private final static Logger LOGGER = LogManager.getLogger(ConfigWindow.class); private SatelliteUserConfig userConfig = null; private JRadioButton selectedLookAndFeel = null; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/DisclaimerWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/DisclaimerWindow.java index 5307a871..97128e75 100755 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/DisclaimerWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/DisclaimerWindow.java @@ -11,7 +11,8 @@ import java.security.NoSuchAlgorithmException; import org.apache.commons.codec.binary.Hex; import org.apache.commons.io.IOUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openslx.dozmod.Config; import org.openslx.dozmod.gui.helper.UiFeedback; import org.openslx.dozmod.util.ResourceLoader; @@ -26,7 +27,7 @@ public class DisclaimerWindow extends GenericNoticeWindow implements UiFeedback */ private static final long serialVersionUID = 8479978304760663L; - private final static Logger LOGGER = Logger.getLogger(PrivacyNoticeWindow.class); + private final static Logger LOGGER = LogManager.getLogger(PrivacyNoticeWindow.class); final DisclaimerWindow me = this; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/GenericNoticeWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/GenericNoticeWindow.java index 42f9758d..7b39998f 100755 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/GenericNoticeWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/GenericNoticeWindow.java @@ -11,7 +11,8 @@ import java.awt.event.WindowEvent; import javax.swing.JFrame; import javax.swing.JScrollBar; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openslx.dozmod.gui.Gui; import org.openslx.dozmod.gui.helper.I18n; import org.openslx.dozmod.gui.helper.MessageType; @@ -30,7 +31,7 @@ public abstract class GenericNoticeWindow extends GenericNoticeWindowLayout impl final GenericNoticeWindow me = this; - private final static Logger LOGGER = Logger.getLogger(GenericNoticeWindow.class); + private final static Logger LOGGER = LogManager.getLogger(GenericNoticeWindow.class); private boolean shouldBeShown = true; public GenericNoticeWindow(Frame modalParent, boolean shouldBeShown) { diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java index 8d31798f..0d63dcb4 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java @@ -24,7 +24,8 @@ import javax.swing.KeyStroke; import javax.swing.ListSelectionModel; import javax.swing.SwingUtilities; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.thrift.TException; import org.openslx.bwlp.thrift.iface.*; import org.openslx.dozmod.Branding; @@ -71,7 +72,7 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout */ private static final long serialVersionUID = -1901954219828374015L; - private static final Logger LOGGER = Logger.getLogger(ImageDetailsWindow.class); + private static final Logger LOGGER = LogManager.getLogger(ImageDetailsWindow.class); /** * Self-reference diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java index bc30c3c5..9434ad25 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java @@ -19,7 +19,8 @@ import javax.swing.SwingUtilities; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openslx.bwlp.thrift.iface.ImageSummaryRead; import org.openslx.dozmod.gui.Gui; import org.openslx.dozmod.gui.MainWindow; @@ -53,7 +54,7 @@ public class ImageListWindow extends ImageListWindowLayout implements DownloadCa */ private static final long serialVersionUID = 84238230133246131L; - private final static Logger LOGGER = Logger.getLogger(ImageListWindow.class); + private final static Logger LOGGER = LogManager.getLogger(ImageListWindow.class); /** * Self-reference diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImagePublishedWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImagePublishedWindow.java index a04d09c9..4c2d4f7c 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImagePublishedWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImagePublishedWindow.java @@ -22,7 +22,8 @@ import javax.swing.UIManager; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.thrift.TException; import org.openslx.bwlp.thrift.iface.ImageSummaryRead; import org.openslx.bwlp.thrift.iface.Organization; @@ -57,7 +58,7 @@ public class ImagePublishedWindow extends ImagePublishedWindowLayout implements */ private static final long serialVersionUID = 7455819819182519090L; - private final static Logger LOGGER = Logger.getLogger(ImagePublishedWindow.class); + private final static Logger LOGGER = LogManager.getLogger(ImagePublishedWindow.class); private final ImagePublishedWindow me = this; // Filtering: matches against image's name, user's first/last name or email and organisation name of the owner diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureChangeImage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureChangeImage.java index 2980b03c..52c333d2 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureChangeImage.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureChangeImage.java @@ -13,7 +13,8 @@ import javax.swing.event.ChangeListener; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openslx.bwlp.thrift.iface.ImageSummaryRead; import org.openslx.dozmod.gui.Gui; import org.openslx.dozmod.gui.changemonitor.DialogChangeMonitor; @@ -35,7 +36,7 @@ public class LectureChangeImage extends LectureChangeImageLayout implements UiFe */ private static final long serialVersionUID = 3558697767037191501L; - private static final Logger LOGGER = Logger.getLogger(LectureChangeImage.class); + private static final Logger LOGGER = LogManager.getLogger(LectureChangeImage.class); private boolean okUsed = false; private ImageTable imageTable; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java index 11c0d605..1bf231f2 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java @@ -1,6 +1,7 @@ package org.openslx.dozmod.gui.window; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.thrift.TException; import org.openslx.bwlp.thrift.iface.*; import org.openslx.dozmod.gui.Gui; @@ -51,7 +52,7 @@ public class LectureDetailsWindow extends LectureDetailsWindowLayout implements */ private static final long serialVersionUID = -2190481933307215137L; - private static final Logger LOGGER = Logger.getLogger(LectureDetailsWindow.class); + private static final Logger LOGGER = LogManager.getLogger(LectureDetailsWindow.class); /** * Self-reference diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureListWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureListWindow.java index e45fcac8..499d1e37 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureListWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureListWindow.java @@ -26,7 +26,8 @@ import javax.swing.UIManager; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.thrift.TException; import org.openslx.bwlp.thrift.iface.ImageDetailsRead; import org.openslx.bwlp.thrift.iface.ImageVersionDetails; @@ -64,7 +65,7 @@ public class LectureListWindow extends LectureListWindowLayout { */ private static final long serialVersionUID = 3135935034893934652L; - private final static Logger LOGGER = Logger.getLogger(LectureListWindow.class); + private final static Logger LOGGER = LogManager.getLogger(LectureListWindow.class); public final LectureListWindow me = this; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java index ba91b0f0..eab1c4f9 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java @@ -19,7 +19,8 @@ import javax.swing.JFrame; import javax.swing.KeyStroke; import javax.swing.SwingUtilities; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.thrift.TBaseHelper; import org.apache.thrift.TException; import org.openslx.bwlp.thrift.iface.Organization; @@ -63,7 +64,7 @@ public class LoginWindow extends LoginWindowLayout { */ private static final long serialVersionUID = 3826201134186162076L; - private final static Logger LOGGER = Logger.getLogger(LoginWindow.class); + private final static Logger LOGGER = LogManager.getLogger(LoginWindow.class); public static enum LoginType { ECP(0), diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/PrivacyNoticeWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/PrivacyNoticeWindow.java index 03a4c790..0ed4ee53 100755 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/PrivacyNoticeWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/PrivacyNoticeWindow.java @@ -11,7 +11,8 @@ import java.security.NoSuchAlgorithmException; import org.apache.commons.codec.binary.Hex; import org.apache.commons.io.IOUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openslx.dozmod.Config; import org.openslx.dozmod.gui.helper.UiFeedback; import org.openslx.dozmod.util.ResourceLoader; @@ -26,7 +27,7 @@ public class PrivacyNoticeWindow extends GenericNoticeWindow implements UiFeedba */ private static final long serialVersionUID = -7356663101779860276L; - private final static Logger LOGGER = Logger.getLogger(PrivacyNoticeWindow.class); + private final static Logger LOGGER = LogManager.getLogger(PrivacyNoticeWindow.class); final PrivacyNoticeWindow me = this; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtConfigEditorWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtConfigEditorWindow.java index 3fccf3dd..1818323d 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtConfigEditorWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtConfigEditorWindow.java @@ -13,7 +13,8 @@ import java.util.Arrays; import java.util.List; import java.util.TreeSet; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openslx.dozmod.gui.Gui; import org.openslx.dozmod.gui.helper.I18n; import org.openslx.dozmod.gui.helper.MessageType; @@ -36,7 +37,7 @@ public class VirtConfigEditorWindow extends VirtConfigEditorWindowLayout impleme */ private static final long serialVersionUID = 8416526255408870346L; - private final static Logger LOGGER = Logger.getLogger(VirtConfigEditorWindow.class); + private final static Logger LOGGER = LogManager.getLogger(VirtConfigEditorWindow.class); public interface VirtConfigChanged { public void virtConfigChanged(String newVmx); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtDropDownConfigEditorWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtDropDownConfigEditorWindow.java index 46bc032c..44544ed1 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtDropDownConfigEditorWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtDropDownConfigEditorWindow.java @@ -23,7 +23,8 @@ import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JScrollPane; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openslx.dozmod.gui.Gui; import org.openslx.dozmod.gui.control.ComboBox; import org.openslx.dozmod.gui.control.ComboBox.ComboBoxRenderer; @@ -58,7 +59,7 @@ public class VirtDropDownConfigEditorWindow extends JDialog */ private static final long serialVersionUID = 230794205942072411L; - private final static Logger LOGGER = Logger.getLogger(VirtDropDownConfigEditorWindow.class); + private final static Logger LOGGER = LogManager.getLogger(VirtDropDownConfigEditorWindow.class); public interface VirtConfigChanged { public void virtConfigChanged(String newVmx); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java index d68ebba4..55b525d9 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java @@ -18,7 +18,8 @@ import javax.swing.JSeparator; import javax.swing.JTextField; import javax.swing.border.TitledBorder; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openslx.bwlp.thrift.iface.Organization; import org.openslx.dozmod.Branding; import org.openslx.dozmod.gui.Gui; @@ -36,7 +37,7 @@ public abstract class LoginWindowLayout extends JDialog { */ private static final long serialVersionUID = 4666636501698824636L; - private static final Logger LOGGER = Logger.getLogger(LoginWindowLayout.class); + private static final Logger LOGGER = LogManager.getLogger(LoginWindowLayout.class); // TODO This has nothing to to with the layout protected static enum LOGIN_TYPE { diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageCreationWizard.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageCreationWizard.java index 885e40f7..11d3846a 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageCreationWizard.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageCreationWizard.java @@ -1,6 +1,7 @@ package org.openslx.dozmod.gui.wizard; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.thrift.TException; import org.openslx.bwlp.thrift.iface.ImageBaseWrite; import org.openslx.bwlp.thrift.iface.ImageVersionWrite; @@ -34,7 +35,7 @@ public class ImageCreationWizard extends Wizard implements UiFeedback, QuitNotif */ private static final long serialVersionUID = -353405234601306343L; - private final static Logger LOGGER = Logger.getLogger(ImageCreationWizard.class); + private final static Logger LOGGER = LogManager.getLogger(ImageCreationWizard.class); private final UploadWizardState state = new UploadWizardState(); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageUpdateWizard.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageUpdateWizard.java index d05b02b5..a82801ac 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageUpdateWizard.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageUpdateWizard.java @@ -2,7 +2,8 @@ package org.openslx.dozmod.gui.wizard; import java.awt.Window; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.thrift.TException; import org.openslx.bwlp.thrift.iface.ImageDetailsRead; import org.openslx.bwlp.thrift.iface.ImageVersionWrite; @@ -29,7 +30,7 @@ public class ImageUpdateWizard extends Wizard implements UiFeedback, QuitNotific */ private static final long serialVersionUID = -584900619809829672L; - private final static Logger LOGGER = Logger.getLogger(ImageCreationWizard.class); + private final static Logger LOGGER = LogManager.getLogger(ImageCreationWizard.class); private final UploadWizardState state = new UploadWizardState(); protected ImageUploadPage imageUploadPage; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/LectureWizard.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/LectureWizard.java index 59c79a88..bd7c0aeb 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/LectureWizard.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/LectureWizard.java @@ -1,6 +1,7 @@ package org.openslx.dozmod.gui.wizard; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openslx.bwlp.thrift.iface.ImageSummaryRead; import org.openslx.bwlp.thrift.iface.LectureWrite; import org.openslx.dozmod.gui.Gui; @@ -26,7 +27,7 @@ public class LectureWizard extends Wizard implements UiFeedback { */ private static final long serialVersionUID = -7447355922540362345L; - private final static Logger LOGGER = Logger.getLogger(LectureWizard.class); + private final static Logger LOGGER = LogManager.getLogger(LectureWizard.class); public final LectureWizardState state = new LectureWizardState(); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java index 940531c6..389e4005 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java @@ -1,7 +1,8 @@ package org.openslx.dozmod.gui.wizard.page; import org.apache.commons.io.FileUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openslx.bwlp.thrift.iface.ImageDetailsRead; import org.openslx.dozmod.Config; import org.openslx.dozmod.gui.Gui; @@ -40,7 +41,7 @@ public class ContainerUploadPage extends ContainerUploadPageLayout { */ private static final long serialVersionUID = 2564301984375080698L; - private final Logger LOGGER = Logger.getLogger(ContainerUploadPage.class); + private final Logger LOGGER = LogManager.getLogger(ContainerUploadPage.class); private final UploadWizardState state; private final ImageDetailsRead existingImage; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageCustomPermissionPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageCustomPermissionPage.java index 3a40cb35..8895ebbb 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageCustomPermissionPage.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageCustomPermissionPage.java @@ -2,7 +2,8 @@ package org.openslx.dozmod.gui.wizard.page; import java.util.Map; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openslx.bwlp.thrift.iface.ImagePermissions; import org.openslx.dozmod.gui.wizard.Wizard; import org.openslx.dozmod.gui.wizard.layout.ImageCustomPermissionPageLayout; @@ -16,7 +17,7 @@ public class ImageCustomPermissionPage extends ImageCustomPermissionPageLayout { */ private static final long serialVersionUID = -8809873730069813731L; - private final static Logger LOGGER = Logger.getLogger(ImageCustomPermissionPage.class); + private final static Logger LOGGER = LogManager.getLogger(ImageCustomPermissionPage.class); private boolean initDone = false; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageOvfConversionPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageOvfConversionPage.java index 8caa4c51..ed3df849 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageOvfConversionPage.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageOvfConversionPage.java @@ -14,7 +14,8 @@ import javax.swing.JOptionPane; import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openslx.dozmod.Config; import org.openslx.dozmod.gui.Gui; import org.openslx.dozmod.gui.helper.I18n; @@ -36,7 +37,7 @@ public class ImageOvfConversionPage extends ImageOvfConversionPageLayout { */ private static final long serialVersionUID = 464428060782110490L; - private final static Logger LOGGER = Logger.getLogger(ImageOvfConversionPage.class); + private final static Logger LOGGER = LogManager.getLogger(ImageOvfConversionPage.class); private UploadWizardState state; private ImageOvfConversionPage page; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java index 1d7f5821..d0b491e3 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java @@ -16,7 +16,8 @@ import javax.swing.JOptionPane; import javax.swing.filechooser.FileNameExtensionFilter; import org.apache.commons.io.FilenameUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openslx.bwlp.thrift.iface.ImageDetailsRead; import org.openslx.bwlp.thrift.iface.Virtualizer; import org.openslx.dozmod.Branding; @@ -58,7 +59,7 @@ public class ImageUploadPage extends ImageUploadPageLayout { */ private static final long serialVersionUID = -2974001512014608455L; - private final static Logger LOGGER = Logger.getLogger(ImageUploadPage.class); + private final static Logger LOGGER = LogManager.getLogger(ImageUploadPage.class); private UploadWizardState state; private String lastDetectedName = null; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadSummaryPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadSummaryPage.java index fdd52efb..7f310f3b 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadSummaryPage.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadSummaryPage.java @@ -3,7 +3,8 @@ package org.openslx.dozmod.gui.wizard.page; import java.awt.KeyboardFocusManager; import java.awt.Window; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openslx.bwlp.thrift.iface.ImageSummaryRead; import org.openslx.bwlp.thrift.iface.TransferState; import org.openslx.dozmod.Branding; @@ -27,7 +28,7 @@ public class ImageUploadSummaryPage extends ImageUploadSummaryPageLayout { */ private static final long serialVersionUID = -319910198640112507L; - private static final Logger LOGGER = Logger.getLogger(ImageUploadSummaryPage.class); + private static final Logger LOGGER = LogManager.getLogger(ImageUploadSummaryPage.class); private boolean pageIsVisible = false; private boolean uploadListenerAdded = false; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureCustomPermissionPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureCustomPermissionPage.java index bcaa773e..8e82d6bf 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureCustomPermissionPage.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureCustomPermissionPage.java @@ -2,7 +2,8 @@ package org.openslx.dozmod.gui.wizard.page; import java.util.Map; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openslx.bwlp.thrift.iface.LecturePermissions; import org.openslx.dozmod.gui.wizard.Wizard; import org.openslx.dozmod.gui.wizard.layout.LectureCustomPermissionPageLayout; @@ -19,7 +20,7 @@ public class LectureCustomPermissionPage extends LectureCustomPermissionPageLayo */ private static final long serialVersionUID = 8593836578573838805L; - private final static Logger LOGGER = Logger.getLogger(LectureCustomPermissionPage.class); + private final static Logger LOGGER = LogManager.getLogger(LectureCustomPermissionPage.class); private boolean initDone = false; |