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 2014/10/30 08:47:59 UTC

svn commit: r1635419 - in /directory/shared/trunk: ./ asn1/api/ asn1/ber/ dsml/engine/ dsml/parser/ i18n/ ldap/client/api/ ldap/codec/core/ ldap/extras/aci/ ldap/extras/codec-api/ ldap/extras/codec/ ldap/extras/sp/ ldap/extras/trigger/ ldap/extras/util...

Author: elecharny
Date: Thu Oct 30 07:47:58 2014
New Revision: 1635419

URL: http://svn.apache.org/r1635419
Log:
Updated the pom.xml, adding the Import-Packages and updated the Export-Packages in the bundle-plugin configuration

Modified:
    directory/shared/trunk/asn1/api/pom.xml
    directory/shared/trunk/asn1/ber/pom.xml
    directory/shared/trunk/dsml/engine/pom.xml
    directory/shared/trunk/dsml/parser/pom.xml
    directory/shared/trunk/i18n/pom.xml
    directory/shared/trunk/ldap/client/api/pom.xml
    directory/shared/trunk/ldap/codec/core/pom.xml
    directory/shared/trunk/ldap/extras/aci/pom.xml
    directory/shared/trunk/ldap/extras/codec-api/pom.xml
    directory/shared/trunk/ldap/extras/codec/pom.xml
    directory/shared/trunk/ldap/extras/sp/pom.xml
    directory/shared/trunk/ldap/extras/trigger/pom.xml
    directory/shared/trunk/ldap/extras/util/pom.xml
    directory/shared/trunk/ldap/model/pom.xml
    directory/shared/trunk/ldap/net/mina/pom.xml
    directory/shared/trunk/ldap/schema/converter/pom.xml
    directory/shared/trunk/ldap/schema/data/pom.xml
    directory/shared/trunk/pom.xml
    directory/shared/trunk/util/pom.xml

Modified: directory/shared/trunk/asn1/api/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/api/pom.xml?rev=1635419&r1=1635418&r2=1635419&view=diff
==============================================================================
--- directory/shared/trunk/asn1/api/pom.xml (original)
+++ directory/shared/trunk/asn1/api/pom.xml Thu Oct 30 07:47:58 2014
@@ -67,8 +67,12 @@
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.asn1.api</Bundle-SymbolicName>
             <Export-Package>
-                {local-packages};version=${project.version};-noimport:=true
+              org.apache.directory.api.asn1;version=${project.version};-noimport:=true,
+              org.apache.directory.api.asn1.util;version=${project.version};-noimport:=true
             </Export-Package>
+            <Import-Package>
+              org.apache.directory.api.i18n;version=${project.version}
+            </Import-Package>
           </instructions>
         </configuration>
       </plugin>

Modified: directory/shared/trunk/asn1/ber/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/ber/pom.xml?rev=1635419&r1=1635418&r2=1635419&view=diff
==============================================================================
--- directory/shared/trunk/asn1/ber/pom.xml (original)
+++ directory/shared/trunk/asn1/ber/pom.xml Thu Oct 30 07:47:58 2014
@@ -77,8 +77,18 @@
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.asn1.ber</Bundle-SymbolicName>
             <Export-Package>
-                {local-packages};version=${project.version};-noimport:=true
+              org.apache.directory.api.asn1.actions;version=${project.version};-noimport:=true,
+              org.apache.directory.api.asn1.ber;version=${project.version};-noimport:=true,
+              org.apache.directory.api.asn1.ber.grammar;version=${project.version};-noimport:=true,
+              org.apache.directory.api.asn1.ber.tlv;version=${project.version};-noimport:=true
             </Export-Package>
+            <Import-Package>
+              org.apache.directory.api.asn1;version=${project.version},
+              org.apache.directory.api.asn1.util;version=${project.version},
+              org.apache.directory.api.i18n;version=${project.version},
+              org.apache.directory.api.util;version=${project.version},
+              org.slf4j;version=${slf4j.api.version}
+            </Import-Package>
           </instructions>
         </configuration>
       </plugin>

