add new configuration files and update version numbers

8 files changed, 34 insertions, 125 deletions

diff --git a/id/server/data/deploy/conf/moa-id-configuration/moa-id-configtool.properties b/id/server/data/deploy/conf/moa-id-configuration/moa-id-configtool.properties
index b10913d69..162aa3cda 100644
--- a/id/server/data/deploy/conf/moa-id-configuration/moa-id-configtool.properties
+++ b/id/server/data/deploy/conf/moa-id-configuration/moa-id-configtool.properties
@@ -4,19 +4,45 @@
 *
 ******
 
-#General config
-general.login.deaktivate=false
-general.publicURLContext=https://localhost:8443/moa-id-configuration
-general.moaid.instance.url=https://localhost:8443/moa-id-auth
+
 
 general.defaultlanguage=de 
 general.ssl.certstore=certs/certstore
 general.ssl.truststore=certs/truststore
 
 general.moaconfig.key=ConfigurationEncryptionKey
-
 general.pvp.schemavalidation=true
 
+##Hibnerate configuration for MOA-ID 2.0 configuration
+hibernate.dialect=org.hibernate.dialect.MySQLDialect
+hibernate.connection.url=jdbc:mysql://localhost/moa-id-config?charSet=utf-8&autoReconnect=true
+hibernate.connection.charSet=utf-8
+hibernate.connection.driver_class=com.mysql.jdbc.Driver
+hibernate.connection.username=
+hibernate.connection.password=
+
+hibernate.hbm2ddl.auto=update
+hibernate.current_session_context_class=thread
+hibernate.transaction.flush_before_completion=true
+hibernate.transaction.auto_close_session=true
+hibernate.show_sql=false
+hibernate.format_sql=true
+hibernate.c3p0.acquire_increment=3
+hibernate.c3p0.idle_test_period=300
+hibernate.c3p0.timeout=300
+hibernate.c3p0.max_size=20
+hibernate.c3p0.max_statements=0
+hibernate.c3p0.min_size=3
+
+
+############################################################################
+####                             Deprecated                            #####
+############################################################################
+#General config
+general.login.deaktivate=false
+general.publicURLContext=https://localhost:8443/moa-id-configuration
+general.moaid.instance.url=https://localhost:8443/moa-id-auth
+
 ##Mail
 general.mail.host=smtp.localhost...
 #general.mail.host.port=
@@ -65,24 +91,3 @@ general.login.pvp2.keystore.authrequest.key.password=password
 
 #UserRequestCleanUP time in hours
 general.userrequests.cleanup.delay=18
