You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gump.apache.org by bo...@apache.org on 2010/05/11 10:48:20 UTC

svn commit: r943043 - in /gump/metadata: profile/ project/

Author: bodewig
Date: Tue May 11 08:48:19 2010
New Revision: 943043

URL: http://svn.apache.org/viewvc?rev=943043&view=rev
Log:
try to build directory server

Removed:
    gump/metadata/project/directory-authx.xml
    gump/metadata/project/directory-kerberos-protocol.xml
    gump/metadata/project/directory-kerberos-shared.xml
    gump/metadata/project/directory-ldap-protocol.xml
    gump/metadata/project/directory-naming.xml
Modified:
    gump/metadata/profile/gump.xml
    gump/metadata/project/apollo.xml
    gump/metadata/project/directory-apacheds.xml
    gump/metadata/project/muse.xml

Modified: gump/metadata/profile/gump.xml
URL: http://svn.apache.org/viewvc/gump/metadata/profile/gump.xml?rev=943043&r1=943042&r2=943043&view=diff
==============================================================================
--- gump/metadata/profile/gump.xml (original)
+++ gump/metadata/profile/gump.xml Tue May 11 08:48:19 2010
@@ -87,13 +87,8 @@
   <module href="project/rat.xml"/>  
 
 <!-- Apache.Directory -->
-  <module href="project/directory-naming.xml"/>
   <module href="project/directory-apacheds.xml"/>
-  <module href="project/directory-authx.xml"/>
   <module href="project/directory-shared.xml"/>
-  <module href="project/directory-kerberos-shared.xml"/>
-  <module href="project/directory-kerberos-protocol.xml"/>
-  <module href="project/directory-ldap-protocol.xml"/>
 
 <!-- Mina -->
   <module href="project/mina.xml"/>

Modified: gump/metadata/project/apollo.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/apollo.xml?rev=943043&r1=943042&r2=943043&view=diff
==============================================================================
--- gump/metadata/project/apollo.xml (original)
+++ gump/metadata/project/apollo.xml Tue May 11 08:48:19 2010
@@ -59,9 +59,6 @@
     <depend project="jakarta-servletapi-5-servlet" />
     <depend project="velocity-engine" ids="velocity" />
     <depend project="jaxen" />
-    <depend project="naming-core"/>
-    <depend project="naming-factory"/>
-    <depend project="naming-java"/>
     <depend project="spring" ids="spring-core spring-beans"/>
     <depend project="stax" ids="api"/>
     <depend project="ws-axis" />

Modified: gump/metadata/project/directory-apacheds.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/directory-apacheds.xml?rev=943043&r1=943042&r2=943043&view=diff
==============================================================================
--- gump/metadata/project/directory-apacheds.xml (original)
+++ gump/metadata/project/directory-apacheds.xml Tue May 11 08:48:19 2010
@@ -19,73 +19,486 @@
  */
 -->
 
-<!--
-  - This descriptor was automatically generated using Maven.
-  - To regenerate, run: "maven gump:multiproject"
-  -
-  - If you have a requirement that leads to hand editing, please consider filing
-  - a feature request at http://jira.codehaus.org/browse/MPGUMP
--->
-<module name="apacheds">
+<module name="apacheds" groupId="org.apache.directory.server">
   <description>Apache Directory Server</description>
   <url href="http://directory.apache.org/apacheds/"/>
 
-<!--
-  <nag from="apacheds development &lt;dev@directory.apache.org&gt;" to="dev@directory.apache.org"/>
--->
+  <svn repository="asf" dir="directory/apacheds/trunk" />
 
-  <svn repository="asf" dir="directory/apacheds/trunk-with-dependencies" />
-    
-  <project name="apacheds-shared">
-    <mvn goal="install">
-      <property name="maven.test.skip.exec" value="true"/>
-    </mvn>
-    <depend project="junit" />
-    <depend project="shared-ldap" />
-    <option project="commons-daemon"/>
-    
-    <home nested="shared" />
+  <project name="apacheds-parent">
+    <jar name="pom.xml"/>
 
