From ada57605a8127ee25cbb6c2999addf721ab17db1 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Fri, 13 Dec 2019 09:33:04 +0100
Subject: fix problem with old Redis library fix configuration GUI

---
 .../src/main/resources/applicationResources_de.properties           | 4 ++--
 .../src/main/resources/applicationResources_en.properties           | 4 ++--
 .../src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp         | 6 ++++--
 id/server/idserverlib/pom.xml                                       | 2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/id/ConfigWebTool/src/main/resources/applicationResources_de.properties b/id/ConfigWebTool/src/main/resources/applicationResources_de.properties
index 9155d7684..a52efa28d 100644
--- a/id/ConfigWebTool/src/main/resources/applicationResources_de.properties
+++ b/id/ConfigWebTool/src/main/resources/applicationResources_de.properties
@@ -264,8 +264,8 @@ webpages.oaconfig.general.aditional.useUTC=UTC Zeit verwenden
 webpages.oaconfig.general.aditional.calculateHPI="TODO!"
 webpages.oaconfig.general.isHideBPKAuthBlock=bPK/wbPK im AuthBlock ausblenden
 
-webpages.oaconfig.general.neweid.header=E-ID Attribute 
-webpages.oaconfig.general.neweid.activate=Neue E-ID Attribute \u00FCbertragen
+webpages.oaconfig.general.neweid.header=E-ID Proxy-Mode 
+webpages.oaconfig.general.neweid.activate=E-ID Proxy-Mode aktivieren
 webpages.oaconfig.general.foreign.sectors=Sektoren f\u00FCr Fremd-bPKs (CSV)
 webpages.oaconfig.general.additionalbpks.sectors=Sektoren f\u00FCr weitere bPKs (CSV)
 
diff --git a/id/ConfigWebTool/src/main/resources/applicationResources_en.properties b/id/ConfigWebTool/src/main/resources/applicationResources_en.properties
index 7d242de01..0109c3b02 100644
--- a/id/ConfigWebTool/src/main/resources/applicationResources_en.properties
+++ b/id/ConfigWebTool/src/main/resources/applicationResources_en.properties
@@ -270,8 +270,8 @@ webpages.oaconfig.general.aditional.useUTC=Use UTC time
 webpages.oaconfig.general.aditional.calculateHPI="TODO!"
 webpages.oaconfig.general.isHideBPKAuthBlock=Hide bPK/wbPK from AuthBlock
 
-webpages.oaconfig.general.neweid.header=Austrian E-ID Attributes 
-webpages.oaconfig.general.neweid.activate=Add additional E-ID Attributes
+webpages.oaconfig.general.neweid.header=E-ID Proxy Mode
+webpages.oaconfig.general.neweid.activate=Activate E-ID Proxy Mode
 webpages.oaconfig.general.foreign.sectors=Sectors for foreign pseudonyms (CSV)
 webpages.oaconfig.general.additionalbpks.sectors=Sectors for additional pseudonyms (CSV)
 
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp
index db79cb7d7..dc093fc36 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp
@@ -123,7 +123,8 @@
 								cssClass="checkbox">
 						</s:checkbox>
 						
-						<!-- s:if test="authOA.isMoaidMode()">
+						<s:if test="authOA.isMoaidMode()">
+							<!-- 
 							<s:textarea name="targetConfig.foreignbPKTargets" 
 										value="%{targetConfig.foreignbPKTargets}" 
 										labelposition="left"
@@ -143,7 +144,8 @@
 										requiredLabel="true"
 										style="height:120px;">								
 							</s:textarea>
-						</s:if -->
+							 -->
+						</s:if>
 					
 					</div>
 					
diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index 39f6068e4..02069517c 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -509,7 +509,7 @@
 	    	<groupId>redis.clients</groupId>
 	    	<artifactId>jedis</artifactId>
 	    	<!-- version>3.0.1</version -->
-	    	<version>2.10.2</version>
+	    	<version>3.1.0</version>
 	    </dependency>
 	
 <!-- 	    <dependency>
-- 
cgit v1.2.3