Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/VariableInstance.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/VariableInstance.java?rev=681565&r1=681564&r2=681565&view=diff ============================================================================== --- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/VariableInstance.java (original) +++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/VariableInstance.java Thu Jul 31 17:29:41 2008 @@ -16,29 +16,36 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.ode.bpel.runtime; +package org.apache.ode.bpel.rtrep.v2; -import org.apache.ode.bpel.o.OScope; +import org.apache.ode.bpel.rtrep.rapi.Variable; import java.io.Serializable; /** * Variable instance identifier. */ -public class VariableInstance implements Serializable { - private static final long serialVersionUID = 1L; +public class VariableInstance implements Serializable, Variable { + private static final long serialVersionUID = 1L; - public final OScope.Variable declaration; - public final Long scopeInstance; - - VariableInstance(Long scopeInstance, OScope.Variable variable) { - this.scopeInstance = scopeInstance; - this.declaration = variable; - } - - public boolean equals(Object obj) { - VariableInstance other = (VariableInstance) obj; - return other.declaration.equals(declaration) && other.scopeInstance.equals(scopeInstance); - } + public final OScope.Variable declaration; + public final Long scopeInstance; + VariableInstance(Long scopeInstance, OScope.Variable variable) { + this.scopeInstance = scopeInstance; + this.declaration = variable; + } + + public boolean equals(Object obj) { + VariableInstance other = (VariableInstance) obj; + return other.declaration.equals(declaration) && other.scopeInstance.equals(scopeInstance); + } + + public String getName() { + return declaration.name; + } + + public long getScopeId() { + return scopeInstance; + } }
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/WAIT.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/WAIT.java?rev=681565&r1=681564&r2=681565&view=diff ============================================================================== --- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/WAIT.java (original) +++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/WAIT.java Thu Jul 31 17:29:41 2008 @@ -16,16 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.ode.bpel.runtime; +package org.apache.ode.bpel.rtrep.v2; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.ode.bpel.common.FaultException; -import org.apache.ode.bpel.explang.EvaluationContext; -import org.apache.ode.bpel.o.OWait; -import org.apache.ode.bpel.runtime.channels.TerminationChannelListener; -import org.apache.ode.bpel.runtime.channels.TimerResponseChannel; -import org.apache.ode.bpel.runtime.channels.TimerResponseChannelListener; +import org.apache.ode.bpel.rtrep.v2.channels.TerminationChannelListener; +import org.apache.ode.bpel.rtrep.v2.channels.TimerResponseChannel; +import org.apache.ode.bpel.rtrep.v2.channels.TimerResponseChannelListener; import org.apache.ode.utils.xsd.Duration; import java.util.Calendar; @@ -58,7 +56,7 @@ if(dueDate.getTime() > System.currentTimeMillis()){ final TimerResponseChannel timerChannel = newChannel(TimerResponseChannel.class); - getBpelRuntimeContext().registerTimer(timerChannel, dueDate); + getBpelRuntime().registerTimer(timerChannel, dueDate); object(false, new TimerResponseChannelListener(timerChannel){ private static final long serialVersionUID = 3120518305645437327L; @@ -81,7 +79,6 @@ public void onTimeout() { //ignore } - public void onCancel() { //ingore } @@ -103,14 +100,14 @@ EvaluationContext evalCtx = getEvaluationContext(); - Date dueDate = null; + Date dueDate; if (wait.hasFor()) { Calendar cal = Calendar.getInstance(); - Duration duration = getBpelRuntimeContext().getExpLangRuntime().evaluateAsDuration(wait.forExpression, evalCtx); + Duration duration = getBpelRuntime().getExpLangRuntime().evaluateAsDuration(wait.forExpression, evalCtx); duration.addTo(cal); dueDate = cal.getTime(); } else if (wait.hasUntil()) { - Calendar cal = getBpelRuntimeContext().getExpLangRuntime().evaluateAsDate(wait.untilExpression, evalCtx); + Calendar cal = getBpelRuntime().getExpLangRuntime().evaluateAsDate(wait.untilExpression, evalCtx); dueDate = cal.getTime(); } else { throw new AssertionError("Static checks failed to find bad WaitActivity!"); Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/WHILE.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/WHILE.java?rev=681565&r1=681564&r2=681565&view=diff ============================================================================== --- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/WHILE.java (original) +++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/WHILE.java Thu Jul 31 17:29:41 2008 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.ode.bpel.runtime; +package org.apache.ode.bpel.rtrep.v2; import java.util.HashSet; import java.util.Set; @@ -24,13 +24,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.ode.bpel.common.FaultException; -import org.apache.ode.bpel.o.OScope; -import org.apache.ode.bpel.o.OWhile; -import org.apache.ode.bpel.runtime.channels.FaultData; -import org.apache.ode.bpel.runtime.channels.ParentScopeChannel; -import org.apache.ode.bpel.runtime.channels.ParentScopeChannelListener; -import org.apache.ode.bpel.runtime.channels.TerminationChannel; -import org.apache.ode.bpel.runtime.channels.TerminationChannelListener; +import org.apache.ode.bpel.rtrep.v2.channels.FaultData; +import org.apache.ode.bpel.rtrep.v2.channels.ParentScopeChannel; +import org.apache.ode.bpel.rtrep.v2.channels.ParentScopeChannelListener; +import org.apache.ode.bpel.rtrep.v2.channels.TerminationChannel; +import org.apache.ode.bpel.rtrep.v2.channels.TerminationChannelListener; import org.apache.ode.jacob.SynchChannel; import org.w3c.dom.Element; @@ -50,8 +48,7 @@ public void run() { - boolean condResult = false; - + boolean condResult; try { condResult = checkCondition(); } catch (FaultException fe) { @@ -95,7 +92,7 @@ * in case of standard expression fault (e.g. selection failure) */ private boolean checkCondition() throws FaultException { - return getBpelRuntimeContext().getExpLangRuntime().evaluateAsBoolean(getOWhile().whileCondition, getEvaluationContext()); + return getBpelRuntime().getExpLangRuntime().evaluateAsBoolean(getOWhile().whileCondition, getEvaluationContext()); } private class WAITER extends BpelJacobRunnable { Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/channels/ActivityRecovery.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/channels/ActivityRecovery.java?rev=681565&r1=681564&r2=681565&view=diff ============================================================================== --- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/channels/ActivityRecovery.java (original) +++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/channels/ActivityRecovery.java Thu Jul 31 17:29:41 2008 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.ode.bpel.runtime.channels; +package org.apache.ode.bpel.rtrep.v2.channels; import org.apache.ode.jacob.ap.ChannelType; Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/channels/Compensation.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/channels/Compensation.java?rev=681565&r1=681564&r2=681565&view=diff ============================================================================== --- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/channels/Compensation.java (original) +++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/channels/Compensation.java Thu Jul 31 17:29:41 2008 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.ode.bpel.runtime.channels; +package org.apache.ode.bpel.rtrep.v2.channels; import org.apache.ode.jacob.SynchChannel; import org.apache.ode.jacob.ap.ChannelType; Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/channels/EventHandlerControl.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/channels/EventHandlerControl.java?rev=681565&r1=681564&r2=681565&view=diff ============================================================================== --- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/channels/EventHandlerControl.java (original) +++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/channels/EventHandlerControl.java Thu Jul 31 17:29:41 2008 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.ode.bpel.runtime.channels; +package org.apache.ode.bpel.rtrep.v2.channels; import org.apache.ode.jacob.ap.ChannelType; Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/channels/FaultData.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/channels/FaultData.java?rev=681565&r1=681564&r2=681565&view=diff ============================================================================== --- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/channels/FaultData.java (original) +++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/channels/FaultData.java Thu Jul 31 17:29:41 2008 @@ -16,13 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.ode.bpel.runtime.channels; +package org.apache.ode.bpel.rtrep.v2.channels; -import org.apache.ode.bpel.o.OBase; -import org.apache.ode.bpel.o.OElementVarType; -import org.apache.ode.bpel.o.OMessageVarType; -import org.apache.ode.bpel.o.OVarType; import org.apache.ode.utils.SerializableElement; +import org.apache.ode.bpel.rtrep.v2.OBase; +import org.apache.ode.bpel.rtrep.v2.OVarType; +import org.apache.ode.bpel.rtrep.v2.OElementVarType; +import org.apache.ode.bpel.rtrep.v2.OMessageVarType; +import org.apache.ode.bpel.rtrep.rapi.FaultInfo; import org.w3c.dom.Element; import javax.xml.namespace.QName; @@ -32,7 +33,7 @@ /** * Information about a BPEL fault. */ -public class FaultData implements Serializable { +public class FaultData implements Serializable, FaultInfo { private static final long serialVersionUID = 1L; /** Name of the fault. */ Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/channels/InvokeResponse.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/channels/InvokeResponse.java?rev=681565&r1=681564&r2=681565&view=diff ============================================================================== --- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/channels/InvokeResponse.java (original) +++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/channels/InvokeResponse.java Thu Jul 31 17:29:41 2008 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.ode.bpel.runtime.channels; +package org.apache.ode.bpel.rtrep.v2.channels; import org.apache.ode.jacob.ap.ChannelType; Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/channels/LinkStatus.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/channels/LinkStatus.java?rev=681565&r1=681564&r2=681565&view=diff ============================================================================== --- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/channels/LinkStatus.java (original) +++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/channels/LinkStatus.java Thu Jul 31 17:29:41 2008 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.ode.bpel.runtime.channels; +package org.apache.ode.bpel.rtrep.v2.channels; import org.apache.ode.jacob.ap.ChannelType; Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/channels/ParentScope.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/channels/ParentScope.java?rev=681565&r1=681564&r2=681565&view=diff ============================================================================== --- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/channels/ParentScope.java (original) +++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/channels/ParentScope.java Thu Jul 31 17:29:41 2008 @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.ode.bpel.runtime.channels; +package org.apache.ode.bpel.rtrep.v2.channels; import org.apache.ode.jacob.SynchChannel; -import org.apache.ode.bpel.o.OScope; -import org.apache.ode.bpel.runtime.CompensationHandler; +import org.apache.ode.bpel.rtrep.v2.OScope; +import org.apache.ode.bpel.rtrep.v2.CompensationHandler; import org.w3c.dom.Element; import java.util.Set; Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/channels/PickResponse.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/channels/PickResponse.java?rev=681565&r1=681564&r2=681565&view=diff ============================================================================== --- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/channels/PickResponse.java (original) +++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/channels/PickResponse.java Thu Jul 31 17:29:41 2008 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.ode.bpel.runtime.channels; +package org.apache.ode.bpel.rtrep.v2.channels; import org.apache.ode.jacob.ap.ChannelType; Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/channels/ReadWriteLock.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/channels/ReadWriteLock.java?rev=681565&r1=681564&r2=681565&view=diff ============================================================================== --- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/channels/ReadWriteLock.java (original) +++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/channels/ReadWriteLock.java Thu Jul 31 17:29:41 2008 @@ -1,4 +1,4 @@ -package org.apache.ode.bpel.runtime.channels; +package org.apache.ode.bpel.rtrep.v2.channels; import org.apache.ode.jacob.SynchChannel; import org.apache.ode.jacob.ap.ChannelType; Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/channels/Termination.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/channels/Termination.java?rev=681565&r1=681564&r2=681565&view=diff ============================================================================== --- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/channels/Termination.java (original) +++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/channels/Termination.java Thu Jul 31 17:29:41 2008 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.ode.bpel.runtime.channels; +package org.apache.ode.bpel.rtrep.v2.channels; import org.apache.ode.jacob.ap.ChannelType; Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/channels/TimerResponse.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/channels/TimerResponse.java?rev=681565&r1=681564&r2=681565&view=diff ============================================================================== --- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/channels/TimerResponse.java (original) +++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/channels/TimerResponse.java Thu Jul 31 17:29:41 2008 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.ode.bpel.runtime.channels; +package org.apache.ode.bpel.rtrep.v2.channels; import org.apache.ode.jacob.ap.ChannelType; Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath10/BpelDocumentNavigator.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath10/BpelDocumentNavigator.java?rev=681565&r1=681564&r2=681565&view=diff ============================================================================== --- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath10/BpelDocumentNavigator.java (original) +++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath10/BpelDocumentNavigator.java Thu Jul 31 17:29:41 2008 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.ode.bpel.elang.xpath10.runtime; +package org.apache.ode.bpel.rtrep.v2.xpath10; import org.jaxen.dom.DocumentNavigator; import org.w3c.dom.Node; Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath10/JaxenContexts.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath10/JaxenContexts.java?rev=681565&r1=681564&r2=681565&view=diff ============================================================================== --- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath10/JaxenContexts.java (original) +++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath10/JaxenContexts.java Thu Jul 31 17:29:41 2008 @@ -16,21 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.ode.bpel.elang.xpath10.runtime; +package org.apache.ode.bpel.rtrep.v2.xpath10; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.ode.bpel.common.FaultException; -import org.apache.ode.bpel.elang.xpath10.o.OXPath10Expression; -import org.apache.ode.bpel.elang.xpath10.o.OXPath10ExpressionBPEL20; -import org.apache.ode.bpel.explang.EvaluationContext; -import org.apache.ode.bpel.o.OLink; -import org.apache.ode.bpel.o.OMessageVarType; -import org.apache.ode.bpel.o.OProcess; -import org.apache.ode.bpel.o.OScope; -import org.apache.ode.bpel.o.OVarType; -import org.apache.ode.bpel.o.OXsdTypeVarType; -import org.apache.ode.bpel.o.OXslSheet; +import org.apache.ode.bpel.rtrep.v2.*; import org.apache.ode.utils.DOMUtils; import org.apache.ode.utils.xsd.XSTypes; import org.apache.ode.utils.xsl.XslTransformHandler; Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath10/JaxenNamespaceContextAdapter.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath10/JaxenNamespaceContextAdapter.java?rev=681565&r1=681564&r2=681565&view=diff ============================================================================== --- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath10/JaxenNamespaceContextAdapter.java (original) +++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath10/JaxenNamespaceContextAdapter.java Thu Jul 31 17:29:41 2008 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.ode.bpel.elang.xpath10.runtime; +package org.apache.ode.bpel.rtrep.v2.xpath10; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath10/OXPath10Expression.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath10/OXPath10Expression.java?rev=681565&r1=681564&r2=681565&view=diff ============================================================================== --- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath10/OXPath10Expression.java (original) +++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath10/OXPath10Expression.java Thu Jul 31 17:29:41 2008 @@ -16,18 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.ode.bpel.elang.xpath10.o; +package org.apache.ode.bpel.rtrep.v2.xpath10; -import org.apache.ode.bpel.o.OBase; -import org.apache.ode.bpel.o.OExpression; -import org.apache.ode.bpel.o.OLValueExpression; -import org.apache.ode.bpel.o.OLink; -import org.apache.ode.bpel.o.OMessageVarType; -import org.apache.ode.bpel.o.OProcess; -import org.apache.ode.bpel.o.OScope; -import org.apache.ode.bpel.o.OScope.Variable; -import org.apache.ode.bpel.o.OXslSheet; import org.apache.ode.utils.NSContext; +import org.apache.ode.bpel.rtrep.v2.*; import javax.xml.namespace.QName; import java.io.Serializable; @@ -48,9 +40,9 @@ public final HashMap<String, OProcess.OProperty> properties = new HashMap<String, OProcess.OProperty>(); - public final HashMap<String, OLink> links = new HashMap<String,OLink>(); + public final HashMap<String, OLink> links = new HashMap<String, OLink>(); - public final HashMap<URI,OXslSheet> xslSheets = new HashMap<URI, OXslSheet>(); + public final HashMap<URI, OXslSheet> xslSheets = new HashMap<URI, OXslSheet>(); /** Map getVariableData invocation signature to compiled objects. */ private final HashMap<SigGetVariableData,OSigGetVariableData> _getVariableDataSigs = @@ -129,10 +121,7 @@ return false; if (partname != null && (other.partname == null || !partname.equals(other.partname))) return false; - if (location != null && (other.location == null || !location.equals(other.location))) - return false; - - return true; + return !(location != null && (other.location == null || !location.equals(other.location))); } public int hashCode() { @@ -165,7 +154,7 @@ /** * @see org.apache.ode.bpel.o.OLValueExpression#getVariable() */ - public Variable getVariable() { + public OScope.Variable getVariable() { if(vars.size() == 0) throw new IllegalStateException("LValue must have one variable reference."); // We're interested in the first variable referenced by the LValue Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath10/OXPath10ExpressionBPEL20.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath10/OXPath10ExpressionBPEL20.java?rev=681565&r1=681564&r2=681565&view=diff ============================================================================== --- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath10/OXPath10ExpressionBPEL20.java (original) +++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath10/OXPath10ExpressionBPEL20.java Thu Jul 31 17:29:41 2008 @@ -16,12 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.ode.bpel.elang.xpath10.o; - -import org.apache.ode.bpel.o.OProcess; +package org.apache.ode.bpel.rtrep.v2.xpath10; +import org.apache.ode.bpel.rtrep.v2.OProcess; import java.io.Serializable; - import javax.xml.namespace.QName; Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath10/WrappedFaultException.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath10/WrappedFaultException.java?rev=681565&r1=681564&r2=681565&view=diff ============================================================================== --- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath10/WrappedFaultException.java (original) +++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath10/WrappedFaultException.java Thu Jul 31 17:29:41 2008 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.ode.bpel.elang.xpath10.runtime; +package org.apache.ode.bpel.rtrep.v2.xpath10; import org.apache.ode.bpel.common.FaultException; Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath10/XPath10ExpressionRuntime.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath10/XPath10ExpressionRuntime.java?rev=681565&r1=681564&r2=681565&view=diff ============================================================================== --- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath10/XPath10ExpressionRuntime.java (original) +++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath10/XPath10ExpressionRuntime.java Thu Jul 31 17:29:41 2008 @@ -16,16 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.ode.bpel.elang.xpath10.runtime; +package org.apache.ode.bpel.rtrep.v2.xpath10; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.ode.bpel.common.FaultException; -import org.apache.ode.bpel.elang.xpath10.o.OXPath10Expression; -import org.apache.ode.bpel.explang.ConfigurationException; -import org.apache.ode.bpel.explang.EvaluationContext; -import org.apache.ode.bpel.explang.ExpressionLanguageRuntime; -import org.apache.ode.bpel.o.OExpression; +import org.apache.ode.bpel.rtrep.v2.EvaluationContext; +import org.apache.ode.bpel.rtrep.v2.ExpressionLanguageRuntime; +import org.apache.ode.bpel.rtrep.v2.OExpression; +import org.apache.ode.bpel.rtrep.common.ConfigurationException; import org.apache.ode.utils.DOMUtils; import org.apache.ode.utils.ISO8601DateParser; import org.apache.ode.utils.xsd.Duration; Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath10/XslRuntimeUriResolver.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath10/XslRuntimeUriResolver.java?rev=681565&r1=681564&r2=681565&view=diff ============================================================================== --- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath10/XslRuntimeUriResolver.java (original) +++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath10/XslRuntimeUriResolver.java Thu Jul 31 17:29:41 2008 @@ -17,12 +17,11 @@ * under the License. */ -package org.apache.ode.bpel.elang.xpath10.runtime; +package org.apache.ode.bpel.rtrep.v2.xpath10; -import org.apache.ode.bpel.elang.xpath10.o.OXPath10Expression; -import org.apache.ode.bpel.o.OXslSheet; import org.apache.ode.utils.StreamUtils; -import org.apache.ode.utils.fs.FileUtils; +import org.apache.ode.utils.fs.FileUtils; +import org.apache.ode.bpel.rtrep.v2.OXslSheet; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath20/JaxpFunctionResolver.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath20/JaxpFunctionResolver.java?rev=681565&r1=681564&r2=681565&view=diff ============================================================================== --- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath20/JaxpFunctionResolver.java (original) +++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath20/JaxpFunctionResolver.java Thu Jul 31 17:29:41 2008 @@ -17,23 +17,17 @@ * under the License. */ -package org.apache.ode.bpel.elang.xpath20.runtime; +package org.apache.ode.bpel.rtrep.v2.xpath20; import net.sf.saxon.dom.NodeWrapper; -import org.apache.commons.httpclient.URIException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.commons.httpclient.URIException; import org.apache.ode.bpel.common.FaultException; -import org.apache.ode.bpel.elang.xpath10.o.OXPath10Expression; -import org.apache.ode.bpel.elang.xpath10.o.OXPath10ExpressionBPEL20; -import org.apache.ode.bpel.elang.xpath20.compiler.Constants; -import org.apache.ode.bpel.elang.xpath20.compiler.WrappedResolverException; -import org.apache.ode.bpel.elang.xpath20.o.OXPath20ExpressionBPEL20; -import org.apache.ode.bpel.explang.EvaluationContext; -import org.apache.ode.bpel.o.OLink; -import org.apache.ode.bpel.o.OProcess; -import org.apache.ode.bpel.o.OScope; -import org.apache.ode.bpel.o.OXslSheet; +import org.apache.ode.bpel.rtrep.common.Constants; +import org.apache.ode.bpel.rtrep.v2.*; +import org.apache.ode.bpel.rtrep.v2.xpath10.OXPath10Expression; +import org.apache.ode.bpel.rtrep.v2.xpath10.OXPath10ExpressionBPEL20; import org.apache.ode.utils.DOMUtils; import org.apache.ode.utils.Namespaces; import org.apache.ode.utils.URITemplate; @@ -78,7 +72,7 @@ public XPathFunction resolveFunction(QName functionName, int arity) { __log.debug("Resolving function " + functionName); if (functionName.getNamespaceURI() == null) { - throw new WrappedResolverException("Undeclared namespace for " + functionName); + throw new WrappedFaultException("Undeclared namespace for " + functionName); } else if (functionName.getNamespaceURI().equals(Namespaces.WS_BPEL_20_NS) || functionName.getNamespaceURI().equals(Namespaces.WSBPEL2_0_FINAL_EXEC)) { String localName = functionName.getLocalPart(); @@ -91,7 +85,7 @@ } else if (Constants.EXT_FUNCTION_DOXSLTRANSFORM.equals(localName)) { return new DoXslTransform(); } else { - throw new WrappedResolverException("Unknown BPEL function: " + functionName); + throw new WrappedFaultException("Unknown BPEL function: " + functionName); } } else if (functionName.getNamespaceURI().equals(Namespaces.ODE_EXTENSION_NS)) { String localName = functionName.getLocalPart(); Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath20/JaxpVariableResolver.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath20/JaxpVariableResolver.java?rev=681565&r1=681564&r2=681565&view=diff ============================================================================== --- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath20/JaxpVariableResolver.java (original) +++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath20/JaxpVariableResolver.java Thu Jul 31 17:29:41 2008 @@ -17,19 +17,14 @@ * under the License. */ -package org.apache.ode.bpel.elang.xpath20.runtime; +package org.apache.ode.bpel.rtrep.v2.xpath20; import net.sf.saxon.value.DateTimeValue; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.ode.bpel.common.FaultException; -import org.apache.ode.bpel.elang.xpath10.o.OXPath10ExpressionBPEL20; -import org.apache.ode.bpel.elang.xpath20.compiler.WrappedResolverException; -import org.apache.ode.bpel.explang.EvaluationContext; -import org.apache.ode.bpel.o.OLink; -import org.apache.ode.bpel.o.OMessageVarType; -import org.apache.ode.bpel.o.OScope; -import org.apache.ode.bpel.o.OXsdTypeVarType; +import org.apache.ode.bpel.rtrep.v2.xpath10.OXPath10ExpressionBPEL20; +import org.apache.ode.bpel.rtrep.v2.*; import org.apache.ode.utils.Namespaces; import org.apache.ode.utils.xsd.XSTypes; import org.w3c.dom.Node; @@ -75,7 +70,7 @@ try { return _ectx.isLinkActive(olink) ? Boolean.TRUE : Boolean.FALSE; } catch (FaultException e) { - throw new WrappedResolverException(e); + throw new WrappedFaultException(e); } }else{ String varName; @@ -108,7 +103,7 @@ return new SingletonNodeList(variableNode); }catch(FaultException e){ - throw new WrappedResolverException(e); + throw new WrappedFaultException(e); } } } Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath20/OXPath20ExpressionBPEL20.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath20/OXPath20ExpressionBPEL20.java?rev=681565&r1=681564&r2=681565&view=diff ============================================================================== --- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath20/OXPath20ExpressionBPEL20.java (original) +++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath20/OXPath20ExpressionBPEL20.java Thu Jul 31 17:29:41 2008 @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.ode.bpel.elang.xpath20.o; +package org.apache.ode.bpel.rtrep.v2.xpath20; import net.sf.saxon.expr.Expression; -import org.apache.ode.bpel.elang.xpath10.o.OXPath10ExpressionBPEL20; -import org.apache.ode.bpel.o.OProcess; +import org.apache.ode.bpel.rtrep.v2.OProcess; +import org.apache.ode.bpel.rtrep.v2.xpath10.OXPath10ExpressionBPEL20; import javax.xml.namespace.QName; Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath20/XPath20ExpressionRuntime.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath20/XPath20ExpressionRuntime.java?rev=681565&r1=681564&r2=681565&view=diff ============================================================================== --- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath20/XPath20ExpressionRuntime.java (original) +++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath20/XPath20ExpressionRuntime.java Thu Jul 31 17:29:41 2008 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.ode.bpel.elang.xpath20.runtime; +package org.apache.ode.bpel.rtrep.v2.xpath20; import net.sf.saxon.trans.DynamicError; import net.sf.saxon.value.DurationValue; @@ -24,13 +24,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.ode.bpel.common.FaultException; -import org.apache.ode.bpel.elang.xpath10.o.OXPath10Expression; -import org.apache.ode.bpel.elang.xpath20.compiler.WrappedResolverException; -import org.apache.ode.bpel.elang.xpath20.o.OXPath20ExpressionBPEL20; -import org.apache.ode.bpel.explang.ConfigurationException; -import org.apache.ode.bpel.explang.EvaluationContext; -import org.apache.ode.bpel.explang.ExpressionLanguageRuntime; -import org.apache.ode.bpel.o.OExpression; +import org.apache.ode.bpel.rtrep.v2.OExpression; +import org.apache.ode.bpel.rtrep.v2.EvaluationContext; +import org.apache.ode.bpel.rtrep.v2.ExpressionLanguageRuntime; +import org.apache.ode.bpel.rtrep.v2.xpath10.OXPath10Expression; +import org.apache.ode.bpel.rtrep.common.ConfigurationException; import org.apache.ode.utils.DOMUtils; import org.apache.ode.utils.ISO8601DateParser; import org.apache.ode.utils.xsd.Duration; @@ -67,16 +65,10 @@ XslTransformHandler.getInstance().setTransformerFactory(trsf); } - /** - * @see org.apache.ode.bpel.explang.ExpressionLanguageRuntime#evaluateAsString(org.apache.ode.bpel.o.OExpression, org.apache.ode.bpel.explang.EvaluationContext) - */ public String evaluateAsString(OExpression cexp, EvaluationContext ctx) throws FaultException{ return (String)evaluate(cexp, ctx, XPathConstants.STRING); } - /** - * @see org.apache.ode.bpel.explang.ExpressionLanguageRuntime#evaluateAsBoolean(org.apache.ode.bpel.o.OExpression, org.apache.ode.bpel.explang.EvaluationContext) - */ public boolean evaluateAsBoolean(OExpression cexp, EvaluationContext ctx) throws FaultException{ return (Boolean) evaluate(cexp, ctx, XPathConstants.BOOLEAN); } @@ -85,9 +77,6 @@ return (Number) evaluate(cexp, ctx, XPathConstants.NUMBER); } - /** - * @see org.apache.ode.bpel.explang.ExpressionLanguageRuntime#evaluate(org.apache.ode.bpel.o.OExpression, org.apache.ode.bpel.explang.EvaluationContext) - */ public List evaluate(OExpression cexp, EvaluationContext ctx) throws FaultException { List result; Object someRes = evaluate(cexp, ctx, XPathConstants.NODESET); @@ -207,7 +196,7 @@ } } throw new FaultException(cexp.getOwner().constants.qnSubLanguageExecutionFault, cause.getMessage(), cause); - } catch (WrappedResolverException wre) { + } catch (WrappedFaultException wre) { wre.printStackTrace(); throw (FaultException)wre.getCause(); } catch (Throwable t) { Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath20/XslRuntimeUriResolver.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath20/XslRuntimeUriResolver.java?rev=681565&r1=681564&r2=681565&view=diff ============================================================================== --- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath20/XslRuntimeUriResolver.java (original) +++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/xpath20/XslRuntimeUriResolver.java Thu Jul 31 17:29:41 2008 @@ -17,11 +17,10 @@ * under the License. */ -package org.apache.ode.bpel.elang.xpath20.runtime; +package org.apache.ode.bpel.rtrep.v2.xpath20; -import org.apache.ode.bpel.compiler.api.CompilationException; -import org.apache.ode.bpel.elang.xpath10.o.OXPath10Expression; -import org.apache.ode.bpel.o.OXslSheet; +import org.apache.ode.bpel.rtrep.v2.xpath10.OXPath10Expression; +import org.apache.ode.bpel.rtrep.v2.OXslSheet; import org.apache.ode.utils.StreamUtils; import org.apache.ode.utils.fs.FileUtils; import org.apache.commons.logging.Log;
