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

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

Author: elecharny
Date: Sun Oct 16 05:17:38 2011
New Revision: 1184763

URL: http://svn.apache.org/viewvc?rev=1184763&view=rev
Log:
Applied patches from Görtürk (DIRSERVER-1668)

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-integ/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/ApacheDS.launch
    directory/apacheds/trunk/service/log4j.properties
    directory/apacheds/trunk/test-framework/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=1184763&r1=1184762&r2=1184763&view=diff
==============================================================================
--- directory/apacheds/trunk/core-annotations/pom.xml (original)
+++ directory/apacheds/trunk/core-annotations/pom.xml Sun Oct 16 05:17:38 2011
@@ -27,6 +27,7 @@
   
   <artifactId>apacheds-core-annotations</artifactId>
   <name>ApacheDS Core Annotations</name>
+  <packaging>bundle</packaging>
   
   <description>Annotations used to define a DirectoryService</description>
   
@@ -115,6 +116,21 @@
           </systemPropertyVariables>
         </configuration>
       </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>
     </plugins>
   </build>  
 </project>

Modified: directory/apacheds/trunk/core-api/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/pom.xml?rev=1184763&r1=1184762&r2=1184763&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/pom.xml (original)
+++ directory/apacheds/trunk/core-api/pom.xml Sun Oct 16 05:17:38 2011
@@ -29,7 +29,7 @@
   
   <artifactId>apacheds-core-api</artifactId>
   <name>ApacheDS Core API</name>
-  <packaging>jar</packaging>
+  <packaging>bundle</packaging>
 
   <description>
     Contains interfaces and helper classes that are part of the ApacheDS Core API.
@@ -146,6 +146,21 @@
           </execution>
         </executions>
       </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>
     </plugins>
   </build>
 

Modified: directory/apacheds/trunk/core-avl/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-avl/pom.xml?rev=1184763&r1=1184762&r2=1184763&view=diff
==============================================================================
--- directory/apacheds/trunk/core-avl/pom.xml (original)
+++ directory/apacheds/trunk/core-avl/pom.xml Sun Oct 16 05:17:38 2011
@@ -25,6 +25,7 @@
   
   <artifactId>apacheds-core-avl</artifactId>
   <name>ApacheDS Core AVL</name>
+  <packaging>bundle</packaging>
   
   <description>A linked in memory AVL tree implementation with Cursor</description>
 
@@ -55,4 +56,23 @@
       <artifactId>shared-util</artifactId>
     </dependency>
   </dependencies>
+  
+  <build>
+    <plugins>
+      <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>
+    </plugins>
+  </build>
 </project>

Modified: directory/apacheds/trunk/core-constants/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-constants/pom.xml?rev=1184763&r1=1184762&r2=1184763&view=diff
==============================================================================
--- directory/apacheds/trunk/core-constants/pom.xml (original)
+++ directory/apacheds/trunk/core-constants/pom.xml Sun Oct 16 05:17:38 2011
@@ -27,6 +27,26 @@
   
   <artifactId>apacheds-core-constants</artifactId>
   <name>ApacheDS Core Constants</name>
+  <packaging>bundle</packaging>
 
   <description>Contains classes that store interfaces with various constants in ApacheDS.</description>
+  
+  <build>
+    <plugins>
+      <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>
+    </plugins>
+  </build>
 </project>

Modified: directory/apacheds/trunk/core-integ/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/pom.xml?rev=1184763&r1=1184762&r2=1184763&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/pom.xml (original)
+++ directory/apacheds/trunk/core-integ/pom.xml Sun Oct 16 05:17:38 2011
@@ -29,6 +29,7 @@
   
   <artifactId>apacheds-core-integ</artifactId>
   <name>ApacheDS Core Integration</name>
+  <packaging>bundle</packaging>
 
   <description>Integration testing framework for Apache Directory Server.</description>
 
@@ -164,6 +165,21 @@
           </execution>
         </executions>
       </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> 
     </plugins>
   </build>
 
@@ -405,7 +421,7 @@ WARNING: Long running integration tests 
                 </configuration>
               </execution>
             </executions>
-          </plugin>
+          </plugin>     
         </plugins>
       </build>
     </profile>

Modified: directory/apacheds/trunk/core-jndi/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/pom.xml?rev=1184763&r1=1184762&r2=1184763&view=diff
==============================================================================
--- directory/apacheds/trunk/core-jndi/pom.xml (original)
+++ directory/apacheds/trunk/core-jndi/pom.xml Sun Oct 16 05:17:38 2011
@@ -27,6 +27,7 @@
   
   <artifactId>apacheds-core-jndi</artifactId>
   <name>ApacheDS Core JNDI</name>
