[riftsaw-commits] riftsaw SVN: r682 - in branches/ODE/ODE-1.x-jpa: dao-jpa-hibernate and 4 other directories.

Author: jeff.yuchang Date: 2010-05-31 02:39:26 -0400 (Mon, 31 May 2010) New Revision: 682 Modified: branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/build.xml branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/files/hibernate.cfg/postgres.properties branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/java/org/apache/ode/dao/jpa/hibernate/BpelDAOConnectionFactoryImpl.java 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/scripts/simplesched-hsql.sql branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/scripts/simplesched-mysql.sql branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/scripts/simplesched-oracle.sql branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/scripts/simplesched-postgres.sql branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MessageDAOImpl.java branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MessageExchangeDAOImpl.java branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MessageRouteDAOImpl.java branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ProcessDAOImpl.java branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ProcessInstanceDAOImpl.java Log: * fix the JPA SQL's in the hibernate testing. * make the id as Long data type for its consistence. * update the ODE_JOB column name. Modified: branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MessageDAOImpl.java =================================================================== --- branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MessageDAOImpl.java 2010-05-28 20:37:17 UTC (rev 681) +++ branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MessageDAOImpl.java 2010-05-31 06:39:26 UTC (rev 682) @@ -45,10 +45,10 @@ @Entity @Table(name = "ODE_MESSAGE") -@NamedQueries( { @NamedQuery(name = MessageDAOImpl.DELETE_MESSAGES_BY_PROCESS, query = "delete from MessageDAOImpl as m where m._messageExchange._process = :process") }) +@NamedQueries( { @NamedQuery(name = MessageDAOImpl.DELETE_MESSAGES_BY_MEXIDS, query = "delete from MessageDAOImpl as m where m._messageExchange._id in (:mexIds)") }) public class MessageDAOImpl implements MessageDAO { private static Log __log = LogFactory.getLog(MessageDAOImpl.class); - public final static String DELETE_MESSAGES_BY_PROCESS = "DELETE_MESSAGES_BY_PROCESS"; + public final static String DELETE_MESSAGES_BY_MEXIDS = "DELETE_MESSAGES_BY_MEXIDS"; @Id @Column(name = "MESSAGE_ID") @@ -64,6 +64,7 @@ @Lob @Column(name = "HEADER") private String _header; + @ManyToOne(fetch = FetchType.LAZY, cascade = { CascadeType.ALL }) @JoinColumn(name = "MESSAGE_EXCHANGE_ID") private MessageExchangeDAOImpl _messageExchange; Modified: branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MessageExchangeDAOImpl.java =================================================================== --- branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MessageExchangeDAOImpl.java 2010-05-28 20:37:17 UTC (rev 681) +++ branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MessageExchangeDAOImpl.java 2010-05-31 06:39:26 UTC (rev 682) @@ -181,7 +181,7 @@ public String getMessageExchangeId() { //return _messageExchangeId; - return _id.toString(); + return _id; } public String getOperation() { @@ -308,10 +308,17 @@ public void setResponse(MessageDAO msg) { _response = (MessageDAOImpl)msg; + if (__log.isDebugEnabled()) { + __log.debug("-----> response data: " + DOMUtils.domToString(this._response.getData()) + ", id: " + this._id); + } + } public void setStatus(String status) { _status = status; + if (__log.isDebugEnabled()){ + __log.debug("-------> status " + _status + ", id :" + this._id); + } } public String getPipedMessageExchangeId() { Modified: branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MessageRouteDAOImpl.java =================================================================== --- branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MessageRouteDAOImpl.java 2010-05-28 20:37:17 UTC (rev 681) +++ branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/MessageRouteDAOImpl.java 2010-05-31 06:39:26 UTC (rev 682) @@ -62,7 +62,7 @@ @SuppressWarnings("unused") @Basic @Column(name="PROCESS_INSTANCE_ID", insertable=false, updatable=false, nullable=true) - private int _instanceId; + private Long _instanceId; @ManyToOne(fetch=FetchType.LAZY,cascade={CascadeType.PERSIST}) @JoinColumn(name="PROCESS_INSTANCE_ID") private ProcessInstanceDAOImpl _processInst; Modified: branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ProcessDAOImpl.java =================================================================== --- branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ProcessDAOImpl.java 2010-05-28 20:37:17 UTC (rev 681) +++ branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ProcessDAOImpl.java 2010-05-31 06:39:26 UTC (rev 682) @@ -133,10 +133,11 @@ // delete routes Collection instanceIds = getEM().createNamedQuery(ProcessInstanceDAOImpl.SELECT_INSTANCE_IDS_BY_PROCESS).setParameter("process", this).getResultList(); batchUpdateByIds(instanceIds.iterator(), getEM().createNamedQuery(MessageRouteDAOImpl.DELETE_MESSAGE_ROUTES_BY_INSTANCE_IDS), "instanceIds"); - getEM().createNamedQuery(CorrelatorDAOImpl.DELETE_CORRELATORS_BY_PROCESS).setParameter("process", this).executeUpdate(); deleteInstances(Integer.MAX_VALUE); + getEM().createNamedQuery(CorrelatorDAOImpl.DELETE_CORRELATORS_BY_PROCESS).setParameter("process", this).executeUpdate(); + // delete process dao getEM().remove(this); // This deletes CorrelatorDAO getEM().flush(); @@ -177,8 +178,8 @@ @SuppressWarnings("unchecked") private void deleteMessages() { - getEM().createNamedQuery(MessageDAOImpl.DELETE_MESSAGES_BY_PROCESS).setParameter("process", this).executeUpdate(); Collection mexIds = getEM().createNamedQuery(MessageExchangeDAOImpl.SELECT_MEX_IDS_BY_PROCESS).setParameter("process", this).getResultList(); + batchUpdateByIds(mexIds.iterator(), getEM().createNamedQuery(MessageDAOImpl.DELETE_MESSAGES_BY_MEXIDS), "mexIds"); batchUpdateByIds(mexIds.iterator(), getEM().createNamedQuery(MexProperty.DELETE_MEX_PROPERTIES_BY_MEX_IDS), "mexIds"); getEM().createNamedQuery(MessageExchangeDAOImpl.DELETE_MEXS_BY_PROCESS).setParameter("process", this).executeUpdate(); } Modified: branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ProcessInstanceDAOImpl.java =================================================================== --- branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ProcessInstanceDAOImpl.java 2010-05-28 20:37:17 UTC (rev 681) +++ branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/ProcessInstanceDAOImpl.java 2010-05-31 06:39:26 UTC (rev 682) @@ -108,7 +108,7 @@ @SuppressWarnings("unused") @Basic @Column(name="FAULT_ID", insertable=false, updatable=false, nullable=true) - private long _faultId; + private Long _faultId; @OneToOne(fetch=FetchType.LAZY,cascade={CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH}) @JoinColumn(name="FAULT_ID") private FaultDAOImpl _fault; @ManyToOne(fetch=FetchType.LAZY,cascade={CascadeType.PERSIST}) @JoinColumn(name="PROCESS_ID") Modified: branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/build.xml =================================================================== --- branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/build.xml 2010-05-28 20:37:17 UTC (rev 681) +++ branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/build.xml 2010-05-31 06:39:26 UTC (rev 682) @@ -32,20 +32,9 @@ <mkdir dir="target/db" /> <mkdir dir="${db.scripts.dir}" /> - <!-- Hsql --> - <create-ddl db="hsql"/> - - <!-- MySQL --> - <create-ddl db="mysql"/> - - <!-- Oracle --> <create-ddl db="oracle"/> - <!-- PostgreSQL --> - <create-ddl db="postgres"/> - <create-ddl db="hsql"/> - </target> <!-- Modified: branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/files/hibernate.cfg/postgres.properties =================================================================== --- branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/files/hibernate.cfg/postgres.properties 2010-05-28 20:37:17 UTC (rev 681) +++ branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/files/hibernate.cfg/postgres.properties 2010-05-31 06:39:26 UTC (rev 682) @@ -1 +1 @@ -dialect=org.hibernate.dialect.PostgresDialect \ No newline at end of file +dialect=org.hibernate.dialect.PostgreSQLDialect \ No newline at end of file Modified: branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/java/org/apache/ode/dao/jpa/hibernate/BpelDAOConnectionFactoryImpl.java =================================================================== --- branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/java/org/apache/ode/dao/jpa/hibernate/BpelDAOConnectionFactoryImpl.java 2010-05-28 20:37:17 UTC (rev 681) +++ branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/java/org/apache/ode/dao/jpa/hibernate/BpelDAOConnectionFactoryImpl.java 2010-05-31 06:39:26 UTC (rev 682) @@ -19,6 +19,7 @@ package org.apache.ode.dao.jpa.hibernate; import java.util.HashMap; +import java.util.Iterator; import java.util.Map; import java.util.Properties; @@ -84,6 +85,8 @@ static Map buildConfig(String prefix, Properties odeConfig, TransactionManager txm, DataSource ds) { Map props = new HashMap(_defaultProperties); + + addEntries(prefix, odeConfig, props); String guid = new GUID().toString(); if (ds != null) { @@ -105,15 +108,24 @@ props.put(HibernateUtil.PROP_GUID, guid); } - if (Boolean.valueOf(odeConfig.getProperty(OdeConfigProperties.PROP_DB_EMBEDDED_CREATE, "true"))) { + if (Boolean.valueOf(odeConfig.getProperty(OdeConfigProperties.PROP_DB_EMBEDDED_CREATE, "false"))) { props.put(Environment.HBM2DDL_AUTO, "create-drop"); + __log.debug("create-drop DDL by Hibernate automatically"); } // Isolation levels override; when you use a ConnectionProvider, this has no effect //String level = System.getProperty("ode.connection.isolation", "2"); //props.put(Environment.ISOLATION, level); - addEntries(prefix, odeConfig, props); + + if (__log.isDebugEnabled()) { + __log.debug("========= Hibernate properties =============="); + for (Iterator it = props.keySet().iterator(); it.hasNext(); ) { + Object key = it.next(); + __log.debug("key : " + key + ", value : " + props.get(key)); + } + __log.debug("=============================================="); + } return props; } @@ -130,6 +142,8 @@ } else { props.put(jpaKey, me.getValue()); } + } else if (key.startsWith("hibernate")) { + props.put(key, me.getValue()); } } } 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-05-28 20:37:17 UTC (rev 681) +++ branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/resources/META-INF/persistence.xml 2010-05-31 06:39:26 UTC (rev 682) @@ -45,7 +45,7 @@ <properties> <property name="hibernate.show_sql" value="false" /> - <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect" /> + <property name="hibernate.dialect" value="org.hibernate.dialect.OracleDialect" /> <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/dao-jpa-hibernate/src/main/scripts/simplesched-hsql.sql =================================================================== --- branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/scripts/simplesched-hsql.sql 2010-05-28 20:37:17 UTC (rev 681) +++ branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/scripts/simplesched-hsql.sql 2010-05-31 06:39:26 UTC (rev 682) @@ -4,7 +4,7 @@ -- -- -CREATE TABLE ode_job ( +CREATE TABLE ODE_JOB ( jobid CHAR(64) NOT NULL DEFAULT '', ts BIGINT NOT NULL DEFAULT 0, nodeid char(64), @@ -24,6 +24,6 @@ PRIMARY KEY(jobid)); -CREATE INDEX IDX_ODE_JOB_TS ON ode_job(ts); -CREATE INDEX IDX_ODE_JOB_NODEID ON ode_job(nodeid); +CREATE INDEX IDX_ODE_JOB_TS ON ODE_JOB(ts); +CREATE INDEX IDX_ODE_JOB_NODEID ON ODE_JOB(nodeid); Modified: branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/scripts/simplesched-mysql.sql =================================================================== --- branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/scripts/simplesched-mysql.sql 2010-05-28 20:37:17 UTC (rev 681) +++ branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/scripts/simplesched-mysql.sql 2010-05-31 06:39:26 UTC (rev 682) @@ -18,7 +18,7 @@ type varchar(255), channel varchar(255), correlatorId varchar(255), - correlationKey varchar(255), + correlationKeySet varchar(255), retryCount int, inMem int, detailsExt blob(4096), Modified: branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/scripts/simplesched-oracle.sql =================================================================== --- branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/scripts/simplesched-oracle.sql 2010-05-28 20:37:17 UTC (rev 681) +++ branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/scripts/simplesched-oracle.sql 2010-05-31 06:39:26 UTC (rev 682) @@ -4,9 +4,9 @@ -- -- -DROP TABLE ode_job; +DROP TABLE ODE_JOB; -CREATE TABLE ode_job ( +CREATE TABLE ODE_JOB ( jobid VARCHAR(64) NOT NULL, ts number(37) NOT NULL, nodeid varchar(64), @@ -19,14 +19,14 @@ type varchar(255), channel varchar(255), correlatorId varchar(255), - correlationKey varchar(255), + correlationKeySet varchar(255), retryCount int, inMem int, detailsExt blob, PRIMARY KEY(jobid)); -CREATE INDEX IDX_ODE_JOB_TS ON ode_job(ts); -CREATE INDEX IDX_ODE_JOB_NODEID ON ode_job(nodeid); +CREATE INDEX IDX_ODE_JOB_TS ON ODE_JOB(ts); +CREATE INDEX IDX_ODE_JOB_NODEID ON ODE_JOB(nodeid); Modified: branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/scripts/simplesched-postgres.sql =================================================================== --- branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/scripts/simplesched-postgres.sql 2010-05-28 20:37:17 UTC (rev 681) +++ branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/scripts/simplesched-postgres.sql 2010-05-31 06:39:26 UTC (rev 682) @@ -4,7 +4,7 @@ -- -- -CREATE TABLE ode_job ( +CREATE TABLE ODE_JOB ( jobid CHAR(64) NOT NULL DEFAULT '', ts BIGINT NOT NULL DEFAULT 0, nodeid char(64), @@ -17,14 +17,14 @@ type varchar(255), channel varchar(255), correlatorId varchar(255), - correlationKey varchar(255), + correlationKeySet varchar(255), retryCount int, inMem int, detailsExt bytea, PRIMARY KEY(jobid)); -CREATE INDEX IDX_ODE_JOB_TS ON ode_job(ts); -CREATE INDEX IDX_ODE_JOB_NODEID ON ode_job(nodeid); +CREATE INDEX IDX_ODE_JOB_TS ON ODE_JOB(ts); +CREATE INDEX IDX_ODE_JOB_NODEID ON ODE_JOB(nodeid);