-    <!--jar name="target/apacheds-shared-@@DATE@@.jar" /-->
+    <!-- dependencies defined inside parent pom
+         (there also is a bunch of stuff we don't build, yet) -->
+    <option project="antlr"/>
+    <option project="commons-cli"/>
+    <option project="commons-collections"/>
+    <option project="commons-daemon"/>
+    <option project="commons-dbcp"/>
+    <option project="commons-io"/>
+    <option project="commons-lang"/>
+    <option project="commons-net"/>
+    <option project="commons-pool"/>
+    <option project="junit"/>
+    <option project="logging-log4j-12"/>
+    <option project="mina"/>
+    <option project="shared-all"/>
+    <option project="slf4j"/>
+    <option project="velocity-engine"/>
+    <option project="xml-xerces"/>
   </project>
-    
-  <project name="apacheds-shared-test">
-    <mvn goal="install"/>
-    <depend project="apacheds-shared"/>
-    <junitreport nested="shared/target/test-reports" />
+
+  <project name="apacheds-all">
+    <mvn basedir="all"/>
+    <jar name="all/target/apacheds-all-*[0-9T].jar"/>
+
+    <depend project="apacheds-avl-partition"/>
+    <depend project="apacheds-core"/>
+    <depend project="apacheds-core-annotations"/>
+    <depend project="apacheds-core-api"/>
+    <depend project="apacheds-core-avl"/>
+    <depend project="apacheds-core-constants"/>
+    <depend project="apacheds-core-entry"/>
+    <depend project="apacheds-core-jndi"/>
+    <depend project="apacheds-core-mock"/>
+    <depend project="apacheds-interceptor-kerberos"/>
+    <depend project="apacheds-jdbm"/>
+    <depend project="apacheds-jdbm-partition"/>
+    <depend project="apacheds-jdbm-store"/>
+    <depend project="apacheds-kerberos-shared"/>
+    <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"/>
+    <depend project="apacheds-protocol-ldap"/>
+    <depend project="apacheds-protocol-ntp"/>
+    <depend project="apacheds-protocol-shared"/>
+    <depend project="apacheds-server-annotations"/>
+    <depend project="apacheds-server-jndi"/>
+    <depend project="apacheds-server-replication"/>
+    <depend project="apacheds-server-xml"/>
+    <depend project="apacheds-test-framework"/>
+    <depend project="apacheds-utils"/>
+    <depend project="apacheds-xbean-spring"/>
+    <depend project="apacheds-xdbm-base"/>
+    <depend project="apacheds-xdbm-search"/>
+    <depend project="apacheds-xdbm-tools"/>
   </project>
-    
-  <project name="maven-directory-plugin">
 
-    <depend project="apacheds-shared" />
-    
-    <home nested="apacheds/core-plugin" />
+  <project name="apacheds-avl-partition">
+    <depend project="apacheds-parent"/>
 
-    <jar name="target/apacheds-core-plugin-1.5.6-SNAPSHOT.jar" id="apacheds-core-plugin"/>
-      
-  
+    <mvn basedir="avl-partition"/>
+    <jar name="avl-partition/target/apacheds-avl-partition-*[0-9T].jar"/>
+
+    <option project="apacheds-core"/>
+    <option project="apacheds-core-avl"/>
+    <option project="apacheds-i18n"/>
+    <option project="apacheds-xbdm-search"/>
+    <option project="apacheds-xbdm-tools"/>
   </project>
-    
+
   <project name="apacheds-core">
+    <depend project="apacheds-parent"/>
+
+    <mvn basedir="core"/>
+    <jar name="core/target/apacheds-core-*[0-9T].jar"/>
+
+    <option project="apacheds-core-api"/>
+    <option project="apacheds-i18n"/>
+    <option project="apacheds-utils"/>
+  </project>
+
+  <project name="apacheds-core-annotations">
+    <depend project="apacheds-parent"/>
+
+    <mvn basedir="core-annotations"/>
+    <jar name="core-annotations/target/apacheds-core-annotations-*[0-9T].jar"/>
+
+    <option project="apacheds-core-jndi"/>
+    <option project="apacheds-i18n"/>
+    <option project="apacheds-jdbm-partition"/>
+    <option project="apacheds-ldif-partition"/>
+    <option project="commons-io"/>
+    <option project="junit"/>
+  </project>
+
+  <project name="apacheds-core-api">
+    <depend project="apacheds-parent"/>
+
+    <mvn basedir="core-api"/>
+    <jar name="core-api/target/apacheds-core-api-*[0-9T].jar"/>
+
+    <option project="apacheds-core-constants"/>
+    <option project="apacheds-core-entry"/>
+    <option project="apacheds-i18n"/>
+    <option project="commons-collections"/>
+    <option project="commons-io"/>
+    <option project="commons-lang"/>
+  </project>
+
+  <project name="apacheds-core-avl">
+    <depend project="apacheds-parent"/>
+
+    <mvn basedir="core-avl"/>
+    <jar name="core-avl/target/apacheds-core-avl-*[0-9T].jar"/>
+
+    <option project="apacheds-xdm-base"/>
+  </project>
+
+  <project name="apacheds-core-constants">
+    <depend project="apacheds-parent"/>
+
+    <mvn basedir="core-constants"/>
+    <jar name="core-constants/target/apacheds-core-constants-*[0-9T].jar"/>
+  </project>
+
+  <project name="apacheds-core-annotations">
+    <depend project="apacheds-parent"/>
+
+    <mvn basedir="core-annotations"/>
+    <jar name="core-annotations/target/apacheds-core-annotations-*[0-9T].jar"/>
+
+    <option project="apacheds-core-jndi"/>
+    <option project="apacheds-i18n"/>
+    <option project="apacheds-jdbm-partition"/>
+    <option project="apacheds-ldif-partition"/>
+    <option project="commons-io"/>
+    <option project="junit"/>
+  </project>
+
+  <project name="apacheds-core-entry">
+    <depend project="apacheds-parent"/>
+
+    <mvn basedir="core-entry"/>
+    <jar name="core-entry/target/apacheds-core-entry-*[0-9T].jar"/>
+
+    <option project="apacheds-i18n"/>
+  </project>
+
+  <project name="apacheds-core-jndi">
+    <depend project="apacheds-parent"/>
+
+    <mvn basedir="core-jndi"/>
+    <jar name="core-jndi/target/apacheds-core-jndi-*[0-9T].jar"/>
+
+    <option project="apacheds-core"/>
+    <option project="apacheds-i18n"/>
+  </project>
+
+  <project name="apacheds-core-mock">
+    <depend project="apacheds-parent"/>
+
+    <mvn basedir="core-mock"/>
+    <jar name="core-mock/target/apacheds-core-mock-*[0-9T].jar"/>
+
+    <option project="apacheds-core-api"/>
+  </project>
+
+  <project name="apacheds-http-integration">
+    <depend project="apacheds-parent"/>
+
+    <mvn basedir="http-integration"/>
+    <jar name="http-integration/target/apacheds-http-integration-*[0-9T].jar"/>
+
+    <option project="apacheds-i18n"/>
+    <option project="jetty"/>
+  </project>
+
+  <project name="apacheds-i18n">
+    <depend project="apacheds-parent"/>
+
+    <mvn basedir="i18n"/>
+    <jar name="i18n/target/apacheds-i18n-*[0-9T].jar"/>
+  </project>
+
+  <project name="apacheds-interceptor-kerberos">
+    <depend project="apacheds-parent"/>
+
+    <mvn basedir="interceptor-kerberos"/>
+    <jar name="interceptor-kerberos/target/apacheds-interceptor-kerberos-*[0-9T].jar"/>
+
+    <option project="apacheds-core"/>
+    <option project="apacheds-i18n"/>
+    <option project="apacheds-kerberos-shared"/>
+  </project>
+
+  <project name="apacheds-jdbm">
+    <depend project="apacheds-parent"/>
+
+    <mvn basedir="jdbm"/>
+    <jar name="jdbm/target/apacheds-jdbm-*[0-9T].jar"/>
+
+    <option project="apacheds-i18n"/>
+  </project>
+
+  <project name="apacheds-jdbm-partition">
+    <depend project="apacheds-parent"/>
+
+    <mvn basedir="jdbm-partition"/>
+    <jar name="jdbm-partition/target/apacheds-jdbm-partition-*[0-9T].jar"/>
+
+    <option project="apacheds-core"/>
+    <option project="apacheds-jdbm-store"/>
+    <option project="apacheds-xdbm-search"/>
+  </project>
+
+  <project name="apacheds-jdbm-store">
+    <depend project="apacheds-parent"/>
+
+    <mvn basedir="jdbm-store"/>
+    <jar name="jdbm-store/target/apacheds-jdbm-store-*[0-9T].jar"/>
+
+    <option project="apacheds-core-avl"/>
+    <option project="apacheds-core-entry"/>
+    <option project="apacheds-i18n"/>
+    <option project="apacheds-jdbm"/>
+    <option project="apacheds-xdbm-tool"/>
+  </project>
+
+  <project name="apacheds-kerberos-shared">
+    <depend project="apacheds-parent"/>
+
+    <mvn basedir="kerberos-shared"/>
+    <jar name="kerberos-shared/target/apacheds-kerberos-shared-*[0-9T].jar"/>
+
+    <option project="apacheds-core-jndi"/>
+    <option project="apacheds-i18n"/>
+    <option project="apacheds-protocol-shared"/>
+  </project>
+
+  <project name="apacheds-ldif-partition">
+    <depend project="apacheds-parent"/>
+
+    <mvn basedir="ldif-partition"/>
+    <jar name="ldif-partition/target/apacheds-ldif-partition-*[0-9T].jar"/>
+
+    <option project="apacheds-avl-partition"/>
+    <option project="apacheds-core-mock"/>
+    <option project="apacheds-i18n"/>
+  </project>
+
+  <project name="apacheds-protocol-changepw">
+    <depend project="apacheds-parent"/>
+
+    <mvn basedir="protocol-changepw"/>
+    <jar name="protocol-changepw/target/apacheds-protocol-changepw-*[0-9T].jar"/>
+
+    <option project="apacheds-i18n"/>
+    <option project="apacheds-kerberos-shared"/>
+  </project>
+
+  <project name="apacheds-protocol-dhcp">
+    <depend project="apacheds-parent"/>
+
+    <mvn basedir="protocol-dhcp"/>
+    <jar name="protocol-dhcp/target/apacheds-protocol-dhcp-*[0-9T].jar"/>
+
+    <option project="apacheds-protocol-shared"/>
+  </project>
+
+  <project name="apacheds-protocol-dns">
+    <depend project="apacheds-parent"/>
+
+    <mvn basedir="protocol-dns"/>
+    <jar name="protocol-dns/target/apacheds-protocol-dns-*[0-9T].jar"/>
+
+    <option project="apacheds-core-jndi"/>
+    <option project="apacheds-i18n"/>
+    <option project="apacheds-protocol-shared"/>
+  </project>
+
+  <project name="apacheds-protocol-dns">
+    <depend project="apacheds-parent"/>
+
+    <mvn basedir="protocol-dns"/>
+    <jar name="protocol-dns/target/apacheds-protocol-dns-*[0-9T].jar"/>
+
+    <option project="apacheds-core-jndi"/>
+    <option project="apacheds-i18n"/>
+    <option project="apacheds-protocol-shared"/>
+  </project>
+
+  <project name="apacheds-protocol-kerberos">
+    <depend project="apacheds-parent"/>
 
-    <depend project="apacheds-shared" />
-    <depend project="maven-directory-plugin" />
+    <mvn basedir="protocol-kerberos"/>
+    <jar name="protocol-kerberos/target/apacheds-protocol-kerberos-*[0-9T].jar"/>
 
-    
-    <home nested="apacheds/core" />
+    <option project="apacheds-i18n"/>
+    <option project="apacheds-jdbm-partition"/>
+    <option project="apacheds-kerberos-shared"/>
+  </project>
+
+  <project name="apacheds-protocol-ldap">
+    <depend project="apacheds-parent"/>
+
+    <mvn basedir="protocol-ldap"/>
+    <jar name="protocol-ldap/target/apacheds-protocol-ldap-*[0-9T].jar"/>
+
+    <option project="apacheds-i18n"/>
+    <option project="apacheds-kerberos-shared"/>
+    <option project="apacheds-xdbm-tools"/>
+  </project>
+
+  <project name="apacheds-protocol-ntp">
+    <depend project="apacheds-parent"/>
+
+    <mvn basedir="protocol-ntp"/>
+    <jar name="protocol-ntp/target/apacheds-protocol-ntp-*[0-9T].jar"/>
+
+    <option project="apacheds-protocol-shared"/>
+    <option project="commons-net"/>
+  </project>
 
-    <jar name="target/apacheds-core-1.5.6-SNAPSHOT.jar" id="apacheds-core"/>
-  
+  <project name="apacheds-protocol-shared">
+    <depend project="apacheds-parent"/>
+
+    <mvn basedir="protocol-shared"/>
+    <jar name="protocol-shared/target/apacheds-protocol-shared-*[0-9T].jar"/>
+
+    <option project="apacheds-core"/>
+    <option project="apacheds-i18n"/>
+    <option project="mina"/>
   </project>
-    
-  <project name="apacheds-main">
 
-    <depend project="apacheds-core" />
-    <depend project="apacheds-shared" />
-    
-    <home nested="main" />
+  <project name="apacheds-server-annotations">
+    <depend project="apacheds-parent"/>
+
+    <mvn basedir="server-annotations"/>
+    <jar name="server-annotations/target/apacheds-server-annotations-*[0-9T].jar"/>
 
-    <jar name="target/apacheds-main-1.5.6-SNAPSHOT.jar" id="apached-main" />
-  
+    <option project="apacheds-core-annotations"/>
+    <option project="apacheds-protocol-kerberos"/>
+    <option project="apacheds-protocol-ldap"/>
+    <option project="junit"/>
   </project>
+
+  <project name="apacheds-server-jndi">
+    <depend project="apacheds-parent"/>
+
+    <mvn basedir="server-jndi"/>
+    <jar name="server-jndi/target/apacheds-server-jndi-*[0-9T].jar"/>
+
+    <option project="apacheds-i18n"/>
+    <option project="apacheds-jdbm-partition"/>
+    <option project="apacheds-ldif-partition"/>
+    <option project="apacheds-protocol-ldap"/>
+  </project>
+
+  <project name="apacheds-server-replication">
+    <depend project="apacheds-parent"/>
+
+    <mvn basedir="server-replication"/>
+    <jar name="server-replication/target/apacheds-server-replication-*[0-9T].jar"/>
+
+    <option project="apacheds-i18n"/>
+  </project>
+
+  <project name="apacheds-server-tools">
+    <depend project="apacheds-parent"/>
+
+    <mvn basedir="server-tools"/>
+    <jar name="server-tools/target/apacheds-server-tools-*[0-9T].jar"/>
+
+    <option project="apacheds-jdbm-partition"/>
+    <option project="apacheds-server-jndi"/>
+    <option project="apacheds-server-xml"/>
+    <option project="commons-cli"/>
+    <option project="commons-lang"/>
+    <option project="logging-log4j-12"/>
+    <option project="slf4j"/>
+  </project>
+
+  <project name="apacheds-server-xml">
+    <depend project="apacheds-parent"/>
+
+    <mvn basedir="server-xml"/>
+    <jar name="server-xml/target/apacheds-server-xml-*[0-9T].jar"/>
+
+    <option project="apacheds-http-integration"/>
+    <option project="apacheds-jdbm-partition"/>
+    <option project="apacheds-protocol-changepw"/>
+    <option project="apacheds-protocol-dns"/>
+    <option project="apacheds-protocol-jndi"/>
+    <option project="apacheds-protocol-kerberos"/>
+    <option project="apacheds-protocol-ldap"/>
+    <option project="apacheds-protocol-ntp"/>
+    <option project="apacheds-xbean-spring"/>
+  </project>
+
+  <project name="apacheds-test-framework">
+    <depend project="apacheds-parent"/>
+
+    <mvn basedir="test-framework"/>
+    <jar name="test-framework/target/apacheds-test-framework-*[0-9T].jar"/>
+
+    <option project="apacheds-i18n"/>
+    <option project="apacheds-server-annotations"/>
+    <option project="commons-io"/>
+    <option project="junit"/>
+  </project>
+
+  <project name="apacheds-utils">
+    <depend project="apacheds-parent"/>
+
+    <mvn basedir="utils"/>
+    <jar name="utils/target/apacheds-utils-*[0-9T].jar"/>
+
+    <option project="apacheds-core-constants"/>
+    <option project="apacheds-core-entry"/>
+  </project>
+
+  <project name="apacheds-xbean-spring">
+    <depend project="apacheds-parent"/>
+
+    <mvn basedir="xbean-spring"/>
+    <jar name="xbean-spring/target/apacheds-xbean-spring-*[0-9T].jar"/>
+
+    <option project="apacheds-core"/>
+    <option project="apacheds-http-integration"/>
+    <option project="apacheds-iterceptor-kerberos"/>
+    <option project="apacheds-jdbm-partition"/>
+    <option project="apacheds-jdbm-store"/>
+    <option project="apacheds-protocol-changepw"/>
+    <option project="apacheds-protocol-dns"/>
+    <option project="apacheds-protocol-kerberos"/>
+    <option project="apacheds-protocol-ldap"/>
+    <option project="apacheds-protocol-ntp"/>
+    <option project="apacheds-protocol-shared"/>
+    <option project="apacheds-server-jndi"/>
+  </project>
+
+  <project name="apacheds-xdbm-base">
+    <depend project="apacheds-parent"/>
+
+    <mvn basedir="xdbm-base"/>
+    <jar name="xdbm-base/target/apacheds-xdbm-base-*[0-9T].jar"/>
+
+    <option project="apacheds-core-api"/>
+  </project>
+
+  <project name="apacheds-xdbm-search">
+    <depend project="apacheds-parent"/>
+
+    <mvn searchdir="xdbm-search"/>
+    <jar name="xdbm-search/target/apacheds-xdbm-search-*[0-9T].jar"/>
+
+    <option project="apacheds-jdbm-store"/>
+    <option project="apacheds-xdbm-base"/>
+    <option project="apacheds-xdbm-tools"/>
+  </project>
+
+  <project name="apacheds-xdbm-tools">
+    <depend project="apacheds-parent"/>
+
+    <mvn toolsdir="xdbm-tools"/>
+    <jar name="xdbm-tools/target/apacheds-xdbm-tools-*[0-9T].jar"/>
+
+    <option project="apacheds-i18n"/>
+    <option project="apacheds-xdbm-base"/>
+  </project>
+
 </module>

Modified: gump/metadata/project/muse.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/muse.xml?rev=943043&r1=943042&r2=943043&view=diff
==============================================================================
--- gump/metadata/project/muse.xml (original)
+++ gump/metadata/project/muse.xml Tue May 11 08:48:19 2010
@@ -52,9 +52,6 @@
     <depend project="commons-logging" />
     <depend project="concurrent" />
     <depend project="jakarta-servletapi" />
-    <depend project="naming-core" />
-    <depend project="naming-factory" />
-    <depend project="naming-java" />
     <depend project="jaxen" />   
     <depend project="velocity-engine" ids="velocity" />
     <depend project="ws-axis" />