+  <packaging>bundle</packaging>
 
   <description>
      Contains a JNDI provider implementation which wraps the core so existing 
@@ -120,6 +121,21 @@
           </execution>
         </executions>
       </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>
     </plugins>
 
     <resources>

Modified: directory/apacheds/trunk/core-shared/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-shared/pom.xml?rev=1184763&r1=1184762&r2=1184763&view=diff
==============================================================================
--- directory/apacheds/trunk/core-shared/pom.xml (original)
+++ directory/apacheds/trunk/core-shared/pom.xml Sun Oct 16 05:17:38 2011
@@ -29,7 +29,7 @@
   
   <artifactId>apacheds-core-shared</artifactId>
   <name>ApacheDS Core Shared</name>
-  <packaging>jar</packaging>
+  <packaging>bundle</packaging>
 
   <description>
     Contains helper classes that are part of the ApacheDS Core.
@@ -151,6 +151,20 @@
           </execution>
         </executions>
       </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>
     </plugins>
   </build>
 

Modified: directory/apacheds/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/pom.xml?rev=1184763&r1=1184762&r2=1184763&view=diff
==============================================================================
--- directory/apacheds/trunk/core/pom.xml (original)
+++ directory/apacheds/trunk/core/pom.xml Sun Oct 16 05:17:38 2011
@@ -29,7 +29,7 @@
   
   <artifactId>apacheds-core</artifactId>
   <name>ApacheDS Core</name>
-  <packaging>jar</packaging>
+  <packaging>bundle</packaging>
 
   <description>
      Server's core contains the JNDI provider, interceptors, schema, and
@@ -249,6 +249,21 @@
           </execution>
         </executions>
       </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>
     </plugins>
 
     <resources>
@@ -261,5 +276,4 @@
       </resource>
     </resources>
   </build>
-</project>
-
+</project>
\ No newline at end of file

Modified: directory/apacheds/trunk/http-directory-bridge/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/http-directory-bridge/pom.xml?rev=1184763&r1=1184762&r2=1184763&view=diff
==============================================================================
--- directory/apacheds/trunk/http-directory-bridge/pom.xml (original)
+++ directory/apacheds/trunk/http-directory-bridge/pom.xml Sun Oct 16 05:17:38 2011
@@ -27,6 +27,7 @@
 
   <artifactId>apacheds-http-directory-bridge</artifactId>
   <name>ApacheDS DirectoryService-WebApp bridge</name>
+  <packaging>bundle</packaging>
 
   <dependencies>
     
@@ -45,5 +46,24 @@
       <artifactId>shared-ldap-model</artifactId>
     </dependency>
   </dependencies>
+  
+  <build>
+    <plugins>
+      <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>
+    </plugins>
+  </build>
 
 </project>

Modified: directory/apacheds/trunk/http-integration/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/http-integration/pom.xml?rev=1184763&r1=1184762&r2=1184763&view=diff
==============================================================================
--- directory/apacheds/trunk/http-integration/pom.xml (original)
+++ directory/apacheds/trunk/http-integration/pom.xml Sun Oct 16 05:17:38 2011
@@ -29,6 +29,7 @@
   
   <artifactId>apacheds-http-integration</artifactId>
   <name>ApacheDS Jetty HTTP Server Integration</name>
+  <packaging>bundle</packaging>
   
   <dependencies>
     <dependency>
@@ -103,6 +104,21 @@
           </execution>
         </executions>
       </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>
    </plugins>
   </build>
 </project>

Modified: directory/apacheds/trunk/i18n/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/i18n/pom.xml?rev=1184763&r1=1184762&r2=1184763&view=diff
==============================================================================
--- directory/apacheds/trunk/i18n/pom.xml (original)
+++ directory/apacheds/trunk/i18n/pom.xml Sun Oct 16 05:17:38 2011
@@ -27,7 +27,27 @@
   
   <artifactId>apacheds-i18n</artifactId>
   <name>ApacheDS I18n</name>
+  <packaging>bundle</packaging>
   
   <description>Internationalization of errors and other messages</description>
+  
+  <build>
+    <plugins>
+      <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>
+    </plugins>
+  </build>
 
 </project>

Modified: directory/apacheds/trunk/interceptor-kerberos/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptor-kerberos/pom.xml?rev=1184763&r1=1184762&r2=1184763&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptor-kerberos/pom.xml (original)
+++ directory/apacheds/trunk/interceptor-kerberos/pom.xml Sun Oct 16 05:17:38 2011
@@ -27,6 +27,7 @@
   
   <artifactId>apacheds-interceptor-kerberos</artifactId>
   <name>ApacheDS Interceptors for Kerberos</name>
