summaryrefslogtreecommitdiff
path: root/pdf-over-gui/src/main/java/at/asit
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 /pdf-over-gui/src/main/java/at/asit
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
Diffstat (limited to 'pdf-over-gui/src/main/java/at/asit')
-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
4 files changed, 18 insertions, 104 deletions
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 {