Modified: directory/shared/trunk/dsml/engine/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/engine/pom.xml?rev=1635419&r1=1635418&r2=1635419&view=diff
==============================================================================
--- directory/shared/trunk/dsml/engine/pom.xml (original)
+++ directory/shared/trunk/dsml/engine/pom.xml Thu Oct 30 07:47:58 2014
@@ -79,8 +79,23 @@
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.dsmlv2.engine</Bundle-SymbolicName>
             <Export-Package>
-                {local-packages};version=${project.version};-noimport:=true
+              org.apache.directory.api.dsmlv2.engine;version=${project.version};-noimport:=true
             </Export-Package>
+            <Import-Package>
+              org.apache.directory.api.asn1;version=${project.version},
+              org.apache.directory.api.dsmlv2;version=${project.version},
+              org.apache.directory.api.dsmlv2.response;version=${project.version},
+              org.apache.directory.api.dsmlv2.request;version=${project.version},
+              org.apache.directory.api.i18n;version=${project.version},
+              org.apache.directory.api.ldap.model.cursor;version=${project.version},
+              org.apache.directory.api.ldap.model.exception;version=${project.version},
+              org.apache.directory.api.ldap.model.message;version=${project.version},
+              org.apache.directory.api.util;version=${project.version},
+              org.apache.directory.ldap.client.api;version=${project.version},
+              org.dom4j;version=${prg.dom4j.version},
+              org.slf4;version=${slf4j.api.version},
+              org.xmlpull.v1;version=${xpp3.version}
+            </Import-Package>
           </instructions>
         </configuration>
       </plugin>

Modified: directory/shared/trunk/dsml/parser/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/pom.xml?rev=1635419&r1=1635418&r2=1635419&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/pom.xml (original)
+++ directory/shared/trunk/dsml/parser/pom.xml Thu Oct 30 07:47:58 2014
@@ -109,8 +109,30 @@
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.dsmlv2.parser</Bundle-SymbolicName>
             <Export-Package>
-                {local-packages};version=${project.version};-noimport:=true
+              org.apache.directory.api.dsmlv2;version=${project.version};-noimport:=true,
+              org.apache.directory.api.dsmlv2.response;version=${project.version};-noimport:=true,
+              org.apache.directory.api.dsmlv2.request;version=${project.version};-noimport:=true
             </Export-Package>
+            <Import-Package>
+              org.apache.directory.api.asn1;version=${project.version},
+              org.apache.directory.api.asn1.util;version=${project.version},
+              org.apache.directory.api.i18n;version=${project.version},
+              org.apache.directory.api.ldap.codec.api;version=${project.version},
+              org.apache.directory.api.ldap.model.entry;version=${project.version},
+              org.apache.directory.api.ldap.model.exception;version=${project.version},
+              org.apache.directory.api.ldap.model.filter;version=${project.version},
+              org.apache.directory.api.ldap.model.ldif;version=${project.version},
+              org.apache.directory.api.ldap.model.message;version=${project.version},
+              org.apache.directory.api.ldap.model.message.controls;version=${project.version},
+              org.apache.directory.api.ldap.model.name;version=${project.version},
+              org.apache.directory.api.ldap.model.url;version=${project.version},
+              org.apache.directory.api.util;version=${project.version},
+              org.dom4j;version=${dom4j.version},
+              org.dom4j.io;version=${dom4j.version},
+              org.dom4j.tree;version=${dom4j.version},
+              org.slf4;version=${slf4j.api.version},
+              org.xmlpull.v1;version=${xpp3.version}
+            </Import-Package>
           </instructions>
         </configuration>
       </plugin>

Modified: directory/shared/trunk/i18n/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/i18n/pom.xml?rev=1635419&r1=1635418&r2=1635419&view=diff
==============================================================================
--- directory/shared/trunk/i18n/pom.xml (original)
+++ directory/shared/trunk/i18n/pom.xml Thu Oct 30 07:47:58 2014
@@ -61,7 +61,7 @@
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.i18n</Bundle-SymbolicName>
             <Export-Package>
-                {local-packages};version=${project.version};-noimport:=true
+              org.apache.directory.api.i18n;version=${project.version};-noimport:=true
             </Export-Package>
           </instructions>
         </configuration>

