Merge branch 'new_key-value_solution' into moa-id-3.0.0-snapshot

Conflicts:
	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/modules/internal/tasks/GetMISSessionIDTask.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/auth/servlet/VerifyAuthenticationBlockServlet.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyIdentityLinkServlet.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/OAParameter.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/data/DynamicOAAuthParameters.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/SSOManager.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/protocol/OAuth20AuthRequest.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/protocol/OAuth20TokenRequest.java
	id/server/moa-id-commons/pom.xml
	id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/CreateStorkAuthRequestFormTask.java
	pom.xml

5 files changed, 0 insertions, 78 deletions

diff --git a/id/server/moa-id-commons/src/main/resources/config/bindings.xjb b/id/server/moa-id-commons/src/main/resources/config/bindings.xjb
deleted file mode 100644
index 21714849b..000000000
--- a/id/server/moa-id-commons/src/main/resources/config/bindings.xjb
+++ /dev/null
@@ -1,35 +0,0 @@
-<jaxb:bindings version="2.1"
-	xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
-	xmlns:hj="http://hyperjaxb3.jvnet.org/ejb/schemas/customizations"
-	xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
-	jaxb:extensionBindingPrefixes="hj">
-	
-	<jaxb:bindings schemaLocation="moaid_config_2.0.xsd" node="/xsd:schema">
-		<jaxb:globalBindings localScoping="toplevel">
-			<jaxb:serializable/>
-       <xjc:javaType  name="java.lang.Boolean" 
-                      xmlType="xsd:boolean" 
-                      adapter="com.sun.tools.xjc.runtime.ZeroOneBooleanAdapter"/>
-		</jaxb:globalBindings>
-	</jaxb:bindings>
-	
-	<jaxb:bindings  schemaLocation="moaid_config_2.0.xsd" node="/xsd:schema/xsd:element[@name='C-PEPS']//xsd:element[@ref='OA_STORK']">
-  	<hj:many-to-many name="OA_STORK">
-    	<orm:join-table name="OA_CPEPS">
-      	<orm:join-column name="aid" referenced-column-name="hjid" />
-        <orm:inverse-join-column name="bid" referenced-column-name="hjid" />
-      </orm:join-table>
-		</hj:many-to-many>
-	</jaxb:bindings>
-	
-	<jaxb:bindings  schemaLocation="moaid_config_2.0.xsd" node="/xsd:schema/xsd:element[@name='OA_STORK']//xsd:element[@ref='C-PEPS']">
-		<hj:many-to-many name="CPEPS" mappedBy="OA_STORK">
-    	 <hj:cascade>
-      	 <hj:cascade-persist/>
-       </hj:cascade>
-		</hj:many-to-many>	
-	</jaxb:bindings>
-	
-</jaxb:bindings>
\ No newline at end of file
diff --git a/id/server/moa-id-commons/src/main/resources/config/hibernate_moasession.cfg.xml b/id/server/moa-id-commons/src/main/resources/config/hibernate_moasession.cfg.xml
deleted file mode 100644
index e40c8b8a9..000000000
--- a/id/server/moa-id-commons/src/main/resources/config/hibernate_moasession.cfg.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<!DOCTYPE hibernate-configuration PUBLIC
-"-//Hibernate/Hibernate Configuration DTD 3.0//EN"
-"http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">
-
-<hibernate-configuration>
-    <session-factory>
-      <!-- MOA Session handling mapping files -->
-      <mapping class="at.gv.egovernment.moa.id.commons.db.dao.session.AssertionStore"/>
-      <mapping class="at.gv.egovernment.moa.id.commons.db.dao.session.AuthenticatedSessionStore"/>
-      <mapping class="at.gv.egovernment.moa.id.commons.db.dao.session.OASessionStore"/>
-      <mapping class="at.gv.egovernment.moa.id.commons.db.dao.session.OldSSOSessionIDStore"/>
-      <mapping class="at.gv.egovernment.moa.id.commons.db.dao.session.ExceptionStore"/>
-    </session-factory>
-</hibernate-configuration>
\ No newline at end of file
diff --git a/id/server/moa-id-commons/src/main/resources/config/hibernate_statistic.cfg.xml b/id/server/moa-id-commons/src/main/resources/config/hibernate_statistic.cfg.xml
deleted file mode 100644
index aa77a9c67..000000000
--- a/id/server/moa-id-commons/src/main/resources/config/hibernate_statistic.cfg.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<!DOCTYPE hibernate-configuration PUBLIC
-"-//Hibernate/Hibernate Configuration DTD 3.0//EN"
-"http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">
-
-<hibernate-configuration>
-    <session-factory>
-      <!-- MOA advanced statistic handling mapping files -->
-      <mapping class="at.gv.egovernment.moa.id.commons.db.dao.statistic.StatisticLog"/>
-    </session-factory>
-</hibernate-configuration>
\ No newline at end of file
diff --git a/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd b/id/server/moa-id-commons/src/main/resources/config/moaid_config_3.0.xsd
index d4686bd5e..d4686bd5e 100644
--- a/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd
+++ b/id/server/moa-id-commons/src/main/resources/config/moaid_config_3.0.xsd
diff --git a/id/server/moa-id-commons/src/main/resources/config/persistence_template.xml b/id/server/moa-id-commons/src/main/resources/config/persistence_template.xml
deleted file mode 100644
index 25092ff58..000000000
--- a/id/server/moa-id-commons/src/main/resources/config/persistence_template.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<persistence version="1.0" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd
-http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:orm="http://java.sun.com/xml/ns/persistence/orm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <persistence-unit name="##generated">
-			<!-- <class>at.gv.egovernment.moa.id.commons.db.dao.config.UserDatabase</class> -->
-			
-<!-- 			<properties>
-			    C3p0 connection pooling configuration
-					<property name="hibernate.connection.provider_class" value="org.hibernate.service.jdbc.connections.internal.C3P0ConnectionProvider"/>
-          <property name="hibernate.connection.provider_class" value="org.hibernate.service.jdbc.connections.internal.C3P0ConnectionProvider"/>
-          <property name="acquireRetryDelay" value="5000"/>
-  				<property name="breakAfterAcquireFailure" value="true"/>
-	 				<property name="checkoutTimeout" value="1"/>
-   				<property name="testConnectionOnCheckin" value="1" />
-			</properties>		 -->			
-    </persistence-unit>
-</persistence>