directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1186096 - 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/ l...
Date Wed, 19 Oct 2011 11:14:30 GMT
Author: pamarcelot
Date: Wed Oct 19 11:14:29 2011
New Revision: 1186096

URL: http://svn.apache.org/viewvc?rev=1186096&view=rev
Log:
Switched back to previously used bundle symbolic names. Added back the specific packages imports
in the LDAP Schema module (they explicitely needed to allow class loading of schema elements
- at the moment).

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/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=1186096&r1=1186095&r2=1186096&view=diff
==============================================================================
--- directory/shared/trunk/asn1/api/pom.xml (original)
+++ directory/shared/trunk/asn1/api/pom.xml Wed Oct 19 11:14:29 2011
@@ -47,6 +47,17 @@
   <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+            <addMavenDescriptor>false</addMavenDescriptor>
+          </archive>
+        </configuration>
+      </plugin>
+      
+      <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <inherited>true</inherited>
@@ -54,7 +65,7 @@
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
           <instructions>
-            <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.asn1.api</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/shared/trunk/asn1/ber/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/ber/pom.xml?rev=1186096&r1=1186095&r2=1186096&view=diff
==============================================================================
--- directory/shared/trunk/asn1/ber/pom.xml (original)
+++ directory/shared/trunk/asn1/ber/pom.xml Wed Oct 19 11:14:29 2011
@@ -57,6 +57,17 @@
   <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+            <addMavenDescriptor>false</addMavenDescriptor>
+          </archive>
+        </configuration>
+      </plugin>
+      
+      <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <inherited>true</inherited>
@@ -64,7 +75,7 @@
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
           <instructions>
-            <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.asn1.ber</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/shared/trunk/dsml/engine/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/engine/pom.xml?rev=1186096&r1=1186095&r2=1186096&view=diff
==============================================================================
--- directory/shared/trunk/dsml/engine/pom.xml (original)
+++ directory/shared/trunk/dsml/engine/pom.xml Wed Oct 19 11:14:29 2011
@@ -72,7 +72,7 @@
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
           <instructions>
-            <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.dsmlv2.engine</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/shared/trunk/dsml/parser/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/pom.xml?rev=1186096&r1=1186095&r2=1186096&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/pom.xml (original)
+++ directory/shared/trunk/dsml/parser/pom.xml Wed Oct 19 11:14:29 2011
@@ -113,7 +113,7 @@
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
           <instructions>
-            <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.dsmlv2.parser</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/shared/trunk/i18n/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/i18n/pom.xml?rev=1186096&r1=1186095&r2=1186096&view=diff
==============================================================================
--- directory/shared/trunk/i18n/pom.xml (original)
+++ directory/shared/trunk/i18n/pom.xml Wed Oct 19 11:14:29 2011
@@ -59,7 +59,7 @@
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
           <instructions>
-            <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.i18n</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/shared/trunk/ldap/client/api/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/client/api/pom.xml?rev=1186096&r1=1186095&r2=1186096&view=diff
==============================================================================
--- directory/shared/trunk/ldap/client/api/pom.xml (original)
+++ directory/shared/trunk/ldap/client/api/pom.xml Wed Oct 19 11:14:29 2011
@@ -115,7 +115,7 @@
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
           <instructions>
-            <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.ldap.client.api</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/shared/trunk/ldap/codec/core/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/pom.xml?rev=1186096&r1=1186095&r2=1186096&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/pom.xml (original)
+++ directory/shared/trunk/ldap/codec/core/pom.xml Wed Oct 19 11:14:29 2011
@@ -119,7 +119,7 @@
           <manifestLocation>META-INF</manifestLocation>
           <instructions>
             <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
-            <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.ldap.codec.core</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/shared/trunk/ldap/extras/aci/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/aci/pom.xml?rev=1186096&r1=1186095&r2=1186096&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/aci/pom.xml (original)
+++ directory/shared/trunk/ldap/extras/aci/pom.xml Wed Oct 19 11:14:29 2011
@@ -83,7 +83,7 @@
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
           <instructions>
-            <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.ldap.extras.aci</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

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=1186096&r1=1186095&r2=1186096&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/pom.xml (original)
+++ directory/shared/trunk/ldap/extras/codec-api/pom.xml Wed Oct 19 11:14:29 2011
@@ -56,7 +56,7 @@
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
           <instructions>
