directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1028969 [2/2] - in /directory/apacheds/branches/apacheds-config: all/ core-annotations/ core-api/ core-api/src/main/java/org/apache/directory/server/core/ core-api/src/test/java/org/apache/directory/server/core/ core-avl/ core-constants/ c...
Date Sat, 30 Oct 2010 02:08:37 GMT
Propchange: directory/apacheds/branches/apacheds-config/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 30 02:08:35 2010
@@ -4,4 +4,4 @@
 /directory/apacheds/branches/apacheds-schema/syncrepl/src/main/java/org/apache/directory/server/syncrepl/SyncReplConsumer.java:806623-896441
 /directory/apacheds/branches/apacheds-subtree/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java:965203-965686
 /directory/apacheds/branches/xdbm-refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java:945827-946347
-/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java:498338-580500
+/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java:498338-580500,1023440-1028958

Propchange: directory/apacheds/branches/apacheds-config/protocol-ntp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 30 02:08:35 2010
@@ -1,2 +1,3 @@
 /directory/apacheds/branches/apacheds-codec-merge/protocol-ntp:982369-987590
 /directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-ntp:980138-980936
+/directory/apacheds/trunk/protocol-ntp:1023440-1028958

Propchange: directory/apacheds/branches/apacheds-config/protocol-shared/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 30 02:08:35 2010
@@ -1,2 +1,3 @@
 /directory/apacheds/branches/apacheds-codec-merge/protocol-shared:982369-987590
 /directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-shared:980138-980936
+/directory/apacheds/trunk/protocol-shared:1023440-1028958

Modified: directory/apacheds/branches/apacheds-config/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java?rev=1028969&r1=1028968&r2=1028969&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java
(original)
+++ directory/apacheds/branches/apacheds-config/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java
Sat Oct 30 02:08:35 2010
@@ -168,7 +168,6 @@ public class LdifFileLoader
      */
     public int execute()
     {
-        DN rdn = null;
         InputStream in = null;
 
         try
@@ -192,7 +191,7 @@ public class LdifFileLoader
                     try
                     {
                         coreSession.lookup( dn );
-                        log.info( "Found {}, will not create.", rdn );
+                        log.info( "Found {}, will not create.", dn );
                     }
                     catch ( Exception e )
                     {
@@ -202,7 +201,7 @@ public class LdifFileLoader
                                 new DefaultEntry( 
                                     coreSession.getDirectoryService().getSchemaManager(),
entry ) ); 
                            count++;
-                            log.info( "Created {}.", rdn );
+                            log.info( "Created {}.", dn );
                         } 
                         catch ( LdapException e1 )
                         {

Propchange: directory/apacheds/branches/apacheds-config/server-annotations/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 30 02:08:35 2010
@@ -1,2 +1,3 @@
 /directory/apacheds/branches/apacheds-codec-merge/server-annotations:982369-987590
 /directory/apacheds/branches/apacheds-dnfactory-experiment/server-annotations:980138-980937
+/directory/apacheds/trunk/server-annotations:1023440-1028958

Propchange: directory/apacheds/branches/apacheds-config/server-integ/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 30 02:08:35 2010
@@ -1,2 +1,3 @@
 /directory/apacheds/branches/apacheds-codec-merge/server-integ:982369-987590
 /directory/apacheds/branches/apacheds-dnfactory-experiment/server-integ:980138-980937
+/directory/apacheds/trunk/server-integ:1023440-1028957

Modified: directory/apacheds/branches/apacheds-config/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java?rev=1028969&r1=1028968&r2=1028969&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java
(original)
+++ directory/apacheds/branches/apacheds-config/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java
Sat Oct 30 02:08:35 2010
@@ -1183,6 +1183,14 @@ public class AddIT extends AbstractLdapT
         catch ( Exception e )
         {
             // We are expecting the session to be close here.
+            if ( connection.isConnected() )
+            {
+                // Race condition:
+                // Upon NoticeOfDisconnection the API sends an abandon request but does not
immediately close the connection.
+                // So at this point it is not guaranteed that the connnection is already
closed.
+                // TODO: This is just a workaround, better check the connection for any outstanding
abandon requests
+                Thread.sleep( 1000 );
+            }
             assertFalse( connection.isConnected() );
         }
     }

