svn commit: r480769 - /incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java

[mriou]

Author: mriou
Date: Wed Nov 29 15:22:42 2006
New Revision: 480769

URL: http://svn.apache.org/viewvc?view=rev&rev=480769
Log:
Default should really be activated processes.

Modified:
    
incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java

Modified: 
incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java?view=diff&rev=480769&r1=480768&r2=480769
==============================================================================
--- 
incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java
 (original)
+++ 
incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java
 Wed Nov 29 15:22:42 2006
@@ -1,36 +1,11 @@
 package org.apache.ode.store;
 
-import java.io.File;
-import java.io.IOException;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-
-import javax.sql.DataSource;
-import javax.xml.namespace.QName;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.ode.bpel.dd.DeployDocument;
 import org.apache.ode.bpel.dd.TDeployment;
 import org.apache.ode.bpel.dd.TDeployment.Process;
-import org.apache.ode.bpel.iapi.ContextException;
-import org.apache.ode.bpel.iapi.ProcessConf;
-import org.apache.ode.bpel.iapi.ProcessState;
-import org.apache.ode.bpel.iapi.ProcessStore;
-import org.apache.ode.bpel.iapi.ProcessStoreEvent;
-import org.apache.ode.bpel.iapi.ProcessStoreListener;
+import org.apache.ode.bpel.iapi.*;
 import org.apache.ode.store.DeploymentUnitDir.CBPInfo;
 import org.apache.ode.store.hib.DbConfStoreConnectionFactory;
 import org.apache.ode.utils.DOMUtils;
@@ -40,6 +15,19 @@
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
+import javax.sql.DataSource;
+import javax.xml.namespace.QName;
+import java.io.File;
+import java.io.IOException;
+import java.sql.SQLException;
+import java.util.*;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
 /**
  * <p>
  * JDBC-based implementation of a process store. Also provides an "in-memory" 
store by way of HSQL database.
@@ -504,10 +492,10 @@
      * @return
      */
     private static ProcessState calcInitialState(TDeployment.Process dd) {
-        ProcessState state = ProcessState.DISABLED;
+        ProcessState state = ProcessState.ACTIVE;
 
-        if (dd.isSetActive())
-            state = ProcessState.ACTIVE;
+        if (dd.isSetActive() && dd.getActive() == false)
+            state = ProcessState.DISABLED;
         if (dd.isSetRetired())
             state = ProcessState.RETIRED;