drafted config saving

3 files changed, 24 insertions, 12 deletions

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>