Author: mszefler
Date: Tue Nov 21 09:56:07 2006
New Revision: 477788
URL: http://svn.apache.org/viewvc?view=rev&rev=477788
Log:
Package structure cleanup
Added:
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HLargeData.java
- copied, changed from r469994,
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/hobj/HLargeData.java
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HObject.java
- copied, changed from r469994,
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/hobj/HObject.java
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ql/
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ql/HibernateInstancesQueryCompiler.java
- copied, changed from r469994,
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/ql/instances/HibernateInstancesQueryCompiler.java
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ql/StateComparator.java
- copied, changed from r469994,
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/ql/instances/StateComparator.java
Removed:
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/hobj/HLargeData.java
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/hobj/HObject.java
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/hobj/package.html
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/ql/instances/HibernateInstancesQueryCompiler.java
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/ql/instances/StateComparator.java
Modified:
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/SessionManager.java
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionImpl.java
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/HibernateDao.java
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageDaoImpl.java
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageExchangeDaoImpl.java
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/PartnerLinkDAOImpl.java
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessDaoImpl.java
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessInstanceDaoImpl.java
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/XmlDataDaoImpl.java
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HActivityRecovery.java
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HBpelEvent.java
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelationProperty.java
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelationSet.java
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelator.java
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelatorMessage.java
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelatorMessageKey.java
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelatorSelector.java
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HFaultData.java
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HMessage.java
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HMessageExchange.java
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HPartnerLink.java
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HProcess.java
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HProcessInstance.java
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HScope.java
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HVariableProperty.java
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HXmlData.java
incubator/ode/trunk/dao-hibernate/src/test/java/org/apache/ode/daohib/ql/InstanceSelectionTest.java
Modified:
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/SessionManager.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/SessionManager.java?view=diff&rev=477788&r1=477787&r2=477788
==============================================================================
---
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/SessionManager.java
(original)
+++
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/SessionManager.java
Tue Nov 21 09:56:07 2006
@@ -19,7 +19,6 @@
package org.apache.ode.daohib;
import org.apache.ode.daohib.bpel.hobj.*;
-import org.apache.ode.daohib.hobj.HLargeData;
import org.apache.ode.utils.uuid.UUID;
import org.hibernate.HibernateException;
import org.hibernate.MappingException;
Modified:
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionImpl.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionImpl.java?view=diff&rev=477788&r1=477787&r2=477788
==============================================================================
---
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionImpl.java
(original)
+++
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionImpl.java
Tue Nov 21 09:56:07 2006
@@ -33,12 +33,12 @@
import org.apache.ode.bpel.evt.ScopeEvent;
import org.apache.ode.daohib.SessionManager;
import org.apache.ode.daohib.bpel.hobj.HBpelEvent;
+import org.apache.ode.daohib.bpel.hobj.HLargeData;
import org.apache.ode.daohib.bpel.hobj.HMessageExchange;
import org.apache.ode.daohib.bpel.hobj.HProcess;
import org.apache.ode.daohib.bpel.hobj.HProcessInstance;
import org.apache.ode.daohib.bpel.hobj.HScope;
-import org.apache.ode.daohib.hobj.HLargeData;
-import org.apache.ode.daohib.ql.instances.HibernateInstancesQueryCompiler;
+import org.apache.ode.daohib.bpel.ql.HibernateInstancesQueryCompiler;
import org.apache.ode.ql.eval.skel.CommandEvaluator;
import org.apache.ode.ql.tree.Builder;
import org.apache.ode.ql.tree.BuilderFactory;
@@ -97,12 +97,13 @@
return mex == null ? null : new MessageExchangeDaoImpl(_sm, mex);
}
- public ProcessDAO createProcess(QName pid, QName type) {
+ public ProcessDAO createProcess(QName pid, QName type, String guid) {
HProcess process = new HProcess();
process.setProcessId(pid.toString());
process.setTypeName(type.getLocalPart());
process.setTypeNamespace(type.getNamespaceURI());
process.setDeployDate(new Date());
+ process.setGuid(guid);
_session.save(process);
return new ProcessDaoImpl(_sm, process);
}
Modified:
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/HibernateDao.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/HibernateDao.java?view=diff&rev=477788&r1=477787&r2=477788
==============================================================================
---
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/HibernateDao.java
(original)
+++
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/HibernateDao.java
Tue Nov 21 09:56:07 2006
@@ -19,7 +19,7 @@
package org.apache.ode.daohib.bpel;
import org.apache.ode.daohib.SessionManager;
-import org.apache.ode.daohib.hobj.HObject;
+import org.apache.ode.daohib.bpel.hobj.HObject;
import org.hibernate.Session;
import java.io.Serializable;
Modified:
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageDaoImpl.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageDaoImpl.java?view=diff&rev=477788&r1=477787&r2=477788
==============================================================================
---
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageDaoImpl.java
(original)
+++
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageDaoImpl.java
Tue Nov 21 09:56:07 2006
@@ -28,8 +28,8 @@
import org.apache.ode.bpel.dao.MessageDAO;
import org.apache.ode.bpel.dao.MessageExchangeDAO;
import org.apache.ode.daohib.SessionManager;
+import org.apache.ode.daohib.bpel.hobj.HLargeData;
import org.apache.ode.daohib.bpel.hobj.HMessage;
-import org.apache.ode.daohib.hobj.HLargeData;
import org.apache.ode.utils.DOMUtils;
public class MessageDaoImpl extends HibernateDao implements MessageDAO {
Modified:
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageExchangeDaoImpl.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageExchangeDaoImpl.java?view=diff&rev=477788&r1=477787&r2=477788
==============================================================================
---
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageExchangeDaoImpl.java
(original)
+++
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageExchangeDaoImpl.java
Tue Nov 21 09:56:07 2006
@@ -21,11 +21,11 @@
import org.apache.ode.bpel.dao.*;
import org.apache.ode.daohib.SessionManager;
+import org.apache.ode.daohib.bpel.hobj.HLargeData;
import org.apache.ode.daohib.bpel.hobj.HMessage;
import org.apache.ode.daohib.bpel.hobj.HMessageExchange;
import org.apache.ode.daohib.bpel.hobj.HProcess;
import org.apache.ode.daohib.bpel.hobj.HProcessInstance;
-import org.apache.ode.daohib.hobj.HLargeData;
import org.apache.ode.utils.DOMUtils;
import org.w3c.dom.Element;
@@ -241,11 +241,11 @@
public void setProcess(ProcessDAO process) {
if (process == null || process instanceof ProcessDaoImpl) {
- _hself.setProcess(process == null ? null : (HProcess)
((ProcessDaoImpl) process).getHibernateObj());
- update();
+ _hself.setProcess(process == null ? null : (HProcess)
((ProcessDaoImpl) process).getHibernateObj());
+ update();
} else {
_externalProcess = process;
- }
+ }
}
public void setInstance(ProcessInstanceDAO instance) {
@@ -255,7 +255,7 @@
update();
} else {
_externalInstance = instance;
- }
+ }
}
Modified:
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/PartnerLinkDAOImpl.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/PartnerLinkDAOImpl.java?view=diff&rev=477788&r1=477787&r2=477788
==============================================================================
---
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/PartnerLinkDAOImpl.java
(original)
+++
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/PartnerLinkDAOImpl.java
Tue Nov 21 09:56:07 2006
@@ -23,8 +23,8 @@
import org.apache.ode.bpel.dao.PartnerLinkDAO;
import org.apache.ode.daohib.SessionManager;
+import org.apache.ode.daohib.bpel.hobj.HLargeData;
import org.apache.ode.daohib.bpel.hobj.HPartnerLink;
-import org.apache.ode.daohib.hobj.HLargeData;
import org.apache.ode.utils.DOMUtils;
import org.w3c.dom.Element;
Modified:
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessDaoImpl.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessDaoImpl.java?view=diff&rev=477788&r1=477787&r2=477788
==============================================================================
---
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessDaoImpl.java
(original)
+++
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessDaoImpl.java
Tue Nov 21 09:56:07 2006
@@ -145,4 +145,8 @@
return _process.getInstances().size();
}
+ public String getGuid() {
+ return _process.getGuid();
+ }
+
}
Modified:
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessInstanceDaoImpl.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessInstanceDaoImpl.java?view=diff&rev=477788&r1=477787&r2=477788
==============================================================================
---
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessInstanceDaoImpl.java
(original)
+++
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessInstanceDaoImpl.java
Tue Nov 21 09:56:07 2006
@@ -23,7 +23,6 @@
import org.apache.ode.bpel.evt.ProcessInstanceEvent;
import org.apache.ode.daohib.SessionManager;
import org.apache.ode.daohib.bpel.hobj.*;
-import org.apache.ode.daohib.hobj.HLargeData;
import org.apache.ode.utils.DOMUtils;
import org.apache.ode.utils.QNameUtils;
import org.apache.ode.utils.stl.CollectionsX;
@@ -42,359 +41,359 @@
* Hibernate-based [EMAIL PROTECTED] ProcessInstanceDAO} implementation.
*/
class ProcessInstanceDaoImpl extends HibernateDao implements
ProcessInstanceDAO {
- /** Query for removing selectors. */
- private static final String QRY_DELSELECTORS = "delete from " +
- HCorrelatorSelector.class.getName() + " where instance = ?";
-
- private static final String QRY_VARIABLES = "from " +
HXmlData.class.getName()
- + " as x where x.name = ? and x.scope.scopeModelId = ? and
x.scope.instance.id = ?";
-
- private static final String QRY_RECOVERIES = "from " +
HActivityRecovery.class.getName() +
- " AS x WHERE x.instance.id = ?";
-
- private HProcessInstance _instance;
-
- private ScopeDAO _root;
-
- public ProcessInstanceDaoImpl(SessionManager sm, HProcessInstance
instance) {
- super(sm, instance);
- _instance = instance;
- }
-
- /**
- * @see org.apache.ode.bpel.dao.ProcessInstanceDAO#getCreateTime()
- */
- public Date getCreateTime() {
- return _instance.getCreated();
- }
-
- public void setFault(FaultDAO fault) {
- _instance.setFault(((FaultDAOImpl)fault)._self);
- getSession().update(_instance);
-
- }
-
-
- /**
- * @see
org.apache.ode.bpel.dao.ProcessInstanceDAO#setFault(javax.xml.namespace.QName,
String, int, int, org.w3c.dom.Element)
- */
- public void setFault(QName name, String explanation, int lineNo, int
activityId, Element faultData) {
- if (_instance.getFault() != null)
- getSession().delete(_instance.getFault());
-
- HFaultData fault = new HFaultData();
- fault.setName(QNameUtils.fromQName(name));
- fault.setExplanation(explanation);
- fault.setLineNo(lineNo);
- fault.setActivityId(activityId);
- if (faultData != null) {
- HLargeData ld = new HLargeData(DOMUtils.domToString(faultData));
- fault.setData(ld);
- getSession().save(ld);
- }
-
- _instance.setFault(fault);
- getSession().save(fault);
- getSession().update(_instance);
- }
- /**
- * @see org.apache.ode.bpel.dao.ProcessInstanceDAO#getFault()
- */
- public FaultDAO getFault() {
- if (_instance.getFault() == null) return null;
- else return new FaultDAOImpl(_sm, _instance.getFault());
- }
-
- /**
- * @see org.apache.ode.bpel.dao.ProcessInstanceDAO#getExecutionState()
- */
- public byte[] getExecutionState() {
- if (_instance.getJacobState() == null) return null;
- return _instance.getJacobState().getBinary();
- }
- /**
- * @see
org.apache.ode.bpel.dao.ProcessInstanceDAO#setExecutionState(byte[])
- */
- public void setExecutionState(byte[] bytes) {
- if (_instance.getJacobState() != null)
- getSession().delete(_instance.getJacobState());
- if (bytes.length > 0) {
- HLargeData ld = new HLargeData(bytes);
- _instance.setJacobState(ld);
- getSession().save(ld);
- }
- getSession().update(_instance);
- }
-
- /**
- * @see org.apache.ode.bpel.dao.ProcessInstanceDAO#getProcess()
- */
- public ProcessDAO getProcess() {
- return new ProcessDaoImpl(_sm, _instance.getProcess());
- }
-
- /**
- * @see org.apache.ode.bpel.dao.ProcessInstanceDAO#getRootScope()
- */
- public ScopeDAO getRootScope() {
- if (_root != null)
- return _root;
- Query rootQry = getSession().createFilter(_instance.getScopes(),
- "where this.parentScope is null");
- HScope hroot = (HScope)rootQry.uniqueResult();
- if (hroot == null)
- return null;
- return _root = new ScopeDaoImpl(_sm, hroot);
- }
- /**
- * @see org.apache.ode.bpel.dao.ProcessInstanceDAO#setState(short)
- */
- public void setState(short state) {
+ /** Query for removing selectors. */
+ private static final String QRY_DELSELECTORS = "delete from " +
+ HCorrelatorSelector.class.getName() + " where instance = ?";
+
+ private static final String QRY_VARIABLES = "from " +
HXmlData.class.getName()
+ + " as x where x.name = ? and x.scope.scopeModelId = ? and
x.scope.instance.id = ?";
+
+ private static final String QRY_RECOVERIES = "from " +
HActivityRecovery.class.getName() +
+ " AS x WHERE x.instance.id = ?";
+
+ private HProcessInstance _instance;
+
+ private ScopeDAO _root;
+
+ public ProcessInstanceDaoImpl(SessionManager sm, HProcessInstance
instance) {
+ super(sm, instance);
+ _instance = instance;
+ }
+
+ /**
+ * @see org.apache.ode.bpel.dao.ProcessInstanceDAO#getCreateTime()
+ */
+ public Date getCreateTime() {
+ return _instance.getCreated();
+ }
+
+ public void setFault(FaultDAO fault) {
+ _instance.setFault(((FaultDAOImpl)fault)._self);
+ getSession().update(_instance);
+
+ }
+
+
+ /**
+ * @see
org.apache.ode.bpel.dao.ProcessInstanceDAO#setFault(javax.xml.namespace.QName,
String, int, int, org.w3c.dom.Element)
+ */
+ public void setFault(QName name, String explanation, int lineNo, int
activityId, Element faultData) {
+ if (_instance.getFault() != null)
+ getSession().delete(_instance.getFault());
+
+ HFaultData fault = new HFaultData();
+ fault.setName(QNameUtils.fromQName(name));
+ fault.setExplanation(explanation);
+ fault.setLineNo(lineNo);
+ fault.setActivityId(activityId);
+ if (faultData != null) {
+ HLargeData ld = new HLargeData(DOMUtils.domToString(faultData));
+ fault.setData(ld);
+ getSession().save(ld);
+ }
+
+ _instance.setFault(fault);
+ getSession().save(fault);
+ getSession().update(_instance);
+ }
+ /**
+ * @see org.apache.ode.bpel.dao.ProcessInstanceDAO#getFault()
+ */
+ public FaultDAO getFault() {
+ if (_instance.getFault() == null) return null;
+ else return new FaultDAOImpl(_sm, _instance.getFault());
+ }
+
+ /**
+ * @see org.apache.ode.bpel.dao.ProcessInstanceDAO#getExecutionState()
+ */
+ public byte[] getExecutionState() {
+ if (_instance.getJacobState() == null) return null;
+ return _instance.getJacobState().getBinary();
+ }
+ /**
+ * @see
org.apache.ode.bpel.dao.ProcessInstanceDAO#setExecutionState(byte[])
+ */
+ public void setExecutionState(byte[] bytes) {
+ if (_instance.getJacobState() != null)
+ getSession().delete(_instance.getJacobState());
+ if (bytes.length > 0) {
+ HLargeData ld = new HLargeData(bytes);
+ _instance.setJacobState(ld);
+ getSession().save(ld);
+ }
+ getSession().update(_instance);
+ }
+
+ /**
+ * @see org.apache.ode.bpel.dao.ProcessInstanceDAO#getProcess()
+ */
+ public ProcessDAO getProcess() {
+ return new ProcessDaoImpl(_sm, _instance.getProcess());
+ }
+
+ /**
+ * @see org.apache.ode.bpel.dao.ProcessInstanceDAO#getRootScope()
+ */
+ public ScopeDAO getRootScope() {
+ if (_root != null)
+ return _root;
+ Query rootQry = getSession().createFilter(_instance.getScopes(),
+ "where this.parentScope is null");
+ HScope hroot = (HScope)rootQry.uniqueResult();
+ if (hroot == null)
+ return null;
+ return _root = new ScopeDaoImpl(_sm, hroot);
+ }
+ /**
+ * @see org.apache.ode.bpel.dao.ProcessInstanceDAO#setState(short)
+ */
+ public void setState(short state) {
_instance.setPreviousState(_instance.getState());
- _instance.setState(state);
- if(state==ProcessState.STATE_TERMINATED) {
- clearSelectors();
- }
- getSession().update(_instance);
- }
- /**
- * @see org.apache.ode.bpel.dao.ProcessInstanceDAO#getState()
- */
- public short getState() {
- return _instance.getState();
- }
- /**
- * @see org.apache.ode.bpel.dao.ProcessInstanceDAO#getPreviousState()
- */
- public short getPreviousState() {
- return _instance.getPreviousState();
- }
-
-
- public ScopeDAO createScope(ScopeDAO parentScope, String name, int
scopeModelId) {
- HScope scope = new HScope();
- scope.setParentScope(parentScope != null
- ? (HScope)((ScopeDaoImpl)parentScope).getHibernateObj()
- : null);
- scope.setName(name);
- scope.setScopeModelId(scopeModelId);
- scope.setState(ScopeStateEnum.ACTIVE.toString());
- scope.setInstance(_instance);
- scope.setCreated(new Date());
- _instance.getScopes().add(scope);
- getSession().save(scope);
-
- return new ScopeDaoImpl(_sm, scope);
- }
-
- /**
- * @see org.apache.ode.bpel.dao.ProcessInstanceDAO#getInstanceId()
- */
- public Long getInstanceId() {
- return _instance.getId();
- }
-
- public ScopeDAO getScope(Long scopeInstanceId) {
- Long id = Long.valueOf(scopeInstanceId);
- HScope scope = (HScope)getSession().get(HScope.class, id);
- return scope != null
- ? new ScopeDaoImpl(_sm, scope)
- : null;
- }
-
- /**
- * @see
org.apache.ode.bpel.dao.ProcessInstanceDAO#getScopes(java.lang.String)
- */
- @SuppressWarnings("unchecked")
- public Collection<ScopeDAO> getScopes(String scopeName) {
- Collection<HScope> hscopes;
- if (scopeName != null) {
- Query filter = _sm.getSession().createFilter(_instance.getScopes(),
- "where this.name=?");
- filter.setString(0,scopeName);
- hscopes = filter.list();
- } else
- hscopes = _instance.getScopes();
- ArrayList<ScopeDAO> ret = new ArrayList<ScopeDAO>();
- CollectionsX.transform(ret, hscopes, new
UnaryFunction<HScope,ScopeDAO> () {
- public ScopeDAO apply(HScope x) {
- return new ScopeDaoImpl(_sm, x);
- }
- });
- return ret;
- }
-
- public Collection<ScopeDAO> getScopes() {
- return getScopes(null);
- }
-
- /**
- * @see
org.apache.ode.bpel.dao.ProcessInstanceDAO#getInstantiatingCorrelator()
- */
- public CorrelatorDAO getInstantiatingCorrelator() {
- return new CorrelatorDaoImpl(_sm,
_instance.getInstantiatingCorrelator());
- }
-
- /**
- * @see org.apache.ode.bpel.dao.ProcessInstanceDAO#getLastActiveTime()
- */
- public Date getLastActiveTime() {
- return _instance.getLastActiveTime();
- }
- /**
- * @see
org.apache.ode.bpel.dao.ProcessInstanceDAO#setLastActiveTime(java.util.Date)
- */
- public void setLastActiveTime(Date dt) {
- _instance.setLastActiveTime(dt);
- }
-
- public Set<CorrelationSetDAO> getCorrelationSets() {
- Set<CorrelationSetDAO> results = new HashSet<CorrelationSetDAO>();
-
- for (HCorrelationSet hCorrelationSet : _instance.getCorrelationSets())
{
- results.add(new CorrelationSetDaoImpl(_sm, hCorrelationSet));
- }
-
- return results;
- }
-
- public CorrelationSetDAO getCorrelationSet(String name) {
- for (HCorrelationSet hCorrelationSet : _instance.getCorrelationSets())
{
- if (hCorrelationSet.getName().equals(name))
- return new CorrelationSetDaoImpl(_sm, hCorrelationSet);
- }
- return null;
- }
-
- /**
- * @see
org.apache.ode.bpel.dao.ProcessInstanceDAO#getVariables(java.lang.String, int)
- */
- public XmlDataDAO[] getVariables(String variableName, int scopeModelId) {
- List<XmlDataDAO> results = new ArrayList<XmlDataDAO>();
-
- Iterator iter;
- Query qry = getSession().createQuery(QRY_VARIABLES);
- qry.setString(0, variableName);
- qry.setInteger(1, scopeModelId);
- qry.setLong(2, _instance.getId());
- iter = qry.iterate();
-
- while(iter.hasNext()) {
- results.add(new XmlDataDaoImpl(_sm, (HXmlData)iter.next()));
- }
- Hibernate.close(iter);
-
- return results.toArray(new XmlDataDAO[results.size()]);
- }
-
- /**
- * @see org.apache.ode.bpel.dao.ProcessInstanceDAO#finishCompletion()
- */
- public void finishCompletion() {
- // make sure we have completed.
- assert (ProcessState.isFinished(this.getState()));
- // let our process know that we've done our work.
- this.getProcess().instanceCompleted(this);
- }
-
- public void delete() {
- _sm.getSession().delete(_instance);
- }
-
- public void insertBpelEvent(ProcessInstanceEvent event) {
- // Defer to the BpelDAOConnectionImpl
- BpelDAOConnectionImpl._insertBpelEvent(_sm.getSession(),event,
this.getProcess(), this);
- }
-
- public EventsFirstLastCountTuple getEventsFirstLastCount() {
-
- // Using a criteria, find the min,max, and count of event tstamps.
- Criteria c = _sm.getSession().createCriteria(HBpelEvent.class);
- c.add(Restrictions.eq("instance",_instance));
-
c.setProjection(Projections.projectionList().add(Projections.min("tstamp"))
- .add(Projections.max("tstamp"))
- .add(Projections.count("tstamp")));
-
- Object[] ret = (Object[]) c.uniqueResult();
- EventsFirstLastCountTuple flc = new EventsFirstLastCountTuple();
- flc.first = (Date) ret[0];
- flc.last = (Date) ret[1];
- flc.count = (Integer)ret[2];
- return flc;
- }
-
- public long genMonotonic() {
- long seq = _instance.getSequence()+1;
- _instance.setSequence(seq);
- return seq;
- }
-
- protected void clearSelectors() {
- Query q = getSession().createQuery(QRY_DELSELECTORS);
- q.setEntity(0, _instance);
- q.executeUpdate();
- }
-
- public int getActivityFailureCount() {
- return _instance.getActivityFailureCount();
- }
-
- public Date getActivityFailureDateTime() {
- return _instance.getActivityFailureDateTime();
- }
-
- public Collection<ActivityRecoveryDAO> getActivityRecoveries() {
- List<ActivityRecoveryDAO> results = new
ArrayList<ActivityRecoveryDAO>();
- Query qry = getSession().createQuery(QRY_RECOVERIES);
- qry.setLong(0, _instance.getId());
- Iterator iter = qry.iterate();
- while (iter.hasNext())
- results.add(new ActivityRecoveryDaoImpl(_sm, (HActivityRecovery)
iter.next()));
- Hibernate.close(iter);
- return results;
- }
-
- public void createActivityRecovery(String channel, long activityId, String
reason,
- Date dateTime, Element data, String[]
actions, int retries) {
- HActivityRecovery recovery = new HActivityRecovery();
- recovery.setInstance(_instance);
- recovery.setChannel(channel);
- recovery.setActivityId(activityId);
- recovery.setReason(reason);
- recovery.setDateTime(dateTime);
- recovery.setRetries(retries);
- if (data != null) {
- HLargeData ld = new HLargeData(DOMUtils.domToString(data));
- recovery.setDetails(ld);
- getSession().save(ld);
- }
- String list = actions[0];
- for (int i = 1; i < actions.length; ++i)
- list += " " + actions[i];
- recovery.setActions(list);
- _instance.getActivityRecoveries().add(recovery);
- getSession().save(recovery);
- _instance.setActivityFailureDateTime(dateTime);
- _instance.setActivityFailureCount(_instance.getActivityFailureCount()
+ 1);
+ _instance.setState(state);
+ if(state==ProcessState.STATE_TERMINATED) {
+ clearSelectors();
+ }
+ getSession().update(_instance);
+ }
+ /**
+ * @see org.apache.ode.bpel.dao.ProcessInstanceDAO#getState()
+ */
+ public short getState() {
+ return _instance.getState();
+ }
+ /**
+ * @see org.apache.ode.bpel.dao.ProcessInstanceDAO#getPreviousState()
+ */
+ public short getPreviousState() {
+ return _instance.getPreviousState();
+ }
+
+
+ public ScopeDAO createScope(ScopeDAO parentScope, String name, int
scopeModelId) {
+ HScope scope = new HScope();
+ scope.setParentScope(parentScope != null
+ ? (HScope)((ScopeDaoImpl)parentScope).getHibernateObj()
+ : null);
+ scope.setName(name);
+ scope.setScopeModelId(scopeModelId);
+ scope.setState(ScopeStateEnum.ACTIVE.toString());
+ scope.setInstance(_instance);
+ scope.setCreated(new Date());
+ _instance.getScopes().add(scope);
+ getSession().save(scope);
+
+ return new ScopeDaoImpl(_sm, scope);
+ }
+
+ /**
+ * @see org.apache.ode.bpel.dao.ProcessInstanceDAO#getInstanceId()
+ */
+ public Long getInstanceId() {
+ return _instance.getId();
+ }
+
+ public ScopeDAO getScope(Long scopeInstanceId) {
+ Long id = Long.valueOf(scopeInstanceId);
+ HScope scope = (HScope)getSession().get(HScope.class, id);
+ return scope != null
+ ? new ScopeDaoImpl(_sm, scope)
+ : null;
+ }
+
+ /**
+ * @see
org.apache.ode.bpel.dao.ProcessInstanceDAO#getScopes(java.lang.String)
+ */
+ @SuppressWarnings("unchecked")
+ public Collection<ScopeDAO> getScopes(String scopeName) {
+ Collection<HScope> hscopes;
+ if (scopeName != null) {
+ Query filter = _sm.getSession().createFilter(_instance.getScopes(),
+ "where this.name=?");
+ filter.setString(0,scopeName);
+ hscopes = filter.list();
+ } else
+ hscopes = _instance.getScopes();
+ ArrayList<ScopeDAO> ret = new ArrayList<ScopeDAO>();
+ CollectionsX.transform(ret, hscopes, new UnaryFunction<HScope,ScopeDAO> ()
{
+ public ScopeDAO apply(HScope x) {
+ return new ScopeDaoImpl(_sm, x);
+ }
+ });
+ return ret;
+ }
+
+ public Collection<ScopeDAO> getScopes() {
+ return getScopes(null);
+ }
+
+ /**
+ * @see
org.apache.ode.bpel.dao.ProcessInstanceDAO#getInstantiatingCorrelator()
+ */
+ public CorrelatorDAO getInstantiatingCorrelator() {
+ return new CorrelatorDaoImpl(_sm,
_instance.getInstantiatingCorrelator());
+ }
+
+ /**
+ * @see org.apache.ode.bpel.dao.ProcessInstanceDAO#getLastActiveTime()
+ */
+ public Date getLastActiveTime() {
+ return _instance.getLastActiveTime();
+ }
+ /**
+ * @see
org.apache.ode.bpel.dao.ProcessInstanceDAO#setLastActiveTime(java.util.Date)
+ */
+ public void setLastActiveTime(Date dt) {
+ _instance.setLastActiveTime(dt);
+ }
+
+ public Set<CorrelationSetDAO> getCorrelationSets() {
+ Set<CorrelationSetDAO> results = new HashSet<CorrelationSetDAO>();
+
+ for (HCorrelationSet hCorrelationSet : _instance.getCorrelationSets()) {
+ results.add(new CorrelationSetDaoImpl(_sm, hCorrelationSet));
+ }
+
+ return results;
+ }
+
+ public CorrelationSetDAO getCorrelationSet(String name) {
+ for (HCorrelationSet hCorrelationSet : _instance.getCorrelationSets()) {
+ if (hCorrelationSet.getName().equals(name))
+ return new CorrelationSetDaoImpl(_sm, hCorrelationSet);
+ }
+ return null;
+ }
+
+ /**
+ * @see
org.apache.ode.bpel.dao.ProcessInstanceDAO#getVariables(java.lang.String, int)
+ */
+ public XmlDataDAO[] getVariables(String variableName, int scopeModelId)
{
+ List<XmlDataDAO> results = new ArrayList<XmlDataDAO>();
+
+ Iterator iter;
+ Query qry = getSession().createQuery(QRY_VARIABLES);
+ qry.setString(0, variableName);
+ qry.setInteger(1, scopeModelId);
+ qry.setLong(2, _instance.getId());
+ iter = qry.iterate();
+
+ while(iter.hasNext()) {
+ results.add(new XmlDataDaoImpl(_sm, (HXmlData)iter.next()));
+ }
+ Hibernate.close(iter);
+
+ return results.toArray(new XmlDataDAO[results.size()]);
+ }
+
+ /**
+ * @see org.apache.ode.bpel.dao.ProcessInstanceDAO#finishCompletion()
+ */
+ public void finishCompletion() {
+ // make sure we have completed.
+ assert (ProcessState.isFinished(this.getState()));
+ // let our process know that we've done our work.
+ this.getProcess().instanceCompleted(this);
+ }
+
+ public void delete() {
+ _sm.getSession().delete(_instance);
+ }
+
+ public void insertBpelEvent(ProcessInstanceEvent event) {
+ // Defer to the BpelDAOConnectionImpl
+ BpelDAOConnectionImpl._insertBpelEvent(_sm.getSession(),event,
this.getProcess(), this);
+ }
+
+ public EventsFirstLastCountTuple getEventsFirstLastCount() {
+
+ // Using a criteria, find the min,max, and count of event tstamps.
+ Criteria c = _sm.getSession().createCriteria(HBpelEvent.class);
+ c.add(Restrictions.eq("instance",_instance));
+ c.setProjection(Projections.projectionList().add(Projections.min("tstamp"))
+ .add(Projections.max("tstamp"))
+
.add(Projections.count("tstamp")));
+
+ Object[] ret = (Object[]) c.uniqueResult();
+ EventsFirstLastCountTuple flc = new EventsFirstLastCountTuple();
+ flc.first = (Date) ret[0];
+ flc.last = (Date) ret[1];
+ flc.count = (Integer)ret[2];
+ return flc;
+ }
+
+ public long genMonotonic() {
+ long seq = _instance.getSequence()+1;
+ _instance.setSequence(seq);
+ return seq;
+ }
+
+ protected void clearSelectors() {
+ Query q = getSession().createQuery(QRY_DELSELECTORS);
+ q.setEntity(0, _instance);
+ q.executeUpdate();
+ }
+
+ public int getActivityFailureCount() {
+ return _instance.getActivityFailureCount();
+ }
+
+ public Date getActivityFailureDateTime() {
+ return _instance.getActivityFailureDateTime();
+ }
+
+ public Collection<ActivityRecoveryDAO> getActivityRecoveries() {
+ List<ActivityRecoveryDAO> results = new ArrayList<ActivityRecoveryDAO>();
+ Query qry = getSession().createQuery(QRY_RECOVERIES);
+ qry.setLong(0, _instance.getId());
+ Iterator iter = qry.iterate();
+ while (iter.hasNext())
+ results.add(new ActivityRecoveryDaoImpl(_sm, (HActivityRecovery)
iter.next()));
+ Hibernate.close(iter);
+ return results;
+ }
+
+ public void createActivityRecovery(String channel, long activityId, String
reason,
+ Date dateTime, Element data, String[]
actions, int retries) {
+ HActivityRecovery recovery = new HActivityRecovery();
+ recovery.setInstance(_instance);
+ recovery.setChannel(channel);
+ recovery.setActivityId(activityId);
+ recovery.setReason(reason);
+ recovery.setDateTime(dateTime);
+ recovery.setRetries(retries);
+ if (data != null) {
+ HLargeData ld = new HLargeData(DOMUtils.domToString(data));
+ recovery.setDetails(ld);
+ getSession().save(ld);
+ }
+ String list = actions[0];
+ for (int i = 1; i < actions.length; ++i)
+ list += " " + actions[i];
+ recovery.setActions(list);
+ _instance.getActivityRecoveries().add(recovery);
+ getSession().save(recovery);
+ _instance.setActivityFailureDateTime(dateTime);
+ _instance.setActivityFailureCount(_instance.getActivityFailureCount() + 1);
+ getSession().update(_instance);
+ }
+
+ /**
+ * Delete previously registered activity recovery.
+ */
+ public void deleteActivityRecovery(String channel) {
+ for (HActivityRecovery recovery : _instance.getActivityRecoveries()) {
+ if (recovery.getChannel().equals(channel)) {
+ getSession().delete(recovery);
+ _instance.setActivityFailureCount(_instance.getActivityFailureCount()
- 1);
getSession().update(_instance);
+ return;
+ }
}
-
- /**
- * Delete previously registered activity recovery.
- */
- public void deleteActivityRecovery(String channel) {
- for (HActivityRecovery recovery : _instance.getActivityRecoveries()) {
- if (recovery.getChannel().equals(channel)) {
- getSession().delete(recovery);
-
_instance.setActivityFailureCount(_instance.getActivityFailureCount() - 1);
- getSession().update(_instance);
- return;
- }
- }
- }
-
- public BpelDAOConnection getConnection() {
- return new BpelDAOConnectionImpl(_sm);
- }
+ }
+
+ public BpelDAOConnection getConnection() {
+ return new BpelDAOConnectionImpl(_sm);
+ }
}
Modified:
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/XmlDataDaoImpl.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/XmlDataDaoImpl.java?view=diff&rev=477788&r1=477787&r2=477788
==============================================================================
---
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/XmlDataDaoImpl.java
(original)
+++
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/XmlDataDaoImpl.java
Tue Nov 21 09:56:07 2006
@@ -21,7 +21,7 @@
import org.apache.ode.bpel.dao.ScopeDAO;
import org.apache.ode.bpel.dao.XmlDataDAO;
import org.apache.ode.daohib.SessionManager;
-import org.apache.ode.daohib.hobj.HLargeData;
+import org.apache.ode.daohib.bpel.hobj.HLargeData;
import org.apache.ode.daohib.bpel.hobj.HVariableProperty;
import org.apache.ode.daohib.bpel.hobj.HXmlData;
import org.apache.ode.utils.DOMUtils;
Modified:
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HActivityRecovery.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HActivityRecovery.java?view=diff&rev=477788&r1=477787&r2=477788
==============================================================================
---
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HActivityRecovery.java
(original)
+++
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HActivityRecovery.java
Tue Nov 21 09:56:07 2006
@@ -19,8 +19,6 @@
package org.apache.ode.daohib.bpel.hobj;
-import org.apache.ode.daohib.hobj.HLargeData;
-import org.apache.ode.daohib.hobj.HObject;
import java.util.Date;
/**
Modified:
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HBpelEvent.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HBpelEvent.java?view=diff&rev=477788&r1=477787&r2=477788
==============================================================================
---
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HBpelEvent.java
(original)
+++
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HBpelEvent.java
Tue Nov 21 09:56:07 2006
@@ -22,8 +22,6 @@
import java.sql.Timestamp;
-import org.apache.ode.daohib.hobj.HObject;
-import org.apache.ode.daohib.hobj.HLargeData;
/**
* Row representation of a BPEL event.
Modified:
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelationProperty.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelationProperty.java?view=diff&rev=477788&r1=477787&r2=477788
==============================================================================
---
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelationProperty.java
(original)
+++
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelationProperty.java
Tue Nov 21 09:56:07 2006
@@ -19,7 +19,6 @@
package org.apache.ode.daohib.bpel.hobj;
-import org.apache.ode.daohib.hobj.HObject;
import javax.xml.namespace.QName;
Modified:
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelationSet.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelationSet.java?view=diff&rev=477788&r1=477787&r2=477788
==============================================================================
---
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelationSet.java
(original)
+++
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelationSet.java
Tue Nov 21 09:56:07 2006
@@ -18,7 +18,6 @@
*/
package org.apache.ode.daohib.bpel.hobj;
-import org.apache.ode.daohib.hobj.HObject;
import java.util.HashSet;
import java.util.Collection;
Modified:
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelator.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelator.java?view=diff&rev=477788&r1=477787&r2=477788
==============================================================================
---
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelator.java
(original)
+++
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelator.java
Tue Nov 21 09:56:07 2006
@@ -18,7 +18,6 @@
*/
package org.apache.ode.daohib.bpel.hobj;
-import org.apache.ode.daohib.hobj.HObject;
import java.util.HashSet;
import java.util.Set;
Modified:
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelatorMessage.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelatorMessage.java?view=diff&rev=477788&r1=477787&r2=477788
==============================================================================
---
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelatorMessage.java
(original)
+++
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelatorMessage.java
Tue Nov 21 09:56:07 2006
@@ -18,7 +18,6 @@
*/
package org.apache.ode.daohib.bpel.hobj;
-import org.apache.ode.daohib.hobj.HObject;
/**
* @hibernate.class table="BPEL_UNMATCHED" lazy="true"
Modified:
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelatorMessageKey.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelatorMessageKey.java?view=diff&rev=477788&r1=477787&r2=477788
==============================================================================
---
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelatorMessageKey.java
(original)
+++
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelatorMessageKey.java
Tue Nov 21 09:56:07 2006
@@ -18,7 +18,6 @@
*/
package org.apache.ode.daohib.bpel.hobj;
-import org.apache.ode.daohib.hobj.HObject;
/**
* Hibernate table for representing the pre-computed keys for a message
Modified:
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelatorSelector.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelatorSelector.java?view=diff&rev=477788&r1=477787&r2=477788
==============================================================================
---
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelatorSelector.java
(original)
+++
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HCorrelatorSelector.java
Tue Nov 21 09:56:07 2006
@@ -18,7 +18,6 @@
*/
package org.apache.ode.daohib.bpel.hobj;
-import org.apache.ode.daohib.hobj.HObject;
/**
* @hibernate.class table="BPEL_SELECTORS" lazy="true"
Modified:
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HFaultData.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HFaultData.java?view=diff&rev=477788&r1=477787&r2=477788
==============================================================================
---
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HFaultData.java
(original)
+++
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HFaultData.java
Tue Nov 21 09:56:07 2006
@@ -19,8 +19,6 @@
package org.apache.ode.daohib.bpel.hobj;
-import org.apache.ode.daohib.hobj.HLargeData;
-import org.apache.ode.daohib.hobj.HObject;
/**
* Persistent representation of a fault.
Copied:
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HLargeData.java
(from r469994,
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/hobj/HLargeData.java)
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HLargeData.java?view=diff&rev=477788&p1=incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/hobj/HLargeData.java&r1=469994&p2=incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HLargeData.java&r2=477788
==============================================================================
---
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/hobj/HLargeData.java
(original)
+++
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HLargeData.java
Tue Nov 21 09:56:07 2006
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.ode.daohib.hobj;
+package org.apache.ode.daohib.bpel.hobj;
/**
* Used to store large data sets into a single table. When an HObject
Modified:
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HMessage.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HMessage.java?view=diff&rev=477788&r1=477787&r2=477788
==============================================================================
---
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HMessage.java
(original)
+++
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HMessage.java
Tue Nov 21 09:56:07 2006
@@ -18,8 +18,6 @@
*/
package org.apache.ode.daohib.bpel.hobj;
-import org.apache.ode.daohib.hobj.HLargeData;
-import org.apache.ode.daohib.hobj.HObject;
/**
* Hibernate-managed table for keeping track of messages.
Modified:
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HMessageExchange.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HMessageExchange.java?view=diff&rev=477788&r1=477787&r2=477788
==============================================================================
---
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HMessageExchange.java
(original)
+++
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HMessageExchange.java
Tue Nov 21 09:56:07 2006
@@ -18,8 +18,6 @@
*/
package org.apache.ode.daohib.bpel.hobj;
-import org.apache.ode.daohib.hobj.HLargeData;
-import org.apache.ode.daohib.hobj.HObject;
import java.util.Date;
import java.util.HashMap;
Copied:
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HObject.java
(from r469994,
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/hobj/HObject.java)
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HObject.java?view=diff&rev=477788&p1=incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/hobj/HObject.java&r1=469994&p2=incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HObject.java&r2=477788
==============================================================================
---
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/hobj/HObject.java
(original)
+++
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HObject.java
Tue Nov 21 09:56:07 2006
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.daohib.hobj;
+package org.apache.ode.daohib.bpel.hobj;
import java.util.Date;
Modified:
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HPartnerLink.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HPartnerLink.java?view=diff&rev=477788&r1=477787&r2=477788
==============================================================================
---
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HPartnerLink.java
(original)
+++
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HPartnerLink.java
Tue Nov 21 09:56:07 2006
@@ -19,8 +19,6 @@
package org.apache.ode.daohib.bpel.hobj;
-import org.apache.ode.daohib.hobj.HLargeData;
-import org.apache.ode.daohib.hobj.HObject;
import java.util.Set;
/**
Modified:
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HProcess.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HProcess.java?view=diff&rev=477788&r1=477787&r2=477788
==============================================================================
---
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HProcess.java
(original)
+++
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HProcess.java
Tue Nov 21 09:56:07 2006
@@ -18,6 +18,7 @@
*/
package org.apache.ode.daohib.bpel.hobj;
+
import java.util.Collection;
import java.util.Date;
import java.util.HashSet;
@@ -70,6 +71,10 @@
private boolean _active;
+ private HLargeData _compiledProcess;
+
+ private String _guid;
+
/**
* @hibernate.set
* lazy="true"
@@ -259,4 +264,14 @@
_active = active;
}
+ public void setGuid(String guid) {
+ _guid = guid;
+ }
+
+ /**
+ * @hibernate.property
+ */
+ public String getGuid() {
+ return _guid;
+ }
}
Modified:
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HProcessInstance.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HProcessInstance.java?view=diff&rev=477788&r1=477787&r2=477788
==============================================================================
---
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HProcessInstance.java
(original)
+++
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HProcessInstance.java
Tue Nov 21 09:56:07 2006
@@ -18,8 +18,6 @@
*/
package org.apache.ode.daohib.bpel.hobj;
-import org.apache.ode.daohib.hobj.HObject;
-import org.apache.ode.daohib.hobj.HLargeData;
import java.util.Collection;
import java.util.Date;
Modified:
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HScope.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HScope.java?view=diff&rev=477788&r1=477787&r2=477788
==============================================================================
---
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HScope.java
(original)
+++
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HScope.java
Tue Nov 21 09:56:07 2006
@@ -18,7 +18,6 @@
*/
package org.apache.ode.daohib.bpel.hobj;
-import org.apache.ode.daohib.hobj.HObject;
import java.util.HashSet;
import java.util.Set;
Modified:
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HVariableProperty.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HVariableProperty.java?view=diff&rev=477788&r1=477787&r2=477788
==============================================================================
---
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HVariableProperty.java
(original)
+++
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HVariableProperty.java
Tue Nov 21 09:56:07 2006
@@ -18,7 +18,6 @@
*/
package org.apache.ode.daohib.bpel.hobj;
-import org.apache.ode.daohib.hobj.HObject;
/**
* Efficient storage of properties (bpel properties).
Modified:
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HXmlData.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HXmlData.java?view=diff&rev=477788&r1=477787&r2=477788
==============================================================================
---
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HXmlData.java
(original)
+++
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HXmlData.java
Tue Nov 21 09:56:07 2006
@@ -18,8 +18,6 @@
*/
package org.apache.ode.daohib.bpel.hobj;
-import org.apache.ode.daohib.hobj.HObject;
-import org.apache.ode.daohib.hobj.HLargeData;
import java.util.Collection;
import java.util.HashSet;
Copied:
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ql/HibernateInstancesQueryCompiler.java
(from r469994,
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/ql/instances/HibernateInstancesQueryCompiler.java)
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ql/HibernateInstancesQueryCompiler.java?view=diff&rev=477788&p1=incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/ql/instances/HibernateInstancesQueryCompiler.java&r1=469994&p2=incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ql/HibernateInstancesQueryCompiler.java&r2=477788
==============================================================================
---
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/ql/instances/HibernateInstancesQueryCompiler.java
(original)
+++
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ql/HibernateInstancesQueryCompiler.java
Tue Nov 21 09:56:07 2006
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.ode.daohib.ql.instances;
+package org.apache.ode.daohib.bpel.ql;
import org.apache.commons.lang.StringUtils;
import org.apache.ode.bpel.common.ProcessState;
Copied:
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ql/StateComparator.java
(from r469994,
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/ql/instances/StateComparator.java)
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ql/StateComparator.java?view=diff&rev=477788&p1=incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/ql/instances/StateComparator.java&r1=469994&p2=incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ql/StateComparator.java&r2=477788
==============================================================================
---
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/ql/instances/StateComparator.java
(original)
+++
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ql/StateComparator.java
Tue Nov 21 09:56:07 2006
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.ode.daohib.ql.instances;
+package org.apache.ode.daohib.bpel.ql;
import java.util.Comparator;
Modified:
incubator/ode/trunk/dao-hibernate/src/test/java/org/apache/ode/daohib/ql/InstanceSelectionTest.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-hibernate/src/test/java/org/apache/ode/daohib/ql/InstanceSelectionTest.java?view=diff&rev=477788&r1=477787&r2=477788
==============================================================================
---
incubator/ode/trunk/dao-hibernate/src/test/java/org/apache/ode/daohib/ql/InstanceSelectionTest.java
(original)
+++
incubator/ode/trunk/dao-hibernate/src/test/java/org/apache/ode/daohib/ql/InstanceSelectionTest.java
Tue Nov 21 09:56:07 2006
@@ -26,7 +26,7 @@
import org.apache.ode.daohib.bpel.BaseDAOTest;
import org.apache.ode.daohib.bpel.hobj.HProcess;
import org.apache.ode.daohib.bpel.hobj.HProcessInstance;
-import org.apache.ode.daohib.ql.instances.HibernateInstancesQueryCompiler;
+import org.apache.ode.daohib.bpel.ql.HibernateInstancesQueryCompiler;
import org.apache.ode.ql.eval.skel.CommandEvaluator;
import org.apache.ode.ql.tree.Builder;
import org.apache.ode.ql.tree.BuilderFactory;
