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/10 10:13:36 UTC

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

Author: fuzzylogic
Date: Thu Aug 10 01:13:30 2006
New Revision: 430301

URL: http://svn.apache.org/viewvc?rev=430301&view=rev
Log:
DERBY-1470: Commit -alt4 patch, which adds sysinfo to derbyclient.jar and
unseals org.apache.derby.loc in derbynet.jar and derbyclient.jar to prevent
sealing problems.

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=430301&r1=430300&r2=430301&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Thu Aug 10 01:13:30 2006
@@ -1196,6 +1196,9 @@
       	<section name="org/apache/derby/tools/">
     	  <attribute name="Sealed" value="false"/>
     	</section>
+    	<section name="org/apache/derby/loc/">
+    	  <attribute name="Sealed" value="false"/>
+    	</section>
     </manifest> 
 
     <delete file="${derby.jar.dir}/derbynet.jar"/>
@@ -1211,6 +1214,7 @@
     	 manifest="${derby.jar.dir}/lists/smfnet.mf">
       <fileset dir="${out.dir}"
                includes="org/apache/derby/loc/drda/**,
+                         org/apache/derby/loc/sysinfoMessages.properties,
                          org/apache/derby/info/net.properties"/>
       <fileset dir="${derby.jar.dir}/lists"
                includes="META-INF/**"/>
@@ -1266,6 +1270,12 @@
       	<section name="org/apache/derby/tools">
     	  <attribute name="Sealed" value="false"/>
     	</section>
+    	<section name="org/apache/derby/impl/tools/sysinfo/">
+    	  <attribute name="Sealed" value="false"/>
+    	</section>
+    	<section name="org/apache/derby/loc/">
+    	  <attribute name="Sealed" value="false"/>
+    	</section>
     </manifest> 
  	
     <delete file="${derby.jar.dir}/derbyclient.jar"/>
@@ -1279,6 +1289,7 @@
                includesfile="${derby.jar.dir}/lists/dnc.list"/>
       <fileset dir="${out.dir}"
                includes="org/apache/derby/info/dnc.properties,
+                         org/apache/derby/loc/sysinfoMessages.properties,
                          org/apache/derby/loc/clientmessages*.properties"
                excludes="org/apache/derby/loc/clientmessages_qq_PP_testOnly.properties"/>
       <fileset dir="${derby.jar.dir}/lists"

Modified: db/derby/code/trunk/tools/jar/dnc.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/jar/dnc.properties?rev=430301&r1=430300&r2=430301&view=diff
==============================================================================
--- db/derby/code/trunk/tools/jar/dnc.properties (original)
+++ db/derby/code/trunk/tools/jar/dnc.properties Thu Aug 10 01:13:30 2006
@@ -2,6 +2,7 @@
 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
+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