You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2011/10/19 13:17:54 UTC

svn commit: r1186100 - in /directory/apacheds/trunk: core-annotations/ core-api/ core-avl/ core-constants/ core-jndi/ core-shared/ core/ http-directory-bridge/ http-integration/ i18n/ interceptor-kerberos/ interceptors/admin/ interceptors/authn/ interc...

Author: pamarcelot
Date: Wed Oct 19 11:17:52 2011
New Revision: 1186100

URL: http://svn.apache.org/viewvc?rev=1186100&view=rev
Log:
Switched back to specified bundle symbolic names. 'MANIFEST.MF' files are now generated in the 'META-INF' folder.

Modified:
    directory/apacheds/trunk/core-annotations/pom.xml
    directory/apacheds/trunk/core-api/pom.xml
    directory/apacheds/trunk/core-avl/pom.xml
    directory/apacheds/trunk/core-constants/pom.xml
    directory/apacheds/trunk/core-jndi/pom.xml
    directory/apacheds/trunk/core-shared/pom.xml
    directory/apacheds/trunk/core/pom.xml
    directory/apacheds/trunk/http-directory-bridge/pom.xml
    directory/apacheds/trunk/http-integration/pom.xml
    directory/apacheds/trunk/i18n/pom.xml
    directory/apacheds/trunk/interceptor-kerberos/pom.xml
    directory/apacheds/trunk/interceptors/admin/pom.xml
    directory/apacheds/trunk/interceptors/authn/pom.xml
    directory/apacheds/trunk/interceptors/authz/pom.xml
    directory/apacheds/trunk/interceptors/changelog/pom.xml
    directory/apacheds/trunk/interceptors/collective/pom.xml
    directory/apacheds/trunk/interceptors/event/pom.xml
    directory/apacheds/trunk/interceptors/exception/pom.xml
    directory/apacheds/trunk/interceptors/hash/pom.xml
    directory/apacheds/trunk/interceptors/journal/pom.xml
    directory/apacheds/trunk/interceptors/logger/pom.xml
    directory/apacheds/trunk/interceptors/normalization/pom.xml
    directory/apacheds/trunk/interceptors/operational/pom.xml
    directory/apacheds/trunk/interceptors/referral/pom.xml
    directory/apacheds/trunk/interceptors/schema/pom.xml
    directory/apacheds/trunk/interceptors/subtree/pom.xml
    directory/apacheds/trunk/interceptors/trigger/pom.xml
    directory/apacheds/trunk/jdbm-partition/pom.xml
    directory/apacheds/trunk/jdbm/pom.xml
    directory/apacheds/trunk/kerberos-codec/pom.xml
    directory/apacheds/trunk/ldif-partition/pom.xml
    directory/apacheds/trunk/protocol-dhcp/pom.xml
    directory/apacheds/trunk/protocol-dns/pom.xml
    directory/apacheds/trunk/protocol-kerberos/pom.xml
    directory/apacheds/trunk/protocol-ldap/pom.xml
    directory/apacheds/trunk/protocol-ntp/pom.xml
    directory/apacheds/trunk/protocol-shared/pom.xml
    directory/apacheds/trunk/server-annotations/pom.xml
    directory/apacheds/trunk/server-config/pom.xml
    directory/apacheds/trunk/server-integ/pom.xml
    directory/apacheds/trunk/server-jndi/pom.xml
    directory/apacheds/trunk/server-replication/pom.xml
    directory/apacheds/trunk/service-builder/pom.xml
    directory/apacheds/trunk/service-osgi/pom.xml
    directory/apacheds/trunk/xdbm-partition/pom.xml
    directory/apacheds/trunk/xdbm-tools/pom.xml

Modified: directory/apacheds/trunk/core-annotations/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-annotations/pom.xml?rev=1186100&r1=1186099&r2=1186100&view=diff
==============================================================================
--- directory/apacheds/trunk/core-annotations/pom.xml (original)
+++ directory/apacheds/trunk/core-annotations/pom.xml Wed Oct 19 11:17:52 2011
@@ -118,13 +118,25 @@
       </plugin>
       
       <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}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.core.annotations</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/apacheds/trunk/core-api/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/pom.xml?rev=1186100&r1=1186099&r2=1186100&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/pom.xml (original)
+++ directory/apacheds/trunk/core-api/pom.xml Wed Oct 19 11:17:52 2011
@@ -148,13 +148,25 @@
       </plugin>
       
       <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}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.core.api</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/apacheds/trunk/core-avl/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-avl/pom.xml?rev=1186100&r1=1186099&r2=1186100&view=diff