Modified: directory/shared/trunk/ldap/client/api/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/client/api/pom.xml?rev=1635419&r1=1635418&r2=1635419&view=diff
==============================================================================
--- directory/shared/trunk/ldap/client/api/pom.xml (original)
+++ directory/shared/trunk/ldap/client/api/pom.xml Thu Oct 30 07:47:58 2014
@@ -118,8 +118,45 @@
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.ldap.client.api</Bundle-SymbolicName>
             <Export-Package>
-                {local-packages};version=${project.version};-noimport:=true
+              org.apache.directory.api.ldap.client.api;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.client.api.callback;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.client.api.exception;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.client.api.future;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.client.template;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.client.template.exception;version=${project.version};-noimport:=true
             </Export-Package>
+            <Import-Package>
+              org.apache.commons.pool;version=${commons.pool.version},
+              org.apache.commons.pool.impl;version=${commons.pool.version},
+              org.apache.directory.api.asn1;version=${project.version},
+              org.apache.directory.api.asn1.util;version=${project.version},
+              org.apache.directory.api.i18n;version=${project.version},
+              org.apache.directory.api.ldap.codec.api;version=${project.version},
+              org.apache.directory.api.ldap.extras.controls.ppolicy;version=${project.version},
+              org.apache.directory.api.ldap.extras.controls.ppolicy_impl;version=${project.version},
+              org.apache.directory.api.ldap.extras.extended.startTls;version=${project.version},
+              org.apache.directory.api.ldap.model.constants;version=${project.version},
+              org.apache.directory.api.ldap.model.cursor;version=${project.version},
+              org.apache.directory.api.ldap.model.entry;version=${project.version},
+              org.apache.directory.api.ldap.model.exception;version=${project.version},
+              org.apache.directory.api.ldap.model.message;version=${project.version},
+              org.apache.directory.api.ldap.model.message.controls;version=${project.version},
+              org.apache.directory.api.ldap.model.message.extended;version=${project.version},
+              org.apache.directory.api.ldap.model.name;version=${project.version},
+              org.apache.directory.api.ldap.model.schema;version=${project.version},
+              org.apache.directory.api.ldap.model.schema.parsers;version=${project.version},
+              org.apache.directory.api.ldap.model.schema.registries;version=${project.version},
+              org.apache.directory.api.ldap.schemamanager.impl;version=${project.version},
+              org.apache.directory.api.util;version=${project.version},
+              org.apache.mina.core.filterchain;version=${.version},
+              org.apache.mina.core.future;version=${mina.core.version},
+              org.apache.mina.core.service;version=${mina.core.version},
+              org.apache.mina.core.session;version=${mina.core.version},
+              org.apache.mina.filter.codec;version=${mina.core.version},
+              org.apache.mina.filter.ssl;version=${mina.core.version},
+              org.apache.mina.transport.socket.nio;version=${mina.core.version},
+              org.slf4j;version=${slf4j.api.version}
+            </Import-Package>
           </instructions>
         </configuration>
       </plugin>

Modified: directory/shared/trunk/ldap/codec/core/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/pom.xml?rev=1635419&r1=1635418&r2=1635419&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/pom.xml (original)
+++ directory/shared/trunk/ldap/codec/core/pom.xml Thu Oct 30 07:47:58 2014
@@ -121,8 +121,38 @@
             <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
             <Bundle-SymbolicName>${project.groupId}.ldap.codec.core</Bundle-SymbolicName>
             <Export-Package>
-                {local-packages};version=${project.version};-noimport:=true
+              org.apache.directory.api.ldap.codec;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.codec.actions;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.codec.actions.*;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.codec.api;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.codec.controls;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.codec.controls.*;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.codec.decorators;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.codec.osgi;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.codec.search;version=${project.version};-noimport:=true
             </Export-Package>
