Merge remote-tracking branch 'remotes/origin/vidp' into moa2_0_tlenz

Conflicts:
	id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java
	id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java
	id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties
	id/server/moa-id-commons/pom.xml
	id/server/stork2-saml-engine/pom.xml
	pom.xml
	repository/iaik/iaik_tsl/1.0/iaik_tsl-1.0.jar
	repository/iaik/iaik_tsl/1.0/iaik_tsl-1.0.pom

1 files changed, 46 insertions, 46 deletions

diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDSectorShareMarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDSectorShareMarshaller.java
index 87ab23660..0ce449cd1 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDSectorShareMarshaller.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDSectorShareMarshaller.java
@@ -1,46 +1,46 @@
-/* 

- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by

- * the European Commission - subsequent versions of the EUPL (the "Licence");

- * You may not use this work except in compliance with the Licence. You may

- * obtain a copy of the Licence at:

- * 

- * http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the Licence is distributed on an "AS IS" basis, WITHOUT

- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the

- * Licence for the specific language governing permissions and limitations under

- * the Licence.

- */

-

-package eu.stork.peps.auth.engine.core.impl;

-

-import org.opensaml.common.impl.AbstractSAMLObjectMarshaller;

-import org.opensaml.saml2.core.impl.AbstractNameIDTypeMarshaller;

-import org.opensaml.xml.XMLObject;

-import org.opensaml.xml.io.MarshallingException;

-import org.opensaml.xml.util.XMLHelper;

-import org.w3c.dom.Element;

-

-import eu.stork.peps.auth.engine.core.EIDSectorShare;

-

-/**

- * The Class EIDSectorShareMarshaller.

- * 

- * @author fjquevedo

- */

-public class EIDSectorShareMarshaller extends AbstractSAMLObjectMarshaller {

-

-	/**

-	 * Marshall element content.

-	 *

-	 * @param samlObject the SAML object

-	 * @param domElement the DOM element

-	 * @throws MarshallingException the marshalling exception

-	 */

-	protected final void marshallElementContent(final XMLObject samlObject,

-			final Element domElement) throws MarshallingException {

-		final EIDSectorShare sectorShare = (EIDSectorShare) samlObject;

-		XMLHelper.appendTextContent(domElement, sectorShare.getEIDSectorShare());

-	}

-}

+/* 
+ * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence. You may
+ * obtain a copy of the Licence at:
+ * 
+ * http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * Licence for the specific language governing permissions and limitations under
+ * the Licence.
+ */
+
+package eu.stork.peps.auth.engine.core.impl;
+
+import org.opensaml.common.impl.AbstractSAMLObjectMarshaller;
+import org.opensaml.saml2.core.impl.AbstractNameIDTypeMarshaller;
+import org.opensaml.xml.XMLObject;
+import org.opensaml.xml.io.MarshallingException;
+import org.opensaml.xml.util.XMLHelper;
+import org.w3c.dom.Element;
+
+import eu.stork.peps.auth.engine.core.EIDSectorShare;
+
+/**
+ * The Class EIDSectorShareMarshaller.
+ * 
+ * @author fjquevedo
+ */
+public class EIDSectorShareMarshaller extends AbstractSAMLObjectMarshaller {
+
+	/**
+	 * Marshall element content.
+	 *
+	 * @param samlObject the SAML object
+	 * @param domElement the DOM element
+	 * @throws MarshallingException the marshalling exception
+	 */
+	protected final void marshallElementContent(final XMLObject samlObject,
+			final Element domElement) throws MarshallingException {
+		final EIDSectorShare sectorShare = (EIDSectorShare) samlObject;
+		XMLHelper.appendTextContent(domElement, sectorShare.getEIDSectorShare());
+	}
+}