You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by mr...@apache.org on 2007/01/06 00:17:11 UTC
svn commit: r493232 - in /incubator/ode/trunk:
bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessAndInstanceManagementImpl.java
dao-jpa/src/main/java/org/apache/ode/dao/jpa/ScopeDAOImpl.java
Author: mriou
Date: Fri Jan 5 15:17:11 2007
New Revision: 493232
URL: http://svn.apache.org/viewvc?view=rev&rev=493232
Log:
Few more temporary fixes until the finders for the management API are implemented.
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/ScopeDAOImpl.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=493232&r1=493231&r2=493232
==============================================================================
--- 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 15:17:11 2007
@@ -570,11 +570,15 @@
ii.setSiid(siid);
dbexec(new BpelDatabase.Callable<Object>() {
public Object run(BpelDAOConnection conn) throws Exception {
+ try {
ScopeDAO instance = conn.getScope(siidl);
if (instance == null)
throw new InvalidRequestException("Scope not found: " + siidl);
// TODO: deal with "ERROR" state information.
fillScopeInfo(ii, instance, includeActivityInfo);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
return null;
}
});
@@ -833,6 +837,7 @@
TScopeInfo.Activities activities = scopeInfo.addNewActivities();
List<BpelEvent> events = scope.listEvents(null);
+ if (events )
ActivityStateDocumentBuilder b = new ActivityStateDocumentBuilder();
for (BpelEvent e : events)
b.onEvent(e);
Modified: incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ScopeDAOImpl.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ScopeDAOImpl.java?view=diff&rev=493232&r1=493231&r2=493232
==============================================================================
--- incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ScopeDAOImpl.java (original)
+++ incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ScopeDAOImpl.java Fri Jan 5 15:17:11 2007
@@ -19,34 +19,14 @@
package org.apache.ode.dao.jpa;
+import org.apache.ode.bpel.common.BpelEventFilter;
+import org.apache.ode.bpel.dao.*;
+import org.apache.ode.bpel.evt.BpelEvent;
+
+import javax.persistence.*;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
-
-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.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-import javax.persistence.Version;
-
-import org.apache.ode.bpel.common.BpelEventFilter;
-import org.apache.ode.bpel.dao.CorrelationSetDAO;
-import org.apache.ode.bpel.dao.PartnerLinkDAO;
-import org.apache.ode.bpel.dao.ProcessInstanceDAO;
-import org.apache.ode.bpel.dao.ScopeDAO;
-import org.apache.ode.bpel.dao.ScopeStateEnum;
-import org.apache.ode.bpel.dao.XmlDataDAO;
-import org.apache.ode.bpel.evt.BpelEvent;
@Entity
@Table(name="ODE_SCOPE")
@@ -183,8 +163,8 @@
}
public List<BpelEvent> listEvents(BpelEventFilter efilter) {
- // TODO Auto-generated method stub
- return null;
+ // TODO Implement me
+ return new ArrayList<BpelEvent>();
}
public void setState(ScopeStateEnum state) {