You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by dj...@apache.org on 2005/01/21 18:29:25 UTC
svn commit: r125945 - in incubator/derby/code/trunk/java/engine/org/apache/derby: . iapi/types impl/sql/conn
Author: djd
Date: Fri Jan 21 09:29:23 2005
New Revision: 125945
URL: http://svn.apache.org/viewcvs?view=rev&rev=125945
Log:
Make the DataValueFactory a dynamically loaded module.
Preperation for JSR169 and multiple implementations of DataValueFactory
Modified:
incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueFactoryImpl.java
incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionFactory.java
incubator/derby/code/trunk/java/engine/org/apache/derby/modules.properties
Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueFactoryImpl.java
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueFactoryImpl.java?view=diff&rev=125945&p1=incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueFactoryImpl.java&r1=125944&p2=incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueFactoryImpl.java&r2=125945
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueFactoryImpl.java (original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueFactoryImpl.java Fri Jan 21 09:29:23 2005
@@ -68,9 +68,8 @@
* Make the constructor public.
*
*/
- public DataValueFactoryImpl(LocaleFinder localeFinder)
+ public DataValueFactoryImpl()
{
- this.localeFinder = localeFinder;
}
/**
Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionFactory.java
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionFactory.java?view=diff&rev=125945&p1=incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionFactory.java&r1=125944&p2=incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionFactory.java&r2=125945
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionFactory.java (original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionFactory.java Fri Jan 21 09:29:23 2005
@@ -75,8 +75,6 @@
import org.apache.derby.iapi.services.property.PropertyUtil;
import org.apache.derby.iapi.services.property.PropertySetCallback;
-import org.apache.derby.iapi.types.DataValueFactoryImpl;
-
import org.apache.derby.iapi.services.i18n.LocaleFinder;
import org.apache.derby.iapi.reference.SQLState;
import org.apache.derby.iapi.reference.Property;
@@ -320,18 +318,7 @@
public void boot(boolean create, Properties startParams)
throws StandardException {
- // Get the Database from the context manager and pass it to the
- // DataValueFactory. The DVF expects a LocaleFinder, which Database
- // implements.
- //
- // RESOLVE: Unfortunately, the Database is in the process of booting,
- // so the Monitor can't find it. So, we just pass in null, and let
- // the DVF get the Database on first access. No amount of shuffling
- // of boot order can solve this problem, because the Database is
- // the top-level module for almost everything. So, the Monitor needs
- // to be fixed so it can find modules that are not done booting yet.
- dvf = new DataValueFactoryImpl((LocaleFinder) null);
-
+ dvf = (DataValueFactory) Monitor.bootServiceModule(create, this, org.apache.derby.iapi.reference.ClassName.DataValueFactory, startParams);
javaFactory = (JavaFactory) Monitor.startSystemModule(org.apache.derby.iapi.reference.Module.JavaFactory);
uuidFactory = Monitor.getMonitor().getUUIDFactory();
classFactory = (ClassFactory) Monitor.getServiceModule(this, org.apache.derby.iapi.reference.Module.ClassFactory);
Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/modules.properties
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/engine/org/apache/derby/modules.properties?view=diff&rev=125945&p1=incubator/derby/code/trunk/java/engine/org/apache/derby/modules.properties&r1=125944&p2=incubator/derby/code/trunk/java/engine/org/apache/derby/modules.properties&r2=125945
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/modules.properties (original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/modules.properties Fri Jan 21 09:29:23 2005
@@ -273,10 +273,6 @@
cloudscape.config.rawStore=derby
-#####################################################
-# Replication Common Per Database.
-#####################################################
-
#
# Support for read-only databases
#
@@ -290,7 +286,7 @@
cloudscape.config.netServer.autoStart=derby
-
-
-
-
+# DataValueFactory implementations
+derby.module.dvfJ2=org.apache.derby.iapi.types.DataValueFactoryImpl
+derby.env.dvfJ2=2
+cloudscape.config.dvfJ2=derby