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, 95 insertions, 95 deletions

diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributesImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributesImpl.java
index a58a08a05..0a5b37add 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributesImpl.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributesImpl.java
@@ -1,95 +1,95 @@
-/* 

- * 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 java.util.ArrayList;

-import java.util.Collections;

-import java.util.List;

-

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

-import org.opensaml.xml.XMLObject;

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

-

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

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

-

-/**

- * The Class RequestedAttributesImpl.

- * 

- * @author fjquevedo

- */

-public class RequestedAttributesImpl extends AbstractSAMLObject implements

-	RequestedAttributes {

-

-    /**

-     * Instantiates a new requested attributes implement.

-     * 

-     * @param namespaceURI the namespace URI

-     * @param elementLocalName the element local name

-     * @param namespacePrefix the namespace prefix

-     */

-    protected RequestedAttributesImpl(final String namespaceURI,

-	    final String elementLocalName, final String namespacePrefix) {

-	super(namespaceURI, elementLocalName, namespacePrefix);

-	indexedChildren = new IndexedXMLObjectChildrenList<XMLObject>(this);

-    }

-

-    /** The indexed children. */

-    private final IndexedXMLObjectChildrenList<XMLObject> indexedChildren;

-

-    /**

-     * Gets the indexed children.

-     * 

-     * @return the indexed children

-     */

-    public final IndexedXMLObjectChildrenList<XMLObject> getIndexedChildren() {

-	return indexedChildren;

-    }

-

-

-    /**

-     * Gets the ordered children.

-     *

-     * @return the ordered children

-     */

-    public final List<XMLObject> getOrderedChildren() {

-

-	final ArrayList<XMLObject> children = new ArrayList<XMLObject>();

-

-	children.addAll(indexedChildren);

-

-	return Collections.unmodifiableList(children);

-

-    }

-

-    /**

-     * Gets the attributes.

-     * 

-     * @return the attributes

-     * 

-     * @see eu.stork.peps.auth.engine.core.RequestedAttributes#getAttributes()

-     */

-    @SuppressWarnings("unchecked")

-    public final List<RequestedAttribute> getAttributes() {

-	return (List<RequestedAttribute>) indexedChildren

-		.subList(RequestedAttribute.DEF_ELEMENT_NAME);

-    }

-

-    @Override

-    public int hashCode() {

-        throw new UnsupportedOperationException("hashCode method not implemented");

-    }

-}

+/* 
+ * 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 java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.opensaml.common.impl.AbstractSAMLObject;
+import org.opensaml.xml.XMLObject;
+import org.opensaml.xml.util.IndexedXMLObjectChildrenList;
+
+import eu.stork.peps.auth.engine.core.RequestedAttribute;
+import eu.stork.peps.auth.engine.core.RequestedAttributes;
+
+/**
+ * The Class RequestedAttributesImpl.
+ * 
+ * @author fjquevedo
+ */
+public class RequestedAttributesImpl extends AbstractSAMLObject implements
+	RequestedAttributes {
+
+    /**
+     * Instantiates a new requested attributes implement.
+     * 
+     * @param namespaceURI the namespace URI
+     * @param elementLocalName the element local name
+     * @param namespacePrefix the namespace prefix
+     */
+    protected RequestedAttributesImpl(final String namespaceURI,
+	    final String elementLocalName, final String namespacePrefix) {
+	super(namespaceURI, elementLocalName, namespacePrefix);
+	indexedChildren = new IndexedXMLObjectChildrenList<XMLObject>(this);
+    }
+
+    /** The indexed children. */
+    private final IndexedXMLObjectChildrenList<XMLObject> indexedChildren;
+
+    /**
+     * Gets the indexed children.
+     * 
+     * @return the indexed children
+     */
+    public final IndexedXMLObjectChildrenList<XMLObject> getIndexedChildren() {
+	return indexedChildren;
+    }
+
+
+    /**
+     * Gets the ordered children.
+     *
+     * @return the ordered children
+     */
+    public final List<XMLObject> getOrderedChildren() {
+
+	final ArrayList<XMLObject> children = new ArrayList<XMLObject>();
+
+	children.addAll(indexedChildren);
+
+	return Collections.unmodifiableList(children);
+
+    }
+
+    /**
+     * Gets the attributes.
+     * 
+     * @return the attributes
+     * 
+     * @see eu.stork.peps.auth.engine.core.RequestedAttributes#getAttributes()
+     */
+    @SuppressWarnings("unchecked")
+    public final List<RequestedAttribute> getAttributes() {
+	return (List<RequestedAttribute>) indexedChildren
+		.subList(RequestedAttribute.DEF_ELEMENT_NAME);
+    }
+
+    @Override
+    public int hashCode() {
+        throw new UnsupportedOperationException("hashCode method not implemented");
+    }
+}