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/12/01 22:31:21 UTC
cvs commit: db-ojb/src/jdori/org/apache/ojb/jdori/sql OjbFieldManager.java OjbStoreManager.java
thma 2003/12/01 13:31:21
Modified: src/jdori/org/apache/ojb/jdori/sql OjbFieldManager.java
OjbStoreManager.java
Log:
apply Antonios patch regarding the JavaModelFactory. Thanks !
Revision Changes Path
1.4 +7 -2 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- OjbFieldManager.java 23 Nov 2003 12:33:04 -0000 1.3
+++ OjbFieldManager.java 1 Dec 2003 21:31:21 -0000 1.4
@@ -62,6 +62,9 @@
import com.sun.jdori.FieldManager;
import com.sun.jdori.common.model.jdo.JDOModelFactoryImpl;
+import com.sun.jdori.common.model.runtime.RuntimeJavaModelFactory;
+import com.sun.jdori.model.java.JavaModel;
+import com.sun.jdori.model.java.JavaModelFactory;
import com.sun.jdori.model.jdo.JDOClass;
import com.sun.jdori.model.jdo.JDOField;
import com.sun.jdori.model.jdo.JDOModel;
@@ -284,8 +287,10 @@
JDOClass rc = null;
try
{
- //ClassLoader cl = c.getClassLoader();
- JDOModel m = JDOModelFactoryImpl.getInstance().getJDOModel(null);
+ ClassLoader cl = c.getClassLoader();
+ JavaModelFactory javaModelFactory = RuntimeJavaModelFactory.getInstance();
+ JavaModel javaModel = javaModelFactory.getJavaModel(c.getClassLoader());
+ JDOModel m = JDOModelFactoryImpl.getInstance().getJDOModel(javaModel);
rc = m.getJDOClass(c.getName());
}
catch (RuntimeException ex)
1.5 +8 -2 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- OjbStoreManager.java 23 Nov 2003 12:33:04 -0000 1.4
+++ OjbStoreManager.java 1 Dec 2003 21:31:21 -0000 1.5
@@ -74,7 +74,10 @@
import com.sun.jdori.StateManagerInternal;
import com.sun.jdori.StoreManager;
import com.sun.jdori.common.model.jdo.JDOModelFactoryImpl;
+import com.sun.jdori.common.model.runtime.RuntimeJavaModelFactory;
import com.sun.jdori.common.query.BasicQueryResult;
+import com.sun.jdori.model.java.JavaModel;
+import com.sun.jdori.model.java.JavaModelFactory;
import com.sun.jdori.model.jdo.JDOClass;
import com.sun.jdori.model.jdo.JDOModel;
import com.sun.jdori.query.QueryResult;
@@ -247,8 +250,11 @@
JDOClass rc = null;
try
{
- JDOModel m = JDOModelFactoryImpl.getInstance().getJDOModel(null);
- rc = m.getJDOClass(c.getName());
+ ClassLoader cl = c.getClassLoader();
+ JavaModelFactory javaModelFactory = RuntimeJavaModelFactory.getInstance();
+ JavaModel javaModel = javaModelFactory.getJavaModel(c.getClassLoader());
+ JDOModel m = JDOModelFactoryImpl.getInstance().getJDOModel(javaModel);
+ rc = m.getJDOClass(c.getName());
}
catch (RuntimeException ex)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org