==============================================================================
--- directory/apacheds/trunk/core-avl/pom.xml (original)
+++ directory/apacheds/trunk/core-avl/pom.xml Wed Oct 19 11:17:52 2011
@@ -60,13 +60,25 @@
   <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}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.core.avl</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/apacheds/trunk/core-constants/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-constants/pom.xml?rev=1186100&r1=1186099&r2=1186100&view=diff
==============================================================================
--- directory/apacheds/trunk/core-constants/pom.xml (original)
+++ directory/apacheds/trunk/core-constants/pom.xml Wed Oct 19 11:17:52 2011
@@ -34,13 +34,25 @@
   <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}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.core.constants</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/apacheds/trunk/core-jndi/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/pom.xml?rev=1186100&r1=1186099&r2=1186100&view=diff
==============================================================================
--- directory/apacheds/trunk/core-jndi/pom.xml (original)
+++ directory/apacheds/trunk/core-jndi/pom.xml Wed Oct 19 11:17:52 2011
@@ -123,13 +123,25 @@
       </plugin>
       
       <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}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.core.jndi</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/apacheds/trunk/core-shared/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-shared/pom.xml?rev=1186100&r1=1186099&r2=1186100&view=diff
==============================================================================
--- directory/apacheds/trunk/core-shared/pom.xml (original)
+++ directory/apacheds/trunk/core-shared/pom.xml Wed Oct 19 11:17:52 2011
@@ -140,6 +140,7 @@
           </execution>
         </executions>
       </plugin>
+      
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
         <executions>
@@ -151,14 +152,27 @@
           </execution>
         </executions>
       </plugin>
+      
+      <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}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.core.shared</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/apacheds/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/pom.xml?rev=1186100&r1=1186099&r2=1186100&view=diff
==============================================================================
--- directory/apacheds/trunk/core/pom.xml (original)
+++ directory/apacheds/trunk/core/pom.xml Wed Oct 19 11:17:52 2011
@@ -251,13 +251,25 @@
       </plugin>
       
       <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}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.core</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/apacheds/trunk/http-directory-bridge/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/http-directory-bridge/pom.xml?rev=1186100&r1=1186099&r2=1186100&view=diff
==============================================================================
--- directory/apacheds/trunk/http-directory-bridge/pom.xml (original)
+++ directory/apacheds/trunk/http-directory-bridge/pom.xml Wed Oct 19 11:17:52 2011
@@ -50,13 +50,25 @@
   <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}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.http.directory.bridge</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/apacheds/trunk/http-integration/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/http-integration/pom.xml?rev=1186100&r1=1186099&r2=1186100&view=diff
==============================================================================
--- directory/apacheds/trunk/http-integration/pom.xml (original)
+++ directory/apacheds/trunk/http-integration/pom.xml Wed Oct 19 11:17:52 2011
@@ -106,13 +106,25 @@
       </plugin>
       
       <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}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.http.integration</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/apacheds/trunk/i18n/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/i18n/pom.xml?rev=1186100&r1=1186099&r2=1186100&view=diff
==============================================================================
--- directory/apacheds/trunk/i18n/pom.xml (original)
+++ directory/apacheds/trunk/i18n/pom.xml Wed Oct 19 11:17:52 2011
@@ -34,13 +34,25 @@
   <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}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.i18n</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/apacheds/trunk/interceptor-kerberos/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptor-kerberos/pom.xml?rev=1186100&r1=1186099&r2=1186100&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptor-kerberos/pom.xml (original)
+++ directory/apacheds/trunk/interceptor-kerberos/pom.xml Wed Oct 19 11:17:52 2011
@@ -95,13 +95,25 @@
       </plugin>
       
       <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}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.interceptor.kerberos</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/apacheds/trunk/interceptors/admin/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/admin/pom.xml?rev=1186100&r1=1186099&r2=1186100&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/admin/pom.xml (original)
+++ directory/apacheds/trunk/interceptors/admin/pom.xml Wed Oct 19 11:17:52 2011
@@ -169,13 +169,25 @@
       </plugin>
       
       <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}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.interceptors.admin</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/apacheds/trunk/interceptors/authn/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/authn/pom.xml?rev=1186100&r1=1186099&r2=1186100&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/authn/pom.xml (original)
