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

diff --git a/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/AttributeProvider.java.svn-base b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/AttributeProvider.java.svn-base
new file mode 100644
index 000000000..5fb04e331
--- /dev/null
+++ b/id/server/legacy-backup/stork2-commons/src/main/java/eu/stork/peps/auth/commons/.svn/text-base/AttributeProvider.java.svn-base
@@ -0,0 +1,80 @@
+package eu.stork.peps.auth.commons;
+
+import java.io.Serializable;
+
+/**
+ * This class is a bean used to store the information relative to the Attribute Provider.
+ * 
+ * @author Stelios Lelis (stelios.lelis@aegean.gr), Elias Pastos (ilias@aegean.gr)
+ *
+ * @version $Revision: 1.01 $, $Date: 2013-11-28 $
+ */
+public final class AttributeProvider implements Serializable {
+  /**
+   * Unique identifier.
+   */
+  private static final long serialVersionUID = 7210186241917444559L;
+
+ /**
+   * Provider Id.
+   */
+  private String providerId;
+  
+  /**
+   * Provider Name.
+   */
+  private String providerName;
+
+  /**
+   * Attribute Provider Constructor.
+   * 
+   * @param pId Id of the Attribute Provider.
+   * @param pName Name of the Attribute Provider.
+   */
+  public AttributeProvider(final String pId, final String pName) {
+    
+    this.providerId = pId;
+    this.providerName = pName;
+  }
+  
+  /**
+   * Getter for the providerId value.
+   * 
+   * @return The providerId value.
+   */
+  public String getProviderId() {
+    
+    return providerId;
+  }
+  
+  /**
+   * Setter for the providerId value.
+   * 
+   * @param pId Id of the Attribute Provider.
+   */
+  public void setProviderId(final String pId) {
+    
+    this.providerId = pId;
+  }
+  
+  /**
+   * Getter for the providerName value.
+   * 
+   * @return The providerName value.
+   */
+  public String getProviderName() {
+    
+    return providerName;
+  }
+  
+  /**
+   * Setter for the providerName value.
+   * 
+   * @param name Name of the Attribute Provider.
+   */
+  public void setProviderName(final String name) {
+    
+    this.providerName = name;
+  }
+  
+}