You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by lw...@apache.org on 2006/11/30 08:21:53 UTC
svn commit: r480863 - in
/incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa:
MessageExchangeDAOImpl.java ProcessDAOImpl.java ProcessInstanceDAOImpl.java
ScopeDAOImpl.java
Author: lwaterman
Date: Wed Nov 29 23:21:52 2006
New Revision: 480863
URL: http://svn.apache.org/viewvc?view=rev&rev=480863
Log:
Fix object relationships
Modified:
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageExchangeDAOImpl.java
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessDAOImpl.java
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessInstanceDAOImpl.java
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ScopeDAOImpl.java
Modified: incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageExchangeDAOImpl.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageExchangeDAOImpl.java?view=diff&rev=480863&r1=480862&r2=480863
==============================================================================
--- incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageExchangeDAOImpl.java (original)
+++ incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageExchangeDAOImpl.java Wed Nov 29 23:21:52 2006
@@ -158,7 +158,8 @@
}
public String getMessageExchangeId() {
- return _messageExchangeId;
+ //return _messageExchangeId;
+ return _id.toString();
}
public String getOperation() {
Modified: incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessDAOImpl.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessDAOImpl.java?view=diff&rev=480863&r1=480862&r2=480863
==============================================================================
--- incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessDAOImpl.java (original)
+++ incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessDAOImpl.java Wed Nov 29 23:21:52 2006
@@ -57,8 +57,9 @@
public ProcessInstanceDAO createInstance(
CorrelatorDAO instantiatingCorrelator) {
- ProcessInstanceDAOImpl inst = new ProcessInstanceDAOImpl((CorrelatorDAOImpl)instantiatingCorrelator,_connection);
+ ProcessInstanceDAOImpl inst = new ProcessInstanceDAOImpl((CorrelatorDAOImpl)instantiatingCorrelator, this,_connection);
_instances.add(inst);
+ _numInstances++;
return inst;
}
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=480863&r1=480862&r2=480863
==============================================================================
--- 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 Wed Nov 29 23:21:52 2006
@@ -72,10 +72,11 @@
private CorrelatorDAOImpl _instantiatingCorrelator;
public ProcessInstanceDAOImpl() {}
- public ProcessInstanceDAOImpl(CorrelatorDAOImpl correlator, BPELDAOConnectionImpl connection) {
+ public ProcessInstanceDAOImpl(CorrelatorDAOImpl correlator, ProcessDAOImpl process, BPELDAOConnectionImpl connection) {
_instantiatingCorrelator = correlator;
_connection = connection;
_connection.addInstance(this);
+ _process = process;
}
public void createActivityRecovery(String channel, long activityId,
@@ -88,7 +89,7 @@
public ScopeDAO createScope(ScopeDAO parentScope, String name,
int scopeModelId) {
- ScopeDAOImpl ret = new ScopeDAOImpl((ScopeDAOImpl)parentScope,name,scopeModelId,_connection);
+ ScopeDAOImpl ret = new ScopeDAOImpl((ScopeDAOImpl)parentScope,name,scopeModelId,this,_connection);
_scopes.add(ret);
_rootScope = (parentScope == null)?ret:_rootScope;
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=480863&r1=480862&r2=480863
==============================================================================
--- 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 Wed Nov 29 23:21:52 2006
@@ -82,12 +82,13 @@
private BPELDAOConnectionImpl _connection;
public ScopeDAOImpl() {}
- public ScopeDAOImpl(ScopeDAOImpl parentScope, String name, int scopeModelId, BPELDAOConnectionImpl connection) {
+ public ScopeDAOImpl(ScopeDAOImpl parentScope, String name, int scopeModelId, ProcessInstanceDAOImpl pi, BPELDAOConnectionImpl connection) {
_parentScope = parentScope;
_name = name;
_modelId = scopeModelId;
_connection = connection;
_connection.addScope(this);
+ _processInstance = pi;
}
public PartnerLinkDAO createPartnerLink(int plinkModelId, String pLinkName,