+  <packaging>bundle</packaging>
 
   <description>Interceptors used by the ApacheDS kerberos service.</description>
 
@@ -92,6 +93,21 @@
           </execution>
         </executions>
       </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>
     </plugins>
 
     <resources>

Modified: directory/apacheds/trunk/interceptors/admin/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/admin/pom.xml?rev=1184763&r1=1184762&r2=1184763&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/admin/pom.xml (original)
+++ directory/apacheds/trunk/interceptors/admin/pom.xml Sun Oct 16 05:17:38 2011
@@ -29,7 +29,7 @@
   
   <artifactId>apacheds-interceptors-admin</artifactId>
   <name>ApacheDS AdministrativePoint Interceptor</name>
-  <packaging>jar</packaging>
+  <packaging>bundle</packaging>
 
   <description>
     AdministrativePoint interceptor
@@ -167,6 +167,21 @@
           </execution>
         </executions>
       </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>
     </plugins>
 
     <resources>

Modified: directory/apacheds/trunk/interceptors/authn/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/authn/pom.xml?rev=1184763&r1=1184762&r2=1184763&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/authn/pom.xml (original)
+++ directory/apacheds/trunk/interceptors/authn/pom.xml Sun Oct 16 05:17:38 2011
@@ -29,7 +29,7 @@
   
   <artifactId>apacheds-interceptors-authn</artifactId>
   <name>ApacheDS Authentication Interceptor</name>
-  <packaging>jar</packaging>
+  <packaging>bundle</packaging>
 
   <description>
     Authentication interceptor
@@ -167,6 +167,21 @@
           </execution>
         </executions>
       </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>
     </plugins>
 
     <resources>

Modified: directory/apacheds/trunk/interceptors/authz/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/authz/pom.xml?rev=1184763&r1=1184762&r2=1184763&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/authz/pom.xml (original)
+++ directory/apacheds/trunk/interceptors/authz/pom.xml Sun Oct 16 05:17:38 2011
@@ -29,7 +29,7 @@
   
   <artifactId>apacheds-interceptors-authz</artifactId>
   <name>ApacheDS Authorization Interceptor</name>
-  <packaging>jar</packaging>
+  <packaging>bundle</packaging>
 
   <description>
     Authorization interceptor
@@ -172,6 +172,21 @@
           </execution>
         </executions>
       </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>
     </plugins>
 
     <resources>

Modified: directory/apacheds/trunk/interceptors/changelog/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/changelog/pom.xml?rev=1184763&r1=1184762&r2=1184763&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/changelog/pom.xml (original)
+++ directory/apacheds/trunk/interceptors/changelog/pom.xml Sun Oct 16 05:17:38 2011
@@ -29,7 +29,7 @@
   
   <artifactId>apacheds-interceptors-changelog</artifactId>
   <name>ApacheDS ChangeLog Interceptor</name>
-  <packaging>jar</packaging>
+  <packaging>bundle</packaging>
 
   <description>
     ChangeLog interceptor
@@ -167,6 +167,21 @@
           </execution>
         </executions>
       </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>
     </plugins>
 
     <resources>

Modified: directory/apacheds/trunk/interceptors/collective/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/collective/pom.xml?rev=1184763&r1=1184762&r2=1184763&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/collective/pom.xml (original)
+++ directory/apacheds/trunk/interceptors/collective/pom.xml Sun Oct 16 05:17:38 2011
@@ -29,7 +29,7 @@
   
   <artifactId>apacheds-interceptors-collective</artifactId>
   <name>ApacheDS Collective Attribute Interceptor</name>
-  <packaging>jar</packaging>
+  <packaging>bundle</packaging>
 
   <description>
     Collective Attribute interceptor
@@ -162,6 +162,21 @@
           </execution>
         </executions>
       </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>
     </plugins>
 
     <resources>

Modified: directory/apacheds/trunk/interceptors/event/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/event/pom.xml?rev=1184763&r1=1184762&r2=1184763&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/event/pom.xml (original)
+++ directory/apacheds/trunk/interceptors/event/pom.xml Sun Oct 16 05:17:38 2011
@@ -29,7 +29,7 @@
   
   <artifactId>apacheds-interceptors-event</artifactId>
   <name>ApacheDS Event Interceptor</name>
-  <packaging>jar</packaging>
+  <packaging>bundle</packaging>
 
   <description>
     Event interceptor
