Merge branch 'multiple_IDP_publicURLPrefixes' into moa-id-3.0.0-snapshot

Conflicts:
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthConstants.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GenerateIFrameTemplateServlet.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/assertion/PVP2AssertionBuilder.java

2 files changed, 34 insertions, 0 deletions

diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/session/InterfederationSessionStore.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/session/InterfederationSessionStore.java
index 7b298a7d9..54216edc4 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/session/InterfederationSessionStore.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/session/InterfederationSessionStore.java
@@ -62,6 +62,9 @@ public class InterfederationSessionStore implements Serializable{
 	@Column(name = "QAALevel", unique=false, nullable=false)
 	private String QAALevel;
 	
+	@Column(name = "authURL", unique=false, nullable=false)
+	private String authURL;
+	
 	@Column(name = "attributesRequested", unique=false, nullable=true)
 	private boolean attributesRequested;
 	
@@ -207,6 +210,20 @@ public class InterfederationSessionStore implements Serializable{
 		this.storeSSOInformation = storeSSOInformation;
 	}
 
+	/**
+	 * @return the authURL
+	 */
+	public String getAuthURL() {
+		return authURL;
+	}
+
+	/**
+	 * @param authURL the authURL to set
+	 */
+	public void setAuthURL(String authURL) {
+		this.authURL = authURL;
+	}
+
 	
 
 }
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/session/OASessionStore.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/session/OASessionStore.java
index 0daeba40e..8b720e901 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/session/OASessionStore.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/session/OASessionStore.java
@@ -65,6 +65,9 @@ public class OASessionStore implements Serializable{
 	@Column(name = "protocolType", unique=false, nullable=true)
 	private String protocolType;
 	
+	@Column(name = "authURL", unique=false, nullable=false)
+	private String authURL;
+	
 	@Column(name = "attributequeryused", unique=false, nullable=false)
 	private boolean attributeQueryUsed = false;
 	
@@ -183,6 +186,20 @@ public class OASessionStore implements Serializable{
 		this.userNameIDFormat = userNameIDFormat;
 	}
 
+	/**
+	 * @return the authURL
+	 */
+	public String getAuthURL() {
+		return authURL;
+	}
+
+	/**
+	 * @param authURL the authURL to set
+	 */
+	public void setAuthURL(String authURL) {
+		this.authURL = authURL;
+	}
+