1 files changed, 34 insertions, 14 deletions

diff --git a/id.server/src/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java b/id.server/src/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
index a722868e0..d354ba910 100644
--- a/id.server/src/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
+++ b/id.server/src/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
@@ -88,12 +88,14 @@ public class AuthConfigurationProvider extends ConfigurationProvider {
 	 * multiple files can be given for different mime types
 	 */
   private String[] transformsInfoFileNames;
+  
 	/**
 	 * transformations for rendering in the secure viewer of the security layer implementation,
 	 * read from {@link transformsInfoFileNames};
 	 * multiple transformation can be given for different mime types
 	 */
   private String[] transformsInfos;
+  
   /**
    * parameters for connection to MOA SP component
    */
@@ -218,8 +220,8 @@ public class AuthConfigurationProvider extends ConfigurationProvider {
       bKUSelectable = (bKUConnectionParameter!=null);
       bKUSelectionType = builder.buildAuthBKUSelectionType();
 		  genericConfiguration = builder.buildGenericConfiguration();
-		  transformsInfoFileNames = builder.buildTransformsInfoFileNames();
-		  loadTransformsInfos();
+		  transformsInfoFileNames = builder.buildTransformsInfoFileNames(builder.getConfigElem(), ConfigurationBuilder.AUTH_SECLAYER_TRANSFORMS_INFO_FILENAME_XPATH);
+		  transformsInfos = builder.loadTransformsInfos(transformsInfoFileNames);
 	    moaSpConnectionParameter = builder.buildMoaSpConnectionParameter();
 	    moaSpIdentityLinkTrustProfileID = builder.getMoaSpIdentityLinkTrustProfileID();
 	    moaSpAuthBlockTrustProfileID = builder.getMoaSpAuthBlockTrustProfileID();
@@ -229,9 +231,9 @@ public class AuthConfigurationProvider extends ConfigurationProvider {
       defaultChainingMode = builder.getDefaultChainingMode();
       chainingModes = builder.buildChainingModes();  
       trustedCACertificates = builder.getTrustedCACertificates();
-      trustedCACertificates = FileUtils.makeAbsoluteURL(trustedCACertificates, rootConfigFileDir);    } 
+      trustedCACertificates = FileUtils.makeAbsoluteURL(trustedCACertificates, rootConfigFileDir);     
 
-    catch (Throwable t) {
+    } catch (Throwable t) {
       throw new ConfigurationException("config.02", null, t);
   	}
   }
@@ -240,17 +242,35 @@ public class AuthConfigurationProvider extends ConfigurationProvider {
    * Loads the <code>transformsInfos</code> from files.
    * @throws Exception on any exception thrown
    */
-  private void loadTransformsInfos() throws Exception {
-	 	
-	 	transformsInfos = new String[transformsInfoFileNames.length];
-  	for (int i = 0; i < transformsInfoFileNames.length; i++) {
-  		String fileURL = transformsInfoFileNames[i];
+//  private void loadTransformsInfos() throws Exception {
+//	 	
+//	 	transformsInfos = new String[transformsInfoFileNames.length];
+//  	for (int i = 0; i < transformsInfoFileNames.length; i++) {
+//  		String fileURL = transformsInfoFileNames[i];
+//
+//			//if fileURL is relative to rootConfigFileDir make it absolute 					
+//			fileURL = FileUtils.makeAbsoluteURL(fileURL, rootConfigFileDir);  		
+//			String transformsInfo = FileUtils.readURL(fileURL, DEFAULT_ENCODING);
+// 			transformsInfos[i] = transformsInfo;
+//  	}
+//  }
+  
+  /**
+   * Loads the <code>transformsInfos</code> from files.
+   * @throws Exception on any exception thrown
+   */
+  private String[] loadTransformsInfos(String[] transformsInfoFileNames) throws Exception {
+    
+    String[] transformsInfos = new String[transformsInfoFileNames.length];
+    for (int i = 0; i < transformsInfoFileNames.length; i++) {
+      String fileURL = transformsInfoFileNames[i];
 
-			//if fileURL is relative to rootConfigFileDir make it absolute 					
-			fileURL = FileUtils.makeAbsoluteURL(fileURL, rootConfigFileDir);  		
-			String transformsInfo = FileUtils.readURL(fileURL, DEFAULT_ENCODING);
- 			transformsInfos[i] = transformsInfo;
-  	}
+      //if fileURL is relative to rootConfigFileDir make it absolute          
+      fileURL = FileUtils.makeAbsoluteURL(fileURL, rootConfigFileDir);      
+      String transformsInfo = FileUtils.readURL(fileURL, DEFAULT_ENCODING);
+      transformsInfos[i] = transformsInfo;
+    }
+    return transformsInfos;
   }
   /**
    * Return a string array with all filenames leading