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 ar...@apache.org on 2005/01/13 21:05:36 UTC
cvs commit: db-ojb/src/ejb/org/apache/ojb/ejb/pb PBBaseBeanImpl.java PBSessionBean.java PersonArticleManagerPBBean.java PersonManagerPBBean.java RollbackBean.java
arminw 2005/01/13 12:05:36
Modified: src/ejb/org/apache/ojb/ejb/odmg ODMGBaseBeanImpl.java
RollbackBean.java
src/ejb/org/apache/ojb/ejb/pb PBBaseBeanImpl.java
PBSessionBean.java PersonArticleManagerPBBean.java
PersonManagerPBBean.java RollbackBean.java
Log:
merge with 1.0.x branch
Revision Changes Path
1.7 +2 -2 db-ojb/src/ejb/org/apache/ojb/ejb/odmg/ODMGBaseBeanImpl.java
Index: ODMGBaseBeanImpl.java
===================================================================
RCS file: /home/cvs/db-ojb/src/ejb/org/apache/ojb/ejb/odmg/ODMGBaseBeanImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ODMGBaseBeanImpl.java 13 Sep 2004 10:54:27 -0000 1.6
+++ ODMGBaseBeanImpl.java 13 Jan 2005 20:05:36 -0000 1.7
@@ -170,7 +170,7 @@
public int getCount(Class target)
{
PersistenceBroker broker = ((HasBroker) odmg.currentTransaction()).getBroker();
- int result = broker.getCount(new QueryByCriteria(target, null));
+ int result = broker.getCount(new QueryByCriteria(target));
return result;
}
1.3 +2 -2 db-ojb/src/ejb/org/apache/ojb/ejb/odmg/RollbackBean.java
Index: RollbackBean.java
===================================================================
RCS file: /home/cvs/db-ojb/src/ejb/org/apache/ojb/ejb/odmg/RollbackBean.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RollbackBean.java 13 Sep 2004 10:54:28 -0000 1.2
+++ RollbackBean.java 13 Jan 2005 20:05:36 -0000 1.3
@@ -270,7 +270,7 @@
tx.flush();
Class searchClass = objectsToStore.get(0).getClass();
PersistenceBroker broker = tx.getBroker();
- Query q = new QueryByCriteria(searchClass, new Criteria());
+ Query q = new QueryByCriteria(searchClass);
// we get the iterator and step into the first found object
Iterator it = broker.getIteratorByQuery(q);
it.next();
1.6 +3 -3 db-ojb/src/ejb/org/apache/ojb/ejb/pb/PBBaseBeanImpl.java
Index: PBBaseBeanImpl.java
===================================================================
RCS file: /home/cvs/db-ojb/src/ejb/org/apache/ojb/ejb/pb/PBBaseBeanImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PBBaseBeanImpl.java 11 Aug 2004 00:46:56 -0000 1.5
+++ PBBaseBeanImpl.java 13 Jan 2005 20:05:36 -0000 1.6
@@ -89,7 +89,7 @@
int result;
try
{
- result = broker.getCount(new QueryByCriteria(target, null));
+ result = broker.getCount(new QueryByCriteria(target));
}
finally
{
@@ -107,7 +107,7 @@
Collection result;
try
{
- Query q = new QueryByCriteria(target, null);
+ Query q = new QueryByCriteria(target);
result = broker.getCollectionByQuery(q);
}
finally
1.8 +4 -4 db-ojb/src/ejb/org/apache/ojb/ejb/pb/PBSessionBean.java
Index: PBSessionBean.java
===================================================================
RCS file: /home/cvs/db-ojb/src/ejb/org/apache/ojb/ejb/pb/PBSessionBean.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PBSessionBean.java 13 Sep 2004 10:54:29 -0000 1.7
+++ PBSessionBean.java 13 Jan 2005 20:05:36 -0000 1.8
@@ -131,7 +131,7 @@
protected int getCount(Class target)
{
PersistenceBroker broker = getBroker();
- int result = broker.getCount(new QueryByCriteria(target, null));
+ int result = broker.getCount(new QueryByCriteria(target));
broker.close();
return result;
}
@@ -143,7 +143,7 @@
{
if(log.isDebugEnabled()) log.debug("getAllObjects was called");
PersistenceBroker broker = getBroker();
- Query q = new QueryByCriteria(target, null);
+ Query q = new QueryByCriteria(target);
Collection result = broker.getCollectionByQuery(q);
broker.close();
return result;
@@ -156,7 +156,7 @@
{
if(log.isDebugEnabled()) log.debug("getAllObjects was called");
PersistenceBroker broker = getBroker();
- Query q = new QueryByCriteria(target, null);
+ Query q = new QueryByCriteria(target);
Iterator result = broker.getIteratorByQuery(q);
broker.close();
return result;
1.9 +2 -2 db-ojb/src/ejb/org/apache/ojb/ejb/pb/PersonArticleManagerPBBean.java
Index: PersonArticleManagerPBBean.java
===================================================================
RCS file: /home/cvs/db-ojb/src/ejb/org/apache/ojb/ejb/pb/PersonArticleManagerPBBean.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- PersonArticleManagerPBBean.java 13 Sep 2004 10:54:29 -0000 1.8
+++ PersonArticleManagerPBBean.java 13 Jan 2005 20:05:36 -0000 1.9
@@ -107,7 +107,7 @@
try
{
// do something with broker
- Query q = new QueryByCriteria(PersonVO.class, null);
+ Query q = new QueryByCriteria(PersonVO.class);
broker.getCollectionByQuery(q);
// System.out.println("## broker1: con=" + broker.serviceConnectionManager().getConnection());
//now use nested bean call
1.5 +2 -2 db-ojb/src/ejb/org/apache/ojb/ejb/pb/PersonManagerPBBean.java
Index: PersonManagerPBBean.java
===================================================================
RCS file: /home/cvs/db-ojb/src/ejb/org/apache/ojb/ejb/pb/PersonManagerPBBean.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PersonManagerPBBean.java 5 Apr 2004 00:17:08 -0000 1.4
+++ PersonManagerPBBean.java 13 Jan 2005 20:05:36 -0000 1.5
@@ -112,7 +112,7 @@
Criteria criteria = new Criteria();
if (firstname != null) criteria.addEqualTo("firstname", firstname);
if (lastname != null) criteria.addEqualTo("firstname", lastname);
- Query q = new QueryByCriteria(PersonVO.class, null);
+ Query q = new QueryByCriteria(PersonVO.class);
Collection result = broker.getCollectionByQuery(q);
broker.close();
return result;
1.3 +2 -2 db-ojb/src/ejb/org/apache/ojb/ejb/pb/RollbackBean.java
Index: RollbackBean.java
===================================================================
RCS file: /home/cvs/db-ojb/src/ejb/org/apache/ojb/ejb/pb/RollbackBean.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RollbackBean.java 13 Sep 2004 10:54:29 -0000 1.2
+++ RollbackBean.java 13 Jan 2005 20:05:36 -0000 1.3
@@ -213,7 +213,7 @@
PersistenceBroker broker = getBroker();
try
{
- Query q = new QueryByCriteria(searchClass, new Criteria());
+ Query q = new QueryByCriteria(searchClass);
// we get the iterator and step into the first found object
Iterator it = broker.getIteratorByQuery(q);
it.next();
---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org