+++ directory/apacheds/trunk/interceptors/authn/pom.xml Wed Oct 19 11:17:52 2011
@@ -169,13 +169,25 @@
       </plugin>
       
       <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}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.interceptors.authn</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/apacheds/trunk/interceptors/authz/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/authz/pom.xml?rev=1186100&r1=1186099&r2=1186100&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/authz/pom.xml (original)
+++ directory/apacheds/trunk/interceptors/authz/pom.xml Wed Oct 19 11:17:52 2011
@@ -169,13 +169,25 @@
       </plugin>
       
       <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}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.interceptors.authz</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/apacheds/trunk/interceptors/changelog/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/changelog/pom.xml?rev=1186100&r1=1186099&r2=1186100&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/changelog/pom.xml (original)
+++ directory/apacheds/trunk/interceptors/changelog/pom.xml Wed Oct 19 11:17:52 2011
@@ -169,13 +169,25 @@
       </plugin>
       
       <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}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.interceptors.changelog</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/apacheds/trunk/interceptors/collective/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/collective/pom.xml?rev=1186100&r1=1186099&r2=1186100&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/collective/pom.xml (original)
+++ directory/apacheds/trunk/interceptors/collective/pom.xml Wed Oct 19 11:17:52 2011
@@ -164,13 +164,25 @@
       </plugin>
       
       <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}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.interceptors.collective</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/apacheds/trunk/interceptors/event/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/event/pom.xml?rev=1186100&r1=1186099&r2=1186100&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/event/pom.xml (original)
+++ directory/apacheds/trunk/interceptors/event/pom.xml Wed Oct 19 11:17:52 2011
@@ -169,13 +169,25 @@
       </plugin>
       
       <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}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.interceptors.event</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/apacheds/trunk/interceptors/exception/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/exception/pom.xml?rev=1186100&r1=1186099&r2=1186100&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/exception/pom.xml (original)
+++ directory/apacheds/trunk/interceptors/exception/pom.xml Wed Oct 19 11:17:52 2011
@@ -169,13 +169,25 @@
       </plugin>
       
       <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}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.interceptors.exception</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/apacheds/trunk/interceptors/hash/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/hash/pom.xml?rev=1186100&r1=1186099&r2=1186100&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/hash/pom.xml (original)
+++ directory/apacheds/trunk/interceptors/hash/pom.xml Wed Oct 19 11:17:52 2011
@@ -169,13 +169,25 @@
       </plugin>
       
       <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}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.interceptors.hash</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/apacheds/trunk/interceptors/journal/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/journal/pom.xml?rev=1186100&r1=1186099&r2=1186100&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/journal/pom.xml (original)
+++ directory/apacheds/trunk/interceptors/journal/pom.xml Wed Oct 19 11:17:52 2011
@@ -164,13 +164,25 @@
       </plugin>
       
       <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}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.interceptors.journal</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/apacheds/trunk/interceptors/logger/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/logger/pom.xml?rev=1186100&r1=1186099&r2=1186100&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/logger/pom.xml (original)
+++ directory/apacheds/trunk/interceptors/logger/pom.xml Wed Oct 19 11:17:52 2011
@@ -164,13 +164,25 @@
       </plugin>
       
       <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}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.interceptors.logger</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/apacheds/trunk/interceptors/normalization/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/normalization/pom.xml?rev=1186100&r1=1186099&r2=1186100&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/normalization/pom.xml (original)
+++ directory/apacheds/trunk/interceptors/normalization/pom.xml Wed Oct 19 11:17:52 2011
@@ -169,13 +169,25 @@
       </plugin>
       
       <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}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.interceptors.normalization</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/apacheds/trunk/interceptors/operational/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/operational/pom.xml?rev=1186100&r1=1186099&r2=1186100&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/operational/pom.xml (original)
+++ directory/apacheds/trunk/interceptors/operational/pom.xml Wed Oct 19 11:17:52 2011
@@ -164,13 +164,25 @@
       </plugin>
       
       <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}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.interceptors.operational</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/apacheds/trunk/interceptors/referral/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/referral/pom.xml?rev=1186100&r1=1186099&r2=1186100&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/referral/pom.xml (original)
+++ directory/apacheds/trunk/interceptors/referral/pom.xml Wed Oct 19 11:17:52 2011
@@ -169,13 +169,25 @@
       </plugin>
       
       <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}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.interceptors.referral</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/apacheds/trunk/interceptors/schema/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/schema/pom.xml?rev=1186100&r1=1186099&r2=1186100&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/schema/pom.xml (original)
