Author: seanahn
Date: Thu Oct 15 00:15:37 2009
New Revision: 825348
URL: http://svn.apache.org/viewvc?rev=825348&view=rev
Log:
ode-679, Rollback changes on ODE-578
Removed:
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/FailFastTest.java
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestFailFast/faultOnFailure/
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestFailFast/invoke/
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestFailFast/selectionFailure/
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestFailureInInvoke/
Modified:
ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/ODEService.java
ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/OdeFault.java
ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/SoapExternalService.java
ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/util/SoapMessageConverter.java
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/MessageExchangeImpl.java
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/INVOKE.java
ode/branches/APACHE_ODE_1.X/utils/src/main/java/org/apache/ode/utils/Properties.java
Modified:
ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/ODEService.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/ODEService.java?rev=825348&r1=825347&r2=825348&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/ODEService.java
(original)
+++
ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/ODEService.java
Thu Oct 15 00:15:37 2009
@@ -35,7 +35,6 @@
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFault;
-import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
import org.apache.axis2.client.Options;
import org.apache.axis2.context.MessageContext;
@@ -61,9 +60,6 @@
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import javax.xml.transform.dom.DOMSource;
-import java.io.IOException;
-
/**
* A running service, encapsulates the Axis service, its receivers and our
* receivers as well.
@@ -273,19 +269,7 @@
writeHeader(msgContext, mex);
break;
case FAILURE:
- if (__log.isDebugEnabled())
- __log.debug("Failure response message: " + mex.getFault());
- OdeFault odeFault;
- String beVerbose =
_pconf.getEndpointProperties(_serviceRef).get(Properties.PROP_MEX_FAILURE_VERBOSE);
- // default is true
- if (beVerbose == null || Boolean.valueOf(beVerbose)) {
- odeFault =
_converter.createOdeFault(mex.getFaultExplanation(), mex.getFaultResponse());
- } else {
- odeFault = new OdeFault("Message exchange failure.");
- odeFault.setDetail(null);
- odeFault.setStackTrace(new StackTraceElement[]{});
- }
- throw odeFault;
+ throw new OdeFault("Message exchange failure");
default:
throw new OdeFault("Received ODE message exchange in
unexpected state: " + mex.getStatus());
}
Modified:
ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/OdeFault.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/OdeFault.java?rev=825348&r1=825347&r2=825348&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/OdeFault.java
(original)
+++
ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/OdeFault.java
Thu Oct 15 00:15:37 2009
@@ -22,7 +22,6 @@
import javax.xml.namespace.QName;
import org.apache.axis2.AxisFault;
-import org.apache.axiom.om.OMElement;
/**
* User-friendly version of AxisFault
@@ -47,7 +46,4 @@
super(new QName("java:"+cause.getClass().getPackage(),
cause.getClass().getName(), "java"), message, cause);
}
- public OdeFault(String message, OMElement faultDetail) {
- super(FAULT, message, null, null, faultDetail);
- }
}
Modified:
ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/SoapExternalService.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/SoapExternalService.java?rev=825348&r1=825347&r2=825348&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/SoapExternalService.java
(original)
+++
ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/SoapExternalService.java
Thu Oct 15 00:15:37 2009
@@ -20,8 +20,6 @@
package org.apache.ode.axis2;
import org.apache.axiom.soap.SOAPEnvelope;
-import org.apache.axiom.soap.SOAPFaultReason;
-import org.apache.axiom.soap.SOAPFault;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.OperationClient;
@@ -484,11 +482,8 @@
} else {
if (__log.isWarnEnabled())
__log.warn("Fault response:
faultType=(unkown)\n" + reply.getEnvelope().toString());
- final SOAPFaultReason r =
reply.getEnvelope().getBody().getFault().getReason();
- SOAPFault f =
reply.getEnvelope().getBody().getFault();
- String reason = r != null ? r.getText() :
"Unspecified";
- Element details = f != null ? OMUtils.toDOM(f)
: null;
- odeMex.replyWithFailure(FailureType.OTHER,
reason, details);
+ odeMex.replyWithFailure(FailureType.OTHER,
reply.getEnvelope().getBody()
+ .getFault().getText(),
OMUtils.toDOM(reply.getEnvelope().getBody()));
}
} else {
Message response =
odeMex.createMessage(odeMex.getOperation().getOutput().getMessage().getQName());
Modified:
ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/util/SoapMessageConverter.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/util/SoapMessageConverter.java?rev=825348&r1=825347&r2=825348&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/util/SoapMessageConverter.java
(original)
+++
ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/util/SoapMessageConverter.java
Thu Oct 15 00:15:37 2009
@@ -44,9 +44,7 @@
import javax.wsdl.extensions.soap.SOAPHeader;
import javax.wsdl.extensions.soap.SOAPOperation;
import javax.xml.namespace.QName;
-import javax.xml.transform.dom.DOMSource;
import java.util.*;
-import java.io.IOException;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
@@ -546,28 +544,4 @@
return WsdlUtils.inferFault(operation, elName);
}
- /**
- *
- * @param faultExplanation
- * @param faultResponse
- * @return an OdeFault
- */
- public OdeFault createOdeFault(String faultExplanation,
org.apache.ode.bpel.iapi.Message faultResponse) {
- String message = new StringBuilder("Message exchange failure due to:
").append(faultExplanation).toString();
- OMElement detail = null;
- if (faultResponse!=null) {
- Element messageElement = faultResponse.getMessage();
- if (messageElement != null) {
- Element detailElement =
DOMUtils.getFirstChildElement(messageElement);
- if (detailElement != null) {
- try {
- detail = OMUtils.toOM(new DOMSource(messageElement));
- } catch (IOException ignore) {
- }
- }
- }
- }
- return new OdeFault(message, detail);
- }
-
}
Modified:
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java?rev=825348&r1=825347&r2=825348&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java
(original)
+++
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java
Thu Oct 15 00:15:37 2009
@@ -24,7 +24,6 @@
import java.util.*;
import javax.wsdl.Operation;
-import javax.wsdl.OperationType;
import javax.xml.namespace.QName;
import org.apache.commons.logging.Log;
@@ -228,7 +227,7 @@
public void afterCompletion(boolean success) {
}
public void beforeCompletion() {
- _dao.delete(_bpelProcess.getCleanupCategories(false));
+ _dao.delete(_bpelProcess.getCleanupCategories(false), false);
}
});
}
@@ -257,7 +256,7 @@
public void afterCompletion(boolean success) {
}
public void beforeCompletion() {
- _dao.delete(_bpelProcess.getCleanupCategories(true));
+ _dao.delete(_bpelProcess.getCleanupCategories(true), false);
}
});
}
@@ -1315,18 +1314,6 @@
__log.info("ActivityRecovery: Registering activity " + activityId + ",
failure reason: " + reason +
" on channel " + channel.export());
_dao.createActivityRecovery(channel.export(), (int) activityId,
reason, dateTime, details, actions, retries);
- // Release and fail any outstanding request
- String[] mexRefs = _outstandingRequests.releaseAll();
- if(mexRefs!=null){
- for(String mexRef:mexRefs){
- MessageExchangeDAO mexDao =
_dao.getConnection().getMessageExchange(mexRef);
- if (mexDao !=null) {
- MyRoleMessageExchangeImpl mex = new
MyRoleMessageExchangeImpl(_bpelProcess, _bpelProcess._engine, mexDao);
- _bpelProcess.initMyRoleMex(mex);
- mex.setFailure(FailureType.OTHER, reason, details);
- }
- }
- }
}
public void unregisterActivityForRecovery(ActivityRecoveryChannel channel)
{
Modified:
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/MessageExchangeImpl.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/MessageExchangeImpl.java?rev=825348&r1=825347&r2=825348&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/MessageExchangeImpl.java
(original)
+++
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/MessageExchangeImpl.java
Thu Oct 15 00:15:37 2009
@@ -28,7 +28,6 @@
import org.apache.ode.bpel.iapi.Message;
import org.apache.ode.bpel.iapi.MessageExchange;
import org.apache.ode.utils.msg.MessageBundle;
-import org.apache.ode.utils.Namespaces;
import org.w3c.dom.Element;
import javax.wsdl.Operation;
@@ -159,6 +158,7 @@
setStatus(Status.FAULT);
getDAO().setFault(faultType);
getDAO().setResponse(((MessageImpl)outputFaultMessage)._dao);
+
responseReceived();
}
@@ -179,15 +179,9 @@
}
void setFailure(FailureType type, String reason, Element details) throws
BpelEngineException {
- // TODO not using FailureType
+ // TODO not using FailureType, nor details
setStatus(Status.FAILURE);
getDAO().setFaultExplanation(reason);
- if (details != null) {
- Message message = createMessage(new
QName(Namespaces.ODE_EXTENSION_NS, "failureMessage"));
- message.setMessage(details);
- getDAO().setResponse(((MessageImpl) message)._dao);
- }
- responseReceived();
}
void setStatus(Status status) {
Modified:
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/INVOKE.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/INVOKE.java?rev=825348&r1=825347&r2=825348&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/INVOKE.java
(original)
+++
ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/INVOKE.java
Thu Oct 15 00:15:37 2009
@@ -184,10 +184,10 @@
// and either retry or indicate failure condition.
// admin to resume the process.
String reason =
getBpelRuntimeContext().getPartnerFaultExplanation(mexId);
- Element msg =
getBpelRuntimeContext().getPartnerResponse(mexId);
__log.error("Failure during invoke: " + reason);
try {
- _self.parent.failure(reason, msg);
+ Element el =
DOMUtils.stringToDOM("<invokeFailure><![CDATA["+reason+"]]></invokeFailure>");
+ _self.parent.failure(reason, el);
} catch (Exception e) {
_self.parent.failure(reason, null);
}
Modified:
ode/branches/APACHE_ODE_1.X/utils/src/main/java/org/apache/ode/utils/Properties.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/utils/src/main/java/org/apache/ode/utils/Properties.java?rev=825348&r1=825347&r2=825348&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/utils/src/main/java/org/apache/ode/utils/Properties.java
(original)
+++
ode/branches/APACHE_ODE_1.X/utils/src/main/java/org/apache/ode/utils/Properties.java
Thu Oct 15 00:15:37 2009
@@ -54,7 +54,6 @@
// its default value
public static final int DEFAULT_MEX_TIMEOUT = 2 * 60 * 1000;
- public static final String PROP_MEX_FAILURE_VERBOSE =
"mex.failure.verbose";
public static final String PROP_HTTP_CONNECTION_TIMEOUT =
HttpConnectionParams.CONNECTION_TIMEOUT;
public static final String PROP_HTTP_SOCKET_TIMEOUT =
HttpMethodParams.SO_TIMEOUT;
