From 5304a281d530abbe2aa57dc2583bc72d7988c949 Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Thu, 20 Feb 2014 14:57:42 +0100
Subject: config gui for vidp mockups

---
 .../data/oa/AttributeProviderPlugin.java           | 24 +++++++++++++++++
 .../id/configuration/data/oa/OASTORKConfig.java    | 12 +++++++++
 .../main/resources/applicationResources.properties |  8 +++++-
 id/ConfigWebTool/src/main/webapp/js/common.js      | 11 ++++++++
 .../src/main/webapp/jsp/editOAGeneral.jsp          | 30 ++++++++++++++++++++++
 5 files changed, 84 insertions(+), 1 deletion(-)
 create mode 100644 id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/AttributeProviderPlugin.java

(limited to 'id/ConfigWebTool/src')

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/AttributeProviderPlugin.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/AttributeProviderPlugin.java
new file mode 100644
index 000000000..275bc81c4
--- /dev/null
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/AttributeProviderPlugin.java
@@ -0,0 +1,24 @@
+package at.gv.egovernment.moa.id.configuration.data.oa;
+
+import at.gv.egovernment.moa.id.protocols.stork2.StorkAttributeRequestProvider;
+
+public class AttributeProviderPlugin {
+	private String url = "demourl";
+	private Class plugin = StorkAttributeRequestProvider.class;
+	
+	public String getUrl() {
+		return url;
+	}
+	
+	public void setUrl(String url) {
+		this.url = url;
+	}
+	
+	public Class getPlugin() {
+		return plugin;
+	}
+	
+	public void setPlugin(Class plugin) {
+		this.plugin = plugin;
+	}
+}
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
index da07b10b0..f084115c4 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
@@ -126,4 +126,16 @@ public class OASTORKConfig {
 	public void setHelperAttributes(List<AttributeHelper> attributes) {
 		this.attributes = attributes;
 	}
+
+
+	public List<AttributeProviderPlugin> getAttributeProviderPlugins() {
+		List<AttributeProviderPlugin> result = new ArrayList<AttributeProviderPlugin>();
+		result.add(new AttributeProviderPlugin());
+
+		return result;
+	}
+
+	public boolean isVidpEnabled() {
+		return true;
+	}
 }
diff --git a/id/ConfigWebTool/src/main/resources/applicationResources.properties b/id/ConfigWebTool/src/main/resources/applicationResources.properties
index 4a99ab664..313f9f2be 100644
--- a/id/ConfigWebTool/src/main/resources/applicationResources.properties
+++ b/id/ConfigWebTool/src/main/resources/applicationResources.properties
@@ -198,7 +198,8 @@ webpages.oaconfig.menu.pvp2.show=PVP2 Konfiguration einblenden
 webpages.oaconfig.menu.pvp2.hidden=PVP2 Konfiguration ausblenden
 webpages.oaconfig.menu.oauth20.show=OAuth 2.0 Konfiguration einblenden
 webpages.oaconfig.menu.oauth20.hidden=OAuth 2.0 Konfiguration ausblenden
-
+webpages.oaconfig.menu.vidp.show=VIDP Konfiguration einblenden
+webpages.oaconfig.menu.vidp.hidden=VIDP Konfiguration ausblenden
 
 webpages.oaconfig.menu.stork=STORK Konfiguration
 
@@ -258,6 +259,11 @@ webpages.oaconfig.oauth20.clientId=Client ID
 webpages.oaconfig.oauth20.clientSecret=Client Passwort
 webpages.oaconfig.oauth20.redirectUri=Redirect Uri 
 
+webpages.oaconfig.vidp.enabled=VIDP interface aktiv
+webpages.oaconfig.vidp.ap.new=Neuen Attribut Provider erstellen
+webpages.oaconfig.vidp.ap.remove=Entfernen
+webpages.oaconfig.vidp.ap.list=Liste der konfigurierten Attribut Provider
+
 		
 message.title=Meldung:
 webpages.oaconfig.success=Die Online-Applikation {0} konnte erfolgreich gespeichert werden.
