From 9f6a8a59fe28702e097c23c8b8bee4123b1af12d Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Mon, 17 Mar 2014 18:51:20 +0100
Subject: solve legacy configuration import error

---
 .../moa/id/config/legacy/BuildFromLegacyConfig.java   | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'id/server/idserverlib/src/main/java/at/gv/egovernment')

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/legacy/BuildFromLegacyConfig.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/legacy/BuildFromLegacyConfig.java
index 68d934036..e6e77911a 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/legacy/BuildFromLegacyConfig.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/legacy/BuildFromLegacyConfig.java
@@ -28,6 +28,7 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigInteger;
+import java.net.URI;
 import java.net.URL;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -241,8 +242,9 @@ public class BuildFromLegacyConfig {
 	    		for (int i=0; i<transformsInfos.length; i++) {
 
 	    			TransformsInfoType transforminfotype = new TransformsInfoType();
-	    				    			
-	    			Path fileName_ = new File(transformsInfoFileNames[i]).toPath().getFileName();	    				    			
+	    			
+	    			String fileURL = FileUtils.makeAbsoluteURL(transformsInfoFileNames[i], rootConfigFileDir);	    			    			
+	    			Path fileName_ = new File(new URI(fileURL)).toPath().getFileName();
 	    			transforminfotype.setFilename(fileName_.toString());
 	    		
 	    			transforminfotype.setTransformation(Base64Utils.encode(transformsInfos[i].getBytes("UTF-8")).getBytes("UTF-8"));
@@ -398,15 +400,14 @@ public class BuildFromLegacyConfig {
 	        	templates.setTemplate(template_list);
 	        	
 	        	
-	        	//set TransformsInfo
+	        	//TransformsInfo not supported by MOAID 2.0
 	        	String[] transforminfos = oa.getTransformsInfos();
-	        	ArrayList<TransformsInfoType> oa_transforminfos = new ArrayList<TransformsInfoType>();
-	        	for (String e1 : transforminfos) {
-	        		TransformsInfoType transforminfo = new TransformsInfoType();
-	        		transforminfo.setFilename(e1);
-	        		oa_transforminfos.add(transforminfo);
+	        	for (String e1 : transforminfos) {	        		
+	        		if (MiscUtil.isNotEmpty(e1)) {
+	        			Logger.warn("OA specific transformation for OA " + oa.getPublicURLPrefix()
+	        					+ " are not supported. USE AdditionalAuthBlock text!");
+	        		}
 	        	}
-	        	oa_auth.setTransformsInfo(oa_transforminfos);
 	        	
 	        	//VerifyInfoBoxes not supported by MOAID 2.0
 	        	
-- 
cgit v1.2.3