You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by va...@apache.org on 2013/05/14 02:04:42 UTC
[1/6] git commit: fixing a class loading issue.
Updated Branches:
refs/heads/master 8d7427e7e -> 7159ad390
refs/heads/ode-1.3.6.x f7fb73131 -> 8493242bc
fixing a class loading issue.
Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/37549335
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/37549335
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/37549335
Branch: refs/heads/ode-1.3.6.x
Commit: 375493358b5d91c42a13da82259653e3dbf20a22
Parents: f7fb731
Author: Tammo van Lessen <tv...@gmail.com>
Authored: Mon May 13 23:09:56 2013 +0200
Committer: Tammo van Lessen <tv...@gmail.com>
Committed: Tue May 14 01:54:26 2013 +0200
----------------------------------------------------------------------
.../java/org/apache/ode/il/dbutil/Database.java | 3 +-
.../store/hib/DbConfStoreConnectionFactory.java | 25 +++++++--------
.../daohib/bpel/BpelDAOConnectionFactoryImpl.java | 20 ++++++------
3 files changed, 24 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode/blob/37549335/bpel-epr/src/main/java/org/apache/ode/il/dbutil/Database.java
----------------------------------------------------------------------
diff --git a/bpel-epr/src/main/java/org/apache/ode/il/dbutil/Database.java b/bpel-epr/src/main/java/org/apache/ode/il/dbutil/Database.java
index b74c85a..80a0a00 100644
--- a/bpel-epr/src/main/java/org/apache/ode/il/dbutil/Database.java
+++ b/bpel-epr/src/main/java/org/apache/ode/il/dbutil/Database.java
@@ -279,7 +279,8 @@ public class Database {
BpelDAOConnectionFactoryJDBC cf;
try {
- cf = (BpelDAOConnectionFactoryJDBC) Class.forName(pClassName).newInstance();
+ Class<?> clazz = this.getClass().getClassLoader().loadClass(pClassName);
+ cf = (BpelDAOConnectionFactoryJDBC) clazz.newInstance();
} catch (Exception ex) {
String errmsg = __msgs.msgDAOInstantiationFailed(pClassName);
__log.error(errmsg, ex);
http://git-wip-us.apache.org/repos/asf/ode/blob/37549335/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java
----------------------------------------------------------------------
diff --git a/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java b/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java
index 1806b76..b11e15d 100644
--- a/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java
+++ b/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java
@@ -18,6 +18,17 @@
*/
package org.apache.ode.store.hib;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import java.util.concurrent.ConcurrentHashMap;
+
+import javax.sql.DataSource;
+import javax.transaction.TransactionManager;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ode.bpel.iapi.BpelEngineException;
@@ -36,17 +47,6 @@ import org.hibernate.connection.ConnectionProvider;
import org.hibernate.dialect.Dialect;
import org.hibernate.dialect.DialectFactory;
-import javax.sql.DataSource;
-import javax.transaction.TransactionManager;
-
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.SQLException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-import java.util.concurrent.ConcurrentHashMap;
-
public class DbConfStoreConnectionFactory implements ConfStoreConnectionFactory {
private static final Log __log = LogFactory.getLog(DbConfStoreConnectionFactory.class);
@@ -133,11 +133,10 @@ public class DbConfStoreConnectionFactory implements ConfStoreConnectionFactory
return new ConfStoreConnectionHib(_sessionFactory.getCurrentSession());
}
- @SuppressWarnings("unchecked")
private void initTxMgr(String txFactoryClassName) {
__log.info("ProcessStore initializing transaction manager using " + txFactoryClassName);
try {
- Class txFactClass = getClass().getClassLoader().loadClass(txFactoryClassName);
+ Class<?> txFactClass = getClass().getClassLoader().loadClass(txFactoryClassName);
Object txFact = txFactClass.newInstance();
_txMgr = (TransactionManager) txFactClass.getMethod("getTransactionManager", (Class[]) null).invoke(txFact);
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/ode/blob/37549335/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionFactoryImpl.java
----------------------------------------------------------------------
diff --git a/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionFactoryImpl.java b/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionFactoryImpl.java
index 9d28de2..56558ed 100644
--- a/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionFactoryImpl.java
+++ b/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionFactoryImpl.java
@@ -18,6 +18,15 @@
*/
package org.apache.ode.daohib.bpel;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Properties;
+
+import javax.sql.DataSource;
+import javax.transaction.TransactionManager;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ode.bpel.dao.BpelDAOConnection;
@@ -30,14 +39,6 @@ import org.hibernate.cfg.Environment;
import org.hibernate.dialect.Dialect;
import org.hibernate.dialect.DialectFactory;
-import javax.sql.DataSource;
-import javax.transaction.TransactionManager;
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.util.HashMap;
-import java.util.Properties;
-import java.util.Enumeration;
-
/**
* Hibernate-based {@link org.apache.ode.bpel.dao.BpelDAOConnectionFactory}
* implementation.
@@ -69,7 +70,6 @@ public class BpelDAOConnectionFactoryImpl implements BpelDAOConnectionFactoryJDB
/**
* @see org.apache.ode.bpel.dao.BpelDAOConnectionFactory#init(java.util.Properties)
*/
- @SuppressWarnings("unchecked")
public void init(Properties initialProps) {
if (_ds == null) {
String errmsg = "setDataSource() not called!";
@@ -123,7 +123,7 @@ public class BpelDAOConnectionFactoryImpl implements BpelDAOConnectionFactoryJDB
properties.put(Environment.ISOLATION, level);
if (__log.isDebugEnabled()) {
- Enumeration names = properties.propertyNames();
+ Enumeration<?> names = properties.propertyNames();
__log.debug("Properties passed to Hibernate:");
while (names.hasMoreElements()) {
String name = (String) names.nextElement();
[6/6] git commit: ignoring obsolete testcases.
Posted by va...@apache.org.
ignoring obsolete testcases.
Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/7159ad39
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/7159ad39
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/7159ad39
Branch: refs/heads/master
Commit: 7159ad3907e5112c5dda473e8ff4999876185315
Parents: 92b285b
Author: Tammo van Lessen <tv...@gmail.com>
Authored: Tue May 14 01:52:41 2013 +0200
Committer: Tammo van Lessen <tv...@gmail.com>
Committed: Tue May 14 02:02:43 2013 +0200
----------------------------------------------------------------------
Rakefile | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode/blob/7159ad39/Rakefile
----------------------------------------------------------------------
diff --git a/Rakefile b/Rakefile
index 5188884..0b6be72 100644
--- a/Rakefile
+++ b/Rakefile
@@ -469,7 +469,8 @@ define "ode" do
LOG4J,
DOM4J,
HIBERNATE
-
+ test.exclude "*JbiTestBase"
+ test.exclude "*OdeJbiComponentLifeCycleTest"
test.setup unzip(_("target/test/smx/ode")=>project("dao-jpa-ojpa-derby").package(:zip))
test.setup unzip(_("target/test/smx/ode")=>project("dao-hibernate-db").package(:zip))
test.setup task(:prepare_jbi_tests) do |task|
[2/6] git commit: fixing tempfile generation.
Posted by va...@apache.org.
fixing tempfile generation.
Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/d56304b7
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/d56304b7
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/d56304b7
Branch: refs/heads/ode-1.3.6.x
Commit: d56304b79fbe04027c7a1fa74a285cdfd0d27162
Parents: 3754933
Author: Tammo van Lessen <tv...@gmail.com>
Authored: Tue May 14 01:52:20 2013 +0200
Committer: Tammo van Lessen <tv...@gmail.com>
Committed: Tue May 14 01:54:27 2013 +0200
----------------------------------------------------------------------
tasks/jbi.rake | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode/blob/d56304b7/tasks/jbi.rake
----------------------------------------------------------------------
diff --git a/tasks/jbi.rake b/tasks/jbi.rake
index eed6505..a29f429 100644
--- a/tasks/jbi.rake
+++ b/tasks/jbi.rake
@@ -76,10 +76,14 @@ class JBITask < Buildr::ZipTask
when nil, true
# Tempfiles gets deleted on garbage collection, so we're going to hold on to it
# through instance variable not closure variable.
- Tempfile.open("MANIFEST.MF") { |@jbi_xml_tmp| @jbi_xml_tmp.write descriptor }
+ @jbi_xml_tmp = Tempfile.new('MANIFEST.MF')
+ @jbi_xml_tmp.write descriptor
+ @jbi_xml_tmp.close
path("META-INF").include @jbi_xml_tmp.path, :as=>"jbi.xml"
when Proc, Method
- Tempfile.open("MANIFEST.MF") { |@jbi_xml_tmp| @jbi_xml_tmp.write jbi_xml.call.to_s }
+ @jbi_xml_tmp = Tempfile.new('MANIFEST.MF')
+ @jbi_xml_tmp.write jbi_xml.call.to_s
+ @jbi_xml_tmp.close
path("META-INF").include @jbi_xml_tmp.path, :as=>"jbi.xml"
end
end
[5/6] git commit: fixing a class loading issue.
Posted by va...@apache.org.
fixing a class loading issue.
Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/92b285b7
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/92b285b7
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/92b285b7
Branch: refs/heads/master
Commit: 92b285b7df96ce583b1067064b8ee92670e4f2b2
Parents: 82a053e
Author: Tammo van Lessen <tv...@gmail.com>
Authored: Mon May 13 23:09:56 2013 +0200
Committer: Tammo van Lessen <tv...@gmail.com>
Committed: Tue May 14 02:02:10 2013 +0200
----------------------------------------------------------------------
.../java/org/apache/ode/il/dbutil/Database.java | 3 +-
.../store/hib/DbConfStoreConnectionFactory.java | 24 +++++++-------
.../daohib/bpel/BpelDAOConnectionFactoryImpl.java | 20 ++++++------
3 files changed, 24 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode/blob/92b285b7/bpel-epr/src/main/java/org/apache/ode/il/dbutil/Database.java
----------------------------------------------------------------------
diff --git a/bpel-epr/src/main/java/org/apache/ode/il/dbutil/Database.java b/bpel-epr/src/main/java/org/apache/ode/il/dbutil/Database.java
index a2aefe5..5d895ef 100644
--- a/bpel-epr/src/main/java/org/apache/ode/il/dbutil/Database.java
+++ b/bpel-epr/src/main/java/org/apache/ode/il/dbutil/Database.java
@@ -110,7 +110,8 @@ public abstract class Database {
BpelDAOConnectionFactoryJDBC cf;
try {
- cf = (BpelDAOConnectionFactoryJDBC) Class.forName(pClassName).newInstance();
+ Class<?> clazz = this.getClass().getClassLoader().loadClass(pClassName);
+ cf = (BpelDAOConnectionFactoryJDBC) clazz.newInstance();
} catch (Exception ex) {
String errmsg = __msgs.msgDAOInstantiationFailed(pClassName);
__log.error(errmsg, ex);
http://git-wip-us.apache.org/repos/asf/ode/blob/92b285b7/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java
----------------------------------------------------------------------
diff --git a/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java b/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java
index a83ae10..edf39d1 100644
--- a/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java
+++ b/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java
@@ -18,6 +18,17 @@
*/
package org.apache.ode.store.hib;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import java.util.concurrent.ConcurrentHashMap;
+
+import javax.sql.DataSource;
+import javax.transaction.TransactionManager;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ode.bpel.iapi.BpelEngineException;
@@ -35,17 +46,6 @@ import org.hibernate.cfg.Environment;
import org.hibernate.connection.ConnectionProvider;
import org.hibernate.dialect.Dialect;
-import javax.sql.DataSource;
-import javax.transaction.TransactionManager;
-
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.SQLException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-import java.util.concurrent.ConcurrentHashMap;
-
public class DbConfStoreConnectionFactory implements ConfStoreConnectionFactory {
private static final Log __log = LogFactory.getLog(DbConfStoreConnectionFactory.class);
@@ -110,7 +110,7 @@ public class DbConfStoreConnectionFactory implements ConfStoreConnectionFactory
private void initTxMgr(String txFactoryClassName) {
__log.info("ProcessStore initializing transaction manager using " + txFactoryClassName);
try {
- Class txFactClass = getClass().getClassLoader().loadClass(txFactoryClassName);
+ Class<?> txFactClass = getClass().getClassLoader().loadClass(txFactoryClassName);
Object txFact = txFactClass.newInstance();
_txMgr = (TransactionManager) txFactClass.getMethod("getTransactionManager", (Class[]) null).invoke(txFact);
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/ode/blob/92b285b7/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionFactoryImpl.java
----------------------------------------------------------------------
diff --git a/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionFactoryImpl.java b/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionFactoryImpl.java
index 5a34891..9d7d309 100644
--- a/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionFactoryImpl.java
+++ b/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionFactoryImpl.java
@@ -18,6 +18,15 @@
*/
package org.apache.ode.daohib.bpel;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Properties;
+
+import javax.sql.DataSource;
+import javax.transaction.TransactionManager;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ode.bpel.dao.BpelDAOConnection;
@@ -30,14 +39,6 @@ import org.hibernate.cfg.Environment;
import org.hibernate.dialect.Dialect;
import org.hibernate.dialect.resolver.DialectFactory;
-import javax.sql.DataSource;
-import javax.transaction.TransactionManager;
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.util.HashMap;
-import java.util.Properties;
-import java.util.Enumeration;
-
/**
* Hibernate-based {@link org.apache.ode.bpel.dao.BpelDAOConnectionFactory}
* implementation.
@@ -69,7 +70,6 @@ public class BpelDAOConnectionFactoryImpl implements BpelDAOConnectionFactoryJDB
/**
* @see org.apache.ode.bpel.dao.BpelDAOConnectionFactory#init(java.util.Properties)
*/
- @SuppressWarnings("unchecked")
public void init(Properties initialProps) {
if (_ds == null) {
String errmsg = "setDataSource() not called!";
@@ -109,7 +109,7 @@ public class BpelDAOConnectionFactoryImpl implements BpelDAOConnectionFactoryJDB
properties.put(Environment.ISOLATION, level);
if (__log.isDebugEnabled()) {
- Enumeration names = properties.propertyNames();
+ Enumeration<?> names = properties.propertyNames();
__log.debug("Properties passed to Hibernate:");
while (names.hasMoreElements()) {
String name = (String) names.nextElement();
[4/6] git commit: fixing tempfile handling
Posted by va...@apache.org.
fixing tempfile handling
Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/82a053ee
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/82a053ee
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/82a053ee
Branch: refs/heads/master
Commit: 82a053eeb43c38808ceb30992452cd2906e462b1
Parents: 8d7427e
Author: Tammo van Lessen <tv...@gmail.com>
Authored: Tue May 14 01:58:15 2013 +0200
Committer: Tammo van Lessen <tv...@gmail.com>
Committed: Tue May 14 01:58:15 2013 +0200
----------------------------------------------------------------------
tasks/jbi.rake | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode/blob/82a053ee/tasks/jbi.rake
----------------------------------------------------------------------
diff --git a/tasks/jbi.rake b/tasks/jbi.rake
index 9f57600..32562a3 100644
--- a/tasks/jbi.rake
+++ b/tasks/jbi.rake
@@ -76,10 +76,14 @@ class JBITask < Buildr::ZipTask
when nil, true
# Tempfiles gets deleted on garbage collection, so we're going to hold on to it
# through instance variable not closure variable.
- Tempfile.open("MANIFEST.MF") { |@jbi_xml_tmp| @jbi_xml_tmp.write descriptor }
+ @jbi_xml_tmp = Tempfile.new('MANIFEST.MF')
+ @jbi_xml_tmp.write descriptor
+ @jbi_xml_tmp.close
path("META-INF").include @jbi_xml_tmp.path, :as=>"jbi.xml"
when Proc, Method
- Tempfile.open("MANIFEST.MF") { |@jbi_xml_tmp| @jbi_xml_tmp.write jbi_xml.call.to_s }
+ @jbi_xml_tmp = Tempfile.new('MANIFEST.MF')
+ @jbi_xml_tmp.write descriptor
+ @jbi_xml_tmp.close
path("META-INF").include @jbi_xml_tmp.path, :as=>"jbi.xml"
end
end
[3/6] git commit: ignoring obsolete testcases.
Posted by va...@apache.org.
ignoring obsolete testcases.
Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/8493242b
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/8493242b
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/8493242b
Branch: refs/heads/ode-1.3.6.x
Commit: 8493242bcfa5e301f0ab1c8e2aaa6790845ffcc6
Parents: d56304b
Author: Tammo van Lessen <tv...@gmail.com>
Authored: Tue May 14 01:52:41 2013 +0200
Committer: Tammo van Lessen <tv...@gmail.com>
Committed: Tue May 14 01:54:28 2013 +0200
----------------------------------------------------------------------
Rakefile | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode/blob/8493242b/Rakefile
----------------------------------------------------------------------
diff --git a/Rakefile b/Rakefile
index 84dbca5..c38257a 100644
--- a/Rakefile
+++ b/Rakefile
@@ -436,7 +436,8 @@ define "ode" do
LOG4J,
DOM4J,
HIBERNATE
-
+ test.exclude "*JbiTestBase"
+ test.exclude "*OdeJbiComponentLifeCycleTest"
test.setup unzip(_("target/test/smx/ode")=>project("dao-jpa-ojpa-derby").package(:zip))
test.setup unzip(_("target/test/smx/ode")=>project("dao-hibernate-db").package(:zip))
test.setup task(:prepare_jbi_tests) do |task|