using annotations for hibernate configuration now

4 files changed, 14 insertions, 8 deletions

diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/MOASessionDBUtils.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/MOASessionDBUtils.java
index a3d833f62..5cdd607ac 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/MOASessionDBUtils.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/MOASessionDBUtils.java
@@ -30,6 +30,7 @@ import org.hibernate.SessionFactory;
 import org.hibernate.Transaction;
 import org.hibernate.cfg.Configuration;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -43,6 +44,7 @@ public class MOASessionDBUtils {
    private SessionFactory sessionFactory;
 
 	@Autowired
+	@Qualifier("sessionSessionFactory") 
 	public void setSessionFactory(SessionFactory sessionFactory) {
 		this.sessionFactory = sessionFactory;
 	}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/StatisticLogDBUtils.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/StatisticLogDBUtils.java
index f8ea1c8f6..51bb0eb6d 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/StatisticLogDBUtils.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/StatisticLogDBUtils.java
@@ -29,6 +29,7 @@ import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.cfg.Configuration;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.transaction.annotation.Transactional;
 
 import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException;
@@ -36,11 +37,12 @@ import at.gv.egovernment.moa.logging.Logger;
 
 @Transactional("statisticLogTransactionManager")
 public class StatisticLogDBUtils {
-
+ 
 	   private SessionFactory sessionFactory;
 
 		@Autowired
-		public void setSessionFactory(SessionFactory sessionFactory) {
+		@Qualifier("statisticLogSessionFactory") 
+		public void setstatisticLogSessionFactory(SessionFactory sessionFactory) {
 			this.sessionFactory = sessionFactory;
 		}
 
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/statistic/StatisticLog.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/statistic/StatisticLog.java
index 97f26812f..ba48f8caf 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/statistic/StatisticLog.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/statistic/StatisticLog.java
@@ -39,7 +39,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 
 @Entity
-@DynamicUpdate(value=true)
+//@DynamicUpdate(value=true)
 @Table(name = "statisticlog")
 @NamedQueries({
     @NamedQuery(name="getAllEntriesNotBeforeTimeStamp", query = "select statisiclog from StatisticLog statisiclog where statisiclog.timestamp > :timeout")
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 fc8edf44e..5f80c6439 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
@@ -11,8 +11,8 @@
 		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
 		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
 
-	<context:annotation-config/>
-	
+	<context:annotation-config></context:annotation-config>
+	<tx:annotation-driven transaction-manager="statisticLogTransactionManager"/>
 				
     <bean id="statisticLogDataSource" class="org.apache.commons.dbcp2.BasicDataSource" lazy-init="true" destroy-method="close">
 		<aop:scoped-proxy/>
@@ -35,7 +35,9 @@
 	
 	<bean id="statisticLogSessionFactory" class="org.springframework.orm.hibernate4.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>
@@ -52,7 +54,7 @@
     </bean>
     
     <bean name="statisticLogTransactionManager" id="statisticLogTransactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
-		<property name="entityManagerFactory" ref="statisticEntityManagerFactory" />
+		<property name="entityManagerFactory" ref="statistic" />
 	</bean> 
 	
 	<bean id="statisticJpaVendorAdapter" class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter">
@@ -61,13 +63,13 @@
 		<property name="databasePlatform" value="${advancedlogging.hibernate.dialect}" />
 	</bean>
 	
-	<bean name="statisticLog" id="statisticEntityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
+	<bean name="statistic" id="statistic" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
 		<property name="dataSource" ref="statisticLogDataSource" />
 		<property name="jpaVendorAdapter" ref="statisticJpaVendorAdapter" />
 		<property name="packagesToScan" value="at.gv.egovernment.moa.id.commons.db.dao.statistic" />
 		<property name="persistenceUnitName" value="statistic" />
 	</bean> 
-	<tx:annotation-driven transaction-manager="statisticLogTransactionManager"/>
+	
 
 	
 </beans>
\ No newline at end of file