You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by rr...@apache.org on 2010/04/07 15:49:22 UTC
svn commit: r931547 - in
/ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store:
ProcessConfImpl.java ProcessStoreImpl.java
Author: rr
Date: Wed Apr 7 13:49:21 2010
New Revision: 931547
URL: http://svn.apache.org/viewvc?rev=931547&view=rev
Log:
ODE-801: GenerateProcessEvents as global config option
Modified:
ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java
ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java
Modified: ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java?rev=931547&r1=931546&r2=931547&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java Wed Apr 7 13:49:21 2010
@@ -97,9 +97,11 @@ public class ProcessConfImpl implements
private EndpointReferenceContext eprContext;
private final ProcessCleanupConfImpl processCleanupConfImpl;
+
+ private final boolean generateProcessEventsAll;
ProcessConfImpl(QName pid, QName type, long version, DeploymentUnitDir du, TDeployment.Process pinfo, Date deployDate,
- Map<QName, Node> props, ProcessState pstate, EndpointReferenceContext eprContext, File configDir) {
+ Map<QName, Node> props, ProcessState pstate, EndpointReferenceContext eprContext, File configDir, boolean generateProcessEventsAll) {
_pid = pid;
_version = version;
_du = du;
@@ -110,6 +112,7 @@ public class ProcessConfImpl implements
_state = pstate;
_type = type;
_inMemory = _pinfo.isSetInMemory() && _pinfo.getInMemory();
+ this.generateProcessEventsAll = generateProcessEventsAll;
this.eprContext = eprContext;
propertiesWatchDog = new WatchDog<Map<File, Long>, PropertiesObserver>(new PropertiesMutable(), new PropertiesObserver());
@@ -385,11 +388,13 @@ public class ProcessConfImpl implements
TProcessEvents processEvents = _pinfo.getProcessEvents();
// No filtering, using defaults
if (processEvents == null) {
- HashSet<BpelEvent.TYPE> all = new HashSet<BpelEvent.TYPE>();
- for (BpelEvent.TYPE t : BpelEvent.TYPE.values()) {
- if (!t.equals(BpelEvent.TYPE.scopeHandling)) all.add(t);
+ if (generateProcessEventsAll) {
+ HashSet<BpelEvent.TYPE> all = new HashSet<BpelEvent.TYPE>();
+ for (BpelEvent.TYPE t : BpelEvent.TYPE.values()) {
+ if (!t.equals(BpelEvent.TYPE.scopeHandling)) all.add(t);
+ }
+ _events.put(null, all);
}
- _events.put(null, all);
return;
}
Modified: ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java?rev=931547&r1=931546&r2=931547&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java Wed Apr 7 13:49:21 2010
@@ -81,6 +81,8 @@ public class ProcessStoreImpl implements
private ConfStoreConnectionFactory _cf;
private EndpointReferenceContext eprContext;
+
+ private boolean generateProcessEventsAll;
protected File _deployDir;
@@ -105,6 +107,7 @@ public class ProcessStoreImpl implements
public ProcessStoreImpl(EndpointReferenceContext eprContext, DataSource ds, String persistenceType, OdeConfigProperties props, boolean createDatamodel) {
this.eprContext = eprContext;
+ this.generateProcessEventsAll = props.getProperty("generateProcessEvents", "all").equals("all");
if (ds != null) {
// ugly hack
if (persistenceType.toLowerCase().indexOf("hib") != -1) {
@@ -236,7 +239,7 @@ public class ProcessStoreImpl implements
}
ProcessConfImpl pconf = new ProcessConfImpl(pid, processDD.getName(), version, du, processDD, deployDate,
- calcInitialProperties(processDD), calcInitialState(processDD), eprContext, _configDir);
+ calcInitialProperties(processDD), calcInitialState(processDD), eprContext, _configDir, generateProcessEventsAll);
processes.add(pconf);
}
@@ -693,7 +696,7 @@ public class ProcessStoreImpl implements
// TODO: update the props based on the values in the DB.
ProcessConfImpl pconf = new ProcessConfImpl(p.getPID(), p.getType(), p.getVersion(), dud, pinfo, dudao
- .getDeployDate(), props, p.getState(), eprContext, _configDir);
+ .getDeployDate(), props, p.getState(), eprContext, _configDir, generateProcessEventsAll);
version = p.getVersion();
_processes.put(pconf.getProcessId(), pconf);