Author: elecharny
Date: Thu Sep  9 16:48:30 2010
New Revision: 995489

URL: http://svn.apache.org/viewvc?rev=995489&view=rev
Log:
injected the ldap-client-api project into shared. Uncommented the dsml-parser project in shared

Added:
    directory/shared/trunk/ldap-client-api/
      - copied from r993315, directory/clients/ldap/trunk/ldap-client-api/
Removed:
    directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/shared/
Modified:
    directory/shared/trunk/dsml-parser/pom.xml
    directory/shared/trunk/ldap-client-api/pom.xml
    directory/shared/trunk/pom.xml

Modified: directory/shared/trunk/dsml-parser/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/pom.xml?rev=995489&r1=995488&r2=995489&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/pom.xml (original)
+++ directory/shared/trunk/dsml-parser/pom.xml Thu Sep  9 16:48:30 2010
@@ -56,6 +56,16 @@
     </dependency>
     
     <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>ldap-client-api</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>shared-cursor</artifactId>
+    </dependency>
+    
+    <dependency>
       <groupId>dom4j</groupId>
       <artifactId>dom4j</artifactId>
     </dependency>

Modified: directory/shared/trunk/ldap-client-api/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-client-api/pom.xml?rev=995489&r1=993315&r2=995489&view=diff
==============================================================================
--- directory/shared/trunk/ldap-client-api/pom.xml (original)
+++ directory/shared/trunk/ldap-client-api/pom.xml Thu Sep  9 16:48:30 2010
@@ -22,9 +22,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.directory.client.ldap</groupId>
-    <artifactId>ldap-client</artifactId>
-    <version>0.2-SNAPSHOT</version>
+    <groupId>org.apache.directory.shared</groupId>
+    <artifactId>shared-parent</artifactId>
+    <version>0.9.20-SNAPSHOT</version>
   </parent>
 
   <artifactId>ldap-client-api</artifactId>
@@ -50,37 +50,31 @@
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-ldap</artifactId>
-      <version>${org.apache.directory.shared.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-cursor</artifactId>
-      <version>${org.apache.directory.shared.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-ldap-constants</artifactId>
-      <version>${org.apache.directory.shared.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-asn1</artifactId>
-      <version>${org.apache.directory.shared.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-ldap-schema-manager</artifactId>
-      <version>${org.apache.directory.shared.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-ldap-schema-loader</artifactId>
-      <version>${org.apache.directory.shared.version}</version>
     </dependency>
 
     <dependency>

Modified: directory/shared/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/pom.xml?rev=995489&r1=995488&r2=995489&view=diff
==============================================================================
--- directory/shared/trunk/pom.xml (original)
+++ directory/shared/trunk/pom.xml Thu Sep  9 16:48:30 2010
@@ -84,7 +84,8 @@
     <module>asn1-codec</module>
     <module>ldap-convert</module>
     <module>cursor</module>
-    <!-- module>dsml-parser</module -->
+    <module>ldap-client-api</module>
+    <module>dsml-parser</module>
   </modules>
 
   <build>
@@ -162,6 +163,12 @@
 
       <dependency>
         <groupId>${project.groupId}</groupId>
+        <artifactId>ldap-client-api</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>${project.groupId}</groupId>
         <artifactId>shared-ldap-schema</artifactId>
         <version>${project.version}</version>
       </dependency>