You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by mr...@apache.org on 2008/08/04 20:44:21 UTC
svn commit: r682457 [1/2] - in /ode/branches/rtver: ./
bpel-api/src/main/java/org/apache/ode/bpel/rapi/
bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/
bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/api/
bpel-compiler/src/main/java/...
Author: mriou
Date: Mon Aug 4 11:44:19 2008
New Revision: 682457
URL: http://svn.apache.org/viewvc?rev=682457&view=rev
Log:
The compiler compiles (he). But I'm getting ready to break it again.
Added:
ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/
- copied from r681565, ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/rapi/
ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/RuntimeImpl.java
Removed:
ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/rapi/
Modified:
ode/branches/rtver/Rakefile
ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/CorrelationSet.java
ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/CorrelationSetModel.java
ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/FaultInfo.java
ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/IOContext.java
ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/InvalidProcessException.java
ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/NoSuchOperationException.java
ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/OdeRTInstance.java
ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/OdeRTInstanceContext.java
ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/OdeRuntime.java
ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/PartnerLink.java
ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/PartnerLinkModel.java
ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/ProcessControlContext.java
ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/ProcessModel.java
ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/PropertyAliasModel.java
ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/RecoveryContext.java
ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/ScopedObject.java
ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/Selector.java
ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/UninitializedPartnerEPR.java
ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/UninitializedVariableException.java
ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/Variable.java
ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/VariableContext.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/ActivityGenerator.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/AssignGenerator.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BaseCompiler.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelC.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/CompensateGenerator.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/CompensateScopeGenerator.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/DefaultActivityGenerator.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/EmptyGenerator.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/ExtensionActivtityGenerator.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/FlowGenerator.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/ForEachGenerator.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/IfGenerator.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/InvokeGenerator.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/PickGenerator.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/PickReceiveGenerator.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/ReceiveGenerator.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/RepeatUntilGenerator.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/ReplyGenerator.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/RethrowGenerator.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/SequenceGenerator.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/SwitchGenerator.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/TerminateGenerator.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/ThrowGenerator.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WaitGenerator.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WhileGenerator.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/api/CompilerContext.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/api/ExpressionCompiler.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/BpelObjectFactory.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/Variable.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/JaxenBpelHandler.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPath10ExpressionCompilerBPEL11.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPath10ExpressionCompilerBPEL20.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPath10ExpressionCompilerImpl.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XslCompileUriResolver.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/JaxpFunctionResolver.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/JaxpVariableResolver.java
ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerImpl.java
ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/ACTIVITYGUARD.java
ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/BpelJacobRunnable.java
ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/CorrelationSetInstance.java
ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/EH_EVENT.java
ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OPartnerLink.java
ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OProcess.java
ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OScope.java
ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/PICK.java
ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/PartnerLinkInstance.java
ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/PropertyAliasEvaluationContext.java
ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/RETHROW.java
ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/RuntimeInstanceImpl.java
ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/SCOPE.java
ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/Selector.java
ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/VariableInstance.java
ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/channels/FaultData.java
Modified: ode/branches/rtver/Rakefile
URL: http://svn.apache.org/viewvc/ode/branches/rtver/Rakefile?rev=682457&r1=682456&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/Rakefile (original)
+++ ode/branches/rtver/Rakefile Mon Aug 4 11:44:19 2008
@@ -252,7 +252,7 @@
desc "ODE Runtime Engine"
define "bpel-runtime" do
- compile.with projects("bpel-api", "bpel-compiler", "bpel-dao", "runtime-repo", "bpel-schemas",
+ compile.with projects("bpel-api", "bpel-compiler", "bpel-dao", "bpel-schemas",
"bpel-store", "jacob", "jacob-ap", "utils"),
BACKPORT, COMMONS.logging, COMMONS.httpclient, COMMONS.collections, COMMONS.lang, JAXEN, JAVAX.persistence,
JAVAX.stream, SAXON, WSDL4J, XMLBEANS, JAVAX.transaction
@@ -287,7 +287,7 @@
desc "ODE Process Store"
define "bpel-store" do
- compile.with projects("bpel-api", "bpel-compiler", "bpel-dao", "runtime-repo", "bpel-schemas", "il-common",
+ compile.with projects("bpel-api", "bpel-compiler", "bpel-dao", "bpel-schemas", "il-common",
"dao-hibernate", "utils"),
COMMONS.logging, JAVAX.persistence, JAVAX.stream, HIBERNATE, HSQLDB, XMLBEANS, XERCES, WSDL4J
compile { open_jpa_enhance }
@@ -413,7 +413,7 @@
desc "ODE JBI Integration Layer"
define "jbi" do
- compile.with projects("bpel-api", "bpel-compiler", "bpel-connector", "bpel-dao", "il-common", "runtime-repo",
+ compile.with projects("bpel-api", "bpel-compiler", "bpel-connector", "bpel-dao", "il-common",
"bpel-runtime", "scheduler-simple", "bpel-schemas", "bpel-store", "utils"),
AXIOM, COMMONS.logging, COMMONS.pool, JAVAX.transaction, JBI, LOG4J, WSDL4J, XERCES
Modified: ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/CorrelationSet.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/CorrelationSet.java?rev=682457&r1=681565&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/CorrelationSet.java (original)
+++ ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/CorrelationSet.java Mon Aug 4 11:44:19 2008
@@ -1,6 +1,6 @@
-package org.apache.ode.bpel.rtrep.rapi;
+package org.apache.ode.bpel.rapi;
-public interface CorrelationSet extends org.apache.ode.bpel.rtrep.rapi.ScopedObject {
+public interface CorrelationSet extends org.apache.ode.bpel.rapi.ScopedObject {
String getName();
}
Modified: ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/CorrelationSetModel.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/CorrelationSetModel.java?rev=682457&r1=681565&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/CorrelationSetModel.java (original)
+++ ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/CorrelationSetModel.java Mon Aug 4 11:44:19 2008
@@ -1,4 +1,4 @@
-package org.apache.ode.bpel.rtrep.rapi;
+package org.apache.ode.bpel.rapi;
import javax.xml.namespace.QName;
import java.util.Set;
Modified: ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/FaultInfo.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/FaultInfo.java?rev=682457&r1=681565&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/FaultInfo.java (original)
+++ ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/FaultInfo.java Mon Aug 4 11:44:19 2008
@@ -1,4 +1,4 @@
-package org.apache.ode.bpel.rtrep.rapi;
+package org.apache.ode.bpel.rapi;
import javax.xml.namespace.QName;
Modified: ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/IOContext.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/IOContext.java?rev=682457&r1=681565&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/IOContext.java (original)
+++ ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/IOContext.java Mon Aug 4 11:44:19 2008
@@ -1,4 +1,4 @@
-package org.apache.ode.bpel.rtrep.rapi;
+package org.apache.ode.bpel.rapi;
import java.util.Date;
Modified: ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/InvalidProcessException.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/InvalidProcessException.java?rev=682457&r1=681565&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/InvalidProcessException.java (original)
+++ ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/InvalidProcessException.java Mon Aug 4 11:44:19 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.rtrep.rapi;
+package org.apache.ode.bpel.rapi;
/**
* A run-time exception indicating that the process is invalid. This should not
Modified: ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/NoSuchOperationException.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/NoSuchOperationException.java?rev=682457&r1=681565&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/NoSuchOperationException.java (original)
+++ ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/NoSuchOperationException.java Mon Aug 4 11:44:19 2008
@@ -1,7 +1,7 @@
/**
*
*/
-package org.apache.ode.bpel.rtrep.rapi;
+package org.apache.ode.bpel.rapi;
/**
* @author mszefler
Modified: ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/OdeRTInstance.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/OdeRTInstance.java?rev=682457&r1=681565&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/OdeRTInstance.java (original)
+++ ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/OdeRTInstance.java Mon Aug 4 11:44:19 2008
@@ -1,4 +1,4 @@
-package org.apache.ode.bpel.rtrep.rapi;
+package org.apache.ode.bpel.rapi;
import java.io.IOException;
import java.io.OutputStream;
Modified: ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/OdeRTInstanceContext.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/OdeRTInstanceContext.java?rev=682457&r1=681565&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/OdeRTInstanceContext.java (original)
+++ ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/OdeRTInstanceContext.java Mon Aug 4 11:44:19 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.rtrep.rapi;
+package org.apache.ode.bpel.rapi;
import org.apache.ode.bpel.evt.ProcessInstanceEvent;
Modified: ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/OdeRuntime.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/OdeRuntime.java?rev=682457&r1=681565&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/OdeRuntime.java (original)
+++ ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/OdeRuntime.java Mon Aug 4 11:44:19 2008
@@ -1,8 +1,7 @@
-package org.apache.ode.bpel.rtrep.rapi;
+package org.apache.ode.bpel.rapi;
import org.apache.ode.bpel.iapi.ProcessConf;
import org.apache.ode.bpel.common.FaultException;
-import org.apache.ode.jacob.soup.ReplacementMap;
import org.w3c.dom.Element;
import javax.xml.namespace.QName;
@@ -13,7 +12,7 @@
OdeRTInstance newInstance(Object state);
- ReplacementMap getReplacementMap(QName processName);
+ Object getReplacementMap(QName processName);
ProcessModel getModel();
Modified: ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/PartnerLink.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/PartnerLink.java?rev=682457&r1=681565&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/PartnerLink.java (original)
+++ ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/PartnerLink.java Mon Aug 4 11:44:19 2008
@@ -1,4 +1,4 @@
-package org.apache.ode.bpel.rtrep.rapi;
+package org.apache.ode.bpel.rapi;
public interface PartnerLink extends ScopedObject {
Modified: ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/PartnerLinkModel.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/PartnerLinkModel.java?rev=682457&r1=681565&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/PartnerLinkModel.java (original)
+++ ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/PartnerLinkModel.java Mon Aug 4 11:44:19 2008
@@ -1,4 +1,4 @@
-package org.apache.ode.bpel.rtrep.rapi;
+package org.apache.ode.bpel.rapi;
import javax.wsdl.Operation;
import javax.wsdl.PortType;
Modified: ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/ProcessControlContext.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/ProcessControlContext.java?rev=682457&r1=681565&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/ProcessControlContext.java (original)
+++ ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/ProcessControlContext.java Mon Aug 4 11:44:19 2008
@@ -1,4 +1,4 @@
-package org.apache.ode.bpel.rtrep.rapi;
+package org.apache.ode.bpel.rapi;
/**
Modified: ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/ProcessModel.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/ProcessModel.java?rev=682457&r1=681565&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/ProcessModel.java (original)
+++ ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/ProcessModel.java Mon Aug 4 11:44:19 2008
@@ -1,4 +1,4 @@
-package org.apache.ode.bpel.rtrep.rapi;
+package org.apache.ode.bpel.rapi;
import java.util.Collection;
import java.util.List;
Modified: ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/PropertyAliasModel.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/PropertyAliasModel.java?rev=682457&r1=681565&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/PropertyAliasModel.java (original)
+++ ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/PropertyAliasModel.java Mon Aug 4 11:44:19 2008
@@ -1,4 +1,4 @@
-package org.apache.ode.bpel.rtrep.rapi;
+package org.apache.ode.bpel.rapi;
public interface PropertyAliasModel {
String getDescription();
Modified: ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/RecoveryContext.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/RecoveryContext.java?rev=682457&r1=681565&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/RecoveryContext.java (original)
+++ ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/RecoveryContext.java Mon Aug 4 11:44:19 2008
@@ -1,4 +1,4 @@
-package org.apache.ode.bpel.rtrep.rapi;
+package org.apache.ode.bpel.rapi;
import java.util.Date;
Modified: ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/ScopedObject.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/ScopedObject.java?rev=682457&r1=681565&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/ScopedObject.java (original)
+++ ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/ScopedObject.java Mon Aug 4 11:44:19 2008
@@ -1,4 +1,4 @@
-package org.apache.ode.bpel.rtrep.rapi;
+package org.apache.ode.bpel.rapi;
public interface ScopedObject {
Modified: ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/Selector.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/Selector.java?rev=682457&r1=681565&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/Selector.java (original)
+++ ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/Selector.java Mon Aug 4 11:44:19 2008
@@ -1,4 +1,4 @@
-package org.apache.ode.bpel.rtrep.rapi;
+package org.apache.ode.bpel.rapi;
import org.apache.ode.bpel.common.CorrelationKey;
Modified: ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/UninitializedPartnerEPR.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/UninitializedPartnerEPR.java?rev=682457&r1=681565&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/UninitializedPartnerEPR.java (original)
+++ ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/UninitializedPartnerEPR.java Mon Aug 4 11:44:19 2008
@@ -1,7 +1,7 @@
/**
*
*/
-package org.apache.ode.bpel.rtrep.rapi;
+package org.apache.ode.bpel.rapi;
/**
*
Modified: ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/UninitializedVariableException.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/UninitializedVariableException.java?rev=682457&r1=681565&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/UninitializedVariableException.java (original)
+++ ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/UninitializedVariableException.java Mon Aug 4 11:44:19 2008
@@ -1,7 +1,7 @@
/**
*
*/
-package org.apache.ode.bpel.rtrep.rapi;
+package org.apache.ode.bpel.rapi;
/**
* Indicates that the engine could not complete an operation because a variable was not initialized.
Modified: ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/Variable.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/Variable.java?rev=682457&r1=681565&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/Variable.java (original)
+++ ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/Variable.java Mon Aug 4 11:44:19 2008
@@ -1,4 +1,4 @@
-package org.apache.ode.bpel.rtrep.rapi;
+package org.apache.ode.bpel.rapi;
public interface Variable extends ScopedObject {
Modified: ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/VariableContext.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/VariableContext.java?rev=682457&r1=681565&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/VariableContext.java (original)
+++ ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/rapi/VariableContext.java Mon Aug 4 11:44:19 2008
@@ -1,4 +1,4 @@
-package org.apache.ode.bpel.rtrep.rapi;
+package org.apache.ode.bpel.rapi;
import java.util.Collection;
@@ -6,7 +6,6 @@
import org.apache.ode.bpel.common.CorrelationKey;
import org.apache.ode.bpel.common.FaultException;
-import org.apache.ode.bpel.evar.IncompleteKeyException;
import org.apache.ode.bpel.evar.ExternalVariableModuleException;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
Modified: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/ActivityGenerator.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/ActivityGenerator.java?rev=682457&r1=682456&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/ActivityGenerator.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/ActivityGenerator.java Mon Aug 4 11:44:19 2008
@@ -20,7 +20,7 @@
import org.apache.ode.bpel.compiler.api.CompilerContext;
import org.apache.ode.bpel.compiler.bom.Activity;
-import org.apache.ode.bpel.o.OActivity;
+import org.apache.ode.bpel.rtrep.v2.OActivity;
/**
Modified: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/AssignGenerator.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/AssignGenerator.java?rev=682457&r1=682456&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/AssignGenerator.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/AssignGenerator.java Mon Aug 4 11:44:19 2008
@@ -36,11 +36,11 @@
import org.apache.ode.bpel.compiler.bom.To;
import org.apache.ode.bpel.compiler.bom.VariableVal;
import org.apache.ode.bpel.compiler.bom.AssignActivity.AssignOperation;
-import org.apache.ode.bpel.o.DebugInfo;
-import org.apache.ode.bpel.o.OActivity;
-import org.apache.ode.bpel.o.OAssign;
-import org.apache.ode.bpel.o.OMessageVarType;
-import org.apache.ode.bpel.o.OAssign.RValue;
+import org.apache.ode.bpel.rtrep.v2.DebugInfo;
+import org.apache.ode.bpel.rtrep.v2.OActivity;
+import org.apache.ode.bpel.rtrep.v2.OAssign;
+import org.apache.ode.bpel.rtrep.v2.OMessageVarType;
+import org.apache.ode.bpel.rtrep.v2.OAssign.RValue;
import org.apache.ode.utils.DOMUtils;
import org.apache.ode.utils.SerializableElement;
import org.apache.ode.utils.msg.MessageBundle;
Modified: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BaseCompiler.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BaseCompiler.java?rev=682457&r1=682456&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BaseCompiler.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BaseCompiler.java Mon Aug 4 11:44:19 2008
@@ -1,7 +1,7 @@
package org.apache.ode.bpel.compiler;
-import org.apache.ode.bpel.o.OProcess;
-import org.apache.ode.bpel.o.OConstants;
+import org.apache.ode.bpel.rtrep.v2.OProcess;
+import org.apache.ode.bpel.rtrep.v2.OConstants;
import javax.xml.namespace.QName;
Modified: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelC.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelC.java?rev=682457&r1=682456&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelC.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelC.java Mon Aug 4 11:44:19 2008
@@ -38,8 +38,8 @@
import org.apache.ode.bpel.compiler.api.SourceLocation;
import org.apache.ode.bpel.compiler.bom.BpelObjectFactory;
import org.apache.ode.bpel.compiler.bom.Process;
-import org.apache.ode.bpel.o.OProcess;
-import org.apache.ode.bpel.o.Serializer;
+import org.apache.ode.bpel.rtrep.v2.OProcess;
+import org.apache.ode.bpel.rtrep.v2.Serializer;
import org.apache.ode.utils.StreamUtils;
import org.apache.ode.utils.msg.MessageBundle;
import org.w3c.dom.Node;
Modified: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java?rev=682457&r1=682456&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/BpelCompiler.java Mon Aug 4 11:44:19 2008
@@ -82,34 +82,34 @@
import org.apache.ode.bpel.compiler.bom.Variable;
import org.apache.ode.bpel.compiler.wsdl.Definition4BPEL;
import org.apache.ode.bpel.compiler.wsdl.WSDLFactory4BPEL;
-import org.apache.ode.bpel.o.DebugInfo;
-import org.apache.ode.bpel.o.OActivity;
-import org.apache.ode.bpel.o.OAssign;
-import org.apache.ode.bpel.o.OCatch;
-import org.apache.ode.bpel.o.OCompensate;
-import org.apache.ode.bpel.o.OCompensationHandler;
-import org.apache.ode.bpel.o.OConstantExpression;
-import org.apache.ode.bpel.o.OConstantVarType;
-import org.apache.ode.bpel.o.OConstants;
-import org.apache.ode.bpel.o.OElementVarType;
-import org.apache.ode.bpel.o.OEventHandler;
-import org.apache.ode.bpel.o.OExpression;
-import org.apache.ode.bpel.o.OExpressionLanguage;
-import org.apache.ode.bpel.o.OExtVar;
-import org.apache.ode.bpel.o.OFaultHandler;
-import org.apache.ode.bpel.o.OFlow;
-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.OPartnerLink;
-import org.apache.ode.bpel.o.OProcess;
-import org.apache.ode.bpel.o.ORethrow;
-import org.apache.ode.bpel.o.OScope;
-import org.apache.ode.bpel.o.OSequence;
-import org.apache.ode.bpel.o.OTerminationHandler;
-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.DebugInfo;
+import org.apache.ode.bpel.rtrep.v2.OActivity;
+import org.apache.ode.bpel.rtrep.v2.OAssign;
+import org.apache.ode.bpel.rtrep.v2.OCatch;
+import org.apache.ode.bpel.rtrep.v2.OCompensate;
+import org.apache.ode.bpel.rtrep.v2.OCompensationHandler;
+import org.apache.ode.bpel.rtrep.v2.OConstantExpression;
+import org.apache.ode.bpel.rtrep.v2.OConstantVarType;
+import org.apache.ode.bpel.rtrep.v2.OConstants;
+import org.apache.ode.bpel.rtrep.v2.OElementVarType;
+import org.apache.ode.bpel.rtrep.v2.OEventHandler;
+import org.apache.ode.bpel.rtrep.v2.OExpression;
+import org.apache.ode.bpel.rtrep.v2.OExpressionLanguage;
+import org.apache.ode.bpel.rtrep.v2.OExtVar;
+import org.apache.ode.bpel.rtrep.v2.OFaultHandler;
+import org.apache.ode.bpel.rtrep.v2.OFlow;
+import org.apache.ode.bpel.rtrep.v2.OLValueExpression;
+import org.apache.ode.bpel.rtrep.v2.OLink;
+import org.apache.ode.bpel.rtrep.v2.OMessageVarType;
+import org.apache.ode.bpel.rtrep.v2.OPartnerLink;
+import org.apache.ode.bpel.rtrep.v2.OProcess;
+import org.apache.ode.bpel.rtrep.v2.ORethrow;
+import org.apache.ode.bpel.rtrep.v2.OScope;
+import org.apache.ode.bpel.rtrep.v2.OSequence;
+import org.apache.ode.bpel.rtrep.v2.OTerminationHandler;
+import org.apache.ode.bpel.rtrep.v2.OVarType;
+import org.apache.ode.bpel.rtrep.v2.OXsdTypeVarType;
+import org.apache.ode.bpel.rtrep.v2.OXslSheet;
import org.apache.ode.utils.GUID;
import org.apache.ode.utils.NSContext;
import org.apache.ode.utils.StreamUtils;
Modified: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/CompensateGenerator.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/CompensateGenerator.java?rev=682457&r1=682456&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/CompensateGenerator.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/CompensateGenerator.java Mon Aug 4 11:44:19 2008
@@ -19,8 +19,8 @@
package org.apache.ode.bpel.compiler;
import org.apache.ode.bpel.compiler.bom.Activity;
-import org.apache.ode.bpel.o.OActivity;
-import org.apache.ode.bpel.o.OCompensate;
+import org.apache.ode.bpel.rtrep.v2.OActivity;
+import org.apache.ode.bpel.rtrep.v2.OCompensate;
/**
Modified: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/CompensateScopeGenerator.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/CompensateScopeGenerator.java?rev=682457&r1=682456&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/CompensateScopeGenerator.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/CompensateScopeGenerator.java Mon Aug 4 11:44:19 2008
@@ -22,8 +22,8 @@
import org.apache.ode.bpel.compiler.api.CompilationException;
import org.apache.ode.bpel.compiler.bom.Activity;
import org.apache.ode.bpel.compiler.bom.CompensateScopeActivity;
-import org.apache.ode.bpel.o.OActivity;
-import org.apache.ode.bpel.o.OCompensate;
+import org.apache.ode.bpel.rtrep.v2.OActivity;
+import org.apache.ode.bpel.rtrep.v2.OCompensate;
import org.apache.ode.utils.msg.MessageBundle;
Modified: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/DefaultActivityGenerator.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/DefaultActivityGenerator.java?rev=682457&r1=682456&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/DefaultActivityGenerator.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/DefaultActivityGenerator.java Mon Aug 4 11:44:19 2008
@@ -20,10 +20,10 @@
import org.apache.ode.bpel.compiler.api.CompilerContext;
import org.apache.ode.bpel.compiler.bom.BpelObject;
-import org.apache.ode.bpel.compiler.bom.ExtensibilityQNames;
import org.apache.ode.bpel.compiler.bom.FailureHandling;
-import org.apache.ode.bpel.o.OActivity;
-import org.apache.ode.bpel.o.OFailureHandling;
+import org.apache.ode.bpel.rtrep.v2.OActivity;
+import org.apache.ode.bpel.rtrep.v2.OFailureHandling;
+import org.apache.ode.bpel.rtrep.common.extension.ExtensibilityQNames;
import org.w3c.dom.Element;
/**
Modified: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/EmptyGenerator.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/EmptyGenerator.java?rev=682457&r1=682456&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/EmptyGenerator.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/EmptyGenerator.java Mon Aug 4 11:44:19 2008
@@ -19,8 +19,8 @@
package org.apache.ode.bpel.compiler;
import org.apache.ode.bpel.compiler.bom.Activity;
-import org.apache.ode.bpel.o.OActivity;
-import org.apache.ode.bpel.o.OEmpty;
+import org.apache.ode.bpel.rtrep.v2.OActivity;
+import org.apache.ode.bpel.rtrep.v2.OEmpty;
/**
* Generates code for <code><empty></code> activities.
Modified: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/ExtensionActivtityGenerator.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/ExtensionActivtityGenerator.java?rev=682457&r1=682456&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/ExtensionActivtityGenerator.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/ExtensionActivtityGenerator.java Mon Aug 4 11:44:19 2008
@@ -23,8 +23,8 @@
import org.apache.ode.bpel.compiler.bom.Activity;
import org.apache.ode.bpel.compiler.bom.CompositeActivity;
import org.apache.ode.bpel.compiler.bom.ExtensionActivity;
-import org.apache.ode.bpel.o.OActivity;
-import org.apache.ode.bpel.o.OExtensionActivity;
+import org.apache.ode.bpel.rtrep.v2.OActivity;
+import org.apache.ode.bpel.rtrep.v2.OExtensionActivity;
import org.apache.ode.utils.DOMUtils;
import org.apache.ode.utils.SerializableElement;
import org.apache.ode.utils.msg.MessageBundle;
Modified: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/FlowGenerator.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/FlowGenerator.java?rev=682457&r1=682456&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/FlowGenerator.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/FlowGenerator.java Mon Aug 4 11:44:19 2008
@@ -23,9 +23,9 @@
import org.apache.ode.bpel.compiler.bom.CompositeActivity;
import org.apache.ode.bpel.compiler.bom.FlowActivity;
import org.apache.ode.bpel.compiler.bom.Link;
-import org.apache.ode.bpel.o.OActivity;
-import org.apache.ode.bpel.o.OFlow;
-import org.apache.ode.bpel.o.OLink;
+import org.apache.ode.bpel.rtrep.v2.OActivity;
+import org.apache.ode.bpel.rtrep.v2.OFlow;
+import org.apache.ode.bpel.rtrep.v2.OLink;
import org.apache.ode.utils.msg.MessageBundle;
import org.apache.ode.utils.stl.CollectionsX;
import org.apache.ode.utils.stl.MemberOfFunction;
Modified: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/ForEachGenerator.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/ForEachGenerator.java?rev=682457&r1=682456&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/ForEachGenerator.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/ForEachGenerator.java Mon Aug 4 11:44:19 2008
@@ -28,10 +28,10 @@
import org.apache.ode.bpel.compiler.bom.Activity;
import org.apache.ode.bpel.compiler.bom.ForEachActivity;
import org.apache.ode.bpel.compiler.bom.Scope;
-import org.apache.ode.bpel.o.OActivity;
-import org.apache.ode.bpel.o.OForEach;
-import org.apache.ode.bpel.o.OScope;
-import org.apache.ode.bpel.o.OXsdTypeVarType;
+import org.apache.ode.bpel.rtrep.v2.OActivity;
+import org.apache.ode.bpel.rtrep.v2.OForEach;
+import org.apache.ode.bpel.rtrep.v2.OScope;
+import org.apache.ode.bpel.rtrep.v2.OXsdTypeVarType;
import org.apache.ode.utils.msg.MessageBundle;
import org.apache.ode.utils.Namespaces;
Modified: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/IfGenerator.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/IfGenerator.java?rev=682457&r1=682456&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/IfGenerator.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/IfGenerator.java Mon Aug 4 11:44:19 2008
@@ -24,8 +24,8 @@
import org.apache.ode.bpel.compiler.api.CompilationException;
import org.apache.ode.bpel.compiler.bom.Activity;
import org.apache.ode.bpel.compiler.bom.IfActivity;
-import org.apache.ode.bpel.o.OActivity;
-import org.apache.ode.bpel.o.OSwitch;
+import org.apache.ode.bpel.rtrep.v2.OActivity;
+import org.apache.ode.bpel.rtrep.v2.OSwitch;
import org.apache.ode.utils.msg.MessageBundle;
Modified: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/InvokeGenerator.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/InvokeGenerator.java?rev=682457&r1=682456&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/InvokeGenerator.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/InvokeGenerator.java Mon Aug 4 11:44:19 2008
@@ -23,10 +23,10 @@
import org.apache.ode.bpel.compiler.bom.Activity;
import org.apache.ode.bpel.compiler.bom.Correlation;
import org.apache.ode.bpel.compiler.bom.InvokeActivity;
-import org.apache.ode.bpel.o.OActivity;
-import org.apache.ode.bpel.o.OInvoke;
-import org.apache.ode.bpel.o.OProcess;
-import org.apache.ode.bpel.o.OScope;
+import org.apache.ode.bpel.rtrep.v2.OActivity;
+import org.apache.ode.bpel.rtrep.v2.OInvoke;
+import org.apache.ode.bpel.rtrep.v2.OProcess;
+import org.apache.ode.bpel.rtrep.v2.OScope;
import org.apache.ode.utils.msg.MessageBundle;
import org.apache.ode.utils.stl.CollectionsX;
import org.apache.ode.utils.stl.MemberOfFunction;
Modified: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/PickGenerator.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/PickGenerator.java?rev=682457&r1=682456&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/PickGenerator.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/PickGenerator.java Mon Aug 4 11:44:19 2008
@@ -23,8 +23,8 @@
import org.apache.ode.bpel.compiler.bom.OnAlarm;
import org.apache.ode.bpel.compiler.bom.OnMessage;
import org.apache.ode.bpel.compiler.bom.PickActivity;
-import org.apache.ode.bpel.o.OActivity;
-import org.apache.ode.bpel.o.OPickReceive;
+import org.apache.ode.bpel.rtrep.v2.OActivity;
+import org.apache.ode.bpel.rtrep.v2.OPickReceive;
/**
Modified: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/PickReceiveGenerator.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/PickReceiveGenerator.java?rev=682457&r1=682456&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/PickReceiveGenerator.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/PickReceiveGenerator.java Mon Aug 4 11:44:19 2008
@@ -21,10 +21,10 @@
import org.apache.ode.bpel.compiler.api.CompilationException;
import org.apache.ode.bpel.compiler.bom.Activity;
import org.apache.ode.bpel.compiler.bom.Correlation;
-import org.apache.ode.bpel.o.OActivity;
-import org.apache.ode.bpel.o.OPickReceive;
-import org.apache.ode.bpel.o.OProcess;
-import org.apache.ode.bpel.o.OScope;
+import org.apache.ode.bpel.rtrep.v2.OActivity;
+import org.apache.ode.bpel.rtrep.v2.OPickReceive;
+import org.apache.ode.bpel.rtrep.v2.OProcess;
+import org.apache.ode.bpel.rtrep.v2.OScope;
import org.apache.ode.utils.msg.MessageBundle;
import javax.xml.namespace.QName;
@@ -33,7 +33,7 @@
/**
* Base class for the {@link PickGenerator} and {@link ReceiveGenerator}
* classes. Provides common functionality related to generating
- * {@link org.apache.ode.bpel.o.OPickReceive.OnMessage} objects.
+ * {@link org.apache.ode.bpel.rtrep.v2.OPickReceive.OnMessage} objects.
*/
abstract class PickReceiveGenerator extends DefaultActivityGenerator {
protected static final CommonCompilationMessages __cmsgsGeneral = MessageBundle
Modified: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/ReceiveGenerator.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/ReceiveGenerator.java?rev=682457&r1=682456&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/ReceiveGenerator.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/ReceiveGenerator.java Mon Aug 4 11:44:19 2008
@@ -20,9 +20,9 @@
import org.apache.ode.bpel.compiler.bom.Activity;
import org.apache.ode.bpel.compiler.bom.ReceiveActivity;
-import org.apache.ode.bpel.o.OActivity;
-import org.apache.ode.bpel.o.OEmpty;
-import org.apache.ode.bpel.o.OPickReceive;
+import org.apache.ode.bpel.rtrep.v2.OActivity;
+import org.apache.ode.bpel.rtrep.v2.OEmpty;
+import org.apache.ode.bpel.rtrep.v2.OPickReceive;
class ReceiveGenerator extends PickReceiveGenerator {
Modified: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/RepeatUntilGenerator.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/RepeatUntilGenerator.java?rev=682457&r1=682456&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/RepeatUntilGenerator.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/RepeatUntilGenerator.java Mon Aug 4 11:44:19 2008
@@ -20,8 +20,8 @@
import org.apache.ode.bpel.compiler.bom.Activity;
import org.apache.ode.bpel.compiler.bom.RepeatUntilActivity;
-import org.apache.ode.bpel.o.OActivity;
-import org.apache.ode.bpel.o.ORepeatUntil;
+import org.apache.ode.bpel.rtrep.v2.OActivity;
+import org.apache.ode.bpel.rtrep.v2.ORepeatUntil;
/**
* Generates code for <code><while></code> activities.
Modified: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/ReplyGenerator.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/ReplyGenerator.java?rev=682457&r1=682456&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/ReplyGenerator.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/ReplyGenerator.java Mon Aug 4 11:44:19 2008
@@ -21,11 +21,11 @@
import org.apache.ode.bpel.compiler.api.CompilationException;
import org.apache.ode.bpel.compiler.bom.Activity;
import org.apache.ode.bpel.compiler.bom.Correlation;
-import org.apache.ode.bpel.o.OActivity;
-import org.apache.ode.bpel.o.OMessageVarType;
-import org.apache.ode.bpel.o.OProcess;
-import org.apache.ode.bpel.o.OReply;
-import org.apache.ode.bpel.o.OScope;
+import org.apache.ode.bpel.rtrep.v2.OActivity;
+import org.apache.ode.bpel.rtrep.v2.OMessageVarType;
+import org.apache.ode.bpel.rtrep.v2.OProcess;
+import org.apache.ode.bpel.rtrep.v2.OReply;
+import org.apache.ode.bpel.rtrep.v2.OScope;
import org.apache.ode.utils.msg.MessageBundle;
import javax.wsdl.Fault;
Modified: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/RethrowGenerator.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/RethrowGenerator.java?rev=682457&r1=682456&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/RethrowGenerator.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/RethrowGenerator.java Mon Aug 4 11:44:19 2008
@@ -19,8 +19,8 @@
package org.apache.ode.bpel.compiler;
import org.apache.ode.bpel.compiler.bom.Activity;
-import org.apache.ode.bpel.o.OActivity;
-import org.apache.ode.bpel.o.ORethrow;
+import org.apache.ode.bpel.rtrep.v2.OActivity;
+import org.apache.ode.bpel.rtrep.v2.ORethrow;
class RethrowGenerator extends DefaultActivityGenerator {
Modified: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/SequenceGenerator.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/SequenceGenerator.java?rev=682457&r1=682456&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/SequenceGenerator.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/SequenceGenerator.java Mon Aug 4 11:44:19 2008
@@ -22,8 +22,8 @@
import org.apache.ode.bpel.compiler.bom.Activity;
import org.apache.ode.bpel.compiler.bom.CompositeActivity;
import org.apache.ode.bpel.compiler.bom.SequenceActivity;
-import org.apache.ode.bpel.o.OActivity;
-import org.apache.ode.bpel.o.OSequence;
+import org.apache.ode.bpel.rtrep.v2.OActivity;
+import org.apache.ode.bpel.rtrep.v2.OSequence;
import org.apache.ode.utils.msg.MessageBundle;
Modified: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/SwitchGenerator.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/SwitchGenerator.java?rev=682457&r1=682456&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/SwitchGenerator.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/SwitchGenerator.java Mon Aug 4 11:44:19 2008
@@ -20,8 +20,8 @@
import org.apache.ode.bpel.compiler.bom.Activity;
import org.apache.ode.bpel.compiler.bom.SwitchActivity;
-import org.apache.ode.bpel.o.OActivity;
-import org.apache.ode.bpel.o.OSwitch;
+import org.apache.ode.bpel.rtrep.v2.OActivity;
+import org.apache.ode.bpel.rtrep.v2.OSwitch;
/**
* Generator for legacy BPEL 1.1 <code><switch></code> actiivty.
Modified: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/TerminateGenerator.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/TerminateGenerator.java?rev=682457&r1=682456&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/TerminateGenerator.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/TerminateGenerator.java Mon Aug 4 11:44:19 2008
@@ -19,8 +19,8 @@
package org.apache.ode.bpel.compiler;
import org.apache.ode.bpel.compiler.bom.Activity;
-import org.apache.ode.bpel.o.OActivity;
-import org.apache.ode.bpel.o.OTerminate;
+import org.apache.ode.bpel.rtrep.v2.OActivity;
+import org.apache.ode.bpel.rtrep.v2.OTerminate;
/**
Modified: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/ThrowGenerator.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/ThrowGenerator.java?rev=682457&r1=682456&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/ThrowGenerator.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/ThrowGenerator.java Mon Aug 4 11:44:19 2008
@@ -20,8 +20,8 @@
import org.apache.ode.bpel.compiler.bom.Activity;
import org.apache.ode.bpel.compiler.bom.ThrowActivity;
-import org.apache.ode.bpel.o.OActivity;
-import org.apache.ode.bpel.o.OThrow;
+import org.apache.ode.bpel.rtrep.v2.OActivity;
+import org.apache.ode.bpel.rtrep.v2.OThrow;
/**
Modified: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WaitGenerator.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WaitGenerator.java?rev=682457&r1=682456&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WaitGenerator.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WaitGenerator.java Mon Aug 4 11:44:19 2008
@@ -22,8 +22,8 @@
import org.apache.ode.bpel.compiler.api.CompilationException;
import org.apache.ode.bpel.compiler.bom.Activity;
import org.apache.ode.bpel.compiler.bom.WaitActivity;
-import org.apache.ode.bpel.o.OActivity;
-import org.apache.ode.bpel.o.OWait;
+import org.apache.ode.bpel.rtrep.v2.OActivity;
+import org.apache.ode.bpel.rtrep.v2.OWait;
import org.apache.ode.utils.msg.MessageBundle;
/**
Modified: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WhileGenerator.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WhileGenerator.java?rev=682457&r1=682456&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WhileGenerator.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/WhileGenerator.java Mon Aug 4 11:44:19 2008
@@ -20,8 +20,8 @@
import org.apache.ode.bpel.compiler.bom.Activity;
import org.apache.ode.bpel.compiler.bom.WhileActivity;
-import org.apache.ode.bpel.o.OActivity;
-import org.apache.ode.bpel.o.OWhile;
+import org.apache.ode.bpel.rtrep.v2.OActivity;
+import org.apache.ode.bpel.rtrep.v2.OWhile;
/**
Modified: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/api/CompilerContext.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/api/CompilerContext.java?rev=682457&r1=682456&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/api/CompilerContext.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/api/CompilerContext.java Mon Aug 4 11:44:19 2008
@@ -27,17 +27,17 @@
import org.apache.ode.bpel.compiler.bom.Activity;
import org.apache.ode.bpel.compiler.bom.Expression;
import org.apache.ode.bpel.compiler.bom.ScopeLikeActivity;
-import org.apache.ode.bpel.o.OActivity;
-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.OPartnerLink;
-import org.apache.ode.bpel.o.OProcess;
-import org.apache.ode.bpel.o.OScope;
-import org.apache.ode.bpel.o.OXsdTypeVarType;
-import org.apache.ode.bpel.o.OXslSheet;
-import org.apache.ode.bpel.o.OScope.Variable;
+import org.apache.ode.bpel.rtrep.v2.OActivity;
+import org.apache.ode.bpel.rtrep.v2.OExpression;
+import org.apache.ode.bpel.rtrep.v2.OLValueExpression;
+import org.apache.ode.bpel.rtrep.v2.OLink;
+import org.apache.ode.bpel.rtrep.v2.OMessageVarType;
+import org.apache.ode.bpel.rtrep.v2.OPartnerLink;
+import org.apache.ode.bpel.rtrep.v2.OProcess;
+import org.apache.ode.bpel.rtrep.v2.OScope;
+import org.apache.ode.bpel.rtrep.v2.OXsdTypeVarType;
+import org.apache.ode.bpel.rtrep.v2.OXslSheet;
+import org.apache.ode.bpel.rtrep.v2.OScope.Variable;
import org.apache.ode.utils.NSContext;
Modified: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/api/ExpressionCompiler.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/api/ExpressionCompiler.java?rev=682457&r1=682456&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/api/ExpressionCompiler.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/api/ExpressionCompiler.java Mon Aug 4 11:44:19 2008
@@ -18,8 +18,8 @@
*/
package org.apache.ode.bpel.compiler.api;
-import org.apache.ode.bpel.o.OExpression;
-import org.apache.ode.bpel.o.OLValueExpression;
+import org.apache.ode.bpel.rtrep.v2.OExpression;
+import org.apache.ode.bpel.rtrep.v2.OLValueExpression;
import java.util.Map;
@@ -35,7 +35,7 @@
void setCompilerContext(CompilerContext compilerContext);
/**
- * Compile an expression into a {@link org.apache.ode.bpel.o.OExpression} object.
+ * Compile an expression into a {@link org.apache.ode.bpel.rtrep.v2.OExpression} object.
* @param source
* @return
*/
@@ -43,7 +43,7 @@
throws CompilationException;
/**
- * Compile an lvalue (the 'to' of an assignment) into a {@link org.apache.ode.bpel.o.OLValueExpression} object.
+ * Compile an lvalue (the 'to' of an assignment) into a {@link org.apache.ode.bpel.rtrep.v2.OLValueExpression} object.
* @param source
* @return
* @throws CompilationException
@@ -52,7 +52,7 @@
throws CompilationException;
/**
- * Compile a join condition into a {@link org.apache.ode.bpel.o.OExpression} object.
+ * Compile a join condition into a {@link org.apache.ode.bpel.rtrep.v2.OExpression} object.
* @param source
* @return
*/
Modified: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/BpelObjectFactory.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/BpelObjectFactory.java?rev=682457&r1=682456&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/BpelObjectFactory.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/BpelObjectFactory.java Mon Aug 4 11:44:19 2008
@@ -21,6 +21,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ode.bpel.compiler.bom.IfActivity.Case;
+import org.apache.ode.bpel.rtrep.common.extension.ExtensibilityQNames;
import org.apache.ode.utils.DOMUtils;
import org.apache.ode.utils.XMLParserUtils;
import org.w3c.dom.Document;
Modified: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/Variable.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/Variable.java?rev=682457&r1=682456&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/Variable.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/bom/Variable.java Mon Aug 4 11:44:19 2008
@@ -21,6 +21,7 @@
import javax.xml.namespace.QName;
import org.w3c.dom.Element;
+import org.apache.ode.bpel.rtrep.common.extension.ExtensibilityQNames;
/**
* BPEL Variable declaration.
Modified: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/JaxenBpelHandler.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/JaxenBpelHandler.java?rev=682457&r1=682456&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/JaxenBpelHandler.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/JaxenBpelHandler.java Mon Aug 4 11:44:19 2008
@@ -24,14 +24,14 @@
import org.apache.ode.bpel.compiler.api.CompilationException;
import org.apache.ode.bpel.compiler.api.CompilerContext;
-import org.apache.ode.bpel.elang.xpath10.o.OXPath10Expression;
-import org.apache.ode.bpel.elang.xpath10.o.OXPath10ExpressionBPEL20;
-import org.apache.ode.bpel.o.OExpression;
-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.OXslSheet;
+import org.apache.ode.bpel.rtrep.v2.OExpression;
+import org.apache.ode.bpel.rtrep.v2.OLink;
+import org.apache.ode.bpel.rtrep.v2.OMessageVarType;
+import org.apache.ode.bpel.rtrep.v2.OProcess;
+import org.apache.ode.bpel.rtrep.v2.OScope;
+import org.apache.ode.bpel.rtrep.v2.OXslSheet;
+import org.apache.ode.bpel.rtrep.v2.xpath10.OXPath10ExpressionBPEL20;
+import org.apache.ode.bpel.rtrep.v2.xpath10.OXPath10Expression;
import org.apache.ode.utils.NSContext;
import org.apache.ode.utils.msg.MessageBundle;
import org.apache.ode.utils.xsl.XslTransformHandler;
Modified: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPath10ExpressionCompilerBPEL11.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPath10ExpressionCompilerBPEL11.java?rev=682457&r1=682456&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPath10ExpressionCompilerBPEL11.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPath10ExpressionCompilerBPEL11.java Mon Aug 4 11:44:19 2008
@@ -20,9 +20,9 @@
import org.apache.ode.bpel.compiler.api.CompilationException;
import org.apache.ode.bpel.compiler.bom.Expression;
-import org.apache.ode.bpel.elang.xpath10.o.OXPath10Expression;
-import org.apache.ode.bpel.o.OExpression;
-import org.apache.ode.bpel.o.OLValueExpression;
+import org.apache.ode.bpel.rtrep.v2.xpath10.OXPath10Expression;
+import org.apache.ode.bpel.rtrep.v2.OExpression;
+import org.apache.ode.bpel.rtrep.v2.OLValueExpression;
import org.apache.ode.utils.Namespaces;
/**
Modified: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPath10ExpressionCompilerBPEL20.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPath10ExpressionCompilerBPEL20.java?rev=682457&r1=682456&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPath10ExpressionCompilerBPEL20.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPath10ExpressionCompilerBPEL20.java Mon Aug 4 11:44:19 2008
@@ -21,10 +21,10 @@
import org.apache.ode.bpel.compiler.api.CompilationException;
import org.apache.ode.bpel.compiler.api.CompilerContext;
import org.apache.ode.bpel.compiler.bom.Expression;
-import org.apache.ode.bpel.elang.xpath10.o.OXPath10Expression;
-import org.apache.ode.bpel.elang.xpath10.o.OXPath10ExpressionBPEL20;
-import org.apache.ode.bpel.o.OExpression;
-import org.apache.ode.bpel.o.OLValueExpression;
+import org.apache.ode.bpel.rtrep.v2.xpath10.OXPath10Expression;
+import org.apache.ode.bpel.rtrep.v2.xpath10.OXPath10ExpressionBPEL20;
+import org.apache.ode.bpel.rtrep.v2.OExpression;
+import org.apache.ode.bpel.rtrep.v2.OLValueExpression;
import org.apache.ode.utils.Namespaces;
import org.apache.ode.utils.xsl.XslTransformHandler;
Modified: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPath10ExpressionCompilerImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPath10ExpressionCompilerImpl.java?rev=682457&r1=682456&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPath10ExpressionCompilerImpl.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPath10ExpressionCompilerImpl.java Mon Aug 4 11:44:19 2008
@@ -27,7 +27,7 @@
import org.apache.ode.bpel.compiler.api.CompilerContext;
import org.apache.ode.bpel.compiler.api.ExpressionCompiler;
import org.apache.ode.bpel.compiler.bom.Expression;
-import org.apache.ode.bpel.elang.xpath10.o.OXPath10Expression;
+import org.apache.ode.bpel.rtrep.v2.xpath10.OXPath10Expression;
import org.apache.ode.utils.msg.MessageBundle;
import org.jaxen.saxpath.SAXPathException;
import org.jaxen.saxpath.XPathReader;
Modified: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XslCompileUriResolver.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XslCompileUriResolver.java?rev=682457&r1=682456&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XslCompileUriResolver.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XslCompileUriResolver.java Mon Aug 4 11:44:19 2008
@@ -20,8 +20,8 @@
package org.apache.ode.bpel.elang.xpath10.compiler;
import org.apache.ode.bpel.compiler.api.CompilerContext;
-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 javax.xml.transform.URIResolver;
import javax.xml.transform.Source;
Modified: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/JaxpFunctionResolver.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/JaxpFunctionResolver.java?rev=682457&r1=682456&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/JaxpFunctionResolver.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/JaxpFunctionResolver.java Mon Aug 4 11:44:19 2008
@@ -23,10 +23,11 @@
import org.apache.ode.bpel.compiler.api.CompilerContext;
import org.apache.ode.bpel.elang.xpath10.compiler.XPathMessages;
import org.apache.ode.bpel.elang.xpath10.compiler.XslCompileUriResolver;
-import org.apache.ode.bpel.elang.xpath20.o.OXPath20ExpressionBPEL20;
-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.v2.xpath20.OXPath20ExpressionBPEL20;
+import org.apache.ode.bpel.rtrep.v2.OProcess;
+import org.apache.ode.bpel.rtrep.v2.OScope;
+import org.apache.ode.bpel.rtrep.v2.OXslSheet;
+import org.apache.ode.bpel.rtrep.common.Constants;
import org.apache.ode.utils.NSContext;
import org.apache.ode.utils.Namespaces;
import org.apache.ode.utils.msg.MessageBundle;
Modified: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/JaxpVariableResolver.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/JaxpVariableResolver.java?rev=682457&r1=682456&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/JaxpVariableResolver.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/JaxpVariableResolver.java Mon Aug 4 11:44:19 2008
@@ -22,13 +22,13 @@
import org.apache.ode.bpel.compiler.api.CompilationException;
import org.apache.ode.bpel.compiler.api.CompilerContext;
import org.apache.ode.bpel.elang.xpath10.compiler.XPathMessages;
-import org.apache.ode.bpel.elang.xpath10.o.OXPath10ExpressionBPEL20;
-import org.apache.ode.bpel.o.OElementVarType;
-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.OVarType;
-import org.apache.ode.bpel.o.OXsdTypeVarType;
+import org.apache.ode.bpel.rtrep.v2.xpath10.OXPath10ExpressionBPEL20;
+import org.apache.ode.bpel.rtrep.v2.OElementVarType;
+import org.apache.ode.bpel.rtrep.v2.OLink;
+import org.apache.ode.bpel.rtrep.v2.OMessageVarType;
+import org.apache.ode.bpel.rtrep.v2.OScope;
+import org.apache.ode.bpel.rtrep.v2.OVarType;
+import org.apache.ode.bpel.rtrep.v2.OXsdTypeVarType;
import org.apache.ode.utils.DOMUtils;
import org.apache.ode.utils.Namespaces;
import org.apache.ode.utils.msg.MessageBundle;
Modified: ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerImpl.java?rev=682457&r1=682456&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerImpl.java (original)
+++ ode/branches/rtver/bpel-compiler/src/main/java/org/apache/ode/bpel/elang/xpath20/compiler/XPath20ExpressionCompilerImpl.java Mon Aug 4 11:44:19 2008
@@ -37,9 +37,10 @@
import org.apache.ode.bpel.compiler.bom.Expression;
import org.apache.ode.bpel.elang.xpath10.compiler.XPathMessages;
import org.apache.ode.bpel.elang.xpath10.compiler.XslCompilationErrorListener;
-import org.apache.ode.bpel.elang.xpath20.o.OXPath20ExpressionBPEL20;
-import org.apache.ode.bpel.o.OExpression;
-import org.apache.ode.bpel.o.OLValueExpression;
+import org.apache.ode.bpel.rtrep.v2.xpath20.OXPath20ExpressionBPEL20;
+import org.apache.ode.bpel.rtrep.v2.OExpression;
+import org.apache.ode.bpel.rtrep.v2.OLValueExpression;
+import org.apache.ode.bpel.rtrep.common.Constants;
import org.apache.ode.utils.DOMUtils;
import org.apache.ode.utils.msg.MessageBundle;
import org.apache.ode.utils.xsl.XslTransformHandler;
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/ACTIVITYGUARD.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/ACTIVITYGUARD.java?rev=682457&r1=682456&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/ACTIVITYGUARD.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/ACTIVITYGUARD.java Mon Aug 4 11:44:19 2008
@@ -35,7 +35,7 @@
import org.apache.ode.bpel.rtrep.v2.channels.ActivityRecoveryChannelListener;
import org.apache.ode.bpel.rtrep.v2.channels.TimerResponseChannel;
import org.apache.ode.bpel.rtrep.v2.channels.TimerResponseChannelListener;
-import org.apache.ode.bpel.rtrep.rapi.InvalidProcessException;
+import org.apache.ode.bpel.rapi.InvalidProcessException;
import org.apache.ode.jacob.ChannelListener;
import org.apache.ode.jacob.SynchChannel;
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/BpelJacobRunnable.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/BpelJacobRunnable.java?rev=682457&r1=682456&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/BpelJacobRunnable.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/BpelJacobRunnable.java Mon Aug 4 11:44:19 2008
@@ -23,7 +23,7 @@
import org.apache.ode.bpel.common.CorrelationKey;
import org.apache.ode.bpel.common.FaultException;
import org.apache.ode.bpel.rtrep.v2.channels.FaultData;
-import org.apache.ode.bpel.rtrep.rapi.OdeRTInstanceContext;
+import org.apache.ode.bpel.rapi.OdeRTInstanceContext;
import org.apache.ode.jacob.JacobRunnable;
import org.apache.ode.jacob.vpu.JacobVPU;
import org.w3c.dom.Element;
@@ -62,7 +62,6 @@
protected final FaultData createFault(QName fault, OBase location){
return createFault(fault, location, null);
}
-
protected JacobRunnable createChild(ActivityInfo childInfo, ScopeFrame scopeFrame, LinkFrame linkFrame) {
return new ACTIVITYGUARD(childInfo, scopeFrame, linkFrame);
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/CorrelationSetInstance.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/CorrelationSetInstance.java?rev=682457&r1=682456&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/CorrelationSetInstance.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/CorrelationSetInstance.java Mon Aug 4 11:44:19 2008
@@ -18,7 +18,7 @@
*/
package org.apache.ode.bpel.rtrep.v2;
-import org.apache.ode.bpel.rtrep.rapi.CorrelationSet;
+import org.apache.ode.bpel.rapi.CorrelationSet;
public class CorrelationSetInstance implements CorrelationSet {
public OScope.CorrelationSet declaration;
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/EH_EVENT.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/EH_EVENT.java?rev=682457&r1=682456&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/EH_EVENT.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/EH_EVENT.java Mon Aug 4 11:44:19 2008
@@ -34,7 +34,7 @@
import org.apache.ode.bpel.rtrep.v2.channels.PickResponseChannelListener;
import org.apache.ode.bpel.rtrep.v2.channels.TerminationChannel;
import org.apache.ode.bpel.rtrep.v2.channels.TerminationChannelListener;
-import org.apache.ode.bpel.rtrep.rapi.InvalidProcessException;
+import org.apache.ode.bpel.rapi.InvalidProcessException;
import org.apache.ode.bpel.evt.VariableModificationEvent;
import org.apache.ode.jacob.ChannelListener;
import org.apache.ode.jacob.SynchChannel;
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OPartnerLink.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OPartnerLink.java?rev=682457&r1=682456&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OPartnerLink.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OPartnerLink.java Mon Aug 4 11:44:19 2008
@@ -18,8 +18,8 @@
*/
package org.apache.ode.bpel.rtrep.v2;
-import org.apache.ode.bpel.rtrep.rapi.PartnerLinkModel;
-import org.apache.ode.bpel.rtrep.rapi.CorrelationSetModel;
+import org.apache.ode.bpel.rapi.PartnerLinkModel;
+import org.apache.ode.bpel.rapi.CorrelationSetModel;
import javax.wsdl.Operation;
import javax.wsdl.PortType;
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OProcess.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OProcess.java?rev=682457&r1=682456&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OProcess.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OProcess.java Mon Aug 4 11:44:19 2008
@@ -18,8 +18,9 @@
*/
package org.apache.ode.bpel.rtrep.v2;
-import org.apache.ode.bpel.rtrep.rapi.ProcessModel;
-import org.apache.ode.bpel.rtrep.rapi.PartnerLinkModel;
+import org.apache.ode.bpel.rapi.ProcessModel;
+import org.apache.ode.bpel.rapi.PartnerLinkModel;
+import org.apache.ode.bpel.rapi.PropertyAliasModel;
import javax.wsdl.Operation;
import javax.xml.namespace.QName;
@@ -170,7 +171,7 @@
}
}
- public static class OPropertyAlias extends OBase {
+ public static class OPropertyAlias extends OBase implements PropertyAliasModel {
static final long serialVersionUID = -1L ;
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OScope.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OScope.java?rev=682457&r1=682456&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OScope.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OScope.java Mon Aug 4 11:44:19 2008
@@ -19,6 +19,10 @@
package org.apache.ode.bpel.rtrep.v2;
+import org.apache.ode.bpel.rapi.CorrelationSetModel;
+import org.apache.ode.bpel.rapi.PropertyAliasModel;
+
+import javax.xml.namespace.QName;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -151,13 +155,12 @@
return "{OScope '" + name + "' id=" + getId() + "}";
}
- public static final class CorrelationSet extends OBase {
+ public static final class CorrelationSet extends OBase implements CorrelationSetModel {
static final long serialVersionUID = -1L ;
public String name;
public OScope declaringScope;
- public final List<OProcess.OProperty>properties = new ArrayList<OProcess.OProperty>();
-
+ public final List<OProcess.OProperty> properties = new ArrayList<OProcess.OProperty>();
public CorrelationSet(OProcess owner) {
super(owner);
@@ -166,6 +169,20 @@
public String toString() {
return "{CSet " + name + " " + properties + "}";
}
+
+ public Set<PropertyAliasModel> getAliases(QName messageName) {
+ HashSet<PropertyAliasModel> aliases = new HashSet<PropertyAliasModel>();
+ OVarType messageType = getOwner().messageTypes.get(messageName);
+ for (Object prop : properties) {
+ OProcess.OProperty property = (OProcess.OProperty) prop;
+ OProcess.OPropertyAlias alias = property.getAlias(messageType);
+ if (alias == null)
+ throw new IllegalArgumentException("No alias found for property " + property.name +
+ " and message " + messageName + ", should have been caught at compilation.");
+ aliases.add(alias);
+ }
+ return aliases;
+ }
}
public static final class Variable extends OBase {
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/PICK.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/PICK.java?rev=682457&r1=682456&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/PICK.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/PICK.java Mon Aug 4 11:44:19 2008
@@ -33,7 +33,7 @@
import org.apache.ode.bpel.rtrep.v2.channels.PickResponseChannel;
import org.apache.ode.bpel.rtrep.v2.channels.PickResponseChannelListener;
import org.apache.ode.bpel.rtrep.v2.channels.TerminationChannelListener;
-import org.apache.ode.bpel.rtrep.rapi.InvalidProcessException;
+import org.apache.ode.bpel.rapi.InvalidProcessException;
import org.apache.ode.utils.DOMUtils;
import org.apache.ode.utils.xsd.Duration;
import org.apache.ode.bpel.evar.ExternalVariableModuleException;
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/PartnerLinkInstance.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/PartnerLinkInstance.java?rev=682457&r1=682456&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/PartnerLinkInstance.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/PartnerLinkInstance.java Mon Aug 4 11:44:19 2008
@@ -18,8 +18,8 @@
*/
package org.apache.ode.bpel.rtrep.v2;
-import org.apache.ode.bpel.rtrep.rapi.PartnerLink;
-import org.apache.ode.bpel.rtrep.rapi.PartnerLinkModel;
+import org.apache.ode.bpel.rapi.PartnerLink;
+import org.apache.ode.bpel.rapi.PartnerLinkModel;
import org.apache.ode.utils.ObjectPrinter;
import java.io.Serializable;
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/PropertyAliasEvaluationContext.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/PropertyAliasEvaluationContext.java?rev=682457&r1=682456&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/PropertyAliasEvaluationContext.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/PropertyAliasEvaluationContext.java Mon Aug 4 11:44:19 2008
@@ -21,7 +21,7 @@
import java.net.URI;
import org.apache.ode.bpel.common.FaultException;
-import org.apache.ode.bpel.rtrep.rapi.InvalidProcessException;
+import org.apache.ode.bpel.rapi.InvalidProcessException;
import org.apache.ode.utils.DOMUtils;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/RETHROW.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/RETHROW.java?rev=682457&r1=682456&r2=682457&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/RETHROW.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/RETHROW.java Mon Aug 4 11:44:19 2008
@@ -21,7 +21,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ode.bpel.rtrep.v2.channels.FaultData;
-import org.apache.ode.bpel.rtrep.rapi.InvalidProcessException;
+import org.apache.ode.bpel.rapi.InvalidProcessException;
/**