You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2008/07/22 05:27:36 UTC

svn commit: r678626 - in /directory: apacheds/branches/bigbang/ apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/changelog/ apacheds/branches/bigbang/protocol-ldap/ apacheds/branches/bigbang/server-jndi/ apacheds/branches/b...

Author: akarasulu
Date: Mon Jul 21 20:27:36 2008
New Revision: 678626

URL: http://svn.apache.org/viewvc?rev=678626&view=rev
Log:
locking down to version 11 of top level pom and deleting old protocol-ldap module

Removed:
    directory/apacheds/branches/bigbang/protocol-ldap/
Modified:
    directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java
    directory/apacheds/branches/bigbang/pom.xml
    directory/apacheds/branches/bigbang/server-jndi/pom.xml
    directory/apacheds/branches/bigbang/server-xml/pom.xml
    directory/apacheds/branches/bigbang/xbean-spring/pom.xml
    directory/daemon/branches/bigbang/pom.xml
    directory/installers/branches/bigbang/pom.xml
    directory/project/branches/bigbang/pom.xml
    directory/shared/branches/bigbang/pom.xml

Modified: directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java?rev=678626&r1=678625&r2=678626&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java (original)
+++ directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java Mon Jul 21 20:27:36 2008
@@ -26,8 +26,6 @@
 import org.apache.directory.shared.ldap.ldif.LdifUtils;
 import org.apache.directory.shared.ldap.name.LdapDN;
 
-import javax.naming.NamingException;
-
 
 /**
  * Tests the MemoryChangeLogStore.
@@ -65,7 +63,7 @@
         forward.putAttribute( "ou", "system" );
 
         LdifEntry reverse = LdifUtils.reverseAdd( new LdapDN( forward.getDn() ) );
-        assertEquals( 1, store.log( new LdapPrincipal(), forward, reverse ) );
+        assertEquals( 1, store.log( new LdapPrincipal(), forward, reverse ).getRevision() );
         assertEquals( 1, store.getCurrentRevision() );
     }
 }

Modified: directory/apacheds/branches/bigbang/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/pom.xml?rev=678626&r1=678625&r2=678626&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/pom.xml (original)
+++ directory/apacheds/branches/bigbang/pom.xml Mon Jul 21 20:27:36 2008
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.directory.project</groupId>
     <artifactId>project</artifactId>
-    <version>10</version>
+    <version>11</version>
   </parent>
 
   <groupId>org.apache.directory.server</groupId>
@@ -345,7 +345,6 @@
     <module>xdbm-search</module>
     <module>xdbm-tools</module>
     <module>core</module>
-    <!--module>core-jndi</module-->
     <module>core-constants</module>
     <module>core-shared</module>
     <module>core-plugin</module>
@@ -357,10 +356,7 @@
     <module>core-avl</module>
     <module>protocol-shared</module>
     <module>protocol-ntp</module>
-    <module>protocol-ldap</module>
-    <!--
     <module>protocol-newldap</module>
-    -->
     <module>protocol-kerberos</module>
     <module>protocol-dhcp</module>
     <module>protocol-dns</module>

Modified: directory/apacheds/branches/bigbang/server-jndi/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/server-jndi/pom.xml?rev=678626&r1=678625&r2=678626&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/server-jndi/pom.xml (original)
+++ directory/apacheds/branches/bigbang/server-jndi/pom.xml Mon Jul 21 20:27:36 2008
@@ -64,7 +64,7 @@
 
     <dependency>
       <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-protocol-ldap</artifactId>
+      <artifactId>apacheds-protocol-newldap</artifactId>
       <version>${pom.version}</version>
     </dependency>  
 

Modified: directory/apacheds/branches/bigbang/server-xml/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/server-xml/pom.xml?rev=678626&r1=678625&r2=678626&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/server-xml/pom.xml (original)
+++ directory/apacheds/branches/bigbang/server-xml/pom.xml Mon Jul 21 20:27:36 2008
@@ -61,7 +61,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-protocol-ldap</artifactId>
+      <artifactId>apacheds-protocol-newldap</artifactId>
       <version>${pom.version}</version>
       <scope>test</scope>
     </dependency>

Modified: directory/apacheds/branches/bigbang/xbean-spring/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/xbean-spring/pom.xml?rev=678626&r1=678625&r2=678626&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/xbean-spring/pom.xml (original)
+++ directory/apacheds/branches/bigbang/xbean-spring/pom.xml Mon Jul 21 20:27:36 2008
@@ -101,7 +101,7 @@
 
     <dependency>
       <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-protocol-ldap</artifactId>
+      <artifactId>apacheds-protocol-newldap</artifactId>
       <version>${pom.version}</version>
       <classifier>sources</classifier>
       <scope>provided</scope>

Modified: directory/daemon/branches/bigbang/pom.xml
URL: http://svn.apache.org/viewvc/directory/daemon/branches/bigbang/pom.xml?rev=678626&r1=678625&r2=678626&view=diff
==============================================================================
--- directory/daemon/branches/bigbang/pom.xml (original)
+++ directory/daemon/branches/bigbang/pom.xml Mon Jul 21 20:27:36 2008
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.project</groupId>
     <artifactId>project</artifactId>
-    <version>10</version>
+    <version>11</version>
   </parent>
   <groupId>org.apache.directory.daemon</groupId>
   <artifactId>daemon-parent</artifactId>

Modified: directory/installers/branches/bigbang/pom.xml
URL: http://svn.apache.org/viewvc/directory/installers/branches/bigbang/pom.xml?rev=678626&r1=678625&r2=678626&view=diff
==============================================================================
--- directory/installers/branches/bigbang/pom.xml (original)
+++ directory/installers/branches/bigbang/pom.xml Mon Jul 21 20:27:36 2008
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.directory.project</groupId>
     <artifactId>project</artifactId>
-    <version>10</version>
+    <version>11</version>
   </parent>
 
   <groupId>org.apache.directory.installers</groupId>

Modified: directory/project/branches/bigbang/pom.xml
URL: http://svn.apache.org/viewvc/directory/project/branches/bigbang/pom.xml?rev=678626&r1=678625&r2=678626&view=diff
==============================================================================
--- directory/project/branches/bigbang/pom.xml (original)
+++ directory/project/branches/bigbang/pom.xml Mon Jul 21 20:27:36 2008
@@ -32,7 +32,7 @@
   <artifactId>project</artifactId>
   <packaging>pom</packaging>
   <name>Apache Directory Project</name>
-  <version>12-SNAPSHOT</version>
+  <version>11</version>
 
   <ciManagement>
     <system>continuum</system>

Modified: directory/shared/branches/bigbang/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/pom.xml?rev=678626&r1=678625&r2=678626&view=diff
==============================================================================
--- directory/shared/branches/bigbang/pom.xml (original)
+++ directory/shared/branches/bigbang/pom.xml Mon Jul 21 20:27:36 2008
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.directory.project</groupId>
     <artifactId>project</artifactId>
-    <version>10</version>
+    <version>11</version>
   </parent>
   <groupId>org.apache.directory.shared</groupId>
   <artifactId>shared-parent</artifactId>