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 2015/11/06 11:51:25 UTC
[30/30] ode git commit: Merge from fork branch sudharma/ODECluster
Merge from fork branch sudharma/ODECluster
Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/26dacc20
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/26dacc20
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/26dacc20
Branch: refs/heads/ODE-563
Commit: 26dacc2013b6b5e6c6e097b27c94fdd8352393c5
Parents: 8fcaf5f 6c92a25
Author: sathwik <sa...@apache.org>
Authored: Fri Nov 6 12:58:21 2015 +0530
Committer: sathwik <sa...@apache.org>
Committed: Fri Nov 6 12:58:21 2015 +0530
----------------------------------------------------------------------
Rakefile | 16 +-
.../src/main/webapp/WEB-INF/conf/hazelcast.xml | 63 +++++
.../webapp/WEB-INF/conf/ode-axis2.properties | 8 +-
.../java/org/apache/ode/axis2/Messages.java | 4 +
.../java/org/apache/ode/axis2/ODEServer.java | 119 +++++---
.../ode/axis2/deploy/DeploymentPoller.java | 135 +++++++---
.../ode/axis2/service/DeploymentWebService.java | 177 +++++++-----
.../org/apache/ode/bpel/clapi/ClusterLock.java | 76 ++++++
.../apache/ode/bpel/clapi/ClusterManager.java | 84 ++++++
.../ode/bpel/clapi/ClusterMemberListener.java | 29 ++
.../ode/bpel/clapi/ClusterProcessStore.java | 31 +++
.../bpel/clapi/ProcessStoreClusterEvent.java | 58 ++++
.../bpel/clapi/ProcessStoreClusterListener.java | 24 ++
.../bpel/clapi/ProcessStoreDeployedEvent.java | 32 +++
.../bpel/clapi/ProcessStoreUndeployedEvent.java | 32 +++
.../ode/il/config/OdeConfigProperties.java | 22 +-
.../apache/ode/bpel/engine/BpelEngineImpl.java | 36 +--
.../apache/ode/bpel/engine/BpelServerImpl.java | 5 +
.../org/apache/ode/bpel/engine/Contexts.java | 3 +
.../ode/bpel/engine/InstanceLockManager.java | 30 ++-
.../ode/store/ClusterProcessStoreImpl.java | 135 ++++++++++
.../org/apache/ode/store/ProcessStoreImpl.java | 81 +++---
.../org/apache/ode/test/BPELTestAbstract.java | 51 ++--
clustering/pom.xml | 30 +++
.../java/org/apache/ode/clustering/Test.java | 4 +
.../hazelcast/HazelcastClusterImpl.java | 268 +++++++++++++++++++
.../hazelcast/HazelcastConstants.java | 31 +++
.../hazelcast/HazelcastDeploymentLock.java | 73 +++++
.../hazelcast/HazelcastInstanceLock.java | 94 +++++++
dependencies.rb | 1 +
.../java/org/apache/ode/jbi/OdeLifeCycle.java | 23 +-
pom.xml | 1 +
.../ode/scheduler/simple/SimpleScheduler.java | 189 +++++++++----
.../scheduler/simple/SimpleSchedulerTest.java | 27 +-
34 files changed, 1660 insertions(+), 332 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode/blob/26dacc20/Rakefile
----------------------------------------------------------------------
diff --cc Rakefile
index a8c5f06,7c0fa67..ac9b74e
--- a/Rakefile
+++ b/Rakefile
@@@ -99,9 -97,9 +99,9 @@@ define "ode" d
desc "ODE Axis2 Based Web Application"
define "axis2-war" do
libs = projects("axis2", "bpel-api", "bpel-compiler", "bpel-connector", "bpel-dao",
- "bpel-epr", "bpel-obj", "bpel-ql", "bpel-runtime", "scheduler-simple",
+ "bpel-epr", "bpel-nobj", "bpel-ql", "bpel-runtime", "scheduler-simple",
"bpel-schemas", "bpel-store", "dao-hibernate", "jca-ra", "jca-server",
- "utils", "dao-jpa", "agents"),
+ "utils", "dao-jpa", "agents", "clustering"),
AXIS2_ALL, ANNONGEN, BACKPORT, COMMONS.codec, COMMONS.collections, COMMONS.fileupload, COMMONS.io, COMMONS.httpclient, COMMONS.beanutils,
COMMONS.lang, COMMONS.pool, DERBY, DERBY_TOOLS, JACOB, JAXEN, JAVAX.activation, JAVAX.ejb, JAVAX.javamail,
JAVAX.connector, JAVAX.jms, JAVAX.persistence, JAVAX.transaction, JAVAX.stream, JIBX,
@@@ -233,16 -230,15 +239,16 @@@
desc "ODE Runtime Engine"
define "bpel-runtime" do
- compile.with projects("bpel-api", "bpel-compiler", "bpel-dao", "bpel-epr", "bpel-obj", "bpel-schemas",
- "bpel-store", "utils", "agents","clustering"),
- COMMONS.collections, COMMONS.httpclient, JACOB, JAVAX.persistence, JAVAX.stream, JAXEN, SAXON, WSDL4J, XMLBEANS, SPRING, SLF4J, LOG4J
+
+ compile.with projects("bpel-api", "bpel-compiler", "bpel-dao", "bpel-epr", "bpel-nobj", "bpel-schemas",
- "bpel-store", "utils", "agents"),
++ "bpel-store", "utils", "agents","clustering"),
+ COMMONS.collections, COMMONS.httpclient, JACOB, JAVAX.persistence, JAVAX.stream, JAXEN, SAXON, WSDL4J, XMLBEANS, SPRING, SLF4J, LOG4J,
+ JACKSON, JAVAX.connector
-
- test.with projects("scheduler-simple", "dao-jpa", "dao-hibernate", "bpel-epr"),
- BACKPORT, COMMONS.pool, COMMONS.lang, COMMONS.io, DERBY, JAVAX.connector, JAVAX.transaction,
- GERONIMO.transaction, GERONIMO.kernel, GERONIMO.connector, TRANQL, HSQLDB, JAVAX.ejb,
- OPENJPA, XERCES, XALAN, DOM4J, HIBERNATE, SPRING_TEST, H2::REQUIRES,
+ test.with projects("scheduler-simple", "dao-jpa", "dao-hibernate", "bpel-epr", "bpel-obj"),
+# BACKPORT, COMMONS.pool, COMMONS.lang, COMMONS.io, DERBY, JAVAX.connector, JAVAX.transaction,
+ GERONIMO.transaction, GERONIMO.kernel, GERONIMO.connector, TRANQL, HSQLDB, JAVAX.ejb, JAVAX.transaction,
+ OPENJPA, XERCES, XALAN, DOM4J, HIBERNATE, SPRING_TEST, H2::REQUIRES, JACKSON,
"tranql:tranql-connector-derby-common:jar:1.1"
package :jar
http://git-wip-us.apache.org/repos/asf/ode/blob/26dacc20/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode/blob/26dacc20/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelEngineImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode/blob/26dacc20/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode/blob/26dacc20/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ode/blob/26dacc20/dependencies.rb
----------------------------------------------------------------------
diff --cc dependencies.rb
index 0857cf1,33da5e4..f469c02
--- a/dependencies.rb
+++ b/dependencies.rb
@@@ -75,14 -75,10 +75,15 @@@ GERONIMO = struct
:transaction =>"org.apache.geronimo.components:geronimo-transaction:jar:2.0.1",
:connector =>"org.apache.geronimo.components:geronimo-connector:jar:2.0.1"
)
+ HAZELCAST ="com.hazelcast:hazelcast:jar:3.4.2"
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" ]
-HSQLDB = "hsqldb:hsqldb:jar:1.8.0.7"
+HSQLDB = "org.hsqldb:hsqldb:jar:2.3.3"
+JACKSON = [ "com.fasterxml.jackson.core:jackson-core:jar:2.4.0",
+ "com.fasterxml.jackson.core:jackson-databind:jar:2.4.0",
+ "com.fasterxml.jackson.core:jackson-annotations:jar:2.4.0",
+ "com.fasterxml.jackson.dataformat:jackson-dataformat-smile:jar:2.4.0",
+ "com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:2.4.0"]
JACOB = "org.apache.ode:jacob:jar:2.0a-SNAPSHOT"
JAVAX = struct(
:activation =>"javax.activation:activation:jar:1.1",