@@ -167,6 +167,21 @@
           </execution>
         </executions>
       </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>
     </plugins>
 
     <resources>

Modified: directory/apacheds/trunk/interceptors/exception/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/exception/pom.xml?rev=1184763&r1=1184762&r2=1184763&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/exception/pom.xml (original)
+++ directory/apacheds/trunk/interceptors/exception/pom.xml Sun Oct 16 05:17:38 2011
@@ -29,7 +29,7 @@
   
   <artifactId>apacheds-interceptors-exception</artifactId>
   <name>ApacheDS Exception Interceptor</name>
-  <packaging>jar</packaging>
+  <packaging>bundle</packaging>
 
   <description>
     Exception interceptor
@@ -167,6 +167,21 @@
           </execution>
         </executions>
       </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>
     </plugins>
 
     <resources>

Modified: directory/apacheds/trunk/interceptors/hash/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/hash/pom.xml?rev=1184763&r1=1184762&r2=1184763&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/hash/pom.xml (original)
+++ directory/apacheds/trunk/interceptors/hash/pom.xml Sun Oct 16 05:17:38 2011
@@ -29,7 +29,7 @@
   
   <artifactId>apacheds-interceptors-hash</artifactId>
   <name>ApacheDS Password Hashing Interceptor</name>
-  <packaging>jar</packaging>
+  <packaging>bundle</packaging>
 
   <description>
     Password Hashing interceptor
@@ -60,6 +60,11 @@
     </dependency>
     
     <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-core-shared</artifactId>
+    </dependency>
+    
+    <dependency>
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
     </dependency>
@@ -162,6 +167,21 @@
           </execution>
         </executions>
       </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>
     </plugins>
 
     <resources>

Modified: directory/apacheds/trunk/interceptors/journal/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/journal/pom.xml?rev=1184763&r1=1184762&r2=1184763&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/journal/pom.xml (original)
+++ directory/apacheds/trunk/interceptors/journal/pom.xml Sun Oct 16 05:17:38 2011
@@ -29,7 +29,7 @@
   
   <artifactId>apacheds-interceptors-journal</artifactId>
   <name>ApacheDS Journal Interceptor</name>
-  <packaging>jar</packaging>
+  <packaging>bundle</packaging>
 
   <description>
     Journal interceptor
@@ -162,6 +162,21 @@
           </execution>
         </executions>
       </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>
     </plugins>
 
     <resources>

Modified: directory/apacheds/trunk/interceptors/logger/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/logger/pom.xml?rev=1184763&r1=1184762&r2=1184763&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/logger/pom.xml (original)
+++ directory/apacheds/trunk/interceptors/logger/pom.xml Sun Oct 16 05:17:38 2011
@@ -29,7 +29,7 @@
   
   <artifactId>apacheds-interceptors-logger</artifactId>
   <name>ApacheDS Logger Interceptor</name>
-  <packaging>jar</packaging>
+  <packaging>bundle</packaging>
 
   <description>
     Logger interceptor
@@ -162,6 +162,21 @@
           </execution>
         </executions>
       </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>
     </plugins>
 
     <resources>

Modified: directory/apacheds/trunk/interceptors/normalization/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/normalization/pom.xml?rev=1184763&r1=1184762&r2=1184763&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/normalization/pom.xml (original)
+++ directory/apacheds/trunk/interceptors/normalization/pom.xml Sun Oct 16 05:17:38 2011
@@ -29,7 +29,7 @@
   
   <artifactId>apacheds-interceptors-normalization</artifactId>
   <name>ApacheDS Normalization Interceptor</name>
-  <packaging>jar</packaging>
+  <packaging>bundle</packaging>
 
   <description>
     Normalization interceptor
@@ -167,6 +167,21 @@
           </execution>
         </executions>
       </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>
     </plugins>
 
     <resources>

Modified: directory/apacheds/trunk/interceptors/operational/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/operational/pom.xml?rev=1184763&r1=1184762&r2=1184763&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/operational/pom.xml (original)
+++ directory/apacheds/trunk/interceptors/operational/pom.xml Sun Oct 16 05:17:38 2011
@@ -29,7 +29,7 @@
   
   <artifactId>apacheds-interceptors-operational</artifactId>
   <name>ApacheDS Operational Attribute Interceptor</name>
-  <packaging>jar</packaging>
+  <packaging>bundle</packaging>
 
   <description>
     Operational Attribute interceptor
@@ -162,6 +162,21 @@
           </execution>
         </executions>
       </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>
     </plugins>
 
     <resources>

