Return-Path: 
 <commits-return-5528-apmail-gump-commits-archive=www.apache.org@gump.apache.org>
Delivered-To: apmail-gump-commits-archive@www.apache.org
Received: (qmail 5312 invoked from network); 21 Feb 2011 12:02:04 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 21 Feb 2011 12:02:04 -0000
Received: (qmail 94961 invoked by uid 500); 21 Feb 2011 12:02:02 -0000
Mailing-List: contact commits-help@gump.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@gump.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@gump.apache.org>
List-Post: <mailto:commits@gump.apache.org>
List-Id: <commits.gump.apache.org>
Reply-To: general@gump.apache.org
Delivered-To: mailing list commits@gump.apache.org
Received: (qmail 94954 invoked by uid 99); 21 Feb 2011 12:02:01 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Feb 2011 12:02:01 +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; Mon, 21 Feb 2011 12:02:00 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id EF1B1238890B; Mon, 21 Feb 2011 12:01:39 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1072934 - in /gump/metadata/project:
 directory-apacheds.xml
 directory-shared.xml
Date: Mon, 21 Feb 2011 12:01:39 -0000
To: commits@gump.apache.org
From: bodewig@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110221120139.EF1B1238890B@eris.apache.org>

Author: bodewig
Date: Mon Feb 21 12:01:39 2011
New Revision: 1072934

URL: http://svn.apache.org/viewvc?rev=1072934&view=rev
Log:
ongoing refactoring in DS

Modified:
    gump/metadata/project/directory-apacheds.xml
    gump/metadata/project/directory-shared.xml

Modified: gump/metadata/project/directory-apacheds.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/directory-apacheds.xml?rev=1072934&r1=1072933&r2=1072934&view=diff
==============================================================================
--- gump/metadata/project/directory-apacheds.xml (original)
+++ gump/metadata/project/directory-apacheds.xml Mon Feb 21 12:01:39 2011
@@ -45,7 +45,6 @@
     <depend project="apacheds-kerberos-codec"/>
     <depend project="apacheds-ldif-partition"/>
     <depend project="apacheds-parent"/>
-    <depend project="apacheds-protocol-changepw"/>
     <depend project="apacheds-protocol-dhcp"/>
     <depend project="apacheds-protocol-dns"/>
     <depend project="apacheds-protocol-kerberos"/>
@@ -70,7 +69,11 @@
     <jar name="core/target/apacheds-core-*[0-9T].jar"/>
 
     <depend project="apacheds-core-api"/>
-    <option project="apacheds-i18n"/>
+    <depend project="apacheds-i18n"/>
+    <depend project="directory-junit-addons"/>
+    <option project="commons-collections"/>
+    <option project="commons-lang"/>
+    <option project="shared-all"/>
   </project>
 
   <project name="apacheds-core-test">
@@ -87,12 +90,15 @@
     </mvn3>
     <jar name="core-annotations/target/apacheds-core-annotations-*[0-9T].jar"/>
 
-    <depend project="apacheds-core-jndi"/>
-    <option project="apacheds-i18n"/>
-    <depend project="apacheds-jdbm-partition"/>
+    <depend project="apacheds-core"/>
+    <depend project="apacheds-core-api"/>
     <depend project="apacheds-ldif-partition"/>
+    <depend project="apacheds-xdbm-partition"/>
+    <depend project="directory-junit-addons"/>
+    <option project="apacheds-i18n"/>
     <option project="commons-io"/>
     <option project="junit"/>
+    <option project="shared-all"/>
   </project>
 
   <project name="apacheds-core-annotations-test">
@@ -108,13 +114,14 @@
     </mvn3>
     <jar name="core-api/target/apacheds-core-api-*[0-9T].jar"/>
 
+    <depend project="directory-junit-addons"/>
+    <depend project="ldap-client-api"/>
     <option project="apacheds-core-constants"/>
     <option project="apacheds-i18n"/>
     <option project="commons-collections"/>
     <option project="commons-io"/>
     <option project="commons-lang"/>
