1 files changed, 34 insertions, 29 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 d777d8f..79ef1d2 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
@@ -51,6 +51,7 @@ import at.gv.egovernment.moa.spss.util.MessageProvider;
 import at.gv.egovernment.moaspss.logging.LogMsg;
 import at.gv.egovernment.moaspss.logging.Logger;
 import at.gv.egovernment.moaspss.util.DOMUtils;
+import at.gv.egovernment.moaspss.util.MiscUtil;
 
 /**
  * A class providing access to the MOA configuration data.
@@ -354,17 +355,17 @@ public class ConfigurationProvider
     // build the internal datastructures
     try {
       builder = new ConfigurationPartsBuilder(configElem, configRoot);
+
+      //build TSL configuration
+      tslconfiguration_ = builder.getTSLConfiguration();
       
-      if (builder.checkTrustProfilesTSLenabled()) {
-    	  debug("TSL support enabled for at least one trustprofile.");
-    	  tslconfiguration_ = builder.getTSLConfiguration();
-    	  trustProfiles = builder.buildTrustProfiles(tslconfiguration_.getWorkingDirectory());
-      }
-      else {
-    	  tslconfiguration_ = null;
-    	  trustProfiles = builder.buildTrustProfiles();
-      }
+      //build TrustProfile configuration
+   	  trustProfiles = builder.buildTrustProfiles();
       
+      //check TSL configuration
+      checkTSLConfiguration();
+   	  
+   	  
       digestMethodAlgorithmName = builder.getDigestMethodAlgorithmName();
       canonicalizationAlgorithmName =
         builder.getCanonicalizationAlgorithmName();
@@ -401,13 +402,10 @@ public class ConfigurationProvider
       revocationArchiveJDBCDriverClass_ = builder.getRevocationArchiveJDBCDriverClass();
       
       
-      
-      //check TSL configuration
-      checkTSLConfiguration();
-      
+      //TODO!!!!
+      certStoreLocation_ = builder.getCertStoreLocation();
       
       
-      certStoreLocation_ = builder.getCertStoreLocation();
       createTransformsInfoProfiles = builder.buildCreateTransformsInfoProfiles();
       createSignatureEnvironmentProfiles = builder.buildCreateSignatureEnvironmentProfiles();
       verifyTransformsInfoProfiles = builder.buildVerifyTransformsInfoProfiles();
@@ -451,19 +449,19 @@ public class ConfigurationProvider
     }
   }
   
-  private boolean checkTSLenableTrustprofilesExist()throws ConfigurationException {
-	  boolean bTSLEnabledTPExist = false;
-	  Iterator it = trustProfiles.entrySet().iterator();
-	  while (it.hasNext()) {
-	      Map.Entry pairs = (Map.Entry)it.next();
-	      TrustProfile tp = (TrustProfile) pairs.getValue();
-	      if (tp.isTSLEnabled())
-	    	  bTSLEnabledTPExist = bTSLEnabledTPExist || true;
-	  }
-	  
-	  return bTSLEnabledTPExist;
-	  
-  }
+//  private boolean checkTSLenableTrustprofilesExist()throws ConfigurationException {
+//	  boolean bTSLEnabledTPExist = false;
+//	  Iterator it = trustProfiles.entrySet().iterator();
+//	  while (it.hasNext()) {
+//	      Map.Entry pairs = (Map.Entry)it.next();
+//	      TrustProfile tp = (TrustProfile) pairs.getValue();
+//	      if (tp.isTSLEnabled())
+//	    	  bTSLEnabledTPExist = bTSLEnabledTPExist || true;
+//	  }
+//	  
+//	  return bTSLEnabledTPExist;
+//	  
+//  }
   
   private void  checkTSLConfiguration() throws ConfigurationException {
 	  boolean bTSLEnabledTPExist = false;
@@ -516,7 +514,7 @@ public class ConfigurationProvider
           return;  
       }
 
-      System.setProperty("iaik.xml.crypto.tsl.BinaryHashCache.DIR", hashcache.getAbsolutePath());
+//      System.setProperty("iaik.xml.crypto.tsl.BinaryHashCache.DIR", hashcache.getAbsolutePath());
 //    String hashcachedir = System.getProperty("iaik.xml.crypto.tsl.BinaryHashCache.DIR");
 //    System.out.println("Hashcache: " + hashcachedir);
 
@@ -826,7 +824,14 @@ public class ConfigurationProvider
    * <code>null</code>, if none exists.
    */
   public TrustProfile getTrustProfile(String id) {
-    return (TrustProfile) trustProfiles.get(id);
+
+	  if (MiscUtil.isNotEmpty(id)) {	  
+		  id = id.trim().toLowerCase();
+		  return (TrustProfile) trustProfiles.get(id);
+		  
+	  }
+	  
+	  return null;
   }
   
   /**