-
-##Hibnerate configuration for MOA-ID 2.0 configuration
-hibernate.dialect=org.hibernate.dialect.MySQLDialect
-hibernate.connection.url=jdbc:mysql://localhost/moa-id-config?charSet=utf-8&autoReconnect=true
-hibernate.connection.charSet=utf-8
-hibernate.connection.driver_class=com.mysql.jdbc.Driver
-hibernate.connection.username=
-hibernate.connection.password=
-
-hibernate.hbm2ddl.auto=update
-hibernate.current_session_context_class=thread
-hibernate.transaction.flush_before_completion=true
-hibernate.transaction.auto_close_session=true
-hibernate.show_sql=false
-hibernate.format_sql=true
-hibernate.c3p0.acquire_increment=3
-hibernate.c3p0.idle_test_period=300
-hibernate.c3p0.timeout=300
-hibernate.c3p0.max_size=20
-hibernate.c3p0.max_statements=0
-hibernate.c3p0.min_size=3
\ No newline at end of file
diff --git a/id/server/data/deploy/conf/moa-id-configuration/transforms/TransformsInfoAuthBlockTable_DE_2.1.xml b/id/server/data/deploy/conf/moa-id-configuration/transforms/TransformsInfoAuthBlockTable_DE_3.0.xml
index 6afe1f36b..6afe1f36b 100644
--- a/id/server/data/deploy/conf/moa-id-configuration/transforms/TransformsInfoAuthBlockTable_DE_2.1.xml
+++ b/id/server/data/deploy/conf/moa-id-configuration/transforms/TransformsInfoAuthBlockTable_DE_3.0.xml
diff --git a/id/server/data/deploy/conf/moa-id/MOAIdentities.xsd b/id/server/data/deploy/conf/moa-id/MOAIdentities.xsd
deleted file mode 100644
index 91c7a6cc0..000000000
--- a/id/server/data/deploy/conf/moa-id/MOAIdentities.xsd
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!-- edited with XMLSPY v5 rel. 4 U (http://www.xmlspy.com) by Rudolf Schamberger (Stabsstelle IKT-Strategie) (Bundesrechenzentrum GmbH) -->

-<xs:schema targetNamespace="http://reference.e-government.gv.at/namespace/moa/20020822#/xmllpr20030814" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://reference.e-government.gv.at/namespace/moa/20020822#/xmllpr20030814" elementFormDefault="qualified" attributeFormDefault="unqualified">

-	<xs:element name="MOAIdentities">

-		<xs:annotation>

-			<xs:documentation>MOAIdentities provides a mapping from identities to parameters used in the XMLLoginParameterResolver of MOA-ID</xs:documentation>

-		</xs:annotation>

-		<xs:complexType>

-			<xs:sequence maxOccurs="unbounded">

-				<xs:element name="Mapping">

-					<xs:complexType>

-						<xs:sequence>

-							<xs:element name="Identity">

-								<xs:complexType>

-									<xs:choice>

-										<xs:element name="NamedIdentity" type="tns:NamedIdentityType"/>

-										<xs:element name="bPKIdentity" type="tns:bPKIdentitiyType"/>

-										<xs:element name="wbPKIdentity" type="tns:wbPKIdentitiyType"/>

-									</xs:choice>

-								</xs:complexType>

-							</xs:element>

-							<xs:element name="Parameters" type="tns:ParametersType"/>

-						</xs:sequence>

-					</xs:complexType>

-				</xs:element>

-			</xs:sequence>

-		</xs:complexType>

-	</xs:element>

-	<xs:complexType name="wbPKIdentitiyType">

-		<xs:simpleContent>

-			<xs:extension base="xs:boolean">

-				<xs:attribute name="wbPK" type="xs:string" use="required"/>

-			</xs:extension>

-		</xs:simpleContent>

-	</xs:complexType>

-	<xs:complexType name="bPKIdentitiyType">

-		<xs:simpleContent>

-			<xs:extension base="xs:boolean">

-				<xs:attribute name="bPK" type="xs:string" use="required"/>

-			</xs:extension>

-		</xs:simpleContent>

-	</xs:complexType>

-	<xs:complexType name="NamedIdentityType">

-		<xs:simpleContent>

-			<xs:extension base="xs:boolean">

-				<xs:attribute name="SurName" type="xs:string" use="required"/>

-				<xs:attribute name="GivenName" type="xs:string" use="required"/>

-				<xs:attribute name="BirthDate" type="xs:string" use="optional"/>

-			</xs:extension>

-		</xs:simpleContent>

-	</xs:complexType>

-	<xs:complexType name="ParametersType">

-		<xs:attribute name="UN" type="xs:string" use="optional"/>

-		<xs:attribute name="PW" type="xs:string" use="optional"/>

-		<xs:attribute name="Param1" type="xs:string" use="optional"/>

-		<xs:attribute name="Param2" type="xs:string" use="optional"/>

-		<xs:attribute name="Param3" type="xs:string" use="optional"/>

-	</xs:complexType>

-</xs:schema>

diff --git a/id/server/data/deploy/conf/moa-id/SampleIdentities.xml b/id/server/data/deploy/conf/moa-id/SampleIdentities.xml
deleted file mode 100644
index abda0bf64..000000000
--- a/id/server/data/deploy/conf/moa-id/SampleIdentities.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Beispielkonfiguration für den Einsatz der MOA-ID Proxy-Komponenten unter Einsatz eines speziellen XMLLoginParameterResolver 
-	 Damit kann unter Einsatz des XMLLoginParameterResolverPlainData (s.u.) eine Einschränkung von Benutzer für OA erfolgen. 	 -->
-<!-- Beispiel für ein Element ProxyComponent in der MOA-ID Konfigurationsdatei welches den XMLLoginParameterResolverPlainData 
-     mit der Benutzerdatei Identities.xml verwendet um sich über Basic Authentication (401) an einer Webseite anzumeldne 	     	-->
-     
-     
-<!--
-		<ProxyComponent configFileURL="oa/SampleOAConfiguration.xml" sessionTimeOut="600" 
-						loginParameterResolverImpl="at.gv.egovernment.moa.id.proxy.XMLLoginParameterResolverPlainData" 
-						loginParameterResolverConfiguration="Identities.xml">
-			<ConnectionParameter URL="http://www.digitales.oesterreich.gv.at/">
-			</ConnectionParameter>
-		</ProxyComponent>
--->
-<MOAIdentities xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#/xmllpr20030814" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://reference.e-government.gv.at/namespace/moa/20020822#/xmllpr20030814 MOAIdentities.xsd">
-	<!-- Eintrag aller Benutzer mit Berechtigung -->
-	<!-- Die Daten müssen in der Schreibweise wie in der Personenbindung (= Schreibweise des ZMRs) eingegeben werden -->
-
-	<!-- Benutzerin Kunz -->
-	<Mapping>
-		<Identity>
-			<NamedIdentity SurName="Kunz" GivenName="Karin Stella" BirthDate="1900-01-01">1</NamedIdentity>
-		</Identity>
-		<Parameters UN="KunzKS" PW="geheim"/>
-	</Mapping>
-	<!-- Benutzer Mustermann -->
-	<Mapping>
-		<Identity>
-			<NamedIdentity SurName="Mustermann-Fall" GivenName="Max Moriz" BirthDate="1900-01-01">1</NamedIdentity>
-		</Identity>
-		<Parameters UN="MustMM" PW="höchst?Geheim"/>
-	</Mapping>
-</MOAIdentities>
diff --git a/id/server/data/deploy/conf/moa-id/moa-id.properties b/id/server/data/deploy/conf/moa-id/moa-id.properties
index c330758c8..b01236506 100644
--- a/id/server/data/deploy/conf/moa-id/moa-id.properties
+++ b/id/server/data/deploy/conf/moa-id/moa-id.properties
@@ -5,10 +5,7 @@
 ******
 
 
-##General MOA-ID 2.0 Configuration
-
-#MOA-ID 2.0 XML configuration files (necessary, if inmemory database is used)
-#configuration.xml=$PATH_TO_CONFIG$/conf/moa-id/MOAIDConfiguration-2.0.xml
+##General MOA-ID 3.0 Configuration
 
 ##For Testing
 configuration.validation.certificate.QC.ignore=false
diff --git a/id/server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlockTable_DE_2.1.xml b/id/server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlockTable_DE_3.0.xml
index 6afe1f36b..6afe1f36b 100644
--- a/id/server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlockTable_DE_2.1.xml
+++ b/id/server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlockTable_DE_3.0.xml
diff --git a/id/server/data/deploy/conf/moa-spss/SampleMOASPSSConfiguration.xml b/id/server/data/deploy/conf/moa-spss/SampleMOASPSSConfiguration.xml
index 19fd9d264..9d130971d 100644
--- a/id/server/data/deploy/conf/moa-spss/SampleMOASPSSConfiguration.xml
+++ b/id/server/data/deploy/conf/moa-spss/SampleMOASPSSConfiguration.xml
@@ -84,8 +84,8 @@
 			<cfg:Location>profiles/MOAIDTransformAuthBlockTable_DE_2.0.xml</cfg:Location>
 		</cfg:VerifyTransformsInfoProfile>
 		<cfg:VerifyTransformsInfoProfile>
-			<cfg:Id>MOAIDTransformAuthBlockTable_DE_2.1</cfg:Id>
-			<cfg:Location>profiles/MOAIDTransformAuthBlockTable_DE_2.1.xml</cfg:Location>
+			<cfg:Id>MOAIDTransformAuthBlockTable_DE_3.0</cfg:Id>
+			<cfg:Location>profiles/MOAIDTransformAuthBlockTable_DE_3.0.xml</cfg:Location>
 		</cfg:VerifyTransformsInfoProfile>
 		<cfg:VerifyTransformsInfoProfile>
 			<cfg:Id>MOAIDTransformAuthBlockTable_DE</cfg:Id>
diff --git a/id/server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlockTable_DE_2.1.xml b/id/server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlockTable_DE_3.0.xml
index df3ce8ce6..df3ce8ce6 100644
--- a/id/server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlockTable_DE_2.1.xml
+++ b/id/server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlockTable_DE_3.0.xml