svn commit: r627826 - /db/derby/code/trunk/java/engine/org/apache/derby/modules.properties

[dj...@apache.org]

Author: djd
Date: Thu Feb 14 10:31:01 2008
New Revision: 627826

URL: http://svn.apache.org/viewvc?rev=627826&view=rev
Log:
DERBY-1387 Fix bug where the JDK 1.5 compiled class was being loaded in JDK 1.4. The modules.properties entries for the JMXManagementService was missing jdk. Cleaned up one other case missing jdk and added comments for the newer possible values for derby.env.jdk.

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/modules.properties

Modified: db/derby/code/trunk/java/engine/org/apache/derby/modules.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/modules.properties?rev=627826&r1=627825&r2=627826&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/modules.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/modules.properties Thu Feb 14 10:31:01 2008
@@ -55,6 +55,9 @@
 #       1 = jdk 1.1.x
 #       2 = jdk 1.2.x (Java 2)
 #       4 = jdk 1.4.x (Java 4)
+#       5 = jdk 1.4.2
+#       6 = J2SE 5.0
+#       7 = Java SE 6
 #     - if a particular module have alternate 
 #       implementations for jdk1 versus jdk2 versus jdk4, then the
 #       <tag> MUST BE of the form <name>J1 or <name>J2 or <name>J4.
@@ -332,16 +335,15 @@
 
 # DataValueFactory implementations
 derby.module.dvfJ2=org.apache.derby.iapi.types.J2SEDataValueFactory
-derby.env.dvfJ2=2
+derby.env.jdk.dvfJ2=2
 derby.env.classes.dvfJ2=java.math.BigDecimal,java.sql.Driver
 cloudscape.config.dvfJ2=derby
 
 derby.module.mgmt.jmx=org.apache.derby.impl.services.jmx.JMXManagementService
-derby.env.mgmt.jmx=6
+derby.env.jdk.mgmt.jmx=6
 cloudscape.config.mgmt.jmx=derby
 
 derby.module.mgmt.null=org.apache.derby.impl.services.jmxnone.NoManagementService
-derby.env.mgmt.jmx=2
 cloudscape.config.mgmt.null=derby
 
 # J2ME optional elements, the J2ME_optional_ lead in