+            <Import-Package>
+              org.apache.directory.api.asn1;version=${project.version},
+              org.apache.directory.api.asn1.actions;version=${project.version},
+              org.apache.directory.api.asn1.ber;version=${project.version},
+              org.apache.directory.api.asn1.ber.grammar;version=${project.version},
+              org.apache.directory.api.asn1.ber.tlv;version=${project.version},
+              org.apache.directory.api.asn1.util;version=${project.version},
+              org.apache.directory.api.i18n;version=${project.version},
+              org.apache.directory.api.ldap.model.entry;version=${project.version},
+              org.apache.directory.api.ldap.model.exception;version=${project.version},
+              org.apache.directory.api.ldap.model.filter;version=${project.version},
+              org.apache.directory.api.ldap.model.message;version=${project.version},
+              org.apache.directory.api.ldap.model.message.controls;version=${project.version},
+              org.apache.directory.api.ldap.model.name;version=${project.version},
+              org.apache.directory.api.ldap.model.schema;version=${project.version},
+              org.apache.directory.api.ldap.model.url;version=${project.version},
+              org.apache.directory.api.util;version=${project.version},
+              org.apache.directory.api.util.exception;version=${project.version},
+              org.apache.mina.filter.codec;version=${mina.core.version},
+              org.apache.mina.util;version=${mina.core.version},
+              org.slf4j;version=${slf4j.api.version}
+            </Import-Package>
             <Bundle-Activator>
               org.apache.directory.api.ldap.codec.osgi.DefaultActivator
             </Bundle-Activator>

Modified: directory/shared/trunk/ldap/extras/aci/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/aci/pom.xml?rev=1635419&r1=1635418&r2=1635419&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/aci/pom.xml (original)
+++ directory/shared/trunk/ldap/extras/aci/pom.xml Thu Oct 30 07:47:58 2014
@@ -85,8 +85,24 @@
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.ldap.extras.aci</Bundle-SymbolicName>
             <Export-Package>
-                {local-packages};version=${project.version};-noimport:=true
+              org.apache.directory.api.ldap.aci;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.aci.protectedItem;version=${project.version};-noimport:=true
             </Export-Package>
+            <Import-Package>
+              antlr;version=${antlr.version},
+              antlr.collections.impl;version=${antlr.version},
+              org.apache.directory.api.i18n;version=${project.version},
+              org.apache.directory.api.ldap.model.constants;version=${project.version},
+              org.apache.directory.api.ldap.model.entry;version=${project.version},
+              org.apache.directory.api.ldap.model.exception;version=${project.version},
+              org.apache.directory.api.ldap.model.filter;version=${project.version},
+              org.apache.directory.api.ldap.model.name;version=${project.version},
+              org.apache.directory.api.ldap.model.schema;version=${project.version},
+              org.apache.directory.api.ldap.model.schema.normalizers;version=${project.version},
+              org.apache.directory.api.ldap.model.subtree;version=${project.version},
+              org.apache.directory.api.util;version=${project.version},
+              org.slf4;version=${slf4j.api.version}
+            </Import-Package>
           </instructions>
         </configuration>
       </plugin>

Modified: directory/shared/trunk/ldap/extras/codec-api/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec-api/pom.xml?rev=1635419&r1=1635418&r2=1635419&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/pom.xml (original)
+++ directory/shared/trunk/ldap/extras/codec-api/pom.xml Thu Oct 30 07:47:58 2014
@@ -58,8 +58,27 @@
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.ldap.extras.codec.api</Bundle-SymbolicName>
             <Export-Package>
-                {local-packages};version=${project.version};-noimport:=true
+              org.apache.directory.api.ldap.extras.controls;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.extras.controls.ad;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.extras.controls.ppolicy;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.extras.extended.cancel;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.extras.extended.certGeneration;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.extras.extended.gracefulDisconnect;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.extras.extended.gracefulShutdown;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.extras.extended.pwdModify;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.extras.extended.startTls;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.extras.extended.storedProcedure;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.extras.extended.whoAmI;version=${project.version};-noimport:=true
             </Export-Package>
+            <Import-Package>
+              org.apache.directory.api.asn1.ber.tlv;version=${project.version},
+              org.apache.directory.api.i18n;version=${project.version},
+              org.apache.directory.api.ldap.model.message;version=${project.version},
+              org.apache.directory.api.ldap.model.message.controls;version=${project.version},
+              org.apache.directory.api.ldap.model.name;version=${project.version},
+              org.apache.directory.api.util;version=${project.version},
+              org.apache.directory.api.util.exception;version=${project.version}
+            </Import-Package>
           </instructions>
         </configuration>
       </plugin>