diff --git a/id/ConfigWebTool/src/main/webapp/js/common.js b/id/ConfigWebTool/src/main/webapp/js/common.js
index 384e40509..d9089243f 100644
--- a/id/ConfigWebTool/src/main/webapp/js/common.js
+++ b/id/ConfigWebTool/src/main/webapp/js/common.js
@@ -51,6 +51,17 @@ function oaStork() {
 		$('#stork_block').css('display', "none");
 	}
 }
+function oaVIDP() {
+	if ($('#oa_vidp_area').css('display') == "block") {
+		$('#oa_vidp_area').css('display', "none");
+		$('#button_vidp_show').css('display', "block");
+		$('#button_vidp_hidden').css('display', "none");
+	} else {
+		$('#oa_vidp_area').css('display', "block");
+		$('#button_vidp_show').css('display', "none");
+		$('#button_vidp_hidden').css('display', "block");
+	}
+}
 function oaSAML1() {
 	if ($('#oa_saml1_area').css('display') == "block") {
 		$('#oa_saml1_area').css('display', "none");
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
index 4e8dfc259..18d703eae 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -340,6 +340,13 @@
 								<button type="button" class="oa_buttons" onclick="oaSAML1();" id="button_saml1_hidden">
 									<%=LanguageHelper.getGUIString("webpages.oaconfig.menu.saml1.hidden", request) %>
 								</button>
+								
+								<button  type="button" class="oa_buttons" onclick="oaVIDP();" id="button_vidp_show">
+									<%=LanguageHelper.getGUIString("webpages.oaconfig.menu.vidp.show", request) %>
+								</button>
+								<button type="button" style="display:none" class="oa_buttons" onclick="oaVIDP();" id="button_vidp_hidden">
+									<%=LanguageHelper.getGUIString("webpages.oaconfig.menu.vidp.hidden", request) %>
+								</button>
 							</s:if>
 							
 							<button type="button" class="oa_buttons" onclick="oaPVP2();" id="button_pvp2_show">
@@ -447,6 +454,29 @@
 								cssClass="textfield_long">
 							</s:textfield>
 						</div>
+						
+											
+						<div id="oa_vidp_area" class="oa_protocol_area">
+							<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.stork.header", request) %></h4>
+	
+							<p><s:checkbox name="storkOA.vidpEnabled" 
+								value="%{storkOA.vidpEnabled}"
+								labelposition="left"
+								key="webpages.oaconfig.vidp.enabled"
+								cssClass="checkbox"
+								id="OAuseVidp" /></p>
+							<h5><%=LanguageHelper.getGUIString("webpages.oaconfig.vidp.ap.list", request) %></h5>
+							<table id="stork_aplist">
+								<tr><th>AP Plugin</th><th>URL</th>
+								<s:iterator value="storkOA.attributeProviderPlugins" status="stat">
+								  <tr><td><s:textfield name="storkOA.attributeProviderPlugins[%{#stat.index}].plugin.name" value="%{plugin.name}" cssClass="textfield"/></td>
+								      <td><s:textfield name="storkOA.attributeProviderPlugins[%{#stat.index}].url" value="%{url}" cssClass="textfield"/></td>
+								      <td><input type="button" value="<%=LanguageHelper.getGUIString("webpages.oaconfig.vidp.ap.remove", request) %>" onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/></td></tr>
+								</s:iterator>
+							</table>
+							<input type="button" value="<%=LanguageHelper.getGUIString("webpages.oaconfig.vidp.ap.new", request) %>" onclick='newAp();' />
+								
+						</div>
 					</div>
 
 
-- 
cgit v1.2.3


From ea9d46e1fb39ad31d9bfe6226442b71b8bb11539 Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Thu, 20 Feb 2014 15:09:55 +0100
Subject: available attribute provider dropdown selection

---
 .../gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java | 7 +++++++
 id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp             | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'id/ConfigWebTool/src')

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
index f084115c4..99d783f4f 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
@@ -128,6 +128,13 @@ public class OASTORKConfig {
 	}
 
 
+	public List<String> getAvailableAttributeProviderPlugins() {
+		List<String> result = new ArrayList<String>();
+		result.add(new AttributeProviderPlugin().getPlugin().getSimpleName());
+		
+		return result;
+	}
+	
 	public List<AttributeProviderPlugin> getAttributeProviderPlugins() {
 		List<AttributeProviderPlugin> result = new ArrayList<AttributeProviderPlugin>();
 		result.add(new AttributeProviderPlugin());
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
index 18d703eae..5fce15f5c 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -469,7 +469,7 @@
 							<table id="stork_aplist">
 								<tr><th>AP Plugin</th><th>URL</th>
 								<s:iterator value="storkOA.attributeProviderPlugins" status="stat">
-								  <tr><td><s:textfield name="storkOA.attributeProviderPlugins[%{#stat.index}].plugin.name" value="%{plugin.name}" cssClass="textfield"/></td>
+								  <tr><td><s:select name="storkOA.attributeProviderPlugins[%{#stat.index}].plugin.name" value="%{plugin.name}" list="%{storkOA.availableAttributeProviderPlugins}"/></td>
 								      <td><s:textfield name="storkOA.attributeProviderPlugins[%{#stat.index}].url" value="%{url}" cssClass="textfield"/></td>
 								      <td><input type="button" value="<%=LanguageHelper.getGUIString("webpages.oaconfig.vidp.ap.remove", request) %>" onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/></td></tr>
 								</s:iterator>
-- 
cgit v1.2.3


From 2aeec6f82e0e44888d37167cc917d03a076bdbf7 Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Thu, 20 Feb 2014 15:48:58 +0100
Subject: add new ap configuration entry

---
 id/ConfigWebTool/src/main/webapp/js/common.js | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'id/ConfigWebTool/src')

diff --git a/id/ConfigWebTool/src/main/webapp/js/common.js b/id/ConfigWebTool/src/main/webapp/js/common.js
index d9089243f..45f40f5b8 100644
--- a/id/ConfigWebTool/src/main/webapp/js/common.js
+++ b/id/ConfigWebTool/src/main/webapp/js/common.js
@@ -235,4 +235,13 @@ function newStorkAttribute() {
 	clone.innerHTML = clone.innerHTML.replace(/name="storkconfig.attributes\[\d/g, 'name="storkconfig.attributes[' + nextindex);
 	clone.innerHTML = clone.innerHTML.replace(/(.*" value=").*?(".*)/g, '$1$2');
 	target.parentNode.appendChild(clone);
+}
+function newAp() {
+	var target = $(document.getElementById("stork_aplist").getElementsByTagName("tr")).last()[0];
+	var clone = target.cloneNode(true);
+	var lastindex = parseInt(clone.innerHTML.match(/name="storkOA.attributeProviderPlugins\[(\d)/)[1]);
+	var nextindex = lastindex + 1;
+	clone.innerHTML = clone.innerHTML.replace(/name="storkOA.attributeProviderPlugins\[\d/g, 'name="storkOA.attributeProviderPlugins[' + nextindex);
+	clone.innerHTML = clone.innerHTML.replace(/(.*" value=").*?(".*)/g, '$1$2');
+	target.parentNode.appendChild(clone);
 }
\ No newline at end of file
-- 
cgit v1.2.3


From 44b1f27b00306cac728f6921befd0c1eddb97f81 Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Thu, 20 Feb 2014 16:23:43 +0100
Subject: drafted config saving

---
 .../data/oa/AttributeProviderPlugin.java           |  8 +++----
 .../id/configuration/data/oa/OASTORKConfig.java    | 26 +++++++++++++++++-----
 .../src/main/webapp/jsp/editOAGeneral.jsp          |  2 +-
 3 files changed, 24 insertions(+), 12 deletions(-)

(limited to 'id/ConfigWebTool/src')

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/AttributeProviderPlugin.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/AttributeProviderPlugin.java
index 275bc81c4..00b7b09ce 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/AttributeProviderPlugin.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/AttributeProviderPlugin.java
@@ -1,10 +1,8 @@
 package at.gv.egovernment.moa.id.configuration.data.oa;
 
-import at.gv.egovernment.moa.id.protocols.stork2.StorkAttributeRequestProvider;
-
 public class AttributeProviderPlugin {
 	private String url = "demourl";
-	private Class plugin = StorkAttributeRequestProvider.class;
+	private String plugin = "demo";
 	
 	public String getUrl() {
 		return url;
@@ -14,11 +12,11 @@ public class AttributeProviderPlugin {
 		this.url = url;
 	}
 	
-	public Class getPlugin() {
+	public String getPlugin() {
 		return plugin;
 	}
 	
-	public void setPlugin(Class plugin) {
+	public void setPlugin(String plugin) {
 		this.plugin = plugin;
 	}
 }
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
index 99d783f4f..23181076a 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
@@ -77,6 +77,10 @@ public class OASTORKConfig {
 
 					attributes.add(tmp);
 				}
+				
+				// fetch vidp config
+				attributeProviderPlugins = new ArrayList<AttributeProviderPlugin>();
+				attributeProviderPlugins.add(new AttributeProviderPlugin());
 			}
 		}
 	}
@@ -126,7 +130,12 @@ public class OASTORKConfig {
 	public void setHelperAttributes(List<AttributeHelper> attributes) {
 		this.attributes = attributes;
 	}
-
+	
+	/*
+	 * VIDP settings below
+	 */
+	private boolean vidpEnabled = false;
+	private List<AttributeProviderPlugin> attributeProviderPlugins;
 
 	public List<String> getAvailableAttributeProviderPlugins() {
 		List<String> result = new ArrayList<String>();
@@ -136,13 +145,18 @@ public class OASTORKConfig {
 	}
 	
 	public List<AttributeProviderPlugin> getAttributeProviderPlugins() {
-		List<AttributeProviderPlugin> result = new ArrayList<AttributeProviderPlugin>();
-		result.add(new AttributeProviderPlugin());
-
-		return result;
+		return attributeProviderPlugins;
+	}
+	
+	public void setAttributeProviderPlugins(List<AttributeProviderPlugin> update) {
+		attributeProviderPlugins = update;
 	}
 
 	public boolean isVidpEnabled() {
-		return true;
+		return vidpEnabled;
+	}
+	
+	public void setVidpEnabled(boolean update) {
+		vidpEnabled = update;
 	}
 }
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
index 5fce15f5c..e783d753d 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -469,7 +469,7 @@
 							<table id="stork_aplist">
 								<tr><th>AP Plugin</th><th>URL</th>
 								<s:iterator value="storkOA.attributeProviderPlugins" status="stat">
-								  <tr><td><s:select name="storkOA.attributeProviderPlugins[%{#stat.index}].plugin.name" value="%{plugin.name}" list="%{storkOA.availableAttributeProviderPlugins}"/></td>
+								  <tr><td><s:select name="storkOA.attributeProviderPlugins[%{#stat.index}].plugin" value="%{plugin}" list="%{storkOA.availableAttributeProviderPlugins}"/></td>
 								      <td><s:textfield name="storkOA.attributeProviderPlugins[%{#stat.index}].url" value="%{url}" cssClass="textfield"/></td>
 								      <td><input type="button" value="<%=LanguageHelper.getGUIString("webpages.oaconfig.vidp.ap.remove", request) %>" onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/></td></tr>
 								</s:iterator>
-- 
cgit v1.2.3


From 42c8940c7b813744933d261e4c414f17762062cd Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Thu, 20 Feb 2014 16:57:14 +0100
Subject: ap plugins are persisted now

---
 .../data/oa/AttributeProviderPlugin.java           | 22 ----------------------
 .../id/configuration/data/oa/OASTORKConfig.java    | 12 ++++++++++--
 .../configuration/struts/action/EditOAAction.java  |  2 ++
 3 files changed, 12 insertions(+), 24 deletions(-)
 delete mode 100644 id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/AttributeProviderPlugin.java

(limited to 'id/ConfigWebTool/src')

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/AttributeProviderPlugin.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/AttributeProviderPlugin.java
deleted file mode 100644
index 00b7b09ce..000000000
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/AttributeProviderPlugin.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package at.gv.egovernment.moa.id.configuration.data.oa;
-
-public class AttributeProviderPlugin {
-	private String url = "demourl";
-	private String plugin = "demo";
-	
-	public String getUrl() {
-		return url;
-	}
-	
-	public void setUrl(String url) {
-		this.url = url;
-	}
-	
-	public String getPlugin() {
-		return plugin;
-	}
-	
-	public void setPlugin(String plugin) {
-		this.plugin = plugin;
-	}
-}
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
index 23181076a..72fc6e3a1 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
@@ -26,6 +26,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import at.gv.egovernment.moa.id.commons.db.ConfigurationDBRead;
+import at.gv.egovernment.moa.id.commons.db.dao.config.AttributeProviderPlugin;
 import at.gv.egovernment.moa.id.commons.db.dao.config.AuthComponentOA;
 import at.gv.egovernment.moa.id.commons.db.dao.config.OASTORK;
 import at.gv.egovernment.moa.id.commons.db.dao.config.OAStorkAttribute;
@@ -79,8 +80,15 @@ public class OASTORKConfig {
 				}
 				
 				// fetch vidp config
-				attributeProviderPlugins = new ArrayList<AttributeProviderPlugin>();
-				attributeProviderPlugins.add(new AttributeProviderPlugin());
+				setVidpEnabled(config.isVidpEnabled());
+
+				attributeProviderPlugins = config.getAttributeProviders();
+				// - if no attribute providers are configured, add a dummy
+				// TODO this is a dirty hack since we have to have one entry to
+				// clone from in the web form. Happens when time is short.
+				// Sorry.
+				if (attributeProviderPlugins.isEmpty())
+					attributeProviderPlugins.add(new AttributeProviderPlugin());
 			}
 		}
 	}
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
index 775443689..c257c76c8 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
@@ -984,6 +984,8 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware,
 		stork.setStorkLogonEnabled(storkOA.isStorkLogonEnabled());
 		stork.setQaa(storkOA.getQaa());
 		stork.setOAAttributes(storkOA.getAttributes());
+		stork.setVidpEnabled(storkOA.isVidpEnabled());
+		stork.setAttributeProviders(storkOA.getAttributeProviderPlugins());
 
 		try {
 			if (newentry) {
-- 
cgit v1.2.3


From 4c2406224be2df8b09050178630cdcff979c5ebf Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Mon, 24 Feb 2014 11:42:44 +0100
Subject: introduced attributeproviderfactory

---
 .../gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'id/ConfigWebTool/src')

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
index 72fc6e3a1..430bafbf5 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
@@ -24,7 +24,6 @@ package at.gv.egovernment.moa.id.configuration.data.oa;
 
 import java.util.ArrayList;
 import java.util.List;
-
 import at.gv.egovernment.moa.id.commons.db.ConfigurationDBRead;
 import at.gv.egovernment.moa.id.commons.db.dao.config.AttributeProviderPlugin;
 import at.gv.egovernment.moa.id.commons.db.dao.config.AuthComponentOA;
@@ -32,6 +31,7 @@ import at.gv.egovernment.moa.id.commons.db.dao.config.OASTORK;
 import at.gv.egovernment.moa.id.commons.db.dao.config.OAStorkAttribute;
 import at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplication;
 import at.gv.egovernment.moa.id.commons.db.dao.config.StorkAttribute;
+import at.gv.egovernment.moa.id.protocols.stork2.AttributeProviderFactory;
 
 public class OASTORKConfig {
 
@@ -146,10 +146,7 @@ public class OASTORKConfig {
 	private List<AttributeProviderPlugin> attributeProviderPlugins;
 
 	public List<String> getAvailableAttributeProviderPlugins() {
-		List<String> result = new ArrayList<String>();
-		result.add(new AttributeProviderPlugin().getPlugin().getSimpleName());
-		
-		return result;
+		return AttributeProviderFactory.getAvailablePlugins();
 	}
 	
 	public List<AttributeProviderPlugin> getAttributeProviderPlugins() {
-- 
cgit v1.2.3


From e220daf9bc0eac36c3e20406865f99f4760a30d3 Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Tue, 25 Feb 2014 08:45:04 +0100
Subject: config validators

---
 .../validation/oa/OASTORKConfigValidation.java             | 14 ++++++++++++++
 .../src/main/resources/applicationResources.properties     |  2 ++
 2 files changed, 16 insertions(+)

(limited to 'id/ConfigWebTool/src')

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OASTORKConfigValidation.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OASTORKConfigValidation.java
index f72999020..25e0d751c 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OASTORKConfigValidation.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OASTORKConfigValidation.java
@@ -27,8 +27,11 @@ import java.util.List;
 
 import org.apache.log4j.Logger;
 
+import at.gv.egovernment.moa.id.commons.db.dao.config.AttributeProviderPlugin;
 import at.gv.egovernment.moa.id.configuration.data.oa.OASTORKConfig;
 import at.gv.egovernment.moa.id.configuration.helper.LanguageHelper;
+import at.gv.egovernment.moa.id.configuration.validation.ValidationHelper;
+import at.gv.egovernment.moa.util.MiscUtil;
 
 public class OASTORKConfigValidation {
 
@@ -45,6 +48,17 @@ public class OASTORKConfigValidation {
 			errors.add(LanguageHelper.getErrorString("validation.stork.qaa.outofrange",
 					new Object[] {qaa} ));
 		}
+		
+		for(AttributeProviderPlugin current : oageneral.getAttributeProviderPlugins()) {
+			if (MiscUtil.isEmpty(current.getUrl()) || !ValidationHelper.validateURL(current.getUrl())) {
+				log.info("AttributeProviderPlugin URL has no valid form.");
+				errors.add(LanguageHelper.getErrorString("validation.stork.ap.url.valid"));
+			}
+			if (MiscUtil.isEmpty(current.getName())) {
+				log.info("AttributeProviderPlugin Name is empty.");
+				errors.add(LanguageHelper.getErrorString("validation.stork.ap.name.valid"));
+			}
+		}
 
 		return errors;
 	}
diff --git a/id/ConfigWebTool/src/main/resources/applicationResources.properties b/id/ConfigWebTool/src/main/resources/applicationResources.properties
index 313f9f2be..c6a88510a 100644
--- a/id/ConfigWebTool/src/main/resources/applicationResources.properties
+++ b/id/ConfigWebTool/src/main/resources/applicationResources.properties
@@ -392,6 +392,8 @@ validation.stork.cpeps.url=CPEPS URL ist ung\u00FCltig
 validation.stork.requestedattributes=STORK Attribute sind fehlerhaft. Bsp.: attr1, attr2
 validation.stork.qaa.outofrange=G\u00FCltige QAA Werte sind 1, 2, 3, und 4
 validation.stork.attributes.empty=Es muss mindestens ein Attribut definiert sein
+validation.stork.ap.url.valid=Ung\u00FCltige AttributProvider Url
+validation.stork.ap.name.valid=Ung\u00FCltiger AttributProvider Name
 
 validation.pvp2.metadataurl.empty=Keine Metadaten URL angegeben.
 validation.pvp2.metadataurl.valid=Die Metadaten URL wei\u00DFt kein g\u00FCltiges URL Format auf.
-- 
cgit v1.2.3