From 6cc5cd2311c9e6cde062fa4034444969f9c293e0 Mon Sep 17 00:00:00 2001 From: Klaus Stranacher Date: Sun, 9 Mar 2014 21:04:57 +0100 Subject: POMs added to dependencies maven-assembly-plugin version set to 2.2-beta-1 (for MOA-SPSS) Update TSL parts --- .../java/at/gv/egovernment/moa/util/MiscUtil.java | 28 ++++++++++----------- pom.xml | 10 +++++--- .../1.0/iaik_javax_crypto-1.0.pom | 9 +++++++ .../3.181/iaik_jce_eval_signed-3.181.jar | Bin 890328 -> 921338 bytes .../3.181/iaik_jce_eval_signed-3.181.pom | 9 +++++++ repository/iaik/iaik_jsse/4.4/iaik_jsse-4.4.pom | 9 +++++++ .../iaik_pki_module/1.0/iaik_pki_module-1.0.pom | 9 +++++++ repository/iaik/iaik_ssl/4.4/iaik_ssl-4.4.pom | 9 +++++++ repository/iaik/iaik_util/0.23/iaik_util-0.23.jar | Bin 39377 -> 39372 bytes repository/iaik/iaik_util/0.23/iaik_util-0.23.pom | 9 +++++++ .../1.1709142/iaik_xsect_eval-1.1709142.pom | 9 +++++++ repository/iaik/w3c_http/1.0/w3c_http-1.0.pom | 9 +++++++ .../server/config/ConfigurationPartsBuilder.java | 24 +++++++++++++++--- .../spss/server/config/ConfigurationProvider.java | 5 ++-- spss/server/serverws/pom.xml | 2 +- 15 files changed, 116 insertions(+), 25 deletions(-) create mode 100644 repository/iaik/iaik_javax_crypto/1.0/iaik_javax_crypto-1.0.pom create mode 100644 repository/iaik/iaik_jce_eval_signed/3.181/iaik_jce_eval_signed-3.181.pom create mode 100644 repository/iaik/iaik_jsse/4.4/iaik_jsse-4.4.pom create mode 100644 repository/iaik/iaik_pki_module/1.0/iaik_pki_module-1.0.pom create mode 100644 repository/iaik/iaik_ssl/4.4/iaik_ssl-4.4.pom create mode 100644 repository/iaik/iaik_util/0.23/iaik_util-0.23.pom create mode 100644 repository/iaik/iaik_xsect_eval/1.1709142/iaik_xsect_eval-1.1709142.pom create mode 100644 repository/iaik/w3c_http/1.0/w3c_http-1.0.pom diff --git a/common/src/main/java/at/gv/egovernment/moa/util/MiscUtil.java b/common/src/main/java/at/gv/egovernment/moa/util/MiscUtil.java index 043baea0e..c2f2c9f47 100644 --- a/common/src/main/java/at/gv/egovernment/moa/util/MiscUtil.java +++ b/common/src/main/java/at/gv/egovernment/moa/util/MiscUtil.java @@ -143,20 +143,20 @@ public class MiscUtil { return out.toByteArray(); } - public static Document parseDocument(InputStream inputStream) - throws IOException { - try { - DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory - .newInstance(); - docBuilderFactory.setNamespaceAware(true); - DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder(); - return docBuilder.parse(inputStream); - } catch (ParserConfigurationException e) { - throw new IOException(e); - } catch (SAXException e) { - throw new IOException(e); - } - } +// public static Document parseDocument(InputStream inputStream) +// throws IOException { +// try { +// DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory +// .newInstance(); +// docBuilderFactory.setNamespaceAware(true); +// DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder(); +// return docBuilder.parse(inputStream); +// } catch (ParserConfigurationException e) { +// throw new IOException(e); +// } catch (SAXException e) { +// throw new IOException(e); +// } +// } public static String removePrecedingSlash(String path, String slash) { assertNotEmpty(slash, "Shash"); diff --git a/pom.xml b/pom.xml index 2ac793aa2..c8fc00ea1 100644 --- a/pom.xml +++ b/pom.xml @@ -9,6 +9,7 @@ ${basedir}/repository + UTF-8 @@ -64,7 +65,8 @@ false maven-assembly-plugin - 2.4 + 2.2-beta-1 + moa @@ -204,7 +206,7 @@ MOA.spss.server moa-spss-lib - 2.0.0 + 1.5.2 compile @@ -217,7 +219,7 @@ MOA.spss.server moa-spss-tools - 2.0.0 + 1.5.2 test @@ -354,7 +356,7 @@ iaik.prod iaik_tsl - 1.0 + 1.0.5 iaik.prod diff --git a/repository/iaik/iaik_javax_crypto/1.0/iaik_javax_crypto-1.0.pom b/repository/iaik/iaik_javax_crypto/1.0/iaik_javax_crypto-1.0.pom new file mode 100644 index 000000000..b4ff61576 --- /dev/null +++ b/repository/iaik/iaik_javax_crypto/1.0/iaik_javax_crypto-1.0.pom @@ -0,0 +1,9 @@ + + + 4.0.0 + iaik + iaik_javax_crypto + 1.0 + POM was created from install:install-file + diff --git a/repository/iaik/iaik_jce_eval_signed/3.181/iaik_jce_eval_signed-3.181.jar b/repository/iaik/iaik_jce_eval_signed/3.181/iaik_jce_eval_signed-3.181.jar index 98b5e27a2..932e4310f 100644 Binary files a/repository/iaik/iaik_jce_eval_signed/3.181/iaik_jce_eval_signed-3.181.jar and b/repository/iaik/iaik_jce_eval_signed/3.181/iaik_jce_eval_signed-3.181.jar differ diff --git a/repository/iaik/iaik_jce_eval_signed/3.181/iaik_jce_eval_signed-3.181.pom b/repository/iaik/iaik_jce_eval_signed/3.181/iaik_jce_eval_signed-3.181.pom new file mode 100644 index 000000000..9bcbb93a5 --- /dev/null +++ b/repository/iaik/iaik_jce_eval_signed/3.181/iaik_jce_eval_signed-3.181.pom @@ -0,0 +1,9 @@ + + + 4.0.0 + iaik + iaik_jce_eval_signed + 3.181 + POM was created from install:install-file + diff --git a/repository/iaik/iaik_jsse/4.4/iaik_jsse-4.4.pom b/repository/iaik/iaik_jsse/4.4/iaik_jsse-4.4.pom new file mode 100644 index 000000000..382c12003 --- /dev/null +++ b/repository/iaik/iaik_jsse/4.4/iaik_jsse-4.4.pom @@ -0,0 +1,9 @@ + + + 4.0.0 + iaik + iaik_jsse + 4.4 + POM was created from install:install-file + diff --git a/repository/iaik/iaik_pki_module/1.0/iaik_pki_module-1.0.pom b/repository/iaik/iaik_pki_module/1.0/iaik_pki_module-1.0.pom new file mode 100644 index 000000000..e78656647 --- /dev/null +++ b/repository/iaik/iaik_pki_module/1.0/iaik_pki_module-1.0.pom @@ -0,0 +1,9 @@ + + + 4.0.0 + iaik + iaik_pki_module + 1.0 + POM was created from install:install-file + diff --git a/repository/iaik/iaik_ssl/4.4/iaik_ssl-4.4.pom b/repository/iaik/iaik_ssl/4.4/iaik_ssl-4.4.pom new file mode 100644 index 000000000..32c610268 --- /dev/null +++ b/repository/iaik/iaik_ssl/4.4/iaik_ssl-4.4.pom @@ -0,0 +1,9 @@ + + + 4.0.0 + iaik + iaik_ssl + 4.4 + POM was created from install:install-file + diff --git a/repository/iaik/iaik_util/0.23/iaik_util-0.23.jar b/repository/iaik/iaik_util/0.23/iaik_util-0.23.jar index 1bc0cde7c..78370c31e 100644 Binary files a/repository/iaik/iaik_util/0.23/iaik_util-0.23.jar and b/repository/iaik/iaik_util/0.23/iaik_util-0.23.jar differ diff --git a/repository/iaik/iaik_util/0.23/iaik_util-0.23.pom b/repository/iaik/iaik_util/0.23/iaik_util-0.23.pom new file mode 100644 index 000000000..75fdc3692 --- /dev/null +++ b/repository/iaik/iaik_util/0.23/iaik_util-0.23.pom @@ -0,0 +1,9 @@ + + + 4.0.0 + iaik + iaik_util + 0.23 + POM was created from install:install-file + diff --git a/repository/iaik/iaik_xsect_eval/1.1709142/iaik_xsect_eval-1.1709142.pom b/repository/iaik/iaik_xsect_eval/1.1709142/iaik_xsect_eval-1.1709142.pom new file mode 100644 index 000000000..2697348bd --- /dev/null +++ b/repository/iaik/iaik_xsect_eval/1.1709142/iaik_xsect_eval-1.1709142.pom @@ -0,0 +1,9 @@ + + + 4.0.0 + iaik + iaik_xsect_eval + 1.1709142 + POM was created from install:install-file + diff --git a/repository/iaik/w3c_http/1.0/w3c_http-1.0.pom b/repository/iaik/w3c_http/1.0/w3c_http-1.0.pom new file mode 100644 index 000000000..81f3e826c --- /dev/null +++ b/repository/iaik/w3c_http/1.0/w3c_http-1.0.pom @@ -0,0 +1,9 @@ + + + 4.0.0 + iaik + w3c_http + 1.0 + POM was created from install:install-file + diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java index 0908d88c9..287d8225b 100644 --- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java +++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java @@ -1385,6 +1385,22 @@ public class ConfigurationPartsBuilder { Logger.warn(new LogMsg(txt)); warnings.add(txt); } + + /** + * Log a warning. + * + * @param messageId The message ID. + * @param args Additional parameters for the message. + * @see at.gv.egovernment.moa.spss.server.util.MessageProvider + */ + private void debug(String messageId, Object[] args) { + MessageProvider msg = MessageProvider.getInstance(); + String txt = msg.getMessage(messageId, args); + + Logger.debug(new LogMsg(txt)); + + } + /** * Log a debug message. @@ -1581,27 +1597,27 @@ public class ConfigurationPartsBuilder { String euTSLUrl = getElementValue(getConfigElem(), TSL_CONFIGURATION_XPATH + CONF + "EUTSLUrl", null); if (StringUtils.isEmpty(euTSLUrl)) { euTSLUrl = TSLConfiguration.DEFAULT_EU_TSL_URL; - warn("config.39", new Object[] { "EUTSL", euTSLUrl }); + debug("config.39", new Object[] { "EUTSL", euTSLUrl }); } String updateSchedulePeriod = getElementValue(getConfigElem(), TSL_CONFIGURATION_XPATH + CONF + "UpdateSchedule/" + CONF + "Period" , null); if (StringUtils.isEmpty(updateSchedulePeriod)) { updateSchedulePeriod = TSLConfiguration.DEFAULT_UPDATE_SCHEDULE_PERIOD; - warn("config.39", new Object[] { "UpdateSchedule/Period", updateSchedulePeriod }); + debug("config.39", new Object[] { "UpdateSchedule/Period", updateSchedulePeriod }); } String updateScheduleStartTime = getElementValue(getConfigElem(), TSL_CONFIGURATION_XPATH + CONF + "UpdateSchedule/" + CONF + "StartTime", null); if (StringUtils.isEmpty(updateScheduleStartTime)) { updateScheduleStartTime = TSLConfiguration.DEFAULT_UPDATE_SCHEDULE_STARTTIME; - warn("config.39", new Object[] { "UpdateSchedule/StartTime", updateScheduleStartTime }); + debug("config.39", new Object[] { "UpdateSchedule/StartTime", updateScheduleStartTime }); } String workingDirectoryStr = getElementValue(getConfigElem(), TSL_CONFIGURATION_XPATH + CONF + "WorkingDirectory", null); if (StringUtils.isEmpty(workingDirectoryStr)) { workingDirectoryStr = TSLConfiguration.DEFAULT_WORKING_DIR; - warn("config.39", new Object[] { "WorkingDirectory", workingDirectoryStr }); + debug("config.39", new Object[] { "WorkingDirectory", workingDirectoryStr }); } // convert update schedule starting time to Date object diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationProvider.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationProvider.java index 2cad35763..87a4b50f4 100644 --- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationProvider.java +++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationProvider.java @@ -347,6 +347,8 @@ public class ConfigurationProvider try { builder = new ConfigurationPartsBuilder(configElem, configRoot); + tslconfiguration_ = builder.getTSLConfiguration(); + digestMethodAlgorithmName = builder.getDigestMethodAlgorithmName(); canonicalizationAlgorithmName = builder.getCanonicalizationAlgorithmName(); @@ -361,8 +363,6 @@ public class ConfigurationProvider keyGroupMappings = builder.buildKeyGroupMappings(keyGroups, ANONYMOUS_ISSUER_SERIAL); - tslconfiguration_ = builder.getTSLConfiguration(); - xadesVersion = builder.getXAdESVersion(); defaultChainingMode = builder.getDefaultChainingMode(); chainingModes = builder.buildChainingModes(); @@ -379,6 +379,7 @@ public class ConfigurationProvider revocationArchiveJDBCDriverClass_ = builder.getRevocationArchiveJDBCDriverClass(); + //check TSL configuration checkTSLConfiguration(); diff --git a/spss/server/serverws/pom.xml b/spss/server/serverws/pom.xml index 4372c76d0..0314cb454 100644 --- a/spss/server/serverws/pom.xml +++ b/spss/server/serverws/pom.xml @@ -22,7 +22,7 @@ org.apache.maven.plugins maven-war-plugin - 2.1.1 + 2.3 -- cgit v1.2.3