Modified: directory/shared/trunk/ldap/extras/codec/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/pom.xml?rev=1635419&r1=1635418&r2=1635419&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/pom.xml (original)
+++ directory/shared/trunk/ldap/extras/codec/pom.xml Thu Oct 30 07:47:58 2014
@@ -104,6 +104,48 @@
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>
+            <Export-Package>
+              org.apache.directory.api.ldap.extras.controls.ad_impl;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.extras.controls.ppolicy_impl;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.extras.controls.syncrepl_impl;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.extras.extended.ads_impl.cancel;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.extras.extended.ads_impl.certGeneration;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulDisconnect;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulShutdown;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.extras.extended.ads_impl.pwdModify;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.extras.extended.ads_impl.startTls;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.extras.extended.ads_impl.storedProcedure;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.extras.extended.ads_impl.whoAmI;version=${project.version};-noimport:=true
+            </Export-Package>
+            <Import-Package>
+              org.apache.directory.api.asn1;version=${project.version},
+              org.apache.directory.api.asn1.actions;version=${project.version},
+              org.apache.directory.api.asn1.ber;version=${project.version},
+              org.apache.directory.api.asn1.ber.grammar;version=${project.version},
+              org.apache.directory.api.asn1.ber.tlv;version=${project.version},
+              org.apache.directory.api.i18n;version=${project.version},
+              org.apache.directory.api.ldap.codec.api;version=${project.version},
+              org.apache.directory.api.ldap.extras.controls;version=${project.version},
+              org.apache.directory.api.ldap.extras.controls.ad;version=${project.version},
+              org.apache.directory.api.ldap.extras.controls.ppolicy;version=${project.version},
+              org.apache.directory.api.ldap.extras.controls.syncrepl.syncDone;version=${project.version},
+              org.apache.directory.api.ldap.extras.controls.syncrepl.syncInfoValue;version=${project.version},
+              org.apache.directory.api.ldap.extras.controls.syncrepl.syncState;version=${project.version},
+              org.apache.directory.api.ldap.extras.extended.cancel;version=${project.version},
+              org.apache.directory.api.ldap.extras.extended.certGeneration;version=${project.version},
+              org.apache.directory.api.ldap.extras.extended.gracefulDisconnect;version=${project.version},
+              org.apache.directory.api.ldap.extras.extended.gracefulShutdown;version=${project.version},
+              org.apache.directory.api.ldap.extras.extended.pwdModify;version=${project.version},
+              org.apache.directory.api.ldap.extras.extended.startTls;version=${project.version},
+              org.apache.directory.api.ldap.extras.extended.storedProcedure;version=${project.version},
+              org.apache.directory.api.ldap.extras.extended.whoAmI;version=${project.version},
+              org.apache.directory.api.ldap.model.exception;version=${project.version},
+              org.apache.directory.api.ldap.model.message;version=${project.version},
+              org.apache.directory.api.ldap.model.name;version=${project.version},
+              org.apache.directory.api.ldap.model.url;version=${project.version},
+              org.apache.directory.api.util;version=${project.version},
+              org.slf4j;version=${slf4j.api.version}
+            </Import-Package>
             <Bundle-Activator>
               org.apache.directory.api.ldap.extras.ExtrasBundleActivator
             </Bundle-Activator>

Modified: directory/shared/trunk/ldap/extras/sp/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/sp/pom.xml?rev=1635419&r1=1635418&r2=1635419&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/sp/pom.xml (original)
+++ directory/shared/trunk/ldap/extras/sp/pom.xml Thu Oct 30 07:47:58 2014
@@ -85,8 +85,15 @@
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.ldap.extras.sp</Bundle-SymbolicName>
             <Export-Package>
-                {local-packages};version=${project.version};-noimport:=true
+              org.apache.directory.api.ldap.trigger;version=${project.version};-noimport:=true
             </Export-Package>
+            <Import-Package>
+              org.apache.commons.io;version=${commons.io.version},
+              org.apache.commons.lang;version=${commons.lang.version},
+              org.apache.directory.api.ldap.codec.api;version=${project.version},
+              org.apache.directory.api.ldap.extras.extended.storedProcedure;version=${project.version},
+              org.apache.directory.api.ldap.model.constants;version=${project.version}
+            </Import-Package>
           </instructions>
         </configuration>
       </plugin>

