ODE-1068: Upgraded hibernate to 3.6.10
Project: http://git-wip-us.apache.org/repos/asf/ode/repo Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/5df44480 Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/5df44480 Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/5df44480 Branch: refs/heads/ode-1.3.x Commit: 5df4448061eaa815c7c55ee107c1173415fba22a Parents: bbf07f5 Author: sathwik <[email protected]> Authored: Tue Aug 22 17:00:49 2017 +0530 Committer: sathwik <[email protected]> Committed: Tue Aug 22 17:00:49 2017 +0530 ---------------------------------------------------------------------- Rakefile | 2 +- .../java/org/apache/ode/store/hib/ProcessConfDaoImpl.java | 2 +- dao-hibernate-db/src/main/sql/ode.oracle.properties | 2 +- .../org/apache/ode/daohib/bpel/ProcessInstanceDaoImpl.java | 3 ++- .../main/java/org/apache/ode/daohib/bpel/hobj/HBpelEvent.java | 2 +- dependencies.rb | 7 +++++-- 6 files changed, 11 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ode/blob/5df44480/Rakefile ---------------------------------------------------------------------- diff --git a/Rakefile b/Rakefile index cdda10c..2dfb1a7 100644 --- a/Rakefile +++ b/Rakefile @@ -383,7 +383,7 @@ define "ode" do common_sql = _("src/main/sql/common.sql") index_sql = _("src/main/sql/index.sql") - %w{ derby mysql firebird hsql postgres sqlserver oracle h2}.each do |db| + %w{ derby mysql hsql postgres sqlserver oracle h2}.each do |db| partial_runtime = export[ properties_for[db], dao_hibernate, _("target/partial.runtime.#{db}.sql") ] partial_store = export[ properties_for[db], bpel_store, _("target/partial.store.#{db}.sql") ] build concat(_("target/#{db}.sql")=>[ license_sql, common_sql, predefined_for[db], partial_store, partial_runtime, index_sql]) http://git-wip-us.apache.org/repos/asf/ode/blob/5df44480/bpel-store/src/main/java/org/apache/ode/store/hib/ProcessConfDaoImpl.java ---------------------------------------------------------------------- diff --git a/bpel-store/src/main/java/org/apache/ode/store/hib/ProcessConfDaoImpl.java b/bpel-store/src/main/java/org/apache/ode/store/hib/ProcessConfDaoImpl.java index 34b5345..5d1336f 100644 --- a/bpel-store/src/main/java/org/apache/ode/store/hib/ProcessConfDaoImpl.java +++ b/bpel-store/src/main/java/org/apache/ode/store/hib/ProcessConfDaoImpl.java @@ -68,7 +68,7 @@ public class ProcessConfDaoImpl extends HibObj implements ProcessConfDAO { * @hibernate.map table="STORE_PROCESS_PROP" role="properties_" * @hibernate.collection-key column="propId" foreign-key="none" * @hibernate.collection-index column="name" type="string" - * @hibernate.collection-element column="data" type="text" + * @hibernate.collection-element column="data" type="materialized_clob" */ public Map<String,String> getProperties_() { return _properties; http://git-wip-us.apache.org/repos/asf/ode/blob/5df44480/dao-hibernate-db/src/main/sql/ode.oracle.properties ---------------------------------------------------------------------- diff --git a/dao-hibernate-db/src/main/sql/ode.oracle.properties b/dao-hibernate-db/src/main/sql/ode.oracle.properties index 118fd2a..cfbae80 100644 --- a/dao-hibernate-db/src/main/sql/ode.oracle.properties +++ b/dao-hibernate-db/src/main/sql/ode.oracle.properties @@ -29,7 +29,7 @@ #hibernate.dialect=org.hibernate.dialect.MySQLDialect #hibernate.dialect=org.hibernate.dialect.HSQLDialect #hibernate.dialect=org.hibernate.dialect.OracleDialect -hibernate.dialect=org.hibernate.dialect.Oracle9Dialect +hibernate.dialect=org.hibernate.dialect.Oracle10gDialect #hibernate.dialect=org.hibernate.dialect.SQLServerDialect #hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect #hibernate.dialect=org.hibernate.dialect.SybaseDialect http://git-wip-us.apache.org/repos/asf/ode/blob/5df44480/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessInstanceDaoImpl.java ---------------------------------------------------------------------- diff --git a/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessInstanceDaoImpl.java b/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessInstanceDaoImpl.java index 11504b3..c24ade1 100644 --- a/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessInstanceDaoImpl.java +++ b/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessInstanceDaoImpl.java @@ -469,7 +469,8 @@ public class ProcessInstanceDaoImpl extends HibernateDao implements ProcessInsta EventsFirstLastCountTuple flc = new EventsFirstLastCountTuple(); flc.first = (Date) ret[0]; flc.last = (Date) ret[1]; - flc.count = (Integer)ret[2]; + Long count = (Long) ret[2]; + flc.count = count.intValue(); return flc; } http://git-wip-us.apache.org/repos/asf/ode/blob/5df44480/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HBpelEvent.java ---------------------------------------------------------------------- diff --git a/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HBpelEvent.java b/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HBpelEvent.java index 095f0e4..8cb0af7 100644 --- a/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HBpelEvent.java +++ b/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HBpelEvent.java @@ -95,7 +95,7 @@ public class HBpelEvent extends HObject { /** * @hibernate.property * column="DETAIL" - * type="text" + * type="materialized_clob" * length="32000" */ public String getDetail() { http://git-wip-us.apache.org/repos/asf/ode/blob/5df44480/dependencies.rb ---------------------------------------------------------------------- diff --git a/dependencies.rb b/dependencies.rb index a69accc..c51fac6 100644 --- a/dependencies.rb +++ b/dependencies.rb @@ -75,8 +75,11 @@ GERONIMO = struct( :transaction =>"org.apache.geronimo.components:geronimo-transaction:jar:3.1.3", :connector =>"org.apache.geronimo.components:geronimo-connector:jar:3.1.3" ) -HIBERNATE = [ "org.hibernate:hibernate-core:jar:3.3.2.GA", "javassist:javassist:jar:3.9.0.GA", "antlr:antlr:jar:2.7.6", - "asm:asm:jar:3.3.1", "cglib:cglib:jar:2.2", "net.sf.ehcache:ehcache:jar:1.2.3" ] +HIBERNATE = ["org.hibernate:hibernate-core:jar:3.6.10.Final", "commons-collections:commons-collections:jar:3.1", + "javassist:javassist:jar:3.12.0.GA", "antlr:antlr:jar:2.7.6", + "dom4j:dom4j:jar:1.6.1", "org.hibernate:hibernate-commons-annotations:jar:3.2.0.Final", + "org.hibernate.javax.persistence:hibernate-jpa-2.0-api:jar:1.0.1.Final"] + HSQLDB = "org.hsqldb:hsqldb:jar:2.3.3" JAVAX = struct( :activation =>"javax.activation:activation:jar:1.1",
