Author: assaf
Date: Fri Sep 29 21:59:56 2006
New Revision: 451541
URL: http://svn.apache.org/viewvc?view=rev&rev=451541
Log:
ActivityRecovery: added inheritence and rounded up test cases
Added:
incubator/ode/trunk/bpel-runtime/src/test/resources/recovery/failure-inheritence.bpel
incubator/ode/trunk/bpel-runtime/src/test/resources/recovery/failure-no-retry.bpel
incubator/ode/trunk/bpel-runtime/src/test/resources/recovery/failure-to-fault.bpel
incubator/ode/trunk/bpel-runtime/src/test/resources/recovery/failure-to-recovery.bpel
Removed:
incubator/ode/trunk/bpel-runtime/src/test/resources/recovery/process.bpel
Modified:
incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/capi/CompilerContext.java
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/DefaultActivityGenerator.java
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/FlowGenerator.java
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/ForEachGenerator.java
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/InvokeGenerator.java
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/SequenceGenerator.java
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WhileGenerator.java
incubator/ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/ActivityRecoveryDAO.java
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/MessageExchangeImpl.java
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessAndInstanceManagementImpl.java
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/ProcessInstanceDaoImpl.java
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/BpelRuntimeContext.java
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/INVOKE.java
incubator/ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/ActivityRecoveryTest.java
incubator/ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/CoreBpelTest.java
incubator/ode/trunk/bpel-runtime/src/test/resources/recovery/deploy.xml
incubator/ode/trunk/bpel-runtime/src/test/resources/recovery/services.wsdl
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ActivityRecoveryDaoImpl.java
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessInstanceDaoImpl.java
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HActivityRecovery.java
Modified:
incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/capi/CompilerContext.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/capi/CompilerContext.java?view=diff&rev=451541&r1=451540&r2=451541
==============================================================================
---
incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/capi/CompilerContext.java
(original)
+++
incubator/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/capi/CompilerContext.java
Fri Sep 29 21:59:56 2006
@@ -34,6 +34,7 @@
import javax.wsdl.Operation;
import javax.xml.namespace.QName;
import java.util.List;
+import java.util.Iterator;
/**
@@ -113,4 +114,7 @@
void compile(OActivity context, Runnable run);
public boolean isPartnerLinkAssigned(String plink);
+
+ List<OActivity> getActivityStack();
+
}
Modified:
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java?view=diff&rev=451541&r1=451540&r2=451541
==============================================================================
---
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java
(original)
+++
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java
Fri Sep 29 21:59:56 2006
@@ -1384,6 +1384,7 @@
throw new
CompilationException(__cmsgs.errUnknownActivity(actClass.getName()).setSource(source));
}
+
protected void registerActivityCompiler(Class defClass, ActivityGenerator
generator) {
if (__log.isDebugEnabled()) {
__log.debug("Adding compiler for nodes class \"" +
defClass.getName()
@@ -1418,6 +1419,12 @@
protected void registerExpressionLanguage(String expLangUri,
ExpressionCompiler expressionCompiler) {
_expLanguageCompilers.put(expLangUri, expressionCompiler);
+ }
+
+ public List<OActivity> getActivityStack() {
+ ArrayList<OActivity> rval = new
ArrayList<OActivity>(_structureStack._stack);
+ Collections.reverse(rval);
+ return rval;
}
private static class StructureStack {
Modified:
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/DefaultActivityGenerator.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/DefaultActivityGenerator.java?view=diff&rev=451541&r1=451540&r2=451541
==============================================================================
---
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/DefaultActivityGenerator.java
(original)
+++
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/DefaultActivityGenerator.java
Fri Sep 29 21:59:56 2006
@@ -18,16 +18,78 @@
*/
package org.apache.ode.bpel.compiler;
+import org.apache.ode.bom.api.Activity;
+import org.apache.ode.bpel.o.OActivity;
+import org.apache.ode.bpel.o.FailureHandling;
+import org.apache.ode.bpel.capi.CompilationException;
import org.apache.ode.bpel.capi.CompilerContext;
+import org.apache.ode.utils.msg.MessageBundle;
+import org.apache.ode.utils.DOMUtils;
+
+import javax.xml.namespace.QName;
+import org.w3c.dom.Element;
/**
* Base implementation of the [EMAIL PROTECTED] ActivityGenerator} interface.
*/
abstract class DefaultActivityGenerator implements ActivityGenerator {
protected CompilerContext _context;
+ private static final CommonCompilationMessages __cmsgs =
MessageBundle.getMessages(CommonCompilationMessages.class);
public void setContext(CompilerContext context) {
_context = context;
+ }
+
+ protected void handleDefaultExtensibility(OActivity output, Activity srcx) {
+ handleFailureExtensibility(output, srcx);
+ }
+
+ private void handleFailureExtensibility(OActivity output, Activity srcx) {
+ // Failure handling extensibility element.
+ Element failure = (Element)
srcx.getExtensibilityElements().get(FailureHandling.FAILURE_EXT_ELEMENT);
+ if (failure != null) {
+ output.failureHandling = new FailureHandling();
+ String textValue;
+ Element element = DOMUtils.findChildByName(failure, new
QName(FailureHandling.EXTENSION_NS_URI, "retryFor"));
+ if (element != null) {
+ textValue = DOMUtils.getTextContent(element);
+ if (textValue != null) {
+ try {
+ output.failureHandling.retryFor = Integer.valueOf(textValue);
+ if (output.failureHandling.retryFor < 0)
+ throw new
CompilationException(__cmsgs.errInvalidRetryForValue(textValue));
+ } catch (NumberFormatException except) {
+ throw new
CompilationException(__cmsgs.errInvalidRetryForValue(textValue));
+ }
+ }
+ }
+ element = DOMUtils.findChildByName(failure, new
QName(FailureHandling.EXTENSION_NS_URI, "retryDelay"));
+ if (element != null) {
+ textValue = DOMUtils.getTextContent(element);
+ if (textValue != null) {
+ try {
+ output.failureHandling.retryDelay = Integer.valueOf(textValue);
+ if (output.failureHandling.retryDelay < 0)
+ throw new
CompilationException(__cmsgs.errInvalidRetryDelayValue(textValue));
+ } catch (NumberFormatException except) {
+ throw new
CompilationException(__cmsgs.errInvalidRetryDelayValue(textValue));
+ }
+ }
+ }
+ element = DOMUtils.findChildByName(failure, new
QName(FailureHandling.EXTENSION_NS_URI, "faultOnFailure"));
+ if (element != null) {
+ textValue = DOMUtils.getTextContent(element);
+ if (textValue != null)
+ output.failureHandling.faultOnFailure = Boolean.valueOf(textValue);
+ }
+ } else {
+ for (OActivity parent : _context.getActivityStack()) {
+ if (parent.failureHandling != null) {
+ output.failureHandling = parent.failureHandling;
+ break;
+ }
+ }
+ }
}
}
Modified:
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/FlowGenerator.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/FlowGenerator.java?view=diff&rev=451541&r1=451540&r2=451541
==============================================================================
---
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/FlowGenerator.java
(original)
+++
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/FlowGenerator.java
Fri Sep 29 21:59:56 2006
@@ -40,6 +40,7 @@
private static final FlowGeneratorMessages __cmsgs =
MessageBundle.getMessages(FlowGeneratorMessages.class);
public void compile(OActivity output, Activity src) {
+ handleDefaultExtensibility(output, src);
FlowActivity flowAct = (FlowActivity)src;
OFlow oflow = (OFlow) output;
compileLinkDecls(oflow, flowAct);
Modified:
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/ForEachGenerator.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/ForEachGenerator.java?view=diff&rev=451541&r1=451540&r2=451541
==============================================================================
---
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/ForEachGenerator.java
(original)
+++
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/ForEachGenerator.java
Fri Sep 29 21:59:56 2006
@@ -46,6 +46,7 @@
}
public void compile(OActivity output, Activity src) {
+ handleDefaultExtensibility(output, src);
if (__log.isDebugEnabled()) __log.debug("Compiling ForEach activity.");
OForEach oforEach = (OForEach) output;
ForEachActivity forEach = (ForEachActivity) src;
Modified:
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/InvokeGenerator.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/InvokeGenerator.java?view=diff&rev=451541&r1=451540&r2=451541
==============================================================================
---
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/InvokeGenerator.java
(original)
+++
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/InvokeGenerator.java
Fri Sep 29 21:59:56 2006
@@ -29,7 +29,6 @@
import org.apache.ode.bpel.o.OInvoke;
import org.apache.ode.bpel.o.OProcess;
import org.apache.ode.bpel.o.OScope;
-import org.apache.ode.utils.DOMUtils;
import org.apache.ode.utils.msg.MessageBundle;
import org.w3c.dom.Element;
@@ -51,6 +50,7 @@
}
public void compile(OActivity output, Activity srcx) {
+ handleDefaultExtensibility(output, srcx);
InvokeActivity src = (InvokeActivity)srcx;
OInvoke oinvoke = (OInvoke) output;
@@ -83,45 +83,6 @@
if (!oinvoke.getOwner().version.equals(Constants.NS_BPEL4WS_2003_03)) {
if (!oinvoke.partnerLink.initializePartnerRole &&
!_context.isPartnerLinkAssigned(oinvoke.partnerLink.getName())) {
throw new
CompilationException(__cmsgs.errUninitializedPartnerLinkInInvoke(oinvoke.partnerLink.getName()));
- }
- }
-
- // Failure handling extensibility element.
- Element failure = (Element)
srcx.getExtensibilityElements().get(FailureHandling.FAILURE_EXT_ELEMENT);
- if (failure != null) {
- oinvoke.failureHandling = new FailureHandling();
- String textValue;
- Element element = DOMUtils.findChildByName(failure, new
QName(FailureHandling.EXTENSION_NS_URI, "retryFor"));
- if (element != null) {
- textValue = DOMUtils.getTextContent(element);
- if (textValue != null) {
- try {
- oinvoke.failureHandling.retryFor = Integer.valueOf(textValue);
- if (oinvoke.failureHandling.retryFor < 0)
- throw new
CompilationException(__cmsgs.errInvalidRetryForValue(textValue));
- } catch (NumberFormatException except) {
- throw new
CompilationException(__cmsgs.errInvalidRetryForValue(textValue));
- }
- }
- }
- element = DOMUtils.findChildByName(failure, new
QName(FailureHandling.EXTENSION_NS_URI, "retryDelay"));
- if (element != null) {
- textValue = DOMUtils.getTextContent(element);
- if (textValue != null) {
- try {
- oinvoke.failureHandling.retryDelay = Integer.valueOf(textValue);
- if (oinvoke.failureHandling.retryDelay < 0)
- throw new
CompilationException(__cmsgs.errInvalidRetryDelayValue(textValue));
- } catch (NumberFormatException except) {
- throw new
CompilationException(__cmsgs.errInvalidRetryDelayValue(textValue));
- }
- }
- }
- element = DOMUtils.findChildByName(failure, new
QName(FailureHandling.EXTENSION_NS_URI, "faultOnFailure"));
- if (element != null) {
- textValue = DOMUtils.getTextContent(element);
- if (textValue != null)
- oinvoke.failureHandling.faultOnFailure = Boolean.valueOf(textValue);
}
}
}
Modified:
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/SequenceGenerator.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/SequenceGenerator.java?view=diff&rev=451541&r1=451540&r2=451541
==============================================================================
---
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/SequenceGenerator.java
(original)
+++
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/SequenceGenerator.java
Fri Sep 29 21:59:56 2006
@@ -39,6 +39,7 @@
}
public void compile(OActivity output, Activity src) {
+ handleDefaultExtensibility(output, src);
OSequence oseq = (OSequence) output;
compileChildren(oseq, (SequenceActivity) src);
}
Modified:
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WhileGenerator.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WhileGenerator.java?view=diff&rev=451541&r1=451540&r2=451541
==============================================================================
---
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WhileGenerator.java
(original)
+++
incubator/ode/trunk/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WhileGenerator.java
Fri Sep 29 21:59:56 2006
@@ -33,6 +33,7 @@
}
public void compile(OActivity output, Activity srcx) {
+ handleDefaultExtensibility(output, srcx);
OWhile owhile = (OWhile) output;
WhileActivity src = (WhileActivity)srcx;
owhile.whileCondition = _context.compileExpr(src.getCondition());
Modified:
incubator/ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/ActivityRecoveryDAO.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/ActivityRecoveryDAO.java?view=diff&rev=451541&r1=451540&r2=451541
==============================================================================
---
incubator/ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/ActivityRecoveryDAO.java
(original)
+++
incubator/ode/trunk/bpel-dao/src/main/java/org/apache/ode/bpel/dao/ActivityRecoveryDAO.java
Fri Sep 29 21:59:56 2006
@@ -33,7 +33,7 @@
String getReason();
- Element getData();
+ Element getDetails();
Date getDateTime();
Modified:
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java?view=diff&rev=451541&r1=451540&r2=451541
==============================================================================
---
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java
(original)
+++
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java
Fri Sep 29 21:59:56 2006
@@ -1063,6 +1063,11 @@
return _getPartnerResponse(mexId).getType();
}
+ public String getPartnerFaultExplanation(String mexId) {
+ MessageExchangeDAO dao =
_dao.getConnection().getMessageExchange(mexId);
+ return dao != null ? dao.getFaultExplanation() : null;
+ }
+
private MessageDAO _getPartnerResponse(String mexId) {
MessageExchangeDAO dao =
_dao.getConnection().getMessageExchange(mexId);
if (dao == null) {
@@ -1138,12 +1143,12 @@
}
public void registerActivityForRecovery(ActivityRecoveryChannel channel,
long activityId, String reason,
- Date dateTime, Element data, String[] actions, int retries) {
+ Date dateTime, Element details, String[] actions, int retries) {
if (reason == null)
reason = "Unspecified";
if (dateTime == null)
dateTime = new Date();
- _dao.createActivityRecovery(channel.export(), (int) activityId,
reason, dateTime, data, actions, retries);
+ _dao.createActivityRecovery(channel.export(), (int) activityId,
reason, dateTime, details, actions, retries);
}
public void unregisterActivityForRecovery(ActivityRecoveryChannel channel)
{
Modified:
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/MessageExchangeImpl.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/MessageExchangeImpl.java?view=diff&rev=451541&r1=451540&r2=451541
==============================================================================
---
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/MessageExchangeImpl.java
(original)
+++
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/MessageExchangeImpl.java
Fri Sep 29 21:59:56 2006
@@ -196,10 +196,9 @@
getDAO().setResponse(((MessageImpl)outputMessage)._dao);
}
- void setFailure(FailureType type, String description, Element details)
throws BpelEngineException {
+ void setFailure(FailureType type, String reason, Element details) throws
BpelEngineException {
setStatus(Status.FAILURE);
-// getDAO().setFailureMessage(description);
-// getDAO().setFailureDetails(details);
+ getDAO().setFaultExplanation(reason);
}
void setStatus(Status status) {
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=451541&r1=451540&r2=451541
==============================================================================
---
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 Sep 29 21:59:56 2006
@@ -831,6 +831,7 @@
cal.setTime(recovery.getDateTime());
failure.setDtFailure(cal);
failure.setActions(recovery.getActions());
+ failure.setRetries(recovery.getRetries());
ai.getActivityInfo().setStatus(TActivityStatus.FAILURE);
}
}
Modified:
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/ProcessInstanceDaoImpl.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/ProcessInstanceDaoImpl.java?view=diff&rev=451541&r1=451540&r2=451541
==============================================================================
---
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/ProcessInstanceDaoImpl.java
(original)
+++
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/ProcessInstanceDaoImpl.java
Fri Sep 29 21:59:56 2006
@@ -316,17 +316,17 @@
private long _activityId;
private String _channel;
private String _reason;
- private Element _data;
+ private Element _details;
private Date _dateTime;
private String _actions;
private int _retries;
ActivityRecoveryDAOImpl(String channel, long activityId, String reason,
Date dateTime,
- Element data, String[] actions, int retries) {
+ Element details, String[] actions, int retries) {
_activityId = activityId;
_channel = channel;
_reason = reason;
- _data = data;
+ _details = details;
_dateTime = dateTime;
_actions = actions[0];
for (int i = 1; i < actions.length; ++i)
@@ -346,8 +346,8 @@
return _reason;
}
- public Element getData() {
- return _data;
+ public Element getDetails() {
+ return _details;
}
public Date getDateTime() {
Modified:
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/BpelRuntimeContext.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/BpelRuntimeContext.java?view=diff&rev=451541&r1=451540&r2=451541
==============================================================================
---
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/BpelRuntimeContext.java
(original)
+++
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/BpelRuntimeContext.java
Fri Sep 29 21:59:56 2006
@@ -237,6 +237,8 @@
QName getPartnerFault(String mexId);
+ String getPartnerFaultExplanation(String mexId);
+
QName getPartnerResponseType(String mexId);
Node getPartData(Element message, Part part);
@@ -244,7 +246,7 @@
Element getSourceEPR(String mexId);
void registerActivityForRecovery(ActivityRecoveryChannel channel, long
activityId, String reason,
- Date dateTime, Element data, String[]
actions, int retries);
+ Date dateTime, Element details, String[]
actions, int retries);
void unregisterActivityForRecovery(ActivityRecoveryChannel channel);
Modified:
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/INVOKE.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/INVOKE.java?view=diff&rev=451541&r1=451540&r2=451541
==============================================================================
---
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/INVOKE.java
(original)
+++
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/INVOKE.java
Fri Sep 29 21:59:56 2006
@@ -53,6 +53,9 @@
private Date _lastFailure;
// Reason for last failure.
private String _failureReason;
+ // Data associated with failure.
+ private Element _failureData;
+
public INVOKE(ActivityInfo self, ScopeFrame scopeFrame, LinkFrame linkFrame)
{
super(self, scopeFrame, linkFrame);
@@ -159,7 +162,7 @@
// because there is no fault, instead we'll re-incarnate the invoke
// and either retry or indicate failure condition.
// admin to resume the process.
- INVOKE.this.retryOrFailure(null);
+
INVOKE.this.retryOrFailure(getBpelRuntimeContext().getPartnerFaultExplanation(mexId),
null);
}
});
}
@@ -189,9 +192,10 @@
return (Element) outboundMsg;
}
- private void retryOrFailure(String reason) {
+ private void retryOrFailure(String reason, Element data) {
_lastFailure = new Date();
_failureReason = reason;
+ _failureData = data;
if (_self.getFailureHandling().faultOnFailure) {
// No attempt to retry or enter activity recovery state, simply fault.
@@ -229,7 +233,7 @@
private void requireRecovery() {
sendEvent(new ActivityFailureEvent(_failureReason));
final ActivityRecoveryChannel recoveryChannel =
newChannel(ActivityRecoveryChannel.class);
- getBpelRuntimeContext().registerActivityForRecovery(recoveryChannel,
_self.aId, _failureReason, _lastFailure, null,
+ getBpelRuntimeContext().registerActivityForRecovery(recoveryChannel,
_self.aId, _failureReason, _lastFailure, _failureData,
new String[] { "retry", "cancel", "fault" }, _invoked - 1);
object(false, new ActivityRecoveryChannelListener(recoveryChannel) {
public void retry() {
Modified:
incubator/ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/ActivityRecoveryTest.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/ActivityRecoveryTest.java?view=diff&rev=451541&r1=451540&r2=451541
==============================================================================
---
incubator/ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/ActivityRecoveryTest.java
(original)
+++
incubator/ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/ActivityRecoveryTest.java
Fri Sep 29 21:59:56 2006
@@ -54,49 +54,64 @@
public class ActivityRecoveryTest extends TestCase {
static final String NAMESPACE = "http://ode.apache.org/bpel/unit-test";;
+ static final String[] ACTIONS = new String[]{ "retry", "cancel", "fault" };
int _invoked;
int _failFor;
MockBpelServer _server;
BpelManagementFacade _management;
-
public void testSuccessfulInvoke() throws Exception {
- execute(null, 0);
+ execute("FailureToRecovery", 0);
assertCompleted(true, 1, null);
}
public void testInvokeAndRetry() throws Exception {
- execute(null, 2);
+ execute("FailureToRecovery", 2);
assertCompleted(true, 3, null);
}
public void testRetryRecoveryAction() throws Exception {
- execute(null, 4);
- assertRecovery();
+ execute("FailureToRecovery", 4);
+ assertRecovery(3, ACTIONS);
recover("retry");
- assertRecovery();
+ assertRecovery(4, ACTIONS);
recover("retry");
assertCompleted(true, 5, null);
}
public void testCancelRecoveryAction() throws Exception {
- execute(null, 4);
- assertRecovery();
+ execute("FailureToRecovery", 4);
+ assertRecovery(3, ACTIONS);
recover("retry");
- assertRecovery();
+ assertRecovery(4, ACTIONS);
recover("cancel");
assertCompleted(true, 4, null);
}
public void testFaultRecoveryAction() throws Exception {
- execute(null, 4);
- assertRecovery();
+ execute("FailureToRecovery", 4);
+ assertRecovery(3, ACTIONS);
recover("retry");
- assertRecovery();
+ assertRecovery(4, ACTIONS);
recover("fault");
assertCompleted(false, 4, FailureHandling.FAILURE_FAULT_NAME);
}
+ public void testImmediateFailure() throws Exception {
+ execute("FailureNoRetry", 1);
+ assertRecovery(1, ACTIONS);
+ }
+
+ public void testImmediateFault() throws Exception {
+ execute("FailureToFault", 2);
+ assertCompleted(false, 1, FailureHandling.FAILURE_FAULT_NAME);
+ }
+
+ public void testInheritence() throws Exception {
+ execute("FailureInheritence", 2);
+ assertCompleted(true, 3, null);
+ }
+
protected void setUp() throws Exception {
_server = new MockBpelServer() {
protected MessageExchangeContext createMessageExchangeContext() {
@@ -133,7 +148,7 @@
protected void execute(String process, int failFor) throws Exception {
_failFor = failFor;
_server.getBpelManagementFacade().delete(null);
- _server.invoke(new QName(NAMESPACE, "InstantiatingService"), "instantiate",
+ _server.invoke(new QName(NAMESPACE, process), "instantiate",
DOMUtils.newDocument().createElementNS(NAMESPACE,
"tns:RequestElement"));
_server.waitForBlocking();
}
@@ -162,14 +177,24 @@
/**
* Asserts that the process has one activity in the recovery state.
*/
- protected void assertRecovery() {
+ protected void assertRecovery(int invoked, String[] actions) {
// Test in aggregate to see how many activities we have in this state.
TInstanceInfo instance =
_management.listAllInstances().getInstanceInfoList().getInstanceInfoArray(0);
TInstanceInfo.Failures failures = instance.getFailures();
assertTrue(failures != null && failures.getCount() == 1);
// Look for individual activities inside the process instance.
TScopeInfo rootScope =
_management.getScopeInfoWithActivity(instance.getRootScope().getSiid(),
true).getScopeInfo();
- assertTrue(getRecoveriesInScope(instance, null, null).size() == 1);
+ ArrayList<TActivityInfo> recoveries = getRecoveriesInScope(instance, null,
null);
+ assertTrue(recoveries.size() == 1);
+ TActivityInfo.Failure failure = recoveries.get(0).getFailure();
+ assertTrue(failure.getRetries() == invoked - 1);
+ assertTrue(failure.getReason().equals("Bang"));
+ assertTrue(failure.getDtFailure().getTime().getTime() / 100000 ==
System.currentTimeMillis() / 100000);
+ java.util.HashSet<String> actionSet = new java.util.HashSet<String>();
+ for (String action : failure.getActions().split(" "))
+ actionSet.add(action);
+ for (String action : actions)
+ assertTrue(actionSet.remove(action));
}
/**
Modified:
incubator/ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/CoreBpelTest.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/CoreBpelTest.java?view=diff&rev=451541&r1=451540&r2=451541
==============================================================================
---
incubator/ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/CoreBpelTest.java
(original)
+++
incubator/ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/CoreBpelTest.java
Fri Sep 29 21:59:56 2006
@@ -400,4 +400,8 @@
public void recoverActivity(final String channel, final String action,
final FaultData fault) {
}
+ public String getPartnerFaultExplanation(String mexid) {
+ return null;
+ }
+
}
Modified:
incubator/ode/trunk/bpel-runtime/src/test/resources/recovery/deploy.xml
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/test/resources/recovery/deploy.xml?view=diff&rev=451541&r1=451540&r2=451541
==============================================================================
--- incubator/ode/trunk/bpel-runtime/src/test/resources/recovery/deploy.xml
(original)
+++ incubator/ode/trunk/bpel-runtime/src/test/resources/recovery/deploy.xml Fri
Sep 29 21:59:56 2006
@@ -3,10 +3,40 @@
xmlns:pns="http://ode.apache.org/bpel/unit-test";
xmlns:wns="http://ode.apache.org/bpel/unit-test";>
- <process name="pns:InvokeFailureAndRecovery">
+ <process name="pns:FailureToRecovery">
<active>true</active>
<provide partnerLink="instantiatingPartnerLink">
- <service name="wns:InstantiatingService" port="soap"/>
+ <service name="wns:FailureToRecovery" port="soap"/>
+ </provide>
+ <invoke partnerLink="failingPartnerLink">
+ <service name="wns:FailingService" port="soap"/>
+ </invoke>
+ </process>
+
+ <process name="pns:FailureToFault">
+ <active>true</active>
+ <provide partnerLink="instantiatingPartnerLink">
+ <service name="wns:FailureToFault" port="soap"/>
+ </provide>
+ <invoke partnerLink="failingPartnerLink">
+ <service name="wns:FailingService" port="soap"/>
+ </invoke>
+ </process>
+
+ <process name="pns:FailureNoRetry">
+ <active>true</active>
+ <provide partnerLink="instantiatingPartnerLink">
+ <service name="wns:FailureNoRetry" port="soap"/>
+ </provide>
+ <invoke partnerLink="failingPartnerLink">
+ <service name="wns:FailingService" port="soap"/>
+ </invoke>
+ </process>
+
+ <process name="pns:FailureInheritence">
+ <active>true</active>
+ <provide partnerLink="instantiatingPartnerLink">
+ <service name="wns:FailureInheritence" port="soap"/>
</provide>
<invoke partnerLink="failingPartnerLink">
<service name="wns:FailingService" port="soap"/>
Added:
incubator/ode/trunk/bpel-runtime/src/test/resources/recovery/failure-inheritence.bpel
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/test/resources/recovery/failure-inheritence.bpel?view=auto&rev=451541
==============================================================================
---
incubator/ode/trunk/bpel-runtime/src/test/resources/recovery/failure-inheritence.bpel
(added)
+++
incubator/ode/trunk/bpel-runtime/src/test/resources/recovery/failure-inheritence.bpel
Fri Sep 29 21:59:56 2006
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<process name="FailureInheritence"
+ targetNamespace="http://ode.apache.org/bpel/unit-test";
+ xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/";
+ xmlns:tns="http://ode.apache.org/bpel/unit-test";
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema";
+ xmlns:ext="http://ode.apache.org/activityRecovery";>
+
+ <import location="services.wsdl"
+ namespace="http://ode.apache.org/bpel/unit-test";
+ importType="http://schemas.xmlsoap.org/wsdl/"/>
+
+ <partnerLinks>
+ <partnerLink name="instantiatingPartnerLink"
+ partnerLinkType="tns:InstantiatingPartnerLinkType"
+ myRole="me"/>
+ <partnerLink name="failingPartnerLink"
+ partnerLinkType="tns:FailingPartnerLinkType"
+ partnerRole="partner" initializePartnerRole="yes"/>
+ </partnerLinks>
+
+ <variables>
+ <variable name="request" messageType="tns:Request"/>
+ <variable name="response" messageType="tns:Response"/>
+ </variables>
+
+ <sequence>
+ <ext:failureHandling>
+ <ext:retryFor>2</ext:retryFor>
+ <ext:retryDelay>0</ext:retryDelay>
+ </ext:failureHandling>
+ <receive name="start"
+ partnerLink="instantiatingPartnerLink"
+ portType="tns:InstantiatingPortType"
+ operation="instantiate"
+ variable="request"
+ createInstance="yes"/>
+ <invoke name="invoke"
+ partnerLink="failingPartnerLink"
+ portType="tns:FailingPortType"
+ operation="invoke"
+ inputVariable="request"
+ outputVariable="response"/>
+ </sequence>
+
+</process>
Added:
incubator/ode/trunk/bpel-runtime/src/test/resources/recovery/failure-no-retry.bpel
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/test/resources/recovery/failure-no-retry.bpel?view=auto&rev=451541
==============================================================================
---
incubator/ode/trunk/bpel-runtime/src/test/resources/recovery/failure-no-retry.bpel
(added)
+++
incubator/ode/trunk/bpel-runtime/src/test/resources/recovery/failure-no-retry.bpel
Fri Sep 29 21:59:56 2006
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<process name="FailureNoRetry"
+ targetNamespace="http://ode.apache.org/bpel/unit-test";
+ xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/";
+ xmlns:tns="http://ode.apache.org/bpel/unit-test";
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema";
+ xmlns:ext="http://ode.apache.org/activityRecovery";>
+
+ <import location="services.wsdl"
+ namespace="http://ode.apache.org/bpel/unit-test";
+ importType="http://schemas.xmlsoap.org/wsdl/"/>
+
+ <partnerLinks>
+ <partnerLink name="instantiatingPartnerLink"
+ partnerLinkType="tns:InstantiatingPartnerLinkType"
+ myRole="me"/>
+ <partnerLink name="failingPartnerLink"
+ partnerLinkType="tns:FailingPartnerLinkType"
+ partnerRole="partner" initializePartnerRole="yes"/>
+ </partnerLinks>
+
+ <variables>
+ <variable name="request" messageType="tns:Request"/>
+ <variable name="response" messageType="tns:Response"/>
+ </variables>
+
+ <sequence>
+ <receive name="start"
+ partnerLink="instantiatingPartnerLink"
+ portType="tns:InstantiatingPortType"
+ operation="instantiate"
+ variable="request"
+ createInstance="yes"/>
+ <invoke name="invoke"
+ partnerLink="failingPartnerLink"
+ portType="tns:FailingPortType"
+ operation="invoke"
+ inputVariable="request"
+ outputVariable="response"/>
+ </sequence>
+
+</process>
Added:
incubator/ode/trunk/bpel-runtime/src/test/resources/recovery/failure-to-fault.bpel
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/test/resources/recovery/failure-to-fault.bpel?view=auto&rev=451541
==============================================================================
---
incubator/ode/trunk/bpel-runtime/src/test/resources/recovery/failure-to-fault.bpel
(added)
+++
incubator/ode/trunk/bpel-runtime/src/test/resources/recovery/failure-to-fault.bpel
Fri Sep 29 21:59:56 2006
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<process name="FailureToFault"
+ targetNamespace="http://ode.apache.org/bpel/unit-test";
+ xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/";
+ xmlns:tns="http://ode.apache.org/bpel/unit-test";
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema";
+ xmlns:ext="http://ode.apache.org/activityRecovery";>
+
+ <import location="services.wsdl"
+ namespace="http://ode.apache.org/bpel/unit-test";
+ importType="http://schemas.xmlsoap.org/wsdl/"/>
+
+ <partnerLinks>
+ <partnerLink name="instantiatingPartnerLink"
+ partnerLinkType="tns:InstantiatingPartnerLinkType"
+ myRole="me"/>
+ <partnerLink name="failingPartnerLink"
+ partnerLinkType="tns:FailingPartnerLinkType"
+ partnerRole="partner" initializePartnerRole="yes"/>
+ </partnerLinks>
+
+ <variables>
+ <variable name="request" messageType="tns:Request"/>
+ <variable name="response" messageType="tns:Response"/>
+ </variables>
+
+ <sequence>
+ <receive name="start"
+ partnerLink="instantiatingPartnerLink"
+ portType="tns:InstantiatingPortType"
+ operation="instantiate"
+ variable="request"
+ createInstance="yes"/>
+ <invoke name="invoke"
+ partnerLink="failingPartnerLink"
+ portType="tns:FailingPortType"
+ operation="invoke"
+ inputVariable="request"
+ outputVariable="response">
+ <ext:failureHandling>
+ <ext:faultOnFailure>true</ext:faultOnFailure>
+ </ext:failureHandling>
+ </invoke>
+ </sequence>
+
+</process>
Added:
incubator/ode/trunk/bpel-runtime/src/test/resources/recovery/failure-to-recovery.bpel
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/test/resources/recovery/failure-to-recovery.bpel?view=auto&rev=451541
==============================================================================
---
incubator/ode/trunk/bpel-runtime/src/test/resources/recovery/failure-to-recovery.bpel
(added)
+++
incubator/ode/trunk/bpel-runtime/src/test/resources/recovery/failure-to-recovery.bpel
Fri Sep 29 21:59:56 2006
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<process name="FailureToRecovery"
+ targetNamespace="http://ode.apache.org/bpel/unit-test";
+ xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/";
+ xmlns:tns="http://ode.apache.org/bpel/unit-test";
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema";
+ xmlns:ext="http://ode.apache.org/activityRecovery";>
+
+ <import location="services.wsdl"
+ namespace="http://ode.apache.org/bpel/unit-test";
+ importType="http://schemas.xmlsoap.org/wsdl/"/>
+
+ <partnerLinks>
+ <partnerLink name="instantiatingPartnerLink"
+ partnerLinkType="tns:InstantiatingPartnerLinkType"
+ myRole="me"/>
+ <partnerLink name="failingPartnerLink"
+ partnerLinkType="tns:FailingPartnerLinkType"
+ partnerRole="partner" initializePartnerRole="yes"/>
+ </partnerLinks>
+
+ <variables>
+ <variable name="request" messageType="tns:Request"/>
+ <variable name="response" messageType="tns:Response"/>
+ </variables>
+
+ <sequence>
+ <receive name="start"
+ partnerLink="instantiatingPartnerLink"
+ portType="tns:InstantiatingPortType"
+ operation="instantiate"
+ variable="request"
+ createInstance="yes"/>
+ <invoke name="invoke"
+ partnerLink="failingPartnerLink"
+ portType="tns:FailingPortType"
+ operation="invoke"
+ inputVariable="request"
+ outputVariable="response">
+ <ext:failureHandling>
+ <ext:retryFor>2</ext:retryFor>
+ <ext:retryDelay>0</ext:retryDelay>
+ </ext:failureHandling>
+ </invoke>
+ </sequence>
+
+</process>
Modified:
incubator/ode/trunk/bpel-runtime/src/test/resources/recovery/services.wsdl
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/test/resources/recovery/services.wsdl?view=diff&rev=451541&r1=451540&r2=451541
==============================================================================
--- incubator/ode/trunk/bpel-runtime/src/test/resources/recovery/services.wsdl
(original)
+++ incubator/ode/trunk/bpel-runtime/src/test/resources/recovery/services.wsdl
Fri Sep 29 21:59:56 2006
@@ -55,24 +55,36 @@
</operation>
</binding>
- <service name="InstantiatingService">
+ <service name="FailingService">
+ <port name="soap" binding="tns:FailingBinding">
+ <soap:address location="http://localhost/FailingEndpoint"/>
+ </port>
+ </service>
+
+ <service name="FailureToRecovery">
<port name="soap" binding="tns:InstantiatingBinding">
- <soap:address
location="http://localhost/pxe/soap/InvokeFailureAndRecovery"/>
+ <soap:address location="http://localhost/pxe/soap/FailureToRecovery"/>
</port>
</service>
- <service name="FailingService">
- <port name="soap" binding="tns:FailingBinding">
- <soap:address location="http://localhost/FailingEndpoint"/>
+ <service name="FailureToFault">
+ <port name="soap" binding="tns:InstantiatingBinding">
+ <soap:address location="http://localhost/pxe/soap/FailureToFault"/>
</port>
</service>
- <plnk:partnerLinkType name="InstantiatingPartnerLinkType">
- <plnk:role name="me" portType="tns:InstantiatingPortType"/>
- </plnk:partnerLinkType>
+ <service name="FailureInheritence">
+ <port name="soap" binding="tns:InstantiatingBinding">
+ <soap:address location="http://localhost/pxe/soap/FailureInheritence"/>
+ </port>
+ </service>
<plnk:partnerLinkType name="FailingPartnerLinkType">
<plnk:role name="partner" portType="tns:FailingPortType"/>
+ </plnk:partnerLinkType>
+
+ <plnk:partnerLinkType name="InstantiatingPartnerLinkType">
+ <plnk:role name="me" portType="tns:InstantiatingPortType"/>
</plnk:partnerLinkType>
</definitions>
Modified:
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ActivityRecoveryDaoImpl.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ActivityRecoveryDaoImpl.java?view=diff&rev=451541&r1=451540&r2=451541
==============================================================================
---
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ActivityRecoveryDaoImpl.java
(original)
+++
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ActivityRecoveryDaoImpl.java
Fri Sep 29 21:59:56 2006
@@ -57,10 +57,10 @@
return _self.getDateTime();
}
- public Element getData() {
- if (_self.getData() == null) return null;
+ public Element getDetails() {
+ if (_self.getDetails() == null) return null;
try {
- return DOMUtils.stringToDOM(_self.getData().getText());
+ return DOMUtils.stringToDOM(_self.getDetails().getText());
} catch (SAXException e) {
throw new RuntimeException(e);
} catch (IOException e) {
Modified:
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessInstanceDaoImpl.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessInstanceDaoImpl.java?view=diff&rev=451541&r1=451540&r2=451541
==============================================================================
---
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessInstanceDaoImpl.java
(original)
+++
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessInstanceDaoImpl.java
Fri Sep 29 21:59:56 2006
@@ -366,7 +366,7 @@
recovery.setRetries(retries);
if (data != null) {
HLargeData ld = new HLargeData(DOMUtils.domToString(data));
- recovery.setData(ld);
+ recovery.setDetails(ld);
getSession().save(ld);
}
String list = actions[0];
Modified:
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HActivityRecovery.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HActivityRecovery.java?view=diff&rev=451541&r1=451540&r2=451541
==============================================================================
---
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HActivityRecovery.java
(original)
+++
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HActivityRecovery.java
Fri Sep 29 21:59:56 2006
@@ -35,7 +35,7 @@
private String _channel;
private String _reason;
private Date _dateTime;
- private HLargeData _data;
+ private HLargeData _details;
private String _actions;
private int _retries;
@@ -100,12 +100,12 @@
/**
* @hibernate.many-to-one column="LDATA_ID" cascade="delete"
*/
- public HLargeData getData() {
- return _data;
+ public HLargeData getDetails() {
+ return _details;
}
- public void setData(HLargeData data) {
- _data = data;
+ public void setDetails(HLargeData details) {
+ _details = details;
}
/**