Modified: directory/shared/trunk/ldap/extras/trigger/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/trigger/pom.xml?rev=1635419&r1=1635418&r2=1635419&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/trigger/pom.xml (original)
+++ directory/shared/trunk/ldap/extras/trigger/pom.xml Thu Oct 30 07:47:58 2014
@@ -90,8 +90,20 @@
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.ldap.extras.trigger</Bundle-SymbolicName>
             <Export-Package>
-                {local-packages};version=${project.version};-noimport:=true
+              org.apache.directory.api.ldap.trigger;version=${project.version};-noimport:=true
             </Export-Package>
+            <Import-Package>
+              antlr;version=${antlr.version},
+              antlr.collections.impl;version=${antlr.version},
+              org.apache.commons.lang;version=${commons.lang.version},
+              org.apache.directory.api.i18n;version=${project.version},
+              org.apache.directory.api.ldap.model.constants;version=${project.version},
+              org.apache.directory.api.ldap.model.entry;version=${project.version},
+              org.apache.directory.api.ldap.model.message;version=${project.version},
+              org.apache.directory.api.ldap.model.name;version=${project.version},
+              org.apache.directory.api.ldap.model.schema;version=${project.version},
+              org.slf4j;version=${slf4j.api.version}
+            </Import-Package>
           </instructions>
         </configuration>
       </plugin>

Modified: directory/shared/trunk/ldap/extras/util/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/util/pom.xml?rev=1635419&r1=1635418&r2=1635419&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/util/pom.xml (original)
+++ directory/shared/trunk/ldap/extras/util/pom.xml Thu Oct 30 07:47:58 2014
@@ -65,8 +65,17 @@
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.ldap.extras.util</Bundle-SymbolicName>
             <Export-Package>
-                {local-packages};version=${project.version};-noimport:=true
+              org.apache.directory.api.ldap.util;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.util.tree;version=${project.version};-noimport:=true
             </Export-Package>
+            <Import-Package>
+              org.apache.directory.api.asn1;version=${project.version},
+              org.apache.directory.api.ldap.codec.api;version=${project.version},
+              org.apache.directory.api.ldap.model.exception;version=${project.version},
+              org.apache.directory.api.ldap.model.message;version=${project.version},
+              org.apache.directory.api.ldap.model.name;version=${project.version},
+              org.slf4j;version=${slf4j.api.version}
+            </Import-Package>
           </instructions>
         </configuration>
       </plugin>

Modified: directory/shared/trunk/ldap/model/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/pom.xml?rev=1635419&r1=1635418&r2=1635419&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/pom.xml (original)
+++ directory/shared/trunk/ldap/model/pom.xml Thu Oct 30 07:47:58 2014
@@ -139,10 +139,41 @@
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.ldap.model</Bundle-SymbolicName>
             <Export-Package>
-                {local-packages};version=${project.version};-noimport:=true
+              org.apache.directory.api.ldap.model.constants;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.model.csn;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.model.cursor;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.model.entry;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.model.exception;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.model.filter;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.model.ldif;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.model.message;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.model.message.controls;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.model.message.extended;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.model.name;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.model.password;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.model.schema;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.model.schema.comparators;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.model.schema.normalizers;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.model.schema.parsers;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.model.schema.registries;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.model.schema.registries.helper;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.model.schema.syntaxCheckers;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.model.subtree;version=${project.version};-noimport:=true,
+              org.apache.directory.api.ldap.model.url;version=${project.version};-noimport:=true
             </Export-Package>
             <Import-Package>
-                !sun.net.util,*
+              antlr;version=${antlr.version},
+              antlr.collections.impl;version=${antlr.version},
+              org.apache.commons.collections;version=${commons.collections.version},
+              org.apache.commons.collections.list;version=${commons.collections.version},
+              org.apache.commons.collections.map;version=${commons.collections.version},
+              org.apache.commons.lang;version=${commons.lang.version},
+              org.apache.commons.lang.exception;version=${commons.lang.version},
+              org.apache.directory.api.asn1;version=${project.version},
+              org.apache.directory.api.i18n;version=${project.version},
+              org.apache.directory.api.util;version=${project.version},
+              org.apache.directory.api.util.exception;version=${project.version},
+              org.slf4j;version=${slf4j.api.version}
             </Import-Package>
           </instructions>
         </configuration>

