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 2002/12/24 14:42:50 UTC
cvs commit: jakarta-ojb/src/java/org/apache/ojb/odmg ObjectEnvelopeTable.java OJBJ2EE_2.java TransactionImpl.java
arminw 2002/12/24 05:42:50
Modified: src/java/org/apache/ojb/odmg ObjectEnvelopeTable.java
OJBJ2EE_2.java TransactionImpl.java
Log:
use new service methods from PB
Revision Changes Path
1.11 +1 -1 jakarta-ojb/src/java/org/apache/ojb/odmg/ObjectEnvelopeTable.java
Index: ObjectEnvelopeTable.java
===================================================================
RCS file: /home/cvs/jakarta-ojb/src/java/org/apache/ojb/odmg/ObjectEnvelopeTable.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ObjectEnvelopeTable.java 23 Dec 2002 21:27:59 -0000 1.10
+++ ObjectEnvelopeTable.java 24 Dec 2002 13:42:49 -0000 1.11
@@ -138,7 +138,7 @@
public void commit() throws TransactionAbortedException
{
PersistenceBroker broker = transaction.getBroker();
- ConnectionManagerIF connMan = broker.getConnectionManager();
+ ConnectionManagerIF connMan = broker.serviceConnectionManager();
boolean saveBatchMode = connMan.isBatchMode();
try
1.5 +2 -1 jakarta-ojb/src/java/org/apache/ojb/odmg/OJBJ2EE_2.java
Index: OJBJ2EE_2.java
===================================================================
RCS file: /home/cvs/jakarta-ojb/src/java/org/apache/ojb/odmg/OJBJ2EE_2.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- OJBJ2EE_2.java 5 Oct 2002 20:25:12 -0000 1.4
+++ OJBJ2EE_2.java 24 Dec 2002 13:42:49 -0000 1.5
@@ -17,7 +17,8 @@
{
private Logger log = LoggerFactory.getLogger(OJBJ2EE_2.class);
private OJBTxManager m_ojbTxManager = TxManagerFactory.instance();
- public OJBJ2EE_2()
+
+ protected OJBJ2EE_2()
{
super();
}
1.32 +16 -6 jakarta-ojb/src/java/org/apache/ojb/odmg/TransactionImpl.java
Index: TransactionImpl.java
===================================================================
RCS file: /home/cvs/jakarta-ojb/src/java/org/apache/ojb/odmg/TransactionImpl.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- TransactionImpl.java 20 Dec 2002 02:13:39 -0000 1.31
+++ TransactionImpl.java 24 Dec 2002 13:42:49 -0000 1.32
@@ -55,7 +55,15 @@
*/
-import org.apache.ojb.broker.*;
+import org.apache.ojb.broker.Identity;
+import org.apache.ojb.broker.ManageableCollection;
+import org.apache.ojb.broker.OJBRuntimeException;
+import org.apache.ojb.broker.PBFactoryException;
+import org.apache.ojb.broker.PersistenceBroker;
+import org.apache.ojb.broker.PersistenceBrokerException;
+import org.apache.ojb.broker.PersistenceBrokerFactory;
+import org.apache.ojb.broker.VirtualProxy;
+import org.apache.ojb.broker.PersistenceBrokerSQLException;
import org.apache.ojb.broker.accesslayer.IndirectionHandler;
import org.apache.ojb.broker.accesslayer.MaterializationListener;
import org.apache.ojb.broker.metadata.ClassDescriptor;
@@ -63,6 +71,7 @@
import org.apache.ojb.broker.metadata.FieldDescriptor;
import org.apache.ojb.broker.metadata.ObjectReferenceDescriptor;
import org.apache.ojb.broker.util.ArrayIterator;
+import org.apache.ojb.broker.util.BrokerHelper;
import org.apache.ojb.broker.util.GUID;
import org.apache.ojb.broker.util.configuration.Configurable;
import org.apache.ojb.broker.util.configuration.Configuration;
@@ -94,6 +103,7 @@
*/
//#endif
+
/**
*
* Implementation of Transaction for org.odmg.Transaction.
@@ -238,8 +248,8 @@
ClassDescriptor cld = this.getBroker().getClassDescriptor(obj.getClass());
if (!cld.isAcceptLocks())
{
- if (log.isDebugEnabled())
- log.debug("skipping lock on class: " + cld.getClassNameOfObject() + " object " + obj.toString());
+ if (log.isDebugEnabled())
+ log.debug("skipping lock on class: " + cld.getClassNameOfObject() + " object " + obj.toString());
return;
}
else
@@ -572,7 +582,7 @@
m_txStatus = Status.STATUS_MARKED_ROLLBACK;
throw e;
}
- catch (PersistenceBrokerSQLException pbse)
+ catch (PersistenceBrokerSQLException pbse)
{
log.error("Could not prepare for commit: " + pbse.getMessage());
m_txStatus = Status.STATUS_MARKED_ROLLBACK;
@@ -863,14 +873,14 @@
}
else
{
- throw new RuntimeException(
+ throw new OJBRuntimeException(
col.getClass()
+ " can not be managed by OJB, use Array, Collection or ManageableCollection instead !");
}
// get foreign info for collection elements
ClassDescriptor itemCld = this.getBroker().getClassDescriptor(cds.getItemClass());
- Object[] objPkValues = cld.getKeyValues(newTxObject);
+ Object[] objPkValues = this.getBroker().serviceBrokerHelper().getKeyValues(cld, newTxObject);
FieldDescriptor[] itemFkFields = cds.getForeignKeyFieldDescriptors(itemCld);
/**
* itemFkFields will be null in the case of many to many relationships.