ode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From va...@apache.org
Subject svn commit: r583317 - in /ode/trunk: bpel-api/src/main/java/org/apache/ode/bpel/eapi/ bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/
Date Tue, 09 Oct 2007 22:58:26 GMT
Author: vanto
Date: Tue Oct  9 15:58:23 2007
New Revision: 583317

URL: http://svn.apache.org/viewvc?rev=583317&view=rev
Log:
OPEN - issue ODE-160: ExtensionActivity and ExtensionAssignOperation: Runtime support 
http://issues.apache.org/jira/browse/ODE-160

minor changes on ExtensionContext

Modified:
    ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/eapi/ExtensionContext.java
    ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ASSIGN.java
    ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EXTENSIONACTIVITY.java
    ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ExtensionContextImpl.java

Modified: ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/eapi/ExtensionContext.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/eapi/ExtensionContext.java?rev=583317&r1=583316&r2=583317&view=diff
==============================================================================
--- ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/eapi/ExtensionContext.java (original)
+++ ode/trunk/bpel-api/src/main/java/org/apache/ode/bpel/eapi/ExtensionContext.java Tue Oct
 9 15:58:23 2007
@@ -22,6 +22,7 @@
 import java.util.Map;
 
 import org.apache.ode.bpel.common.FaultException;
+import org.apache.ode.bpel.o.OActivity;
 import org.apache.ode.bpel.o.OLink;
 import org.apache.ode.bpel.o.OProcess;
 import org.apache.ode.bpel.o.OScope;
@@ -46,14 +47,6 @@
 	Map<String, OScope.Variable> getVisibleVariables() throws FaultException;
 	
 	/**
-	 * Returns a list of links.
-	 * 
-	 * @return an unmodifiable list of visible variables.
-	 * @throws FaultException
-	 */
-	List<OLink> getLinks() throws FaultException;
-
-	/**
      * Read the value of a BPEL variable.
      *
      * @param variable
@@ -124,5 +117,16 @@
      * @return instance id
      */
     Long getProcessId();
+    
+    /**
+     * Returns the name of the invoking activity.
+     * @return activity name
+     */
+    String getActivityName();
+    
+    /**
+     * Low-level-method
+     */
+    OActivity getOActivity();
     
 }

Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ASSIGN.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ASSIGN.java?rev=583317&r1=583316&r2=583317&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ASSIGN.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ASSIGN.java Tue Oct 
9 15:58:23 2007
@@ -584,7 +584,7 @@
 
     private void invokeExtensionAssignOperation(OAssign.ExtensionAssignOperation eao) throws
FaultException {
     	try {
-	    	final ExtensionContext helper = new ExtensionContextImpl(this._scopeFrame, getBpelRuntimeContext());
+	    	final ExtensionContext helper = new ExtensionContextImpl(_self.o, _scopeFrame, getBpelRuntimeContext());
 	    	final ExtensionResponseChannel responseChannel = newChannel(ExtensionResponseChannel.class);
 
     		getBpelRuntimeContext().executeExtension(DOMUtils.getElementQName(eao.nestedElement.getElement()),
helper, eao.nestedElement, responseChannel);

Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EXTENSIONACTIVITY.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EXTENSIONACTIVITY.java?rev=583317&r1=583316&r2=583317&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EXTENSIONACTIVITY.java
(original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EXTENSIONACTIVITY.java
Tue Oct  9 15:58:23 2007
@@ -56,7 +56,7 @@
     public final void run() {
         try {
         	final ExtensionResponseChannel responseChannel = newChannel(ExtensionResponseChannel.class);
-        	final ExtensionContext helper = new ExtensionContextImpl(_scopeFrame, getBpelRuntimeContext());
+        	final ExtensionContext helper = new ExtensionContextImpl(_self.o, _scopeFrame, getBpelRuntimeContext());
         	
         	getBpelRuntimeContext().executeExtension(DOMUtils.getElementQName(_oext.nestedElement.getElement()),
helper, new SerializableElement(_oext.nestedElement.getElement()), responseChannel);
         	

Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ExtensionContextImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ExtensionContextImpl.java?rev=583317&r1=583316&r2=583317&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ExtensionContextImpl.java
(original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ExtensionContextImpl.java
Tue Oct  9 15:58:23 2007
@@ -39,17 +39,14 @@
 
 	private BpelRuntimeContext _context;
 	private ScopeFrame _scopeFrame;
+	private OActivity _activity;
 
-	public ExtensionContextImpl(ScopeFrame scopeFrame, BpelRuntimeContext context) {
+	public ExtensionContextImpl(OActivity activity, ScopeFrame scopeFrame, BpelRuntimeContext
context) {
 		_context = context;
 		_scopeFrame = scopeFrame;
+		_activity = activity;
 	}
 	
-	public List<OLink> getLinks() throws FaultException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
 	public Long getProcessId() {
 		return _context.getPid();
 	}
@@ -109,4 +106,12 @@
 	private Variable getVisibleVariable(String varName) {
     	return _scopeFrame.oscope.getVisibleVariable(varName);
     }
+
+	public String getActivityName() {
+		return _activity.name;
+	}
+
+	public OActivity getOActivity() {
+		return _activity;
+	}
 }



Mime
View raw message