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

Conflicts:
	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

1 files changed, 3 insertions, 4 deletions

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 0be291a06..31594f515 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
@@ -15,10 +15,12 @@
  *  limitations under the Licence.
  *******************************************************************************/
 package at.gv.egovernment.moa.id.protocols.eidas;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.slf4j.Logger;
+import org.springframework.http.MediaType;
 
 import at.gv.egovernment.moa.id.auth.exception.MOAIDException;
 import at.gv.egovernment.moa.id.auth.modules.eidas.Constants;
@@ -37,9 +39,7 @@ import eu.eidas.engine.exceptions.SAMLEngineException;
 /**
  * First version to provide some valid metadata to an asking eIDaS node
  */
-//@WebServlet("/eidas/metadata")
 public class EidasMetaDataRequest implements IAction {
-    private static final long serialVersionUID = -2129228304760706063L;
     private Logger logger = org.slf4j.LoggerFactory.getLogger(EidasMetaDataRequest.class); 
     
 	/* (non-Javadoc)
@@ -62,10 +62,9 @@ public class EidasMetaDataRequest implements IAction {
 
             logger.trace(metaData);
 
-            httpResp.setContentType("text/xml");
+            httpResp.setContentType(MediaType.TEXT_XML_VALUE);
             httpResp.getWriter().print(metaData);
             httpResp.flushBuffer();
-            
         } catch (Exception e) {
             e.printStackTrace();
         }