You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ojb-dev@db.apache.org by ol...@apache.org on 2003/09/14 19:49:45 UTC
cvs commit: db-ojb/src/jca/org/apache/ojb/otm/connector OTMJCAConnection.java
olegnitz 2003/09/14 10:49:45
Modified: src/java/org/apache/ojb/otm OTMConnection.java
src/jca/org/apache/ojb/otm/connector OTMJCAConnection.java
Log:
OTMJCAConnection synchronized with OTMConnection
Revision Changes Path
1.15 +13 -0 db-ojb/src/java/org/apache/ojb/otm/OTMConnection.java
Index: OTMConnection.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/OTMConnection.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- OTMConnection.java 13 Sep 2003 23:50:40 -0000 1.14
+++ OTMConnection.java 14 Sep 2003 17:49:45 -0000 1.15
@@ -170,6 +170,19 @@
public Iterator getIteratorByOQLQuery(OQLQuery query);
/**
+ * @param query The OQL query to execute
+ * @param lock the lock that need to be acquired on the object
+ * Possible values are:
+ * LockType.NO_LOCK (aka read only) - changes to the object will not be written to database;
+ * LockType.READ_LOCK (aka optimistic lock) - changes to the object will be written to the database,
+ * in this case the lock will be automatically upgraded to the write lock on transaction commit;
+ * LockType.WRITE_LOCK (aka pessimistic lock) - changes to the object will be written to the database.
+ * @return an Iterator that iterates Objects of class c if calling the .next()
+ * method. The returned objects are locked for read.
+ */
+ public Iterator getIteratorByOQLQuery(OQLQuery query, int lock);
+
+ /**
* @param query The query to execute
* @param lock the lock that need to be acquired on the object
* Possible values are:
1.10 +17 -3 db-ojb/src/jca/org/apache/ojb/otm/connector/OTMJCAConnection.java
Index: OTMJCAConnection.java
===================================================================
RCS file: /home/cvs/db-ojb/src/jca/org/apache/ojb/otm/connector/OTMJCAConnection.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- OTMJCAConnection.java 20 Aug 2003 17:57:00 -0000 1.9
+++ OTMJCAConnection.java 14 Sep 2003 17:49:45 -0000 1.10
@@ -62,7 +62,9 @@
import org.apache.ojb.otm.EditingContext;
import org.apache.ojb.otm.OTMConnection;
import org.apache.ojb.otm.lock.LockingException;
+import org.odmg.OQLQuery;
+import java.util.Collection;
import java.util.Iterator;
/**
@@ -134,19 +136,31 @@
return m_managedConnection.getConnection().getIteratorByQuery(query, i);
}
- public Iterator getIteratorByOQLQuery(EnhancedOQLQuery query)
+ public Iterator getIteratorByOQLQuery(OQLQuery query)
{
isValidUnderlyingConnection();
return m_managedConnection.getConnection().getIteratorByOQLQuery(query);
}
- public Iterator getIteratorByOQLQuery(EnhancedOQLQuery query, int lock)
+ public Iterator getIteratorByOQLQuery(OQLQuery query, int lock)
{
isValidUnderlyingConnection();
return m_managedConnection.getConnection().getIteratorByOQLQuery(query, lock);
}
- public Identity getIdentity(Object o)
+ public Collection getCollectionByQuery(Query query, int lock)
+ {
+ isValidUnderlyingConnection();
+ return m_managedConnection.getConnection().getCollectionByQuery(query, lock);
+ }
+
+ public Collection getCollectionByQuery(Query query)
+ {
+ isValidUnderlyingConnection();
+ return m_managedConnection.getConnection().getCollectionByQuery(query);
+ }
+
+ public Identity getIdentity(Object o)
{
isValidUnderlyingConnection();
return m_managedConnection.getConnection().getIdentity(o);
---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org