Merge branch 'current_development' into development_preview

# Conflicts:
#	id/history.txt

1 files changed, 11 insertions, 2 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OATargetConfiguration.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OATargetConfiguration.java
index b2671302c..84516c73f 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OATargetConfiguration.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OATargetConfiguration.java
@@ -61,6 +61,7 @@ public class OATargetConfiguration implements IOnlineApplicationData {
 	private String foreignbPKTargets = null;
 	private String additionalbPKTargets = null;
 	private boolean eidDemoActive = false;
+  private boolean eidProxyActive = false;
 	
 	public OATargetConfiguration() {
 		 targetList = TargetValidator.getListOfTargets();
@@ -187,7 +188,7 @@ public class OATargetConfiguration implements IOnlineApplicationData {
 		
 		//parse 'Austrian eID mode'  flag
 		eidDemoActive = dbOA.getIseIDDemoModeActive();
-		
+		eidProxyActive = dbOA.getIseIDProxyModeActive();
 		
 		return null;
 	}
@@ -301,6 +302,7 @@ public class OATargetConfiguration implements IOnlineApplicationData {
         dbOA.setForeignbPKTargetList(getForeignbPKTargets());        
         dbOA.setAdditionalbPKTargetList(getAdditionalbPKTargets());
         dbOA.setIseIDDemoModeActive(isEidDemoActive());
+        dbOA.setIseIDProxyModeActive(isEidProxyActive());
         
 		return null;
 	}
@@ -490,7 +492,14 @@ public class OATargetConfiguration implements IOnlineApplicationData {
 		this.eidDemoActive = eidDemoActive;
 	}
 	
-	
+	 public boolean isEidProxyActive() {
+	    return eidProxyActive;
+	  }
+
+
+	  public void setEidProxyActive(boolean eidProxyActive) {
+	    this.eidProxyActive = eidProxyActive;
+	  }