svn commit: r963799 - /db/derby/code/branches/10.5/build.xml

[my...@apache.org]

Author: myrnavl
Date: Tue Jul 13 17:39:52 2010
New Revision: 963799

URL: http://svn.apache.org/viewvc?rev=963799&view=rev
Log:
Merging DERBY-4120 (derbyclient.jar is not a complete OSGi bundle) and 
  DERBY-4574 (derby.jar not a valid R4 OSGi bundle) to 10.5.  
  Merge commands:
    svn merge -c 918152 https://svn.apache.org/repos/asf/db/derby/code/trunk
    svn merge -c 830545 https://svn.apache.org/repos/asf/db/derby/code/trunk

Modified:
    db/derby/code/branches/10.5/build.xml

Modified: db/derby/code/branches/10.5/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/build.xml?rev=963799&r1=963798&r2=963799&view=diff
==============================================================================
--- db/derby/code/branches/10.5/build.xml (original)
+++ db/derby/code/branches/10.5/build.xml Tue Jul 13 17:39:52 2010
@@ -1342,6 +1342,7 @@
       <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
       <attribute name="Bundle-Name" value="Apache Derby ${major}.${minor}"/>
       <attribute name="Bundle-Version" value="${major}.${minor}.${maint}.${changenumber}"/>
+      <attribute name="Bundle-ManifestVersion" value="2"/>
 
       	<attribute name="Sealed" value="true"/>
     	<section name="org/apache/derby/impl/tools/sysinfo/">
@@ -1551,6 +1552,14 @@
       <param name="manifest.file" value="${derby.jar.dir}/lists/smfclient.mf"/>
     </antcall>
 
+    <!-- add extra osgi bits to manifest -->
+
+    <manifest file="${derby.jar.dir}/lists/smfclient.mf"  mode="update">
+      <attribute name="Bundle-SymbolicName" value="derbyclient"/>
+      <attribute name="DynamicImport-Package" value="*"/>
+      <attribute name="Export-Package" value="org.apache.derby.jdbc"/> 
+    </manifest> 
+
     <!-- declare the client driver for autoloading by the JDBC 4 DriverManager -->
     <antcall target="declare-autoloadable-driver">
       <param name="driver.name" value="org.apache.derby.jdbc.ClientDriver"/>