Merge branch 'moa-2.1-Snapshot'

Conflicts:
	id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OATargetConfiguration.java
	pom.xml

1 files changed, 0 insertions, 126 deletions

diff --git a/id/server/doc/conf/moa-id/moa-id.properties b/id/server/doc/conf/moa-id/moa-id.properties
deleted file mode 100644
index e8a75c348..000000000
--- a/id/server/doc/conf/moa-id/moa-id.properties
+++ /dev/null
@@ -1,126 +0,0 @@
-********
-*
-*$PATH_TO_CONFIG$ muss durch den eigentlichen Pfad ersetzt werden!
-*
-******
-
-
-##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
-
-##For Testing
-configuration.validation.certificate.QC.ignore=false
-protocols.pvp2.assertion.encryption.active=false
-
-##General MOA-ID 2.0 operations
-#MOA-ID 2.0 session information encryption key (PassPhrase)
-configuration.moasession.key=SessionEncryptionKey
-
-#MOA-ID 2.0 Monitoring Servlet
-configuration.monitoring.active=false
-configuration.monitoring.message.success=All Tests passed!
-configuration.monitoring.test.identitylink.url=$PATH_TO_CONFIG$/conf/moa-id/monitoring/monitoring_idl.xml
-
-#MOA-ID 2.0 Advanced Logging
-configuration.advancedlogging.active=false
-
-##Webservice Client Configuration
-#MOA-SP webservice
-#service.moasp.acceptedServerCertificates=
-#service.moasp.clientKeyStore=
-#service.moasp.clientKeyStorePassword=
-
-#Online mandates webservice (MIS)
-service.onlinemandates.acceptedServerCertificates=
-service.onlinemandates.clientKeyStore=keys/....
-service.onlinemandates.clientKeyStorePassword=
-
-#Foreign Identities (SZRGW)
-service.foreignidentities.acceptedServerCertificates=
-service.foreignidentities.clientKeyStore=keys/....
-service.foreignidentities.clientKeyStorePassword=
-
-
-##Protocol configuration##
-#PVP2
-protocols.pvp2.idp.ks.file=file:$PATH_TO_CONFIG$/conf/moa-id/keys/moa_idp[password].p12
-protocols.pvp2.idp.ks.kspassword=password
-protocols.pvp2.idp.ks.metadata.alias=pvp_metadata
-protocols.pvp2.idp.ks.metadata.keypassword=password
-protocols.pvp2.idp.ks.assertion.sign.alias=pvp_assertion
-protocols.pvp2.idp.ks.assertion.sign.keypassword=password
-protocols.pvp2.idp.ks.assertion.encryption.alias=pvp_assertion
-protocols.pvp2.idp.ks.assertion.encryption.keypassword=password
-
-#OpenID connect (OAuth)
-protocols.oauth20.jwt.ks.file=file:$PATH_TO_CONFIG$/conf/moa-id/keys/moa_idp[password].p12
-protocols.oauth20.jwt.ks.password=password
-protocols.oauth20.jwt.ks.key.name=oauth
-protocols.oauth20.jwt.ks.key.password=password
-
-##Database configuration##
-#Hibnerate configuration for MOA-ID 2.0 session store 
-moasession.hibernate.dialect=org.hibernate.dialect.MySQLDialect
-moasession.hibernate.connection.url=jdbc:mysql://localhost/moa-id-session?charSet=utf-8
-moasession.hibernate.connection.charSet=utf-8
-moasession.hibernate.connection.driver_class=com.mysql.jdbc.Driver
-moasession.hibernate.connection.username=
-moasession.hibernate.connection.password=
-
-moasession.hibernate.hbm2ddl.auto=update
-moasession.hibernate.current_session_context_class=thread
-moasession.hibernate.transaction.flush_before_completion=true
-moasession.hibernate.transaction.auto_close_session=true
-moasession.hibernate.show_sql=false
-moasession.hibernate.format_sql=true
-moasession.hibernate.c3p0.acquire_increment=3
-moasession.hibernate.c3p0.idle_test_period=60
-moasession.hibernate.c3p0.timeout=60
-moasession.hibernate.c3p0.max_size=20
-moasession.hibernate.c3p0.max_statements=0
-moasession.hibernate.c3p0.min_size=3
-
-#Hibnerate configuration for MOA-ID 2.0 configuration
-configuration.hibernate.dialect=org.hibernate.dialect.MySQLDialect
-configuration.hibernate.connection.url=jdbc:mysql://localhost/moa-id-config?charSet=utf-8&autoReconnect=true
-configuration.hibernate.connection.charSet=utf-8
-configuration.hibernate.connection.driver_class=com.mysql.jdbc.Driver
-configuration.hibernate.connection.username=
-configuration.hibernate.connection.password=
-
-configuration.hibernate.hbm2ddl.auto=update
-configuration.hibernate.current_session_context_class=thread
-configuration.hibernate.transaction.auto_close_session=true
-configuration.hibernate.show_sql=false
-configuration.hibernate.format_sql=true
-configuration.hibernate.connection.provider_class=org.hibernate.service.jdbc.connections.internal.C3P0ConnectionProvider
-configuration.hibernate.c3p0.acquire_increment=3
-configuration.hibernate.c3p0.idle_test_period=60
-configuration.hibernate.c3p0.timeout=300
-configuration.hibernate.c3p0.max_size=20
-configuration.hibernate.c3p0.max_statements=0
-configuration.hibernate.c3p0.min_size=3
-
-#
-#Hibnerate configuration for MOA-ID 2.0 advanced statistic logging
-advancedlogging.hibernate.dialect=org.hibernate.dialect.MySQLDialect
-advancedlogging.hibernate.connection.url=jdbc:mysql://localhost/moa-id-statistic?charSet=utf-8&autoReconnect=true
-advancedlogging.hibernate.connection.charSet=utf-8
-advancedlogging.hibernate.connection.driver_class=com.mysql.jdbc.Driver
-advancedlogging.hibernate.connection.username=
-advancedlogging.hibernate.connection.password=
-
-advancedlogging.hibernate.hbm2ddl.auto=update
-advancedlogging.hibernate.current_session_context_class=thread
-advancedlogging.hibernate.transaction.auto_close_session=true
-advancedlogging.hibernate.show_sql=false
-advancedlogging.hibernate.format_sql=true
-advancedlogging.hibernate.connection.provider_class=org.hibernate.service.jdbc.connections.internal.C3P0ConnectionProvider
-advancedlogging.hibernate.c3p0.acquire_increment=3
-advancedlogging.hibernate.c3p0.idle_test_period=60
-advancedlogging.hibernate.c3p0.timeout=300
-advancedlogging.hibernate.c3p0.max_size=20
-advancedlogging.hibernate.c3p0.max_statements=0
-advancedlogging.hibernate.c3p0.min_size=3