-    <depend project="directory-junit-addons"/>
-    <depend project="ldap-client-api"/>
+    <option project="shared-all"/>
   </project>
 
   <project name="apacheds-core-api-test">
@@ -128,8 +135,11 @@
     <mvn3 goal="install" basedir="core-avl"/>
     <jar name="core-avl/target/apacheds-core-avl-*[0-9T].jar"/>
 
+    <depend project="directory-junit-addons"/>
+    <depend project="shared-ldap-model"/>
+    <depend project="shared-ldap-util"/>
     <option project="apacheds-i18n"/>
-    <depend project="shared-ldap"/>
+    <option project="commons-lang"/>
   </project>
 
   <project name="apacheds-core-constants">
@@ -167,8 +177,9 @@
     <pom name="core-integ/pom.xml"/>
     <jar name="core-integ/target/apacheds-core-integ-*[0-9T].jar"/>
 
-    <option project="apacheds-i18n"/>
+    <depend project="apacheds-core"/>
     <depend project="apacheds-test-framework"/>
+    <option project="apacheds-i18n"/>
     <option project="commons-io"/>
     <option project="junit"/>
   </project>
@@ -266,7 +277,6 @@
     <option project="apacheds-i18n"/>
     <depend project="apacheds-protocol-shared"/>
     <option project="mina"/>
-    <option project="shared-ldap"/>
   </project>
 
   <project name="apacheds-kerberos-test">
@@ -294,7 +304,6 @@
 
     <depend project="apacheds-server-annotations"/>
     <depend project="apacheds-test-framework"/>
-    <depend project="shared-ldap"/>
     <option project="apacheds-core-annotations"/>
     <option project="apacheds-core-api"/>
     <option project="apacheds-protocol-ldap"/>
@@ -443,7 +452,6 @@
     <depend project="apacheds-ldif-partition"/>
     <depend project="apacheds-xdbm-partition"/>
     <option project="directory-junit-addons"/>
-    <option project="shared-ldap"/>
   </project>
 
   <project name="apacheds-server-integ">
@@ -489,7 +497,6 @@
     <jar name="server-replication/target/apacheds-server-replication-*[0-9T].jar"/>
 
     <option project="apacheds-i18n"/>
-    <depend project="shared-ldap"/>
   </project>
 
   <project name="apacheds-server-replication">
@@ -499,7 +506,6 @@
     <jar name="server-replication/target/apacheds-server-replication-*[0-9T].jar"/>
 
     <depend project="apacheds-i18n"/>
-    <option project="shared-ldap"/>
   </project>
 
   <project name="apacheds-server-tools">
@@ -555,7 +561,6 @@
     <option project="commons-io"/>
     <option project="directory-junit-addons"/>
     <option project="mina-core"/>
-    <option project="shared-ldap"/>
     <option project="shared-ldap-schema"/>
   </project>
 
@@ -570,7 +575,6 @@
     <depend project="apacheds-ldif-partition"/>
     <depend project="apacheds-protocol-ldap"/>
     <depend project="ldap-client-api"/>
-    <depend project="shared-ldap"/>
     <option project="commons-io"/>
     <option project="slf4j"/>
   </project>

Modified: gump/metadata/project/directory-shared.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/directory-shared.xml?rev=1072934&r1=1072933&r2=1072934&view=diff
==============================================================================
--- gump/metadata/project/directory-shared.xml (original)
+++ gump/metadata/project/directory-shared.xml Mon Feb 21 12:01:39 2011
@@ -33,12 +33,17 @@
     <mvn3 goal="install" basedir="all"/>
 
     <depend project="ldap-client-api"/>
+    <depend project="shared-asn1-api"/>
+    <depend project="shared-asn1-ber"/>
     <depend project="shared-dsml-engine"/>
     <depend project="shared-dsml-parser"/>
-    <depend project="shared-ldap"/>
+    <depend project="shared-i18n"/>
+    <depend project="shared-ldap-codec"/>
+    <depend project="shared-ldap-model"/>
     <depend project="shared-ldap-schema"/>
+    <depend project="shared-ldap-schema-converter"/>
     <depend project="shared-parent"/>