Modified: directory/shared/trunk/ldap/net/mina/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/net/mina/pom.xml?rev=1635419&r1=1635418&r2=1635419&view=diff
==============================================================================
--- directory/shared/trunk/ldap/net/mina/pom.xml (original)
+++ directory/shared/trunk/ldap/net/mina/pom.xml Thu Oct 30 07:47:58 2014
@@ -67,8 +67,22 @@
             <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
             <Bundle-SymbolicName>${project.groupId}.ldap.net.mina</Bundle-SymbolicName>
             <Export-Package>
-                {local-packages};version=${project.version};-noimport:=true
+              org.apache.directory.api.ldap.codec.protocol.mina;version=${project.version};-noimport:=true
             </Export-Package>
+            <Import-Package>
+              org.apache.directory.api.asn1;version=${project.version},
+              org.apache.directory.api.asn1.ber;version=${project.version},
+              org.apache.directory.api.asn1.ber.tlv;version=${project.version},
+              org.apache.directory.api.ldap.codec.api;version=${project.version},
+              org.apache.directory.api.ldap.model.constants;version=${project.version},
+              org.apache.directory.api.ldap.model.exception;version=${project.version},
+              org.apache.directory.api.ldap.model.message;version=${project.version},
+              org.apache.directory.api.util;version=${project.version},
+              org.apache.mina.core.buffer;version=${mina.core.version},
+              org.apache.mina.core.session;version=${mina.core.version},
+              org.apache.mina.filter.codec;version=${mina.core.version},
+              org.slf4;version=${slf4j.api.version}
+            </Import-Package>
             <Bundle-Activator>
               org.apache.directory.api.ldap.codec.protocol.mina.LdapProtocolCodecActivator
             </Bundle-Activator>

Modified: directory/shared/trunk/ldap/schema/converter/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/converter/pom.xml?rev=1635419&r1=1635418&r2=1635419&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/converter/pom.xml (original)
+++ directory/shared/trunk/ldap/schema/converter/pom.xml Thu Oct 30 07:47:58 2014
@@ -113,8 +113,21 @@
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.ldap.schema.converter</Bundle-SymbolicName>
             <Export-Package>
-                {local-packages};version=${project.version};-noimport:=true
+              org.apache.directory.api.ldap.converter.schema;version="${project.version}";-noimport:=true
             </Export-Package>
+            <Import-Package>
+              org.apache.directory.api.i18n;version=${project.version},
+              org.apache.directory.api.ldap.model.constants;version=${project.version},
+              org.apache.directory.api.ldap.model.entry;version=${project.version},
+              org.apache.directory.api.ldap.model.exception;version=${project.version},
+              org.apache.directory.api.ldap.model.ldif;version=${project.version},
+              org.apache.directory.api.ldap.model.name;version=${project.version},
+              org.apache.directory.api.ldap.model.schema;version=${project.version},
+              org.apache.directory.api.util;version=${project.version},
+              org.slf4j;version=${slf4j.api.version},
+              org.commons.lang.exception;version=${commons.lang.version},
+              antlr;version=${antlr.version}
+            </Import-Package>
           </instructions>
         </configuration>
       </plugin>

Modified: directory/shared/trunk/ldap/schema/data/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/pom.xml?rev=1635419&r1=1635418&r2=1635419&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/pom.xml (original)
+++ directory/shared/trunk/ldap/schema/data/pom.xml Thu Oct 30 07:47:58 2014
@@ -145,15 +145,26 @@
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.ldap.schema</Bundle-SymbolicName>
             <Export-Package>
-                {local-packages};version=${project.version};-noimport:=true,
-                org.apache.directory.api.ldap.schemaextractor.impl;version="${project.version}";-noimport:=true,
-                org.apache.directory.api.ldap.schemamanager.impl;version="${project.version}";-noimport:=true
+              org.apache.directory.api.ldap.schemaextractor;version="${project.version}";-noimport:=true,
+              org.apache.directory.api.ldap.schemaextractor.impl;version="${project.version}";-noimport:=true,
+              org.apache.directory.api.ldap.schemaloader;version="${project.version}";-noimport:=true,
+              org.apache.directory.api.ldap.schemamanager.impl;version="${project.version}";-noimport:=true
             </Export-Package>
             <Import-Package>
