From a8b67c26ee94ff98aba72467a3c8e692dec4c4e1 Mon Sep 17 00:00:00 2001
From: Tobias Kellner <tobias.kellner@iaik.tugraz.at>
Date: Wed, 29 Apr 2015 09:51:08 +0200
Subject: Update spring xml beans to work with Java 8

---
 .../resources/at/gv/egiz/smcc/test/acos/ACOSA03ApplDEC.xml     |  6 +++---
 .../resources/at/gv/egiz/smcc/test/acos/ACOSA03ApplSIG.xml     |  6 +++---
 .../resources/at/gv/egiz/smcc/test/acos/ACOSA04ApplDEC.xml     |  6 +++---
 .../resources/at/gv/egiz/smcc/test/acos/ACOSA04ApplSIG.xml     |  6 +++---
 .../at/gv/egiz/smcc/test/acos/ACOSA04NotActivatedTest.xml      | 10 +++++-----
 smcc/src/test/resources/at/gv/egiz/smcc/test/ecard/ECardG2.xml |  6 +++---
 .../at/gv/egiz/smcc/test/ecard/ECardG2ApplSichereSignatur.xml  |  6 +++---
 smcc/src/test/resources/at/gv/egiz/smcc/test/ecard/ECardG3.xml |  4 ++--
 .../at/gv/egiz/smcc/test/ecard/ECardG3ActivateTest.xml         |  8 ++++----
 .../at/gv/egiz/smcc/test/ecard/ECardG3ApplSichereSignatur.xml  |  6 +++---
 .../at/gv/egiz/smcc/test/ecard/ECardG3NotActivatedTest.xml     | 10 +++++-----
 11 files changed, 37 insertions(+), 37 deletions(-)

(limited to 'smcc')

diff --git a/smcc/src/test/resources/at/gv/egiz/smcc/test/acos/ACOSA03ApplDEC.xml b/smcc/src/test/resources/at/gv/egiz/smcc/test/acos/ACOSA03ApplDEC.xml
index d892613c..1171b262 100644
--- a/smcc/src/test/resources/at/gv/egiz/smcc/test/acos/ACOSA03ApplDEC.xml
+++ b/smcc/src/test/resources/at/gv/egiz/smcc/test/acos/ACOSA03ApplDEC.xml
@@ -40,10 +40,10 @@
 			</list>
 		</property>
     <property name="pins">
-      <map>
+      <util:map id="pins" key-type="java.lang.Integer">
         <entry key="0x81" value-ref="geheimhaltungsPIN" />
         <entry key="0x83" value-ref="infoboxPIN" />
-      </map>
+      </util:map>
     </property>
 	</bean>
 
@@ -75,4 +75,4 @@
     <property name="identityLink" ref="identityLink"/>
   </bean>
 
-</beans>
\ No newline at end of file
+</beans>
diff --git a/smcc/src/test/resources/at/gv/egiz/smcc/test/acos/ACOSA03ApplSIG.xml b/smcc/src/test/resources/at/gv/egiz/smcc/test/acos/ACOSA03ApplSIG.xml
index 5cb1c768..29e5294b 100644
--- a/smcc/src/test/resources/at/gv/egiz/smcc/test/acos/ACOSA03ApplSIG.xml
+++ b/smcc/src/test/resources/at/gv/egiz/smcc/test/acos/ACOSA03ApplSIG.xml
@@ -38,9 +38,9 @@
 			</list>
 		</property>
 		<property name="pins">
-			<map>
+			<util:map id="pins" key-type="java.lang.Integer">
 				<entry key="0x81" value-ref="signaturPIN" />
-			</map>
+			</util:map>
 		</property>
 	</bean>
 
@@ -58,4 +58,4 @@
 		<property name="certificate" ref="certificateSS" />
 	</bean>
 
-</beans>
\ No newline at end of file
+</beans>
diff --git a/smcc/src/test/resources/at/gv/egiz/smcc/test/acos/ACOSA04ApplDEC.xml b/smcc/src/test/resources/at/gv/egiz/smcc/test/acos/ACOSA04ApplDEC.xml
index e9fd3a80..e516b148 100644
--- a/smcc/src/test/resources/at/gv/egiz/smcc/test/acos/ACOSA04ApplDEC.xml
+++ b/smcc/src/test/resources/at/gv/egiz/smcc/test/acos/ACOSA04ApplDEC.xml
@@ -40,9 +40,9 @@
 			</list>
 		</property>
 		<property name="pins">
-			<map>
+			<util:map id="pins" key-type="java.lang.Integer">
 				<entry key="0x81" value-ref="geheimhaltungsPIN" />
-			</map>
+			</util:map>
 		</property>
 	</bean>
 
@@ -68,4 +68,4 @@
 		<property name="identityLink" ref="identityLink" />
 	</bean>
 