-    <option project="shared-i18n"/>
+    <depend project="shared-util"/>
 
     <jar name="all/target/shared-all-*[0-9T].jar"/>
   </project>
@@ -70,7 +75,6 @@
 
     <depend project="ldap-client-api"/>
     <depend project="shared-dsml-parser"/>
-    <depend project="shared-ldap"/>
     <depend project="shared-parent"/>
     <option project="shared-i18n"/>
     <option project="xpp3"/>
@@ -82,11 +86,11 @@
     <mvn3 goal="install" basedir="dsml-parser"/>
 
     <depend project="directory-junit-addons"/>
-    <depend project="ldap-client-api"/>
-    <depend project="shared-ldap"/>
+    <depend project="shared-ldap-codec"/>
+    <depend project="shared-ldap-codec-standalone"/>
+    <depend project="shared-ldap-model"/>
     <depend project="shared-parent"/>
     <option project="dom4j"/>
-    <option project="shared-i18n"/>
     <option project="xml-apis"/>
     <option project="xpp3"/>
 
@@ -124,6 +128,8 @@
     </mvn3>
 
     <depend project="directory-junit-addons"/>
+    <depend project="shared-ldap-codec-standalone"/>
+    <depend project="shared-ldap-extras-codec"/>
     <depend project="shared-ldap-schema"/>
     <depend project="shared-parent"/>
     <option project="commons-io"/>
@@ -131,58 +137,115 @@
     <jar name="integ/target/shared-integ-*[0-9T].jar"/>
   </project>
 
-  <project name="shared-ldap">
-    <mvn3 goal="install" basedir="ldap">
-      <property name="skipTests" value="true"/>
-    </mvn3>
+  <project name="ldap-client-api">
+    <mvn3 goal="install" basedir="ldap-client-api"/>
+
+    <depend project="shared-ldap-codec"/>
+    <depend project="shared-ldap-codec-standalone"/>
+    <depend project="shared-ldap-extras-codec"/>
+    <depend project="shared-ldap-schema"/>
+    <depend project="shared-parent"/>
+    <option project="commons-pool"/>
+    <option project="junit"/>
+    <option project="mina"/>
+    <jar name="ldap-client-api/target/ldap-client-api-*[0-9T].jar"/>
+  </project>
+
+  <project name="shared-ldap-codec">
+    <mvn3 goal="install" basedir="ldap-codec"/>
 
     <depend project="directory-junit-addons"/>
     <depend project="shared-asn1-api"/>
     <depend project="shared-asn1-ber"/>
-    <depend project="shared-ldap-codec"/>
+    <depend project="shared-i18n"/>
     <depend project="shared-ldap-model"/>
     <depend project="shared-parent"/>
     <depend project="shared-util"/>
-    <option project="antlr"/>
     <option project="commons-collections"/>
     <option project="commons-lang"/>
     <option project="mina"/>
-    <option project="shared-i18n"/>
 
-    <jar name="ldap/target/shared-ldap-*[0-9T].jar"/>
+    <jar name="ldap-codec/target/shared-ldap-codec-*[0-9T].jar"/>
   </project>
 
-  <project name="shared-ldap-test">
-    <mvn3 goal="install" basedir="ldap"/>
-    <depend project="shared-ldap"/>
+  <project name="shared-ldap-codec-standalone">
+    <mvn3 goal="install" basedir="ldap-codec-standalone"/>
+
+    <depend project="directory-junit-addons"/>
+    <depend project="shared-ldap-codec"/>
+    <depend project="shared-parent"/>
+
+    <jar name="ldap-codec-standalone/target/shared-ldap-codec-standalone-*[0-9T].jar"/>
   </project>
 
-  <project name="ldap-client-api">
-    <mvn3 goal="install" basedir="ldap-client-api"/>
+  <project name="shared-ldap-extras-parent">
+    <pom name="ldap-extras/pom.xml"/>
+    <depend project="shared-parent"/>
+  </project>
 
