Return-Path: 
 <commits-return-40053-apmail-directory-commits-archive=directory.apache.org@directory.apache.org>
X-Original-To: apmail-directory-commits-archive@www.apache.org
Delivered-To: apmail-directory-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 1A93B1060A
	for <apmail-directory-commits-archive@www.apache.org>;
 Mon, 15 Dec 2014 17:11:34 +0000 (UTC)
Received: (qmail 59524 invoked by uid 500); 15 Dec 2014 17:11:34 -0000
Delivered-To: apmail-directory-commits-archive@directory.apache.org
Received: (qmail 59486 invoked by uid 500); 15 Dec 2014 17:11:34 -0000
Mailing-List: contact commits-help@directory.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@directory.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@directory.apache.org>
List-Post: <mailto:commits@directory.apache.org>
List-Id: <commits.directory.apache.org>
Reply-To: dev@directory.apache.org
Delivered-To: mailing list commits@directory.apache.org
Received: (qmail 59476 invoked by uid 99); 15 Dec 2014 17:11:33 -0000
Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Dec 2014 17:11:33 +0000
Received: from hades.apache.org (localhost [127.0.0.1])
	by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id
 C35DFAC08CB;
	Mon, 15 Dec 2014 17:11:33 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1642979 - in /directory/mavibot/trunk: mavibot/pom.xml
 pom.xml
Date: Mon, 15 Dec 2014 17:11:33 -0000
To: commits@directory.apache.org
From: seelmann@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20141215171133.C35DFAC08CB@hades.apache.org>

Author: seelmann
Date: Tue Dec  2 18:18:53 2014
New Revision: 1642979

URL: http://svn.apache.org/r1642979
Log:
Generate manifest by maven-bundle-plugin, switch back to packaging=bundle

Modified:
    directory/mavibot/trunk/mavibot/pom.xml
    directory/mavibot/trunk/pom.xml

Modified: directory/mavibot/trunk/mavibot/pom.xml
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/pom.xml?rev=1642979&r1=1642978&r2=1642979&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/pom.xml (original)
+++ directory/mavibot/trunk/mavibot/pom.xml Tue Dec  2 18:18:53 2014
@@ -28,7 +28,7 @@
 
   <artifactId>mavibot</artifactId>
   <name>ApacheDS MVCC BTree implementation</name>
-  <packaging>jar</packaging>
+  <packaging>bundle</packaging>
 
   <description>A MVCC BTree Implementation</description>
 
@@ -65,6 +65,44 @@
       <artifactId>slf4j-log4j12</artifactId>
       <version>${slf4j.log4j12.version}</version>
     </dependency>
-  </dependencies>  
+  </dependencies>
+  
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+            <addMavenDescriptor>false</addMavenDescriptor>
+          </archive>
+        </configuration>
+      </plugin>
+      
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <inherited>true</inherited>
+        <extensions>true</extensions>
+        <configuration>
+          <manifestLocation>META-INF</manifestLocation>
+          <instructions>
+            <Bundle-SymbolicName>${project.groupId}.mavibot</Bundle-SymbolicName>
+            <Export-Package>
+              org.apache.directory.mavibot.btree;version=${project.version};-noimport:=true,
+              org.apache.directory.mavibot.btree.comparator;version=${project.version};-noimport:=true,
+              org.apache.directory.mavibot.btree.exception;version=${project.version};-noimport:=true,
+              org.apache.directory.mavibot.btree.memory;version=${project.version};-noimport:=true,
+              org.apache.directory.mavibot.btree.persisted;version=${project.version};-noimport:=true,
+              org.apache.directory.mavibot.btree.serializer;version=${project.version};-noimport:=true,
+              org.apache.directory.mavibot.btree.util;version=${project.version};-noimport:=true
+            </Export-Package>
+          </instructions>
+        </configuration>
+      </plugin>
+
+    </plugins>
+  </build>
 </project>
 

Modified: directory/mavibot/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/pom.xml?rev=1642979&r1=1642978&r2=1642979&view=diff
==============================================================================
--- directory/mavibot/trunk/pom.xml (original)
+++ directory/mavibot/trunk/pom.xml Tue Dec  2 18:18:53 2014
@@ -202,21 +202,6 @@
       </plugin>
     
       <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <inherited>true</inherited>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>${project.groupId}</Bundle-SymbolicName>
-            <Export-Package>
-                {local-packages};version=${project.version};-noimport:=true
-            </Export-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-
-      <plugin>
            <groupId>org.codehaus.mojo</groupId>
            <artifactId>findbugs-maven-plugin</artifactId>
            <configuration>