adjust bpk builder

10 files changed, 25 insertions, 16 deletions

diff --git a/id/ConfigWebTool/ConfigurationInterface.iml b/id/ConfigWebTool/ConfigurationInterface.iml
index 7af1731c8..0006e531e 100644
--- a/id/ConfigWebTool/ConfigurationInterface.iml
+++ b/id/ConfigWebTool/ConfigurationInterface.iml
@@ -106,7 +106,7 @@
     <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.25" level="project" />
     <orderEntry type="module" module-name="moa-id-lib" />
     <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: org.opensaml:opensaml:2.6.0" level="project" />
     <orderEntry type="library" name="Maven: org.opensaml:openws:1.5.0" level="project" />
     <orderEntry type="library" name="Maven: org.opensaml:xmltooling:1.4.0" level="project" />
diff --git a/id/server/auth/moa-id-auth.iml b/id/server/auth/moa-id-auth.iml
index 73af6885e..a82e8089d 100644
--- a/id/server/auth/moa-id-auth.iml
+++ b/id/server/auth/moa-id-auth.iml
@@ -14,8 +14,8 @@
     </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <output url="file://$MODULE_DIR$/../../target/classes" />
+    <output-test url="file://$MODULE_DIR$/../../target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
@@ -78,7 +78,7 @@
     <orderEntry type="library" name="Maven: iaik.prod:iaik_jsse:4.4" level="project" />
     <orderEntry type="module" module-name="moa-id-lib" />
     <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: org.opensaml:opensaml:2.6.0" level="project" />
     <orderEntry type="library" name="Maven: org.opensaml:openws:1.5.0" level="project" />
     <orderEntry type="library" name="Maven: org.opensaml:xmltooling:1.4.0" level="project" />
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 {
 	}
 
 }
+
diff --git a/id/server/moa-id-commons/moa-id-commons.iml b/id/server/moa-id-commons/moa-id-commons.iml
index aeb4ad88c..387cfa900 100644
--- a/id/server/moa-id-commons/moa-id-commons.iml
+++ b/id/server/moa-id-commons/moa-id-commons.iml
@@ -26,8 +26,8 @@
     </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <output url="file://$MODULE_DIR$/../../target/classes" />
+    <output-test url="file://$MODULE_DIR$/../../target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources/config" type="java-resource" />
diff --git a/id/server/pom.xml b/id/server/pom.xml
index c44773994..dfe5d33af 100644
--- a/id/server/pom.xml
+++ b/id/server/pom.xml
@@ -18,8 +18,9 @@
         <module>proxy</module>

         <module>auth</module>

         <module>moa-id-commons</module>

-        <!-- <module>stork2-saml-engine</module>-->

-        <module>SamlEngine-VIDP</module>

+        <module>stork2-saml-engine</module>

+        <module>stork2-commons</module>

+       <!-- <module>SamlEngine-VIDP</module> -->

     </modules>

 

     <properties>

diff --git a/id/server/proxy/moa-id-proxy.iml b/id/server/proxy/moa-id-proxy.iml
index 083fd2df8..f22728405 100644
--- a/id/server/proxy/moa-id-proxy.iml
+++ b/id/server/proxy/moa-id-proxy.iml
@@ -13,8 +13,8 @@
     </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <output url="file://$MODULE_DIR$/../../target/classes" />
+    <output-test url="file://$MODULE_DIR$/../../target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
@@ -75,7 +75,7 @@
     <orderEntry type="library" name="Maven: iaik.prod:iaik_jsse:4.4" level="project" />
     <orderEntry type="module" module-name="moa-id-lib" />
     <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: org.opensaml:opensaml:2.6.0" level="project" />
     <orderEntry type="library" name="Maven: org.opensaml:openws:1.5.0" level="project" />
     <orderEntry type="library" name="Maven: org.opensaml:xmltooling:1.4.0" level="project" />
diff --git a/id/server/stork2-saml-engine/pom.xml b/id/server/stork2-saml-engine/pom.xml
index cead61eb8..c1992b3fb 100644
--- a/id/server/stork2-saml-engine/pom.xml
+++ b/id/server/stork2-saml-engine/pom.xml
@@ -131,8 +131,8 @@
 					<artifactId>maven-compiler-plugin</artifactId>
 					<version>2.3.2</version>
 					<configuration>
-						<source>1.6</source>
-						<target>1.6</target>
+						<source>1.7</source>
+						<target>1.7</target>
 					</configuration>
 				</plugin>