-    <depend project="shared-ldap"/>
-    <option project="commons-pool"/>
-    <option project="junit"/>
-    <option project="mina"/>
-    <option project="shared-ldap-schema"/>
-    <jar name="ldap-client-api/target/ldap-client-api-*[0-9T].jar"/>
+  <project name="shared-ldap-extras-aci">
+    <mvn3 goal="install" basedir="ldap-extras/aci"/>
+
+    <depend project="directory-junit-addons"/>
+    <depend project="shared-i18n"/>
+    <depend project="shared-ldap-extras-parent"/>
+    <depend project="shared-ldap-model"/>
+    <depend project="shared-util"/>
+    <option project="antlr"/>
+
+    <jar name="ldap-extras/aci/target/shared-ldap-extras-aci-*[0-9T].jar"/>
   </project>
 
-  <project name="shared-ldap-codec">
-    <mvn3 goal="install" basedir="ldap-codec"/>
+  <project name="shared-ldap-extras-codec">
+    <mvn3 goal="install" basedir="ldap-extras/codec"/>
+
+    <depend project="directory-junit-addons"/>
+    <depend project="shared-ldap-extras-parent"/>
+    <depend project="shared-ldap-codec"/>
+
+    <jar name="ldap-extras/codec/target/shared-ldap-extras-codec-*[0-9T].jar"/>
+  </project>
+
+  <project name="shared-ldap-extras-sp">
+    <mvn3 goal="install" basedir="ldap-extras/sp"/>
+
+    <depend project="directory-junit-addons"/>
+    <depend project="shared-i18n"/>
+    <depend project="shared-ldap-codec-standalone"/>
+    <depend project="shared-ldap-extras-codec"/>
+    <depend project="shared-ldap-extras-parent"/>
+    <depend project="shared-ldap-extras-util"/>
+    <depend project="shared-ldap-model"/>
+    <depend project="shared-util"/>
+
+    <jar name="ldap-extras/sp/target/shared-ldap-extras-sp-*[0-9T].jar"/>
+  </project>
+
+  <project name="shared-ldap-extras-trigger">
+    <mvn3 goal="install" basedir="ldap-extras/trigger"/>
+
+    <depend project="directory-junit-addons"/>
+    <depend project="shared-i18n"/>
+    <depend project="shared-ldap-extras-parent"/>
+    <depend project="shared-ldap-model"/>
+    <depend project="shared-util"/>
+    <option project="antlr"/>
+
+    <jar name="ldap-extras/trigger/target/shared-ldap-extras-trigger-*[0-9T].jar"/>
+  </project>
+
+  <project name="shared-ldap-extras-util">
+    <mvn3 goal="install" basedir="ldap-extras/util"/>
 
     <depend project="directory-junit-addons"/>
     <depend project="shared-asn1-api"/>
-    <depend project="shared-asn1-ber"/>
     <depend project="shared-i18n"/>
+    <depend project="shared-ldap-codec-standalone"/>
+    <depend project="shared-ldap-extras-parent"/>
     <depend project="shared-ldap-model"/>
-    <depend project="shared-parent"/>
     <depend project="shared-util"/>
-    <option project="commons-collections"/>
-    <option project="commons-lang"/>
-    <option project="mina"/>
 
-    <jar name="ldap-codec/target/shared-ldap-codec-*[0-9T].jar"/>
+    <jar name="ldap-extras/util/target/shared-ldap-extras-util-*[0-9T].jar"/>
   </project>
 
   <project name="shared-ldap-model">
@@ -207,7 +270,7 @@
 
     <depend project="directory-junit-addons"/>
     <depend project="shared-i18n"/>
-    <depend project="shared-ldap"/>
+    <depend project="shared-ldap-extras-aci"/>
     <depend project="shared-parent"/>
     <option project="commons-io"/>
 
@@ -222,6 +285,7 @@
     <depend project="shared-ldap-model"/>
     <depend project="shared-parent"/>
     <depend project="shared-util"/>
+    <option project="antlr"/>
     <option project="commons-lang"/>
 
     <jar name="ldap-schema-converter/target/shared-ldap-schema-converter-*[0-9T].jar"/>