Modified: directory/apacheds/trunk/interceptors/referral/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/referral/pom.xml?rev=1184763&r1=1184762&r2=1184763&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/referral/pom.xml (original)
+++ directory/apacheds/trunk/interceptors/referral/pom.xml Sun Oct 16 05:17:38 2011
@@ -29,7 +29,7 @@
   
   <artifactId>apacheds-interceptors-referral</artifactId>
   <name>ApacheDS Referral Interceptor</name>
-  <packaging>jar</packaging>
+  <packaging>bundle</packaging>
 
   <description>
     Referral interceptor
@@ -167,6 +167,21 @@
           </execution>
         </executions>
       </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>
     </plugins>
 
     <resources>

Modified: directory/apacheds/trunk/interceptors/schema/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/schema/pom.xml?rev=1184763&r1=1184762&r2=1184763&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/schema/pom.xml (original)
+++ directory/apacheds/trunk/interceptors/schema/pom.xml Sun Oct 16 05:17:38 2011
@@ -29,7 +29,7 @@
   
   <artifactId>apacheds-interceptors-schema</artifactId>
   <name>ApacheDS Schema Interceptor</name>
-  <packaging>jar</packaging>
+  <packaging>bundle</packaging>
 
   <description>
     Schema interceptor
@@ -167,6 +167,21 @@
           </execution>
         </executions>
       </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>
     </plugins>
 
     <resources>

Modified: directory/apacheds/trunk/interceptors/subtree/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/subtree/pom.xml?rev=1184763&r1=1184762&r2=1184763&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/subtree/pom.xml (original)
+++ directory/apacheds/trunk/interceptors/subtree/pom.xml Sun Oct 16 05:17:38 2011
@@ -29,7 +29,7 @@
   
   <artifactId>apacheds-interceptors-subtree</artifactId>
   <name>ApacheDS Subtree Interceptor</name>
-  <packaging>jar</packaging>
+  <packaging>bundle</packaging>
 
   <description>
     Subtree interceptor
@@ -167,6 +167,21 @@
           </execution>
         </executions>
       </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>
     </plugins>
 
     <resources>

Modified: directory/apacheds/trunk/interceptors/trigger/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/trigger/pom.xml?rev=1184763&r1=1184762&r2=1184763&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/trigger/pom.xml (original)
+++ directory/apacheds/trunk/interceptors/trigger/pom.xml Sun Oct 16 05:17:38 2011
@@ -29,7 +29,7 @@
   
   <artifactId>apacheds-interceptors-trigger</artifactId>
   <name>ApacheDS Triggers Interceptor</name>
-  <packaging>jar</packaging>
+  <packaging>bundle</packaging>
 
   <description>
     Triggers interceptor
@@ -172,6 +172,21 @@
           </execution>
         </executions>
       </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>
     </plugins>
 
     <resources>

Modified: directory/apacheds/trunk/jdbm-partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/pom.xml?rev=1184763&r1=1184762&r2=1184763&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/pom.xml (original)
+++ directory/apacheds/trunk/jdbm-partition/pom.xml Sun Oct 16 05:17:38 2011
@@ -27,6 +27,7 @@
   
   <artifactId>apacheds-jdbm-partition</artifactId>
   <name>ApacheDS JDBM Partition</name>
+  <packaging>bundle</packaging>
 
   <description>
     JDBM BTree backed partition implementation.
@@ -122,6 +123,21 @@
           </execution>
         </executions>
       </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>
     </plugins>
   </build>
 </project>

Modified: directory/apacheds/trunk/jdbm/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm/pom.xml?rev=1184763&r1=1184762&r2=1184763&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm/pom.xml (original)
+++ directory/apacheds/trunk/jdbm/pom.xml Sun Oct 16 05:17:38 2011
@@ -27,6 +27,7 @@
   
   <artifactId>apacheds-jdbm</artifactId>
   <name>ApacheDS JDBM implementation</name>
+  <packaging>bundle</packaging>
 
   <description>Specific JDBM Implementation</description>
 
@@ -58,5 +59,21 @@
          </plugin>
       </plugins>
     </pluginManagement>
+    <plugins>
+      <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>
+    </plugins>
   </build>
 </project>

Modified: directory/apacheds/trunk/kerberos-codec/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/pom.xml?rev=1184763&r1=1184762&r2=1184763&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/pom.xml (original)
+++ directory/apacheds/trunk/kerberos-codec/pom.xml Sun Oct 16 05:17:38 2011
@@ -27,6 +27,7 @@
   
   <artifactId>apacheds-kerberos-codec</artifactId>
   <name>ApacheDS Protocol Kerberos Codec</name>
