[jboss-svn-commits] JBL Code SVN: r34716 - in labs/jbossrules/branches/5_1_20100802_esteban_diega/drools-process/drools-persistent-timer: drools-timer-persistence/src/main/resources/META-INF and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sat Aug 14 13:48:05 EDT 2010
Author: diegoll
Date: 2010-08-14 13:48:04 -0400 (Sat, 14 Aug 2010)
New Revision: 34716
Removed:
labs/jbossrules/branches/5_1_20100802_esteban_diega/drools-process/drools-persistent-timer/drools-timer-persistence/src/main/resources/jndi.properties
labs/jbossrules/branches/5_1_20100802_esteban_diega/drools-process/drools-persistent-timer/drools-timer-scheduler/src/test/resources/jndi.properties
Modified:
labs/jbossrules/branches/5_1_20100802_esteban_diega/drools-process/drools-persistent-timer/drools-timer-persistence/src/main/resources/META-INF/persistence.xml
labs/jbossrules/branches/5_1_20100802_esteban_diega/drools-process/drools-persistent-timer/drools-timer-scheduler/pom.xml
labs/jbossrules/branches/5_1_20100802_esteban_diega/drools-process/drools-persistent-timer/drools-timer-scheduler/src/main/resources/schedulerContext.xml
labs/jbossrules/branches/5_1_20100802_esteban_diega/drools-process/drools-persistent-timer/drools-timer-scheduler/src/test/resources/META-INF/persistence.xml
Log:
[JBRULES-2616] removed bitronix dependency
Modified: labs/jbossrules/branches/5_1_20100802_esteban_diega/drools-process/drools-persistent-timer/drools-timer-persistence/src/main/resources/META-INF/persistence.xml
===================================================================
--- labs/jbossrules/branches/5_1_20100802_esteban_diega/drools-process/drools-persistent-timer/drools-timer-persistence/src/main/resources/META-INF/persistence.xml 2010-08-14 15:02:39 UTC (rev 34715)
+++ labs/jbossrules/branches/5_1_20100802_esteban_diega/drools-process/drools-persistent-timer/drools-timer-persistence/src/main/resources/META-INF/persistence.xml 2010-08-14 17:48:04 UTC (rev 34716)
@@ -1,15 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<persistence version="1.0" 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" 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">
- <persistence-unit name="org.drools.timer.persistence.jpa" transaction-type="JTA">
+ <persistence-unit name="org.drools.timer.persistence.jpa" transaction-type="RESOURCE_LOCAL">
<provider>org.hibernate.ejb.HibernatePersistence</provider>
<jta-data-source>jdbc/timersDS</jta-data-source>
<class>org.drools.timer.persistence.model.TimerState</class>
<properties>
<property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>
- <property name="hibernate.max_fetch_depth" value="3"/>
- <property name="hibernate.hbm2ddl.auto" value="update" />
+ <property name="hibernate.max_fetch_depth" value="3"/>
+ <property name="hibernate.hbm2ddl.auto" value="update" />
<property name="hibernate.show_sql" value="true" />
- <property name="hibernate.transaction.manager_lookup_class" value="org.hibernate.transaction.BTMTransactionManagerLookup" />
- </properties>
+ </properties>
</persistence-unit>
</persistence>
\ No newline at end of file
Deleted: labs/jbossrules/branches/5_1_20100802_esteban_diega/drools-process/drools-persistent-timer/drools-timer-persistence/src/main/resources/jndi.properties
===================================================================
--- labs/jbossrules/branches/5_1_20100802_esteban_diega/drools-process/drools-persistent-timer/drools-timer-persistence/src/main/resources/jndi.properties 2010-08-14 15:02:39 UTC (rev 34715)
+++ labs/jbossrules/branches/5_1_20100802_esteban_diega/drools-process/drools-persistent-timer/drools-timer-persistence/src/main/resources/jndi.properties 2010-08-14 17:48:04 UTC (rev 34716)
@@ -1 +0,0 @@
-java.naming.factory.initial=bitronix.tm.jndi.BitronixInitialContextFactory
\ No newline at end of file
Modified: labs/jbossrules/branches/5_1_20100802_esteban_diega/drools-process/drools-persistent-timer/drools-timer-scheduler/pom.xml
===================================================================
--- labs/jbossrules/branches/5_1_20100802_esteban_diega/drools-process/drools-persistent-timer/drools-timer-scheduler/pom.xml 2010-08-14 15:02:39 UTC (rev 34715)
+++ labs/jbossrules/branches/5_1_20100802_esteban_diega/drools-process/drools-persistent-timer/drools-timer-scheduler/pom.xml 2010-08-14 17:48:04 UTC (rev 34716)
@@ -16,7 +16,6 @@
<groupId>org.drools</groupId>
<artifactId>drools-timer-messages</artifactId>
</dependency>
-
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-timer-persistence</artifactId>
@@ -72,20 +71,6 @@
<artifactId>spring-jdbc</artifactId>
</dependency>
- <!-- HSQLDB -->
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <scope>test</scope>
- </dependency>
-
- <!-- Bixtronix -->
- <dependency>
- <groupId>org.codehaus.btm</groupId>
- <artifactId>btm</artifactId>
- <scope>test</scope>
- </dependency>
-
<!-- Quartz -->
<dependency>
<groupId>org.opensymphony.quartz</groupId>
@@ -125,6 +110,11 @@
<version>4.8.1</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
Modified: labs/jbossrules/branches/5_1_20100802_esteban_diega/drools-process/drools-persistent-timer/drools-timer-scheduler/src/main/resources/schedulerContext.xml
===================================================================
--- labs/jbossrules/branches/5_1_20100802_esteban_diega/drools-process/drools-persistent-timer/drools-timer-scheduler/src/main/resources/schedulerContext.xml 2010-08-14 15:02:39 UTC (rev 34715)
+++ labs/jbossrules/branches/5_1_20100802_esteban_diega/drools-process/drools-persistent-timer/drools-timer-scheduler/src/main/resources/schedulerContext.xml 2010-08-14 17:48:04 UTC (rev 34716)
@@ -14,10 +14,6 @@
<property name="timerScheduler" ref="timerScheduler"/>
</bean>
- <bean id="timerMessageConsumer" factory-bean="clientSession" factory-method="createConsumer" destroy-method="close">
- <constructor-arg value="timerServiceMessages"/>
- </bean>
-
<bean id="timerScheduler" class="org.drools.timer.scheduler.TimerScheduler">
<property name="scheduler" ref="scheduler" />
<property name="timerPersistence" ref="jpaTimerPersistence" />
@@ -45,57 +41,43 @@
</property>
</bean>
+ <!-- persistence -->
<bean id="jpaTimerPersistence" class="org.drools.timer.persistence.JPATimerPersistence" >
<property name="entityManagerFactory" ref="entityManagerFactory" />
</bean>
- <bean id="clientSession" factory-bean="clientSessionFactory" factory-method="createSession" init-method="start"/>
-
- <bean id="dataSource" class="bitronix.tm.resource.jdbc.PoolingDataSource" init-method="init" destroy-method="close">
- <property name="className" value="org.h2.jdbcx.JdbcDataSource" />
- <property name="uniqueName" value="jdbc/timersDS" />
- <property name="minPoolSize" value="0" />
- <property name="maxPoolSize" value="3" />
- <property name="allowLocalTransactions" value="true" />
- <property name="driverProperties">
- <props>
- <prop key="user">sa</prop>
- <prop key="password">sasa</prop>
- <prop key="URL">jdbc:h2:mem:mydb</prop>
- </props>
- </property>
+ <bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
+ <property name="dataSource" ref="dataSource" />
+ <property name="persistenceUnitName" value="org.drools.timer.persistence.jpa" />
</bean>
-
- <!-- Bitronix Transaction Manager embedded configuration -->
- <bean id="btmConfig" factory-method="getConfiguration" class="bitronix.tm.TransactionManagerServices">
- <property name="serverId" value="spring-btm" />
+
+ <bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
+ <property name="driverClassName" value="${datasource.driverClassName}" />
+ <property name="url" value="${datasource.url}" />
+ <property name="username" value="${datasource.username}" />
+ <property name="password" value="${datasource.password}" />
</bean>
- <!-- create BTM transaction manager -->
- <bean id="bitronixTransactionManager" factory-method="getTransactionManager" class="bitronix.tm.TransactionManagerServices" depends-on="btmConfig, dataSource" destroy-method="shutdown" />
-
- <!-- Spring JtaTransactionManager -->
- <bean id="transactionManager" class="org.springframework.transaction.jta.JtaTransactionManager">
- <property name="transactionManager" ref="bitronixTransactionManager" />
- <property name="userTransaction" ref="bitronixTransactionManager" />
+ <bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
+ <property name="entityManagerFactory" ref="entityManagerFactory" />
</bean>
- <bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalEntityManagerFactoryBean" depends-on="transactionManager">
- <property name="persistenceUnitName" value="org.drools.timer.persistence.jpa"/>
+ <bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="location" value="classpath:datasource.properties"/>
</bean>
- <bean class="org.springframework.orm.jpa.support.PersistenceAnnotationBeanPostProcessor" />
-
- <bean id="timerSchedulerHornetQServer" class="org.drools.timer.scheduler.TimerSchedulerHornetQServer" init-method="start" destroy-method="stop">
- <property name="consumer" ref="timerMessageConsumer"/>
- <property name="timerScheduler" ref="timerScheduler"/>
- </bean>
-
+ <!-- HornetQ configuration -->
+
<bean id="timerMessageProducer" factory-bean="clientSession" factory-method="createProducer" destroy-method="close">
<constructor-arg value="executeTimerMessages" />
</bean>
-
+ <bean id="timerMessageConsumer" factory-bean="clientSession" factory-method="createConsumer" destroy-method="close">
+ <constructor-arg value="timerServiceMessages"/>
+ </bean>
+
+ <bean id="clientSession" factory-bean="clientSessionFactory" factory-method="createSession" init-method="start"/>
+
<!-- client connection with the HornetQ server -->
<bean id="clientSessionFactory" class="org.hornetq.api.core.client.HornetQClient" factory-method="createClientSessionFactory" depends-on="hornetQServer" >
<constructor-arg>
Modified: labs/jbossrules/branches/5_1_20100802_esteban_diega/drools-process/drools-persistent-timer/drools-timer-scheduler/src/test/resources/META-INF/persistence.xml
===================================================================
--- labs/jbossrules/branches/5_1_20100802_esteban_diega/drools-process/drools-persistent-timer/drools-timer-scheduler/src/test/resources/META-INF/persistence.xml 2010-08-14 15:02:39 UTC (rev 34715)
+++ labs/jbossrules/branches/5_1_20100802_esteban_diega/drools-process/drools-persistent-timer/drools-timer-scheduler/src/test/resources/META-INF/persistence.xml 2010-08-14 17:48:04 UTC (rev 34716)
@@ -1,15 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<persistence version="1.0" 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" 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">
- <persistence-unit name="org.drools.timer.persistence.jpa" transaction-type="JTA">
+ <persistence-unit name="org.drools.timer.scheduler.test" transaction-type="RESOURCE_LOCAL">
<provider>org.hibernate.ejb.HibernatePersistence</provider>
<jta-data-source>jdbc/timersDS</jta-data-source>
<class>org.drools.timer.persistence.model.TimerState</class>
<properties>
- <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>
- <property name="hibernate.max_fetch_depth" value="3"/>
- <property name="hibernate.hbm2ddl.auto" value="update" />
- <property name="hibernate.show_sql" value="true" />
- <property name="hibernate.transaction.manager_lookup_class" value="org.hibernate.transaction.BTMTransactionManagerLookup" />
- </properties>
+ <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>
+ <property name="hibernate.max_fetch_depth" value="3"/>
+ <property name="hibernate.hbm2ddl.auto" value="update" />
+ <property name="hibernate.show_sql" value="false" />
+ </properties>
</persistence-unit>
</persistence>
\ No newline at end of file
Deleted: labs/jbossrules/branches/5_1_20100802_esteban_diega/drools-process/drools-persistent-timer/drools-timer-scheduler/src/test/resources/jndi.properties
===================================================================
--- labs/jbossrules/branches/5_1_20100802_esteban_diega/drools-process/drools-persistent-timer/drools-timer-scheduler/src/test/resources/jndi.properties 2010-08-14 15:02:39 UTC (rev 34715)
+++ labs/jbossrules/branches/5_1_20100802_esteban_diega/drools-process/drools-persistent-timer/drools-timer-scheduler/src/test/resources/jndi.properties 2010-08-14 17:48:04 UTC (rev 34716)
@@ -1 +0,0 @@
-java.naming.factory.initial=bitronix.tm.jndi.BitronixInitialContextFactory
\ No newline at end of file
More information about the jboss-svn-commits
mailing list