A lot of moa sig stuff

1 files changed, 18 insertions, 5 deletions

diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationProvider.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationProvider.java
index 578f2fd..d777d8f 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationProvider.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationProvider.java
@@ -46,11 +46,11 @@ import java.util.Set;
 
 import org.w3c.dom.Element;
 
-import at.gv.egovernment.moa.logging.LogMsg;
-import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.spss.api.common.TSLConfiguration;
 import at.gv.egovernment.moa.spss.util.MessageProvider;
-import at.gv.egovernment.moa.util.DOMUtils;
+import at.gv.egovernment.moaspss.logging.LogMsg;
+import at.gv.egovernment.moaspss.logging.Logger;
+import at.gv.egovernment.moaspss.util.DOMUtils;
 
 /**
  * A class providing access to the MOA configuration data.
@@ -107,6 +107,9 @@ public class ConfigurationProvider
   /** PDF AS Configuration */
   private String pdfAsConfiguration;
   
+  private int connectionTimeout;
+  private int readTimeout;
+  
   /** 
    * A <code>List</code> of <code>HardwareCryptoModule</code> objects for 
    * configuring hardware modules.
@@ -376,6 +379,8 @@ public class ConfigurationProvider
       keyGroupMappings =
         builder.buildKeyGroupMappings(keyGroups, ANONYMOUS_ISSUER_SERIAL);
       
+      connectionTimeout = builder.getConnectionTimeout();
+      readTimeout = builder.getReadTimeout();
       pdfAsConfiguration = builder.getPDFASConfiguration();
       adesFormResults = builder.getAdesFormResult();
       xadesVersion = builder.getXAdESVersion();
@@ -553,8 +558,16 @@ public class ConfigurationProvider
   }
   
   public String getPDFASConfiguration() {
-	    return pdfAsConfiguration;
-	  }
+	return pdfAsConfiguration;
+  }
+  
+  public int getConnectionTimeout() {
+	  return this.connectionTimeout;
+  }
+  
+  public int getReadTimeout() {
+	  return this.readTimeout;
+  }
  
   public boolean getAdesFormResults() {
 	  return this.adesFormResults;