Copied: ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ODEProcess.java (from r680846, ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java) URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ODEProcess.java?p2=ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ODEProcess.java&p1=ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java&r1=680846&r2=683675&rev=683675&view=diff ============================================================================== --- ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelProcess.java (original) +++ ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ODEProcess.java Thu Aug 7 12:00:39 2008 @@ -78,7 +78,10 @@ import org.apache.ode.bpel.runtime.ExpressionLanguageRuntimeRegistry; import org.apache.ode.bpel.runtime.PROCESS; import org.apache.ode.bpel.runtime.PropertyAliasEvaluationContext; +import org.apache.ode.bpel.runtime.msgs.Messages; import org.apache.ode.bpel.runtime.channels.FaultData; +import org.apache.ode.bpel.rapi.PartnerLinkModel; +import org.apache.ode.bpel.rapi.FaultInfo; import org.apache.ode.jacob.soup.ReplacementMap; import org.apache.ode.utils.GUID; import org.apache.ode.utils.ObjectPrinter; @@ -94,14 +97,14 @@ * @author Maciej Szefler <mszefler at gmail dot com> * @author Matthieu Riou <mriou at apache dot org> */ -public class BpelProcess { - static final Log __log = LogFactory.getLog(BpelProcess.class); +public class ODEProcess { + static final Log __log = LogFactory.getLog(ODEProcess.class); private static final Messages __msgs = MessageBundle.getMessages(Messages.class); - private volatile Map<OPartnerLink, PartnerLinkPartnerRoleImpl> _partnerRoles; + private volatile Map<PartnerLinkModel, PartnerLinkPartnerRoleImpl> _partnerRoles; - private volatile Map<OPartnerLink, PartnerLinkMyRoleImpl> _myRoles; + private volatile Map<PartnerLinkModel, PartnerLinkMyRoleImpl> _myRoles; /** Mapping from {"Service Name" (QNAME) / port} to a myrole. */ private volatile Map<Endpoint, PartnerLinkMyRoleImpl> _endpointToMyRoleMap; @@ -157,7 +160,7 @@ private ExternalVariableManager _evm; - BpelProcess(BpelServerImpl server, ProcessConf conf, BpelEventListener debugger) { + ODEProcess(BpelServerImpl server, ProcessConf conf, BpelEventListener debugger) { _server = server; _pid = conf.getProcessId(); _pconf = conf; @@ -200,7 +203,7 @@ public String toString() { - return "BpelProcess[" + _pid + "]"; + return "ODEProcess[" + _pid + "]"; } public ExternalVariableManager getEVM() { @@ -208,7 +211,7 @@ } void recoverActivity(ProcessInstanceDAO instanceDAO, final String channel, final long activityId, final String action, - final FaultData fault) { + final FaultInfo fault) { if (__log.isDebugEnabled()) __log.debug("Recovering activity in process " + instanceDAO.getInstanceId() + " with action " + action); @@ -372,8 +375,7 @@ assert worker.isWorkerThread(); BpelRuntimeContextImpl brc = new BpelRuntimeContextImpl(worker, instanceDao); - if (brc.injectTimerEvent(timerChannel)) - brc.execute(); + if (brc.injectTimerEvent(timerChannel)) brc.execute(); } @@ -542,7 +544,7 @@ * be handed off to a separate thread. * * @throws JobProcessorException - * @see org.apache.ode.bpel.engine.BpelProcess#handleWorkEvent(java.util.Map<java.lang.String,java.lang.Object>) + * @see ODEProcess#handleWorkEvent(java.util.Map<java.lang.String,java.lang.Object>) */ void handleWorkEvent(final JobInfo jobInfo) throws JobProcessorException { assert !_contexts.isTransacted() : "work events must be received outside of a transaction"; @@ -672,7 +674,7 @@ return isInMemory() ? _inMemDao.getConnection().getProcess(_pid) : _contexts.dao.getConnection().getProcess(_pid); } - static String genCorrelatorId(OPartnerLink plink, String opName) { + static String genCorrelatorId(PartnerLinkModel plink, String opName) { return plink.getId() + "." + opName; } @@ -727,7 +729,7 @@ // TODO Deactivate all the partner-role channels } - EndpointReference getInitialPartnerRoleEPR(OPartnerLink link) { + EndpointReference getInitialPartnerRoleEPR(PartnerLinkModel link) { _hydrationLatch.latch(1); try { PartnerLinkPartnerRoleImpl prole = _partnerRoles.get(link); @@ -739,7 +741,7 @@ } } - Endpoint getInitialPartnerRoleEndpoint(OPartnerLink link) { + Endpoint getInitialPartnerRoleEndpoint(PartnerLinkModel link) { _hydrationLatch.latch(1); try { PartnerLinkPartnerRoleImpl prole = _partnerRoles.get(link); @@ -751,7 +753,7 @@ } } - EndpointReference getInitialMyRoleEPR(OPartnerLink link) { + EndpointReference getInitialMyRoleEPR(PartnerLinkModel link) { _hydrationLatch.latch(1); try { PartnerLinkMyRoleImpl myRole = _myRoles.get(link); @@ -766,7 +768,7 @@ return _pid; } - PartnerRoleChannel getPartnerRoleChannel(OPartnerLink partnerLink) { + PartnerRoleChannel getPartnerRoleChannel(PartnerLinkModel partnerLink) { _hydrationLatch.latch(1); try { PartnerLinkPartnerRoleImpl prole = _partnerRoles.get(partnerLink); @@ -1075,7 +1077,7 @@ void onMyRoleMexAck(MessageExchangeDAO mexdao, Status old) { if (mexdao.getPipedMessageExchangeId() != null) /* p2p */{ - BpelProcess caller = _server.getBpelProcess(mexdao.getPipedPID()); + ODEProcess caller = _server.getBpelProcess(mexdao.getPipedPID()); // process no longer deployed.... if (caller == null) return; @@ -1274,7 +1276,7 @@ OPartnerLink oplink = (OPartnerLink) _oprocess.getChild(mexdao.getPartnerLinkModelId()); PartnerLinkPartnerRoleImpl partnerRole = _partnerRoles.get(oplink); Endpoint partnerEndpoint = getInitialPartnerRoleEndpoint(oplink); - BpelProcess p2pProcess = null; + ODEProcess p2pProcess = null; if (partnerEndpoint != null) p2pProcess = _server.route(partnerEndpoint.serviceName, new DbBackedMessageImpl(mexdao.getRequest())); @@ -1311,8 +1313,8 @@ * @param outgoingMessage * @param partnerRoleMex */ - private void invokeP2P(BpelProcess target, QName serviceName, Operation operation, MessageExchangeDAO partnerRoleMex) { - if (BpelProcess.__log.isDebugEnabled()) + private void invokeP2P(ODEProcess target, QName serviceName, Operation operation, MessageExchangeDAO partnerRoleMex) { + if (ODEProcess.__log.isDebugEnabled()) __log.debug("Invoking in a p2p interaction, partnerrole " + partnerRoleMex.getMessageExchangeId() + " target=" + target); @@ -1352,7 +1354,7 @@ String mySessionId = partnerRoleMex.getPartnerLink().getMySessionId(); String partnerSessionId = partnerRoleMex.getPartnerLink().getPartnerSessionId(); - if (BpelProcess.__log.isDebugEnabled()) + if (ODEProcess.__log.isDebugEnabled()) __log.debug("Setting myRoleMex session ids for p2p interaction, mySession " + partnerSessionId + " - partnerSess " + mySessionId);
Modified: ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkMyRoleImpl.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkMyRoleImpl.java?rev=683675&r1=683674&r2=683675&view=diff ============================================================================== --- ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkMyRoleImpl.java (original) +++ ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkMyRoleImpl.java Thu Aug 7 12:00:39 2008 @@ -60,14 +60,14 @@ * @author Matthieu Riou <mriou at apache dot org> */ class PartnerLinkMyRoleImpl extends PartnerLinkRoleImpl { - private static final Log __log = LogFactory.getLog(BpelProcess.class); + private static final Log __log = LogFactory.getLog(ODEProcess.class); private static final Messages __msgs = MessageBundle.getMessages(Messages.class); /** The local endpoint for this "myrole". */ public Endpoint _endpoint; - PartnerLinkMyRoleImpl(BpelProcess process, OPartnerLink plink, Endpoint endpoint) { + PartnerLinkMyRoleImpl(ODEProcess process, OPartnerLink plink, Endpoint endpoint) { super(process, plink); _endpoint = endpoint; } @@ -104,7 +104,7 @@ // Is this a /possible/ createInstance Operation? boolean isCreateInstnace = _plinkDef.isCreateInstanceOperation(operation); - String correlatorId = BpelProcess.genCorrelatorId(_plinkDef, operation.getName()); + String correlatorId = ODEProcess.genCorrelatorId(_plinkDef, operation.getName()); CorrelatorDAO correlator = _process.getProcessDAO().getCorrelator(correlatorId); // Special logic for in-mem processes, only createInstance is allowed, so we can skip the Modified: ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkPartnerRoleImpl.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkPartnerRoleImpl.java?rev=683675&r1=683674&r2=683675&view=diff ============================================================================== --- ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkPartnerRoleImpl.java (original) +++ ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkPartnerRoleImpl.java Thu Aug 7 12:00:39 2008 @@ -53,7 +53,7 @@ public PartnerRoleChannel _channel; - PartnerLinkPartnerRoleImpl(BpelProcess process, OPartnerLink plink, Endpoint initialPartner) { + PartnerLinkPartnerRoleImpl(ODEProcess process, OPartnerLink plink, Endpoint initialPartner) { super(process, plink); _initialPartner = initialPartner; } Modified: ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkRoleImpl.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkRoleImpl.java?rev=683675&r1=683674&r2=683675&view=diff ============================================================================== --- ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkRoleImpl.java (original) +++ ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkRoleImpl.java Thu Aug 7 12:00:39 2008 @@ -27,10 +27,10 @@ abstract class PartnerLinkRoleImpl { protected OPartnerLink _plinkDef; protected EndpointReference _initialEPR; - protected BpelProcess _process; + protected ODEProcess _process; protected Contexts _contexts; - PartnerLinkRoleImpl(BpelProcess process, OPartnerLink plink) { + PartnerLinkRoleImpl(ODEProcess process, OPartnerLink plink) { _plinkDef = plink; _process = process; _contexts = _process._contexts; 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=683675&r1=683674&r2=683675&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 12:00:39 2008 @@ -78,7 +78,7 @@ protected State _state = State.INVOKE_XXX; - PartnerRoleMessageExchangeImpl(BpelProcess process, Long iid, String mexId, OPartnerLink oplink, Operation operation, + PartnerRoleMessageExchangeImpl(ODEProcess process, Long iid, String mexId, OPartnerLink oplink, Operation operation, EndpointReference epr, EndpointReference myRoleEPR, PartnerRoleChannel channel) { super(process, iid, mexId, oplink, oplink.partnerRolePortType, operation); _myRoleEPR = myRoleEPR; 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=683675&r1=683674&r2=683675&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 12:00:39 2008 @@ -397,7 +397,7 @@ return null; for (ActivityRecoveryDAO recovery : instance.getActivityRecoveries()) { if (recovery.getActivityId() == aid) { - BpelProcess process = _server.getBpelProcess(instance.getProcess().getProcessId()); + ODEProcess process = _server.getBpelProcess(instance.getProcess().getProcessId()); if (process != null) { process.recoverActivity(instance, recovery.getChannel(), aid, action, null); break; @@ -519,7 +519,7 @@ */ protected final DebuggerSupport getDebugger(QName procid) throws ManagementException { - BpelProcess process = _server.getBpelProcess(procid); + ODEProcess process = _server.getBpelProcess(procid); if (process == null) throw new ProcessNotFoundException("The process \"" + procid + "\" does not exist."); Modified: ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessLifecycleCallback.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessLifecycleCallback.java?rev=683675&r1=683674&r2=683675&view=diff ============================================================================== --- ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessLifecycleCallback.java (original) +++ ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ProcessLifecycleCallback.java Thu Aug 7 12:00:39 2008 @@ -23,5 +23,5 @@ */ public interface ProcessLifecycleCallback { - void hydrated(BpelProcess process); + void hydrated(ODEProcess process); } 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=683675&r1=683674&r2=683675&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 12:00:39 2008 @@ -25,10 +25,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; 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.iapi.MyRoleMessageExchange; -import org.apache.ode.bpel.intercept.InterceptorInvoker; import org.apache.ode.bpel.o.OPartnerLink; /** @@ -42,7 +40,7 @@ private static final Log __log = LogFactory.getLog(ReliableMyRoleMessageExchangeImpl.class); - public ReliableMyRoleMessageExchangeImpl(BpelProcess process, String mexId, OPartnerLink oplink, Operation operation, QName callee) { + public ReliableMyRoleMessageExchangeImpl(ODEProcess process, String mexId, OPartnerLink 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=683675&r1=683674&r2=683675&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 12:00:39 2008 @@ -11,7 +11,7 @@ public class ReliablePartnerRoleMessageExchangeImpl extends PartnerRoleMessageExchangeImpl { - public ReliablePartnerRoleMessageExchangeImpl(BpelProcess process, long iid, String mexId, OPartnerLink oplink, Operation op, + public ReliablePartnerRoleMessageExchangeImpl(ODEProcess process, long iid, String mexId, OPartnerLink 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=683675&r1=683674&r2=683675&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 12:00:39 2008 @@ -17,7 +17,7 @@ */ public class TransactedMyRoleMessageExchangeImpl extends MyRoleMessageExchangeImpl { - public TransactedMyRoleMessageExchangeImpl(BpelProcess process, String mexId, OPartnerLink oplink, Operation operation, QName callee) { + public TransactedMyRoleMessageExchangeImpl(ODEProcess process, String mexId, OPartnerLink 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/TransactedPartnerRoleMessageExchangeImpl.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/TransactedPartnerRoleMessageExchangeImpl.java?rev=683675&r1=683674&r2=683675&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 12:00:39 2008 @@ -18,7 +18,7 @@ */ public class TransactedPartnerRoleMessageExchangeImpl extends PartnerRoleMessageExchangeImpl { - TransactedPartnerRoleMessageExchangeImpl(BpelProcess process, long iid, String mexId, OPartnerLink oplink,Operation operation, EndpointReference epr, EndpointReference myRoleEPR, PartnerRoleChannel channel) { + TransactedPartnerRoleMessageExchangeImpl(ODEProcess process, long iid, String mexId, OPartnerLink 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=683675&r1=683674&r2=683675&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 12:00:39 2008 @@ -29,7 +29,7 @@ ResponseFuture _future; - public UnreliableMyRoleMessageExchangeImpl(BpelProcess process, String mexId, OPartnerLink oplink, Operation operation, + public UnreliableMyRoleMessageExchangeImpl(ODEProcess process, String mexId, OPartnerLink 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=683675&r1=683674&r2=683675&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 12:00:39 2008 @@ -24,7 +24,7 @@ private static final Log __log = LogFactory.getLog(UnreliablePartnerRoleMessageExchangeImpl.class); boolean _asyncReply; - UnreliablePartnerRoleMessageExchangeImpl(BpelProcess process, long iid, String mexId, OPartnerLink oplink, Operation operation, + UnreliablePartnerRoleMessageExchangeImpl(ODEProcess process, long iid, String mexId, OPartnerLink 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=683675&r1=683674&r2=683675&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 12:00:39 2008 @@ -25,22 +25,17 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.ode.bpel.engine.BpelProcess; import org.apache.ode.bpel.iapi.BpelEngineException; -import org.apache.ode.bpel.o.OBase; -import org.apache.ode.bpel.o.OElementVarType; -import org.apache.ode.bpel.o.OProcess; -import org.apache.ode.bpel.o.OScope; -import org.apache.ode.bpel.o.OScope.Variable; import org.apache.ode.bpel.evar.ExternalVariableModule; import org.apache.ode.bpel.evar.ExternalVariableModuleException; import org.apache.ode.bpel.evar.ExternalVariableModule.Locator; import org.apache.ode.bpel.evar.ExternalVariableModule.Value; +import org.apache.ode.bpel.rapi.Variable; import org.w3c.dom.Element; import org.w3c.dom.Node; /** - * Manager for external variable instances; used by [EMAIL PROTECTED] BpelProcess} to manage external variables. + * 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> * 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=683675&r1=683674&r2=683675&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 12:00:39 2008 @@ -30,6 +30,7 @@ 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; @@ -145,6 +146,14 @@ } } + 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/ASSIGN.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/ASSIGN.java?rev=683675&r1=683674&r2=683675&view=diff ============================================================================== --- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/ASSIGN.java (original) +++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/ASSIGN.java Thu Aug 7 12:00:39 2008 @@ -119,7 +119,7 @@ val = tempwrapper; } else doc.appendChild(val); // Only external variables need to be initialized, others are new and going to be overwtitten - if (lvar.declaration.extVar != null) lval = getBpelRuntime().initializeVariable(lvar, val); + if (lvar.declaration.extVar != null) lval = initializeVariable(lvar, val); else lval = val; } else lval = fetchVariableData(lvar, true); @@ -320,7 +320,7 @@ final VariableInstance rval = _scopeFrame .resolve(((OAssign.VariableRef) ocopy.from).getVariable()); Element lvalue = (Element) fetchVariableData(rval, false); - getBpelRuntime().initializeVariable(lval, lvalue); + initializeVariable(lval, lvalue); se = new VariableModificationEvent(lval.declaration.name); ((VariableModificationEvent)se).setNewValue(lvalue); } else { 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=683675&r1=683674&r2=683675&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 12:00:39 2008 @@ -72,14 +72,10 @@ if (__log.isDebugEnabled()) { __log.debug("Initializing correlation set " + cset.declaration.name); } - // if correlation set is already initialized, - // then skip + // if correlation set is already initialized, then skip if (getBpelRuntime().isCorrelationInitialized(cset)) { // if already set, we ignore - if (__log.isDebugEnabled()) { - __log.debug("OCorrelation set " + cset + " is already set: ignoring"); - } - + if (__log.isDebugEnabled()) __log.debug("OCorrelation set " + cset + " is already set: ignoring"); return; } 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=683675&r1=683674&r2=683675&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 12:00:39 2008 @@ -229,7 +229,7 @@ if (msgEl != null) { try { VariableInstance vinst = ehScopeFrame.resolve(_oevent.variable); - getBpelRuntime().initializeVariable(vinst, msgEl); + initializeVariable(vinst, msgEl); VariableModificationEvent se = new VariableModificationEvent(vinst.declaration.name); se.setNewValue(msgEl); Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/FOREACH.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/FOREACH.java?rev=683675&r1=683674&r2=683675&view=diff ============================================================================== --- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/FOREACH.java (original) +++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/FOREACH.java Thu Aug 7 12:00:39 2008 @@ -208,7 +208,7 @@ VariableInstance vinst = newFrame.resolve(_oforEach.counterVariable); try { - getBpelRuntime().initializeVariable(vinst, counterNode); + initializeVariable(vinst, counterNode); } catch (ExternalVariableModuleException e) { __log.error("Exception while initializing external variable", e); _self.parent.failure(e.toString(), null); Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/INVOKE.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/INVOKE.java?rev=683675&r1=683674&r2=683675&view=diff ============================================================================== --- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/INVOKE.java (original) +++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/INVOKE.java Thu Aug 7 12:00:39 2008 @@ -116,7 +116,7 @@ } try { - getBpelRuntime().initializeVariable(outputVar, response); + initializeVariable(outputVar, response); } catch (ExternalVariableModuleException e) { __log.error("Exception while initializing external variable", e); _self.parent.failure(e.toString(), null); 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=683675&r1=683674&r2=683675&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 Thu Aug 7 12:00:39 2008 @@ -216,7 +216,7 @@ VariableInstance vinst = _scopeFrame.resolve(onMessage.variable); try { - getBpelRuntime().initializeVariable(vinst, msgEl); + initializeVariable(vinst, msgEl); } catch (ExternalVariableModuleException e) { __log.error("Exception while initializing external variable", e); _self.parent.failure(e.toString(), null); Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/RuntimeInstanceImpl.java URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/RuntimeInstanceImpl.java?rev=683675&r1=683674&r2=683675&view=diff ============================================================================== --- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/RuntimeInstanceImpl.java (original) +++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/RuntimeInstanceImpl.java Thu Aug 7 12:00:39 2008 @@ -127,7 +127,6 @@ } public Node fetchVariableData(VariableInstance variable, boolean forWriting) throws FaultException { - if (variable.declaration.extVar != null) { // Note, that when using external variables, the database will not contain the value of the // variable, instead we need to go the external variable subsystems. @@ -219,7 +218,6 @@ * Proxy to [EMAIL PROTECTED] VariableContext#readVariableProperty(Variable, QName)}. */ public String readProperty(VariableInstance variable, OProcess.OProperty property) throws FaultException { - try { return _brc.readVariableProperty(variable, property.name); } catch (UninitializedVariableException e) { @@ -239,7 +237,22 @@ */ public Node initializeVariable(VariableInstance var, Node val) throws ExternalVariableModuleException { try { - return _brc.initializeVariable(var, val); + if (var.declaration.extVar != null) /* external variable */ { + if (__log.isDebugEnabled()) + __log.debug("Initialize external variable: name=" + var.declaration + " value="+DOMUtils.domToString(val)); + Node reference = null; + try { + reference = fetchVariableData(var, true); + } catch (FaultException fe) { + // In this context this is not necessarily a problem, since the assignment may re-init the related var + } + if (reference != null) val = _brc.readExtVar(var, reference); + return val; + } else /* normal variable */ { + if (__log.isDebugEnabled()) __log.debug("Initialize variable: name=" + var.declaration + + " value=" + DOMUtils.domToString(val)); + return _brc.initializeVariable(var, val); + } } finally { writeProperties(var, val); } @@ -638,11 +651,6 @@ } } - /* - * (non-Javadoc) - * - * @see org.apache.ode.bpel.engine.rapi.OdeRTInstance#recoverActivity(java.lang.String, long, java.lang.String) - */ public void recoverActivity(final String channel, final long activityId, final String action, FaultInfo fault) { // TODO: better translation here? final FaultData fdata = (fault != null) ? new FaultData(fault.getFaultName(), null, fault.getExplanation()) : null; @@ -652,15 +660,12 @@ public void run() { ActivityRecoveryChannel recovery = importChannel(channel, ActivityRecoveryChannel.class); - __log.info("ActivityRecovery: Recovering activity " + activityId + " with action " + action + " on channel " - + recovery); + __log.info("ActivityRecovery: Recovering activity " + activityId + + " with action " + action + " on channel " + recovery); if (recovery != null) { - if ("cancel".equals(action)) - recovery.cancel(); - else if ("retry".equals(action)) - recovery.retry(); - else if ("fault".equals(action)) - recovery.fault(fdata); + if ("cancel".equals(action)) recovery.cancel(); + else if ("retry".equals(action)) recovery.retry(); + else if ("fault".equals(action)) recovery.fault(fdata); } } }); @@ -675,8 +680,8 @@ * */ private void cleanupOutstandingMyRoleExchanges(FaultInfo optionalFaultData) { - // TODO: all this should be moved into the engine. We don't really need the ORM to find these mexs, we can just scan - // the database -mszefler 20feb08 + // TODO: all this should be moved into the engine. We don't really need the ORM to find + // these mexs, we can just scan the database String[] mexRefs = getORM().releaseAll(); for (String mexId : mexRefs) { _brc.noreply(mexId, optionalFaultData); 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=683675&r1=683674&r2=683675&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 12:00:39 2008 @@ -302,7 +302,7 @@ if (catchBlock.faultVariable != null) { try { VariableInstance vinst = faultHandlerScopeFrame.resolve(catchBlock.faultVariable); - getBpelRuntime().initializeVariable(vinst, _fault.getFaultMessage()); + initializeVariable(vinst, _fault.getFaultMessage()); // Generating event VariableModificationEvent se = new VariableModificationEvent(vinst.declaration.name);