-</beans>
\ No newline at end of file
+</beans>
diff --git a/smcc/src/test/resources/at/gv/egiz/smcc/test/acos/ACOSA04ApplSIG.xml b/smcc/src/test/resources/at/gv/egiz/smcc/test/acos/ACOSA04ApplSIG.xml
index 24b1f3d9..59abef62 100644
--- a/smcc/src/test/resources/at/gv/egiz/smcc/test/acos/ACOSA04ApplSIG.xml
+++ b/smcc/src/test/resources/at/gv/egiz/smcc/test/acos/ACOSA04ApplSIG.xml
@@ -39,9 +39,9 @@
 			</list>
 		</property>
 		<property name="pins">
-			<map>
+			<util:map id="pins" key-type="java.lang.Integer">
 				<entry key="0x81" value-ref="signaturPIN" />
-			</map>
+			</util:map>
 		</property>
 	</bean>
 
@@ -70,4 +70,4 @@
 		<property name="certificate" ref="certificateSS" />
 	</bean>
 
-</beans>
\ No newline at end of file
+</beans>
diff --git a/smcc/src/test/resources/at/gv/egiz/smcc/test/acos/ACOSA04NotActivatedTest.xml b/smcc/src/test/resources/at/gv/egiz/smcc/test/acos/ACOSA04NotActivatedTest.xml
index 2d39c078..0e6557d4 100644
--- a/smcc/src/test/resources/at/gv/egiz/smcc/test/acos/ACOSA04NotActivatedTest.xml
+++ b/smcc/src/test/resources/at/gv/egiz/smcc/test/acos/ACOSA04NotActivatedTest.xml
@@ -55,7 +55,7 @@
 			</list>
 		</property>
 		<property name="pins">
-			<map>
+			<util:map id="pins1" key-type="java.lang.Integer">
 				<entry key="0x81">
 					<bean class="at.gv.egiz.smcc.PIN">
 						<property name="state">
@@ -63,7 +63,7 @@
 						</property>
 					</bean>
 				</entry>
-			</map>
+			</util:map>
 		</property>
 	</bean>
 
@@ -77,7 +77,7 @@
 			</list>
 		</property>
 		<property name="pins">
-			<map>
+			<util:map id="pins2" key-type="java.lang.Integer">
 				<entry key="0x81">
 					<bean class="at.gv.egiz.smcc.PIN">
 						<property name="state">
@@ -85,8 +85,8 @@
 						</property>
 					</bean>
 				</entry>
-			</map>
+			</util:map>
 		</property>
 	</bean>
 
-</beans>
\ No newline at end of file
+</beans>
diff --git a/smcc/src/test/resources/at/gv/egiz/smcc/test/ecard/ECardG2.xml b/smcc/src/test/resources/at/gv/egiz/smcc/test/ecard/ECardG2.xml
index d08574cd..894e31a7 100644
--- a/smcc/src/test/resources/at/gv/egiz/smcc/test/ecard/ECardG2.xml
+++ b/smcc/src/test/resources/at/gv/egiz/smcc/test/ecard/ECardG2.xml
@@ -47,9 +47,9 @@
 	<bean name="cardChannel" class="at.gv.egiz.smcc.starcos.STARCOSCardChannelEmul">
 		<property name="cardEmul" ref="card" />
 		<property name="globalPins">
-			<map>
+			<util:map id="globalPins" key-type="java.lang.Integer">
 				<entry key="0x01" value-ref="kartenPIN" />
-			</map>
+			</util:map>
 		</property>
 		<property name="globalFiles">
 			<list>
@@ -75,4 +75,4 @@
 		</property>
 	</bean>
 
-</beans>
\ No newline at end of file
+</beans>
diff --git a/smcc/src/test/resources/at/gv/egiz/smcc/test/ecard/ECardG2ApplSichereSignatur.xml b/smcc/src/test/resources/at/gv/egiz/smcc/test/ecard/ECardG2ApplSichereSignatur.xml
index c74b6c41..3ba3b69b 100644
--- a/smcc/src/test/resources/at/gv/egiz/smcc/test/ecard/ECardG2ApplSichereSignatur.xml
+++ b/smcc/src/test/resources/at/gv/egiz/smcc/test/ecard/ECardG2ApplSichereSignatur.xml
@@ -39,9 +39,9 @@
 			</list>
 		</property>
 		<property name="pins">
-			<map>
+			<util:map id="pins" key-type="java.lang.Integer">
 				<entry key="0x81" value-ref="signaturPIN" />
-			</map>
+			</util:map>
 		</property>
 	</bean>
 
@@ -59,4 +59,4 @@
 		<property name="certificate" ref="certificateSS" />
 	</bean>
 
