db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r619828 - in /db/derby/code/trunk/java/engine: build.xml org/apache/derby/impl/services/build.xml org/apache/derby/modules.properties
Date Fri, 08 Feb 2008 10:41:48 GMT
Author: kahatlen
Date: Fri Feb  8 02:41:48 2008
New Revision: 619828

URL: http://svn.apache.org/viewvc?rev=619828&view=rev
Log:
DERBY-3117: Use JDK 1.5 to compile classes that depend on java.util.concurrent

Modified:
    db/derby/code/trunk/java/engine/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/impl/services/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/modules.properties

Modified: db/derby/code/trunk/java/engine/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/build.xml?rev=619828&r1=619827&r2=619828&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/build.xml (original)
+++ db/derby/code/trunk/java/engine/build.xml Fri Feb  8 02:41:48 2008
@@ -50,7 +50,7 @@
 
 <!--             ============ Begin Targets ==============                -->
  
-  <target name="engine" depends="engine_j2se,engine_169,engine_169_opt,jdbc4_modules_edit,jdk15_modules_edit"
+  <target name="engine" depends="engine_j2se,engine_169,engine_169_opt,jdbc4_modules_edit"
           description="Build Derby engine">
 	</target>
     <target name="engine_j2se" depends="engine_169"
@@ -119,15 +119,6 @@
                               byline="true" />
         </target>
 
-        <!-- use jdk16 to compile jdk15 code -->
-        <target name="jdk15_modules_edit"
-                if="jdk16">
-          <replaceregexp
-             file="${out.dir}/${derby.dir}/modules.properties"
-             match="^#jdk15_optional_(.*)"
-             replace="\1" byline="true"/>
-        </target>
-	
 <!--             ============= End Targets ==============                -->
 
 <!--             ============= End Project ==============                -->

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/build.xml?rev=619828&r1=619827&r2=619828&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/build.xml Fri Feb  8 02:41:48
2008
@@ -61,14 +61,11 @@
     </javac>
  </target>
  
- <!-- use jdk16 to compile jdk15 code -->
- <target name="compile_impl_services_jdk15" if="jdk16"
+ <target name="compile_impl_services_jdk15"
          depends="compile_impl_services_169">
    <javac
       source="1.5"
       target="1.5"
-      fork="yes"
-      executable="${jdk16}/bin/javac"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -77,10 +74,10 @@
       optimize="${optimize}"
       proceed="${proceed}"
       verbose="${verbose}"
-      srcdir="${derby.engine.src.dir};${derby.engine.src.dir}"
+      srcdir="${derby.engine.src.dir}"
       destdir="${out.dir}">
      <classpath>
-       <pathelement path="${java16compile.classpath}"/>
+       <pathelement path="${java15compile.classpath}"/>
      </classpath>
      <include name="${derby.dir}/impl/services/locks/Concurrent*.java"/>
      <include name="${derby.dir}/impl/services/cache/Concurrent*.java"/>
@@ -90,8 +87,7 @@
    </javac>
  </target>
 
- <target name="compile_impl_services"
-         depends="compile_impl_services_jdk15,compile_impl_services_169">
+ <target name="compile_impl_services" depends="compile_impl_services_jdk15">
     <javac
       source="1.4"
       target="1.4"

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=619828&r1=619827&r2=619828&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 Fri Feb  8 02:41:48
2008
@@ -143,9 +143,9 @@
 cloudscape.config.lockManagerJ1=all
 
 # ConcurrentPool requires JDK 1.5 (constant 6)
-#jdk15_optional_derby.module.lockManagerJ6=org.apache.derby.impl.services.locks.ConcurrentPool
-#jdk15_optional_derby.env.jdk.lockManagerJ6=6
-#jdk15_optional_cloudscape.config.lockManagerJ6=all
+derby.module.lockManagerJ6=org.apache.derby.impl.services.locks.ConcurrentPool
+derby.env.jdk.lockManagerJ6=6
+cloudscape.config.lockManagerJ6=all
 
 derby.module.classManagerJ2=org.apache.derby.impl.services.reflect.ReflectClassesJava2
 cloudscape.config.classManagerJ2=derby



Mime
View raw message