Modified: ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerRoleMessageExchangeImpl.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerRoleMessageExchangeImpl.java?rev=683777&r1=683776&r2=683777&view=diff ============================================================================== --- ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerRoleMessageExchangeImpl.java (original) +++ ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerRoleMessageExchangeImpl.java Thu Aug 7 17:42:36 2008 @@ -38,7 +38,7 @@ import org.apache.ode.bpel.iapi.MessageExchangeContext; import org.apache.ode.bpel.iapi.PartnerRoleChannel; import org.apache.ode.bpel.iapi.PartnerRoleMessageExchange; -import org.apache.ode.bpel.o.OPartnerLink; +import org.apache.ode.bpel.rapi.PartnerLinkModel; import org.w3c.dom.Element; /** @@ -78,9 +78,9 @@ protected State _state = State.INVOKE_XXX; - PartnerRoleMessageExchangeImpl(ODEProcess process, Long iid, String mexId, OPartnerLink oplink, Operation operation, + PartnerRoleMessageExchangeImpl(ODEProcess process, Long iid, String mexId, PartnerLinkModel oplink, Operation operation, EndpointReference epr, EndpointReference myRoleEPR, PartnerRoleChannel channel) { - super(process, iid, mexId, oplink, oplink.partnerRolePortType, operation); + super(process, iid, mexId, oplink, oplink.getPartnerRolePortType(), operation); _myRoleEPR = myRoleEPR; _partnerRoleChannel = channel; }
Modified: ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessAndInstanceManagementImpl.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessAndInstanceManagementImpl.java?rev=683777&r1=683776&r2=683777&view=diff ============================================================================== --- ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessAndInstanceManagementImpl.java (original) +++ ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessAndInstanceManagementImpl.java Thu Aug 7 17:42:36 2008 @@ -61,9 +61,6 @@ import org.apache.ode.bpel.iapi.ProcessConf; import org.apache.ode.bpel.iapi.ProcessState; import org.apache.ode.bpel.iapi.ProcessStore; -import org.apache.ode.bpel.o.OBase; -import org.apache.ode.bpel.o.OPartnerLink; -import org.apache.ode.bpel.o.OProcess; import org.apache.ode.bpel.pmapi.ActivityExtInfoListDocument; import org.apache.ode.bpel.pmapi.ActivityInfoDocument; import org.apache.ode.bpel.pmapi.EventInfoListDocument; @@ -106,6 +103,9 @@ import org.apache.ode.bpel.pmapi.TVariableInfo; import org.apache.ode.bpel.pmapi.TVariableRef; import org.apache.ode.bpel.pmapi.VariableInfoDocument; +import org.apache.ode.bpel.rapi.ProcessModel; +import org.apache.ode.bpel.rapi.PartnerLinkModel; +import org.apache.ode.bpel.rapi.ActivityModel; import org.apache.ode.utils.ISO8601DateParser; import org.apache.ode.utils.msg.MessageBundle; import org.apache.ode.utils.stl.CollectionsX; @@ -481,14 +481,14 @@ public ActivityExtInfoListDocument getExtensibilityElements(QName pid, Integer[] aids) { ActivityExtInfoListDocument aeild = ActivityExtInfoListDocument.Factory.newInstance(); TActivitytExtInfoList taeil = aeild.addNewActivityExtInfoList(); - OProcess oprocess = _server.getOProcess(pid); - if (oprocess == null) + ProcessModel pmodel = _server.getProcessModel(pid); + if (pmodel == null) throw new ProcessNotFoundException("The process \"" + pid + "\" does not exist."); for (int aid : aids) { - OBase obase = oprocess.getChild(aid); - if (obase != null && obase.debugInfo != null && obase.debugInfo.extensibilityElements != null) { - for (Map.Entry<QName, Object> entry : obase.debugInfo.extensibilityElements.entrySet()) { + ActivityModel amodel = pmodel.getChild(aid); + if (amodel != null && amodel.getExtensibilityElements() != null) { + for (Map.Entry<QName, Object> entry : amodel.getExtensibilityElements().entrySet()) { TActivityExtInfo taei = taeil.addNewActivityExtInfo(); taei.setAiid("" + aid); Object extValue = entry.getValue(); @@ -753,14 +753,12 @@ } TEndpointReferences eprs = info.addNewEndpoints(); - OProcess oprocess = _server.getOProcess(pconf.getProcessId()); - if (custom.includeEndpoints() && oprocess != null) { - for (OPartnerLink oplink : oprocess.getAllPartnerLinks()) { - if (oplink.hasPartnerRole() && oplink.initializePartnerRole) { + ProcessModel pmodel = _server.getProcessModel(pconf.getProcessId()); + if (custom.includeEndpoints() && pmodel != null) { + for (PartnerLinkModel oplink : pmodel.getAllPartnerLinks()) { + if (oplink.hasPartnerRole() && oplink.isInitializePartnerRoleSet()) { // TODO: this is very uncool. - EndpointReference pepr = _server.getBpelProcess(pconf.getProcessId()) - .getInitialPartnerRoleEPR(oplink); - + EndpointReference pepr = _server.getBpelProcess(pconf.getProcessId()).getInitialPartnerRoleEPR(oplink); if (pepr != null) { TEndpointReferences.EndpointRef epr = eprs.addNewEndpointRef(); Document eprNodeDoc = epr.getDomNode().getOwnerDocument(); Modified: ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ReliableMyRoleMessageExchangeImpl.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ReliableMyRoleMessageExchangeImpl.java?rev=683777&r1=683776&r2=683777&view=diff ============================================================================== --- ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ReliableMyRoleMessageExchangeImpl.java (original) +++ ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ReliableMyRoleMessageExchangeImpl.java Thu Aug 7 17:42:36 2008 @@ -27,7 +27,7 @@ import org.apache.ode.bpel.dao.MessageExchangeDAO; import org.apache.ode.bpel.iapi.InvocationStyle; import org.apache.ode.bpel.iapi.MyRoleMessageExchange; -import org.apache.ode.bpel.o.OPartnerLink; +import org.apache.ode.bpel.rapi.PartnerLinkModel; /** * Provides an implementation of the [EMAIL PROTECTED] MyRoleMessageExchange} inteface for interactions performed in the @@ -40,7 +40,8 @@ private static final Log __log = LogFactory.getLog(ReliableMyRoleMessageExchangeImpl.class); - public ReliableMyRoleMessageExchangeImpl(ODEProcess process, String mexId, OPartnerLink oplink, Operation operation, QName callee) { + public ReliableMyRoleMessageExchangeImpl(ODEProcess process, String mexId, + PartnerLinkModel oplink, Operation operation, QName callee) { super(process, mexId, oplink, operation, callee); } Modified: ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ReliablePartnerRoleMessageExchangeImpl.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ReliablePartnerRoleMessageExchangeImpl.java?rev=683777&r1=683776&r2=683777&view=diff ============================================================================== --- ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ReliablePartnerRoleMessageExchangeImpl.java (original) +++ ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ReliablePartnerRoleMessageExchangeImpl.java Thu Aug 7 17:42:36 2008 @@ -7,11 +7,11 @@ import org.apache.ode.bpel.iapi.EndpointReference; import org.apache.ode.bpel.iapi.InvocationStyle; import org.apache.ode.bpel.iapi.PartnerRoleChannel; -import org.apache.ode.bpel.o.OPartnerLink; +import org.apache.ode.bpel.rapi.PartnerLinkModel; public class ReliablePartnerRoleMessageExchangeImpl extends PartnerRoleMessageExchangeImpl { - public ReliablePartnerRoleMessageExchangeImpl(ODEProcess process, long iid, String mexId, OPartnerLink oplink, Operation op, + public ReliablePartnerRoleMessageExchangeImpl(ODEProcess process, long iid, String mexId, PartnerLinkModel oplink, Operation op, EndpointReference epr, EndpointReference myRoleEPR, PartnerRoleChannel partnerRoleChannel) { super(process, iid, mexId, oplink, op, epr, myRoleEPR, partnerRoleChannel); } Modified: ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/TransactedMyRoleMessageExchangeImpl.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/TransactedMyRoleMessageExchangeImpl.java?rev=683777&r1=683776&r2=683777&view=diff ============================================================================== --- ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/TransactedMyRoleMessageExchangeImpl.java (original) +++ ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/TransactedMyRoleMessageExchangeImpl.java Thu Aug 7 17:42:36 2008 @@ -6,7 +6,7 @@ import org.apache.ode.bpel.dao.MessageExchangeDAO; import org.apache.ode.bpel.iapi.BpelEngineException; import org.apache.ode.bpel.iapi.InvocationStyle; -import org.apache.ode.bpel.o.OPartnerLink; +import org.apache.ode.bpel.rapi.PartnerLinkModel; /** * Transacted my-role message exchange. @@ -17,8 +17,8 @@ */ public class TransactedMyRoleMessageExchangeImpl extends MyRoleMessageExchangeImpl { - public TransactedMyRoleMessageExchangeImpl(ODEProcess process, String mexId, OPartnerLink oplink, Operation operation, QName callee) { - super(process, mexId, oplink, operation, callee); + public TransactedMyRoleMessageExchangeImpl(ODEProcess process, String mexId, PartnerLinkModel mplink, Operation operation, QName callee) { + super(process, mexId, mplink, operation, callee); } @Override Modified: ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/TransactedPartnerRoleMessageExchangeImpl.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/TransactedPartnerRoleMessageExchangeImpl.java?rev=683777&r1=683776&r2=683777&view=diff ============================================================================== --- ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/TransactedPartnerRoleMessageExchangeImpl.java (original) +++ ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/TransactedPartnerRoleMessageExchangeImpl.java Thu Aug 7 17:42:36 2008 @@ -7,7 +7,7 @@ import org.apache.ode.bpel.iapi.InvocationStyle; import org.apache.ode.bpel.iapi.MessageExchangeContext; import org.apache.ode.bpel.iapi.PartnerRoleChannel; -import org.apache.ode.bpel.o.OPartnerLink; +import org.apache.ode.bpel.rapi.PartnerLinkModel; /** @@ -18,7 +18,7 @@ */ public class TransactedPartnerRoleMessageExchangeImpl extends PartnerRoleMessageExchangeImpl { - TransactedPartnerRoleMessageExchangeImpl(ODEProcess process, long iid, String mexId, OPartnerLink oplink,Operation operation, EndpointReference epr, EndpointReference myRoleEPR, PartnerRoleChannel channel) { + TransactedPartnerRoleMessageExchangeImpl(ODEProcess process, long iid, String mexId, PartnerLinkModel oplink,Operation operation, EndpointReference epr, EndpointReference myRoleEPR, PartnerRoleChannel channel) { super(process, iid, mexId, oplink, operation, epr, myRoleEPR, channel); } Modified: ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/UnreliableMyRoleMessageExchangeImpl.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/UnreliableMyRoleMessageExchangeImpl.java?rev=683777&r1=683776&r2=683777&view=diff ============================================================================== --- ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/UnreliableMyRoleMessageExchangeImpl.java (original) +++ ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/UnreliableMyRoleMessageExchangeImpl.java Thu Aug 7 17:42:36 2008 @@ -14,7 +14,7 @@ import org.apache.ode.bpel.dao.MessageExchangeDAO; import org.apache.ode.bpel.iapi.BpelEngineException; import org.apache.ode.bpel.iapi.InvocationStyle; -import org.apache.ode.bpel.o.OPartnerLink; +import org.apache.ode.bpel.rapi.PartnerLinkModel; /** * For invoking the engine using UNRELIABLE style. @@ -29,7 +29,7 @@ ResponseFuture _future; - public UnreliableMyRoleMessageExchangeImpl(ODEProcess process, String mexId, OPartnerLink oplink, Operation operation, + public UnreliableMyRoleMessageExchangeImpl(ODEProcess process, String mexId, PartnerLinkModel oplink, Operation operation, QName callee) { super(process, mexId, oplink, operation, callee); } Modified: ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/UnreliablePartnerRoleMessageExchangeImpl.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/UnreliablePartnerRoleMessageExchangeImpl.java?rev=683777&r1=683776&r2=683777&view=diff ============================================================================== --- ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/UnreliablePartnerRoleMessageExchangeImpl.java (original) +++ ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/UnreliablePartnerRoleMessageExchangeImpl.java Thu Aug 7 17:42:36 2008 @@ -10,7 +10,7 @@ import org.apache.ode.bpel.iapi.InvocationStyle; import org.apache.ode.bpel.iapi.PartnerRoleChannel; import org.apache.ode.bpel.iapi.PartnerRoleMessageExchange; -import org.apache.ode.bpel.o.OPartnerLink; +import org.apache.ode.bpel.rapi.PartnerLinkModel; /** * Implementation of the [EMAIL PROTECTED] PartnerRoleMessageExchange} interface that is passed to the IL when the UNRELIABLE invocation style @@ -24,7 +24,7 @@ private static final Log __log = LogFactory.getLog(UnreliablePartnerRoleMessageExchangeImpl.class); boolean _asyncReply; - UnreliablePartnerRoleMessageExchangeImpl(ODEProcess process, long iid, String mexId, OPartnerLink oplink, Operation operation, + UnreliablePartnerRoleMessageExchangeImpl(ODEProcess process, long iid, String mexId, PartnerLinkModel oplink, Operation operation, EndpointReference epr, EndpointReference myRoleEPR, PartnerRoleChannel channel) { super(process, iid, mexId, oplink, operation, epr, myRoleEPR, channel); } Modified: ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/extvar/ExternalVariableManager.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/extvar/ExternalVariableManager.java?rev=683777&r1=683776&r2=683777&view=diff ============================================================================== --- ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/extvar/ExternalVariableManager.java (original) +++ ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/extvar/ExternalVariableManager.java Thu Aug 7 17:42:36 2008 @@ -36,9 +36,6 @@ /** * Manager for external variable instances; used by [EMAIL PROTECTED] org.apache.ode.bpel.engine.ODEProcess} to manage external variables. - * - * @author Maciej Szefler <mszefler at gmail dot com> - * */ public class ExternalVariableManager { @@ -56,11 +53,8 @@ /** Process ID */ private QName _pid; - public ExternalVariableManager(QName pid, - ExternalVariableConf evconf, - Map<QName, ExternalVariableModule> engines, - OProcess oprocess) - throws BpelEngineException { + public ExternalVariableManager(QName pid, ExternalVariableConf evconf, Map<QName, + ExternalVariableModule> engines) throws BpelEngineException { _pid = pid; _extVarConf = evconf; _engines = engines; @@ -91,24 +85,24 @@ } // Walk down the process definition looking for any external variables. - for (OBase child : oprocess.getChildren()) { - if (!(child instanceof OScope)) - continue; - OScope oscope = (OScope) child; - for (OScope.Variable var : oscope.variables.values()) { - if (var.extVar == null) - continue; - - EVar evar = _externalVariables.get(var.extVar.externalVariableId); - if (evar == null) { - __log.error("The \"" + oscope.name + "\" scope declared an unknown external variable \"" - + var.extVar.externalVariableId + "\"; check the deployment descriptor."); - fatal = true; - continue; - } - - } - } + // TODO move this to deployment +// for (OBase child : oprocess.getChildren()) { +// if (!(child instanceof OScope)) +// continue; +// OScope oscope = (OScope) child; +// for (OScope.Variable var : oscope.variables.values()) { +// if (var.extVar == null) +// continue; +// +// EVar evar = _externalVariables.get(var.extVar.externalVariableId); +// if (evar == null) { +// __log.error("The \"" + oscope.name + "\" scope declared an unknown external variable \"" +// + var.extVar.externalVariableId + "\"; check the deployment descriptor."); +// fatal = true; +// continue; +// } +// } +// } if (fatal) { String errmsg = "Error initializing external variables. See log for details."; @@ -123,15 +117,15 @@ * Read an external variable. */ public Value read(Variable variable, Node reference, Long iid) throws ExternalVariableModuleException{ - EVar evar = _externalVariables.get(variable.extVar.externalVariableId); + EVar evar = _externalVariables.get(variable.getExternalId()); if (evar == null) { // Should not happen if constructor is working. - throw new BpelEngineException("InternalError: reference to unknown external variable " + variable.extVar.externalVariableId); + throw new BpelEngineException("InternalError: reference to unknown external variable " + variable.getExternalId()); } - Locator locator = new Locator(variable.extVar.externalVariableId, _pid,iid, reference); + Locator locator = new Locator(variable.getExternalId(), _pid,iid, reference); Value newval; - newval = evar._engine.readValue(((OElementVarType) variable.type).elementType, locator ); + newval = evar._engine.readValue(variable.getElementType(), locator ); if (newval == null) return null; return newval; @@ -139,15 +133,15 @@ public Value write(Variable variable, Node reference, Node val, Long iid) throws ExternalVariableModuleException { - EVar evar = _externalVariables.get(variable.extVar.externalVariableId); + EVar evar = _externalVariables.get(variable.getExternalId()); if (evar == null) { // Should not happen if constructor is working. - throw new BpelEngineException("InternalError: reference to unknown external variable " + variable.extVar.externalVariableId); + throw new BpelEngineException("InternalError: reference to unknown external variable " + variable.getExternalId()); } - Locator locator = new Locator(variable.extVar.externalVariableId,_pid,iid,reference); + Locator locator = new Locator(variable.getExternalId(),_pid,iid,reference); Value newval = new Value(locator,val,null); - newval = evar._engine.writeValue(((OElementVarType) variable.type).elementType, newval); + newval = evar._engine.writeValue(variable.getElementType(), newval); return newval; } @@ -155,9 +149,7 @@ static final class EVar { final ExternalVariableModule _engine; - final Element _config; - final String _extVarId; EVar(String id, ExternalVariableModule engine, Element config) { @@ -167,5 +159,4 @@ } } - } Modified: ode/branches/rtver/bpel-runtime/src/test/java/org/apache/ode/bpel/elang/xpath20/runtime/MockCompilerContext.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-runtime/src/test/java/org/apache/ode/bpel/elang/xpath20/runtime/MockCompilerContext.java?rev=683777&r1=683776&r2=683777&view=diff ============================================================================== --- ode/branches/rtver/bpel-runtime/src/test/java/org/apache/ode/bpel/elang/xpath20/runtime/MockCompilerContext.java (original) +++ ode/branches/rtver/bpel-runtime/src/test/java/org/apache/ode/bpel/elang/xpath20/runtime/MockCompilerContext.java Thu Aug 7 17:42:36 2008 @@ -27,7 +27,7 @@ import javax.xml.namespace.QName; import org.apache.ode.bpel.compiler.api.CompilationException; -import org.apache.ode.bpel.compiler.api.ExtensionValidator; +import org.apache.ode.bpel.rapi.ExtensionValidator; import org.apache.ode.bpel.compiler.v2.CompilerContext; import org.apache.ode.bpel.compiler.bom.Activity; import org.apache.ode.bpel.compiler.bom.BpelObject; Modified: ode/branches/rtver/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java?rev=683777&r1=683776&r2=683777&view=diff ============================================================================== --- ode/branches/rtver/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java (original) +++ ode/branches/rtver/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java Thu Aug 7 17:42:36 2008 @@ -23,7 +23,7 @@ import org.apache.ode.bpel.compiler.BpelC; import org.apache.ode.bpel.compiler.DefaultResourceFinder; import org.apache.ode.bpel.compiler.WSDLLocatorImpl; -import org.apache.ode.bpel.compiler.api.ExtensionValidator; +import org.apache.ode.bpel.rapi.ExtensionValidator; import org.apache.ode.bpel.compiler.wsdl.Definition4BPEL; import org.apache.ode.bpel.compiler.wsdl.WSDLFactory4BPEL; import org.apache.ode.bpel.compiler.wsdl.WSDLFactoryBPEL20; Modified: ode/branches/rtver/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java?rev=683777&r1=683776&r2=683777&view=diff ============================================================================== --- ode/branches/rtver/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java (original) +++ ode/branches/rtver/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java Thu Aug 7 17:42:36 2008 @@ -184,6 +184,10 @@ return _version; } + public int getRuntimeVersion() { + return 2; + } + public InputStream getCBPInputStream() { CBPInfo cbpInfo = _du.getCBPInfo(getType()); if (cbpInfo == null) Modified: ode/branches/rtver/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java?rev=683777&r1=683776&r2=683777&view=diff ============================================================================== --- ode/branches/rtver/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java (original) +++ ode/branches/rtver/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java Thu Aug 7 17:42:36 2008 @@ -36,7 +36,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.ode.bpel.compiler.api.CompilationException; -import org.apache.ode.bpel.compiler.api.ExtensionValidator; +import org.apache.ode.bpel.rapi.ExtensionValidator; import org.apache.ode.bpel.dd.DeployDocument; import org.apache.ode.bpel.dd.TDeployment; import org.apache.ode.bpel.iapi.ContextException; Modified: ode/branches/rtver/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java?rev=683777&r1=683776&r2=683777&view=diff ============================================================================== --- ode/branches/rtver/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java (original) +++ ode/branches/rtver/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java Thu Aug 7 17:42:36 2008 @@ -44,13 +44,11 @@ import org.apache.ode.bpel.iapi.MessageExchange; import org.apache.ode.bpel.iapi.MyRoleMessageExchange; import org.apache.ode.bpel.iapi.ProcessStore; -import org.apache.ode.bpel.iapi.ProcessStoreEvent; -import org.apache.ode.bpel.iapi.ProcessStoreListener; import org.apache.ode.bpel.iapi.MessageExchange.AckType; import org.apache.ode.bpel.iapi.MessageExchange.Status; import org.apache.ode.bpel.iapi.MyRoleMessageExchange.CorrelationStatus; import org.apache.ode.bpel.memdao.BpelDAOConnectionFactoryImpl; -import org.apache.ode.bpel.runtime.extension.AbstractExtensionBundle; +import org.apache.ode.bpel.rtrep.common.extension.AbstractExtensionBundle; import org.apache.ode.dao.jpa.BPELDAOConnectionFactoryImpl; import org.apache.ode.il.MockScheduler; import org.apache.ode.il.config.OdeConfigProperties; Modified: ode/branches/rtver/bpel-test/src/main/java/org/apache/ode/test/MockExtensionContext.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-test/src/main/java/org/apache/ode/test/MockExtensionContext.java?rev=683777&r1=683776&r2=683777&view=diff ============================================================================== --- ode/branches/rtver/bpel-test/src/main/java/org/apache/ode/test/MockExtensionContext.java (original) +++ ode/branches/rtver/bpel-test/src/main/java/org/apache/ode/test/MockExtensionContext.java Thu Aug 7 17:42:36 2008 @@ -22,12 +22,11 @@ import java.util.Map; import org.apache.ode.bpel.common.FaultException; -import org.apache.ode.bpel.o.OActivity; -import org.apache.ode.bpel.o.OLink; -import org.apache.ode.bpel.o.OProcess.OProperty; -import org.apache.ode.bpel.o.OScope.Variable; -import org.apache.ode.bpel.runtime.BpelRuntimeContext; -import org.apache.ode.bpel.runtime.extension.ExtensionContext; +import org.apache.ode.bpel.rtrep.v2.OScope; +import org.apache.ode.bpel.rtrep.v2.OProcess; +import org.apache.ode.bpel.rtrep.v2.OActivity; +import org.apache.ode.bpel.rtrep.v2.OLink; +import org.apache.ode.bpel.rtrep.common.extension.ExtensionContext; import org.apache.ode.utils.DOMUtils; import org.w3c.dom.Node; @@ -68,11 +67,7 @@ throw new UnsupportedOperationException("This method is not available in this mock implementation."); } - public BpelRuntimeContext getBpelRuntimeContext() { - throw new UnsupportedOperationException("This method is not available in this mock implementation."); - } - - public Map<String, Variable> getVisibleVariables() + public Map<String, OScope.Variable> getVisibleVariables() throws FaultException { throw new UnsupportedOperationException("This method is not available in this mock implementation."); } @@ -81,16 +76,16 @@ throw new UnsupportedOperationException("This method is not available in this mock implementation."); } - public String readMessageProperty(Variable variable, OProperty property) + public String readMessageProperty(OScope.Variable variable, OProcess.OProperty property) throws FaultException { throw new UnsupportedOperationException("This method is not available in this mock implementation."); } - public Node readVariable(Variable variable) throws FaultException { + public Node readVariable(OScope.Variable variable) throws FaultException { throw new UnsupportedOperationException("This method is not available in this mock implementation."); } - public void writeVariable(Variable variable, Node value) throws FaultException { + public void writeVariable(OScope.Variable variable, Node value) throws FaultException { throw new UnsupportedOperationException("This method is not available in this mock implementation."); } Modified: ode/branches/rtver/bpel-test/src/test/java/org/apache/ode/test/ExtensibilityTest.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-test/src/test/java/org/apache/ode/test/ExtensibilityTest.java?rev=683777&r1=683776&r2=683777&view=diff ============================================================================== --- ode/branches/rtver/bpel-test/src/test/java/org/apache/ode/test/ExtensibilityTest.java (original) +++ ode/branches/rtver/bpel-test/src/test/java/org/apache/ode/test/ExtensibilityTest.java Thu Aug 7 17:42:36 2008 @@ -22,7 +22,7 @@ import org.apache.ode.bpel.compiler.api.CompilationException; import org.apache.ode.bpel.compiler.api.CompilationMessage; import org.apache.ode.bpel.compiler.v2.CompilerContext; -import org.apache.ode.bpel.compiler.bom.ExtensibleElement; +import org.apache.ode.bpel.rapi.ExtensibleElement; import org.apache.ode.bpel.iapi.BpelEngineException; import org.apache.ode.bpel.runtime.extension.AbstractAsyncExtensionOperation; import org.apache.ode.bpel.runtime.extension.AbstractExtensionBundle; Modified: ode/branches/rtver/jbi/src/main/java/org/apache/ode/jbi/OdeContext.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/jbi/src/main/java/org/apache/ode/jbi/OdeContext.java?rev=683777&r1=683776&r2=683777&view=diff ============================================================================== --- ode/branches/rtver/jbi/src/main/java/org/apache/ode/jbi/OdeContext.java (original) +++ ode/branches/rtver/jbi/src/main/java/org/apache/ode/jbi/OdeContext.java Thu Aug 7 17:42:36 2008 @@ -44,11 +44,12 @@ import org.apache.ode.bpel.iapi.Endpoint; import org.apache.ode.bpel.iapi.ProcessConf; import org.apache.ode.bpel.iapi.Scheduler; -import org.apache.ode.bpel.o.OPartnerLink; -import org.apache.ode.bpel.o.OProcess; -import org.apache.ode.bpel.o.Serializer; import org.apache.ode.bpel.pmapi.InstanceManagement; import org.apache.ode.bpel.pmapi.ProcessManagement; +import org.apache.ode.bpel.rapi.Serializer; +import org.apache.ode.bpel.rapi.ProcessModel; +import org.apache.ode.bpel.rapi.PartnerLinkModel; +import org.apache.ode.bpel.rtrep.Serializers; import org.apache.ode.jbi.msgmap.Mapper; import org.apache.ode.jbi.util.WSDLFlattener; import org.apache.ode.store.ProcessStoreImpl; @@ -178,13 +179,13 @@ OdeService service = new OdeService(this, endpoint); try { ProcessConf pc = _store.getProcessConfiguration(pid); - Serializer ofh = new Serializer(pc.getCBPInputStream()); - OProcess compiledProcess = ofh.readOProcess(); + Serializer ofh = Serializers.getLatest(pc.getCBPInputStream()); + ProcessModel compiledProcess = ofh.readPModel(); QName portType = null; for (Map.Entry<String, Endpoint> provide : pc.getProvideEndpoints().entrySet()) { if (provide.getValue().equals(endpoint)) { - OPartnerLink plink = compiledProcess.getPartnerLink(provide.getKey()); - portType = plink.myRolePortType.getQName(); + PartnerLinkModel plink = compiledProcess.getPartnerLink(provide.getKey()); + portType = plink.getMyRolePortType().getQName(); break; } } Modified: ode/branches/rtver/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java?rev=683777&r1=683776&r2=683777&view=diff ============================================================================== --- ode/branches/rtver/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java (original) +++ ode/branches/rtver/jbi/src/main/java/org/apache/ode/jbi/OdeLifeCycle.java Thu Aug 7 17:42:36 2008 @@ -37,7 +37,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.ode.bpel.compiler.api.ExtensionValidator; +import org.apache.ode.bpel.rapi.ExtensionValidator; import org.apache.ode.bpel.connector.BpelServerConnector; import org.apache.ode.bpel.dao.BpelDAOConnectionFactoryJDBC; import org.apache.ode.bpel.engine.BpelServerImpl; @@ -45,7 +45,7 @@ import org.apache.ode.bpel.evtproc.DebugBpelEventListener; import org.apache.ode.bpel.iapi.BpelEventListener; import org.apache.ode.bpel.intercept.MessageExchangeInterceptor; -import org.apache.ode.bpel.runtime.extension.AbstractExtensionBundle; +import org.apache.ode.bpel.rtrep.common.extension.AbstractExtensionBundle; import org.apache.ode.il.dbutil.Database; import org.apache.ode.il.dbutil.DatabaseConfigException; import org.apache.ode.jbi.msgmap.Mapper; Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/common/extension/AbstractExtensionBundle.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/common/extension/AbstractExtensionBundle.java?rev=683777&r1=683776&r2=683777&view=diff ============================================================================== --- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/common/extension/AbstractExtensionBundle.java (original) +++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/common/extension/AbstractExtensionBundle.java Thu Aug 7 17:42:36 2008 @@ -23,10 +23,12 @@ import java.util.Map; import java.util.Set; -import javax.xml.namespace.QName; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.ode.bpel.rapi.ExtensionBundle; +import org.apache.ode.bpel.rapi.ExtensionValidator; + +import javax.xml.namespace.QName; //import org.apache.ode.bpel.compiler.api.ExtensionValidator; /** @@ -35,7 +37,7 @@ * * @author Tammo van Lessen (University of Stuttgart) */ -public abstract class AbstractExtensionBundle { +public abstract class AbstractExtensionBundle implements ExtensionBundle { private static Log __log = LogFactory.getLog(AbstractExtensionBundle.class); private Map<String, Class<? extends ExtensionOperation>> extensionsByName = new HashMap<String, Class<? extends ExtensionOperation>>(); @@ -75,19 +77,18 @@ return getExtensionOperationClass(localName).newInstance(); } - // TODO See what to do with the validation part -// public final Map<QName, ExtensionValidator> getExtensionValidators() { -// Map<QName, ExtensionValidator> result = new HashMap<QName, ExtensionValidator>(); -// String ns = getNamespaceURI(); -// for (String localName : extensionsByName.keySet()) { -// if (ExtensionValidator.class.isAssignableFrom(extensionsByName.get(localName))) { -// try { -// result.put(new QName(ns, localName), (ExtensionValidator)getExtensionOperationInstance(localName)); -// } catch (Exception e) { -// __log.warn("Could not instantiate extension validator for '{" + ns + "}" + localName); -// } -// } -// } -// return result; -// } + public final Map<QName, ExtensionValidator> getExtensionValidators() { + Map<QName, ExtensionValidator> result = new HashMap<QName, ExtensionValidator>(); + String ns = getNamespaceURI(); + for (String localName : extensionsByName.keySet()) { + if (ExtensionValidator.class.isAssignableFrom(extensionsByName.get(localName))) { + try { + result.put(new QName(ns, localName), (ExtensionValidator)getExtensionOperationInstance(localName)); + } catch (Exception e) { + __log.warn("Could not instantiate extension validator for '{" + ns + "}" + localName); + } + } + } + return result; + } } Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/ACTIVITY.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/ACTIVITY.java?rev=683777&r1=683776&r2=683777&view=diff ============================================================================== --- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/ACTIVITY.java (original) +++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/ACTIVITY.java Thu Aug 7 17:42:36 2008 @@ -30,7 +30,6 @@ import org.apache.ode.bpel.evt.ScopeEvent; import org.apache.ode.bpel.evt.VariableReadEvent; import org.apache.ode.bpel.common.FaultException; -import org.apache.ode.bpel.evar.ExternalVariableModuleException; import org.apache.ode.jacob.IndexedObject; import org.w3c.dom.Node; @@ -46,8 +45,6 @@ */ protected boolean _permeable = true; - protected ScopeFrame _scopeFrame; - protected LinkFrame _linkFrame; public ACTIVITY(ActivityInfo self, ScopeFrame scopeFrame, LinkFrame linkFrame) { @@ -146,14 +143,6 @@ } } - Node initializeVariable(VariableInstance var, Node val) throws ExternalVariableModuleException { - if (var.declaration.extVar != null) /* external variable */ { - return getBpelRuntime().initializeVariable(_scopeFrame.resolve(var.declaration.extVar.related), val); - } else /* normal variable */ { - return getBpelRuntime().initializeVariable(var, val); - } - } - public static final class Key implements Serializable { private static final long serialVersionUID = 1L; 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=683777&r1=683776&r2=683777&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 Thu Aug 7 17:42:36 2008 @@ -24,9 +24,11 @@ import org.apache.ode.bpel.common.FaultException; import org.apache.ode.bpel.rtrep.v2.channels.FaultData; import org.apache.ode.bpel.rapi.OdeRTInstanceContext; +import org.apache.ode.bpel.evar.ExternalVariableModuleException; import org.apache.ode.jacob.JacobRunnable; import org.apache.ode.jacob.vpu.JacobVPU; import org.w3c.dom.Element; +import org.w3c.dom.Node; import javax.xml.namespace.QName; @@ -41,6 +43,8 @@ public abstract class BpelJacobRunnable extends JacobRunnable { private static final Log __log = LogFactory.getLog(BpelJacobRunnable.class); + protected ScopeFrame _scopeFrame; + protected RuntimeInstanceImpl getBpelRuntime() { RuntimeInstanceImpl nativeApi = (RuntimeInstanceImpl) JacobVPU.activeJacobThread().getExtension(OdeRTInstanceContext.class); assert nativeApi != null; @@ -93,6 +97,14 @@ CorrelationKey ckeyVal = new CorrelationKey(cset.declaration.getId(), propValues); getBpelRuntime().writeCorrelation(cset,ckeyVal); } + + Node initializeVariable(VariableInstance var, Node val) throws ExternalVariableModuleException { + if (var.declaration.extVar != null) /* external variable */ { + return getBpelRuntime().initializeVariable(_scopeFrame.resolve(var.declaration.extVar.related), val); + } else /* normal variable */ { + return getBpelRuntime().initializeVariable(var, val); + } + } protected long genMonotonic() { return getBpelRuntime().genId(); Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/DebugInfo.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/DebugInfo.java?rev=683777&r1=683776&r2=683777&view=diff ============================================================================== --- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/DebugInfo.java (original) +++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/DebugInfo.java Thu Aug 7 17:42:36 2008 @@ -46,9 +46,8 @@ this.sourceURI = sourceURI; this.startLine = startLine; this.endLine = endLine; - if (extElmt != null && extElmt.size() > 0) { + if (extElmt != null && extElmt.size() > 0) this.extensibilityElements = new HashMap<QName, Object>(extElmt); - } } public DebugInfo(String sourceURI, int line, Map<QName, Object> extElmt) { 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=683777&r1=683776&r2=683777&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 Thu Aug 7 17:42:36 2008 @@ -53,7 +53,6 @@ private EventHandlerControlChannel _ehc; private TerminationChannel _tc; private ParentScopeChannel _psc; - private ScopeFrame _scopeFrame; private OEventHandler.OEvent _oevent; /** Registered compensation handlers. */ Copied: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/KonstExpressionLanguageRuntimeImpl.java (from r683674, ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/explang/konst/KonstExpressionLanguageRuntimeImpl.java) URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/KonstExpressionLanguageRuntimeImpl.java?p2=ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/KonstExpressionLanguageRuntimeImpl.java&p1=ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/explang/konst/KonstExpressionLanguageRuntimeImpl.java&r1=683674&r2=683777&rev=683777&view=diff ============================================================================== --- ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/explang/konst/KonstExpressionLanguageRuntimeImpl.java (original) +++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/KonstExpressionLanguageRuntimeImpl.java Thu Aug 7 17:42:36 2008 @@ -16,12 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.ode.bpel.runtime.explang.konst; +package org.apache.ode.bpel.rtrep.v2; import org.apache.ode.bpel.common.FaultException; -import org.apache.ode.bpel.explang.*; -import org.apache.ode.bpel.o.OConstantExpression; -import org.apache.ode.bpel.o.OExpression; import org.apache.ode.utils.xsd.Duration; import org.w3c.dom.Node; @@ -30,12 +27,12 @@ import java.util.Map; /** - * An implementation of the [EMAIL PROTECTED] org.apache.ode.bpel.explang.ExpressionLanguageRuntime} interface + * An implementation of the ExpressionLanguageRuntime interface * for constant expressions. */ public class KonstExpressionLanguageRuntimeImpl implements ExpressionLanguageRuntime { - public void initialize(Map properties) throws ConfigurationException { + public void initialize(Map properties) { } public String evaluateAsString(OExpression cexp, EvaluationContext ctx) throws FaultException { @@ -48,7 +45,7 @@ public boolean evaluateAsBoolean(OExpression cexp, EvaluationContext ctx) throws FaultException { OConstantExpression konst = (OConstantExpression) cexp; if (konst.getVal() instanceof Boolean) - return ((Boolean)konst.getVal()).booleanValue(); + return (Boolean) konst.getVal(); throw new FaultException(cexp.getOwner().constants.qnInvalidExpressionValue); } Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OBase.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OBase.java?rev=683777&r1=683776&r2=683777&view=diff ============================================================================== --- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OBase.java (original) +++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OBase.java Thu Aug 7 17:42:36 2008 @@ -18,13 +18,17 @@ */ package org.apache.ode.bpel.rtrep.v2; +import org.apache.ode.bpel.rapi.ActivityModel; + +import javax.xml.namespace.QName; import java.io.Serializable; +import java.util.HashMap; /** * Base class for compiled BPEL objects. */ -public class OBase implements Serializable { +public class OBase implements Serializable, ActivityModel { static final long serialVersionUID = -1L ; @@ -48,6 +52,10 @@ return (OProcess) (_owner == null ? this : _owner); } + public HashMap<QName, Object> getExtensibilityElements() { + return debugInfo.extensibilityElements; + } + public int hashCode() { return _id; } 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=683777&r1=683776&r2=683777&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 Thu Aug 7 17:42:36 2008 @@ -21,6 +21,7 @@ import org.apache.ode.bpel.rapi.ProcessModel; import org.apache.ode.bpel.rapi.PartnerLinkModel; import org.apache.ode.bpel.rapi.PropertyAliasModel; +import org.apache.ode.bpel.rapi.ActivityModel; import javax.wsdl.Operation; import javax.xml.namespace.QName; @@ -95,7 +96,7 @@ return guid; } - public OBase getChild(final int id) { + public ActivityModel getChild(final int id) { for (int i=_children.size()-1; i>=0; i--) { OBase child = _children.get(i); if (child.getId() == id) return child; Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/SCOPE.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/SCOPE.java?rev=683777&r1=683776&r2=683777&view=diff ============================================================================== --- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/SCOPE.java (original) +++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/SCOPE.java Thu Aug 7 17:42:36 2008 @@ -64,8 +64,7 @@ assert _oscope.activity != null; } - public void run() { - + public void run() { // Start the child activity. _child = new ActivityInfo(genMonotonic(), _oscope.activity, 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=683777&r1=683776&r2=683777&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 Aug 7 17:42:36 2008 @@ -20,6 +20,7 @@ import org.apache.ode.bpel.rapi.Variable; +import javax.xml.namespace.QName; import java.io.Serializable; /** @@ -48,4 +49,14 @@ public long getScopeId() { return scopeInstance; } + + public String getExternalId() { + if (declaration.extVar == null) return null; + return declaration.extVar.externalVariableId; + } + + public QName getElementType() { + if (!(declaration.type instanceof OElementVarType)) return null; + else return ((OElementVarType)declaration.type).elementType; + } }
