You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by js...@apache.org on 2007/10/15 18:32:58 UTC
svn commit: r584816 - in
/activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model:
ActivityDefinition.java ActivityState.java ProcessInstance.java
Author: jstrachan
Date: Mon Oct 15 09:32:48 2007
New Revision: 584816
URL: http://svn.apache.org/viewvc?rev=584816&view=rev
Log:
added support for MERGE as well as PERSIST cascading
Modified:
activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ActivityDefinition.java
activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ActivityState.java
activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ProcessInstance.java
Modified: activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ActivityDefinition.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ActivityDefinition.java?rev=584816&r1=584815&r2=584816&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ActivityDefinition.java (original)
+++ activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ActivityDefinition.java Mon Oct 15 09:32:48 2007
@@ -54,7 +54,7 @@
this.name = name;
}
- @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST })
+ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST, CascadeType.MERGE })
public ProcessDefinition getProcessDefinition() {
return processDefinition;
}
Modified: activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ActivityState.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ActivityState.java?rev=584816&r1=584815&r2=584816&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ActivityState.java (original)
+++ activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ActivityState.java Mon Oct 15 09:32:48 2007
@@ -87,7 +87,7 @@
// Properties
// -----------------------------------------------------------------------
- @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST })
+ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST, CascadeType.MERGE })
public ProcessInstance getProcessInstance() {
return processInstance;
}
@@ -97,7 +97,7 @@
processInstance.getActivityStates().add(this);
}
- @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST })
+ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST, CascadeType.MERGE })
public ActivityDefinition getActivityDefinition() {
return activityDefinition;
}
Modified: activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ProcessInstance.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ProcessInstance.java?rev=584816&r1=584815&r2=584816&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ProcessInstance.java (original)
+++ activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ProcessInstance.java Mon Oct 15 09:32:48 2007
@@ -56,7 +56,7 @@
this.correlationKey = correlationKey;
}
- @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST })
+ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST, CascadeType.MERGE })
public ProcessDefinition getProcessDefinition() {
return processDefinition;
}