adjust bpk builder

4 files changed, 11 insertions, 3 deletions

diff --git a/id/server/idserverlib/moa-id-lib.iml b/id/server/idserverlib/moa-id-lib.iml
index dba9b563f..5dae15c18 100644
--- a/id/server/idserverlib/moa-id-lib.iml
+++ b/id/server/idserverlib/moa-id-lib.iml
@@ -14,7 +14,7 @@
     <orderEntry type="library" name="Maven: eu.stork.mw.core:stork-saml-engine:2.0" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.6.6" level="project" />
     <orderEntry type="module" module-name="SamlEngine" />
-    <orderEntry type="library" name="Maven: eu.stork:Commons:1.4.0" level="project" />
+    <orderEntry type="module" module-name="Commons" />
     <orderEntry type="library" name="Maven: joda-time:joda-time:2.3" level="project" />
     <orderEntry type="library" name="Maven: log4j:log4j:1.2.14" level="project" />
     <orderEntry type="library" name="Maven: org.opensaml:opensaml:2.6.0" level="project" />
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/BPKBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/BPKBuilder.java
index 603d924d8..866c5a923 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/BPKBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/BPKBuilder.java
@@ -170,9 +170,12 @@ public class BPKBuilder {
                     new Object[]{"storkid", "Unvollständige Parameterangaben: identificationValue=" +
                             identificationValue + ", Zielland=" + destinationCountry + ", Ursprungsland=" + sourceCountry});
         }
+        Logger.info("Building STORK identification from: " + sourceCountry+"/"+destinationCountry+"/" + "[identValue]");
+        String eIdentifier = sourceCountry+"/"+destinationCountry+"/"+identificationValue;
 
+        /* Commented - it is already done by BKU, we need only to add Stork values
         String basisbegriff = identificationValue + "+" + Constants.URN_PREFIX_STORK + "+" + sourceCountry + "+" + destinationCountry;
-        Logger.info("Building STORK identification from:" + basisbegriff);
+        Logger.info("Building STORK identification from: [identValue]+" + Constants.URN_PREFIX_STORK + "+" + sourceCountry + "+" + destinationCountry);
         try {
             MessageDigest md = MessageDigest.getInstance("SHA-1");
             byte[] hash = md.digest(basisbegriff.getBytes("ISO-8859-1"));
@@ -182,6 +185,8 @@ public class BPKBuilder {
         } catch (Exception ex) {
             throw new BuildException("builder.00", new Object[]{"storkid", ex.toString()}, ex);
         }
+        */
+        return eIdentifier;
     }
 
 
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/InfoboxReadRequestBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/InfoboxReadRequestBuilder.java
index ba347c9e5..81ef5e408 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/InfoboxReadRequestBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/InfoboxReadRequestBuilder.java
@@ -46,6 +46,7 @@
 
 package at.gv.egovernment.moa.id.auth.builder;
 
+import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.util.Constants;
 
 /**
@@ -79,7 +80,7 @@ public class InfoboxReadRequestBuilder implements Constants {
      * @return <code>&lt;InfoboxReadRequest&gt;</code> as String
      */
     public String build(boolean businessService, String identityLinkDomainIdentifier) {
-
+        Logger.info("Building InfoBoxReadRequest");
         String slPrefix;
         String slNsDeclaration;
 
@@ -144,6 +145,7 @@ public class InfoboxReadRequestBuilder implements Constants {
      *
      */
     public String buildStorkReadRequest(String identityLinkDomainIdentifier) {
+        Logger.info("Building Stork InfoBoxReadRequest for " + identityLinkDomainIdentifier);
 
         String slPrefix;
         String slNsDeclaration;
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/StorkAttributeRequestProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/StorkAttributeRequestProvider.java
index b3d831b80..618311a28 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/StorkAttributeRequestProvider.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/StorkAttributeRequestProvider.java
@@ -162,3 +162,4 @@ public class StorkAttributeRequestProvider implements AttributeProvider {
 	}
 
 }
+