POMs added to dependencies

maven-assembly-plugin version set to 2.2-beta-1 (for MOA-SPSS)
Update TSL parts

15 files changed, 116 insertions, 25 deletions

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 @@
 

     <properties>

         <repositoryPath>${basedir}/repository</repositoryPath>

+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

     </properties>

 

     <profiles>

@@ -64,7 +65,8 @@
             <plugin>

                 <inherited>false</inherited>

                 <artifactId>maven-assembly-plugin</artifactId>

-                <version>2.4</version>

+                <version>2.2-beta-1</version> 

+                <!-- TODO Update Version 2.2-beta-1 for MOA-SPSS -->

                 <configuration>

                     <finalName>moa</finalName>

                     <descriptors>

@@ -204,7 +206,7 @@
             <dependency>

                 <groupId>MOA.spss.server</groupId>

                 <artifactId>moa-spss-lib</artifactId>

-                <version>2.0.0</version>

+                <version>1.5.2</version>

                 <scope>compile</scope>

             </dependency>

             <dependency>

@@ -217,7 +219,7 @@
             <dependency>

                 <groupId>MOA.spss.server</groupId>

                 <artifactId>moa-spss-tools</artifactId>

-                <version>2.0.0</version>

+                <version>1.5.2</version>

                 <scope>test</scope>

              </dependency>

             <dependency>

@@ -354,7 +356,7 @@
    <dependency>

 			<groupId>iaik.prod</groupId>

 			<artifactId>iaik_tsl</artifactId>

-			<version>1.0</version>

+			<version>1.0.5</version>

 		</dependency>

 		<dependency>

 			<groupId>iaik.prod</groupId>

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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>iaik</groupId>
+  <artifactId>iaik_javax_crypto</artifactId>
+  <version>1.0</version>
+  <description>POM was created from install:install-file</description>
+</project>
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
--- 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
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>iaik</groupId>
+  <artifactId>iaik_jce_eval_signed</artifactId>
+  <version>3.181</version>
+  <description>POM was created from install:install-file</description>
+</project>
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>iaik</groupId>
+  <artifactId>iaik_jsse</artifactId>
+  <version>4.4</version>
+  <description>POM was created from install:install-file</description>
+</project>
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>iaik</groupId>
+  <artifactId>iaik_pki_module</artifactId>
+  <version>1.0</version>
+  <description>POM was created from install:install-file</description>
+</project>
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>iaik</groupId>
+  <artifactId>iaik_ssl</artifactId>
+  <version>4.4</version>
+  <description>POM was created from install:install-file</description>
+</project>
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
--- a/repository/iaik/iaik_util/0.23/iaik_util-0.23.jar
+++ b/repository/iaik/iaik_util/0.23/iaik_util-0.23.jar
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>iaik</groupId>
+  <artifactId>iaik_util</artifactId>
+  <version>0.23</version>
+  <description>POM was created from install:install-file</description>
+</project>
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>iaik</groupId>
+  <artifactId>iaik_xsect_eval</artifactId>
+  <version>1.1709142</version>
+  <description>POM was created from install:install-file</description>
+</project>
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>iaik</groupId>
+  <artifactId>w3c_http</artifactId>
+  <version>1.0</version>
+  <description>POM was created from install:install-file</description>
+</project>
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>