Author: pamarcelot
Date: Tue Jun  1 17:10:50 2010
New Revision: 950169

URL: http://svn.apache.org/viewvc?rev=950169&view=rev
Log:
Clean up in dependencies (adding missing dependencies and restricting the scope of the findbugs dependencies to 'provided') and naming of Shared projects.

Modified:
    directory/shared/trunk/all/pom.xml
    directory/shared/trunk/dsml-parser/pom.xml
    directory/shared/trunk/ldap-constants/pom.xml
    directory/shared/trunk/ldap-convert/pom.xml
    directory/shared/trunk/ldap-schema-loader/pom.xml
    directory/shared/trunk/ldap/pom.xml

Modified: directory/shared/trunk/all/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/all/pom.xml?rev=950169&r1=950168&r2=950169&view=diff
==============================================================================
--- directory/shared/trunk/all/pom.xml (original)
+++ directory/shared/trunk/all/pom.xml Tue Jun  1 17:10:50 2010
@@ -57,13 +57,13 @@
     </dependency>
 
     <dependency>
-      <artifactId>shared-ldap</artifactId>
+      <artifactId>shared-i18n</artifactId>
       <groupId>${project.groupId}</groupId>
       <version>${project.version}</version>
     </dependency>
 
     <dependency>
-      <artifactId>shared-ldif</artifactId>
+      <artifactId>shared-ldap</artifactId>
       <groupId>${project.groupId}</groupId>
       <version>${project.version}</version>
     </dependency>
@@ -93,19 +93,19 @@
     </dependency>
 
     <dependency>
-      <artifactId>shared-ldap-schema-dao</artifactId>
+      <artifactId>shared-ldap-schema-loader</artifactId>
       <groupId>${project.groupId}</groupId>
       <version>${project.version}</version>
     </dependency>
 
     <dependency>
-      <artifactId>shared-ldap-schema-loader</artifactId>
+      <artifactId>shared-ldap-schema-manager</artifactId>
       <groupId>${project.groupId}</groupId>
       <version>${project.version}</version>
     </dependency>
 
     <dependency>
-      <artifactId>shared-ldap-schema-manager</artifactId>
+      <artifactId>shared-ldif</artifactId>
       <groupId>${project.groupId}</groupId>
       <version>${project.version}</version>
     </dependency>

Modified: directory/shared/trunk/dsml-parser/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/pom.xml?rev=950169&r1=950168&r2=950169&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/pom.xml (original)
+++ directory/shared/trunk/dsml-parser/pom.xml Tue Jun  1 17:10:50 2010
@@ -35,28 +35,28 @@
 
   <dependencies>
     <dependency>
-      <artifactId>shared-ldap</artifactId>
+      <artifactId>shared-i18n</artifactId>
       <groupId>${project.groupId}</groupId>
       <version>${project.version}</version>
     </dependency>
     
     <dependency>
-      <artifactId>shared-ldif</artifactId>
+      <artifactId>shared-asn1</artifactId>
       <groupId>${project.groupId}</groupId>
       <version>${project.version}</version>
-    </dependency> 
+    </dependency>
     
     <dependency>
-      <artifactId>shared-i18n</artifactId>
+      <artifactId>shared-ldap</artifactId>
       <groupId>${project.groupId}</groupId>
       <version>${project.version}</version>
-    </dependency> 
+    </dependency>
     
     <dependency>
-      <artifactId>shared-asn1</artifactId>
+      <artifactId>shared-ldif</artifactId>
       <groupId>${project.groupId}</groupId>
       <version>${project.version}</version>
-    </dependency> 
+    </dependency>
     
     <dependency>
       <groupId>dom4j</groupId>
@@ -71,12 +71,6 @@
     </dependency>
     
     <dependency>
-      <groupId>dom4j</groupId>
-      <artifactId>dom4j</artifactId>
-      <version>${dom4j.version}</version>
-    </dependency>
-    
-    <dependency>
       <groupId>xpp3</groupId>
       <artifactId>xpp3</artifactId>
       <version>${xpp3.version}</version>
@@ -86,7 +80,7 @@
       <groupId>findbugs</groupId>
       <artifactId>annotations</artifactId>
       <version>${findbugs.annotations.version}</version>
-      <scope>compile</scope>
+      <scope>provided</scope>
     </dependency>
   </dependencies>
 </project>

Modified: directory/shared/trunk/ldap-constants/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-constants/pom.xml?rev=950169&r1=950168&r2=950169&view=diff
==============================================================================
--- directory/shared/trunk/ldap-constants/pom.xml (original)
+++ directory/shared/trunk/ldap-constants/pom.xml Tue Jun  1 17:10:50 2010
@@ -28,7 +28,7 @@
   </parent>
   
   <artifactId>shared-ldap-constants</artifactId>
-  <name>Apache Directory Shared Ldap Constants</name>
+  <name>Apache Directory Shared LDAP Constants</name>
   <inceptionYear>2007</inceptionYear>
 
   <issueManagement>

Modified: directory/shared/trunk/ldap-convert/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-convert/pom.xml?rev=950169&r1=950168&r2=950169&view=diff
==============================================================================
--- directory/shared/trunk/ldap-convert/pom.xml (original)
+++ directory/shared/trunk/ldap-convert/pom.xml Tue Jun  1 17:10:50 2010
@@ -28,7 +28,7 @@
   </parent>
   
   <artifactId>shared-ldap-converter</artifactId>
-  <name>Apache Directory Shared Ldap Converters</name>
+  <name>Apache Directory Shared LDAP Converters</name>
   <inceptionYear>2007</inceptionYear>
 
   <issueManagement>
@@ -60,6 +60,12 @@
     </dependency>
     
     <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>${commons.lang.version}</version>
+    </dependency>
+    
+    <dependency>
       <groupId>antlr</groupId>
       <artifactId>antlr</artifactId>
       <version>${antlr.version}</version>

Modified: directory/shared/trunk/ldap-schema-loader/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-schema-loader/pom.xml?rev=950169&r1=950168&r2=950169&view=diff
==============================================================================
--- directory/shared/trunk/ldap-schema-loader/pom.xml (original)
+++ directory/shared/trunk/ldap-schema-loader/pom.xml Tue Jun  1 17:10:50 2010
@@ -41,7 +41,13 @@
       <artifactId>shared-i18n</artifactId>
       <groupId>${project.groupId}</groupId>
       <version>${project.version}</version>
-    </dependency>  
+    </dependency>
+
+    <dependency>
+      <artifactId>shared-asn1</artifactId>
+      <groupId>${project.groupId}</groupId>
+      <version>${project.version}</version>
+    </dependency>
 
     <dependency>
       <artifactId>shared-ldap</artifactId>

Modified: directory/shared/trunk/ldap/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/pom.xml?rev=950169&r1=950168&r2=950169&view=diff
==============================================================================
--- directory/shared/trunk/ldap/pom.xml (original)
+++ directory/shared/trunk/ldap/pom.xml Tue Jun  1 17:10:50 2010
@@ -28,7 +28,7 @@
   </parent>
   
   <artifactId>shared-ldap</artifactId>
-  <name>Apache Directory Shared Ldap</name>
+  <name>Apache Directory Shared LDAP</name>
   <inceptionYear>2004</inceptionYear>
 
   <issueManagement>
@@ -81,7 +81,7 @@
       <groupId>findbugs</groupId>
       <artifactId>annotations</artifactId>
       <version>${findbugs.annotations.version}</version>
-      <scope>compile</scope>
+      <scope>provided</scope>
     </dependency>
   </dependencies>