directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1188650 - in /directory/shared/trunk/ldap: client/api/pom.xml codec/standalone/pom.xml codec/standalone/src/main/java/org/apache/directory/shared/ldap/codec/standalone/LdapCodecActivator.java
Date Tue, 25 Oct 2011 13:33:49 GMT
Author: pamarcelot
Date: Tue Oct 25 13:33:49 2011
New Revision: 1188650

URL: http://svn.apache.org/viewvc?rev=1188650&view=rev
Log:
Fix for DIRAPI-56 (Module 'org.apache.felix.framework' is stil used as a dependency and packaged
in the distribution archives).
Also packages the module 'shared-ldap-codec-standalone' as a jar, removing anything related
to OSGI. 

Removed:
    directory/shared/trunk/ldap/codec/standalone/src/main/java/org/apache/directory/shared/ldap/codec/standalone/LdapCodecActivator.java
Modified:
    directory/shared/trunk/ldap/client/api/pom.xml
    directory/shared/trunk/ldap/codec/standalone/pom.xml

Modified: directory/shared/trunk/ldap/client/api/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/client/api/pom.xml?rev=1188650&r1=1188649&r2=1188650&view=diff
==============================================================================
--- directory/shared/trunk/ldap/client/api/pom.xml (original)
+++ directory/shared/trunk/ldap/client/api/pom.xml Tue Oct 25 13:33:49 2011
@@ -55,12 +55,6 @@
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-codec-standalone</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
       <artifactId>shared-ldap-codec-core</artifactId>
     </dependency>
 

Modified: directory/shared/trunk/ldap/codec/standalone/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/standalone/pom.xml?rev=1188650&r1=1188649&r2=1188650&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/standalone/pom.xml (original)
+++ directory/shared/trunk/ldap/codec/standalone/pom.xml Tue Oct 25 13:33:49 2011
@@ -27,7 +27,7 @@
   
   <artifactId>shared-ldap-codec-standalone</artifactId>
   <name>Apache Directory Shared LDAP Codec Standalone</name>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <description>
     This module was created to fix issue DIRSHARED-91 where the embedded Felix
     instance inside the default LdapCodecService implementation was making it 
@@ -56,37 +56,7 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>shared-ldap-codec-core</artifactId>
-    </dependency> 
-    
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-extras-codec</artifactId>
-    </dependency> 
-
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <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>



Mime
View raw message