Merge branch 'eSense_eIDAS_development' into moa-id-3.2_(OPB)

Conflicts:
	id/server/idserverlib/pom.xml
	id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/AuthenticationRequest.java
	id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/EidasMetaDataRequest.java
	id/server/modules/moa-id-modules-saml1/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1AuthenticationServer.java

7 files changed, 61 insertions, 18 deletions

diff --git a/id/ConfigWebTool/pom.xml b/id/ConfigWebTool/pom.xml
index 51bb941a4..71893fca2 100644
--- a/id/ConfigWebTool/pom.xml
+++ b/id/ConfigWebTool/pom.xml
@@ -92,10 +92,10 @@
 			<artifactId>moa-id-module-openID</artifactId>
 		</dependency>
 		
-		<dependency>
+<!--  		<dependency>
 			<groupId>MOA.id.server.modules</groupId>
 			<artifactId>moa-id-module-stork</artifactId>
-		</dependency>
+		</dependency> -->
 
 		<dependency>
 			<groupId>org.apache.commons</groupId>
@@ -170,10 +170,6 @@
 								<groupId>xalan</groupId>
 								<artifactId>*</artifactId>
 							</exclusion>
-							<exclusion>
-								<groupId>org.bouncycastle</groupId>
-								<artifactId>bcprov-jdk15on</artifactId>
-							</exclusion>
 						</exclusions>
         </dependency>
         <dependency>
@@ -188,10 +184,6 @@
         			</exclusion>
         		</exclusions>
         </dependency>
-				<dependency>
-					<groupId>org.bouncycastle</groupId>
-					<artifactId>bcprov-jdk16</artifactId>
-				</dependency>
 
         <dependency>
             <groupId>javax.mail</groupId>
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
index d26fe8a89..3fad65fe5 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
@@ -41,7 +41,7 @@ import at.gv.egovernment.moa.id.config.webgui.exception.ConfigurationException;
 import at.gv.egovernment.moa.id.configuration.auth.AuthenticatedUser;
 import at.gv.egovernment.moa.id.configuration.config.ConfigurationProvider;
 import at.gv.egovernment.moa.id.configuration.validation.oa.OASTORKConfigValidation;
