svn commit: r966560 - in /ode/trunk: Rakefile bpel-api/src/main/java/org/apache/ode/bpel/iapi/OdeGlobalConfig.java bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelEngineImpl.java

[rr]

Author: rr
Date: Thu Jul 22 10:09:21 2010
New Revision: 966560

URL: http://svn.apache.org/viewvc?rev=966560&view=rev
Log:
No auto retire process

Modified:
    ode/trunk/Rakefile
    
ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/OdeGlobalConfig.java
    
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelEngineImpl.java

Modified: ode/trunk/Rakefile
URL: 
http://svn.apache.org/viewvc/ode/trunk/Rakefile?rev=966560&r1=966559&r2=966560&view=diff
==============================================================================
--- ode/trunk/Rakefile (original)
+++ ode/trunk/Rakefile Thu Jul 22 10:09:21 2010
@@ -254,6 +254,7 @@ define "ode" do
       GERONIMO.transaction, GERONIMO.kernel, GERONIMO.connector, 
JAVAX.connector, JAVAX.ejb, JAVAX.transaction, TRANQL, 
"tranql:tranql-connector-derby-common:jar:1.1",
     COMMONS.codec
 
+    test.using :properties=>{ "org.apache.ode.autoRetireProcess"=>"true" }
     test.with projects("bpel-obj", "jacob", "bpel-schemas",
       "bpel-scripts"),
       COMMONS.collections, COMMONS.lang, COMMONS.logging, DERBY, 
JAVAX.connector,
@@ -407,7 +408,7 @@ define "ode" do
       jbi.include path_to("src/main/jbi/ode-jbi.properties")
     end
 
-    test.using :properties=>{ "java.naming.factory.initial" => 
"org.apache.xbean.spring.jndi.SpringInitialContextFactory"}, 
:java_args=>ENV['TEST_JVM_ARGS']
+    test.using :properties=>{ "java.naming.factory.initial" => 
"org.apache.xbean.spring.jndi.SpringInitialContextFactory", 
"org.apache.ode.autoRetireProcess"=>"true"}, :java_args=>ENV['TEST_JVM_ARGS']
     test.with projects("dao-jpa", "dao-hibernate", "bpel-compiler", 
"bpel-api-jca", "jca-ra",
       "jca-server", "jacob"),
       BACKPORT, COMMONS.lang, COMMONS.io, COMMONS.collections, DERBY, 
GERONIMO.connector, GERONIMO.kernel,

Modified: 
ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/OdeGlobalConfig.java
URL: 
http://svn.apache.org/viewvc/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/OdeGlobalConfig.java?rev=966560&r1=966559&r2=966560&view=diff
==============================================================================
--- 
ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/OdeGlobalConfig.java 
(original)
+++ 
ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/iapi/OdeGlobalConfig.java 
Thu Jul 22 10:09:21 2010
@@ -23,4 +23,7 @@ public class OdeGlobalConfig {
     public static boolean queueInOutMessages() {
         return 
Boolean.parseBoolean(System.getProperty("org.apache.ode.queueInOutMessages", 
"true"));
     }
+    public static boolean autoRetireProcess() {
+        return 
Boolean.parseBoolean(System.getProperty("org.apache.ode.autoRetireProcess", 
"false"));
+    }
 }

Modified: 
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelEngineImpl.java
URL: 
http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelEngineImpl.java?rev=966560&r1=966559&r2=966560&view=diff
==============================================================================
--- 
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelEngineImpl.java
 (original)
+++ 
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelEngineImpl.java
 Thu Jul 22 10:09:21 2010
@@ -44,6 +44,7 @@ import org.apache.ode.bpel.iapi.ContextE
 import org.apache.ode.bpel.iapi.Endpoint;
 import org.apache.ode.bpel.iapi.Message;
 import org.apache.ode.bpel.iapi.MessageExchange;
+import org.apache.ode.bpel.iapi.OdeGlobalConfig;
 import org.apache.ode.bpel.iapi.MyRoleMessageExchange;
 import org.apache.ode.bpel.iapi.PartnerRoleMessageExchange;
 import org.apache.ode.bpel.iapi.ProcessState;
@@ -330,6 +331,9 @@ public class BpelEngineImpl implements B
                 BpelProcess cachedVersion = processesIter.next();
                 __log.debug("cached version " + cachedVersion.getPID() + " vs 
registering version " + process.getPID());
                 if 
(cachedVersion.getProcessType().equals(process.getProcessType())) {
+                    if (!OdeGlobalConfig.autoRetireProcess()) {
+                        throw new ContextException("Can't activate two 
processes of the same name: " + process.getConf().getPackage() + ", " + 
cachedVersion.getConf().getPackage() + ", name: " + process.getProcessType());
+                    }
                     //Check for versions to retain newer one
                     if (cachedVersion.getVersion() > process.getVersion()) {
                         __log.debug("removing current version");