diff options
| author | tkellner <tkellner@174cde9d-5d70-4d2a-aa98-46368bc2aaf7> | 2013-04-10 19:28:34 +0000 |
|---|---|---|
| committer | tkellner <tkellner@174cde9d-5d70-4d2a-aa98-46368bc2aaf7> | 2013-04-10 19:28:34 +0000 |
| commit | 0a24f8c56cb0f156bd548883a5e3b53cfc149ce2 (patch) | |
| tree | fa73850fd1bfba8852e50fcf01a39f33e78b9589 | |
| parent | ea98e837c957a0ab4e9a82d1d8c3020d86045835 (diff) | |
| download | pdf-over-0a24f8c56cb0f156bd548883a5e3b53cfc149ce2.tar.gz pdf-over-0a24f8c56cb0f156bd548883a5e3b53cfc149ce2.tar.bz2 pdf-over-0a24f8c56cb0f156bd548883a5e3b53cfc149ce2.zip | |
Move log4j props and config to avoid name clashes
git-svn-id: https://joinup.ec.europa.eu/svn/pdf-over/trunk@340 174cde9d-5d70-4d2a-aa98-46368bc2aaf7
| -rw-r--r-- | pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PrepareConfigurationState.java | 15 | ||||
| -rw-r--r-- | pdf-over-gui/src/main/resources/at/asit/pdfover/gui/PDFOver.config (renamed from pdf-over-gui/src/main/resources/PDFOver.config) | 0 | ||||
| -rw-r--r-- | pdf-over-gui/src/main/resources/at/asit/pdfover/gui/log4j.properties (renamed from pdf-over-gui/src/main/resources/log4j.properties) | 0 |
3 files changed, 8 insertions, 7 deletions
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 955d125a..3a9048ba 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 @@ -57,7 +57,7 @@ public class PrepareConfigurationState extends State { private static final Logger log = LoggerFactory .getLogger(PrepareConfigurationState.class); - private static String RES_SEPARATOR = "/"; //$NON-NLS-1$ + private static String RES_PATH = "/at/asit/pdfover/gui/"; //$NON-NLS-1$ private static String FILE_SEPARATOR = File.separator; @@ -104,7 +104,7 @@ public class PrepareConfigurationState extends State { // default value! try { InputStream is = this.getClass().getResourceAsStream( - RES_SEPARATOR + filename); + RES_PATH + filename); this.stateMachine.getConfigProvider() .loadConfiguration(is); @@ -150,10 +150,11 @@ public class PrepareConfigurationState extends State { InputStream inputStream = null; FileOutputStream pdfOverConfig = null; try { - inputStream = this.getClass().getResourceAsStream( - RES_SEPARATOR + Constants.DEFAULT_CONFIG_FILENAME); - pdfOverConfig = new FileOutputStream(this.stateMachine.getConfigProvider().getConfigurationDirectory() - + FILE_SEPARATOR + Constants.DEFAULT_CONFIG_FILENAME); + inputStream = this.getClass().getResourceAsStream(RES_PATH + + Constants.DEFAULT_CONFIG_FILENAME); + pdfOverConfig = new FileOutputStream( + this.stateMachine.getConfigProvider().getConfigurationDirectory() + + FILE_SEPARATOR + Constants.DEFAULT_CONFIG_FILENAME); while ((byteCount = inputStream.read(buffer)) >= 0) { pdfOverConfig.write(buffer, 0, byteCount); @@ -188,7 +189,7 @@ public class PrepareConfigurationState extends State { pdfOverConfig = null; try { inputStream = this.getClass().getResourceAsStream( - RES_SEPARATOR + Constants.DEFAULT_LOG4J_FILENAME); + RES_PATH + Constants.DEFAULT_LOG4J_FILENAME); pdfOverConfig = new FileOutputStream(this.stateMachine.getConfigProvider().getConfigurationDirectory() + FILE_SEPARATOR + Constants.DEFAULT_LOG4J_FILENAME); diff --git a/pdf-over-gui/src/main/resources/PDFOver.config b/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/PDFOver.config index 85cc43ad..85cc43ad 100644 --- a/pdf-over-gui/src/main/resources/PDFOver.config +++ b/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/PDFOver.config diff --git a/pdf-over-gui/src/main/resources/log4j.properties b/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/log4j.properties index 74a980b2..74a980b2 100644 --- a/pdf-over-gui/src/main/resources/log4j.properties +++ b/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/log4j.properties |