You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by sa...@apache.org on 2017/08/22 11:31:12 UTC
[1/3] ode git commit: ODE-1042: Upgraded persistence.xml to 2.0
Repository: ode
Updated Branches:
refs/heads/ode-1.3.x 5a948fd5a -> 5df444806
ODE-1042: Upgraded persistence.xml to 2.0
Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/30a81fe6
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/30a81fe6
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/30a81fe6
Branch: refs/heads/ode-1.3.x
Commit: 30a81fe67e65f3dca95e19308e8584d997402042
Parents: 5a948fd
Author: sathwik <sa...@apache.org>
Authored: Tue Aug 8 10:04:49 2017 +0530
Committer: sathwik <sa...@apache.org>
Committed: Tue Aug 8 10:04:49 2017 +0530
----------------------------------------------------------------------
bpel-store/src/main/resources/META-INF/persistence.xml | 5 +++--
dao-jpa-ojpa-derby/src/test/resources/META-INF/persistence.xml | 5 ++++-
dao-jpa/src/main/resources/META-INF/persistence.xml | 3 ++-
3 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode/blob/30a81fe6/bpel-store/src/main/resources/META-INF/persistence.xml
----------------------------------------------------------------------
diff --git a/bpel-store/src/main/resources/META-INF/persistence.xml b/bpel-store/src/main/resources/META-INF/persistence.xml
index 11d155e..f6bb431 100644
--- a/bpel-store/src/main/resources/META-INF/persistence.xml
+++ b/bpel-store/src/main/resources/META-INF/persistence.xml
@@ -19,8 +19,9 @@
-->
<persistence xmlns="http://java.sun.com/xml/ns/persistence"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- version="1.0">
+ 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_2_0.xsd"
+ version="2.0">
<persistence-unit name="ode-store">
<!--
This properties file is used specifically by the
http://git-wip-us.apache.org/repos/asf/ode/blob/30a81fe6/dao-jpa-ojpa-derby/src/test/resources/META-INF/persistence.xml
----------------------------------------------------------------------
diff --git a/dao-jpa-ojpa-derby/src/test/resources/META-INF/persistence.xml b/dao-jpa-ojpa-derby/src/test/resources/META-INF/persistence.xml
index 9e536ca..9e98786 100644
--- a/dao-jpa-ojpa-derby/src/test/resources/META-INF/persistence.xml
+++ b/dao-jpa-ojpa-derby/src/test/resources/META-INF/persistence.xml
@@ -17,7 +17,10 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0">
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+ 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_2_0.xsd"
+ version="2.0">
<persistence-unit name="ode-unit-test-embedded">
<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
<class>org.apache.ode.dao.jpa.ActivityRecoveryDAOImpl</class>
http://git-wip-us.apache.org/repos/asf/ode/blob/30a81fe6/dao-jpa/src/main/resources/META-INF/persistence.xml
----------------------------------------------------------------------
diff --git a/dao-jpa/src/main/resources/META-INF/persistence.xml b/dao-jpa/src/main/resources/META-INF/persistence.xml
index 479e00f..0936946 100644
--- a/dao-jpa/src/main/resources/META-INF/persistence.xml
+++ b/dao-jpa/src/main/resources/META-INF/persistence.xml
@@ -19,7 +19,8 @@
-->
<persistence xmlns="http://java.sun.com/xml/ns/persistence"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- version="1.0">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
+ version="2.0">
<persistence-unit name="ode-dao">
<!--
This properties file is used specifically by the
[3/3] ode git commit: ODE-1068: Upgraded hibernate to 3.6.10
Posted by sa...@apache.org.
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 <sa...@apache.org>
Authored: Tue Aug 22 17:00:49 2017 +0530
Committer: sathwik <sa...@apache.org>
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",
[2/3] ode git commit: ODE-1042: Geronimo JPA 2 spec jar added
Posted by sa...@apache.org.
ODE-1042: Geronimo JPA 2 spec jar added
Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/bbf07f58
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/bbf07f58
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/bbf07f58
Branch: refs/heads/ode-1.3.x
Commit: bbf07f58e5145d13fe525e859db0e3fd5498ab7b
Parents: 30a81fe
Author: sathwik <sa...@apache.org>
Authored: Tue Aug 22 14:02:25 2017 +0530
Committer: sathwik <sa...@apache.org>
Committed: Tue Aug 22 14:02:25 2017 +0530
----------------------------------------------------------------------
dependencies.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode/blob/bbf07f58/dependencies.rb
----------------------------------------------------------------------
diff --git a/dependencies.rb b/dependencies.rb
index 3ace1ce..a69accc 100644
--- a/dependencies.rb
+++ b/dependencies.rb
@@ -85,7 +85,7 @@ JAVAX = struct(
:ejb =>"org.apache.geronimo.specs:geronimo-ejb_2.1_spec:jar:1.1",
:javamail =>"org.apache.geronimo.specs:geronimo-javamail_1.4_spec:jar:1.7.1",
:jms =>"geronimo-spec:geronimo-spec-jms:jar:1.1-rc4",
- :persistence =>"org.eclipse.persistence:javax.persistence:jar:2.0.0",
+ :persistence =>"org.apache.geronimo.specs:geronimo-jpa_2.0_spec:jar:1.1",
:servlet =>"org.apache.geronimo.specs:geronimo-servlet_2.4_spec:jar:1.0",
:stream =>"stax:stax-api:jar:1.0.1",
:transaction =>"org.apache.geronimo.specs:geronimo-jta_1.1_spec:jar:1.1.1",