+  <packaging>bundle</packaging>
 
   <description>The Kerberos protocol encoder/decoder module</description>
 
@@ -103,6 +104,21 @@
           </execution>
         </executions>
       </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>
     </plugins>
   </build>
 </project>

Modified: directory/apacheds/trunk/ldif-partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldif-partition/pom.xml?rev=1184763&r1=1184762&r2=1184763&view=diff
==============================================================================
--- directory/apacheds/trunk/ldif-partition/pom.xml (original)
+++ directory/apacheds/trunk/ldif-partition/pom.xml Sun Oct 16 05:17:38 2011
@@ -27,6 +27,7 @@
   
   <artifactId>apacheds-ldif-partition</artifactId>
   <name>ApacheDS LDIF Partition</name>
+  <packaging>bundle</packaging>
 
   <description>A partition that backs it's entries and indices in AvlTrees within memory.</description>
 
@@ -99,6 +100,21 @@
           </execution>
         </executions>
       </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>
     </plugins>
   </build>
 </project>

Modified: directory/apacheds/trunk/protocol-dhcp/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dhcp/pom.xml?rev=1184763&r1=1184762&r2=1184763&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-dhcp/pom.xml (original)
+++ directory/apacheds/trunk/protocol-dhcp/pom.xml Sun Oct 16 05:17:38 2011
@@ -27,6 +27,7 @@
   
   <artifactId>apacheds-protocol-dhcp</artifactId>
   <name>ApacheDS Protocol Dhcp</name>
+  <packaging>bundle</packaging>
 
   <description>The DHCP protocol provider for ApacheDS</description>
 
@@ -52,4 +53,23 @@
       <artifactId>mina-core</artifactId>
     </dependency>
   </dependencies>
+  
+  <build>
+    <plugins>
+      <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>
+    </plugins>
+  </build>
 </project>

Modified: directory/apacheds/trunk/protocol-dns/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dns/pom.xml?rev=1184763&r1=1184762&r2=1184763&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-dns/pom.xml (original)
+++ directory/apacheds/trunk/protocol-dns/pom.xml Sun Oct 16 05:17:38 2011
@@ -27,6 +27,7 @@
   
   <artifactId>apacheds-protocol-dns</artifactId>
   <name>ApacheDS Protocol Dns</name>
+  <packaging>bundle</packaging>
 
   <description>The DNS protocol provider for ApacheDS</description> 
 
@@ -88,6 +89,21 @@
           </execution>
         </executions>
       </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>
     </plugins>
   </build>
 </project>

Modified: directory/apacheds/trunk/protocol-kerberos/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-kerberos/pom.xml?rev=1184763&r1=1184762&r2=1184763&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-kerberos/pom.xml (original)
+++ directory/apacheds/trunk/protocol-kerberos/pom.xml Sun Oct 16 05:17:38 2011
@@ -27,6 +27,7 @@
   
   <artifactId>apacheds-protocol-kerberos</artifactId>
   <name>ApacheDS Protocol Kerberos</name>
+  <packaging>bundle</packaging>
 
   <description>The Kerberos Protocol Provider for ApacheDS</description>
 
@@ -96,6 +97,21 @@
           </execution>
         </executions>
       </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>
     </plugins>
   </build>
 </project>

Modified: directory/apacheds/trunk/protocol-ldap/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/pom.xml?rev=1184763&r1=1184762&r2=1184763&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/pom.xml (original)
+++ directory/apacheds/trunk/protocol-ldap/pom.xml Sun Oct 16 05:17:38 2011
@@ -27,6 +27,7 @@
   
   <artifactId>apacheds-protocol-ldap</artifactId>
   <name>ApacheDS Protocol Ldap</name>
+  <packaging>bundle</packaging>
   
   <description>The LDAPv3 protocol provider for ApacheDS</description>
 
@@ -156,6 +157,21 @@
           </execution>
         </executions>
       </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>
     </plugins>
   </build>
 </project>

Modified: directory/apacheds/trunk/protocol-ntp/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ntp/pom.xml?rev=1184763&r1=1184762&r2=1184763&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ntp/pom.xml (original)
+++ directory/apacheds/trunk/protocol-ntp/pom.xml Sun Oct 16 05:17:38 2011
@@ -27,6 +27,7 @@
   
   <artifactId>apacheds-protocol-ntp</artifactId>
   <name>ApacheDS Protocol Ntp</name>
