[riftsaw-commits] riftsaw SVN: r731 - in branches/ODE/ODE-1.x-jpa: dao-jpa/src/main/java/org/apache/ode/dao/jpa and 4 other directories.

Author: jeff.yuchang Date: 2010-06-15 08:36:13 -0400 (Tue, 15 Jun 2010) New Revision: 731 Modified: branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/build.xml branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/resources/META-INF/persistence.xml branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/JpaConnection.java branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/BpelDAOConnectionImpl.java branches/ODE/ODE-1.x-jpa/pom.xml branches/ODE/ODE-1.x-jpa/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/SimpleScheduler.java Log: * enable the clearOnComplete() method. Modified: branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/JpaConnection.java =================================================================== --- branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/JpaConnection.java 2010-06-15 11:12:36 UTC (rev 730) +++ branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/JpaConnection.java 2010-06-15 12:36:13 UTC (rev 731) @@ -55,12 +55,9 @@ } public void close() { - /* Connections are stored in thread locals so only destroying the factory - * should close the connection - _em.close(); - _em = null; - _mgr = null; - */ + if (_em != null) { + _em.close(); + } } public boolean isClosed() { @@ -78,6 +75,9 @@ public void afterCompletion(int i) { _em.clear(); + if(__log.isDebugEnabled()) { + __log.debug("-------> clear the entity manager"); + } } public void beforeCompletion() { @@ -108,7 +108,7 @@ try { if (_mgr.getStatus() == Status.STATUS_ACTIVE) { _em.joinTransaction(); - //clearOnComplete(); + clearOnComplete(); } } catch (SystemException se) { __log.error(se); Modified: branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/BpelDAOConnectionImpl.java =================================================================== --- branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/BpelDAOConnectionImpl.java 2010-06-15 11:12:36 UTC (rev 730) +++ branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/BpelDAOConnectionImpl.java 2010-06-15 12:36:13 UTC (rev 731) @@ -337,13 +337,9 @@ public MessageExchangeDAO getMessageExchange(String mexid) { _txCtx.begin(); - List l = _em.createQuery("select x from MessageExchangeDAOImpl x where x._id = ?1").setParameter(1, mexid).getResultList(); + MessageExchangeDAOImpl dao = _em.find(MessageExchangeDAOImpl.class, mexid); _txCtx.commit(); - if (l.size() == 0) { - return null; - } - - return (MessageExchangeDAOImpl) l.get(0); + return dao; } public void deleteMessageExchange(MessageExchangeDAO mexDao) { Modified: branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/build.xml =================================================================== --- branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/build.xml 2010-06-15 11:12:36 UTC (rev 730) +++ branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/build.xml 2010-06-15 12:36:13 UTC (rev 731) @@ -32,7 +32,7 @@ <mkdir dir="target/db" /> <mkdir dir="${db.scripts.dir}" /> - <create-ddl db="oracle"/> + <create-ddl db="hsql"/> </target> Modified: branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/resources/META-INF/persistence.xml =================================================================== --- branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/resources/META-INF/persistence.xml 2010-06-15 11:12:36 UTC (rev 730) +++ branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/resources/META-INF/persistence.xml 2010-06-15 12:36:13 UTC (rev 731) @@ -45,7 +45,7 @@ <properties> <property name="hibernate.show_sql" value="false" /> - <property name="hibernate.dialect" value="org.hibernate.dialect.OracleDialect" /> + <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect" /> <property name="hibernate.connection.datasource" value="java:BPELDB" /> <property name="hibernate.transaction.factory_class" value="org.hibernate.transaction.JTATransactionFactory" /> <property name="hibernate.transaction.manager_lookup_class" value="org.hibernate.transaction.JBossTransactionManagerLookup" /> Modified: branches/ODE/ODE-1.x-jpa/pom.xml =================================================================== --- branches/ODE/ODE-1.x-jpa/pom.xml 2010-06-15 11:12:36 UTC (rev 730) +++ branches/ODE/ODE-1.x-jpa/pom.xml 2010-06-15 12:36:13 UTC (rev 731) @@ -135,11 +135,11 @@ <module>bpel-connector</module> <module>bpel-test</module> <module>axis2</module> - <module>jbi</module> + <!--module>jbi</module> <module>jbi-bundle</module> <module>jbi-karaf</module> <module>axis2-war</module> - <module>distro</module> + <module>distro</module--> </modules> <build> Modified: branches/ODE/ODE-1.x-jpa/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/SimpleScheduler.java =================================================================== --- branches/ODE/ODE-1.x-jpa/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/SimpleScheduler.java 2010-06-15 11:12:36 UTC (rev 730) +++ branches/ODE/ODE-1.x-jpa/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/SimpleScheduler.java 2010-06-15 12:36:13 UTC (rev 731) @@ -286,14 +286,22 @@ ex = e; } finally { if (ex == null) { - if (__log.isDebugEnabled()) __log.debug("Commiting on " + txm + "..."); + if (__log.isDebugEnabled()) { + __log.debug("Commiting on " + txm + "..."); + } try { txm.commit(); + if (__log.isDebugEnabled()) { + __log.debug("committed on " + txm + " successfully."); + } } catch( Exception e2 ) { ex = e2; + __log.error("error in commiting transaction", e2); } } else { - if (__log.isDebugEnabled()) __log.debug("Rollbacking on " + txm + "..."); + if (__log.isDebugEnabled()) { + __log.debug("Rollbacking on " + txm + "..."); + } txm.rollback(); }