Author: mszefler
Date: Thu Aug 2 10:58:07 2007
New Revision: 562205
URL: http://svn.apache.org/viewvc?view=rev&rev=562205
Log:
BART tweaks.
Modified:
ode/branches/bart/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionImpl.java
ode/branches/bart/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageExchangeDaoImpl.java
ode/branches/bart/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HMessageExchange.java
Modified:
ode/branches/bart/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionImpl.java
URL:
http://svn.apache.org/viewvc/ode/branches/bart/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionImpl.java?view=diff&rev=562205&r1=562204&r2=562205
==============================================================================
---
ode/branches/bart/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionImpl.java
(original)
+++
ode/branches/bart/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionImpl.java
Thu Aug 2 10:58:07 2007
@@ -64,16 +64,24 @@
_session = _sm.getSession();
}
- public MessageExchangeDAO createMessageExchange(char dir) {
+ public MessageExchangeDAO createMessageExchange(String mexId, char dir) {
HMessageExchange mex = new HMessageExchange();
+ mex.setMexId(mexId);
mex.setDirection(dir);
_session.save(mex);
return new MessageExchangeDaoImpl(_sm, mex);
}
- public MessageExchangeDAO getMessageExchange(String mexid) {
- HMessageExchange mex = (HMessageExchange)
_session.get(HMessageExchange.class, new Long(mexid));
- return mex == null ? null : new MessageExchangeDaoImpl(_sm, mex);
+ public MessageExchangeDAO getMessageExchange(String mexId) {
+ try {
+ Criteria criteria = _session.createCriteria(HProcess.class);
+ criteria.add(Expression.eq("mexId", mexId));
+ HMessageExchange mex = (HMessageExchange) criteria.uniqueResult();
+ return mex == null ? null : new MessageExchangeDaoImpl(_sm, mex);
+ } catch (HibernateException e) {
+ __log.error("DbError", e);
+ throw e;
+ }
}
public ProcessDAO createProcess(QName pid, QName type, String guid, long
version) {
@@ -131,7 +139,6 @@
return daos;
}
-
@SuppressWarnings("unchecked")
static Iterator<HProcessInstance> _instanceQuery(Session session, boolean
countOnly, InstanceFilter filter) {
Criteria crit = session.createCriteria(HProcessInstance.class);
@@ -214,8 +221,7 @@
try {
CollectionsX.transformEx(ret, hevents, new
UnaryFunctionEx<HBpelEvent, BpelEvent>() {
public BpelEvent apply(HBpelEvent x) throws Exception {
- return (BpelEvent)
SerializableUtils.toObject(x.getData().getBinary(), BpelEvent.class
- .getClassLoader());
+ return (BpelEvent)
SerializableUtils.toObject(x.getData().getBinary(),
BpelEvent.class.getClassLoader());
}
});
Modified:
ode/branches/bart/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageExchangeDaoImpl.java
URL:
http://svn.apache.org/viewvc/ode/branches/bart/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageExchangeDaoImpl.java?view=diff&rev=562205&r1=562204&r2=562205
==============================================================================
---
ode/branches/bart/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageExchangeDaoImpl.java
(original)
+++
ode/branches/bart/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageExchangeDaoImpl.java
Thu Aug 2 10:58:07 2007
@@ -319,6 +319,10 @@
public void setFailureType(String failureType) {
_hself.setFailureType(failureType);
}
+
+ public String getFailureType() {
+ return _hself.getFailureType();
+ }
public void setInvocationStyle(String invocationStyle) {
_hself.setInvocationStyle(invocationStyle);
Modified:
ode/branches/bart/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HMessageExchange.java
URL:
http://svn.apache.org/viewvc/ode/branches/bart/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HMessageExchange.java?view=diff&rev=562205&r1=562204&r2=562205
==============================================================================
---
ode/branches/bart/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HMessageExchange.java
(original)
+++
ode/branches/bart/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HMessageExchange.java
Thu Aug 2 10:58:07 2007
@@ -18,7 +18,6 @@
*/
package org.apache.ode.daohib.bpel.hobj;
-
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -47,7 +46,7 @@
private HMessage _request;
private HMessage _response;
-
+
private HPartnerLink _partnerLink;
private String _clientKey;
@@ -71,7 +70,7 @@
private String _callee;
private HMessageExchange _p2pPeer;
-
+
private Map<String, String> _properties = new HashMap<String, String>();
private long _timeout;
@@ -80,6 +79,8 @@
private String _failureType;
+ private String _mexId;
+
/**
*
*/
@@ -88,6 +89,20 @@
}
/**
+ *
+ * @hibernate.property
+ * @hibernate.column name="MEXID" not-null="true" unique="true"
+ */
+
+ public String getMexId() {
+ return _mexId;
+ }
+
+ public void setMexId(String mexId) {
+ _mexId = mexId;
+ }
+
+ /**
* @hibernate.property column="PORT_TYPE"
*/
public String getPortType() {
@@ -305,8 +320,7 @@
}
/**
- * @hibernate.map name="properties" table="BPEL_MEX_PROPS" lazy="false"
- * cascade="delete"
+ * @hibernate.map name="properties" table="BPEL_MEX_PROPS" lazy="false"
cascade="delete"
* @hibernate.collection-key column="MEX"
* @hibernate.collection-index column="NAME" type="string"
* @hibernate.collection-element column="VALUE" type="string" length="8000"
@@ -324,21 +338,20 @@
}
/**
- * @hibernate.many-to-one column="PARTNERLINK"
+ * @hibernate.many-to-one column="PARTNERLINK"
*/
public HPartnerLink getPartnerLink() {
return _partnerLink;
}
-
/**
* @hibernate.property column="TIMEOUT"
*
*/
public long getTimeout() {
- return _timeout;
+ return _timeout;
}
-
+
public void setTimeout(long timeout) {
_timeout = timeout;
}
@@ -357,7 +370,7 @@
public HMessageExchange getPipedMessageExchange() {
return _p2pPeer;
}
-
+
public void setPipedMesageExchange(HMessageExchange p2ppeer) {
_p2pPeer = p2ppeer;
}
@@ -365,7 +378,7 @@
public void setFailureType(String failureType) {
_failureType = failureType;
}
-
+
/**
* @hibernate.property column="FAILURE_TYPE"
* @return
@@ -377,5 +390,5 @@
public void setInvocationStyle(String invocationStyle) {
_istyle = invocationStyle;
}
-
+
}