-</beans>
\ No newline at end of file
+</beans>
diff --git a/smcc/src/test/resources/at/gv/egiz/smcc/test/ecard/ECardG3.xml b/smcc/src/test/resources/at/gv/egiz/smcc/test/ecard/ECardG3.xml
index f954660b..23df037e 100644
--- a/smcc/src/test/resources/at/gv/egiz/smcc/test/ecard/ECardG3.xml
+++ b/smcc/src/test/resources/at/gv/egiz/smcc/test/ecard/ECardG3.xml
@@ -47,9 +47,9 @@
 	<bean name="cardChannel" class="at.gv.egiz.smcc.starcos.STARCOSCardChannelEmul">
 		<property name="cardEmul" ref="card" />
 		<property name="globalPins">
-			<map>
+			<util:map id="globalPins" key-type="java.lang.Integer">
 				<entry key="0x01" value-ref="kartenPIN" />
-			</map>
+			</util:map>
 		</property>
 		<property name="globalFiles">
 			<list>
diff --git a/smcc/src/test/resources/at/gv/egiz/smcc/test/ecard/ECardG3ActivateTest.xml b/smcc/src/test/resources/at/gv/egiz/smcc/test/ecard/ECardG3ActivateTest.xml
index 9fec2d42..94727116 100644
--- a/smcc/src/test/resources/at/gv/egiz/smcc/test/ecard/ECardG3ActivateTest.xml
+++ b/smcc/src/test/resources/at/gv/egiz/smcc/test/ecard/ECardG3ActivateTest.xml
@@ -45,7 +45,7 @@
 
 	<bean name="cardChannel_notActivated" parent="cardChannel">
 		<property name="globalPins">
-			<map>
+			<util:map id="globalPins" key-type="java.lang.Integer">
 				<entry key="0x01">
 					<bean parent="kartenPIN">
 						<property name="pin" value="26:12:34:56:ff:ff:ff:ff" />
@@ -54,7 +54,7 @@
 						</property>
 					</bean>
 				</entry>
-			</map>
+			</util:map>
 		</property>
 	</bean>
 
@@ -70,7 +70,7 @@
 
 	<bean name="applSichereSignatur_notActivated" parent="applSichereSignatur">
 		<property name="pins">
-			<map>
+			<util:map id="pins" key-type="java.lang.Integer">
 				<entry key="0x81">
 					<bean parent="signaturPIN">
 						<property name="state">
@@ -78,7 +78,7 @@
 						</property>
 					</bean>
 				</entry>
-			</map>
+			</util:map>
 		</property>
 	</bean>
 
diff --git a/smcc/src/test/resources/at/gv/egiz/smcc/test/ecard/ECardG3ApplSichereSignatur.xml b/smcc/src/test/resources/at/gv/egiz/smcc/test/ecard/ECardG3ApplSichereSignatur.xml
index cf203e9f..5e483558 100644
--- a/smcc/src/test/resources/at/gv/egiz/smcc/test/ecard/ECardG3ApplSichereSignatur.xml
+++ b/smcc/src/test/resources/at/gv/egiz/smcc/test/ecard/ECardG3ApplSichereSignatur.xml
@@ -39,9 +39,9 @@
 			</list>
 		</property>
 		<property name="pins">
-			<map>
+			<util:map id="pins" key-type="java.lang.Integer">
 				<entry key="0x81" value-ref="signaturPIN" />
-			</map>
+			</util:map>
 		</property>
 	</bean>
 
@@ -59,4 +59,4 @@
 		<property name="certificate" ref="certificateSS" />
 	</bean>
 
-</beans>
\ No newline at end of file
+</beans>
diff --git a/smcc/src/test/resources/at/gv/egiz/smcc/test/ecard/ECardG3NotActivatedTest.xml b/smcc/src/test/resources/at/gv/egiz/smcc/test/ecard/ECardG3NotActivatedTest.xml
index 2fa5f9e2..421aab3b 100644
--- a/smcc/src/test/resources/at/gv/egiz/smcc/test/ecard/ECardG3NotActivatedTest.xml
+++ b/smcc/src/test/resources/at/gv/egiz/smcc/test/ecard/ECardG3NotActivatedTest.xml
@@ -40,7 +40,7 @@
 
 	<bean name="cardChannel_notActivated" parent="cardChannel">
 		<property name="globalPins">
-			<map>
+			<util:map id="globalPins" key-type="java.lang.Integer">
 				<entry key="0x01">
 					<bean parent="kartenPIN">
 						<property name="state">
@@ -48,7 +48,7 @@
 						</property>
 					</bean>
 				</entry>
-			</map>
+			</util:map>
 		</property>
 	</bean>
 
@@ -81,7 +81,7 @@
 			</list>
 		</property>
 		<property name="pins">
-			<map>
+			<util:map id="pins" key-type="java.lang.Integer">
 				<entry key="0x81">
 					<bean parent="signaturPIN">
 						<property name="pin" value="26:12:34:56:ff:ff:ff:ff" />
@@ -90,8 +90,8 @@
 						</property>
 					</bean>
 				</entry>
-			</map>
+			</util:map>
 		</property>
 	</bean>
 
-</beans>
\ No newline at end of file
+</beans>
-- 
cgit v1.2.3