From 6cc5cd2311c9e6cde062fa4034444969f9c293e0 Mon Sep 17 00:00:00 2001
From: Klaus Stranacher <kstranacher@iaik.tugraz.at>
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

---
 .../server/config/ConfigurationPartsBuilder.java   | 24 ++++++++++++++++++----
 .../spss/server/config/ConfigurationProvider.java  |  5 +++--
 spss/server/serverws/pom.xml                       |  2 +-
 3 files changed, 24 insertions(+), 7 deletions(-)

(limited to 'spss/server')

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 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>2.1.1</version>
+                <version>2.3</version>
                 <!-- <version>2.0.2</version>-->
                 <configuration>
                     <archive>
-- 
cgit v1.2.3