aboutsummaryrefslogtreecommitdiff
path: root/id/server
diff options
context:
space:
mode:
Diffstat (limited to 'id/server')
-rw-r--r--id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml10
-rw-r--r--id/server/idserverlib/src/main/resources/session.common.beans.xml19
-rw-r--r--id/server/moa-id-commons/src/main/resources/statistic.logging.beans.xml21
3 files changed, 4 insertions, 46 deletions
diff --git a/id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml b/id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml
index 6f32926e0..26fd1f986 100644
--- a/id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml
+++ b/id/server/idserverlib/src/main/resources/moaid.authentication.beans.xml
@@ -84,13 +84,7 @@
<bean id="MOASAML2SubjectNameIDGenerator"
class="at.gv.egovernment.moa.id.auth.builder.MOAIDSubjectNameIdGenerator" />
-
-<!-- <bean id="taskExecutor" class="org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor">
- <property name="corePoolSize" value="5" />
- <property name="maxPoolSize" value="10" />
- <property name="queueCapacity" value="25" />
- </bean> -->
-
+
<!-- Authentication Process Tasks -->
<bean id="GenerateBKUSelectionFrameTask"
class="at.gv.egovernment.moa.id.auth.modules.internal.tasks.GenerateBKUSelectionFrameTask"
@@ -119,7 +113,7 @@
<beans profile="advancedLogOff">
<bean id="StatisticLogger"
- class="at.gv.egovernment.moa.id.advancedlogging.DummyStatisticLogger"/>
+ class="at.gv.egiz.eaaf.core.impl.logging.DummyStatisticLogger"/>
</beans>
</beans>
diff --git a/id/server/idserverlib/src/main/resources/session.common.beans.xml b/id/server/idserverlib/src/main/resources/session.common.beans.xml
index bd3db0a5e..2591879cd 100644
--- a/id/server/idserverlib/src/main/resources/session.common.beans.xml
+++ b/id/server/idserverlib/src/main/resources/session.common.beans.xml
@@ -33,22 +33,7 @@
<property name="validationQuery" value="${moasession.dbcp.validationQuery}" />
</bean>
-<!-- <bean id="sessionSessionFactory" class="org.springframework.orm.hibernate5.LocalSessionFactoryBean">
- <property name="dataSource" ref="sessionDataSource"/>
- <property name="packagesToScan" value="at.gv.egovernment.moa.id.commons.db.dao.session" />
- <property name="hibernateProperties">
- <props>
- <prop key="hibernate.dialect">${moasession.hibernate.dialect}</prop>
- <prop key="hibernate.show_sql">${moasession.hibernate.show_sql}</prop>
- <prop key="hibernate.hbm2ddl.auto">${moasession.hibernate.hbm2ddl.auto}</prop>
- <prop key="current_session_context_class">${moasession.hibernate.current_session_context_class}</prop>
- <prop key="hibernate.transaction.flush_before_completion">${moasession.hibernate.transaction.flush_before_completion}</prop>
- <prop key="hibernate.transaction.auto_close_session">${moasession.hibernate.transaction.auto_close_session}</prop>
- </props>
- </property>
- </bean> -->
-
- <!-- MYSQL Conector -->
+ <!-- MYSQL Connector -->
<tx:annotation-driven transaction-manager="sessionTransactionManager"/>
<bean id="sessionJpaVendorAdapter" class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter">
@@ -68,6 +53,4 @@
<property name="entityManagerFactory" ref="session" />
</bean>
- <!-- bean id="moaSessionDBUtils" class="at.gv.egovernment.moa.id.commons.db.MOASessionDBUtils"/-->
-
</beans> \ No newline at end of file
diff --git a/id/server/moa-id-commons/src/main/resources/statistic.logging.beans.xml b/id/server/moa-id-commons/src/main/resources/statistic.logging.beans.xml
index 9b00ff3cd..96808f2c5 100644
--- a/id/server/moa-id-commons/src/main/resources/statistic.logging.beans.xml
+++ b/id/server/moa-id-commons/src/main/resources/statistic.logging.beans.xml
@@ -32,26 +32,7 @@
<property name="testWhileIdle" value="${advancedlogging.dbcp.testWhileIdle}" />
<property name="validationQuery" value="${advancedlogging.dbcp.validationQuery}" />
</bean>
-
-<!-- <bean id="statisticLogSessionFactory" class="org.springframework.orm.hibernate5.LocalSessionFactoryBean">
- <property name="dataSource" ref="statisticLogDataSource"/>
- <property name="packagesToScan" value="at.gv.egovernment.moa.id.commons.db.dao.statistic" />
- <property name="hibernateProperties">
-
- <props>
- <prop key="hibernate.dialect">${advancedlogging.hibernate.dialect}</prop>
- <prop key="hibernate.show_sql">${advancedlogging.hibernate.show_sql}</prop>
- <prop key="hibernate.hbm2ddl.auto">${advancedlogging.hibernate.hbm2ddl.auto}</prop>
- <prop key="current_session_context_class">${advancedlogging.hibernate.current_session_context_class}</prop>
- <prop key="hibernate.transaction.flush_before_completion">${advancedlogging.hibernate.transaction.flush_before_completion}</prop>
- <prop key="hibernate.transaction.auto_close_session">${advancedlogging.hibernate.transaction.auto_close_session}</prop>
- </props>
- </property>
- </bean> -->
-
-
- <!-- bean id="statisticLogDBUtils" class="at.gv.egovernment.moa.id.commons.db.StatisticLogDBUtils"/-->
-
+
<bean name="statisticLogTransactionManager" id="statisticLogTransactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
<property name="entityManagerFactory" ref="statistic" />
</bean>