+  <packaging>bundle</packaging>
 
   <description>The NTP protocol provider for ApacheDS</description>
 
@@ -63,6 +64,21 @@
           </execution>
         </executions>
       </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>
     </plugins>
   </build>
 </project>

Modified: directory/apacheds/trunk/protocol-shared/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-shared/pom.xml?rev=1184763&r1=1184762&r2=1184763&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-shared/pom.xml (original)
+++ directory/apacheds/trunk/protocol-shared/pom.xml Sun Oct 16 05:17:38 2011
@@ -26,6 +26,7 @@
   </parent>
   
   <name>ApacheDS Protocol Shared</name>
+  <packaging>bundle</packaging>
   <artifactId>apacheds-protocol-shared</artifactId>
 
   <description>
@@ -69,6 +70,21 @@
           </execution>
         </executions>
       </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>
     </plugins>
   </build>
 </project>

Modified: directory/apacheds/trunk/server-annotations/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-annotations/pom.xml?rev=1184763&r1=1184762&r2=1184763&view=diff
==============================================================================
--- directory/apacheds/trunk/server-annotations/pom.xml (original)
+++ directory/apacheds/trunk/server-annotations/pom.xml Sun Oct 16 05:17:38 2011
@@ -27,6 +27,7 @@
   
   <artifactId>apacheds-server-annotations</artifactId>
   <name>Apacheds Server Annotations</name>
+  <packaging>bundle</packaging>
 
   <description>Annotations used to define a LdapServer</description>
   
@@ -115,6 +116,21 @@
           </systemPropertyVariables>
         </configuration>
       </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>
     </plugins>
   </build>  
 </project>

Modified: directory/apacheds/trunk/server-config/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/pom.xml?rev=1184763&r1=1184762&r2=1184763&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/pom.xml (original)
+++ directory/apacheds/trunk/server-config/pom.xml Sun Oct 16 05:17:38 2011
@@ -27,6 +27,7 @@
 
   <artifactId>apacheds-server-config</artifactId>
   <name>ApacheDS Server Config</name>
+  <packaging>bundle</packaging>
 
   <dependencies>
     
@@ -76,4 +77,23 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+  
+  <build>
+    <plugins>
+      <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>
+    </plugins>
+  </build>
 </project>

Modified: directory/apacheds/trunk/server-integ/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/pom.xml?rev=1184763&r1=1184762&r2=1184763&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/pom.xml (original)
+++ directory/apacheds/trunk/server-integ/pom.xml Sun Oct 16 05:17:38 2011
@@ -27,6 +27,7 @@
   
   <artifactId>apacheds-server-integ</artifactId>
   <name>ApacheDS Server Integration</name>
+  <packaging>bundle</packaging>
 
   <description>Integration testing framework for Apache Directory Server.</description>
 
@@ -204,6 +205,21 @@
           </execution>
         </executions>
       </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>
     </plugins>
   </build>
 

Modified: directory/apacheds/trunk/server-jndi/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-jndi/pom.xml?rev=1184763&r1=1184762&r2=1184763&view=diff
==============================================================================
--- directory/apacheds/trunk/server-jndi/pom.xml (original)
+++ directory/apacheds/trunk/server-jndi/pom.xml Sun Oct 16 05:17:38 2011
@@ -27,6 +27,7 @@
   
   <artifactId>apacheds-server-jndi</artifactId>
   <name>ApacheDS Server JNDI</name>
+  <packaging>bundle</packaging>
 
   <description>
     The JNDI provider which launches the core and associated network 
@@ -115,6 +116,21 @@
           </systemPropertyVariables>
         </configuration>
       </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>
     </plugins>
   </build>
 </project>

Modified: directory/apacheds/trunk/server-replication/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-replication/pom.xml?rev=1184763&r1=1184762&r2=1184763&view=diff
==============================================================================
--- directory/apacheds/trunk/server-replication/pom.xml (original)
+++ directory/apacheds/trunk/server-replication/pom.xml Sun Oct 16 05:17:38 2011
@@ -27,6 +27,7 @@
   
   <artifactId>apacheds-server-replication</artifactId>
   <name>ApacheDS Server Replication Service</name>
+  <packaging>bundle</packaging>
   
   <description>
     A multi-master replication service for replicating information
@@ -49,4 +50,23 @@
       <artifactId>shared-util</artifactId>
     </dependency>
   </dependencies>
+  
+  <build>
+    <plugins>
+      <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>
+    </plugins>
+  </build>
 </project>

