Return-Path: 
 <zookeeper-commits-return-542-apmail-hadoop-zookeeper-commits-archive=hadoop.apache.org@hadoop.apache.org>
Delivered-To: apmail-hadoop-zookeeper-commits-archive@minotaur.apache.org
Received: (qmail 89790 invoked from network); 26 Nov 2009 13:37:18 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 26 Nov 2009 13:37:18 -0000
Received: (qmail 3198 invoked by uid 500); 26 Nov 2009 13:37:18 -0000
Delivered-To: apmail-hadoop-zookeeper-commits-archive@hadoop.apache.org
Received: (qmail 3159 invoked by uid 500); 26 Nov 2009 13:37:17 -0000
Mailing-List: contact zookeeper-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:zookeeper-commits-help@hadoop.apache.org>
List-Unsubscribe: <mailto:zookeeper-commits-unsubscribe@hadoop.apache.org>
List-Post: <mailto:zookeeper-commits@hadoop.apache.org>
List-Id: <zookeeper-commits.hadoop.apache.org>
Reply-To: zookeeper-dev@<hadoop.apache.org>
Delivered-To: mailing list zookeeper-commits@hadoop.apache.org
Received: (qmail 3149 invoked by uid 99); 26 Nov 2009 13:37:17 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Nov 2009 13:37:17 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Nov 2009 13:37:08 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 51A0123888D6; Thu, 26 Nov 2009 13:36:47 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r884554 - in /hadoop/zookeeper/trunk: CHANGES.txt
 build.xml
Date: Thu, 26 Nov 2009 13:36:47 -0000
To: zookeeper-commits@hadoop.apache.org
From: breed@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20091126133647.51A0123888D6@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: breed
Date: Thu Nov 26 13:36:46 2009
New Revision: 884554

URL: http://svn.apache.org/viewvc?rev=884554&view=rev
Log:
ZOOKEEPER-425. Add OSGi metadata to zookeeper.jar

Modified:
    hadoop/zookeeper/trunk/CHANGES.txt
    hadoop/zookeeper/trunk/build.xml

Modified: hadoop/zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/CHANGES.txt?rev=884554&r1=884553&r2=884554&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/CHANGES.txt (original)
+++ hadoop/zookeeper/trunk/CHANGES.txt Thu Nov 26 13:36:46 2009
@@ -157,6 +157,8 @@
   ZOOKEEPER-472.  Making DataNode not instantiate a HashMap when the node is
   ephmeral (Erik Holstad via mahadev)
 
+  ZOOKEEPER-425. Add OSGi metadata to zookeeper.jar (david bosschaert via breed)
+
 NEW FEATURES:
   ZOOKEEPER-539. generate eclipse project via ant target. (phunt via mahadev)
 

Modified: hadoop/zookeeper/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/build.xml?rev=884554&r1=884553&r2=884554&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/build.xml (original)
+++ hadoop/zookeeper/trunk/build.xml Thu Nov 26 13:36:46 2009
@@ -438,6 +438,19 @@
                 <attribute name="Implementation-Title" value="org.apache.zookeeper"/>
                 <attribute name="Implementation-Version" value="${revision}"/> 
                 <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
+            	
+            	<!-- The following are OSGi manifest headers -->
+            	<!-- currently hardcoded, when things get more complicated we could use BND 
+            	http://www.aqute.biz/Code/Bnd to generate them -->
+                <attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
+                <attribute name="Bundle-Name" value="ZooKeeper Bundle"/>
+                <attribute name="Bundle-SymbolicName" value="org.apache.hadoop.zookeeper"/>
+                <attribute name="Bundle-ManifestVersion" value="2"/>
+                <attribute name="Bundle-Version" value="${version}"/>
+                <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+                <attribute name="Bundle-DocURL" value="http://hadoop.apache.org/zookeeper"/>
+                <attribute name="Import-Package" value='javax.management,org.apache.log4j,org.osgi.framework;version="[1.4,2.0)",org.osgi.util.tracker;version="[1.1,2.0)"'/>
+                <attribute name="Export-Package" value='org.apache.zookeeper;version="${version}",org.apache.zookeeper.data;version="${version}",org.apache.zookeeper.version;version="${version}",org.apache.zookeeper.server;version="${version}",org.apache.zookeeper.server.quorum;version="${version}"'/>
             </manifest>
         </jar>
     </target>