Configuration Tool Update and Bugfix

 -- Username/Password login update
 -- EditUser, insert second password textfield
 -- OAConfig: insert OA specific SecurityLayer Templates
 -- OAConfig: SecurityLayer Version only for admin

1 files changed, 94 insertions, 21 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAGeneralConfig.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAGeneralConfig.java
index 129d62346..57ae4863a 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAGeneralConfig.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAGeneralConfig.java
@@ -41,9 +41,7 @@ public class OAGeneralConfig {
 	private String identificationType = null;
 	
 	private String aditionalAuthBlockText = null;
-	
-	//TODO: look Template!!!
-	
+		
 	private String mandateProfiles = null;
 	
 	private boolean isActive = false;
@@ -55,8 +53,9 @@ public class OAGeneralConfig {
 	private String keyBoxIdentifier = null;
 	private static Map<String, String> keyBoxIdentifierList;
 	
-	private String templateURL = null;
-	
+	private boolean legacy = false;
+	List<String> SLTemplates = null;
+		
 	private Map<String, byte[]> transformations;
 	
 
@@ -141,12 +140,21 @@ public class OAGeneralConfig {
 			TemplatesType templates = oaauth.getTemplates();
 			if (templates != null) {
 				aditionalAuthBlockText = templates.getAditionalAuthBlockText();
-				TemplateType templatetype = templates.getTemplate();
+				List<TemplateType> templatetype = templates.getTemplate();
 				
 				if (templatetype != null) {
-					templateURL = templatetype.getURL();
+					if (SLTemplates == null) {
+						SLTemplates = new ArrayList<String>();
+					}
+
+					for (TemplateType el : templatetype) {
+						SLTemplates.add(el.getURL());
+					}
 				}
 			}
+		
+			if (SLTemplates != null && SLTemplates.size() > 0)
+				legacy = true;
 			
 			List<TransformsInfoType> transforminfos = oaauth.getTransformsInfo();
 			transformations = new HashMap<String, byte[]>();
@@ -306,20 +314,6 @@ public class OAGeneralConfig {
 	}
 	
 	/**
-	 * @return the templateURL
-	 */
-	public String getTemplateURL() {
-		return templateURL;
-	}
-
-	/**
-	 * @param templateURL the templateURL to set
-	 */
-	public void setTemplateURL(String templateURL) {
-		this.templateURL = templateURL;
-	}
-
-	/**
 	 * @return the transformations
 	 */
 	public Map<String, byte[]> getTransformations() {
@@ -388,6 +382,85 @@ public class OAGeneralConfig {
 		keyBoxIdentifierList = list;
 	}
 
+
+	/**
+	 * @return the legacy
+	 */
+	public boolean isLegacy() {
+		return legacy;
+	}
+
+
+	/**
+	 * @param legacy the legacy to set
+	 */
+	public void setLegacy(boolean legacy) {
+		this.legacy = legacy;
+	}
+
+
+	/**
+	 * @return the sLTemplateURL1
+	 */
+	public String getSLTemplateURL1() {
+		if (SLTemplates != null && SLTemplates.size() > 0)
+			return SLTemplates.get(0);
+		else
+			return null;
+	}
+
+
+	/**
+	 * @param sLTemplateURL1 the sLTemplateURL1 to set
+	 */
+	public void setSLTemplateURL1(String sLTemplateURL1) {
+		if (SLTemplates == null)
+			SLTemplates = new ArrayList<String>();
+		SLTemplates.add(sLTemplateURL1);
+	}
+
+
+	/**
+	 * @return the sLTemplateURL2
+	 */
+	public String getSLTemplateURL2() {
+		if (SLTemplates != null && SLTemplates.size() > 1)
+			return SLTemplates.get(1);
+		else
+			return null;
+	}
+
+
+	/**
+	 * @param sLTemplateURL2 the sLTemplateURL2 to set
+	 */
+	public void setSLTemplateURL2(String sLTemplateURL2) {
+		if (SLTemplates == null)
+			SLTemplates = new ArrayList<String>();
+		SLTemplates.add(sLTemplateURL2);
+	}
+
+
+	/**
+	 * @return the sLTemplateURL3
+	 */
+	public String getSLTemplateURL3() {
+		if (SLTemplates != null && SLTemplates.size() > 2)
+			return SLTemplates.get(2);
+		else
+			return null;
+	}
+
+
+	/**
+	 * @param sLTemplateURL3 the sLTemplateURL3 to set
+	 */
+	public void setSLTemplateURL3(String sLTemplateURL3) {
+		if (SLTemplates == null)
+			SLTemplates = new ArrayList<String>();
+		SLTemplates.add(sLTemplateURL3);
+	}
+
 	
 	
 }