ode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mr...@apache.org
Subject svn commit: r788528 - in /ode/branches/APACHE_ODE_1.X: bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/ bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/ bpel-test/src/test/resources/bpel/2.0/TestAssignActivity1/
Date Thu, 25 Jun 2009 22:10:10 GMT
Author: mriou
Date: Thu Jun 25 22:10:09 2009
New Revision: 788528

URL: http://svn.apache.org/viewvc?rev=788528&view=rev
Log:
ODE-631 Add a custom variable to hold the process definition QName

Modified:
    ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/JaxpVariableResolver.java
    ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/JaxpVariableResolver.java
    ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity1/TestAssign.bpel

Modified: ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/JaxpVariableResolver.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/JaxpVariableResolver.java?rev=788528&r1=788527&r2=788528&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/JaxpVariableResolver.java
(original)
+++ ode/branches/APACHE_ODE_1.X/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/JaxpVariableResolver.java
Thu Jun 25 22:10:09 2009
@@ -60,7 +60,8 @@
         // Custom variables
         if ("ode".equals(variableName.getPrefix())
                 || Namespaces.ODE_EXTENSION_NS.equals(variableName.getNamespaceURI())) {
-            if ("pid".equals(variableName.getLocalPart())) return "";
+            if ("pid".equals(variableName.getLocalPart()) || "processQName".equals(variableName.getLocalPart()))
+                return "";
         }
 
         try {

Modified: ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/JaxpVariableResolver.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/JaxpVariableResolver.java?rev=788528&r1=788527&r2=788528&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/JaxpVariableResolver.java
(original)
+++ ode/branches/APACHE_ODE_1.X/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/JaxpVariableResolver.java
Thu Jun 25 22:10:09 2009
@@ -69,6 +69,8 @@
         if (variableName.getNamespaceURI().equals(Namespaces.ODE_EXTENSION_NS)) {
             if ("pid".equals(variableName.getLocalPart())) {
                 return _ectx.getProcessId();
+            } else if ("processQName".equals(variableName.getLocalPart())) {
+                return _ectx.getProcessQName();
             }
         }
 

Modified: ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity1/TestAssign.bpel
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity1/TestAssign.bpel?rev=788528&r1=788527&r2=788528&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity1/TestAssign.bpel
(original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity1/TestAssign.bpel
Thu Jun 25 22:10:09 2009
@@ -63,6 +63,10 @@
                 <to>$strVar</to>
             </copy>
             <copy>
+                <from>$ode:processQName</from>
+                <to variable="strVar"/>
+            </copy>
+            <copy>
                 <from>$ode:pid</from>
                 <to variable="strVar"/>
             </copy>



Mime
View raw message