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 th...@apache.org on 2003/11/23 13:33:05 UTC
cvs commit: db-ojb/src/jdori/org/apache/ojb/jdori/sql OjbFieldManager.java OjbStoreManager.java
thma 2003/11/23 04:33:05
Modified: src/jdori/org/apache/ojb/jdori/sql OjbFieldManager.java
OjbStoreManager.java
Log:
code now compiles against JDORI 1.0.1
Please note: this code has not yet been tested
Revision Changes Path
1.3 +4 -5 db-ojb/src/jdori/org/apache/ojb/jdori/sql/OjbFieldManager.java
Index: OjbFieldManager.java
===================================================================
RCS file: /home/cvs/db-ojb/src/jdori/org/apache/ojb/jdori/sql/OjbFieldManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- OjbFieldManager.java 11 Apr 2003 21:00:01 -0000 1.2
+++ OjbFieldManager.java 23 Nov 2003 12:33:04 -0000 1.3
@@ -61,11 +61,10 @@
import org.apache.ojb.broker.metadata.ClassDescriptor;
import com.sun.jdori.FieldManager;
-import com.sun.jdori.common.model.jdo.RuntimeJDOModelFactoryImpl;
+import com.sun.jdori.common.model.jdo.JDOModelFactoryImpl;
import com.sun.jdori.model.jdo.JDOClass;
import com.sun.jdori.model.jdo.JDOField;
import com.sun.jdori.model.jdo.JDOModel;
-import com.sun.jdori.model.jdo.JDOModelException;
/**
* @author Thomas Mahler
@@ -285,11 +284,11 @@
JDOClass rc = null;
try
{
- ClassLoader cl = c.getClassLoader();
- JDOModel m = RuntimeJDOModelFactoryImpl.getInstance().getJDOModel(cl);
+ //ClassLoader cl = c.getClassLoader();
+ JDOModel m = JDOModelFactoryImpl.getInstance().getJDOModel(null);
rc = m.getJDOClass(c.getName());
}
- catch (JDOModelException ex)
+ catch (RuntimeException ex)
{
throw new JDOFatalInternalException("Not a JDO class: " + c.getName());
}
1.4 +3 -5 db-ojb/src/jdori/org/apache/ojb/jdori/sql/OjbStoreManager.java
Index: OjbStoreManager.java
===================================================================
RCS file: /home/cvs/db-ojb/src/jdori/org/apache/ojb/jdori/sql/OjbStoreManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- OjbStoreManager.java 14 Jun 2003 13:04:08 -0000 1.3
+++ OjbStoreManager.java 23 Nov 2003 12:33:04 -0000 1.4
@@ -73,11 +73,10 @@
import com.sun.jdori.PersistenceManagerInternal;
import com.sun.jdori.StateManagerInternal;
import com.sun.jdori.StoreManager;
-import com.sun.jdori.common.model.jdo.RuntimeJDOModelFactoryImpl;
+import com.sun.jdori.common.model.jdo.JDOModelFactoryImpl;
import com.sun.jdori.common.query.BasicQueryResult;
import com.sun.jdori.model.jdo.JDOClass;
import com.sun.jdori.model.jdo.JDOModel;
-import com.sun.jdori.model.jdo.JDOModelException;
import com.sun.jdori.query.QueryResult;
import com.sun.jdori.query.QueryResultHelper;
@@ -248,11 +247,10 @@
JDOClass rc = null;
try
{
- ClassLoader cl = c.getClassLoader();
- JDOModel m = RuntimeJDOModelFactoryImpl.getInstance().getJDOModel(cl);
+ JDOModel m = JDOModelFactoryImpl.getInstance().getJDOModel(null);
rc = m.getJDOClass(c.getName());
}
- catch (JDOModelException ex)
+ catch (RuntimeException ex)
{
throw new JDOFatalInternalException("Not a JDO class: " + c.getName());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org