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, 89 insertions, 0 deletions

diff --git a/id/server/legacy-backup/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossSectorShareImpl.java b/id/server/legacy-backup/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossSectorShareImpl.java
new file mode 100644
index 000000000..7b2ad3dbd
--- /dev/null
+++ b/id/server/legacy-backup/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossSectorShareImpl.java
@@ -0,0 +1,89 @@
+/*
+ * 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.List;
+
+import org.opensaml.common.impl.AbstractSAMLObject;
+
+import org.opensaml.xml.XMLObject;
+
+import eu.stork.peps.auth.engine.core.EIDCrossSectorShare;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * The Class EIDCrossSectorShareImpl.
+ * 
+ * @author fjquevedo
+ */
+public class EIDCrossSectorShareImpl extends AbstractSAMLObject implements
+	EIDCrossSectorShare {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(EIDCrossSectorShareImpl.class.getName());
+	/** The citizen country code. */
+    private String eIDCrossSectorShare;
+
+
+    /**
+     * Instantiates a new eID cross sector share implementation.
+     * 
+     * @param namespaceURI the namespace URI
+     * @param elementLocalName the element local name
+     * @param namespacePrefix the namespace prefix
+     */
+    protected EIDCrossSectorShareImpl(final String namespaceURI,
+	    final String elementLocalName, final String namespacePrefix) {
+	super(namespaceURI, elementLocalName, namespacePrefix);
+    }
+    
+    
+  
+    /**
+     * Gets the eID cross sector share.
+     *
+     * @return the eID cross sector share
+     */
+    public final String getEIDCrossSectorShare() {
+    	return eIDCrossSectorShare;
+    }
+
+
+    /**
+     * Sets the eID cross sector share.
+     *
+     * @param newEIDCrossSectorShare the new eID cross sector share
+     */
+    public final void setEIDCrossSectorShare(String newEIDCrossSectorShare) {
+    	this.eIDCrossSectorShare = prepareForAssignment(this.eIDCrossSectorShare, newEIDCrossSectorShare);
+    }
+    
+    /**
+     * Gets the ordered children.
+     *
+     * @return the ordered children
+     */
+    public final List<XMLObject> getOrderedChildren() {
+	return null;
+    }
+
+    @Override
+    public int hashCode() {
+        LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
+        return super.hashCode();
+    }
+}
\ No newline at end of file