svn commit: r734146 - in /db/derby/code/trunk: build.xml tools/jar/dnc.properties tools/jar/extraDBMSclasses.properties

[rh...@apache.org]

Author: rhillegas
Date: Tue Jan 13 06:52:09 2009
New Revision: 734146

URL: http://svn.apache.org/viewvc?rev=734146&view=rev
Log:
DERBY-3988: Fix jar building targets to pull in JDBC4 datasources when the deprecated jdk16 variable is not set.

Modified:
    db/derby/code/trunk/build.xml
    db/derby/code/trunk/tools/jar/dnc.properties
    db/derby/code/trunk/tools/jar/extraDBMSclasses.properties

Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/build.xml?rev=734146&r1=734145&r2=734146&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Tue Jan 13 06:52:09 2009
@@ -1234,15 +1234,6 @@
   </target>
 
 
-  <target name="jdbc4_classlist_edit" if="jdk16">
-    <!-- uncomment jdbc4 classes if jdk 1.6 is available -->
-    <echo level="info" message="uncommenting jdbc4 classes"/>
-    <replaceregexp file="${jar.classlist}"
-     match="^#jdbc4_optional_(.*)"
-     replace="\1"
-     byline="true"/>
-  </target>
-
 <!-- - - - - - - - - - - - - - - derby.jar target - - - - - - - - - - - -->
 
   <target name="derbyjar" depends="initjars">
@@ -1258,10 +1249,6 @@
       <fileset dir="${basedir}/tools/jar" includes="*DBMS*.properties"/>
     </concat>
 
-    <antcall target="jdbc4_classlist_edit">
-      <param name="jar.classlist" value="${derby.jar.dir}/lists/otherDerbyClasses.properties"/>
-    </antcall>
-
     <mkdir dir="${derby.jar.dir}/lists/org/apache/derby"/>
     <java classname="org.apache.derbyBuild.propertyconfig" fork="yes">
       <arg value="${out.dir}/org/apache/derby/modules.properties"/>
@@ -1581,10 +1568,6 @@
     <copy file="${basedir}/tools/jar/dnc.properties"
           tofile="${derby.jar.dir}/lists/dnc.properties"/>
 
-    <antcall target="jdbc4_classlist_edit">
-      <param name="jar.classlist" value="${derby.jar.dir}/lists/dnc.properties"/>
-    </antcall>
-
     <java classname="org.apache.derbyBuild.classlister" fork="yes">
       <jvmarg value="-Doutputfile=${derby.jar.dir}/lists/dnc.list"/>
       <arg value="${derby.jar.dir}/lists/dnc.properties"/>

Modified: db/derby/code/trunk/tools/jar/dnc.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/jar/dnc.properties?rev=734146&r1=734145&r2=734146&view=diff
==============================================================================
--- db/derby/code/trunk/tools/jar/dnc.properties (original)
+++ db/derby/code/trunk/tools/jar/dnc.properties Tue Jan 13 06:52:09 2009
@@ -18,11 +18,11 @@
 derby.module.client.cpds=org.apache.derby.jdbc.ClientConnectionPoolDataSource
 derby.module.client.xads=org.apache.derby.jdbc.ClientXADataSource
 derby.module.client.sysinfo=org.apache.derby.tools.sysinfo
-#jdbc4_optional_derby.module.client.40ds=org.apache.derby.jdbc.ClientDataSource40
-#jdbc4_optional_derby.module.client.40cpds=org.apache.derby.jdbc.ClientConnectionPoolDataSource40
-#jdbc4_optional_derby.module.client.40xads=org.apache.derby.jdbc.ClientXADataSource40
-#jdbc4_optional_derby.module.client.40cp=org.apache.derby.client.ClientPooledConnection40
-#jdbc4_optional_derby.module.client.40nc=org.apache.derby.client.net.NetConnection40
-#jdbc4_optional_derby.module.client.40cjof=org.apache.derby.client.net.ClientJDBCObjectFactoryImpl40
+derby.module.client.40ds=org.apache.derby.jdbc.ClientDataSource40
+derby.module.client.40cpds=org.apache.derby.jdbc.ClientConnectionPoolDataSource40
+derby.module.client.40xads=org.apache.derby.jdbc.ClientXADataSource40
+derby.module.client.40cp=org.apache.derby.client.ClientPooledConnection40
+derby.module.client.40nc=org.apache.derby.client.net.NetConnection40
+derby.module.client.40cjof=org.apache.derby.client.net.ClientJDBCObjectFactoryImpl40
 
 derby.module.shared.threaddump=org.apache.derby.shared.common.sanity.ThreadDump
\ No newline at end of file

Modified: db/derby/code/trunk/tools/jar/extraDBMSclasses.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/jar/extraDBMSclasses.properties?rev=734146&r1=734145&r2=734146&view=diff
==============================================================================
--- db/derby/code/trunk/tools/jar/extraDBMSclasses.properties (original)
+++ db/derby/code/trunk/tools/jar/extraDBMSclasses.properties Tue Jan 13 06:52:09 2009
@@ -48,11 +48,9 @@
 derby.module.core.cscpds=org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource
 derby.module.core.csxad=org.apache.derby.jdbc.EmbeddedXADataSource
 derby.module.core.csds_simple=org.apache.derby.jdbc.EmbeddedSimpleDataSource
-#Next line will be uncommented if build with jdk 1.6 support
-#The uncommenting will be handled by {srcroot}/build.xml
-#jdbc4_optional_derby.module.core.csds.jdk16=org.apache.derby.jdbc.EmbeddedDataSource40
-#jdbc4_optional_derby.module.core.csxads.jdk16=org.apache.derby.jdbc.EmbeddedXADataSource40
-#jdbc4_optional_derby.module.core.cscpds.jdk16=org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource40
+derby.module.core.csds.jdk16=org.apache.derby.jdbc.EmbeddedDataSource40
+derby.module.core.csxads.jdk16=org.apache.derby.jdbc.EmbeddedXADataSource40
+derby.module.core.cscpds.jdk16=org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource40
 
 derby.module.database.consistency.checker=org.apache.derby.iapi.db.ConsistencyChecker
 derby.module.database.optimizer.trace=org.apache.derby.iapi.db.OptimizerTrace