You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by ms...@apache.org on 2007/08/15 19:37:57 UTC
svn commit: r566279 - in /ode/branches/bart:
bpel-api/src/main/java/org/apache/ode/bpel/pmapi/
bpel-dao/src/main/java/org/apache/ode/bpel/dao/
bpel-ql/src/main/java/org/apache/ode/ql/jcc/
bpel-runtime/src/main/java/org/apache/ode/bpel/engine/ bpel-runt...
Author: mszefler
Date: Wed Aug 15 10:37:55 2007
New Revision: 566279
URL: http://svn.apache.org/viewvc?view=rev&rev=566279
Log:
BART ---
* javadocs
* made MessageDAO first-class object (removed association with messageexchange)
Modified:
ode/branches/bart/bpel-api/src/main/java/org/apache/ode/bpel/pmapi/InstanceManagement.java
ode/branches/bart/bpel-api/src/main/java/org/apache/ode/bpel/pmapi/ProcessManagement.java
ode/branches/bart/bpel-dao/src/main/java/org/apache/ode/bpel/dao/MessageDAO.java
ode/branches/bart/bpel-ql/src/main/java/org/apache/ode/ql/jcc/TreeBuilder.java
ode/branches/bart/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java
ode/branches/bart/bpel-runtime/src/main/java/org/apache/ode/bpel/intercept/NoOpInterceptor.java
ode/branches/bart/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/MessageDAOImpl.java
ode/branches/bart/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/MessageExchangeDAOImpl.java
ode/branches/bart/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageDaoImpl.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/HMessage.java
ode/branches/bart/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ql/HibernateInstancesQueryCompiler.java
ode/branches/bart/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageDAOImpl.java
ode/branches/bart/jacob/src/main/java/org/apache/ode/jacob/vpu/JacobMessages.java
Modified: ode/branches/bart/bpel-api/src/main/java/org/apache/ode/bpel/pmapi/InstanceManagement.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-api/src/main/java/org/apache/ode/bpel/pmapi/InstanceManagement.java?view=diff&rev=566279&r1=566278&r2=566279
==============================================================================
--- ode/branches/bart/bpel-api/src/main/java/org/apache/ode/bpel/pmapi/InstanceManagement.java (original)
+++ ode/branches/bart/bpel-api/src/main/java/org/apache/ode/bpel/pmapi/InstanceManagement.java Wed Aug 15 10:37:55 2007
@@ -145,7 +145,7 @@
* Get an instance by id.
* @param iid
* @return information about a specific instance
- * @throws InstanceNotFoundException TODO
+ * @throws InstanceNotFoundException
*/
InstanceInfoDocument getInstanceInfo(Long iid) throws InstanceNotFoundException;
Modified: ode/branches/bart/bpel-api/src/main/java/org/apache/ode/bpel/pmapi/ProcessManagement.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-api/src/main/java/org/apache/ode/bpel/pmapi/ProcessManagement.java?view=diff&rev=566279&r1=566278&r2=566279
==============================================================================
--- ode/branches/bart/bpel-api/src/main/java/org/apache/ode/bpel/pmapi/ProcessManagement.java (original)
+++ ode/branches/bart/bpel-api/src/main/java/org/apache/ode/bpel/pmapi/ProcessManagement.java Wed Aug 15 10:37:55 2007
@@ -106,7 +106,7 @@
/**
* Retire a process.
* @param pid identifier of the process to retire
- * @param retired TODO
+ * @param retired new value of retired flag
* @return {@link ProcessInfoDocument} reflecting the modification
*/
ProcessInfoDocument setRetired(QName pid, boolean retired)
Modified: ode/branches/bart/bpel-dao/src/main/java/org/apache/ode/bpel/dao/MessageDAO.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-dao/src/main/java/org/apache/ode/bpel/dao/MessageDAO.java?view=diff&rev=566279&r1=566278&r2=566279
==============================================================================
--- ode/branches/bart/bpel-dao/src/main/java/org/apache/ode/bpel/dao/MessageDAO.java (original)
+++ ode/branches/bart/bpel-dao/src/main/java/org/apache/ode/bpel/dao/MessageDAO.java Wed Aug 15 10:37:55 2007
@@ -23,16 +23,24 @@
import org.w3c.dom.Element;
-// TODO: Abstract out the data representation.
+/**
+ * Representation of a message (i.e. request/response) in the database.
+ *
+ * @author Maciej Szefler <mszefler at gmail dot com>
+ *
+ */
public interface MessageDAO {
- void setType(QName type);
-
- QName getType();
-
- void setData(Element value);
-
- Element getData();
+ /** Set the message type (i.e. the <wsdl:message> type). */
+ void setType(QName type);
+
+ /** Get the message type (i.e. the <wsdl:message> type). */
+ QName getType();
+
+ /** Set the message data (content). */
+ void setData(Element value);
+
+ /** Get the message data (content). */
+ Element getData();
- MessageExchangeDAO getMessageExchange();
}
Modified: ode/branches/bart/bpel-ql/src/main/java/org/apache/ode/ql/jcc/TreeBuilder.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-ql/src/main/java/org/apache/ode/ql/jcc/TreeBuilder.java?view=diff&rev=566279&r1=566278&r2=566279
==============================================================================
--- ode/branches/bart/bpel-ql/src/main/java/org/apache/ode/ql/jcc/TreeBuilder.java (original)
+++ ode/branches/bart/bpel-ql/src/main/java/org/apache/ode/ql/jcc/TreeBuilder.java Wed Aug 15 10:37:55 2007
@@ -48,7 +48,6 @@
org.apache.ode.ql.jcc.ASTStart start = new Parser(query).start();
return build(start);
}catch(ParseException ex) {
- //TODO create common exception which will indicate parsing exception
throw new RuntimeException(ex.getMessage(), ex);
}
}
@@ -119,7 +118,6 @@
ASTOrderType astType = (ASTOrderType)extractChildNode(node, 1);
type = OrderByType.valueOf(astType.getValue().toUpperCase());
} else {
- //TODO
throw new IllegalArgumentException();
}
Identifier id = createIdentifier(node, 0);
@@ -185,7 +183,6 @@
if(node instanceof ASTProperty) {
return new org.apache.ode.ql.tree.nodes.Property(((ASTProperty)node).getName());
}
- //TODO
throw new IllegalArgumentException("");
}
private ASTValue extractValue(Node parentNode, int index) {
@@ -196,14 +193,12 @@
private Node extractChildNode(Node parentNode, int index, Class expected) {
Node node = extractChildNode(parentNode, index);
if(!(expected.isAssignableFrom(node.getClass()))) {
- //TODO
throw new IllegalArgumentException("");
}
return node;
}
private Node extractChildNode(Node parentNode, int index) {
if(parentNode.jjtGetNumChildren()<=index) {
- //TODO
throw new IllegalArgumentException("");
}
return parentNode.jjtGetChild(index);
Modified: ode/branches/bart/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java?view=diff&rev=566279&r1=566278&r2=566279
==============================================================================
--- ode/branches/bart/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java (original)
+++ ode/branches/bart/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java Wed Aug 15 10:37:55 2007
@@ -37,7 +37,6 @@
import org.apache.ode.bpel.dao.CorrelatorDAO;
import org.apache.ode.bpel.dao.MessageDAO;
import org.apache.ode.bpel.dao.MessageExchangeDAO;
-import org.apache.ode.bpel.dao.MessageRouteDAO;
import org.apache.ode.bpel.dao.PartnerLinkDAO;
import org.apache.ode.bpel.dao.ProcessDAO;
import org.apache.ode.bpel.dao.ProcessInstanceDAO;
@@ -1012,8 +1011,14 @@
}
public QName getPartnerFault(String mexId) {
- MessageExchangeDAO mex = _getPartnerResponse(mexId).getMessageExchange();
- return mex.getFault();
+ MessageExchangeDAO dao = _dao.getConnection().getMessageExchange(mexId);
+ if (dao == null) {
+ // this should not happen....
+ String msg = "Engine requested non-existent message exchange: " + mexId;
+ __log.fatal(msg);
+ throw new BpelEngineException(msg);
+ }
+ return dao.getFault();
}
public QName getPartnerResponseType(String mexId) {
Modified: ode/branches/bart/bpel-runtime/src/main/java/org/apache/ode/bpel/intercept/NoOpInterceptor.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-runtime/src/main/java/org/apache/ode/bpel/intercept/NoOpInterceptor.java?view=diff&rev=566279&r1=566278&r2=566279
==============================================================================
--- ode/branches/bart/bpel-runtime/src/main/java/org/apache/ode/bpel/intercept/NoOpInterceptor.java (original)
+++ ode/branches/bart/bpel-runtime/src/main/java/org/apache/ode/bpel/intercept/NoOpInterceptor.java Wed Aug 15 10:37:55 2007
@@ -18,8 +18,6 @@
*/
package org.apache.ode.bpel.intercept;
-import org.apache.ode.bpel.iapi.MyRoleMessageExchange;
-import org.apache.ode.bpel.iapi.PartnerRoleMessageExchange;
/**
* No-Op implementation of the
Modified: ode/branches/bart/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/MessageDAOImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/MessageDAOImpl.java?view=diff&rev=566279&r1=566278&r2=566279
==============================================================================
--- ode/branches/bart/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/MessageDAOImpl.java (original)
+++ ode/branches/bart/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/MessageDAOImpl.java Wed Aug 15 10:37:55 2007
@@ -19,20 +19,17 @@
package org.apache.ode.bpel.memdao;
+import javax.xml.namespace.QName;
+
import org.apache.ode.bpel.dao.MessageDAO;
-import org.apache.ode.bpel.dao.MessageExchangeDAO;
import org.apache.ode.utils.DOMUtils;
import org.w3c.dom.Element;
-import javax.xml.namespace.QName;
-
public class MessageDAOImpl extends DaoBaseImpl implements MessageDAO {
private QName type;
private Element data;
- private MessageExchangeDAO messageExchange;
- public MessageDAOImpl(MessageExchangeDAO messageExchange) {
- this.messageExchange = messageExchange;
+ public MessageDAOImpl() {
}
public void setType(QName type) {
@@ -54,8 +51,5 @@
return data;
}
- public MessageExchangeDAO getMessageExchange() {
- return messageExchange;
- }
-
+
}
Modified: ode/branches/bart/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/MessageExchangeDAOImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/MessageExchangeDAOImpl.java?view=diff&rev=566279&r1=566278&r2=566279
==============================================================================
--- ode/branches/bart/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/MessageExchangeDAOImpl.java (original)
+++ ode/branches/bart/bpel-runtime/src/main/java/org/apache/ode/bpel/memdao/MessageExchangeDAOImpl.java Wed Aug 15 10:37:55 2007
@@ -112,7 +112,7 @@
}
public MessageDAO createMessage(QName type) {
- MessageDAO messageDAO = new MessageDAOImpl(this);
+ MessageDAO messageDAO = new MessageDAOImpl();
messageDAO.setType(type);
return messageDAO;
}
Modified: ode/branches/bart/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageDaoImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageDaoImpl.java?view=diff&rev=566279&r1=566278&r2=566279
==============================================================================
--- ode/branches/bart/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageDaoImpl.java (original)
+++ ode/branches/bart/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageDaoImpl.java Wed Aug 15 10:37:55 2007
@@ -20,8 +20,9 @@
package org.apache.ode.daohib.bpel;
+import javax.xml.namespace.QName;
+
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;
@@ -29,8 +30,6 @@
import org.hibernate.Session;
import org.w3c.dom.Element;
-import javax.xml.namespace.QName;
-
public class MessageDaoImpl extends HibernateDao implements MessageDAO {
private HMessage _hself;
@@ -70,10 +69,5 @@
}
}
-
- public MessageExchangeDAO getMessageExchange() {
- return new MessageExchangeDaoImpl(_sm,_hself.getMessageExchange());
- }
-
}
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=566279&r1=566278&r2=566279
==============================================================================
--- 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 Wed Aug 15 10:37:55 2007
@@ -100,7 +100,6 @@
HMessage message = new HMessage();
message.setType(type == null ? null : type.toString());
message.setCreated(new Date());
- message.setMessageExchange(_hself);
getSession().save(message);
return new MessageDaoImpl(_sm, message);
Modified: ode/branches/bart/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HMessage.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HMessage.java?view=diff&rev=566279&r1=566278&r2=566279
==============================================================================
--- ode/branches/bart/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HMessage.java (original)
+++ ode/branches/bart/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HMessage.java Wed Aug 15 10:37:55 2007
@@ -27,20 +27,9 @@
*/
public class HMessage extends HObject {
- private HMessageExchange _mex;
private String _type;
private HLargeData _data;
-
- public void setMessageExchange(HMessageExchange mex) {
- _mex = mex;
- }
-
- /** @hibernate.many-to-one column="MEX" */
- public HMessageExchange getMessageExchange() {
- return _mex;
- }
-
public void setType(String type) {
_type = type;
}
Modified: ode/branches/bart/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ql/HibernateInstancesQueryCompiler.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ql/HibernateInstancesQueryCompiler.java?view=diff&rev=566279&r1=566278&r2=566279
==============================================================================
--- ode/branches/bart/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ql/HibernateInstancesQueryCompiler.java (original)
+++ ode/branches/bart/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ql/HibernateInstancesQueryCompiler.java Wed Aug 15 10:37:55 2007
@@ -334,7 +334,6 @@
try {
value.setValue(ISO8601DateParser.parse((String) value.getValue()));
} catch (ParseException ex) {
- // TODO
throw new RuntimeException(ex);
}
}
@@ -521,7 +520,6 @@
objValues.add(ISO8601DateParser.parse((String) value.getValue()));
}
} catch (ParseException ex) {
- // TODO
throw new RuntimeException(ex);
}
} else {
Modified: ode/branches/bart/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageDAOImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageDAOImpl.java?view=diff&rev=566279&r1=566278&r2=566279
==============================================================================
--- ode/branches/bart/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageDAOImpl.java (original)
+++ ode/branches/bart/dao-jpa/src/main/java/org/apache/ode/dao/jpa/MessageDAOImpl.java Wed Aug 15 10:37:55 2007
@@ -20,25 +20,21 @@
package org.apache.ode.dao.jpa;
-import org.apache.ode.bpel.dao.MessageDAO;
-import org.apache.ode.bpel.dao.MessageExchangeDAO;
-import org.apache.ode.utils.DOMUtils;
-import org.w3c.dom.Element;
-
import javax.persistence.Basic;
-import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
-import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Lob;
-import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.xml.namespace.QName;
+import org.apache.ode.bpel.dao.MessageDAO;
+import org.apache.ode.utils.DOMUtils;
+import org.w3c.dom.Element;
+
@Entity
@Table(name="ODE_MESSAGE")
@@ -53,15 +49,12 @@
private String _data;
@Transient
private Element _element;
- @ManyToOne(fetch=FetchType.LAZY,cascade={CascadeType.ALL}) @Column(name="MESSAGE_EXCHANGE_ID")
- private MessageExchangeDAOImpl _messageExchange;
public MessageDAOImpl() {
}
public MessageDAOImpl(QName type, MessageExchangeDAOImpl me) {
_type = type.toString();
- _messageExchange = me;
}
public Element getData() {
@@ -74,10 +67,6 @@
}
return _element;
- }
-
- public MessageExchangeDAO getMessageExchange() {
- return _messageExchange;
}
public QName getType() {
Modified: ode/branches/bart/jacob/src/main/java/org/apache/ode/jacob/vpu/JacobMessages.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/jacob/src/main/java/org/apache/ode/jacob/vpu/JacobMessages.java?view=diff&rev=566279&r1=566278&r2=566279
==============================================================================
--- ode/branches/bart/jacob/src/main/java/org/apache/ode/jacob/vpu/JacobMessages.java (original)
+++ ode/branches/bart/jacob/src/main/java/org/apache/ode/jacob/vpu/JacobMessages.java Wed Aug 15 10:37:55 2007
@@ -44,24 +44,7 @@
methodName, className);
}
- // TODO
- public String msgContDeHydrationErr(String channel, String name) {
- throw new UnsupportedOperationException();
- }
- /**
- * Error indicating that a re-hydration of a saved _continuation object could
- * not be completed.
- *
- * @param channel
- * channel with the dangling _continuation
- * @param mlClassName
- * name of de-hydrated {@link org.apache.ode.jacob.ChannelListener} object
- *
- */
- public String msgContHydrationErr(String channel, String mlClassName) {
- throw new UnsupportedOperationException();
- }
/**
* Internal error indicating that a required client method was not accessible