-              *,
-              org.apache.directory.api.ldap.aci,
-              org.apache.directory.api.ldap.model.schema.comparators,
-              org.apache.directory.api.ldap.model.schema.syntaxCheckers
+              org.apache.directory.api.asn1.util;version=${project.version},
+              org.apache.directory.api.i18n;version=${project.version},
+              org.apache.directory.api.ldap.model.constants;version=${project.version},
+              org.apache.directory.api.ldap.model.entry;version=${project.version},
+              org.apache.directory.api.ldap.model.exception;version=${project.version},
+              org.apache.directory.api.ldap.model.ldif;version=${project.version},
+              org.apache.directory.api.ldap.model.message;version=${project.version},
+              org.apache.directory.api.ldap.model.name;version=${project.version},
+              org.apache.directory.api.ldap.model.schema;version=${project.version},
+              org.apache.directory.api.ldap.model.schema.normalizers;version=${project.version},
+              org.apache.directory.api.ldap.model.schema.parsers;version=${project.version},
+              org.apache.directory.api.ldap.model.schema.registries;version=${project.version},
+              org.apache.directory.api.util;version=${project.version},
+              org.slf4j;version=${slf4j.api.version}
             </Import-Package>
           </instructions>
         </configuration>

Modified: directory/shared/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/pom.xml?rev=1635419&r1=1635418&r2=1635419&view=diff
==============================================================================
--- directory/shared/trunk/pom.xml (original)
+++ directory/shared/trunk/pom.xml Thu Oct 30 07:47:58 2014
@@ -16,14 +16,13 @@
   KIND, either express or implied.  See the License for the
   specific language governing permissions and limitations
   under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+--><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.project</groupId>
     <artifactId>project</artifactId>
     <version>32</version>
-    <relativePath />
+    <relativePath/>
   </parent>
 
   <groupId>org.apache.directory.api</groupId>
@@ -50,15 +49,15 @@
     <dom4j.version>1.6.1</dom4j.version>
     <junit.version>4.11</junit.version>
     <log4j.version>1.2.17</log4j.version>
-    <mina.core.version>2.0.7</mina.core.version>
+    <mina.core.version>2.0.8</mina.core.version>
     <org.osgi.version>3.0.0</org.osgi.version>
-    <org.osgi.core.version>5.0.0</org.osgi.core.version>
-    <org.apache.felix.version>4.4.0</org.apache.felix.version>
+    <org.osgi.core.version>6.0.0</org.osgi.core.version>
+    <org.apache.felix.version>4.4.1</org.apache.felix.version>
     <slf4j.api.version>1.7.7</slf4j.api.version>
     <slf4j.log4j12.version>1.7.7</slf4j.log4j12.version>
     <xml.apis.version>2.0.2</xml.apis.version>
     <xpp3.version>1.1.4c</xpp3.version>
-    <pax-exam.version>3.4.0</pax-exam.version>
+    <pax-exam.version>4.2.0</pax-exam.version>
     <pax-exam-container-default.version>1.2.4</pax-exam-container-default.version>
     <pax-exam-junit.version>1.2.4</pax-exam-junit.version>
     <findbugs.annotations.version>1.0.0</findbugs.annotations.version>
@@ -153,7 +152,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore />
+                    <ignore/>
                   </action>
                 </pluginExecution>
                 <pluginExecution>
@@ -166,7 +165,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore />
+                    <ignore/>
                   </action>
                 </pluginExecution>
               </pluginExecutions>

Modified: directory/shared/trunk/util/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/util/pom.xml?rev=1635419&r1=1635418&r2=1635419&view=diff
==============================================================================
--- directory/shared/trunk/util/pom.xml (original)
+++ directory/shared/trunk/util/pom.xml Thu Oct 30 07:47:58 2014
@@ -56,8 +56,13 @@
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.util</Bundle-SymbolicName>
             <Export-Package>
-                {local-packages};version=${project.version};-noimport:=true
+              org.apache.directory.api.util;version=${project.version};-noimport:=true,
+              org.apache.directory.api.util.exception;version=${project.version};-noimport:=true
             </Export-Package>
+            <Import-Package>
+              org.apache.directory.api.i18n;version=${project.version},
+              org.slf4;version=${slf4j.api.version}
+            </Import-Package>
           </instructions>
         </configuration>
       </plugin>