Modified: directory/apacheds/branches/apacheds-config/server-integ/src/test/java/org/apache/directory/server/operations/bind/BindIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-integ/src/test/java/org/apache/directory/server/operations/bind/BindIT.java?rev=1028969&r1=1028968&r2=1028969&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-integ/src/test/java/org/apache/directory/server/operations/bind/BindIT.java
(original)
+++ directory/apacheds/branches/apacheds-config/server-integ/src/test/java/org/apache/directory/server/operations/bind/BindIT.java
Sat Oct 30 02:08:35 2010
@@ -25,6 +25,7 @@ import static org.junit.Assert.assertEqu
 import static org.junit.Assert.fail;
 
 import javax.naming.AuthenticationException;
+import javax.naming.InvalidNameException;
 
 import netscape.ldap.LDAPConnection;
 import netscape.ldap.LDAPConstraints;
@@ -46,41 +47,40 @@ import org.junit.runner.RunWith;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-@RunWith ( FrameworkRunner.class ) 
-@ApplyLdifs( {
-    // Entry # 1
-    "dn: uid=akarasulu,ou=users,ou=system",
-    "objectClass: uidObject",
-    "objectClass: person",
-    "objectClass: top",
-    "uid: akarasulu",
-    "cn: Alex Karasulu",
-    "sn: karasulu", 
-    // Entry # 2
-    "dn: ou=Computers,uid=akarasulu,ou=users,ou=system",
-    "objectClass: organizationalUnit",
-    "objectClass: top",
-    "ou: computers",
-    "description: Computers for Alex",
-    "seeAlso: ou=Machines,uid=akarasulu,ou=users,ou=system", 
-    // Entry # 3
-    "dn: uid=akarasuluref,ou=users,ou=system",
-    "objectClass: extensibleObject",
-    "objectClass: uidObject",
-    "objectClass: referral",
-    "objectClass: top",
-    "uid: akarasuluref",
-    "userPassword: secret",
-    "ref: ldap://localhost:10389/uid=akarasulu,ou=users,ou=system", 
-    "ref: ldap://foo:10389/uid=akarasulu,ou=users,ou=system",
-    "ref: ldap://bar:10389/uid=akarasulu,ou=users,ou=system"
-    }
-)
-@CreateDS( allowAnonAccess=true, name="BindIT-class")
-@CreateLdapServer ( 
-    transports = 
+@RunWith(FrameworkRunner.class)
+@ApplyLdifs(
+    {
+        // Entry # 1
+        "dn: uid=akarasulu,ou=users,ou=system",
+        "objectClass: uidObject",
+        "objectClass: person",
+        "objectClass: top",
+        "uid: akarasulu",
+        "cn: Alex Karasulu",
+        "sn: karasulu",
+        // Entry # 2
+        "dn: ou=Computers,uid=akarasulu,ou=users,ou=system",
+        "objectClass: organizationalUnit",
+        "objectClass: top",
+        "ou: computers",
+        "description: Computers for Alex",
+        "seeAlso: ou=Machines,uid=akarasulu,ou=users,ou=system",
+        // Entry # 3
+        "dn: uid=akarasuluref,ou=users,ou=system",
+        "objectClass: extensibleObject",
+        "objectClass: uidObject",
+        "objectClass: referral",
+        "objectClass: top",
+        "uid: akarasuluref",
+        "userPassword: secret",
+        "ref: ldap://localhost:10389/uid=akarasulu,ou=users,ou=system",
+        "ref: ldap://foo:10389/uid=akarasulu,ou=users,ou=system",
+        "ref: ldap://bar:10389/uid=akarasulu,ou=users,ou=system" })
+@CreateDS(allowAnonAccess = true, name = "BindIT-class")
+@CreateLdapServer(
+    transports =
     {
-        @CreateTransport( protocol = "LDAP" )
+        @CreateTransport(protocol = "LDAP")
     })
 public class BindIT extends AbstractLdapTestUnit
 {
@@ -106,18 +106,18 @@ public class BindIT extends AbstractLdap
 
 
     /**
-     * Test with bindDn that is under a naming context but points to non-existant user.
-     * @todo make this pass: see http://issues.apache.org/jira/browse/DIREVE-339
+     * Test bind with malformed bind DN.
      */
-    //    public void testBadBindDnMalformed() throws Exception
-    //    {
-    //        try
-    //        {
-    //            bind( "system", "blah" );
-    //            fail( "should never get here due to a " );
-    //        }
-    //        catch ( InvalidNameException e ){}
-    //    }
+    @Test
+    public void testBadBindDnMalformed() throws Exception
+    {
+        try
+        {
+            getWiredContext( ldapServer, "system", "blah" );
+            fail( "should never get here due to a " );
+        }
+        catch ( InvalidNameException e ){}
+    }
 
     /**
      * Test with bindDn that is under a naming context but points to non-existant user.
@@ -137,12 +137,12 @@ public class BindIT extends AbstractLdap
         }
     }
 
-    
+
     @Test
     public void testConnectWithIllegalLDAPVersion() throws Exception
     {
         LDAPConnection conn = null;
-        
+
         try
         {
             conn = new LDAPConnection();
@@ -162,7 +162,7 @@ public class BindIT extends AbstractLdap
         }
     }
 
-    
+
     /**
      * Tests bind operation on referral entry.
      */
@@ -174,25 +174,25 @@ public class BindIT extends AbstractLdap
         constraints.setClientControls( new LDAPControl( LDAPControl.MANAGEDSAIT, true, new
byte[0] ) );
         constraints.setServerControls( new LDAPControl( LDAPControl.MANAGEDSAIT, true, new
byte[0] ) );
         conn.setConstraints( constraints );
-        
+
         try
         {
-            conn.connect( 3, "localhost", ldapServer.getPort(), 
+            conn.connect( 3, "localhost", ldapServer.getPort(),
                 "uid=akarasuluref,ou=users,ou=system", "secret", constraints );
             fail( "try to connect with illegal version number should fail" );
         }
-        catch( LDAPException e )
+        catch ( LDAPException e )
         {
             assertEquals( "statuscode", LDAPException.INVALID_CREDENTIALS, e.getLDAPResultCode()
);
         }
-        
+
         try
         {
-            conn.connect( 3, "localhost", ldapServer.getPort(), 
+            conn.connect( 3, "localhost", ldapServer.getPort(),
                 "uid=akarasuluref,ou=users,ou=system", "secret" );
             fail( "try to connect with illegal version number should fail" );
         }
-        catch( LDAPException e )
+        catch ( LDAPException e )
         {
             assertEquals( "statuscode", LDAPException.INVALID_CREDENTIALS, e.getLDAPResultCode()
);
         }

Modified: directory/apacheds/branches/apacheds-config/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java?rev=1028969&r1=1028968&r2=1028969&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java
(original)
+++ directory/apacheds/branches/apacheds-config/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java
Sat Oct 30 02:08:35 2010
@@ -93,6 +93,7 @@ import org.slf4j.LoggerFactory;
         "objectClass: organizationalUnit",
         "objectClass: top",
         "ou: users\n",
+
         // Entry # 2
         "dn: uid=hnelson,ou=users,dc=example,dc=com",
         "objectClass: inetOrgPerson",
@@ -107,7 +108,7 @@ import org.slf4j.LoggerFactory;
         "krb5KeyVersionNumber: 0",
         "cn: Horatio Nelson",
         "sn: Nelson",
-    
+
         // krbtgt
         "dn: uid=krbtgt,ou=users,dc=example,dc=com",
         "objectClass: inetOrgPerson",
@@ -122,7 +123,7 @@ import org.slf4j.LoggerFactory;
         "krb5KeyVersionNumber: 0",
         "cn: KDC Service",
         "sn: Service",
-        
+
         // ldap per host
         "dn: uid=ldap,ou=users,dc=example,dc=com",
         "objectClass: inetOrgPerson",
@@ -136,16 +137,15 @@ import org.slf4j.LoggerFactory;
         "krb5PrincipalName: ldap/localhost@EXAMPLE.COM",
         "krb5KeyVersionNumber: 0",
         "cn: LDAP Service",
-        "sn: Service"
-    })
+        "sn: Service" })
 @CreateDS(allowAnonAccess = false, name = "SaslBindIT-class", partitions =
     { @CreatePartition(name = "example", suffix = "dc=example,dc=com", contextEntry = @ContextEntry(entryLdif
= "dn: dc=example,dc=com\n"
         + "dc: example\n" + "objectClass: top\n" + "objectClass: domain\n\n"), indexes =
         { @CreateIndex(attribute = "objectClass"), @CreateIndex(attribute = "dc"), @CreateIndex(attribute
= "ou") }) },
-additionalInterceptors = { KeyDerivationInterceptor.class }
-)
+    additionalInterceptors =
+        { KeyDerivationInterceptor.class })
 @CreateLdapServer(transports =
-    { @CreateTransport(protocol = "LDAP") }, saslHost = "localhost", saslPrincipal="ldap/localhost@EXAMPLE.COM",
saslMechanisms =
+    { @CreateTransport(protocol = "LDAP") }, saslHost = "localhost", saslPrincipal = "ldap/localhost@EXAMPLE.COM",
saslMechanisms =
     { @SaslMechanism(name = SupportedSaslMechanisms.PLAIN, implClass = PlainMechanismHandler.class),
         @SaslMechanism(name = SupportedSaslMechanisms.CRAM_MD5, implClass = CramMd5MechanismHandler.class),
         @SaslMechanism(name = SupportedSaslMechanisms.DIGEST_MD5, implClass = DigestMd5MechanismHandler.class),
@@ -153,11 +153,11 @@ additionalInterceptors = { KeyDerivation
         @SaslMechanism(name = SupportedSaslMechanisms.NTLM, implClass = NtlmMechanismHandler.class),
         @SaslMechanism(name = SupportedSaslMechanisms.GSS_SPNEGO, implClass = NtlmMechanismHandler.class)
}, extendedOpHandlers =
     { StoredProcedureExtendedOperationHandler.class }, ntlmProvider = BogusNtlmProvider.class)
-@CreateKdcServer ( 
-    transports = 
+@CreateKdcServer(
+    transports =
     {
-        @CreateTransport( protocol = "UDP", port = 6088 ),
-        @CreateTransport( protocol = "TCP", port = 6088 )
+        @CreateTransport(protocol = "UDP", port = 6088),
+        @CreateTransport(protocol = "TCP", port = 6088)
     })
 public class SaslBindIT extends AbstractLdapTestUnit
 {
@@ -244,6 +244,7 @@ public class SaslBindIT extends Abstract
      * Test a SASL bind with an empty mechanism 
      */
     @Test
+    @Ignore("Activate and fix when DIRAPI-36 (Provide a SaslBindRequest extending BindRequest
that can be used in LdapConnection.bind(...) method) is solved")
     public void testSaslBindNoMech() throws Exception
     {
         DN userDn = new DN( "uid=hnelson,ou=users,dc=example,dc=com" );
@@ -277,7 +278,7 @@ public class SaslBindIT extends Abstract
         DN userDn = new DN( "uid=hnelson,ou=users,dc=example,dc=com" );
         LdapNetworkConnection connection = new LdapNetworkConnection( "localhost", ldapServer.getPort()
);
 
-        BindResponse resp = connection.bindCramMd5( userDn.getName(), "secret", null );
+        BindResponse resp = connection.bindCramMd5( userDn.getRdn().getUpValue().getString(),
"secret", null );
         assertEquals( ResultCodeEnum.SUCCESS, resp.getLdapResult().getResultCode() );
 
         Entry entry = connection.lookup( userDn );
@@ -296,7 +297,7 @@ public class SaslBindIT extends Abstract
         DN userDn = new DN( "uid=hnelson,ou=users,dc=example,dc=com" );
         LdapNetworkConnection connection = new LdapNetworkConnection( "localhost", ldapServer.getPort()
);
 
-        BindResponse resp = connection.bindCramMd5( userDn.getName(), "badsecret", null );
+        BindResponse resp = connection.bindCramMd5( userDn.getRdn().getUpValue().getString(),
"badsecret", null );
         assertEquals( ResultCodeEnum.INVALID_CREDENTIALS, resp.getLdapResult().getResultCode()
);
         connection.close();
     }
@@ -311,7 +312,8 @@ public class SaslBindIT extends Abstract
         DN userDn = new DN( "uid=hnelson,ou=users,dc=example,dc=com" );
         LdapNetworkConnection connection = new LdapNetworkConnection( "localhost", ldapServer.getPort()
);
 
-        BindResponse resp = connection.bindDigestMd5( userDn.getName(), "secret", null, ldapServer.getSaslRealms()
+        BindResponse resp = connection.bindDigestMd5( userDn.getRdn().getUpValue().getString(),
"secret", null,
+            ldapServer.getSaslRealms()
                 .get( 0 ) );
         assertEquals( ResultCodeEnum.SUCCESS, resp.getLdapResult().getResultCode() );
 
@@ -331,7 +333,8 @@ public class SaslBindIT extends Abstract
         DN userDn = new DN( "uid=hnelson,ou=users,dc=example,dc=com" );
         LdapNetworkConnection connection = new LdapNetworkConnection( "localhost", ldapServer.getPort()
);
 
-        BindResponse resp = connection.bindGssApi( userDn.getName(), "secret", ldapServer.getSaslRealms().get(
0 )
+        BindResponse resp = connection.bindGssApi( userDn.getRdn().getUpValue().getString(),
"secret", ldapServer
+            .getSaslRealms().get( 0 )
             .toUpperCase(), "localhost", 6088 );
         assertEquals( ResultCodeEnum.SUCCESS, resp.getLdapResult().getResultCode() );
 
@@ -341,7 +344,7 @@ public class SaslBindIT extends Abstract
         connection.close();
     }
 
-    
+
     /**
      * Tests to make sure DIGEST-MD5 binds below the RootDSE fail if the realm is bad.
      */
@@ -445,7 +448,8 @@ public class SaslBindIT extends Abstract
 
             // Digest-MD5
             connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
-            resp = connection.bindDigestMd5( userDn.getName(), "secret", null, ldapServer.getSaslRealms()
+            resp = connection.bindDigestMd5( userDn.getRdn().getUpValue().getString(), "secret",
null, ldapServer
+                .getSaslRealms()
                 .get( 0 ) );
             assertEquals( ResultCodeEnum.SUCCESS, resp.getLdapResult().getResultCode() );
             entry = connection.lookup( userDn );
@@ -454,7 +458,7 @@ public class SaslBindIT extends Abstract
 
             // Cram-MD5
             connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
-            resp = connection.bindCramMd5( userDn.getName(), "secret", null );
+            resp = connection.bindCramMd5( userDn.getRdn().getUpValue().getString(), "secret",
null );
             assertEquals( ResultCodeEnum.SUCCESS, resp.getLdapResult().getResultCode() );
             entry = connection.lookup( userDn );
             assertEquals( "hnelson", entry.get( "uid" ).getString() );
@@ -462,7 +466,8 @@ public class SaslBindIT extends Abstract
 
             // GSSAPI
             connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
-            resp = connection.bindGssApi( userDn.getName(), "secret", ldapServer.getSaslRealms().get(
0 )
+            resp = connection.bindGssApi( userDn.getRdn().getUpValue().getString(), "secret",
ldapServer
+                .getSaslRealms().get( 0 )
                 .toUpperCase(), "localhost", 6088 );
             assertEquals( ResultCodeEnum.SUCCESS, resp.getLdapResult().getResultCode() );
             entry = connection.lookup( userDn );
@@ -595,9 +600,10 @@ public class SaslBindIT extends Abstract
         return provider;
     }
 
-    
+
     ////////////////////////
-    protected Entry getPrincipalAttributes( String dn, String sn, String cn, String uid,
String userPassword, String principal ) throws LdapException
+    protected Entry getPrincipalAttributes( String dn, String sn, String cn, String uid,
String userPassword,
+        String principal ) throws LdapException
     {
         Entry entry = new DefaultEntry( new DN( dn ) );
         entry.add( SchemaConstants.OBJECT_CLASS_AT, "person", "inetOrgPerson", "krb5principal",
"krb5kdcentry" );

Modified: directory/apacheds/branches/apacheds-config/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java?rev=1028969&r1=1028968&r2=1028969&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java
(original)
+++ directory/apacheds/branches/apacheds-config/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java
Sat Oct 30 02:08:35 2010
@@ -332,7 +332,7 @@ public class PersistentSearchIT extends 
     {
         PersistentSearchControl control = new PersistentSearchControl();
         control.setReturnECs( true );
-        control.setChangeTypes( ChangeType.ADD_VALUE );
+        control.setChangeTypes( ChangeType.ADD.getValue() );
         control.enableNotification( ChangeType.MODIFY );
         setUpListener( true, control, false );
         ctx.createSubcontext( "cn=Jack Black", getPersonAttributes( "Black", "Jack Black"
) );

Propchange: directory/apacheds/branches/apacheds-config/server-jndi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 30 02:08:35 2010
@@ -1,2 +1,3 @@
 /directory/apacheds/branches/apacheds-codec-merge/server-jndi:982369-987590
 /directory/apacheds/branches/apacheds-dnfactory-experiment/server-jndi:980138-980937
+/directory/apacheds/trunk/server-jndi:1023440-1028957

Propchange: directory/apacheds/branches/apacheds-config/server-replication/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 30 02:08:35 2010
@@ -1,2 +1,3 @@
 /directory/apacheds/branches/apacheds-codec-merge/server-replication:982369-987590
 /directory/apacheds/branches/apacheds-dnfactory-experiment/server-replication:980138-980937
+/directory/apacheds/trunk/server-replication:1023440-1028957



Mime
View raw message