directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1059824 - in /directory/shared/trunk: dsml-engine/ dsml-engine/pom.xml dsml-parser/ dsml-parser/pom.xml ldap-client-api/ ldap-client-api/pom.xml ldap-schema/ ldap-schema/pom.xml ldap/ ldap/pom.xml
Date Mon, 17 Jan 2011 09:26:20 GMT
Author: pamarcelot
Date: Mon Jan 17 09:26:20 2011
New Revision: 1059824

URL: http://svn.apache.org/viewvc?rev=1059824&view=rev
Log:
Fixed various issues with OSGI-fication of Shared modules:
- Generation of the MANIFEST.MF file in a top level META-INF folder (ignored by SVN)
- Usage of ${project.property} instead of ${pom.property} for Maven 3 compliance
- Removal of Bundle-Version directive which is inherited automatically from the project version
- Usage of ${project.name} as Bundle-Name (instead of ${project.artifactId})

Modified:
    directory/shared/trunk/dsml-engine/   (props changed)
    directory/shared/trunk/dsml-engine/pom.xml
    directory/shared/trunk/dsml-parser/   (props changed)
    directory/shared/trunk/dsml-parser/pom.xml
    directory/shared/trunk/ldap/   (props changed)
    directory/shared/trunk/ldap-client-api/   (props changed)
    directory/shared/trunk/ldap-client-api/pom.xml
    directory/shared/trunk/ldap-schema/   (props changed)
    directory/shared/trunk/ldap-schema/pom.xml
    directory/shared/trunk/ldap/pom.xml

Propchange: directory/shared/trunk/dsml-engine/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jan 17 09:26:20 2011
@@ -3,3 +3,4 @@
 target
 .classpath
 .project
+META-INF

Modified: directory/shared/trunk/dsml-engine/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-engine/pom.xml?rev=1059824&r1=1059823&r2=1059824&view=diff
==============================================================================
--- directory/shared/trunk/dsml-engine/pom.xml (original)
+++ directory/shared/trunk/dsml-engine/pom.xml Mon Jan 17 09:26:20 2011
@@ -59,15 +59,26 @@
   <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+            <addMavenDescriptor>false</addMavenDescriptor>
+          </archive>
+        </configuration>
+      </plugin>
+      
+      <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <inherited>true</inherited>
         <extensions>true</extensions>
         <configuration>
+          <manifestLocation>META-INF</manifestLocation>
           <instructions>
-            <Bundle-SymbolicName>${pom.groupId}.dsmlv2.engine</Bundle-SymbolicName>
-            <Bundle-Name>${pom.artifactId}</Bundle-Name>
-            <Bundle-Version>${pom.version}</Bundle-Version>
+            <Bundle-SymbolicName>${project.groupId}.dsmlv2.engine</Bundle-SymbolicName>
+            <Bundle-Name>${project.name}</Bundle-Name>
             <Export-Package>org.apache.directory.shared.dsmlv2.engine</Export-Package>
           </instructions>
         </configuration>

Propchange: directory/shared/trunk/dsml-parser/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jan 17 09:26:20 2011
@@ -4,3 +4,4 @@ target
 .settings
 *.iml
 *.ipr
+META-INF

Modified: directory/shared/trunk/dsml-parser/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/pom.xml?rev=1059824&r1=1059823&r2=1059824&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/pom.xml (original)
+++ directory/shared/trunk/dsml-parser/pom.xml Mon Jan 17 09:26:20 2011
@@ -65,15 +65,26 @@
   <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+            <addMavenDescriptor>false</addMavenDescriptor>
+          </archive>
+        </configuration>
+      </plugin>
+      
+      <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <inherited>true</inherited>
         <extensions>true</extensions>
         <configuration>
+          <manifestLocation>META-INF</manifestLocation>
           <instructions>
-            <Bundle-SymbolicName>${pom.groupId}.dsmlv2.parser</Bundle-SymbolicName>
-            <Bundle-Name>${pom.artifactId}</Bundle-Name>
-            <Bundle-Version>${pom.version}</Bundle-Version>
+            <Bundle-SymbolicName>${project.groupId}.dsmlv2.parser</Bundle-SymbolicName>
+            <Bundle-Name>${project.name}</Bundle-Name>
             <Export-Package>org.apache.directory.shared.dsmlv2.*</Export-Package>
           </instructions>
         </configuration>

Propchange: directory/shared/trunk/ldap/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jan 17 09:26:20 2011
@@ -12,3 +12,4 @@ target
 *~
 .fbprefs
 nbproject
+META-INF

