Merge branch 'moa-2.1-Snapshot' of gitlab.iaik.tugraz.at:afitzek/moa-idspss into vidp_2.1_bs

7 files changed, 32 insertions, 8 deletions

diff --git a/id/server/data/deploy/conf/moa-id-configuration/moa-id-configtool.properties b/id/server/data/deploy/conf/moa-id-configuration/moa-id-configtool.properties
index 2bb9cb005..05b5fbdef 100644
--- a/id/server/data/deploy/conf/moa-id-configuration/moa-id-configtool.properties
+++ b/id/server/data/deploy/conf/moa-id-configuration/moa-id-configtool.properties
@@ -2,6 +2,8 @@
 general.login.deaktivate=false
 general.publicURLContext=https://localhost:8443/moa-id-configuration
 
+general.defaultlanguage=de 
+
 ##Mail
 general.mail.host=smtp.localhost...
 #general.mail.host.port=
diff --git a/id/server/doc/handbook/config/config.html b/id/server/doc/handbook/config/config.html
index c704e85d1..ddbe1ac37 100644
--- a/id/server/doc/handbook/config/config.html
+++ b/id/server/doc/handbook/config/config.html
@@ -200,6 +200,12 @@
     <td>Public URL Prefix unter dem die zu konfigurierende MOA-ID-Auth Instanz erreichbar ist</td>
   </tr>
   <tr>
+    <td>general.defaultlanguage</td>
+    <td>de, en</td>
+    <td><p>Hiermit kann die Sprache, welche f&uuml;r die Darstellung der Texte verwendet wird, festgelegt werden.</p>
+    <p><strong>Hinweis</strong>: Aktuell wird nur Deutsch (de) oder Englisch (en) unterst&uuml;tzt.</p></td>
+  </tr>
+  <tr>
     <td>general.userrequests.cleanup.delay</td>
     <td>18</td>
     <td>Innerhalb dieses Zeitraums muss ein neuer Benutzer die im Benutzerprofil hinterlegte eMail Adresse validieren. </td>
diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index ae4c57fc8..285a5da9c 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -34,7 +34,6 @@
     <dependency>

     		<groupId>MOA.id.server</groupId>

     		<artifactId>moa-id-commons</artifactId>

-    		<version>${pom.version}</version>

     </dependency>

     

 <!--         <dependency>

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/PostBinding.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/PostBinding.java
index 6517325b9..11e280d8f 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/PostBinding.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/PostBinding.java
@@ -122,7 +122,13 @@ public class PostBinding implements IDecoder, IEncoder {
 		
 		MOARequest request = new MOARequest(inboundMessage);
 		request.setVerified(false);
-		request.setEntityID(messageContext.getPeerEntityMetadata().getEntityID());
+		
+		if (messageContext.getPeerEntityMetadata() != null)
+			request.setEntityID(messageContext.getPeerEntityMetadata().getEntityID());
+		
+		else
+			Logger.info("No Metadata found for OA with EntityID " + inboundMessage.getIssuer().getValue());
+				
 		request.setRelayState(messageContext.getRelayState());
 		return request;
 
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParamValidatorUtils.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParamValidatorUtils.java
index 0cb11cf5f..5eb55317a 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParamValidatorUtils.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParamValidatorUtils.java
@@ -232,8 +232,8 @@ public class ParamValidatorUtils implements MOAIDAuthConstants{
 		    			  return true;

 		    		  }

 		    		  else {

-		    			  Logger.error("Fehler Ueberpruefung Parameter bkuURI. bkuURI ist nicht auf Liste der vertrauenswuerdigen BKUs (Konfigurationselement: MOA-IDConfiguration/TrustedBKUs)");  

-		    			  Logger.error("Ueberpruefte bkuURI: " + bkuURI);

+		    			  Logger.error("Fehler Ueberpruefung Parameter bkuURI. "

+		    					  + bkuURI + " ist nicht auf Liste der vertrauenswuerdigen BKUs (Konfigurationselement: MOA-IDConfiguration/TrustedBKUs)");  

                           return false;

 		    		  }  

 	    		  }

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();

+				

 		}

 	}

 	/**