+++ directory/apacheds/trunk/interceptors/schema/pom.xml Wed Oct 19 11:17:52 2011
@@ -169,13 +169,25 @@
       </plugin>
       
       <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}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.interceptors.schema</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/apacheds/trunk/interceptors/subtree/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/subtree/pom.xml?rev=1186100&r1=1186099&r2=1186100&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/subtree/pom.xml (original)
+++ directory/apacheds/trunk/interceptors/subtree/pom.xml Wed Oct 19 11:17:52 2011
@@ -169,13 +169,25 @@
       </plugin>
       
       <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}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.interceptors.subtree</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/apacheds/trunk/interceptors/trigger/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/trigger/pom.xml?rev=1186100&r1=1186099&r2=1186100&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/trigger/pom.xml (original)
+++ directory/apacheds/trunk/interceptors/trigger/pom.xml Wed Oct 19 11:17:52 2011
@@ -169,13 +169,25 @@
       </plugin>
       
       <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}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.interceptors.trigger</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/apacheds/trunk/jdbm-partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/pom.xml?rev=1186100&r1=1186099&r2=1186100&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/pom.xml (original)
+++ directory/apacheds/trunk/jdbm-partition/pom.xml Wed Oct 19 11:17:52 2011
@@ -125,13 +125,25 @@
       </plugin>
       
       <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}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.jdbm.partition</Bundle-SymbolicName>
             <Export-Package>
                 org.apache.directory.server.core.partition.impl.btree.jdbm;version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/apacheds/trunk/jdbm/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm/pom.xml?rev=1186100&r1=1186099&r2=1186100&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm/pom.xml (original)
+++ directory/apacheds/trunk/jdbm/pom.xml Wed Oct 19 11:17:52 2011
@@ -61,13 +61,25 @@
     </pluginManagement>
     <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}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.jdbm</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/apacheds/trunk/kerberos-codec/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/pom.xml?rev=1186100&r1=1186099&r2=1186100&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/pom.xml (original)
+++ directory/apacheds/trunk/kerberos-codec/pom.xml Wed Oct 19 11:17:52 2011
@@ -106,13 +106,25 @@
       </plugin>
       
       <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}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.kerberos.codec</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/apacheds/trunk/ldif-partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldif-partition/pom.xml?rev=1186100&r1=1186099&r2=1186100&view=diff
==============================================================================
--- directory/apacheds/trunk/ldif-partition/pom.xml (original)
+++ directory/apacheds/trunk/ldif-partition/pom.xml Wed Oct 19 11:17:52 2011
@@ -102,13 +102,25 @@
       </plugin>
       
       <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}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.ldif.partition</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/apacheds/trunk/protocol-dhcp/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dhcp/pom.xml?rev=1186100&r1=1186099&r2=1186100&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-dhcp/pom.xml (original)
+++ directory/apacheds/trunk/protocol-dhcp/pom.xml Wed Oct 19 11:17:52 2011
@@ -57,13 +57,25 @@
   <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}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.protocol.dhcp</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/apacheds/trunk/protocol-dns/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dns/pom.xml?rev=1186100&r1=1186099&r2=1186100&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-dns/pom.xml (original)
+++ directory/apacheds/trunk/protocol-dns/pom.xml Wed Oct 19 11:17:52 2011
@@ -91,13 +91,25 @@
       </plugin>
       
       <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}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.protocol.dns</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/apacheds/trunk/protocol-kerberos/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-kerberos/pom.xml?rev=1186100&r1=1186099&r2=1186100&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-kerberos/pom.xml (original)
+++ directory/apacheds/trunk/protocol-kerberos/pom.xml Wed Oct 19 11:17:52 2011
@@ -99,13 +99,25 @@
       </plugin>
       
       <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}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.protocol.kerberos</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/apacheds/trunk/protocol-ldap/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/pom.xml?rev=1186100&r1=1186099&r2=1186100&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/pom.xml (original)
+++ directory/apacheds/trunk/protocol-ldap/pom.xml Wed Oct 19 11:17:52 2011
@@ -159,13 +159,25 @@
       </plugin>
       
       <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}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.protocol.ldap</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/apacheds/trunk/protocol-ntp/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ntp/pom.xml?rev=1186100&r1=1186099&r2=1186100&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ntp/pom.xml (original)
+++ directory/apacheds/trunk/protocol-ntp/pom.xml Wed Oct 19 11:17:52 2011
@@ -66,13 +66,25 @@
       </plugin>
       
       <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}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.protocol.ntp</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/apacheds/trunk/protocol-shared/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-shared/pom.xml?rev=1186100&r1=1186099&r2=1186100&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-shared/pom.xml (original)
