From b82a8cc5f8178a0cf222db7682df6db1c56051c0 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 2 Apr 2014 07:43:15 +0200
Subject: change stork2-commons to allow Java 1.6 builds

---
 id/server/pom.xml                                         |  2 +-
 id/server/stork2-commons/pom.xml                          |  4 ++--
 .../eu/stork/peps/tests/ComplexAttributesMarshalling.java | 15 +++++++++++++--
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/id/server/pom.xml b/id/server/pom.xml
index f4b92fbd5..d748c01eb 100644
--- a/id/server/pom.xml
+++ b/id/server/pom.xml
@@ -19,7 +19,7 @@
         <module>auth</module>
         <module>moa-id-commons</module>
         <module>stork2-saml-engine</module>
-        <!-- <module>stork2-commons</module> -->
+        <module>stork2-commons</module>
     </modules>
 
     <properties>
diff --git a/id/server/stork2-commons/pom.xml b/id/server/stork2-commons/pom.xml
index b13035307..c1dd27924 100644
--- a/id/server/stork2-commons/pom.xml
+++ b/id/server/stork2-commons/pom.xml
@@ -122,8 +122,8 @@
 					<artifactId>maven-compiler-plugin</artifactId>
 					<version>3.1</version>
 					<configuration>
-						<source>1.7</source>
-						<target>1.7</target>
+						<source>1.6</source>
+						<target>1.6</target>
 					</configuration>
 				</plugin>
 				<plugin>
diff --git a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/ComplexAttributesMarshalling.java b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/ComplexAttributesMarshalling.java
index c7e195fa6..d411a2f42 100644
--- a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/ComplexAttributesMarshalling.java
+++ b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/ComplexAttributesMarshalling.java
@@ -88,10 +88,15 @@ public class ComplexAttributesMarshalling {
 		    m.marshal(objf.createCanonicalResidenceAddress(object), new FileOutputStream("CanonicalAddressType.xml"));		    
 			m.marshal(objf.createCanonicalResidenceAddress(object), System.out);
 		}
-		catch (JAXBException | FileNotFoundException e) 
+		catch (JAXBException e ) 
 		{
 			e.printStackTrace();
+			
+		} catch (FileNotFoundException e) {
+			e.printStackTrace();
+			
 		}
+		
 	}
 
 	/**
@@ -156,8 +161,14 @@ public class ComplexAttributesMarshalling {
 			m.marshal(o.createHasAccountInBank(object), new FileOutputStream ("hasbankaccount.xml"));
 			m.marshal(o.createHasAccountInBank(object), System.out);
 			
-		} catch (JAXBException | FileNotFoundException e) {
+		}
+		catch (JAXBException e ) 
+		{
+			e.printStackTrace();
+			
+		} catch (FileNotFoundException e) {
 			e.printStackTrace();
+				
 		}
 	}
 	/**
-- 
cgit v1.2.3