git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@33 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4

1 files changed, 18 insertions, 3 deletions

diff --git a/BKUOnline/src/main/java/at/gv/egiz/bku/online/conf/Configurator.java b/BKUOnline/src/main/java/at/gv/egiz/bku/online/conf/Configurator.java
index de577139..c09abcc1 100644
--- a/BKUOnline/src/main/java/at/gv/egiz/bku/online/conf/Configurator.java
+++ b/BKUOnline/src/main/java/at/gv/egiz/bku/online/conf/Configurator.java
@@ -17,8 +17,10 @@
 package at.gv.egiz.bku.online.conf;
 
 import iaik.security.ecc.provider.ECCProvider;
+import iaik.security.provider.IAIK;
 import iaik.xml.crypto.XSecProvider;
 
+import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.security.Provider;
 import java.security.Security;
@@ -29,22 +31,30 @@ import javax.net.ssl.HttpsURLConnection;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import at.gv.egiz.bku.binding.DataUrl;
+import at.gv.egiz.bku.binding.DataUrlConnection;
+import at.gv.egiz.bku.slcommands.impl.xsect.DataObject;
 import at.gv.egiz.bku.slcommands.impl.xsect.STALProvider;
-import iaik.security.provider.IAIK;
 
 /**
  * 
  * TODO currently only the code to get started.
  */
-public class Configurator {
+public abstract class Configurator {
 
 	private Log log = LogFactory.getLog(Configurator.class);
+	
+	private static Configurator instance = new SpringConfigurator();
 
 	protected Properties properties;
 
-	public Configurator() {
+	protected Configurator() {
 	}
 
+	public static Configurator getInstance() {
+	  return instance;
+	}
+	
 	protected void configUrlConnections() {
 		HttpsURLConnection.setFollowRedirects(false);
 		HttpURLConnection.setFollowRedirects(false);
@@ -65,9 +75,14 @@ public class Configurator {
 		log.debug(sb.toString());
 	}
 
+	protected void configViewer() {
+	  DataObject.enableHashDataInputValidation(Boolean.parseBoolean(properties.getProperty("ValidateHashDataInputs")));
+	}
+	
 	public void configure() {
 		configureProviders();
 		configUrlConnections();
+		configViewer();
 	}
 
 	public void setConfiguration(Properties props) {