You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by se...@apache.org on 2009/04/06 23:53:27 UTC
svn commit: r762523 [9/9] - in /ode/trunk: ./
axis2-war/src/main/webapp/WEB-INF/classes/
axis2-war/src/main/webapp/WEB-INF/conf.hib-derby/
axis2-war/src/main/webapp/WEB-INF/conf.jpa-derby/
axis2-war/src/main/webapp/WEB-INF/conf.template/ axis2-war/src/...
Modified: ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/OdeInternalInstance.java
URL: http://svn.apache.org/viewvc/ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/OdeInternalInstance.java?rev=762523&r1=762522&r2=762523&view=diff
==============================================================================
--- ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/OdeInternalInstance.java (original)
+++ ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/OdeInternalInstance.java Mon Apr 6 21:53:20 2009
@@ -52,7 +52,7 @@
void writeEndpointReference(PartnerLinkInstance plval, Element element);
- void releasePartnerMex(String mexId);
+ void releasePartnerMex(String mexId, boolean instanceSucceeded);
QName getPartnerFault(String mexId);
Modified: ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/RuntimeInstanceImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/RuntimeInstanceImpl.java?rev=762523&r1=762522&r2=762523&view=diff
==============================================================================
--- ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/RuntimeInstanceImpl.java (original)
+++ ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v1/RuntimeInstanceImpl.java Mon Apr 6 21:53:20 2009
@@ -406,8 +406,8 @@
/**
* Proxy to {@link org.apache.ode.bpel.rapi.IOContext#releasePartnerMex(String) }.
*/
- public void releasePartnerMex(String mexId) {
- _brc.releasePartnerMex(mexId);
+ public void releasePartnerMex(String mexId, boolean instanceSucceeded) {
+ _brc.releasePartnerMex(mexId, instanceSucceeded);
}
/**
Modified: ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/INVOKE.java
URL: http://svn.apache.org/viewvc/ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/INVOKE.java?rev=762523&r1=762522&r2=762523&view=diff
==============================================================================
--- ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/INVOKE.java (original)
+++ ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/INVOKE.java Mon Apr 6 21:53:20 2009
@@ -159,7 +159,7 @@
// TODO update output variable with data from non-initiate correlation sets
_self.parent.completed(fault, CompensationHandler.emptySet());
- getBpelRuntime().releasePartnerMex(mexId);
+ getBpelRuntime().releasePartnerMex(mexId, fault == null);
}
public void onFault() {
@@ -169,7 +169,7 @@
FaultData fault = createFault(faultName, msg,
_oinvoke.getOwner().messageTypes.get(msgType), _self.o);
_self.parent.completed(fault, CompensationHandler.emptySet());
- getBpelRuntime().releasePartnerMex(mexId);
+ getBpelRuntime().releasePartnerMex(mexId, false);
}
public void onFailure() {
@@ -178,7 +178,7 @@
// and either retry or indicate failure condition.
// admin to resume the process.
_self.parent.failure(getBpelRuntime().getPartnerFaultExplanation(mexId), null);
- getBpelRuntime().releasePartnerMex(mexId);
+ getBpelRuntime().releasePartnerMex(mexId, false);
}
}.or(new TerminationChannelListener(_self.self) {
Modified: ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/OdeInternalInstance.java
URL: http://svn.apache.org/viewvc/ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/OdeInternalInstance.java?rev=762523&r1=762522&r2=762523&view=diff
==============================================================================
--- ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/OdeInternalInstance.java (original)
+++ ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/OdeInternalInstance.java Mon Apr 6 21:53:20 2009
@@ -52,7 +52,7 @@
void writeEndpointReference(PartnerLinkInstance plval, Element element);
- void releasePartnerMex(String mexId);
+ void releasePartnerMex(String mexId, boolean instanceSucceeded);
QName getPartnerFault(String mexId);
Modified: ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/RuntimeInstanceImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/RuntimeInstanceImpl.java?rev=762523&r1=762522&r2=762523&view=diff
==============================================================================
--- ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/RuntimeInstanceImpl.java (original)
+++ ode/trunk/runtimes/src/main/java/org/apache/ode/bpel/rtrep/v2/RuntimeInstanceImpl.java Mon Apr 6 21:53:20 2009
@@ -405,8 +405,8 @@
/**
* Proxy to {@link IOContext#releasePartnerMex(String) }.
*/
- public void releasePartnerMex(String mexId) {
- _brc.releasePartnerMex(mexId);
+ public void releasePartnerMex(String mexId, boolean instanceSucceeded) {
+ _brc.releasePartnerMex(mexId, instanceSucceeded);
}
/**
Modified: ode/trunk/runtimes/src/test/java/org/apache/ode/bpel/rtrep/v1/CoreBpelTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/runtimes/src/test/java/org/apache/ode/bpel/rtrep/v1/CoreBpelTest.java?rev=762523&r1=762522&r2=762523&view=diff
==============================================================================
--- ode/trunk/runtimes/src/test/java/org/apache/ode/bpel/rtrep/v1/CoreBpelTest.java (original)
+++ ode/trunk/runtimes/src/test/java/org/apache/ode/bpel/rtrep/v1/CoreBpelTest.java Mon Apr 6 21:53:20 2009
@@ -407,7 +407,7 @@
return null;
}
- public void releasePartnerMex(String mexId) {
+ public void releasePartnerMex(String mexId, boolean instanceSucceeded) {
// TODO Auto-generated method stub
}
Modified: ode/trunk/runtimes/src/test/java/org/apache/ode/bpel/rtrep/v2/CoreBpelTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/runtimes/src/test/java/org/apache/ode/bpel/rtrep/v2/CoreBpelTest.java?rev=762523&r1=762522&r2=762523&view=diff
==============================================================================
--- ode/trunk/runtimes/src/test/java/org/apache/ode/bpel/rtrep/v2/CoreBpelTest.java (original)
+++ ode/trunk/runtimes/src/test/java/org/apache/ode/bpel/rtrep/v2/CoreBpelTest.java Mon Apr 6 21:53:20 2009
@@ -413,7 +413,7 @@
return null;
}
- public void releasePartnerMex(String mexId) {
+ public void releasePartnerMex(String mexId, boolean instanceSucceeded) {
// TODO Auto-generated method stub
}
Modified: ode/trunk/utils/src/main/java/org/apache/ode/utils/LoggingInterceptor.java
URL: http://svn.apache.org/viewvc/ode/trunk/utils/src/main/java/org/apache/ode/utils/LoggingInterceptor.java?rev=762523&r1=762522&r2=762523&view=diff
==============================================================================
--- ode/trunk/utils/src/main/java/org/apache/ode/utils/LoggingInterceptor.java (original)
+++ ode/trunk/utils/src/main/java/org/apache/ode/utils/LoggingInterceptor.java Mon Apr 6 21:53:20 2009
@@ -79,11 +79,6 @@
// JDBC Connection
if ("prepareStatement".equals(method.getName())) {
print("prepareStmt: " + args[0]);
- if (((String)args[0]).indexOf("ODE_SCOPE") > 0) {
- for (StackTraceElement traceElement : Thread.currentThread().getStackTrace()) {
- print(traceElement.toString());
- }
- }
} else if ("prepareCall".equals(method.getName())) {
print("prepareCall: " + args[0]);
} else if ("close".equals(method.getName())) {
Modified: ode/trunk/utils/src/main/java/org/apache/ode/utils/wsdl/WsdlUtils.java
URL: http://svn.apache.org/viewvc/ode/trunk/utils/src/main/java/org/apache/ode/utils/wsdl/WsdlUtils.java?rev=762523&r1=762522&r2=762523&view=diff
==============================================================================
--- ode/trunk/utils/src/main/java/org/apache/ode/utils/wsdl/WsdlUtils.java (original)
+++ ode/trunk/utils/src/main/java/org/apache/ode/utils/wsdl/WsdlUtils.java Mon Apr 6 21:53:20 2009
@@ -19,6 +19,8 @@
package org.apache.ode.utils.wsdl;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.ode.utils.Namespaces;
import org.apache.ode.utils.stl.CollectionsX;
import org.w3c.dom.Element;
@@ -54,7 +56,9 @@
* @author <a href="mailto:midon@intalio.com">Alexis Midon</a>
*/
public class WsdlUtils {
-
+ @SuppressWarnings("unused")
+ private final static Log __log = LogFactory.getLog(WsdlUtils.class);
+
private static final Messages msgs = Messages.getMessages(Messages.class);
/**
@@ -141,6 +145,7 @@
* @return an instance of {@link SOAPBinding} or {@link HTTPBinding} or null
* @throws IllegalArgumentException if multiple bindings found.
*/
+ @SuppressWarnings("unchecked")
public static ExtensibilityElement getBindingExtension(Binding binding) {
Collection bindings = new ArrayList();
CollectionsX.filter(bindings, binding.getExtensibilityElements(), HTTPBinding.class);
@@ -176,6 +181,7 @@
* @return an instance of {@link javax.wsdl.extensions.http.HTTPOperation} or {@link javax.wsdl.extensions.soap.SOAPOperation}
* @throws IllegalArgumentException if not exactly 1 element is found.
*/
+ @SuppressWarnings("unchecked")
public static ExtensibilityElement getOperationExtension(BindingOperation bindingOperation) {
Collection operations = new ArrayList();
CollectionsX.filter(operations, bindingOperation.getExtensibilityElements(), HTTPOperation.class);
@@ -224,6 +230,7 @@
* contained in the extensibility element list. Or null if none.
* @throws IllegalArgumentException if more than 1 MIMEContent is found.
*/
+ @SuppressWarnings("unchecked")
public static MIMEContent getMimeContent(List extensibilityElements) {
Collection<MIMEContent> coll = CollectionsX.filter(extensibilityElements, MIMEContent.class);
if (coll.size() == 0) {
@@ -245,6 +252,7 @@
* @return an instance of {@link javax.wsdl.extensions.http.HTTPAddress} or {@link javax.wsdl.extensions.soap.SOAPAddress}
* @throws IllegalArgumentException if not exactly 1 element is found.
*/
+ @SuppressWarnings("unchecked")
public static ExtensibilityElement getAddressExtension(Port port) {
Collection operations = new ArrayList();
CollectionsX.filter(operations, port.getExtensibilityElements(), HTTPAddress.class);
@@ -305,6 +313,7 @@
return false;
}
+ @SuppressWarnings("unchecked")
public static Collection<UnknownExtensibilityElement> getHttpHeaders(List extensibilityElements) {
final Collection<UnknownExtensibilityElement> unknownExtElements = CollectionsX.filter(extensibilityElements, UnknownExtensibilityElement.class);
for (UnknownExtensibilityElement extensibilityElement : unknownExtElements) {
@@ -335,6 +344,7 @@
if (p.getElementName() == null) continue;
if (p.getElementName().equals(elName)) return f;
}
+
return null;
}