-import at.gv.egovernment.moa.id.protocols.stork2.AttributeProviderFactory;
+//import at.gv.egovernment.moa.id.protocols.stork2.AttributeProviderFactory;
 
 public class OASTORKConfig implements IOnlineApplicationData{
 
@@ -293,7 +293,10 @@ public class OASTORKConfig implements IOnlineApplicationData{
 	}
 	
 	public List<String> getAvailableAttributeProviderPlugins() {
-		return AttributeProviderFactory.getAvailablePlugins();
+		//TODO: remove in final version
+		
+		return new ArrayList<String>();
+		//return AttributeProviderFactory.getAvailablePlugins();
 	}
 	
 	public List<AttributeProviderPlugin> getAttributeProviderPlugins() {
diff --git a/id/server/idserverlib/src/test/java/test/tlenz/simpletest.java b/id/server/idserverlib/src/test/java/test/tlenz/simpletest.java
index fd1473b1f..2c80b7ffd 100644
--- a/id/server/idserverlib/src/test/java/test/tlenz/simpletest.java
+++ b/id/server/idserverlib/src/test/java/test/tlenz/simpletest.java
@@ -1,7 +1,11 @@
 package test.tlenz;
 
+import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
 
 import org.w3c.dom.Element;
 
@@ -58,6 +62,46 @@ import at.gv.egovernment.moa.util.DOMUtils;
 public class simpletest {
 //
 	public static void main(String[] args) {
+				
+		
+		URI fileURI = null;
+		try {
+			fileURI = new URI("file:c:/moa3/tomcat8/conf/moa-id/moa-id.properties");
+			File propertiesFile = new File(fileURI);
+			
+			InputStream in = new FileInputStream(propertiesFile);
+			ObjectInputStream testOIS = new ObjectInputStream(in);
+			
+			Object test = testOIS.readObject();
+			
+			
+		} catch (Exception e1) {
+			e1.printStackTrace();
+		}
+		
+		try {
+			fileURI = new URI("file:/c:/moa3/tomcat8/conf/moa-id/moa-id.properties");
+			File propertiesFile = new File(fileURI);
+		} catch (Exception e1) {
+			e1.printStackTrace();
+		}
+		
+		try {
+			fileURI = new URI("file://c:/moa3/tomcat8/conf/moa-id/moa-id.properties");
+			File propertiesFile = new File(fileURI);
+		} catch (Exception e1) {
+			e1.printStackTrace();
+		}
+		
+		try {
+			fileURI = new URI("file:///c:/moa3/tomcat8/conf/moa-id/moa-id.properties");
+			File propertiesFile = new File(fileURI);
+		} catch (Exception e1) {
+			e1.printStackTrace();
+		}
+		
+		
+		
 		try {
 		InputStream s = new FileInputStream("D:/idl_test/identity_link.xml");
 		Element idlTemplate = DOMUtils.parseXmlValidating(s);
diff --git a/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/AuthenticationRequest.java b/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/AuthenticationRequest.java
index 5040f1fe3..09287e6d4 100644
--- a/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/AuthenticationRequest.java
+++ b/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/AuthenticationRequest.java
@@ -150,7 +150,7 @@ public class AuthenticationRequest implements IAction {
             Logger.trace("Sending html content  : " + new String(writer.getBuffer()));
 
             httpResp.getOutputStream().write(writer.getBuffer().toString().getBytes("UTF-8"));
-            httpResp.setContentType(MediaType.TEXT_HTML_VALUE);
+            httpResp.setContentType(MediaType.TEXT_HTML.getType());
 
         } catch (Exception e) {
             Logger.error("Velocity error: " + e.getMessage());
diff --git a/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/EidasMetaDataRequest.java b/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/EidasMetaDataRequest.java
index 31594f515..66179fae4 100644
--- a/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/EidasMetaDataRequest.java
+++ b/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/EidasMetaDataRequest.java
@@ -62,9 +62,9 @@ public class EidasMetaDataRequest implements IAction {
 
             logger.trace(metaData);
 
-            httpResp.setContentType(MediaType.TEXT_XML_VALUE);
-            httpResp.getWriter().print(metaData);
-            httpResp.flushBuffer();
+            response.setContentType(MediaType.TEXT_XML.getType());
+            response.getWriter().print(metaData);
+            response.flushBuffer();
         } catch (Exception e) {
             e.printStackTrace();
         } 
diff --git a/id/server/modules/moa-id-modules-saml1/pom.xml b/id/server/modules/moa-id-modules-saml1/pom.xml
index b5d5a1f8f..d0d8f6a48 100644
--- a/id/server/modules/moa-id-modules-saml1/pom.xml
+++ b/id/server/modules/moa-id-modules-saml1/pom.xml
@@ -50,6 +50,12 @@
   		 <groupId>MOA.id.server.modules</groupId>
   		 <artifactId>moa-id-modul-citizencard_authentication</artifactId>
   	</dependency>
+  	
+  	<dependency>
+  		 <groupId>MOA.id.server.modules</groupId>
+  		 <artifactId>moa-id-module-eIDAS</artifactId>
+  	</dependency>
+  	
   </dependencies>
   
   
diff --git a/id/server/modules/moa-id-modules-saml1/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1AuthenticationServer.java b/id/server/modules/moa-id-modules-saml1/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1AuthenticationServer.java
index af5dada54..421d00cbe 100644
--- a/id/server/modules/moa-id-modules-saml1/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1AuthenticationServer.java
+++ b/id/server/modules/moa-id-modules-saml1/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1AuthenticationServer.java
@@ -75,8 +75,6 @@ import at.gv.util.xsd.persondata.PersonNameType.FamilyName;
 import at.gv.util.xsd.persondata.PhysicalPersonType;
 import eu.eidas.auth.commons.IPersonalAttributeList;
 import eu.eidas.auth.commons.PersonalAttribute;
-//import eu.stork.peps.auth.commons.IPersonalAttributeList;
-//import eu.stork.peps.auth.commons.PersonalAttribute;
 //import at.gv.egovernment.moa.id.util.IdentityLinkReSigner;
 
 public class SAML1AuthenticationServer extends AuthenticationServer {