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 20:15:17 UTC
svn commit: r1184895 - in /directory/shared/trunk: asn1/api/ asn1/ber/
dsml/engine/ dsml/parser/ i18n/ ldap/client/api/ ldap/codec/core/
ldap/codec/standalone/ ldap/extras/aci/ ldap/extras/codec-api/
ldap/extras/codec/ ldap/extras/sp/ ldap/extras/trigg...
Author: elecharny
Date: Sun Oct 16 18:15:16 2011
New Revision: 1184895
URL: http://svn.apache.org/viewvc?rev=1184895&view=rev
Log:
Applied Göktürk patch on shared (DIRSERVER-1668)
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/codec/standalone/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=1184895&r1=1184894&r2=1184895&view=diff
==============================================================================
--- directory/shared/trunk/asn1/api/pom.xml (original)
+++ directory/shared/trunk/asn1/api/pom.xml Sun Oct 16 18:15:16 2011
@@ -54,14 +54,9 @@
<configuration>
<manifestLocation>META-INF</manifestLocation>
<instructions>
- <Bundle-SymbolicName>${project.groupId}.asn1.api</Bundle-SymbolicName>
- <Import-Package>
- org.apache.directory.shared.i18n,
- org.apache.directory.shared.util
- </Import-Package>
+ <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
<Export-Package>
- org.apache.directory.shared.asn1,
- org.apache.directory.shared.asn1.util
+ {local-packages};version=${project.version};-noimport:=true
</Export-Package>
</instructions>
</configuration>
Modified: directory/shared/trunk/asn1/ber/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/ber/pom.xml?rev=1184895&r1=1184894&r2=1184895&view=diff
==============================================================================
--- directory/shared/trunk/asn1/ber/pom.xml (original)
+++ directory/shared/trunk/asn1/ber/pom.xml Sun Oct 16 18:15:16 2011
@@ -64,10 +64,9 @@
<configuration>
<manifestLocation>META-INF</manifestLocation>
<instructions>
- <Bundle-SymbolicName>${project.groupId}.asn1.ber</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
<Export-Package>
- org.apache.directory.shared.asn1.actions,
- org.apache.directory.shared.asn1.ber.*
+ {local-packages};version=${project.version};-noimport:=true
</Export-Package>
</instructions>
</configuration>
Modified: directory/shared/trunk/dsml/engine/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/engine/pom.xml?rev=1184895&r1=1184894&r2=1184895&view=diff
==============================================================================
--- directory/shared/trunk/dsml/engine/pom.xml (original)
+++ directory/shared/trunk/dsml/engine/pom.xml Sun Oct 16 18:15:16 2011
@@ -72,8 +72,10 @@
<configuration>
<manifestLocation>META-INF</manifestLocation>
<instructions>
- <Bundle-SymbolicName>${project.groupId}.dsmlv2.engine</Bundle-SymbolicName>
- <Export-Package>org.apache.directory.shared.dsmlv2.engine</Export-Package>
+ <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+ <Export-Package>
+ {local-packages};version=${project.version};-noimport:=true
+ </Export-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=1184895&r1=1184894&r2=1184895&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/pom.xml (original)
+++ directory/shared/trunk/dsml/parser/pom.xml Sun Oct 16 18:15:16 2011
@@ -113,8 +113,10 @@
<configuration>
<manifestLocation>META-INF</manifestLocation>
<instructions>
- <Bundle-SymbolicName>${project.groupId}.dsmlv2.parser</Bundle-SymbolicName>
- <Export-Package>org.apache.directory.shared.dsmlv2.*</Export-Package>
+ <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+ <Export-Package>
+ {local-packages};version=${project.version};-noimport:=true
+ </Export-Package>
</instructions>
</configuration>
</plugin>
Modified: directory/shared/trunk/i18n/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/i18n/pom.xml?rev=1184895&r1=1184894&r2=1184895&view=diff
==============================================================================
--- directory/shared/trunk/i18n/pom.xml (original)
+++ directory/shared/trunk/i18n/pom.xml Sun Oct 16 18:15:16 2011
@@ -59,8 +59,10 @@
<configuration>
<manifestLocation>META-INF</manifestLocation>
<instructions>
- <Bundle-SymbolicName>${project.groupId}.i18n</Bundle-SymbolicName>
- <Export-Package>org.apache.directory.shared.i18n</Export-Package>
+ <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+ <Export-Package>
+ {local-packages};version=${project.version};-noimport:=true
+ </Export-Package>
</instructions>
</configuration>
</plugin>
Modified: directory/shared/trunk/ldap/client/api/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/client/api/pom.xml?rev=1184895&r1=1184894&r2=1184895&view=diff
==============================================================================
--- directory/shared/trunk/ldap/client/api/pom.xml (original)
+++ directory/shared/trunk/ldap/client/api/pom.xml Sun Oct 16 18:15:16 2011
@@ -115,8 +115,10 @@
<configuration>
<manifestLocation>META-INF</manifestLocation>
<instructions>
- <Bundle-SymbolicName>${project.groupId}.ldap.client.api</Bundle-SymbolicName>
- <Export-Package>org.apache.directory.ldap.client.api.*</Export-Package>
+ <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+ <Export-Package>
+ {local-packages};version=${project.version};-noimport:=true
+ </Export-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=1184895&r1=1184894&r2=1184895&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/pom.xml (original)
+++ directory/shared/trunk/ldap/codec/core/pom.xml Sun Oct 16 18:15:16 2011
@@ -118,10 +118,10 @@
<configuration>
<manifestLocation>META-INF</manifestLocation>
<instructions>
- <Bundle-SymbolicName>${project.groupId}.ldap.codec.core</Bundle-SymbolicName>
<Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
+ <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
<Export-Package>
- org.apache.directory.shared.ldap.codec.api
+ {local-packages};version=${project.version};-noimport:=true
</Export-Package>
<Bundle-Activator>
org.apache.directory.shared.ldap.codec.osgi.DefaultActivator
Modified: directory/shared/trunk/ldap/codec/standalone/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/standalone/pom.xml?rev=1184895&r1=1184894&r2=1184895&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/standalone/pom.xml (original)
+++ directory/shared/trunk/ldap/codec/standalone/pom.xml Sun Oct 16 18:15:16 2011
@@ -27,7 +27,7 @@
<artifactId>shared-ldap-codec-standalone</artifactId>
<name>Apache Directory Shared LDAP Codec Standalone</name>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<description>
This module was created to fix issue DIRSHARED-91 where the embedded Felix
instance inside the default LdapCodecService implementation was making it
@@ -68,4 +68,25 @@
<artifactId>org.apache.felix.framework</artifactId>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <inherited>true</inherited>
+ <extensions>true</extensions>
+ <configuration>
+ <manifestLocation>META-INF</manifestLocation>
+ <instructions>
+ <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
+ <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/shared/trunk/ldap/extras/aci/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/aci/pom.xml?rev=1184895&r1=1184894&r2=1184895&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/aci/pom.xml (original)
+++ directory/shared/trunk/ldap/extras/aci/pom.xml Sun Oct 16 18:15:16 2011
@@ -83,9 +83,9 @@
<configuration>
<manifestLocation>META-INF</manifestLocation>
<instructions>
- <Bundle-SymbolicName>${project.groupId}.ldap.extras.aci</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
<Export-Package>
- org.apache.directory.shared.ldap.aci*
+ {local-packages};version=${project.version};-noimport:=true
</Export-Package>
</instructions>
</configuration>
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=1184895&r1=1184894&r2=1184895&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec-api/pom.xml (original)
+++ directory/shared/trunk/ldap/extras/codec-api/pom.xml Sun Oct 16 18:15:16 2011
@@ -56,10 +56,9 @@
<configuration>
<manifestLocation>META-INF</manifestLocation>
<instructions>
- <Bundle-SymbolicName>${project.groupId}.ldap.extras.codec.api</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
<Export-Package>
- org.apache.directory.shared.ldap.extras.controls,
- org.apache.directory.shared.ldap.extras.extended
+ {local-packages};version=${project.version};-noimport:=true
</Export-Package>
</instructions>
</configuration>
Modified: directory/shared/trunk/ldap/extras/codec/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/pom.xml?rev=1184895&r1=1184894&r2=1184895&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/pom.xml (original)
+++ directory/shared/trunk/ldap/extras/codec/pom.xml Sun Oct 16 18:15:16 2011
@@ -100,7 +100,10 @@
<configuration>
<manifestLocation>META-INF</manifestLocation>
<instructions>
- <Bundle-SymbolicName>${project.groupId}.ldap.extras.codec</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+ <Export-Package>
+ {local-packages};version=${project.version};-noimport:=true
+ </Export-Package>
<Bundle-Activator>
org.apache.directory.shared.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=1184895&r1=1184894&r2=1184895&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/sp/pom.xml (original)
+++ directory/shared/trunk/ldap/extras/sp/pom.xml Sun Oct 16 18:15:16 2011
@@ -83,9 +83,9 @@
<configuration>
<manifestLocation>META-INF</manifestLocation>
<instructions>
- <Bundle-SymbolicName>${project.groupId}.ldap.extras.sp</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
<Export-Package>
- org.apache.directory.shared.ldap.sp
+ {local-packages};version=${project.version};-noimport:=true
</Export-Package>
</instructions>
</configuration>
Modified: directory/shared/trunk/ldap/extras/trigger/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/trigger/pom.xml?rev=1184895&r1=1184894&r2=1184895&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/trigger/pom.xml (original)
+++ directory/shared/trunk/ldap/extras/trigger/pom.xml Sun Oct 16 18:15:16 2011
@@ -83,9 +83,9 @@
<configuration>
<manifestLocation>META-INF</manifestLocation>
<instructions>
- <Bundle-SymbolicName>${project.groupId}.ldap.extras.trigger</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
<Export-Package>
- org.apache.directory.shared.ldap.trigger
+ {local-packages};version=${project.version};-noimport:=true
</Export-Package>
</instructions>
</configuration>
Modified: directory/shared/trunk/ldap/extras/util/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/util/pom.xml?rev=1184895&r1=1184894&r2=1184895&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/util/pom.xml (original)
+++ directory/shared/trunk/ldap/extras/util/pom.xml Sun Oct 16 18:15:16 2011
@@ -73,9 +73,9 @@
<configuration>
<manifestLocation>META-INF</manifestLocation>
<instructions>
- <Bundle-SymbolicName>${project.groupId}.ldap.extras.util</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
<Export-Package>
- org.apache.directory.shared.ldap.util*
+ {local-packages};version=${project.version};-noimport:=true
</Export-Package>
</instructions>
</configuration>
Modified: directory/shared/trunk/ldap/model/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/pom.xml?rev=1184895&r1=1184894&r2=1184895&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/pom.xml (original)
+++ directory/shared/trunk/ldap/model/pom.xml Sun Oct 16 18:15:16 2011
@@ -137,9 +137,9 @@
<configuration>
<manifestLocation>META-INF</manifestLocation>
<instructions>
- <Bundle-SymbolicName>${project.groupId}.ldap.model</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
<Export-Package>
- org.apache.directory.shared.ldap.model*
+ {local-packages};version=${project.version};-noimport:=true
</Export-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=1184895&r1=1184894&r2=1184895&view=diff
==============================================================================
--- directory/shared/trunk/ldap/net/mina/pom.xml (original)
+++ directory/shared/trunk/ldap/net/mina/pom.xml Sun Oct 16 18:15:16 2011
@@ -64,8 +64,11 @@
<configuration>
<manifestLocation>META-INF</manifestLocation>
<instructions>
- <Bundle-SymbolicName>${project.groupId}.ldap.net.mina</Bundle-SymbolicName>
<Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
+ <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+ <Export-Package>
+ {local-packages};version=${project.version};-noimport:=true
+ </Export-Package>
<Bundle-Activator>
org.apache.directory.shared.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=1184895&r1=1184894&r2=1184895&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/converter/pom.xml (original)
+++ directory/shared/trunk/ldap/schema/converter/pom.xml Sun Oct 16 18:15:16 2011
@@ -111,8 +111,10 @@
<configuration>
<manifestLocation>META-INF</manifestLocation>
<instructions>
- <Bundle-SymbolicName>${project.groupId}.ldap.schema.converter</Bundle-SymbolicName>
- <Export-Package>org.apache.directory.shared.converter.schema</Export-Package>
+ <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+ <Export-Package>
+ {local-packages};version=${project.version};-noimport:=true
+ </Export-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=1184895&r1=1184894&r2=1184895&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/pom.xml (original)
+++ directory/shared/trunk/ldap/schema/data/pom.xml Sun Oct 16 18:15:16 2011
@@ -138,17 +138,10 @@
<configuration>
<manifestLocation>META-INF</manifestLocation>
<instructions>
- <Bundle-SymbolicName>${project.groupId}.ldap.schema</Bundle-SymbolicName>
- <Export-Package>org.apache.directory.shared.ldap.schema*</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>
+ <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+ <Export-Package>
+ {local-packages};version=${project.version};-noimport:=true
+ </Export-Package>
</instructions>
</configuration>
</plugin>
Modified: directory/shared/trunk/util/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/util/pom.xml?rev=1184895&r1=1184894&r2=1184895&view=diff
==============================================================================
--- directory/shared/trunk/util/pom.xml (original)
+++ directory/shared/trunk/util/pom.xml Sun Oct 16 18:15:16 2011
@@ -54,10 +54,9 @@
<configuration>
<manifestLocation>META-INF</manifestLocation>
<instructions>
- <Bundle-SymbolicName>${project.groupId}.util</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
<Export-Package>
- org.apache.directory.shared.util,
- org.apache.directory.shared.util.exception
+ {local-packages};version=${project.version};-noimport:=true
</Export-Package>
</instructions>
</configuration>