Return-Path: 
 <derby-commits-return-4071-apmail-db-derby-commits-archive=db.apache.org@db.apache.org>
Delivered-To: apmail-db-derby-commits-archive@www.apache.org
Received: (qmail 50050 invoked from network); 4 Aug 2006 21:32:28 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 4 Aug 2006 21:32:28 -0000
Received: (qmail 87789 invoked by uid 500); 4 Aug 2006 21:32:27 -0000
Delivered-To: apmail-db-derby-commits-archive@db.apache.org
Received: (qmail 87763 invoked by uid 500); 4 Aug 2006 21:32:27 -0000
Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:derby-commits-help@db.apache.org>
list-unsubscribe: <mailto:derby-commits-unsubscribe@db.apache.org>
List-Post: <mailto:derby-commits@db.apache.org>
Reply-To: "Derby Development" <derby-dev@db.apache.org>
List-Id: <derby-commits.db.apache.org>
Delivered-To: mailing list derby-commits@db.apache.org
Received: (qmail 87752 invoked by uid 99); 4 Aug 2006 21:32:27 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Aug 2006 14:32:27 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Aug 2006 14:32:26 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 81FB01A981A; Fri,  4 Aug 2006 14:32:06 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r428892 - in /db/derby/code/trunk: build.xml
 tools/jar/dnc.properties
Date: Fri, 04 Aug 2006 21:32:05 -0000
To: derby-commits@db.apache.org
From: fuzzylogic@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20060804213206.81FB01A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: fuzzylogic
Date: Fri Aug  4 14:32:05 2006
New Revision: 428892

URL: http://svn.apache.org/viewvc?rev=428892&view=rev
Log:
DERBY-1424: Fix badness caused by a double patch command from last checkin.

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

Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/build.xml?rev=428892&r1=428891&r2=428892&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Fri Aug  4 14:32:05 2006
@@ -916,7 +916,9 @@
       <fileset dir="${basedir}/tools/jar" includes="*DBMS*.properties"/>
     </concat>
 
-    <antcall target="jdbc4_classlist_edit"/>
+    <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">
@@ -1206,6 +1208,21 @@
 
     <echo message="Beginning derbyclient.jar ${sanity.name} build"/>
 
+    <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"/>
+      <classpath>
+        <pathelement path="${out.dir}"/> 
+      </classpath>
+    </java>
+
     <echo message=" creating new dnc.properties file "/>
 
     <mkdir dir="${out.dir}/org/apache/derby/info/"/>
@@ -1243,15 +1260,11 @@
          update="true"
     	 manifest="${derby.jar.dir}/lists/smfclient.mf">
       <fileset dir="${out.dir}"
-               includes="org/apache/derby/client/**,
-		 	 org/apache/derby/client/jdbc/Client**,
-                         org/apache/derby/jdbc/Client**,
-                         org/apache/derby/iapi/services/info/**,
-                         org/apache/derby/iapi/services/sanity/SanityManager.class,
-                         org/apache/derby/shared/**,
-                         org/apache/derby/info/dnc.properties,
+               includesfile="${derby.jar.dir}/lists/dnc.list"/>
+      <fileset dir="${out.dir}"
+               includes="org/apache/derby/info/dnc.properties,
                          org/apache/derby/loc/clientmessages*.properties"
-               excludes="org/apache/derby/shared/common/reference/**"/>
+               excludes="org/apache/derby/loc/clientmessages_qq_PP_testOnly.properties"/>
       <fileset dir="${derby.jar.dir}/lists"
                includes="META-INF/**"/>
     </jar>

Modified: db/derby/code/trunk/tools/jar/dnc.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/jar/dnc.properties?rev=428892&r1=428891&r2=428892&view=diff
==============================================================================
--- db/derby/code/trunk/tools/jar/dnc.properties (original)
+++ db/derby/code/trunk/tools/jar/dnc.properties Fri Aug  4 14:32:05 2006
@@ -8,13 +8,3 @@
 #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