summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Heher <jakob.heher@iaik.tugraz.at>2022-02-17 17:39:15 +0100
committerJakob Heher <jakob.heher@iaik.tugraz.at>2022-02-17 17:39:15 +0100
commit76018bf5e46ee440457204c1f52b6f61dc03fcc1 (patch)
tree9f50ff898ac4c9920b9f6e44dbb79c372a25ec22
parent030fc579050ea42d8e813402f75e14b8c8ee1a57 (diff)
downloadpdf-over-76018bf5e46ee440457204c1f52b6f61dc03fcc1.tar.gz
pdf-over-76018bf5e46ee440457204c1f52b6f61dc03fcc1.tar.bz2
pdf-over-76018bf5e46ee440457204c1f52b6f61dc03fcc1.zip
log4j -> logback 1.2.10 (latest stable)
closes #57
-rw-r--r--pdf-over-commons/src/main/java/at/asit/pdfover/commons/Constants.java3
-rw-r--r--pdf-over-gui/pom.xml5
-rw-r--r--pdf-over-gui/src/main/java/at/asit/pdfover/gui/DeveloperMain.java81
-rw-r--r--pdf-over-gui/src/main/java/at/asit/pdfover/gui/Main.java31
-rw-r--r--pdf-over-gui/src/main/java/at/asit/pdfover/gui/osx/CocoaUIEnhancer.java5
-rw-r--r--pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PrepareConfigurationState.java5
-rw-r--r--pdf-over-gui/src/main/resources/log4j.properties36
-rw-r--r--pdf-over-gui/src/main/resources/logback.xml38
-rw-r--r--pdf-over-signator/pom.xml5
-rw-r--r--pdf-over-signer/pdf-over-sigpdfas3/src/main/java/at/asit/pdfover/signer/pdfas/PDFASHelper.java2
-rw-r--r--pdf-over-signer/pdf-over-sigpdfas4/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4Helper.java3
-rw-r--r--pom.xml6
12 files changed, 65 insertions, 155 deletions
diff --git a/pdf-over-commons/src/main/java/at/asit/pdfover/commons/Constants.java b/pdf-over-commons/src/main/java/at/asit/pdfover/commons/Constants.java
index cd48729d..901d0824 100644
--- a/pdf-over-commons/src/main/java/at/asit/pdfover/commons/Constants.java
+++ b/pdf-over-commons/src/main/java/at/asit/pdfover/commons/Constants.java
@@ -64,9 +64,6 @@ public class Constants {
/** The default configuration file name */
public static final String DEFAULT_CONFIG_FILENAME = "PDF-Over.config"; //$NON-NLS-1$
- /** The default log4j file name */
- public static final String DEFAULT_LOG4J_FILENAME = "log4j.properties"; //$NON-NLS-1$
-
/** The configuration version file name */
public static final String CONFIG_VERSION_FILENAME = ".version"; //$NON-NLS-1$
diff --git a/pdf-over-gui/pom.xml b/pdf-over-gui/pom.xml
index e9867e2a..a125c0d5 100644
--- a/pdf-over-gui/pom.xml
+++ b/pdf-over-gui/pom.xml
@@ -22,8 +22,9 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>1.2.10</version>
</dependency>
<dependency>
<groupId>at.a-sit</groupId>
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/DeveloperMain.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/DeveloperMain.java
deleted file mode 100644
index 5ef6ea3c..00000000
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/DeveloperMain.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright 2012 by A-SIT, Secure Information Technology Center Austria
- *
- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "Licence");
- * You may not use this work except in compliance with the Licence.
- * You may obtain a copy of the Licence at:
- * http://joinup.ec.europa.eu/software/page/eupl
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the Licence is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the Licence for the specific language governing permissions and
- * limitations under the Licence.
- */
-package at.asit.pdfover.gui;
-
-//Imports
-import java.io.File;
-
-import at.asit.pdfover.commons.Constants;
-import org.apache.log4j.PropertyConfigurator;
-import org.eclipse.swt.SWT;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import at.asit.pdfover.gui.workflow.StateMachineImpl;
-
-/**
- * Main entry point for developers
- */
-public class DeveloperMain {
-
- /**
- * SLF4J Logger instance
- **/
- private static final Logger log = LoggerFactory.getLogger(DeveloperMain.class);
-
- /**
- * Developer Main Entry point...
- * @param args
- */
- public static void main(String[] args) {
- //BasicConfigurator.configure();
-
- // Set PDF-AS log4j configuration:
- //System.setProperty("log4j.configuration", "log4j.properties");
-
- File configDir = new File(Constants.CONFIG_DIRECTORY);
- if(!configDir.exists()) {
- configDir.mkdir();
- }
-
- File log4j = new File(configDir.getAbsolutePath() + File.separator + Constants.DEFAULT_LOG4J_FILENAME);
- if(log4j.exists()) {
- PropertyConfigurator.configureAndWatch(log4j.getAbsolutePath());
- }
-
- log.debug("SWT version: " + SWT.getVersion()); //$NON-NLS-1$
-
- StringBuilder sb = new StringBuilder();
-
- for(int i = 0; i < args.length; i++) {
- sb.append(" "); //$NON-NLS-1$
- sb.append(args[i]);
- }
-
- log.debug("Executing arguments are: " + sb.toString()); //$NON-NLS-1$
-
- StateMachineImpl stateMachine = new StateMachineImpl(args);
- log.debug("Starting stateMachine ..."); //$NON-NLS-1$
-
- stateMachine.start();
-
- log.debug("Ended stateMachine ..."); //$NON-NLS-1$
-
- // Workaround for remaining AWT-Shutdown thread on OSX
- System.exit(0);
- }
-
-}
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/Main.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/Main.java
index b62d6cf8..b75b4ebd 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/Main.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/Main.java
@@ -20,7 +20,6 @@ import java.io.File;
import java.io.IOException;
import at.asit.pdfover.commons.Constants;
-import org.apache.log4j.PropertyConfigurator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -44,26 +43,20 @@ public class Main {
public static void main(String[] args) throws IOException {
try {
- File configDir = new File(Constants.CONFIG_DIRECTORY);
-
- if (!configDir.exists()) {
- configDir.mkdir();
- }
-
-
- File log4j = new File(configDir.getAbsolutePath() + File.separator + Constants.DEFAULT_LOG4J_FILENAME);
- if (log4j.exists()) {
- PropertyConfigurator.configureAndWatch(log4j.getAbsolutePath());
- }
+ File configDir = new File(Constants.CONFIG_DIRECTORY);
+ if (!configDir.exists()) {
+ configDir.mkdir();
+ }
+
- StateMachineImpl stateMachine = new StateMachineImpl(args);
-
- log.debug("Starting stateMachine ..."); //$NON-NLS-1$
- stateMachine.start();
-
-
- log.debug("Ended stateMachine ..."); //$NON-NLS-1$
+ StateMachineImpl stateMachine = new StateMachineImpl(args);
+
+ log.debug("Starting stateMachine ..."); //$NON-NLS-1$
+ stateMachine.start();
+
+
+ log.debug("Ended stateMachine ..."); //$NON-NLS-1$
}
catch (Throwable e) {
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/osx/CocoaUIEnhancer.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/osx/CocoaUIEnhancer.java
index 78aaa777..a5605557 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/osx/CocoaUIEnhancer.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/osx/CocoaUIEnhancer.java
@@ -18,12 +18,13 @@ package at.asit.pdfover.gui.osx;
import java.lang.reflect.Method;
-import org.apache.log4j.Logger;
import org.eclipse.swt.SWT;
import org.eclipse.swt.internal.C;
import org.eclipse.swt.internal.Callback;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Listener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import at.asit.pdfover.commons.Constants;
import at.asit.pdfover.commons.Messages;
@@ -52,7 +53,7 @@ import at.asit.pdfover.commons.Messages;
* href="http://www.eclipse.org/legal/epl-v10.html">EPL</a>).
*/
public class CocoaUIEnhancer {
- static final Logger log = Logger.getLogger(CocoaUIEnhancer.class);
+ static final Logger log = LoggerFactory.getLogger(CocoaUIEnhancer.class);
private static final long kAboutMenuItem = 0;
private static final long kPreferencesMenuItem = 2;
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PrepareConfigurationState.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PrepareConfigurationState.java
index 24b33e84..579848cf 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PrepareConfigurationState.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PrepareConfigurationState.java
@@ -34,7 +34,6 @@ import java.util.Locale;
import at.asit.pdfover.commons.Profile;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.log4j.PropertyConfigurator;
import org.eclipse.swt.SWT;
import org.eclipse.swt.program.Program;
import org.slf4j.Logger;
@@ -218,6 +217,8 @@ public class PrepareConfigurationState extends State {
}
private void copyLog4jConfig() throws InitializationException {
+ // TODO: figure out if we still need this
+ /*
// 1Kb buffer
byte[] buffer = new byte[1024];
int byteCount = 0;
@@ -260,7 +261,7 @@ public class PrepareConfigurationState extends State {
"Failed to close Resource stream for log4j config", e); //$NON-NLS-1$
}
}
- }
+ }*/
}
private void unzipPdfAsConfig(File configDir) throws InitializationException {
diff --git a/pdf-over-gui/src/main/resources/log4j.properties b/pdf-over-gui/src/main/resources/log4j.properties
deleted file mode 100644
index 489bc2b2..00000000
--- a/pdf-over-gui/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,36 +0,0 @@
-log4j.rootLogger=TRACE, STDOUT, LOGFILE
-
-# STDOUT appender
-log4j.appender.STDOUT=org.apache.log4j.ConsoleAppender
-log4j.appender.STDOUT.layout=org.apache.log4j.PatternLayout
-log4j.appender.STDOUT.layout.ConversionPattern=%-5p | %d | %t | %c %x- %m%n
-log4j.appender.STDOUT.encoding=UTF-8
-log4j.appender.STDOUT.Threshold = DEBUG
-
-log4j.appender.LOGFILE=org.apache.log4j.RollingFileAppender
-log4j.appender.LOGFILE.file=${user.home}/.pdf-over/pdf-over.log
-log4j.appender.LOGFILE.MaxFileSize=100KB
-log4j.appender.LOGFILE.MaxBackupIndex=10
-log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout
-log4j.appender.LOGFILE.layout.ConversionPattern=%-5p | %d | %t | %c %x- %m%n
-log4j.appender.LOGFILE.encoding=UTF-8
-log4j.appender.LOGFILE.Threshold = INFO
-
-log4j.logger = INFO
-
-# DETAIL LEVELS PDF-Over
-log4j.logger.at.asit.pdfover = DEBUG
-log4j.logger.at.gv.egiz.pdfas = WARN
-log4j.logger.at.knowcenter = WARN
-log4j.logger.at.knowcenter.wag.egov.egiz.ldap = WARN
-log4j.logger.org.apache.commons.httpclient = ERROR
-log4j.logger.httpclient.wire = ERROR
-
-
-# DETAIL LEVELS PDF-AS
-log4j.logger.org.pdfbox = DEBUG
-log4j.logger.org.apache.pdfbox.util = DEBUG
-log4j.logger.at.gv.egiz.pdfas = DEBUG
-log4j.logger.at.knowcenter = DEBUG
-log4j.logger.at.knowcenter.wag.egov.egiz.ldap = DEBUG
-log4j.logger.org.apache.commons.httpclient = ERROR
diff --git a/pdf-over-gui/src/main/resources/logback.xml b/pdf-over-gui/src/main/resources/logback.xml
new file mode 100644
index 00000000..e9d8bd6f
--- /dev/null
+++ b/pdf-over-gui/src/main/resources/logback.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Built in 2022-02-17 04:16 by logback-translator -->
+<!-- -->
+<!-- For sponsoring SLF4J/logback/reload4j projects see -->
+<!-- https://github.com/sponsors/qos-ch -->
+<!-- -->
+<configuration>
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoding>UTF-8</encoding>
+ <encoder>
+ <pattern>%-5p | %t @ %c{40} | %m%n</pattern>
+ </encoder>
+ </appender>
+ <appender name="LOGFILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <!--See also http://logback.qos.ch/manual/appenders.html#RollingFileAppender-->
+ <encoding>UTF-8</encoding>
+ <file>${user.home}/.pdf-over/pdf-over.log</file>
+ <encoder>
+ <pattern>%-5p | %d | %t @ %c | %m%n</pattern>
+ </encoder>
+ <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+ <level>INFO</level>
+ </filter>
+ <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+ <maxIndex>10</maxIndex>
+ <FileNamePattern>${user.home}/.pdf-over/pdf-over.log.%i</FileNamePattern>
+ </rollingPolicy>
+ <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+ <MaxFileSize>100KB</MaxFileSize>
+ </triggeringPolicy>
+ </appender>
+ <logger name="at.asit.pdfover" level="INFO"/>
+ <root level="WARN">
+ <appender-ref ref="STDOUT"/>
+ <appender-ref ref="LOGFILE"/>
+ </root>
+</configuration> \ No newline at end of file
diff --git a/pdf-over-signator/pom.xml b/pdf-over-signator/pom.xml
index 7c8e0441..b429b6d3 100644
--- a/pdf-over-signator/pom.xml
+++ b/pdf-over-signator/pom.xml
@@ -13,8 +13,9 @@
</properties>
<dependencies>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>1.2.10</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
diff --git a/pdf-over-signer/pdf-over-sigpdfas3/src/main/java/at/asit/pdfover/signer/pdfas/PDFASHelper.java b/pdf-over-signer/pdf-over-sigpdfas3/src/main/java/at/asit/pdfover/signer/pdfas/PDFASHelper.java
index 473bbf42..1375a1fc 100644
--- a/pdf-over-signer/pdf-over-sigpdfas3/src/main/java/at/asit/pdfover/signer/pdfas/PDFASHelper.java
+++ b/pdf-over-signer/pdf-over-sigpdfas3/src/main/java/at/asit/pdfover/signer/pdfas/PDFASHelper.java
@@ -45,8 +45,6 @@ public class PDFASHelper {
*/
private static PdfAs createPdfAs() throws PdfAsException {
File directory = new File (".");
- System.setProperty("log4j.configuration", directory.getAbsolutePath() +
- "/log4j.properties");
System.setProperty("pdf-as.work-dir", getWorkDir());
return new at.gv.egiz.pdfas.impl.api.PdfAsObject();
}
diff --git a/pdf-over-signer/pdf-over-sigpdfas4/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4Helper.java b/pdf-over-signer/pdf-over-sigpdfas4/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4Helper.java
index 21a6bbdb..e523637f 100644
--- a/pdf-over-signer/pdf-over-sigpdfas4/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4Helper.java
+++ b/pdf-over-signer/pdf-over-sigpdfas4/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4Helper.java
@@ -63,9 +63,6 @@ public class PdfAs4Helper {
* @throws PdfAsException
*/
private static PdfAs createPdfAs() {
- File directory = new File (".");
- System.setProperty("log4j.configuration", directory.getAbsolutePath() +
- "/log4j.properties");
return PdfAsFactory.createPdfAs(new File(getWorkDir()));
}
diff --git a/pom.xml b/pom.xml
index db0fc806..774334ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -161,9 +161,9 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.6.6</version>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>1.2.10</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>