From 7700a426db02fe0e44d8ff1e19595f45dc337806 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Tue, 1 Apr 2014 18:56:00 +0200 Subject: solve problems with Struts 2.3.16.1 --- id/server/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'id/server') diff --git a/id/server/pom.xml b/id/server/pom.xml index d748c01eb..f4b92fbd5 100644 --- a/id/server/pom.xml +++ b/id/server/pom.xml @@ -19,7 +19,7 @@ auth moa-id-commons stork2-saml-engine - stork2-commons + -- cgit v1.2.3 From 3395f06b54249ad4f8281e45ef93d97540bb7a7a Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Wed, 2 Apr 2014 07:37:59 +0200 Subject: merge two log messages into one message --- .../main/java/at/gv/egovernment/moa/id/util/ParamValidatorUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'id/server') 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; } } -- cgit v1.2.3 From b82a8cc5f8178a0cf222db7682df6db1c56051c0 Mon Sep 17 00:00:00 2001 From: Thomas Lenz 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(-) (limited to 'id/server') 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 @@ auth moa-id-commons stork2-saml-engine - + stork2-commons 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 @@ maven-compiler-plugin 3.1 - 1.7 - 1.7 + 1.6 + 1.6 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 From 8b6831043febd92ce2333bc01c373aa0ad9bc8b2 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Wed, 2 Apr 2014 09:29:41 +0200 Subject: add a infolog if no Metadata is found --- .../egovernment/moa/id/protocols/pvp2x/binding/PostBinding.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'id/server') 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; -- cgit v1.2.3 From 49dec667de27b30c353e2312b16719453d0cf1b9 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Wed, 2 Apr 2014 09:30:31 +0200 Subject: add moa-id-commons to moa-idspss project --- id/server/idserverlib/pom.xml | 1 - 1 file changed, 1 deletion(-) (limited to 'id/server') 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 @@ MOA.id.server moa-id-commons - ${pom.version}