ode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mi...@apache.org
Subject svn commit: r697203 - in /ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel: ./ hobj/
Date Fri, 19 Sep 2008 19:34:34 GMT
Author: midon
Date: Fri Sep 19 12:34:33 2008
New Revision: 697203

URL: http://svn.apache.org/viewvc?rev=697203&view=rev
Log:
create a new log category specific to DAO methods that might trigger SQL queries

Modified:
    ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ActivityRecoveryDaoImpl.java
    ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CorrelationSetDaoImpl.java
    ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CorrelatorDaoImpl.java
    ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/FaultDAOImpl.java
    ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/HibernateDao.java
    ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageDaoImpl.java
    ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageExchangeDaoImpl.java
    ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageRouteDaoImpl.java
    ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/PartnerLinkDAOImpl.java
    ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessDaoImpl.java
    ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessInstanceDaoImpl.java
    ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ScopeDaoImpl.java
    ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/XmlDataDaoImpl.java
    ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HMessage.java

Modified: ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ActivityRecoveryDaoImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ActivityRecoveryDaoImpl.java?rev=697203&r1=697202&r2=697203&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ActivityRecoveryDaoImpl.java
(original)
+++ ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ActivityRecoveryDaoImpl.java
Fri Sep 19 12:34:33 2008
@@ -34,10 +34,12 @@
  */
 public class ActivityRecoveryDaoImpl extends HibernateDao implements ActivityRecoveryDAO
{
 
+
     HActivityRecovery _self;
 