-            <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.ldap.extras.codec.api</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/shared/trunk/ldap/extras/codec/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/pom.xml?rev=1186096&r1=1186095&r2=1186096&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/pom.xml (original)
+++ directory/shared/trunk/ldap/extras/codec/pom.xml Wed Oct 19 11:14:29 2011
@@ -100,7 +100,7 @@
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
           <instructions>
-            <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.ldap.extras.codec</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/shared/trunk/ldap/extras/sp/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/sp/pom.xml?rev=1186096&r1=1186095&r2=1186096&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/sp/pom.xml (original)
+++ directory/shared/trunk/ldap/extras/sp/pom.xml Wed Oct 19 11:14:29 2011
@@ -83,7 +83,7 @@
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
           <instructions>
-            <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.ldap.extras.sp</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/shared/trunk/ldap/extras/trigger/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/trigger/pom.xml?rev=1186096&r1=1186095&r2=1186096&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/trigger/pom.xml (original)
+++ directory/shared/trunk/ldap/extras/trigger/pom.xml Wed Oct 19 11:14:29 2011
@@ -83,7 +83,7 @@
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
           <instructions>
-            <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.ldap.extras.trigger</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/shared/trunk/ldap/extras/util/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/util/pom.xml?rev=1186096&r1=1186095&r2=1186096&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/util/pom.xml (original)
+++ directory/shared/trunk/ldap/extras/util/pom.xml Wed Oct 19 11:14:29 2011
@@ -73,7 +73,7 @@
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
           <instructions>
-            <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.ldap.extras.util</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/shared/trunk/ldap/model/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/pom.xml?rev=1186096&r1=1186095&r2=1186096&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/pom.xml (original)
+++ directory/shared/trunk/ldap/model/pom.xml Wed Oct 19 11:14:29 2011
@@ -137,7 +137,7 @@
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
           <instructions>
-            <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.ldap.model</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/shared/trunk/ldap/net/mina/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/net/mina/pom.xml?rev=1186096&r1=1186095&r2=1186096&view=diff
==============================================================================
--- directory/shared/trunk/ldap/net/mina/pom.xml (original)
+++ directory/shared/trunk/ldap/net/mina/pom.xml Wed Oct 19 11:14:29 2011
@@ -65,7 +65,7 @@
           <manifestLocation>META-INF</manifestLocation>
           <instructions>
             <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
-            <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.ldap.net.mina</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/shared/trunk/ldap/schema/converter/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/converter/pom.xml?rev=1186096&r1=1186095&r2=1186096&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/converter/pom.xml (original)
+++ directory/shared/trunk/ldap/schema/converter/pom.xml Wed Oct 19 11:14:29 2011
@@ -111,7 +111,7 @@
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
           <instructions>
-            <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.ldap.schema.converter</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>

Modified: directory/shared/trunk/ldap/schema/data/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/pom.xml?rev=1186096&r1=1186095&r2=1186096&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/pom.xml (original)
+++ directory/shared/trunk/ldap/schema/data/pom.xml Wed Oct 19 11:14:29 2011
@@ -138,12 +138,21 @@
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
           <instructions>
-            <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.ldap.schema</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true,
                 org.apache.directory.shared.ldap.schemaextractor.impl;version="${project.version}";-noimport:=true,
                 org.apache.directory.shared.ldap.schemamanager.impl;version="${project.version}";-noimport:=true
             </Export-Package>
+            <Import-Package>
+              *,
+              org.apache.directory.shared.ldap.aci,
+              org.apache.directory.shared.ldap.model.schema.comparators,
+              org.apache.directory.shared.ldap.model.schema.normalizers,
+              org.apache.directory.shared.ldap.model.schema.parsers,
+              org.apache.directory.shared.ldap.model.schema.registries,
+              org.apache.directory.shared.ldap.model.schema.syntaxCheckers
+            </Import-Package>
           </instructions>
         </configuration>
       </plugin>

Modified: directory/shared/trunk/util/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/util/pom.xml?rev=1186096&r1=1186095&r2=1186096&view=diff
==============================================================================
--- directory/shared/trunk/util/pom.xml (original)
+++ directory/shared/trunk/util/pom.xml Wed Oct 19 11:14:29 2011
@@ -54,7 +54,7 @@
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
           <instructions>
-            <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.groupId}.util</Bundle-SymbolicName>
             <Export-Package>
                 {local-packages};version=${project.version};-noimport:=true
             </Export-Package>



Mime
View raw message