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 fu...@apache.org on 2006/08/04 23:27:01 UTC

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

Author: fuzzylogic
Date: Fri Aug  4 14:27:01 2006
New Revision: 428891

URL: http://svn.apache.org/viewvc?rev=428891&view=rev
Log:
DERBY-1424: Build derbyclient.jar using classlister. Also removes an unnecessary
class from derbytools.jar.

Added:
    db/derby/code/trunk/tools/jar/dnc.properties   (with props)
Modified:
    db/derby/code/trunk/build.xml
    db/derby/code/trunk/tools/jar/tools.properties

Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/build.xml?rev=428891&r1=428890&r2=428891&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Fri Aug  4 14:27:01 2006
@@ -900,7 +900,7 @@
   <target name="jdbc4_classlist_edit" if="jdk16">
     <!-- uncomment jdbc4 classes if jdk 1.6 is available -->
     <echo message="uncommenting jdbc4 classes"/>
-    <replaceregexp file="${derby.jar.dir}/lists/otherDerbyClasses.properties"
+    <replaceregexp file="${jar.classlist}"
      match="^#jdbc4_optional_(.*)"
      replace="\1"
      byline="true"/>

Added: db/derby/code/trunk/tools/jar/dnc.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/jar/dnc.properties?rev=428891&view=auto
==============================================================================
--- db/derby/code/trunk/tools/jar/dnc.properties (added)
+++ db/derby/code/trunk/tools/jar/dnc.properties Fri Aug  4 14:27:01 2006
@@ -0,0 +1,20 @@
+derby.module.client.driver=org.apache.derby.jdbc.ClientDriver
+derby.module.client.dsfactory=org.apache.derby.client.ClientDataSourceFactory
+derby.module.client.cpds=org.apache.derby.jdbc.ClientConnectionPoolDataSource
+derby.module.client.xads=org.apache.derby.jdbc.ClientXADataSource
+#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.driver=org.apache.derby.jdbc.ClientDriver
+derby.module.client.dsfactory=org.apache.derby.client.ClientDataSourceFactory
+derby.module.client.cpds=org.apache.derby.jdbc.ClientConnectionPoolDataSource
+derby.module.client.xads=org.apache.derby.jdbc.ClientXADataSource
+#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

Propchange: db/derby/code/trunk/tools/jar/dnc.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/tools/jar/tools.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/jar/tools.properties?rev=428891&r1=428890&r2=428891&view=diff
==============================================================================
--- db/derby/code/trunk/tools/jar/tools.properties (original)
+++ db/derby/code/trunk/tools/jar/tools.properties Fri Aug  4 14:27:01 2006
@@ -9,6 +9,5 @@
 
 derby.module.ij=org.apache.derby.tools.ij
 derby.module.ij.xaHelper=org.apache.derby.impl.tools.ij.xaHelper
-derby.module.Attribute=org.apache.derby.iapi.reference.Attribute
 derby.module.cslook=org.apache.derby.tools.dblook
 derby.module.sysinfo=org.apache.derby.tools.sysinfo