Micheal Hahn PR#6, Extension Activity improvements

Author: sathwik

.gitignore

@@ -22,3 +22,5 @@ derby.log
 Gemfile.lock
 spoon
 *.log
+.m2
+tmp/

README.extensions

@@ -0,0 +1,22 @@
+=============================================
+  Apache ODE - Extension Installation Guide
+=============================================
+
+BPEL 2.0 introduces extensibility mechanisms, which allow you to extend
+the set of activities and/or variable assignment mechanisms.
+With BPEL 2.0 it is possible to extend the language by user-defined
+activities and custom assignment logic.
+
+Since version 1.2 Apache ODE supports these extensibility mechanismns
+and provides a plug-in architecture that allows for registering
+third-party extensions.
+
+1.) Installation of extensions (WAR)
+  1) Copy the extension 
+      TBC
+  
+2.) Installation of extensions (JBI)
+      TBW
+
+3.) Writing ODE extensions
+TBW

Rakefile

@@ -316,7 +316,7 @@ define "ode" do
   desc "ODE BPEL Tests"
   define "bpel-test" do
     compile.with projects("bpel-api", "bpel-compiler", "bpel-dao", "bpel-runtime",
-      "bpel-store", "utils", "bpel-epr", "dao-hibernate", "agents", "scheduler-simple"),
+      "bpel-store", "utils", "bpel-epr", "dao-hibernate", "agents", "scheduler-simple", "bpel-nobj"),
       DERBY, JUnit.dependencies, JAVAX.persistence, OPENJPA, WSDL4J, COMMONS.httpclient, COMMONS.io,
       GERONIMO.transaction, GERONIMO.kernel, GERONIMO.connector, JAVAX.connector, JAVAX.ejb, JAVAX.transaction, TRANQL, "tranql:tranql-connector-derby-common:jar:1.1",
       SPRING_TEST, COMMONS.codec, SLF4J, LOG4J2

bpel-api/src/main/java/org/apache/ode/bpel/eapi/ExtensionContext.java

@@ -14,11 +14,10 @@
  */
 package org.apache.ode.bpel.eapi;
 
-import java.util.List;
 import java.util.Map;
 
 import org.apache.ode.bpel.common.FaultException;
-import org.apache.ode.bpel.obj.OLink;
+import org.apache.ode.bpel.obj.OActivity;
 import org.apache.ode.bpel.obj.OProcess;
 import org.apache.ode.bpel.obj.OScope;
 import org.w3c.dom.Node;
@@ -41,14 +40,6 @@ public interface ExtensionContext {
      */
     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.
      *
@@ -95,19 +86,28 @@ public interface ExtensionContext {
     String readMessageProperty(OScope.Variable variable, OProcess.OProperty property)
             throws FaultException;
 
-    /**
-     * Obtain the status of a control link.
-     *
-     * @param olink link to check
-     * @return <code>true</code> if the link is active, <code>false</code> otherwise.
-     */
-    boolean isLinkActive(OLink olink) throws FaultException;
-
     /**
      * Reads the current process instance id.
      * 
      * @return instance id
      */
     Long getProcessId();
 
+    /**
+     * Returns the name of the invoking activity.
+     * @return activity name
+     */
+    String getActivityName();
+    
+    /**
+     * Low-level-method
+     */
+    OActivity getOActivity();
+    
+    //ScopeFrame getScopeFrame();
+    void complete();
+    
+    void completeWithFault(Throwable t);
+    
+    void completeWithFault(FaultException fault);
 }

bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java

@@ -1665,6 +1665,9 @@ private void compileExtension(Extension ext) {
 
         _declaredExtensionNS.add(ext.getNamespaceURI());
         _oprocess.getDeclaredExtensions().add(oextension);
+        if (ext.isMustUnderstand()) {
+            _oprocess.getMustUnderstandExtensions().add(oextension);
+        }
 
         if (__log.isDebugEnabled())
             __log.debug("Compiled extension " + oextension);

bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/ExtensibilityQNames.java

@@ -46,7 +46,7 @@ public abstract class ExtensibilityQNames {
 
     public static final String NS_BPEL_EXTENSIBILITY = "http://ode.apache.org/bpelExtensibility";
 
-    public static final QName UNKNOWN_EO_FAULT_NAME = new QName(NS_BPEL_EXTENSIBILITY, "unknownExtensionOperation");
+    public static final QName UNKNOWN_EA_FAULT_NAME = new QName(NS_BPEL_EXTENSIBILITY, "unknownExtensionImplementation");
 
     public static final QName INVALID_EXTENSION_ELEMENT = new QName(NS_BPEL_EXTENSIBILITY, "invalidExtensionElement");
 }