+++ directory/apacheds/trunk/protocol-shared/pom.xml Wed Oct 19 11:17:52 2011
@@ -72,13 +72,25 @@
       </plugin>
       
       <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}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.protocol.shared</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/apacheds/trunk/server-annotations/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-annotations/pom.xml?rev=1186100&r1=1186099&r2=1186100&view=diff
==============================================================================
--- directory/apacheds/trunk/server-annotations/pom.xml (original)
+++ directory/apacheds/trunk/server-annotations/pom.xml Wed Oct 19 11:17:52 2011
@@ -118,13 +118,25 @@
       </plugin>
       
       <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}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.annotations</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/apacheds/trunk/server-config/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/pom.xml?rev=1186100&r1=1186099&r2=1186100&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/pom.xml (original)
+++ directory/apacheds/trunk/server-config/pom.xml Wed Oct 19 11:17:52 2011
@@ -81,13 +81,25 @@
   <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}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.config</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/apacheds/trunk/server-integ/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/pom.xml?rev=1186100&r1=1186099&r2=1186100&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/pom.xml (original)
+++ directory/apacheds/trunk/server-integ/pom.xml Wed Oct 19 11:17:52 2011
@@ -207,19 +207,31 @@
       </plugin>
       
       <plugin>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>maven-bundle-plugin</artifactId>
-            <inherited>true</inherited>
-            <extensions>true</extensions>
-            <configuration>
-              <instructions>
-                <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
-                <Export-Package>
-                    {local-packages};version=${project.version};-noimport:=true
-                </Export-Package>
-              </instructions>
-            </configuration>
-          </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}.${project.artifactId}</Bundle-SymbolicName>
+            <Export-Package>
+              {local-packages};version=${project.version};-noimport:=true
+            </Export-Package>
+          </instructions>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 

Modified: directory/apacheds/trunk/server-jndi/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-jndi/pom.xml?rev=1186100&r1=1186099&r2=1186100&view=diff
==============================================================================
--- directory/apacheds/trunk/server-jndi/pom.xml (original)
+++ directory/apacheds/trunk/server-jndi/pom.xml Wed Oct 19 11:17:52 2011
@@ -118,13 +118,25 @@
       </plugin>
       
       <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}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.jndi</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/apacheds/trunk/server-replication/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-replication/pom.xml?rev=1186100&r1=1186099&r2=1186100&view=diff
==============================================================================
--- directory/apacheds/trunk/server-replication/pom.xml (original)
+++ directory/apacheds/trunk/server-replication/pom.xml Wed Oct 19 11:17:52 2011
@@ -54,13 +54,25 @@
   <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}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.replication</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/apacheds/trunk/service-builder/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/service-builder/pom.xml?rev=1186100&r1=1186099&r2=1186100&view=diff
==============================================================================
--- directory/apacheds/trunk/service-builder/pom.xml (original)
+++ directory/apacheds/trunk/service-builder/pom.xml Wed Oct 19 11:17:52 2011
@@ -140,13 +140,25 @@
   <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}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.service.builder</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/apacheds/trunk/service-osgi/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/service-osgi/pom.xml?rev=1186100&r1=1186099&r2=1186100&view=diff
==============================================================================
--- directory/apacheds/trunk/service-osgi/pom.xml (original)
+++ directory/apacheds/trunk/service-osgi/pom.xml Wed Oct 19 11:17:52 2011
@@ -81,13 +81,25 @@
   <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}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.service.osgi</Bundle-SymbolicName>
           </instructions>
         </configuration>
       </plugin>

Modified: directory/apacheds/trunk/xdbm-partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/pom.xml?rev=1186100&r1=1186099&r2=1186100&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/pom.xml (original)
+++ directory/apacheds/trunk/xdbm-partition/pom.xml Wed Oct 19 11:17:52 2011
@@ -98,13 +98,25 @@
       </plugin>
       
       <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}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.xdbm.partition</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true,
                 org.apache.directory.server.core.partition.impl.avl;version="${project.version}";-noimport:=true,

Modified: directory/apacheds/trunk/xdbm-tools/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-tools/pom.xml?rev=1186100&r1=1186099&r2=1186100&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-tools/pom.xml (original)
+++ directory/apacheds/trunk/xdbm-tools/pom.xml Wed Oct 19 11:17:52 2011
@@ -71,13 +71,25 @@
   <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}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.xdbm.tools</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>