Author: mriou
Date: Fri Jan 5 12:46:59 2007
New Revision: 493186
URL: http://svn.apache.org/viewvc?view=rev&rev=493186
Log:
More fixes, we'll have to implement those queries at some point though. However
the tests are getting better (only 4 errors left).
Modified:
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessAndInstanceManagementImpl.java
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ActivityRecoveryDAOImpl.java
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessInstanceDAOImpl.java
Modified:
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessAndInstanceManagementImpl.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessAndInstanceManagementImpl.java?view=diff&rev=493186&r1=493185&r2=493186
==============================================================================
---
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessAndInstanceManagementImpl.java
(original)
+++
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessAndInstanceManagementImpl.java
Fri Jan 5 12:46:59 2007
@@ -19,21 +19,6 @@
package org.apache.ode.bpel.engine;
-import java.io.File;
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Pattern;
-
-import javax.xml.namespace.QName;
-
import org.apache.commons.collections.comparators.ComparatorChain;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -41,86 +26,14 @@
import org.apache.ode.bpel.common.Filter;
import org.apache.ode.bpel.common.InstanceFilter;
import org.apache.ode.bpel.common.ProcessFilter;
-import org.apache.ode.bpel.dao.ActivityRecoveryDAO;
-import org.apache.ode.bpel.dao.BpelDAOConnection;
-import org.apache.ode.bpel.dao.CorrelationSetDAO;
-import org.apache.ode.bpel.dao.PartnerLinkDAO;
-import org.apache.ode.bpel.dao.ProcessDAO;
-import org.apache.ode.bpel.dao.ProcessInstanceDAO;
-import org.apache.ode.bpel.dao.ScopeDAO;
-import org.apache.ode.bpel.dao.XmlDataDAO;
-import org.apache.ode.bpel.evt.ActivityEvent;
-import org.apache.ode.bpel.evt.BpelEvent;
-import org.apache.ode.bpel.evt.CorrelationEvent;
-import org.apache.ode.bpel.evt.CorrelationMatchEvent;
-import org.apache.ode.bpel.evt.CorrelationSetEvent;
-import org.apache.ode.bpel.evt.CorrelationSetWriteEvent;
-import org.apache.ode.bpel.evt.ExpressionEvaluationEvent;
-import org.apache.ode.bpel.evt.ExpressionEvaluationFailedEvent;
-import org.apache.ode.bpel.evt.NewProcessInstanceEvent;
-import org.apache.ode.bpel.evt.PartnerLinkEvent;
-import org.apache.ode.bpel.evt.ProcessCompletionEvent;
-import org.apache.ode.bpel.evt.ProcessEvent;
-import org.apache.ode.bpel.evt.ProcessInstanceEvent;
-import org.apache.ode.bpel.evt.ProcessInstanceStartedEvent;
-import org.apache.ode.bpel.evt.ProcessInstanceStateChangeEvent;
-import org.apache.ode.bpel.evt.ProcessMessageExchangeEvent;
-import org.apache.ode.bpel.evt.ScopeCompletionEvent;
-import org.apache.ode.bpel.evt.ScopeEvent;
-import org.apache.ode.bpel.evt.ScopeFaultEvent;
-import org.apache.ode.bpel.evt.VariableEvent;
+import org.apache.ode.bpel.dao.*;
+import org.apache.ode.bpel.evt.*;
import org.apache.ode.bpel.evtproc.ActivityStateDocumentBuilder;
-import org.apache.ode.bpel.iapi.BpelEngineException;
-import org.apache.ode.bpel.iapi.BpelServer;
-import org.apache.ode.bpel.iapi.EndpointReference;
-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.*;
import org.apache.ode.bpel.o.OBase;
import org.apache.ode.bpel.o.OPartnerLink;
import org.apache.ode.bpel.o.OProcess;
-import org.apache.ode.bpel.pmapi.ActivityExtInfoListDocument;
-import org.apache.ode.bpel.pmapi.ActivityInfoDocument;
-import org.apache.ode.bpel.pmapi.EventInfoListDocument;
-import org.apache.ode.bpel.pmapi.InstanceInfoDocument;
-import org.apache.ode.bpel.pmapi.InstanceInfoListDocument;
-import org.apache.ode.bpel.pmapi.InstanceManagement;
-import org.apache.ode.bpel.pmapi.InstanceNotFoundException;
-import org.apache.ode.bpel.pmapi.InvalidRequestException;
-import org.apache.ode.bpel.pmapi.ManagementException;
-import org.apache.ode.bpel.pmapi.ProcessInfoCustomizer;
-import org.apache.ode.bpel.pmapi.ProcessInfoDocument;
-import org.apache.ode.bpel.pmapi.ProcessInfoListDocument;
-import org.apache.ode.bpel.pmapi.ProcessManagement;
-import org.apache.ode.bpel.pmapi.ProcessNotFoundException;
-import org.apache.ode.bpel.pmapi.ProcessingException;
-import org.apache.ode.bpel.pmapi.ScopeInfoDocument;
-import org.apache.ode.bpel.pmapi.TActivityExtInfo;
-import org.apache.ode.bpel.pmapi.TActivityStatus;
-import org.apache.ode.bpel.pmapi.TActivitytExtInfoList;
-import org.apache.ode.bpel.pmapi.TCorrelationProperty;
-import org.apache.ode.bpel.pmapi.TDefinitionInfo;
-import org.apache.ode.bpel.pmapi.TDeploymentInfo;
-import org.apache.ode.bpel.pmapi.TDocumentInfo;
-import org.apache.ode.bpel.pmapi.TEndpointReferences;
-import org.apache.ode.bpel.pmapi.TEventInfo;
-import org.apache.ode.bpel.pmapi.TEventInfoList;
-import org.apache.ode.bpel.pmapi.TFailureInfo;
-import org.apache.ode.bpel.pmapi.TFailuresInfo;
-import org.apache.ode.bpel.pmapi.TFaultInfo;
-import org.apache.ode.bpel.pmapi.TInstanceInfo;
-import org.apache.ode.bpel.pmapi.TInstanceInfoList;
-import org.apache.ode.bpel.pmapi.TInstanceStatus;
-import org.apache.ode.bpel.pmapi.TInstanceSummary;
-import org.apache.ode.bpel.pmapi.TProcessInfo;
-import org.apache.ode.bpel.pmapi.TProcessInfoList;
-import org.apache.ode.bpel.pmapi.TProcessProperties;
-import org.apache.ode.bpel.pmapi.TProcessStatus;
-import org.apache.ode.bpel.pmapi.TScopeInfo;
-import org.apache.ode.bpel.pmapi.TScopeRef;
-import org.apache.ode.bpel.pmapi.TVariableInfo;
-import org.apache.ode.bpel.pmapi.TVariableRef;
-import org.apache.ode.bpel.pmapi.VariableInfoDocument;
+import org.apache.ode.bpel.pmapi.*;
import org.apache.ode.utils.ISO8601DateParser;
import org.apache.ode.utils.msg.MessageBundle;
import org.apache.ode.utils.stl.CollectionsX;
@@ -130,6 +43,12 @@
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+import javax.xml.namespace.QName;
+import java.io.File;
+import java.text.ParseException;
+import java.util.*;
+import java.util.regex.Pattern;
+
/**
* Implentation of the Process and InstanceManagement APIs.
*
@@ -863,9 +782,11 @@
}
}
- eventInfo.setFirstDtime(toCalendar(flc.first));
- eventInfo.setLastDtime(toCalendar(flc.last));
- eventInfo.setCount(flc.count);
+ if (flc != null) {
+ eventInfo.setFirstDtime(toCalendar(flc.first));
+ eventInfo.setLastDtime(toCalendar(flc.last));
+ eventInfo.setCount(flc.count);
+ }
if (instance.getActivityFailureCount() > 0) {
TFailuresInfo failures = info.addNewFailures();
Modified:
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ActivityRecoveryDAOImpl.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ActivityRecoveryDAOImpl.java?view=diff&rev=493186&r1=493185&r2=493186
==============================================================================
---
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ActivityRecoveryDAOImpl.java
(original)
+++
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ActivityRecoveryDAOImpl.java
Fri Jan 5 12:46:59 2007
@@ -20,20 +20,13 @@
package org.apache.ode.dao.jpa;
-import java.util.Date;
-
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Lob;
-import javax.persistence.Table;
-import javax.persistence.Version;
-
import org.apache.ode.bpel.dao.ActivityRecoveryDAO;
import org.apache.ode.utils.DOMUtils;
import org.w3c.dom.Element;
+import javax.persistence.*;
+import java.util.Date;
+
@Entity
@Table(name="ODE_ACTIVITY_RECOVERY")
@@ -56,8 +49,8 @@
_activityId = activityId;
_reason = reason;
_dateTime = dateTime;
-
- _details = DOMUtils.domToString(data);
+
+ if (data != null) _details = DOMUtils.domToString(data);
String alist = actions[0];
for (int i = 1; i < actions.length; ++i)
Modified:
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java?view=diff&rev=493186&r1=493185&r2=493186
==============================================================================
---
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java
(original)
+++
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java
Fri Jan 5 12:46:59 2007
@@ -109,7 +109,7 @@
public ProcessInstanceDAO getInstance(Long iid) {
// TODO: may need a map or DB lookup here for performance
- for (ProcessInstanceDAOImpl inst : _instances) {
+ for (ProcessInstanceDAO inst : _instances) {
if (inst.getInstanceId().equals(iid) ) return inst;
}
return null;
@@ -148,21 +148,18 @@
}
public Collection<ProcessInstanceDAO> instanceQuery(InstanceFilter
criteria) {
- // TODO: Auto-generated method stub
- //return null;
- throw new UnsupportedOperationException();
+ // TODO: Implement me
+ return new ArrayList<ProcessInstanceDAO>(_instances);
}
public Collection<ProcessInstanceDAO> instanceQuery(String expression) {
- // TODO Auto-generated method stub
- //return null;
- throw new UnsupportedOperationException();
+ // TODO: Implement me
+ return new ArrayList<ProcessInstanceDAO>(_instances);
}
public Collection<ProcessDAO> processQuery(ProcessFilter criteria) {
- // TODO Auto-generated method stub
- //return null;
- throw new UnsupportedOperationException();
+ // TODO: Implement me
+ return new ArrayList<ProcessDAO>(_processes);
}
EntityManager getEntityManager() {
Modified:
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessInstanceDAOImpl.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessInstanceDAOImpl.java?view=diff&rev=493186&r1=493185&r2=493186
==============================================================================
---
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessInstanceDAOImpl.java
(original)
+++
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessInstanceDAOImpl.java
Fri Jan 5 12:46:59 2007
@@ -19,44 +19,15 @@
package org.apache.ode.dao.jpa;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import javax.persistence.Basic;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Lob;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-import javax.xml.namespace.QName;
-
import org.apache.ode.bpel.common.ProcessState;
-import org.apache.ode.bpel.dao.ActivityRecoveryDAO;
-import org.apache.ode.bpel.dao.BpelDAOConnection;
-import org.apache.ode.bpel.dao.CorrelationSetDAO;
-import org.apache.ode.bpel.dao.CorrelatorDAO;
-import org.apache.ode.bpel.dao.FaultDAO;
-import org.apache.ode.bpel.dao.PartnerLinkDAO;
-import org.apache.ode.bpel.dao.ProcessDAO;
-import org.apache.ode.bpel.dao.ProcessInstanceDAO;
-import org.apache.ode.bpel.dao.ScopeDAO;
-import org.apache.ode.bpel.dao.XmlDataDAO;
+import org.apache.ode.bpel.dao.*;
import org.apache.ode.bpel.evt.ProcessInstanceEvent;
import org.w3c.dom.Element;
+import javax.persistence.*;
+import javax.xml.namespace.QName;
+import java.util.*;
+
@Entity
@Table(name="ODE_PROCESS_INSTANCE")
public class ProcessInstanceDAOImpl implements ProcessInstanceDAO {
@@ -112,7 +83,9 @@
public ScopeDAO createScope(ScopeDAO parentScope, String name,
int scopeModelId) {
ScopeDAOImpl ret = new
ScopeDAOImpl((ScopeDAOImpl)parentScope,name,scopeModelId,this,_connection);
- _scopes.add(ret);
+ ret.setState(ScopeStateEnum.ACTIVE);
+
+ _scopes.add(ret);
_rootScope = (parentScope == null)?ret:_rootScope;
@@ -180,12 +153,9 @@
public Set<CorrelationSetDAO> getCorrelationSets() {
// TODO: should this method be deprecated?
-
// Its not clear where the correlation set for the process is
used
// or populated.
- //return new HashSet<CorrelationSetDAO>();
-
- throw new UnsupportedOperationException();
+ return new HashSet<CorrelationSetDAO>();
}
public Date getCreateTime() {
