some small changes to solve compatibility problems

5 files changed, 15 insertions, 15 deletions

diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/BPKBuilder.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/BPKBuilder.java
index 62a57dd1..dfafea6f 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/BPKBuilder.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/BPKBuilder.java
@@ -173,7 +173,7 @@ public class BPKBuilder {
         
         // check if we have been called by public sector application
         if (baseIDType.startsWith(EAAFConstants.URN_PREFIX_BASEID)) {
-        	bPKType = EAAFConstants.URN_PREFIX_EIDAS + "+" + sourceCountry + "+" + destinationCountry;
+        	bPKType = EAAFConstants.URN_PREFIX_EIDAS + sourceCountry + "+" + destinationCountry;
             log.debug("Building eIDAS identification from: [identValue]+" + bPKType);         
             bPK = calculatebPKwbPK(baseID + "+"  + bPKType);
             
@@ -192,7 +192,7 @@ public class BPKBuilder {
                             bPK + ", Zielland=" + destinationCountry + ", Ursprungsland=" + sourceCountry);
         }
         
-        log.debug("Building eIDAS identification from: " + sourceCountry+"/"+destinationCountry+"/" + "[identValue]");
+        log.trace("eIDAS pseudonym generation finished. ");
         String eIdentifier = sourceCountry + "/" + destinationCountry + "/" + bPK;
         
         return Pair.newInstance(eIdentifier, bPKType);
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/PVPConstants.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/PVPConstants.java
index 39eef07c..7f6f70a3 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/PVPConstants.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/PVPConstants.java
@@ -129,11 +129,11 @@ public interface PVPConstants extends PVPAttributeDefinitions {
 				}
 			});
 	
-	//constants for requested SAML2 attribtes by using eIDAS namespace
-    public static final String EIDAS10_SAML_NS = "http://eidas.europa.eu/saml-extensions";
-    public static final String EIDAS10_PREFIX = "eidas";
+	//constants for requested SAML2 attribtes by using own namespace
+    public static final String EIDAT10_SAML_NS = "http://eid.gv.at/eID/attributes/saml-extensions";
+    public static final String EIDAT10_PREFIX = "eid";
     
 	public static final QName EIDAS_REQUESTED_ATTRIBUTE_VALUE_TYPE =
-            new QName(EIDAS10_SAML_NS, "AttributeValue", EIDAS10_PREFIX);
+            new QName(EIDAT10_SAML_NS, "AttributeValue", EIDAT10_PREFIX);
 	
 }
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/reqattr/EAAFRequestedAttribute.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/reqattr/EAAFRequestedAttribute.java
index fcb56d01..ab59c4df 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/reqattr/EAAFRequestedAttribute.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/reqattr/EAAFRequestedAttribute.java
@@ -45,12 +45,12 @@ public interface EAAFRequestedAttribute extends SAMLObject, AttributeExtensibleX
 
     
 	 /** Default element name. */
-    QName DEFAULT_ELEMENT_NAME = new QName(PVPConstants.EIDAS10_SAML_NS, DEF_LOCAL_NAME,
-    		PVPConstants.EIDAS10_PREFIX);
+    QName DEFAULT_ELEMENT_NAME = new QName(PVPConstants.EIDAT10_SAML_NS, DEF_LOCAL_NAME,
+    		PVPConstants.EIDAT10_PREFIX);
 
     /** QName of the XSI type. */
-    QName TYPE_NAME = new QName(PVPConstants.EIDAS10_SAML_NS, TYPE_LOCAL_NAME,
-    		PVPConstants.EIDAS10_PREFIX);
+    QName TYPE_NAME = new QName(PVPConstants.EIDAT10_SAML_NS, TYPE_LOCAL_NAME,
+    		PVPConstants.EIDAT10_PREFIX);
 	
 	
 
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/reqattr/EAAFRequestedAttributes.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/reqattr/EAAFRequestedAttributes.java
index bb171172..3a45d5d2 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/reqattr/EAAFRequestedAttributes.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/reqattr/EAAFRequestedAttributes.java
@@ -37,15 +37,15 @@ public interface EAAFRequestedAttributes extends SAMLObject {
     String DEF_LOCAL_NAME = "RequestedAttributes";
 
     /** Default element name. */
-    QName DEFAULT_ELEMENT_NAME = new QName(PVPConstants.EIDAS10_SAML_NS, DEF_LOCAL_NAME,
-    		PVPConstants.EIDAS10_PREFIX);
+    QName DEFAULT_ELEMENT_NAME = new QName(PVPConstants.EIDAT10_SAML_NS, DEF_LOCAL_NAME,
+    		PVPConstants.EIDAT10_PREFIX);
 
     /** Local name of the XSI type. */
     String TYPE_LOCAL_NAME = "RequestedAttributesType";
 
     /** QName of the XSI type. */
-    QName TYPE_NAME = new QName(PVPConstants.EIDAS10_SAML_NS, TYPE_LOCAL_NAME,
-    		PVPConstants.EIDAS10_PREFIX);
+    QName TYPE_NAME = new QName(PVPConstants.EIDAT10_SAML_NS, TYPE_LOCAL_NAME,
+    		PVPConstants.EIDAT10_PREFIX);
 
     /**
      * Gets the attributes.
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/builder/reqattr/EAAFRequestedAttributeUnmarshaller.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/builder/reqattr/EAAFRequestedAttributeUnmarshaller.java
index c9517cff..53eeeab9 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/builder/reqattr/EAAFRequestedAttributeUnmarshaller.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/builder/reqattr/EAAFRequestedAttributeUnmarshaller.java
@@ -41,7 +41,7 @@ public class EAAFRequestedAttributeUnmarshaller extends AbstractSAMLObjectUnmars
     	final QName childQName = childSAMLObject.getElementQName();
     
     	if ("AttributeValue".equals(childQName.getLocalPart())
-    		&& childQName.getNamespaceURI().equals(PVPConstants.EIDAS10_SAML_NS)) {
+    		&& childQName.getNamespaceURI().equals(PVPConstants.EIDAT10_SAML_NS)) {
     	    requestedAttr.getAttributeValues().add(childSAMLObject);
     	
     	} else