Modified: directory/apacheds/trunk/service-builder/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/service-builder/pom.xml?rev=1184763&r1=1184762&r2=1184763&view=diff
==============================================================================
--- directory/apacheds/trunk/service-builder/pom.xml (original)
+++ directory/apacheds/trunk/service-builder/pom.xml Sun Oct 16 05:17:38 2011
@@ -27,6 +27,7 @@
 
   <artifactId>apacheds-service-builder</artifactId>
   <name>ApacheDS Service Builder</name>
+  <packaging>bundle</packaging>
 
   <dependencies>
     <dependency>
@@ -135,4 +136,23 @@
       <artifactId>apacheds-interceptor-kerberos</artifactId>
     </dependency>
   </dependencies>
+  
+  <build>
+    <plugins>
+      <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>
+    </plugins>
+  </build>
 </project>

Modified: directory/apacheds/trunk/service/ApacheDS.launch
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/service/ApacheDS.launch?rev=1184763&r1=1184762&r2=1184763&view=diff
==============================================================================
--- directory/apacheds/trunk/service/ApacheDS.launch (original)
+++ directory/apacheds/trunk/service/ApacheDS.launch Sun Oct 16 05:17:38 2011
@@ -1,22 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-  
-  http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
 <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/apacheds-service/src/main/java/org/apache/directory/server/UberjarMain.java"/>
@@ -24,6 +6,9 @@
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
 </listAttribute>
+<mapAttribute key="org.eclipse.debug.core.preferred_launchers">
+<mapEntry key="[debug]" value="org.eclipse.jdt.launching.localJavaApplication"/>
+</mapAttribute>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.directory.server.UberjarMain"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="./target/instance"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="apacheds-service"/>

Modified: directory/apacheds/trunk/service/log4j.properties
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/service/log4j.properties?rev=1184763&r1=1184762&r2=1184763&view=diff
==============================================================================
--- directory/apacheds/trunk/service/log4j.properties (original)
+++ directory/apacheds/trunk/service/log4j.properties Sun Oct 16 05:17:38 2011
@@ -37,4 +37,5 @@ log4j.logger.org.apache.directory.shared
 log4j.logger.org.apache.directory.shared.asn1=FATAL
 
 log4j.logger.org.apache.directory.server.schema.registries=FATAL
+#log4j.logger.org.apache.directory.server.ldap.handlers=DEBUG
 

Modified: directory/apacheds/trunk/test-framework/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/test-framework/pom.xml?rev=1184763&r1=1184762&r2=1184763&view=diff
==============================================================================
--- directory/apacheds/trunk/test-framework/pom.xml (original)
+++ directory/apacheds/trunk/test-framework/pom.xml Sun Oct 16 05:17:38 2011
@@ -28,6 +28,7 @@
   
   <artifactId>apacheds-test-framework</artifactId>
   <name>ApacheDS Test Framework</name>
+  <packaging>bundle</packaging>
   
   <description>Test framework for integration tests without depending on the InheritableSettings</description>
   
@@ -105,6 +106,21 @@
           </systemPropertyVariables>
         </configuration>
       </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>
     </plugins>
   </build>  
 </project>

Modified: directory/apacheds/trunk/xdbm-partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/pom.xml?rev=1184763&r1=1184762&r2=1184763&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/pom.xml (original)
+++ directory/apacheds/trunk/xdbm-partition/pom.xml Sun Oct 16 05:17:38 2011
@@ -26,6 +26,7 @@
   
   <artifactId>apacheds-xdbm-partition</artifactId>
   <name>ApacheDS Generalized (X) DBM Partition</name>
+  <packaging>bundle</packaging>
   
   <description>Partition with search engine implementation generalized for XDBM entry store scheme</description>
   
@@ -95,6 +96,21 @@
           </execution>
         </executions>
       </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>
     </plugins>
   </build>
 </project>

Modified: directory/apacheds/trunk/xdbm-tools/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-tools/pom.xml?rev=1184763&r1=1184762&r2=1184763&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-tools/pom.xml (original)
+++ directory/apacheds/trunk/xdbm-tools/pom.xml Sun Oct 16 05:17:38 2011
@@ -25,6 +25,7 @@
   
   <artifactId>apacheds-xdbm-tools</artifactId>
   <name>ApacheDS Generalized (X) DBM Tools</name>
+  <packaging>bundle</packaging>
 
   <description>
     Several kinds of two column key/value data structures, in memory and on  
@@ -66,4 +67,23 @@
       <artifactId>shared-util</artifactId>
     </dependency>
   </dependencies>
+  
+  <build>
+    <plugins>
+      <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>
+    </plugins>
+  </build>
 </project>