Return-Path: 
 <commits-return-30817-apmail-directory-commits-archive=directory.apache.org@directory.apache.org>
Delivered-To: apmail-directory-commits-archive@www.apache.org
Received: (qmail 35262 invoked from network); 10 Feb 2011 03:56:00 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 10 Feb 2011 03:56:00 -0000
Received: (qmail 72807 invoked by uid 500); 10 Feb 2011 03:56:00 -0000
Delivered-To: apmail-directory-commits-archive@directory.apache.org
Received: (qmail 72749 invoked by uid 500); 10 Feb 2011 03:55:58 -0000
Mailing-List: contact commits-help@directory.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@directory.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@directory.apache.org>
List-Post: <mailto:commits@directory.apache.org>
List-Id: <commits.directory.apache.org>
Reply-To: dev@directory.apache.org
Delivered-To: mailing list commits@directory.apache.org
Received: (qmail 72742 invoked by uid 99); 10 Feb 2011 03:55:57 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Feb 2011 03:55:57 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Feb 2011 03:55:55 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 99B472388A41; Thu, 10 Feb 2011 03:55:34 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1069225 -
 /directory/shared/branches/m1/ldap-codec-standalone/pom.xml
Date: Thu, 10 Feb 2011 03:55:34 -0000
To: commits@directory.apache.org
From: akarasulu@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110210035534.99B472388A41@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: akarasulu
Date: Thu Feb 10 03:55:34 2011
New Revision: 1069225

URL: http://svn.apache.org/viewvc?rev=1069225&view=rev
Log:
DIRSHARED-91:

  o changing pom to reflect standalone nature and adding proper documentation
    for others to come
  o note that I kept the unit test cases instead of deleting them and this is
    for a few reasons:

      (1) I want the tests to run twice, once as unit tests on the ldap-codec
          version of the service implementation, and
      (2) a second time as integration tests to test running with the embedded
          felix instance. Once this module is deleted we're fine anyway and 
          will no longer need the test duplication. For now it's a good thing
          and cannot hurt.
      (3) The ldap-codec now needs to switch the tests to use the non-Felix
          embedding implementation without the additional shutdown 
          functionality that was put into the AbstractLdapCodecServiceTest
          class just recently for DIRSHARED-95.


Modified:
    directory/shared/branches/m1/ldap-codec-standalone/pom.xml

Modified: directory/shared/branches/m1/ldap-codec-standalone/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec-standalone/pom.xml?rev=1069225&r1=1069224&r2=1069225&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-codec-standalone/pom.xml (original)
+++ directory/shared/branches/m1/ldap-codec-standalone/pom.xml Thu Feb 10 03:55:34 2011
@@ -25,10 +25,21 @@
     <version>0.9.20-SNAPSHOT</version>
   </parent>
   
-  <artifactId>shared-ldap-codec</artifactId>
-  <name>Apache Directory Shared LDAP Codec</name>
-  <packaging>bundle</packaging>
-  <description>LDAP Codec used by clients and servers</description>
+  <artifactId>shared-ldap-codec-standalone</artifactId>
+  <name>Apache Directory Shared LDAP Codec Standalone</name>
+  <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 
+    very problematic to deploy the ldap-codec inside an RCP (OSGi) environment
+    and hence Apache Directory Studio could not use it.
+
+    This module is most likely temporary and will disappear once we are fully
+    OSGi enabled. This module is a plain old jar, not a bundle to avoid 
+    accidental reuse as an OSGi module because it contains the version of the
+    LdapCodecService that embeds Felix to make controls and extended ops 
+    pluggable in the codec.
+  </description>
 
   <dependencies>
     <dependency>
@@ -45,48 +56,13 @@
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-util</artifactId>
+      <artifactId>shared-ldap-codec</artifactId>
     </dependency> 
 
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>shared-asn1-api</artifactId>
-    </dependency> 
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>shared-asn1-ber</artifactId>
-    </dependency> 
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>shared-i18n</artifactId>
-    </dependency> 
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-model</artifactId>
-    </dependency> 
-
-    <dependency>
-      <groupId>org.apache.mina</groupId>
-      <artifactId>mina-core</artifactId>
-    </dependency>
-    
-    <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.framework</artifactId>
     </dependency>
-    
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-    </dependency>
   </dependencies>
 
   <build>
@@ -109,34 +85,6 @@
           </systemPropertyVariables>
         </configuration>
       </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>${project.groupId}.ldap.codec</Bundle-SymbolicName>
-            <Export-Package>
-              org.apache.directory.shared.ldap.codec.api,
-              org.apache.directory.shared.ldap.codec.controls
-            </Export-Package>
-          </instructions>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 </project>