Propchange: directory/shared/trunk/ldap-client-api/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jan 17 09:26:20 2011
@@ -3,3 +3,4 @@ target
 .classpath
 .project
 .settings
+META-INF

Modified: directory/shared/trunk/ldap-client-api/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-client-api/pom.xml?rev=1059824&r1=1059823&r2=1059824&view=diff
==============================================================================
--- directory/shared/trunk/ldap-client-api/pom.xml (original)
+++ directory/shared/trunk/ldap-client-api/pom.xml Mon Jan 17 09:26:20 2011
@@ -91,20 +91,27 @@
       </plugin>
 
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+            <addMavenDescriptor>false</addMavenDescriptor>
+          </archive>
+        </configuration>
+      </plugin>
+
+      <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <inherited>true</inherited>
         <extensions>true</extensions>
         <configuration>
+          <manifestLocation>META-INF</manifestLocation>
           <instructions>
-            <Bundle-SymbolicName>
-              ${pom.groupId}.ldap.client.api
-            </Bundle-SymbolicName>
-            <Bundle-Name>${pom.artifactId}</Bundle-Name>
-            <Bundle-Version>${pom.version}</Bundle-Version>
-            <Export-Package>
-              org.apache.directory.ldap.client.api.*
-            </Export-Package>
+            <Bundle-SymbolicName>${project.groupId}.ldap.client.api</Bundle-SymbolicName>
+            <Bundle-Name>${project.name}</Bundle-Name>
+            <Export-Package>org.apache.directory.ldap.client.api.*</Export-Package>
           </instructions>
         </configuration>
       </plugin>

Propchange: directory/shared/trunk/ldap-schema/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jan 17 09:26:20 2011
@@ -14,4 +14,4 @@ apache.org
 .classpath
 nbproject
 schema
-
+META-INF

Modified: directory/shared/trunk/ldap-schema/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-schema/pom.xml?rev=1059824&r1=1059823&r2=1059824&view=diff
==============================================================================
--- directory/shared/trunk/ldap-schema/pom.xml (original)
+++ directory/shared/trunk/ldap-schema/pom.xml Mon Jan 17 09:26:20 2011
@@ -115,9 +115,8 @@
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>
           <archive>
-            <manifestFile>
-              ${project.build.outputDirectory}/META-INF/MANIFEST.MF
-            </manifestFile>
+            <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+            <addMavenDescriptor>false</addMavenDescriptor>
           </archive>
         </configuration>
       </plugin>
@@ -137,15 +136,11 @@
           </execution>
         </executions>
         <configuration>
+          <manifestLocation>META-INF</manifestLocation>
           <instructions>
-            <Bundle-SymbolicName>
-              ${pom.groupId}.ldap.schema
-            </Bundle-SymbolicName>
-            <Bundle-Name>${pom.artifactId}</Bundle-Name>
-            <Bundle-Version>${pom.version}</Bundle-Version>
-            <Export-Package>
-              org.apache.directory.shared.ldap.schema.*
-            </Export-Package>
+            <Bundle-SymbolicName>${project.groupId}.ldap.schema</Bundle-SymbolicName>
+            <Bundle-Name>${project.name}</Bundle-Name>
+            <Export-Package>org.apache.directory.shared.ldap.schema.*</Export-Package>
           </instructions>
         </configuration>
       </plugin>

Modified: directory/shared/trunk/ldap/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/pom.xml?rev=1059824&r1=1059823&r2=1059824&view=diff
==============================================================================
--- directory/shared/trunk/ldap/pom.xml (original)
+++ directory/shared/trunk/ldap/pom.xml Mon Jan 17 09:26:20 2011
@@ -105,15 +105,26 @@
       </plugin>
 
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+            <addMavenDescriptor>false</addMavenDescriptor>
+          </archive>
+        </configuration>
+      </plugin>
+
+      <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <inherited>true</inherited>
         <extensions>true</extensions>
         <configuration>
+          <manifestLocation>META-INF</manifestLocation>
           <instructions>
-            <Bundle-SymbolicName>${pom.groupId}.ldap</Bundle-SymbolicName>
-            <Bundle-Name>${pom.artifactId}</Bundle-Name>
-            <Bundle-Version>${pom.version}</Bundle-Version>
+            <Bundle-SymbolicName>${project.groupId}.ldap</Bundle-SymbolicName>
+            <Bundle-Name>${project.name}</Bundle-Name>
             <Export-Package>org.apache.directory.shared.ldap.*</Export-Package>
           </instructions>
         </configuration>



Mime
View raw message