     public ActivityRecoveryDaoImpl(SessionManager sm, HActivityRecovery recovery) {
         super(sm, recovery);
+        entering("ActivityRecoveryDaoImpl.ActivityRecoveryDaoImpl");
         _self = recovery;
     }
 
@@ -58,6 +60,7 @@
     }
 
     public Element getDetails() {
+        entering("ActivityRecoveryDaoImpl.getDetails");
         if (_self.getDetails() == null) return null;
         try {
             return DOMUtils.stringToDOM(_self.getDetails().getText());

Modified: ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CorrelationSetDaoImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CorrelationSetDaoImpl.java?rev=697203&r1=697202&r2=697203&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CorrelationSetDaoImpl.java
(original)
+++ ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CorrelationSetDaoImpl.java
Fri Sep 19 12:34:33 2008
@@ -39,6 +39,7 @@
 
   public CorrelationSetDaoImpl(SessionManager sessionManager, HCorrelationSet correlationSet)
{
     super(sessionManager, correlationSet);
+      entering("CorrelationSetDaoImpl.CorrelationSetDaoImpl");
     _correlationSet = correlationSet;
   }
 
@@ -51,10 +52,12 @@
   }
 
   public ScopeDAO getScope() {
+      entering("CorrelationSetDaoImpl.getScope");
     return new ScopeDaoImpl(_sm, _correlationSet.getScope());
   }
 
   public void setValue(QName[] names, CorrelationKey values) {
+      entering("CorrelationSetDaoImpl.setValue");
     _correlationSet.setValue(values.toCanonicalString());
     if (_correlationSet.getProperties() == null || _correlationSet.getProperties().size()
== 0) {
       for (int m = 0; m < names.length; m++) {
@@ -74,11 +77,13 @@
   }
 
   public CorrelationKey getValue() {
+      entering("CorrelationSetDaoImpl.getValue");
     if (_correlationSet.getValue() != null) return new CorrelationKey(_correlationSet.getValue());
     else return null;
   }
 
   public Map<QName, String> getProperties() {
+      entering("CorrelationSetDaoImpl.getProperties");
     HashMap<QName, String> result = new HashMap<QName, String>();
     for (HCorrelationProperty property : _correlationSet.getProperties()) {
       result.put(property.getQName(), property.getValue());
@@ -87,6 +92,7 @@
   }
 
   private HCorrelationProperty getProperty(QName qName) {
+      entering("CorrelationSetDaoImpl.getProperty");
     for (HCorrelationProperty property : _correlationSet.getProperties()) {
       if (qName.getLocalPart().equals(property.getName())
               && qName.getNamespaceURI().equals(property.getNamespace()))

Modified: ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CorrelatorDaoImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CorrelatorDaoImpl.java?rev=697203&r1=697202&r2=697203&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CorrelatorDaoImpl.java
(original)
+++ ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CorrelatorDaoImpl.java
Fri Sep 19 12:34:33 2008
@@ -73,10 +73,12 @@
 
     public CorrelatorDaoImpl(SessionManager sm, HCorrelator hobj) {
         super(sm, hobj);
+        entering("CorrelatorDaoImpl.CorrelatorDaoImpl");
         _hobj = hobj;
     }
 
     public MessageExchangeDAO dequeueMessage(CorrelationKey key) {
+        entering("CorrelatorDaoImpl.dequeueMessage");
         String hdr = "dequeueMessage(" + key + "): ";
         __log.debug(hdr);
 
@@ -103,6 +105,7 @@
     }
 
     public MessageRouteDAO findRoute(CorrelationKey key) {
+        entering("CorrelatorDaoImpl.findRoute");
         String hdr = "findRoute(key=" + key + "): ";
         if (__log.isDebugEnabled())
             __log.debug(hdr);
@@ -144,6 +147,7 @@
     }
 
     public void enqueueMessage(MessageExchangeDAO mex, CorrelationKey[] correlationKeys)
{
+        entering("CorrelatorDaoImpl.enqueueMessage");
         String[] keys = canonifyKeys(correlationKeys);
         String hdr = "enqueueMessage(mex=" + ((MessageExchangeDaoImpl) mex)._hobj.getId()
+ " keys="
                 + CollectionUtils.makeCollection(ArrayList.class, keys) + "): ";
@@ -174,6 +178,7 @@
     }
 
     public void addRoute(String routeGroupId, ProcessInstanceDAO target, int idx, CorrelationKey
correlationKey) {
+        entering("CorrelatorDaoImpl.addRoute");
         String hdr = "addRoute(" + routeGroupId + ", iid=" + target.getInstanceId() + ",
idx=" + idx + ", ckey="
                 + correlationKey + "): ";
 
@@ -194,7 +199,7 @@
     }
 
     public boolean checkRoute(CorrelationKey ckey) {
-
+        entering("CorrelatorDaoImpl.checkRoute");
         Query lockQry = getSession().createQuery(LOCK_SELECTORS);
         lockQry.setString("ckey", ckey == null ? null : ckey.toCanonicalString());
         lockQry.setEntity("corr",_hobj);
@@ -207,6 +212,7 @@
     }
 
     public void removeRoutes(String routeGroupId, ProcessInstanceDAO target) {
+        entering("CorrelatorDaoImpl.removeRoutes");
         String hdr = "removeRoutes(" + routeGroupId + ", iid=" + target.getInstanceId() +
"): ";
         __log.debug(hdr);
         Query q = getSession().createQuery(QRY_DELSELECTORS);
@@ -218,6 +224,7 @@
     }
 
     public void removeEntries(HMessageExchange mex) {
+        entering("CorrelatorDaoImpl.removeEntries");
         String hdr = "removeEntries(" + mex + "): ";
         __log.debug(hdr);
 

Modified: ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/FaultDAOImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/FaultDAOImpl.java?rev=697203&r1=697202&r2=697203&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/FaultDAOImpl.java
(original)
+++ ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/FaultDAOImpl.java
Fri Sep 19 12:34:33 2008
@@ -35,37 +35,40 @@
  */
 public class FaultDAOImpl extends HibernateDao implements FaultDAO {
 
-  HFaultData _self;
 
-  public FaultDAOImpl(SessionManager sm, HFaultData fault) {
-    super(sm, fault);
-    _self = fault;
-  }
-
-  public QName getName() {
-    return QNameUtils.toQName(_self.getName());
-  }
-
-  public Element getData() {
-    if (_self.getData() == null) return null;
-    try {
-      return DOMUtils.stringToDOM(_self.getData().getText());
-    } catch (SAXException e) {
-      throw new RuntimeException(e);
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  public String getExplanation() {
-    return _self.getExplanation();
-  }
-
-  public int getLineNo() {
-    return _self.getLineNo();
-  }
-
-  public int getActivityId() {
-    return _self.getActivityId();
-  }
+    HFaultData _self;
+
+    public FaultDAOImpl(SessionManager sm, HFaultData fault) {
+        super(sm, fault);
+        if (logDao.isDebugEnabled()) logDao.debug("FaultDAOImpl.FaultDAOImpl");
+        _self = fault;
+    }
+
+    public QName getName() {
+        return QNameUtils.toQName(_self.getName());
+    }
+
+    public Element getData() {
+        entering("FaultDAOImpl.getData");
+        if (_self.getData() == null) return null;
+        try {
+            return DOMUtils.stringToDOM(_self.getData().getText());
+        } catch (SAXException e) {
+            throw new RuntimeException(e);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public String getExplanation() {
+        return _self.getExplanation();
+    }
+
+    public int getLineNo() {
+        return _self.getLineNo();
+    }
+
+    public int getActivityId() {
+        return _self.getActivityId();
+    }
 }

Modified: ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/HibernateDao.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/HibernateDao.java?rev=697203&r1=697202&r2=697203&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/HibernateDao.java
(original)
+++ ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/HibernateDao.java
Fri Sep 19 12:34:33 2008
@@ -20,22 +20,38 @@
 
 import org.apache.ode.daohib.SessionManager;
 import org.apache.ode.daohib.bpel.hobj.HObject;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.hibernate.Session;
 
 import java.io.Serializable;
 
 /**
  * Base class for our DAO objects.
+ * <p>
+ * All subclass methods that might trigger SQL queries should log a message in the log category
'org.apache.ode.bpel.DAO' when entered.
+ * A typical message could be "className.methodName". <br/>
+ * Typical candidates are setters, finders and getters of entities. Getters of simple properties
won't provide relevant information. 
  */
 public abstract class HibernateDao {
-  protected final SessionManager _sm;
-  protected final HObject _hobj;
+
+    // logger used by subclasses to track entered methods that may trigger sql query
+    // we don't use the package name to avoid interferences with other logging info.
+    static final Log logDao = LogFactory.getLog("org.apache.ode.bpel.DAO");
+
+    protected final SessionManager _sm;
+    protected final HObject _hobj;
 
 	protected HibernateDao(SessionManager sessionManager, HObject hobj) {
     _sm = sessionManager;
 		_hobj = hobj;
 	}
 
+    void entering(String msg){
+        // add a prefix to be parser friendly 
+        if(logDao.isDebugEnabled()) logDao.debug("entering "+msg);
+    }
+
 	/**
 	 * @see org.apache.ode.utils.dao.DAO#getDHandle()
 	 */

Modified: ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageDaoImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageDaoImpl.java?rev=697203&r1=697202&r2=697203&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageDaoImpl.java
(original)
+++ ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageDaoImpl.java
Fri Sep 19 12:34:33 2008
@@ -31,6 +31,7 @@
 
 import javax.xml.namespace.QName;
 
+
 public class MessageDaoImpl extends HibernateDao implements MessageDAO {
 
     private HMessage _hself;
@@ -38,11 +39,13 @@
 
     protected MessageDaoImpl(SessionManager sessionManager, HMessage hobj) {
         super(sessionManager, hobj);
+        entering("MessageDaoImpl.MessageDaoImpl");
         _hself = hobj;
         _session = sessionManager.getSession();
     }
 
     public void setType(QName type) {
+        entering("MessageDaoImpl.setType");
         _hself.setType(type == null ? null : type.toString());
     }
 
@@ -51,6 +54,7 @@
     }
 
     public void setData(Element value) {
+        entering("MessageDaoImpl.setData");
         if (value == null) return;
         if (_hself.getMessageData() != null)
             _session.delete(_hself.getMessageData());
@@ -61,6 +65,7 @@
     }
 
     public Element getData() {
+        entering("MessageDaoImpl.getData");
         if (_hself.getMessageData() == null)
             return null;
         try {
@@ -71,6 +76,7 @@
     }
 
     public void setHeader(Element value) {
+        entering("MessageDaoImpl.setHeader");
         if (value == null) return;
         if (_hself.getHeader() != null)
             _session.delete(_hself.getHeader());
@@ -81,6 +87,7 @@
     }
 
     public Element getHeader() {
+        entering("MessageDaoImpl.getHeader");
         if (_hself.getHeader() == null) return null;
         try {
             return DOMUtils.stringToDOM(_hself.getHeader().getText());
@@ -90,6 +97,7 @@
     }
 
     public MessageExchangeDAO getMessageExchange() {
+        entering("MessageDaoImpl.getMessageExchange");
         return new MessageExchangeDaoImpl(_sm,_hself.getMessageExchange());
     }
 

Modified: ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageExchangeDaoImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageExchangeDaoImpl.java?rev=697203&r1=697202&r2=697203&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageExchangeDaoImpl.java
(original)
+++ ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageExchangeDaoImpl.java
Fri Sep 19 12:34:33 2008
@@ -49,6 +49,7 @@
 
     public MessageExchangeDaoImpl(SessionManager sm, HMessageExchange mex) {
         super(sm, mex);
+        entering("MessageExchangeDaoImpl.MessageExchangeDaoImpl");
         _hself = mex;
     }
 
@@ -57,6 +58,7 @@
     }
 
     public MessageDAO getResponse() {
+        entering("MessageExchangeDaoImpl.getResponse");
         return _hself.getResponse() == null ? null : new MessageDaoImpl(_sm, _hself.getResponse());
     }
 
@@ -65,6 +67,7 @@
     }
 
     public MessageDAO getRequest() {
+        entering("MessageExchangeDaoImpl.getRequest");
         return _hself.getRequest() == null ? null : new MessageDaoImpl(_sm, _hself.getRequest());
     }
 
@@ -77,11 +80,13 @@
     }
 
     public void setPortType(QName porttype) {
+        entering("MessageExchangeDaoImpl.setPortType");
         _hself.setPortType(porttype == null ? null : porttype.toString());
         update();
     }
 
     public void setStatus(String status) {
+        entering("MessageExchangeDaoImpl.setStatus");
         _hself.setState(status);
         update();
     }
@@ -91,6 +96,7 @@
     }
 
     public MessageDAO createMessage(QName type) {
+        entering("MessageExchangeDaoImpl.createMessage");
         HMessage message = new HMessage();
         message.setType(type == null ? null : type.toString());
         message.setCreated(new Date());
@@ -101,11 +107,13 @@
     }
 
     public void setRequest(MessageDAO msg) {
+        entering("MessageExchangeDaoImpl.setRequest");
         _hself.setRequest(msg == null ? null : (HMessage) ((MessageDaoImpl) msg).getHibernateObj());
         update();
     }
 
     public void setResponse(MessageDAO msg) {
+        entering("MessageExchangeDaoImpl.setResponse");
         _hself.setResponse(msg == null ? null : (HMessage) ((MessageDaoImpl) msg).getHibernateObj());
         update();
     }
@@ -115,6 +123,7 @@
     }
 
     public void setPartnerLinkModelId(int modelId) {
+        entering("MessageExchangeDaoImpl.setPartnerLinkModelId");
         _hself.setPartnerLinkModelId(modelId);
         update();
     }
@@ -124,22 +133,26 @@
     }
 
     public void setCorrelationId(String clientKey) {
+        entering("MessageExchangeDaoImpl.setCorrelationId");
         _hself.setClientKey(clientKey);
         update();
     }
 
     public void setPattern(String pattern) {
+        entering("MessageExchangeDaoImpl.setPattern");
         _hself.setPattern(pattern);
         update();
 
     }
 
     public void setOperation(String opname) {
+        entering("MessageExchangeDaoImpl.setOperation");
         _hself.setOperationName(opname);
         update();
     }
 
     public void setEPR(Element source) {
+        entering("MessageExchangeDaoImpl.setEPR");
         if (source == null)
             _hself.setEndpoint(null);
         else {
@@ -153,6 +166,7 @@
     }
 
     public Element getEPR() {
+        entering("MessageExchangeDaoImpl.getEPR");
         HLargeData ld = _hself.getEndpoint();
         if (ld == null)
             return null;
@@ -164,6 +178,7 @@
     }
 
     public void setCallbackEPR(Element source) {
+        entering("MessageExchangeDaoImpl.setCallbackEPR");
         if (source == null)
             _hself.setCallbackEndpoint(null);
         else {
@@ -177,6 +192,7 @@
     }
 
     public Element getCallbackEPR() {
+        entering("MessageExchangeDaoImpl.getCallbackEPR");
         HLargeData ld = _hself.getCallbackEndpoint();
         if (ld == null)
             return null;
@@ -196,6 +212,7 @@
     }
 
     public void setChannel(String channel) {
+        entering("MessageExchangeDaoImpl.setChannel");
         _hself.setChannelName(channel);
         update();
     }
@@ -210,6 +227,7 @@
     }
 
     public void setFault(QName faultType) {
+        entering("MessageExchangeDaoImpl.setFault");
         _hself.setFault(faultType == null ? null : faultType.toString());
         update();
     }
@@ -219,11 +237,13 @@
     }
 
     public void setFaultExplanation(String explanation) {
+        entering("MessageExchangeDaoImpl.setFaultExplanation");
         _hself.setFaultExplanation(explanation);
         update();
     }
 
     public void setCorrelationStatus(String cstatus) {
+        entering("MessageExchangeDaoImpl.setCorrelationStatus");
         _hself.setCorrelationStatus(cstatus);
         update();
     }
@@ -233,11 +253,13 @@
     }
 
     public ProcessDAO getProcess() {
+        entering("MessageExchangeDaoImpl.getProcess");
         if (_externalProcess != null) return _externalProcess;
         else return _hself.getProcess() == null ? null : new ProcessDaoImpl(_sm, _hself.getProcess());
     }
 
     public void setProcess(ProcessDAO process) {
+        entering("MessageExchangeDaoImpl.setProcess");
         if (process == null || process instanceof ProcessDaoImpl) {
         _hself.setProcess(process == null ? null : (HProcess) ((ProcessDaoImpl) process).getHibernateObj());
         update();
@@ -247,6 +269,7 @@
     }
 
     public void setInstance(ProcessInstanceDAO instance) {
+        entering("MessageExchangeDaoImpl.setInstance");
         if (instance == null || instance instanceof ProcessInstanceDaoImpl) {
         _hself.setInstance(instance == null ? null : (HProcessInstance) ((ProcessInstanceDaoImpl)
instance)
                 .getHibernateObj());
@@ -258,6 +281,7 @@
     }
 
     public ProcessInstanceDAO getInstance() {
+        entering("MessageExchangeDaoImpl.getInstance");
         if (_externalInstance != null) return _externalInstance;
         else return _hself.getInstance() == null ? null : new ProcessInstanceDaoImpl(_sm,
_hself.getInstance());
     }
@@ -272,29 +296,35 @@
     }
 
     public void setCallee(QName callee) {
+        entering("MessageExchangeDaoImpl.setCallee");
         _hself.setCallee(callee == null ? null : callee.toString());
         update();
     }
 
     public String getProperty(String key) {
+        entering("MessageExchangeDaoImpl.getProperty");
         return _hself.getProperties().get(key);
     }
 
     public void setProperty(String key, String value) {
+        entering("MessageExchangeDaoImpl.setProperty");
         _hself.getProperties().put(key, value);
         update();
     }
 
     public void setPartnerLink(PartnerLinkDAO plinkDAO) {
+        entering("MessageExchangeDaoImpl.setPartnerLink");
         _hself.setPartnerLink(((PartnerLinkDAOImpl) plinkDAO)._self);
         update();
     }
 
     public PartnerLinkDAO getPartnerLink() {
+        entering("MessageExchangeDaoImpl.getPartnerLink");
         return new PartnerLinkDAOImpl(_sm, _hself.getPartnerLink());
     }
 
     public Set<String> getPropertyNames() {
+        entering("MessageExchangeDaoImpl.getPropertyNames");
         return Collections.unmodifiableSet(_hself.getProperties().keySet());
     }
 
@@ -303,6 +333,7 @@
     }
 
     public void setPipedMessageExchangeId(String mexId) {
+        entering("MessageExchangeDaoImpl.setPipedMessageExchangeId");
         _hself.setPipedMessageExchangeId(mexId);
     }
 

Modified: ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageRouteDaoImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageRouteDaoImpl.java?rev=697203&r1=697202&r2=697203&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageRouteDaoImpl.java
(original)
+++ ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageRouteDaoImpl.java
Fri Sep 19 12:34:33 2008
@@ -39,6 +39,7 @@
 
     public MessageRouteDaoImpl(SessionManager sm, HCorrelatorSelector hobj) {
         super(sm, hobj);
+        entering("MessageRouteDaoImpl.MessageRouteDaoImpl");
         _selector = hobj;
     }
 
@@ -46,6 +47,7 @@
      * @see org.apache.ode.bpel.dao.MessageRouteDAO#getTargetInstance()
      */
     public ProcessInstanceDAO getTargetInstance() {
+        entering("MessageRouteDaoImpl.getTargetInstance");
         // First we need to reliably lock the instance:
         if (!_locked) {
             Query q = getSession().createQuery(LOCK_INSTANCE);
@@ -59,10 +61,12 @@
     }
 
     public String getGroupId() {
+        entering("MessageRouteDaoImpl.getGroupId");
         return _selector.getGroupId();
     }
 
     public int getIndex() {
+        entering("MessageRouteDaoImpl.getIndex");
         return _selector.getIndex();
     }
 

Modified: ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/PartnerLinkDAOImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/PartnerLinkDAOImpl.java?rev=697203&r1=697202&r2=697203&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/PartnerLinkDAOImpl.java
(original)
+++ ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/PartnerLinkDAOImpl.java
Fri Sep 19 12:34:33 2008
@@ -36,6 +36,7 @@
  */
 public class PartnerLinkDAOImpl extends HibernateDao implements PartnerLinkDAO {
 
+
     /** Cached copy of my epr */
     private Element _myEPR;
 
@@ -46,6 +47,7 @@
 
     public PartnerLinkDAOImpl(SessionManager sessionManager, HPartnerLink hobj) {
         super(sessionManager, hobj);
+        entering("PartnerLinkDAOImpl.PartnerLinkDAOImpl");
         _self = hobj;
     }
 
@@ -70,11 +72,13 @@
     }
 
     public void setMyRoleServiceName(QName svcName) {
+        entering("PartnerLinkDAOImpl.setMyRoleServiceName");
         _self.setServiceName(svcName == null ? null : svcName.toString());
         update();
     }
 
     public Element getMyEPR() {
+        entering("PartnerLinkDAOImpl.getMyEPR");
         if (_myEPR != null)
             return _myEPR;
         if (_self.getMyEPR() == null)
@@ -87,6 +91,7 @@
     }
 
     public void setMyEPR(Element val) {
+        entering("PartnerLinkDAOImpl.setMyEPR");
         _myEPR = val;
         if (_self.getMyEPR() != null)
             _sm.getSession().delete(_self.getMyEPR());
@@ -101,6 +106,7 @@
     }
 
     public Element getPartnerEPR() {
+        entering("PartnerLinkDAOImpl.getPartnerEPR");
         if (_partnerEPR != null)
             return _partnerEPR;
         if (_self.getPartnerEPR() == null)
@@ -113,6 +119,7 @@
     }
 
     public void setPartnerEPR(Element val) {
+        entering("PartnerLinkDAOImpl.setPartnerEPR");
         _partnerEPR = val;
         if (_self.getPartnerEPR() != null)
             _sm.getSession().delete(_self.getPartnerEPR());
@@ -135,10 +142,12 @@
     }
 
     public void setPartnerSessionId(String session) {
+        entering("PartnerLinkDAOImpl.setPartnerSessionId");
         _self.setPartnerSessionId(session);
     }
 
     public void setMySessionId(String sessionId) {
+        entering("PartnerLinkDAOImpl.setMySessionId");
         _self.setMySessionId(sessionId);
 
     }

Modified: ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessDaoImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessDaoImpl.java?rev=697203&r1=697202&r2=697203&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessDaoImpl.java
(original)
+++ ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessDaoImpl.java
Fri Sep 19 12:34:33 2008
@@ -42,12 +42,14 @@
  * Hibernate-based {@link ProcessDAO} implementation.
  */
 class ProcessDaoImpl extends HibernateDao implements ProcessDAO {
+
     private static final String QRY_CORRELATOR = "where this.correlatorId = ?";
 
     private HProcess _process;
 
     public ProcessDaoImpl(SessionManager sm, HProcess process) {
         super(sm,process);
+        entering("ProcessDaoImpl.ProcessDaoImpl");
         _process = process;
     }
 
@@ -56,6 +58,7 @@
     }
 
     public ProcessInstanceDAO getInstance(Long iid) {
+        entering("ProcessDaoImpl.getInstance");
         ProcessInstanceDAO instance = BpelDAOConnectionImpl._getInstance(_sm, getSession(),
iid);
         if (instance == null || !instance.getProcess().getProcessId().equals(getProcessId()))
             return null;
@@ -64,6 +67,7 @@
 
 
     public CorrelatorDAO getCorrelator(String  corrId) {
+        entering("ProcessDaoImpl.getCorrelator");
         Iterator results;
         Query q = getSession().createFilter(_process.getCorrelators(),
                 QRY_CORRELATOR);
@@ -81,12 +85,14 @@
     }
 
     public void removeRoutes(String routeId, ProcessInstanceDAO target) {
+        entering("ProcessDaoImpl.removeRoutes");
         for (HCorrelator hCorrelator : _process.getCorrelators()) {
             new CorrelatorDaoImpl(_sm, hCorrelator).removeRoutes(routeId, target);
         }
     }
 
     public ProcessInstanceDAO createInstance(CorrelatorDAO correlator) {
+        entering("ProcessDaoImpl.createInstance");
         HProcessInstance instance = new HProcessInstance();
         instance.setInstantiatingCorrelator((HCorrelator)((CorrelatorDaoImpl)correlator).getHibernateObj());
         instance.setProcess(_process);
@@ -102,7 +108,7 @@
      */
     @SuppressWarnings("unchecked")
     public Collection<ProcessInstanceDAO> findInstance(CorrelationKey ckeyValue) {
-
+        entering("ProcessDaoImpl.findInstance");
         Criteria criteria = getSession().createCriteria(HCorrelationSet.class);
         criteria.add(Expression.eq("scope.instance.process.id",_process.getId()));
         criteria.add(Expression.eq("value", ckeyValue.toCanonicalString()));
@@ -119,6 +125,7 @@
     }
 
     public void delete() {
+        entering("ProcessDaoImpl.delete");
         getSession().delete(_process);
     }
 
@@ -131,6 +138,7 @@
     }
 
     public CorrelatorDAO addCorrelator(String corrid) {
+        entering("ProcessDaoImpl.addCorrelator");
         HCorrelator correlator = new HCorrelator();
         correlator.setCorrelatorId(corrid);
         correlator.setProcess(_process);
@@ -142,7 +150,9 @@
     }
 
 	public int getNumInstances() {
-		// TODO: Is this efficient? 
+        entering("ProcessDaoImpl.getNumInstances");
+        // this should be efficient if the relation is tagged as extra-lazy.
+        // If the collection is not initialized yet, Hibernate will do a count(*) and the
whole collection will not be fetched.
 		return _process.getInstances().size();
 	}
 

Modified: ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessInstanceDaoImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessInstanceDaoImpl.java?rev=697203&r1=697202&r2=697203&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessInstanceDaoImpl.java
(original)
+++ ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessInstanceDaoImpl.java
Fri Sep 19 12:34:33 2008
@@ -57,6 +57,7 @@
   
 	public ProcessInstanceDaoImpl(SessionManager sm, HProcessInstance instance) {
     super(sm, instance);
+        entering("ProcessInstanceDaoImpl.ProcessInstanceDaoImpl");
 		_instance = instance;
 	}
 
@@ -68,6 +69,7 @@
 	}
   
   public void setFault(FaultDAO fault) {
+      entering("ProcessInstanceDaoImpl.setFault");
     _instance.setFault(((FaultDAOImpl)fault)._self);
     getSession().update(_instance);
     
@@ -78,6 +80,7 @@
    * @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) {
+       entering("ProcessInstanceDaoImpl.setFault");
     if (_instance.getFault() != null)
       getSession().delete(_instance.getFault());
 
@@ -100,6 +103,7 @@
    * @see org.apache.ode.bpel.dao.ProcessInstanceDAO#getFault()
    */
   public FaultDAO getFault() {
+      entering("ProcessInstanceDaoImpl.getFault");
     if (_instance.getFault() == null) return null;
     else return new FaultDAOImpl(_sm, _instance.getFault());
   }
@@ -108,6 +112,7 @@
 	 * @see org.apache.ode.bpel.dao.ProcessInstanceDAO#getExecutionState()
 	 */
 	public byte[] getExecutionState() {
+        entering("ProcessInstanceDaoImpl.getExecutionState");
     if (_instance.getJacobState() == null) return null;
     return _instance.getJacobState().getBinary();
 	}
@@ -115,6 +120,7 @@
 	 * @see org.apache.ode.bpel.dao.ProcessInstanceDAO#setExecutionState(byte[])
 	 */
 	public void setExecutionState(byte[] bytes) {
+        entering("ProcessInstanceDaoImpl.setExecutionState");
     if (_instance.getJacobState() != null)
       getSession().delete(_instance.getJacobState());
     if (bytes.length > 0) {
@@ -129,6 +135,7 @@
 	 * @see org.apache.ode.bpel.dao.ProcessInstanceDAO#getProcess()
 	 */
 	public ProcessDAO getProcess() {
+        entering("ProcessInstanceDaoImpl.getProcess");
 		return new ProcessDaoImpl(_sm, _instance.getProcess());
 	}
   
@@ -136,6 +143,7 @@
 	 * @see org.apache.ode.bpel.dao.ProcessInstanceDAO#getRootScope()
 	 */
 	public ScopeDAO getRootScope() {
+        entering("ProcessInstanceDaoImpl.getRootScope");
     if (_root != null) 
       return _root;
     Query rootQry = getSession().createFilter(_instance.getScopes(),
@@ -149,6 +157,7 @@
 	 * @see org.apache.ode.bpel.dao.ProcessInstanceDAO#setState(short)
 	 */
 	public void setState(short state) {
+        entering("ProcessInstanceDaoImpl.setState");
         _instance.setPreviousState(_instance.getState());
     _instance.setState(state);
     if(state==ProcessState.STATE_TERMINATED) {
@@ -171,6 +180,7 @@
 
   
 	public ScopeDAO createScope(ScopeDAO parentScope, String name, int scopeModelId) {
+        entering("ProcessInstanceDaoImpl.createScope");
 		HScope scope = new HScope();
     scope.setParentScope(parentScope != null
         ? (HScope)((ScopeDaoImpl)parentScope).getHibernateObj()
@@ -194,6 +204,7 @@
 	}
 
   public ScopeDAO getScope(Long scopeInstanceId) {
+      entering("ProcessInstanceDaoImpl.getScope");
     Long id = Long.valueOf(scopeInstanceId);
     HScope scope = (HScope)getSession().get(HScope.class, id);
     return scope != null
@@ -206,6 +217,7 @@
 	 */
 	@SuppressWarnings("unchecked")
   public Collection<ScopeDAO> getScopes(String scopeName) {
+        entering("ProcessInstanceDaoImpl.getScopes");
     Collection<HScope> hscopes;
     if (scopeName != null) {
       Query filter = _sm.getSession().createFilter(_instance.getScopes(),
@@ -231,6 +243,7 @@
 	 * @see org.apache.ode.bpel.dao.ProcessInstanceDAO#getInstantiatingCorrelator()
 	 */
 	public CorrelatorDAO getInstantiatingCorrelator() {
+        entering("ProcessInstanceDaoImpl.getInstantiatingCorrelator");
 		return new CorrelatorDaoImpl(_sm, _instance.getInstantiatingCorrelator());
 	}
 
@@ -244,10 +257,12 @@
 	 * @see org.apache.ode.bpel.dao.ProcessInstanceDAO#setLastActiveTime(java.util.Date)
 	 */
 	public void setLastActiveTime(Date dt) {
+        entering("ProcessInstanceDaoImpl.setLastActiveTime");
 		_instance.setLastActiveTime(dt);
 	}
 
   public Set<CorrelationSetDAO> getCorrelationSets() {
+      entering("ProcessInstanceDaoImpl.getCorrelationSets");
     Set<CorrelationSetDAO> results = new HashSet<CorrelationSetDAO>();
 
     for (HCorrelationSet hCorrelationSet : _instance.getCorrelationSets()) {
@@ -258,6 +273,7 @@
   }
 
   public CorrelationSetDAO getCorrelationSet(String name) {
+      entering("ProcessInstanceDaoImpl.getCorrelationSet");
     for (HCorrelationSet hCorrelationSet : _instance.getCorrelationSets()) {
       if (hCorrelationSet.getName().equals(name))
         return new CorrelationSetDaoImpl(_sm, hCorrelationSet);
@@ -270,6 +286,7 @@
      * @see org.apache.ode.bpel.dao.ProcessInstanceDAO#getVariables(java.lang.String, int)
      */
 	public XmlDataDAO[] getVariables(String variableName, int scopeModelId) {
+        entering("ProcessInstanceDaoImpl.getVariables");
     List<XmlDataDAO> results = new ArrayList<XmlDataDAO>();
 
     Iterator iter;
@@ -291,6 +308,7 @@
    * @see org.apache.ode.bpel.dao.ProcessInstanceDAO#finishCompletion()
    */
   public void finishCompletion() {
+      entering("ProcessInstanceDaoImpl.finishCompletion");
     // make sure we have completed.
     assert (ProcessState.isFinished(this.getState()));
     // let our process know that we've done our work.
@@ -298,16 +316,18 @@
   }
 
   public void delete() {
+      entering("ProcessInstanceDaoImpl.delete");
     _sm.getSession().delete(_instance);
   }
 
   public void insertBpelEvent(ProcessInstanceEvent event) {
+      entering("ProcessInstanceDaoImpl.insertBpelEvent");
     // Defer to the BpelDAOConnectionImpl
     BpelDAOConnectionImpl._insertBpelEvent(_sm.getSession(),event, this.getProcess(), this);
   }
 
   public EventsFirstLastCountTuple getEventsFirstLastCount() {
-
+      entering("ProcessInstanceDaoImpl.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));
@@ -324,12 +344,14 @@
   }
 
   public long genMonotonic() {
+      entering("ProcessInstanceDaoImpl.genMonotonic");
     long seq = _instance.getSequence()+1;
     _instance.setSequence(seq);
     return seq;
   }
   
   protected void clearSelectors() {
+      entering("ProcessInstanceDaoImpl.clearSelectors");
     Query q = getSession().createQuery(QRY_DELSELECTORS);
     q.setEntity(0, _instance);
     q.executeUpdate();    
@@ -344,6 +366,7 @@
   }
 
   public Collection<ActivityRecoveryDAO> getActivityRecoveries() {
+      entering("ProcessInstanceDaoImpl.getActivityRecoveries");
     List<ActivityRecoveryDAO> results = new ArrayList<ActivityRecoveryDAO>();
     Query qry = getSession().createQuery(QRY_RECOVERIES);
     qry.setLong(0, _instance.getId());
@@ -356,6 +379,7 @@
 
   public void createActivityRecovery(String channel, long activityId, String reason,
                                      Date dateTime, Element data, String[] actions, int retries)
{
+      entering("ProcessInstanceDaoImpl.createActivityRecovery");
     HActivityRecovery recovery = new HActivityRecovery();
     recovery.setInstance(_instance);
     recovery.setChannel(channel);
@@ -383,6 +407,7 @@
    * Delete previously registered activity recovery.
    */
   public void deleteActivityRecovery(String channel) {
+      entering("ProcessInstanceDaoImpl.deleteActivityRecovery");
     for (HActivityRecovery recovery : _instance.getActivityRecoveries()) {
       if (recovery.getChannel().equals(channel)) {
         getSession().delete(recovery);
@@ -394,6 +419,7 @@
   }
   
   public BpelDAOConnection getConnection() {
+      entering("ProcessInstanceDaoImpl.getConnection");
     return new BpelDAOConnectionImpl(_sm);
   }
 

Modified: ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ScopeDaoImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ScopeDaoImpl.java?rev=697203&r1=697202&r2=697203&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ScopeDaoImpl.java
(original)
+++ ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ScopeDaoImpl.java
Fri Sep 19 12:34:33 2008
@@ -46,6 +46,7 @@
  */
 class ScopeDaoImpl extends HibernateDao implements ScopeDAO {
 
+
     private static final String QRY_VARIABLE = "from " + HXmlData.class.getName() +
             " as x where x.name = ? and x.scope.id = ?";
 
@@ -61,6 +62,7 @@
 
     public ScopeDaoImpl(SessionManager sm, HScope scope) {
         super(sm, scope);
+        entering("ScopeDaoImpl.ScopeDaoImpl");
         _scope = scope;
     }
 
@@ -68,6 +70,7 @@
      * @see org.apache.ode.bpel.dao.ScopeDAO#getCorrelationSet(java.lang.String)
      */
     public CorrelationSetDAO getCorrelationSet(String corrSetName) {
+        entering("ScopeDaoImpl.getCorrelationSet");
         Query qry = getSession().createQuery(QRY_CSET);
         qry.setString(0,corrSetName);
         qry.setLong(1,_scope.getId());
@@ -88,6 +91,7 @@
      * @see org.apache.ode.bpel.dao.ScopeDAO#getParentScope()
      */
     public ScopeDAO getParentScope() {
+        entering("ScopeDaoImpl.getParentScope");
         return _scope.getParentScope() != null
                 ? new ScopeDaoImpl(_sm, _scope.getParentScope())
                 : null;
@@ -96,12 +100,14 @@
      * @see org.apache.ode.bpel.dao.ScopeDAO#getProcessInstance()
      */
     public ProcessInstanceDAO getProcessInstance() {
+        entering("ScopeDaoImpl.getProcessInstance");
         return new ProcessInstanceDaoImpl(_sm, _scope.getInstance());
     }
     /**
      * @see org.apache.ode.bpel.dao.ScopeDAO#setState(org.apache.ode.bpel.dao.ScopeStateEnum)
      */
     public void setState(ScopeStateEnum state) {
+        entering("ScopeDaoImpl.setState");
         _scope.setState(state.toString());
         getSession().update(_scope);
     }
@@ -121,6 +127,7 @@
      * @see org.apache.ode.bpel.dao.ScopeDAO#getVariable(java.lang.String)
      */
     public XmlDataDAO getVariable(String varName) {
+        entering("ScopeDaoImpl.getVariable");
         XmlDataDAO cached = _variables.get(varName);
         if (cached != null) return _variables.get(varName);
 
@@ -144,6 +151,7 @@
     }
 
     public PartnerLinkDAO createPartnerLink(int modelId, String pLinkName, String myRole,
String partnerRole) {
+        entering("ScopeDaoImpl.createPartnerLink");
         HPartnerLink epr = new HPartnerLink();
         epr.setModelId(modelId);
         epr.setLinkName(pLinkName);
@@ -157,6 +165,7 @@
     }
 
     public PartnerLinkDAO getPartnerLink(int plinkId) {
+        entering("ScopeDaoImpl.getPartnerLink");
         Query qry = getSession().createQuery(QRY_SCOPE_EPR);
         qry.setInteger(0,plinkId);
         qry.setEntity(1,_scope);
@@ -167,6 +176,7 @@
     }
 
     public Collection<PartnerLinkDAO> getPartnerLinks() {
+        entering("ScopeDaoImpl.getPartnerLinks");
         ArrayList<PartnerLinkDAO> plinks = new ArrayList<PartnerLinkDAO>();
         for (HPartnerLink hPartnerLink : _scope.getPartnerLinks()) {
             plinks.add(new PartnerLinkDAOImpl(_sm, hPartnerLink));
@@ -189,6 +199,7 @@
     }
 
     public Set<CorrelationSetDAO> getCorrelationSets() {
+        entering("ScopeDaoImpl.getCorrelationSets");
         Set<CorrelationSetDAO> results = new HashSet<CorrelationSetDAO>();
         for (HCorrelationSet hCorrelationSet : _scope.getCorrelationSets()) {
             results.add(new CorrelationSetDaoImpl(_sm, hCorrelationSet));
@@ -199,6 +210,7 @@
 
     @SuppressWarnings("unchecked")
     public Collection<ScopeDAO> getChildScopes() {
+        entering("ScopeDaoImpl.getChildScopes");
         Query q = getSession().createQuery("from " + HScope.class.getName() + " as x where
x.parentScope=?");
         q.setEntity(0, _scope);
         Collection<HScope> hscopes = q.list();
@@ -212,6 +224,7 @@
 
     @SuppressWarnings("unchecked")
     public Collection<XmlDataDAO> getVariables() {
+        entering("ScopeDaoImpl.getVariables");
         Query q = getSession().createFilter(_scope.getVariables(), "where this.scope=?");
         q.setEntity(0, _scope);
         return CollectionsX.transform(new LinkedList<XmlDataDAO>(), (Collection<HXmlData>)q.list(),
new UnaryFunction<HXmlData,XmlDataDAO>() {
@@ -224,7 +237,7 @@
 
     @SuppressWarnings("unchecked")
     public List<BpelEvent> listEvents() {
-
+        entering("ScopeDaoImpl.listEvents");
 //        CriteriaBuilder cb = new CriteriaBuilder();
         Criteria crit = _sm.getSession().createCriteria(HBpelEvent.class);
 //        if (efilter != null)

Modified: ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/XmlDataDaoImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/XmlDataDaoImpl.java?rev=697203&r1=697202&r2=697203&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/XmlDataDaoImpl.java
(original)
+++ ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/XmlDataDaoImpl.java
Fri Sep 19 12:34:33 2008
@@ -38,6 +38,8 @@
  * Hibernate-based {@link XmlDataDAO} implementation.
  */
 class XmlDataDaoImpl extends HibernateDao implements XmlDataDAO {
+
+
     private static final String QUERY_PROPERTY =
             "from " + HVariableProperty.class.getName() +
                     " as p where p.xmlData.id = ? and p.name = ?";
@@ -50,12 +52,14 @@
      */
     public XmlDataDaoImpl(SessionManager sm, HXmlData hobj) {
         super(sm, hobj);
+        entering("XmlDataDaoImpl.XmlDataDaoImpl");
         _data = hobj;
     }
     /**
      * @see org.apache.ode.bpel.dao.XmlDataDAO#isNull()
      */
     public boolean isNull() {
+        entering("XmlDataDaoImpl.isNull");
         return _data.getData() == null;
     }
 
@@ -63,6 +67,7 @@
      * @see org.apache.ode.bpel.dao.XmlDataDAO#get()
      */
     public Node get() {
+        entering("XmlDataDaoImpl.get");
         if(_node == null){
             _node = prepare();
         }
@@ -78,6 +83,7 @@
      * @see org.apache.ode.bpel.dao.XmlDataDAO#set(org.w3c.dom.Node)
      */
     public void set(Node val) {
+        entering("XmlDataDaoImpl.set");
         _node = val;
         _data.setSimpleType(!(val instanceof Element));
         if (_data.getData() != null) _sm.getSession().delete(_data.getData());
@@ -97,7 +103,7 @@
      * @see org.apache.ode.bpel.dao.XmlDataDAO#getProperty(java.lang.String)
      */
     public String getProperty(String propertyName) {
-
+        entering("XmlDataDaoImpl.getProperty");
         HVariableProperty p = _getProperty(propertyName);
         return p == null
                 ? null
@@ -108,6 +114,7 @@
      * @see org.apache.ode.bpel.dao.XmlDataDAO#setProperty(java.lang.String, java.lang.String)
      */
     public void setProperty(String pname, String pvalue) {
+        entering("XmlDataDaoImpl.setProperty");
         HVariableProperty p = _getProperty(pname);
         if(p == null){
             p = new HVariableProperty(_data, pname, pvalue);
@@ -123,10 +130,12 @@
      * @see org.apache.ode.bpel.dao.XmlDataDAO#getScopeDAO()
      */
     public ScopeDAO getScopeDAO() {
+        entering("XmlDataDaoImpl.getScopeDAO");
         return new ScopeDaoImpl(_sm,_data.getScope());
     }
 
     private HVariableProperty _getProperty(String propertyName){
+        entering("XmlDataDaoImpl._getProperty");
         Iterator iter;
         Query qry = getSession().createQuery(QUERY_PROPERTY);
         qry.setLong(0, _data.getId());

Modified: ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HMessage.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HMessage.java?rev=697203&r1=697202&r2=697203&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HMessage.java
(original)
+++ ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HMessage.java
Fri Sep 19 12:34:33 2008
@@ -61,7 +61,7 @@
     _data = data;
   }
 
-  /** @hibernate.many-to-one column="HEADER" */
+  /** @hibernate.many-to-one column="HEADER"  lazy="false" outer-join="true" */
   public HLargeData getHeader() {
     return _header;
   }



Mime
View raw message