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:32:05 UTC
svn commit: r428892 - in /db/derby/code/trunk: build.xml
tools/jar/dnc.properties
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