You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2008/02/01 20:46:45 UTC
svn commit: r617618 [1/2] - in /directory:
apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/
apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/
apacheds/branches/bigbang/c...
Author: elecharny
Date: Fri Feb 1 11:46:08 2008
New Revision: 617618
URL: http://svn.apache.org/viewvc?rev=617618&view=rev
Log:
Renamed Entry to LdifEntry
Added:
directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifEntry.java
- copied, changed from r615843, directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/Entry.java
Removed:
directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/Entry.java
Modified:
directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerEntry.java
directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java
directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java
directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ListIT.java
directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ModifyContextIT.java
directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryIT.java
directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java
directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java
directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaServiceIT.java
directory/apacheds/branches/bigbang/core-unit/src/main/java/org/apache/directory/server/core/unit/AbstractTestCase.java
directory/apacheds/branches/bigbang/core-unit/src/main/java/org/apache/directory/server/core/unit/IntegrationUtils.java
directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/DirectoryService.java
directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLog.java
directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogEvent.java
directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogStore.java
directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/DefaultChangeLog.java
directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java
directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/OriginalChangeLogInterceptor.java
directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java
directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java
directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java
directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java
directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/ClientConnectionManager.java
directory/apacheds/branches/bigbang/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java
directory/apacheds/branches/bigbang/server-tools/src/main/java/org/apache/directory/server/tools/commands/importcmd/ImportCommandExecutor.java
directory/apacheds/branches/bigbang/server-unit/src/main/java/org/apache/directory/server/unit/AbstractServerTest.java
directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/NegationOperatorITest.java
directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java
directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifUtils.java
directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/util/PropertiesUtils.java
directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifReaderTest.java
directory/shared/branches/bigbang/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifUtilsTest.java
Modified: directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerEntry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerEntry.java?rev=617618&r1=617617&r2=617618&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerEntry.java (original)
+++ directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerEntry.java Fri Feb 1 11:46:08 2008
@@ -1376,6 +1376,21 @@
* - if the attribute already exists, we add the value (no duplicate)
* - or we just add a new attribute to the Map
*-----------------------------------------------------------------------*/
+
+ /**
+ * Add some Values to the current Entry.
+ *
+ * @param upId The user provided ID of the attribute we want to add
+ * some values to
+ * @param values The list of Values to add
+ * @throws NamingException
+ */
+ public void add( String upId, Value<?>... values ) throws NamingException
+ {
+
+ }
+
+
/**
* Add an attribute (represented by its ID and some String values) into an
* entry.
Modified: directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java?rev=617618&r1=617617&r2=617618&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java Fri Feb 1 11:46:08 2008
@@ -25,7 +25,7 @@
import org.apache.directory.server.core.authn.LdapPrincipal;
import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
import org.apache.directory.shared.ldap.ldif.ChangeType;
-import org.apache.directory.shared.ldap.ldif.Entry;
+import org.apache.directory.shared.ldap.ldif.LdifEntry;
import org.apache.directory.shared.ldap.ldif.LdifReader;
import org.apache.directory.shared.ldap.message.AttributeImpl;
import org.apache.directory.shared.ldap.name.LdapDN;
@@ -89,16 +89,16 @@
{
LdapContext rootDSE = getRootContext( service );
LdifReader reader = new LdifReader();
- List<Entry> entries = reader.parseLdif( ldif );
+ List<LdifEntry> entries = reader.parseLdif( ldif );
- for ( Entry entry : entries )
+ for ( LdifEntry entry : entries )
{
rootDSE.createSubcontext( new LdapDN( entry.getDn() ), entry.getAttributes() );
}
}
- public static Entry getUserAddLdif() throws InvalidNameException
+ public static LdifEntry getUserAddLdif() throws InvalidNameException
{
return getUserAddLdif( "uid=akarasulu,ou=users,ou=system", "test".getBytes(), "Alex Karasulu", "Karasulu" );
}
@@ -143,7 +143,7 @@
}
- public static void apply( LdapContext root, Entry entry ) throws NamingException
+ public static void apply( LdapContext root, LdifEntry entry ) throws NamingException
{
LdapDN dn = new LdapDN( entry.getDn() );
@@ -203,11 +203,11 @@
}
- public static Entry getUserAddLdif( String dnstr, byte[] password, String cn, String sn )
+ public static LdifEntry getUserAddLdif( String dnstr, byte[] password, String cn, String sn )
throws InvalidNameException
{
LdapDN dn = new LdapDN( dnstr );
- Entry ldif = new Entry();
+ LdifEntry ldif = new LdifEntry();
ldif.setDn( dnstr );
ldif.setChangeType( ChangeType.Add );
Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java?rev=617618&r1=617617&r2=617618&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java Fri Feb 1 11:46:08 2008
@@ -27,7 +27,7 @@
import static org.apache.directory.server.core.integ.IntegrationUtils.getUserAddLdif;
import org.apache.directory.server.core.integ.annotations.Factory;
import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
-import org.apache.directory.shared.ldap.ldif.Entry;
+import org.apache.directory.shared.ldap.ldif.LdifEntry;
import org.apache.directory.shared.ldap.message.AttributesImpl;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
@@ -66,7 +66,7 @@
@Test
public void testNoDeleteOnAdminByNonAdmin() throws NamingException
{
- Entry akarasulu = getUserAddLdif();
+ LdifEntry akarasulu = getUserAddLdif();
getRootContext( service ).createSubcontext( akarasulu.getDn(), akarasulu.getAttributes() );
try
@@ -89,7 +89,7 @@
@Test
public void testNoRdnChangesOnAdminByNonAdmin() throws NamingException
{
- Entry akarasulu = getUserAddLdif();
+ LdifEntry akarasulu = getUserAddLdif();
getRootContext( service ).createSubcontext( akarasulu.getDn(), akarasulu.getAttributes() );
LdapContext sysRoot = getContext( akarasulu.getDn(), service, "ou=system" );
@@ -113,7 +113,7 @@
@Test
public void testModifyOnAdminByNonAdmin() throws NamingException
{
- Entry akarasulu = getUserAddLdif();
+ LdifEntry akarasulu = getUserAddLdif();
getRootContext( service ).createSubcontext( akarasulu.getDn(), akarasulu.getAttributes() );
LdapContext sysRoot = getContext( akarasulu.getDn(), service, "ou=system" );
@@ -140,7 +140,7 @@
@Test
public void testSearchSubtreeByNonAdmin() throws NamingException
{
- Entry akarasulu = getUserAddLdif();
+ LdifEntry akarasulu = getUserAddLdif();
getRootContext( service ).createSubcontext( akarasulu.getDn(), akarasulu.getAttributes() );
LdapContext sysRoot = getContext( akarasulu.getDn(), service, "ou=system" );
Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ListIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ListIT.java?rev=617618&r1=617617&r2=617618&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ListIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ListIT.java Fri Feb 1 11:46:08 2008
@@ -26,7 +26,7 @@
import static org.apache.directory.server.core.integ.IntegrationUtils.getRootContext;
import static org.apache.directory.server.core.integ.IntegrationUtils.getContext;
import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
-import org.apache.directory.shared.ldap.ldif.Entry;
+import org.apache.directory.shared.ldap.ldif.LdifEntry;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;
@@ -57,7 +57,7 @@
@Test
public void testListSystemAsNonAdmin() throws NamingException
{
- Entry akarasulu = getUserAddLdif();
+ LdifEntry akarasulu = getUserAddLdif();
getRootContext( service ).createSubcontext( akarasulu.getDn(), akarasulu.getAttributes() );
LdapContext sysRoot = getContext( akarasulu.getDn(), service, "ou=system" );
@@ -79,7 +79,7 @@
@Test
public void testListUsersAsNonAdmin() throws NamingException
{
- Entry akarasulu = getUserAddLdif();
+ LdifEntry akarasulu = getUserAddLdif();
getRootContext( service ).createSubcontext( akarasulu.getDn(), akarasulu.getAttributes() );
LdapContext sysRoot = getContext( akarasulu.getDn(), service, "ou=system" );
@@ -121,7 +121,7 @@
{
LdapContext sysRoot = getSystemContext( service );
HashSet<String> set = new HashSet<String>();
- Entry akarasulu = getUserAddLdif();
+ LdifEntry akarasulu = getUserAddLdif();
getRootContext( service ).createSubcontext( akarasulu.getDn(), akarasulu.getAttributes() );
NamingEnumeration<NameClassPair> list = sysRoot.list( "ou=users" );
Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ModifyContextIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ModifyContextIT.java?rev=617618&r1=617617&r2=617618&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ModifyContextIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ModifyContextIT.java Fri Feb 1 11:46:08 2008
@@ -26,7 +26,7 @@
import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
import static org.apache.directory.server.core.integ.IntegrationUtils.getUserAddLdif;
import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeValueException;
-import org.apache.directory.shared.ldap.ldif.Entry;
+import org.apache.directory.shared.ldap.ldif.LdifEntry;
import org.apache.directory.shared.ldap.message.AttributeImpl;
import org.apache.directory.shared.ldap.message.AttributesImpl;
import static org.junit.Assert.assertEquals;
@@ -64,7 +64,7 @@
*/
protected void createData() throws NamingException
{
- Entry akarasulu = getUserAddLdif();
+ LdifEntry akarasulu = getUserAddLdif();
getRootContext( service ).createSubcontext( akarasulu.getDn(), akarasulu.getAttributes() );
LdapContext sysRoot = getSystemContext( service );
Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryIT.java?rev=617618&r1=617617&r2=617618&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryIT.java Fri Feb 1 11:46:08 2008
@@ -28,7 +28,7 @@
import org.apache.directory.shared.ldap.message.AttributeImpl;
import org.apache.directory.shared.ldap.message.AttributesImpl;
import org.apache.directory.shared.ldap.util.ArrayUtils;
-import org.apache.directory.shared.ldap.ldif.Entry;
+import org.apache.directory.shared.ldap.ldif.LdifEntry;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertNull;
@@ -62,7 +62,7 @@
@Test
public void testObjectFactory() throws NamingException
{
- Entry akarasulu = getUserAddLdif();
+ LdifEntry akarasulu = getUserAddLdif();
getRootContext( service ).createSubcontext( akarasulu.getDn(), akarasulu.getAttributes() );
LdapContext sysRoot = getSystemContext( service );
Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java?rev=617618&r1=617617&r2=617618&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java Fri Feb 1 11:46:08 2008
@@ -27,7 +27,7 @@
import static org.apache.directory.server.core.integ.IntegrationUtils.getRootContext;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.exception.LdapNamingException;
-import org.apache.directory.shared.ldap.ldif.Entry;
+import org.apache.directory.shared.ldap.ldif.LdifEntry;
import org.apache.directory.shared.ldap.message.AttributeImpl;
import org.apache.directory.shared.ldap.message.AttributesImpl;
import org.apache.directory.shared.ldap.message.ModificationItemImpl;
@@ -99,7 +99,7 @@
String ref2 = "ldap://maxwell:10389/ou=users,ou=system";
td.rootCtx = getSystemContext( service );
- Entry akarasulu = getUserAddLdif();
+ LdifEntry akarasulu = getUserAddLdif();
getRootContext( service ).createSubcontext( akarasulu.getDn(), akarasulu.getAttributes() );
// -------------------------------------------------------------------
Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java?rev=617618&r1=617617&r2=617618&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java Fri Feb 1 11:46:08 2008
@@ -26,7 +26,7 @@
import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
import static org.apache.directory.server.core.integ.IntegrationUtils.getUserAddLdif;
import org.apache.directory.shared.ldap.constants.JndiPropertyConstants;
-import org.apache.directory.shared.ldap.ldif.Entry;
+import org.apache.directory.shared.ldap.ldif.LdifEntry;
import org.apache.directory.shared.ldap.message.AliasDerefMode;
import org.apache.directory.shared.ldap.message.AttributeImpl;
import org.apache.directory.shared.ldap.message.AttributesImpl;
@@ -269,7 +269,7 @@
@Test
public void testConfirmNonAdminUserDnIsCreatorsName() throws NamingException
{
- Entry akarasulu = getUserAddLdif();
+ LdifEntry akarasulu = getUserAddLdif();
getRootContext( service ).createSubcontext( akarasulu.getDn(), akarasulu.getAttributes() );
LdapContext sysRoot = getSystemContext( service );
Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaServiceIT.java?rev=617618&r1=617617&r2=617618&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaServiceIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaServiceIT.java Fri Feb 1 11:46:08 2008
@@ -26,7 +26,7 @@
import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
-import org.apache.directory.shared.ldap.ldif.Entry;
+import org.apache.directory.shared.ldap.ldif.LdifEntry;
import org.apache.directory.shared.ldap.ldif.LdifReader;
import org.apache.directory.shared.ldap.message.AttributesImpl;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
@@ -155,8 +155,8 @@
StringReader in = new StringReader( numberOfGunsAttrLdif + "\n\n" + shipOCLdif );
LdifReader ldifReader = new LdifReader( in );
- Entry numberOfGunsAttrEntry = ldifReader.next();
- Entry shipOCEntry = ldifReader.next();
+ LdifEntry numberOfGunsAttrEntry = ldifReader.next();
+ LdifEntry shipOCEntry = ldifReader.next();
assertFalse( ldifReader.hasNext() );
// should be fine with unique OID
Modified: directory/apacheds/branches/bigbang/core-unit/src/main/java/org/apache/directory/server/core/unit/AbstractTestCase.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-unit/src/main/java/org/apache/directory/server/core/unit/AbstractTestCase.java?rev=617618&r1=617617&r2=617618&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-unit/src/main/java/org/apache/directory/server/core/unit/AbstractTestCase.java (original)
+++ directory/apacheds/branches/bigbang/core-unit/src/main/java/org/apache/directory/server/core/unit/AbstractTestCase.java Fri Feb 1 11:46:08 2008
@@ -26,7 +26,7 @@
import org.apache.directory.server.core.DefaultDirectoryService;
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.schema.registries.Registries;
-import org.apache.directory.shared.ldap.ldif.Entry;
+import org.apache.directory.shared.ldap.ldif.LdifEntry;
import org.apache.directory.shared.ldap.ldif.LdifReader;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.slf4j.Logger;
@@ -94,7 +94,7 @@
protected boolean doDelete = true;
/** A testEntries of entries as Attributes to add to the DIT for testing */
- protected List<Entry> testEntries = new ArrayList<Entry>();
+ protected List<LdifEntry> testEntries = new ArrayList<LdifEntry>();
/** An optional LDIF file path if set and present is read to add more test entries */
private String ldifPath;
@@ -179,8 +179,8 @@
// -------------------------------------------------------------------
LdifReader reader = new LdifReader();
- List<Entry> entries = reader.parseLdif( LDIF );
- Entry entry = entries.get(0);
+ List<LdifEntry> entries = reader.parseLdif( LDIF );
+ LdifEntry entry = entries.get(0);
testEntries.add( entry );
// -------------------------------------------------------------------
@@ -214,7 +214,7 @@
if ( in != null )
{
- Iterator<Entry> list = new LdifReader( in );
+ Iterator<LdifEntry> list = new LdifReader( in );
while ( list.hasNext() )
{
@@ -426,9 +426,9 @@
protected void injectEntries( String ldif ) throws NamingException
{
LdifReader reader = new LdifReader();
- List<Entry> entries = reader.parseLdif( ldif );
+ List<LdifEntry> entries = reader.parseLdif( ldif );
- for ( Entry entry : entries )
+ for ( LdifEntry entry : entries )
{
rootDSE.createSubcontext( new LdapDN( entry.getDn() ), entry.getAttributes() );
}
Modified: directory/apacheds/branches/bigbang/core-unit/src/main/java/org/apache/directory/server/core/unit/IntegrationUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-unit/src/main/java/org/apache/directory/server/core/unit/IntegrationUtils.java?rev=617618&r1=617617&r2=617618&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-unit/src/main/java/org/apache/directory/server/core/unit/IntegrationUtils.java (original)
+++ directory/apacheds/branches/bigbang/core-unit/src/main/java/org/apache/directory/server/core/unit/IntegrationUtils.java Fri Feb 1 11:46:08 2008
@@ -21,7 +21,7 @@
import org.apache.commons.io.FileUtils;
import org.apache.directory.shared.ldap.ldif.ChangeType;
-import org.apache.directory.shared.ldap.ldif.Entry;
+import org.apache.directory.shared.ldap.ldif.LdifEntry;
import org.apache.directory.shared.ldap.message.AttributeImpl;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.slf4j.Logger;
@@ -71,14 +71,14 @@
}
- public static Entry getUserAddLdif() throws InvalidNameException
+ public static LdifEntry getUserAddLdif() throws InvalidNameException
{
return getUserAddLdif( "uid=akarasulu,ou=users,ou=system", "test".getBytes(), "Alex Karasulu", "Karasulu" );
}
- public static void apply( LdapContext root, Entry entry ) throws NamingException
+ public static void apply( LdapContext root, LdifEntry entry ) throws NamingException
{
LdapDN dn = new LdapDN( entry.getDn() );
@@ -138,11 +138,11 @@
}
- public static Entry getUserAddLdif( String dnstr, byte[] password, String cn, String sn )
+ public static LdifEntry getUserAddLdif( String dnstr, byte[] password, String cn, String sn )
throws InvalidNameException
{
LdapDN dn = new LdapDN( dnstr );
- Entry ldif = new Entry();
+ LdifEntry ldif = new LdifEntry();
ldif.setDn( dnstr );
ldif.setChangeType( ChangeType.Add );
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?rev=617618&r1=617617&r2=617618&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java Fri Feb 1 11:46:08 2008
@@ -84,7 +84,7 @@
import org.apache.directory.shared.ldap.exception.LdapNamingException;
import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
import org.apache.directory.shared.ldap.ldif.ChangeType;
-import org.apache.directory.shared.ldap.ldif.Entry;
+import org.apache.directory.shared.ldap.ldif.LdifEntry;
import org.apache.directory.shared.ldap.ldif.LdifReader;
import org.apache.directory.shared.ldap.message.AttributesImpl;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
@@ -229,7 +229,7 @@
private List<Interceptor> interceptors;
private Partition systemPartition;
private Set<Partition> partitions = new HashSet<Partition>();
- private List<? extends Entry> testEntries = new ArrayList<Entry>(); // List<Attributes>
+ private List<? extends LdifEntry> testEntries = new ArrayList<LdifEntry>(); // List<Attributes>
@@ -370,15 +370,15 @@
/**
- * Returns test directory entries({@link Entry}) to be loaded while
+ * Returns test directory entries({@link LdifEntry}) to be loaded while
* bootstrapping.
*
* @org.apache.xbean.Property nestedType="org.apache.directory.shared.ldap.ldif.Entry"
* @return test entries to load during bootstrapping
*/
- public List<Entry> getTestEntries()
+ public List<LdifEntry> getTestEntries()
{
- List<Entry> cloned = new ArrayList<Entry>();
+ List<LdifEntry> cloned = new ArrayList<LdifEntry>();
cloned.addAll( testEntries );
return cloned;
}
@@ -391,10 +391,10 @@
* @org.apache.xbean.Property nestedType="org.apache.directory.shared.ldap.ldif.Entry"
* @param testEntries the test entries to load while bootstrapping
*/
- public void setTestEntries( List<? extends Entry> testEntries )
+ public void setTestEntries( List<? extends LdifEntry> testEntries )
{
//noinspection MismatchedQueryAndUpdateOfCollection
- List<Entry> cloned = new ArrayList<Entry>();
+ List<LdifEntry> cloned = new ArrayList<LdifEntry>();
cloned.addAll( testEntries );
this.testEntries = testEntries;
}
@@ -694,7 +694,7 @@
while ( cursor.previous() ) // apply ldifs in reverse order
{
ChangeLogEvent event = cursor.get();
- Entry reverse = event.getReverseLdif();
+ LdifEntry reverse = event.getReverseLdif();
switch( reverse.getChangeType().getChangeType() )
{
@@ -1248,11 +1248,11 @@
LdapPrincipal principal = new LdapPrincipal( adminDn, AuthenticationLevel.SIMPLE );
ServerLdapContext ctx = new ServerLdapContext( this, principal, new LdapDN() );
- for ( Entry testEntry : testEntries )
+ for ( LdifEntry testEntry : testEntries )
{
try
{
- Entry entry = testEntry.clone();
+ LdifEntry entry = testEntry.clone();
Attributes attributes = entry.getAttributes();
String dn = entry.getDn();
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/DirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/DirectoryService.java?rev=617618&r1=617617&r2=617618&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/DirectoryService.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/DirectoryService.java Fri Feb 1 11:46:08 2008
@@ -31,7 +31,7 @@
import org.apache.directory.server.core.partition.PartitionNexus;
import org.apache.directory.server.core.schema.SchemaService;
import org.apache.directory.server.schema.registries.Registries;
-import org.apache.directory.shared.ldap.ldif.Entry;
+import org.apache.directory.shared.ldap.ldif.LdifEntry;
import org.apache.directory.shared.ldap.name.LdapDN;
import javax.naming.Context;
@@ -279,12 +279,12 @@
/**
- * Returns test directory entries({@link Entry}) to be loaded while
+ * Returns test directory entries({@link LdifEntry}) to be loaded while
* bootstrapping.
*
* @return test entries to load during bootstrapping
*/
- List<Entry> getTestEntries();
+ List<LdifEntry> getTestEntries();
/**
@@ -293,7 +293,7 @@
*
* @param testEntries the test entries to load while bootstrapping
*/
- void setTestEntries( List<? extends Entry> testEntries );
+ void setTestEntries( List<? extends LdifEntry> testEntries );
/**
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLog.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLog.java?rev=617618&r1=617617&r2=617618&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLog.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLog.java Fri Feb 1 11:46:08 2008
@@ -22,7 +22,7 @@
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.authn.LdapPrincipal;
-import org.apache.directory.shared.ldap.ldif.Entry;
+import org.apache.directory.shared.ldap.ldif.LdifEntry;
import javax.naming.NamingException;
@@ -73,7 +73,7 @@
* @return the new revision reached after having applied the forward LDIF
* @throws NamingException if there are problems logging the change
*/
- long log( LdapPrincipal principal, Entry forward, Entry reverse ) throws NamingException;
+ long log( LdapPrincipal principal, LdifEntry forward, LdifEntry reverse ) throws NamingException;
/**
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogEvent.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogEvent.java?rev=617618&r1=617617&r2=617618&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogEvent.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogEvent.java Fri Feb 1 11:46:08 2008
@@ -23,7 +23,7 @@
import java.io.Serializable;
import org.apache.directory.server.core.authn.LdapPrincipal;
-import org.apache.directory.shared.ldap.ldif.Entry;
+import org.apache.directory.shared.ldap.ldif.LdifEntry;
/**
@@ -37,8 +37,8 @@
private static final long serialVersionUID = 1L;
private final String zuluTime;
private final long revision;
- private final Entry forwardLdif;
- private final Entry reverseLdif;
+ private final LdifEntry forwardLdif;
+ private final LdifEntry reverseLdif;
private final LdapPrincipal committer;
@@ -49,7 +49,7 @@
* @param zuluTime the timestamp for when the change occurred in generalizedTime format
*/
public ChangeLogEvent( long revision, String zuluTime, LdapPrincipal committer,
- Entry forwardLdif, Entry reverseLdif )
+ LdifEntry forwardLdif, LdifEntry reverseLdif )
{
this.zuluTime = zuluTime;
this.revision = revision;
@@ -62,7 +62,7 @@
/**
* @return the forwardLdif
*/
- public Entry getForwardLdif()
+ public LdifEntry getForwardLdif()
{
return forwardLdif;
}
@@ -71,7 +71,7 @@
/**
* @return the reverseLdif
*/
- public Entry getReverseLdif()
+ public LdifEntry getReverseLdif()
{
return reverseLdif;
}
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java?rev=617618&r1=617617&r2=617618&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java Fri Feb 1 11:46:08 2008
@@ -41,7 +41,7 @@
import org.apache.directory.server.core.schema.SchemaService;
import org.apache.directory.shared.ldap.entry.Modification;
import org.apache.directory.shared.ldap.ldif.ChangeType;
-import org.apache.directory.shared.ldap.ldif.Entry;
+import org.apache.directory.shared.ldap.ldif.LdifEntry;
import org.apache.directory.shared.ldap.ldif.LdifUtils;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.name.Rdn;
@@ -99,7 +99,7 @@
return;
}
- Entry forward = new Entry();
+ LdifEntry forward = new LdifEntry();
forward.setChangeType( ChangeType.Add );
forward.setDn( opContext.getDn().getUpName() );
@@ -112,7 +112,7 @@
forward.addAttribute( ServerEntryUtils.toAttributeImpl( addEntry.get( attributeType ) ) );
}
- Entry reverse = LdifUtils.reverseAdd( opContext.getDn() );
+ LdifEntry reverse = LdifUtils.reverseAdd( opContext.getDn() );
changeLog.log( getPrincipal(), forward, reverse );
}
@@ -139,10 +139,10 @@
return;
}
- Entry forward = new Entry();
+ LdifEntry forward = new LdifEntry();
forward.setChangeType( ChangeType.Delete );
forward.setDn( opContext.getDn().getUpName() );
- Entry reverse = LdifUtils.reverseDel( opContext.getDn(), ServerEntryUtils.toAttributesImpl( serverEntry ) );
+ LdifEntry reverse = LdifUtils.reverseDel( opContext.getDn(), ServerEntryUtils.toAttributesImpl( serverEntry ) );
changeLog.log( getPrincipal(), forward, reverse );
}
@@ -201,7 +201,7 @@
return;
}
- Entry forward = new Entry();
+ LdifEntry forward = new LdifEntry();
forward.setChangeType( ChangeType.Modify );
forward.setDn( opContext.getDn().getUpName() );
@@ -210,7 +210,7 @@
forward.addModificationItem( ServerEntryUtils.toModificationItemImpl( modItem ) );
}
- Entry reverse = LdifUtils.reverseModify(
+ LdifEntry reverse = LdifUtils.reverseModify(
opContext.getDn(),
ServerEntryUtils.toModificationItemImpl( opContext.getModItems() ),
ServerEntryUtils.toAttributesImpl( serverEntry ) );
@@ -241,12 +241,12 @@
return;
}
- Entry forward = new Entry();
+ LdifEntry forward = new LdifEntry();
forward.setChangeType( ChangeType.ModRdn );
forward.setDn( renameContext.getDn().getUpName() );
forward.setDeleteOldRdn( renameContext.getDelOldDn() );
- Entry reverse = LdifUtils.reverseModifyRdn( ServerEntryUtils.toAttributesImpl( serverEntry ), null, renameContext.getDn(),
+ LdifEntry reverse = LdifUtils.reverseModifyRdn( ServerEntryUtils.toAttributesImpl( serverEntry ), null, renameContext.getDn(),
new Rdn( renameContext.getNewRdn() ) );
changeLog.log( getPrincipal(), forward, reverse );
@@ -274,14 +274,14 @@
return;
}
- Entry forward = new Entry();
+ LdifEntry forward = new LdifEntry();
forward.setChangeType( ChangeType.ModDn );
forward.setDn( opCtx.getDn().getUpName() );
forward.setDeleteOldRdn( opCtx.getDelOldDn() );
forward.setNewRdn( opCtx.getNewRdn().getUpName() );
forward.setNewSuperior( opCtx.getParent().getUpName() );
- Entry reverse = LdifUtils.reverseModifyRdn( ServerEntryUtils.toAttributesImpl( serverEntry ), opCtx.getParent(), opCtx.getDn(),
+ LdifEntry reverse = LdifUtils.reverseModifyRdn( ServerEntryUtils.toAttributesImpl( serverEntry ), opCtx.getParent(), opCtx.getDn(),
new Rdn( opCtx.getNewRdn() ) );
changeLog.log( getPrincipal(), forward, reverse );
}
@@ -296,12 +296,12 @@
return;
}
- Entry forward = new Entry();
+ LdifEntry forward = new LdifEntry();
forward.setChangeType( ChangeType.ModDn );
forward.setDn( opCtx.getDn().getUpName() );
forward.setNewSuperior( opCtx.getParent().getUpName() );
- Entry reverse = LdifUtils.reverseModifyDn( opCtx.getParent(), opCtx.getDn() );
+ LdifEntry reverse = LdifUtils.reverseModifyDn( opCtx.getParent(), opCtx.getDn() );
changeLog.log( getPrincipal(), forward, reverse );
}
}
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogStore.java?rev=617618&r1=617617&r2=617618&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogStore.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogStore.java Fri Feb 1 11:46:08 2008
@@ -23,7 +23,7 @@
import org.apache.directory.server.core.authn.LdapPrincipal;
import org.apache.directory.server.core.cursor.Cursor;
import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.shared.ldap.ldif.Entry;
+import org.apache.directory.shared.ldap.ldif.LdifEntry;
import javax.naming.NamingException;
@@ -64,7 +64,7 @@
* @return the new revision reached after having applied the forward LDIF
* @throws NamingException if there are problems logging the change
*/
- long log( LdapPrincipal principal, Entry forward, Entry reverse ) throws NamingException;
+ long log( LdapPrincipal principal, LdifEntry forward, LdifEntry reverse ) throws NamingException;
/**
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/DefaultChangeLog.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/DefaultChangeLog.java?rev=617618&r1=617617&r2=617618&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/DefaultChangeLog.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/DefaultChangeLog.java Fri Feb 1 11:46:08 2008
@@ -21,7 +21,7 @@
import org.apache.directory.server.core.authn.LdapPrincipal;
import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.shared.ldap.ldif.Entry;
+import org.apache.directory.shared.ldap.ldif.LdifEntry;
import javax.naming.NamingException;
@@ -59,7 +59,7 @@
}
- public long log( LdapPrincipal principal, Entry forward, Entry reverse ) throws NamingException
+ public long log( LdapPrincipal principal, LdifEntry forward, LdifEntry reverse ) throws NamingException
{
if ( ! enabled )
{
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java?rev=617618&r1=617617&r2=617618&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java Fri Feb 1 11:46:08 2008
@@ -40,7 +40,7 @@
import org.apache.directory.server.core.authn.LdapPrincipal;
import org.apache.directory.server.core.cursor.Cursor;
import org.apache.directory.server.core.cursor.ListCursor;
-import org.apache.directory.shared.ldap.ldif.Entry;
+import org.apache.directory.shared.ldap.ldif.LdifEntry;
import org.apache.directory.shared.ldap.util.DateUtils;
import javax.naming.NamingException;
@@ -425,7 +425,7 @@
}
- public long log( LdapPrincipal principal, Entry forward, Entry reverse ) throws NamingException
+ public long log( LdapPrincipal principal, LdifEntry forward, LdifEntry reverse ) throws NamingException
{
currentRevision++;
ChangeLogEvent event = new ChangeLogEvent( currentRevision, DateUtils.getGeneralizedTime(),
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/OriginalChangeLogInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/OriginalChangeLogInterceptor.java?rev=617618&r1=617617&r2=617618&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/OriginalChangeLogInterceptor.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/changelog/OriginalChangeLogInterceptor.java Fri Feb 1 11:46:08 2008
@@ -35,7 +35,7 @@
import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
import org.apache.directory.shared.ldap.entry.Modification;
import org.apache.directory.shared.ldap.ldif.ChangeType;
-import org.apache.directory.shared.ldap.ldif.Entry;
+import org.apache.directory.shared.ldap.ldif.LdifEntry;
import org.apache.directory.shared.ldap.ldif.LdifUtils;
import org.apache.directory.shared.ldap.util.Base64;
import org.apache.directory.shared.ldap.util.DateUtils;
@@ -263,7 +263,7 @@
buf.append( "\n#! deleteTimestamp: " );
buf.append( DateUtils.getGeneralizedTime() );
- Entry entry = new Entry();
+ LdifEntry entry = new LdifEntry();
entry.setDn( opContext.getDn().getUpName() );
entry.setChangeType( ChangeType.Delete );
buf.append( LdifUtils.convertToLdif( entry ) );
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java?rev=617618&r1=617617&r2=617618&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java Fri Feb 1 11:46:08 2008
@@ -70,7 +70,7 @@
import org.apache.directory.shared.ldap.filter.ExprNode;
import org.apache.directory.shared.ldap.filter.FilterParser;
-import org.apache.directory.shared.ldap.ldif.Entry;
+import org.apache.directory.shared.ldap.ldif.LdifEntry;
import org.apache.directory.shared.ldap.ldif.LdifReader;
import org.apache.directory.shared.ldap.message.AliasDerefMode;
import org.apache.directory.shared.ldap.name.LdapDN;
@@ -449,7 +449,7 @@
while ( list.hasNext() )
{
- Entry entry = ( Entry ) list.next();
+ LdifEntry entry = ( LdifEntry ) list.next();
String updn = entry.getDn();
Attributes attrs = entry.getAttributes();
Modified: directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java?rev=617618&r1=617617&r2=617618&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java (original)
+++ directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java Fri Feb 1 11:46:08 2008
@@ -41,7 +41,7 @@
import org.apache.directory.shared.ldap.aci.ProtectedItem;
import org.apache.directory.shared.ldap.aci.UserClass;
import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
-import org.apache.directory.shared.ldap.ldif.Entry;
+import org.apache.directory.shared.ldap.ldif.LdifEntry;
import org.apache.directory.shared.ldap.name.LdapDN;
import javax.naming.NamingEnumeration;
@@ -389,13 +389,13 @@
}
- public List<Entry> getTestEntries()
+ public List<LdifEntry> getTestEntries()
{
return null;
}
- public void setTestEntries( List<? extends Entry> testEntries )
+ public void setTestEntries( List<? extends LdifEntry> testEntries )
{
}
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=617618&r1=617617&r2=617618&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 Fri Feb 1 11:46:08 2008
@@ -22,7 +22,7 @@
import junit.framework.TestCase;
import org.apache.directory.server.core.authn.LdapPrincipal;
import org.apache.directory.shared.ldap.ldif.ChangeType;
-import org.apache.directory.shared.ldap.ldif.Entry;
+import org.apache.directory.shared.ldap.ldif.LdifEntry;
import org.apache.directory.shared.ldap.ldif.LdifUtils;
import org.apache.directory.shared.ldap.name.LdapDN;
@@ -58,13 +58,13 @@
{
assertEquals( "first revision is always 0", 0, store.getCurrentRevision() );
- Entry forward = new Entry();
+ LdifEntry forward = new LdifEntry();
forward.setDn( "ou=system" );
forward.setChangeType( ChangeType.Add );
forward.putAttribute( "objectClass", "organizationalUnit" );
forward.putAttribute( "ou", "system" );
- Entry reverse = LdifUtils.reverseAdd( new LdapDN( forward.getDn() ) );
+ LdifEntry reverse = LdifUtils.reverseAdd( new LdapDN( forward.getDn() ) );
assertEquals( 1, store.log( new LdapPrincipal(), forward, reverse ) );
assertEquals( 1, store.getCurrentRevision() );
}
Modified: directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java?rev=617618&r1=617617&r2=617618&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java (original)
+++ directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java Fri Feb 1 11:46:08 2008
@@ -35,7 +35,7 @@
import org.apache.directory.server.core.schema.SchemaOperationControl;
import org.apache.directory.server.core.schema.SchemaService;
import org.apache.directory.server.schema.registries.Registries;
-import org.apache.directory.shared.ldap.ldif.Entry;
+import org.apache.directory.shared.ldap.ldif.LdifEntry;
import org.apache.directory.shared.ldap.name.LdapDN;
import javax.naming.Context;
@@ -443,13 +443,13 @@
}
- public List<Entry> getTestEntries()
+ public List<LdifEntry> getTestEntries()
{
return null;
}
- public void setTestEntries( List<? extends Entry> testEntries )
+ public void setTestEntries( List<? extends LdifEntry> testEntries )
{
}
Modified: directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/ClientConnectionManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/ClientConnectionManager.java?rev=617618&r1=617617&r2=617618&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/ClientConnectionManager.java (original)
+++ directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/ClientConnectionManager.java Fri Feb 1 11:46:08 2008
@@ -384,7 +384,7 @@
}
catch ( RuntimeIOException e )
{
- LOG.error( "[Replica-" + ClientConnectionManager.this.configuration.getReplicaId()
+ LOG.warn( "[Replica-" + ClientConnectionManager.this.configuration.getReplicaId()
+ "] Failed to connect to replica-" + replica.getId(), e );
}
finally
Modified: directory/apacheds/branches/bigbang/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java?rev=617618&r1=617617&r2=617618&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java (original)
+++ directory/apacheds/branches/bigbang/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java Fri Feb 1 11:46:08 2008
@@ -37,7 +37,7 @@
import javax.naming.directory.DirContext;
import javax.naming.directory.ModificationItem;
-import org.apache.directory.shared.ldap.ldif.Entry;
+import org.apache.directory.shared.ldap.ldif.LdifEntry;
import org.apache.directory.shared.ldap.ldif.LdifReader;
import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import org.slf4j.Logger;
@@ -183,7 +183,7 @@
while ( ldifIterator.hasNext() )
{
- Entry entry = ldifIterator.next();
+ LdifEntry entry = ldifIterator.next();
String dn = entry.getDn();
Modified: directory/apacheds/branches/bigbang/server-tools/src/main/java/org/apache/directory/server/tools/commands/importcmd/ImportCommandExecutor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/server-tools/src/main/java/org/apache/directory/server/tools/commands/importcmd/ImportCommandExecutor.java?rev=617618&r1=617617&r2=617618&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/server-tools/src/main/java/org/apache/directory/server/tools/commands/importcmd/ImportCommandExecutor.java (original)
+++ directory/apacheds/branches/bigbang/server-tools/src/main/java/org/apache/directory/server/tools/commands/importcmd/ImportCommandExecutor.java Fri Feb 1 11:46:08 2008
@@ -47,7 +47,7 @@
import org.apache.directory.shared.ldap.codec.modifyDn.ModifyDNRequest;
import org.apache.directory.shared.ldap.codec.unbind.UnBindRequest;
import org.apache.directory.shared.ldap.ldif.ChangeType;
-import org.apache.directory.shared.ldap.ldif.Entry;
+import org.apache.directory.shared.ldap.ldif.LdifEntry;
import org.apache.directory.shared.ldap.ldif.LdifReader;
import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
@@ -213,7 +213,7 @@
* @throws NamingException ??
* @throws EncoderException ??
*/
- private int addEntry( Entry entry, int messageId ) throws IOException, DecoderException,
+ private int addEntry( LdifEntry entry, int messageId ) throws IOException, DecoderException,
NamingException, EncoderException
{
AddRequest addRequest = new AddRequest();
@@ -294,7 +294,7 @@
* @throws NamingException ??
* @throws EncoderException ??
*/
- private int deleteEntry( Entry entry, int messageId ) throws IOException, DecoderException,
+ private int deleteEntry( LdifEntry entry, int messageId ) throws IOException, DecoderException,
NamingException, EncoderException
{
DelRequest delRequest = new DelRequest();
@@ -356,7 +356,7 @@
* @throws DecoderException ??
* @throws EncoderException ??
*/
- private int changeModRDNEntry( Entry entry, int messageId ) throws IOException, DecoderException,
+ private int changeModRDNEntry( LdifEntry entry, int messageId ) throws IOException, DecoderException,
NamingException, EncoderException
{
ModifyDNRequest modifyDNRequest = new ModifyDNRequest();
@@ -425,7 +425,7 @@
* @throws DecoderException ??
* @throws EncoderException ??
*/
- private int changeModifyEntry( Entry entry, int messageId ) throws IOException, DecoderException,
+ private int changeModifyEntry( LdifEntry entry, int messageId ) throws IOException, DecoderException,
NamingException, EncoderException
{
ModifyRequest modifyRequest = new ModifyRequest();
@@ -517,7 +517,7 @@
* @throws DecoderException ??
* @throws EncoderException ??
*/
- private int changeEntry( Entry entry, int messageId ) throws IOException, DecoderException,
+ private int changeEntry( LdifEntry entry, int messageId ) throws IOException, DecoderException,
NamingException, EncoderException
{
switch ( entry.getChangeType().getChangeType() )
@@ -842,13 +842,13 @@
if ( ldifReader.containsEntries() )
{
// Parse the file and inject every entry
- Iterator<Entry> entries = ldifReader.iterator();
+ Iterator<LdifEntry> entries = ldifReader.iterator();
long t0 = System.currentTimeMillis();
int nbAdd = 0;
while ( entries.hasNext() )
{
- Entry entry = entries.next();
+ LdifEntry entry = entries.next();
// Check if we have had some error, has next() does not throw any exception
if ( ldifReader.hasError() )
@@ -907,13 +907,13 @@
else
{
// Parse the file and inject every modification
- Iterator<Entry> entries = ldifReader.iterator();
+ Iterator<LdifEntry> entries = ldifReader.iterator();
long t0 = System.currentTimeMillis();
int nbMod = 0;
while ( entries.hasNext() )
{
- Entry entry = entries.next();
+ LdifEntry entry = entries.next();
// Check if we have had some error, has next() does not throw any exception
if ( ldifReader.hasError() )
Modified: directory/apacheds/branches/bigbang/server-unit/src/main/java/org/apache/directory/server/unit/AbstractServerTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/server-unit/src/main/java/org/apache/directory/server/unit/AbstractServerTest.java?rev=617618&r1=617617&r2=617618&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/server-unit/src/main/java/org/apache/directory/server/unit/AbstractServerTest.java (original)
+++ directory/apacheds/branches/bigbang/server-unit/src/main/java/org/apache/directory/server/unit/AbstractServerTest.java Fri Feb 1 11:46:08 2008
@@ -30,7 +30,7 @@
import org.apache.directory.server.ldap.LdapServer;
import org.apache.directory.server.protocol.shared.SocketAcceptor;
import org.apache.directory.shared.ldap.exception.LdapConfigurationException;
-import org.apache.directory.shared.ldap.ldif.Entry;
+import org.apache.directory.shared.ldap.ldif.LdifEntry;
import org.apache.directory.shared.ldap.ldif.LdifReader;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.mina.util.AvailablePortFinder;
@@ -63,7 +63,7 @@
public abstract class AbstractServerTest extends TestCase
{
private static final Logger LOG = LoggerFactory.getLogger( AbstractServerTest.class );
- private static final List<Entry> EMPTY_LIST = Collections.unmodifiableList( new ArrayList<Entry>( 0 ) );
+ private static final List<LdifEntry> EMPTY_LIST = Collections.unmodifiableList( new ArrayList<LdifEntry>( 0 ) );
private static final String CTX_FACTORY = "com.sun.jndi.ldap.LdapCtxFactory";
/** the context root for the system partition */
@@ -101,7 +101,7 @@
* @return a list of entries added to the server in the order they were added
* @throws NamingException of the load fails
*/
- protected List<Entry> loadTestLdif( boolean verifyEntries ) throws NamingException
+ protected List<LdifEntry> loadTestLdif( boolean verifyEntries ) throws NamingException
{
InputStream in = getClass().getResourceAsStream( getClass().getSimpleName() + ".ldif" );
if ( in == null )
@@ -110,10 +110,10 @@
}
LdifReader ldifReader = new LdifReader( in );
- List<Entry> entries = new ArrayList<Entry>();
+ List<LdifEntry> entries = new ArrayList<LdifEntry>();
while ( ldifReader.hasNext() )
{
- Entry entry = ldifReader.next();
+ LdifEntry entry = ldifReader.next();
rootDSE.createSubcontext( entry.getDn(), entry.getAttributes() );
if ( verifyEntries )
@@ -140,7 +140,7 @@
* @param entry the entry to verify
* @throws NamingException if there are problems accessing the entry
*/
- protected void verify( Entry entry ) throws NamingException
+ protected void verify( LdifEntry entry ) throws NamingException
{
Attributes readAttributes = rootDSE.getAttributes( entry.getDn() );
NamingEnumeration<String> readIds = entry.getAttributes().getIDs();
@@ -359,11 +359,11 @@
{
try
{
- Iterator<Entry> iterator = new LdifReader( in );
+ Iterator<LdifEntry> iterator = new LdifReader( in );
while ( iterator.hasNext() )
{
- Entry entry = iterator.next();
+ LdifEntry entry = iterator.next();
LdapDN dn = new LdapDN( entry.getDn() );
rootDSE.createSubcontext( dn, entry.getAttributes() );
}
@@ -386,9 +386,9 @@
protected void injectEntries( String ldif ) throws NamingException
{
LdifReader reader = new LdifReader();
- List<Entry> entries = reader.parseLdif( ldif );
+ List<LdifEntry> entries = reader.parseLdif( ldif );
- for ( Entry entry : entries )
+ for ( LdifEntry entry : entries )
{
rootDSE.createSubcontext( new LdapDN( entry.getDn() ), entry.getAttributes() );
}
Modified: directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/NegationOperatorITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/NegationOperatorITest.java?rev=617618&r1=617617&r2=617618&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/NegationOperatorITest.java (original)
+++ directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/NegationOperatorITest.java Fri Feb 1 11:46:08 2008
@@ -37,7 +37,7 @@
import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
import org.apache.directory.server.unit.AbstractServerTest;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.ldif.Entry;
+import org.apache.directory.shared.ldap.ldif.LdifEntry;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.util.DateUtils;
@@ -54,7 +54,7 @@
public class NegationOperatorITest extends AbstractServerTest
{
private LdapContext ctx = null;
- private List<Entry> loadedEntries;
+ private List<LdifEntry> loadedEntries;
/**
Copied: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifEntry.java (from r615843, directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/Entry.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifEntry.java?p2=directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifEntry.java&p1=directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/Entry.java&r1=615843&r2=617618&rev=617618&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/Entry.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifEntry.java Fri Feb 1 11:46:08 2008
@@ -53,7 +53,7 @@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class Entry implements Cloneable, Serializable
+public class LdifEntry implements Cloneable, Serializable
{
/** Used in toArray() */
public static final ModificationItemImpl[] EMPTY_MODS = new ModificationItemImpl[0];
@@ -88,7 +88,7 @@
/**
* Creates a new Entry object.
*/
- public Entry()
+ public LdifEntry()
{
changeType = ChangeType.Add; // Default LDIF content
modificationList = new LinkedList<ModificationItemImpl>();
@@ -473,9 +473,9 @@
/**
* Clone method
*/
- public Entry clone() throws CloneNotSupportedException
+ public LdifEntry clone() throws CloneNotSupportedException
{
- Entry clone = (Entry) super.clone();
+ LdifEntry clone = (LdifEntry) super.clone();
if ( modificationList != null )
{
@@ -669,12 +669,12 @@
return false;
}
- if ( ! (o instanceof Entry ) )
+ if ( ! (o instanceof LdifEntry ) )
{
return false;
}
- Entry entry = (Entry)o;
+ LdifEntry entry = (LdifEntry)o;
// Check the DN
try
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java?rev=617618&r1=617617&r2=617618&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java Fri Feb 1 11:46:08 2008
@@ -152,7 +152,7 @@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class LdifReader implements Iterator<Entry>
+public class LdifReader implements Iterator<LdifEntry>
{
/** A logger */
private static final Logger LOG = LoggerFactory.getLogger( LdifReader.class );
@@ -211,7 +211,7 @@
protected static final int ATTRVAL_SPEC_OR_SEP = 2;
/** Iterator prefetched entry */
- protected Entry prefetched;
+ protected LdifEntry prefetched;
/** The ldif Reader */
protected Reader in;
@@ -855,7 +855,7 @@
* @throws NamingException
* If anything goes wrong
*/
- public void parseAttributeValue( Entry entry, String line, String lowerLine ) throws NamingException
+ public void parseAttributeValue( LdifEntry entry, String line, String lowerLine ) throws NamingException
{
int colonIndex = line.indexOf( ':' );
@@ -884,7 +884,7 @@
* @throws NamingException
* If anything goes wrong
*/
- private void parseModRdn( Entry entry, Iterator<String> iter ) throws NamingException
+ private void parseModRdn( LdifEntry entry, Iterator<String> iter ) throws NamingException
{
// We must have two lines : one starting with "newrdn:" or "newrdn::",
// and the second starting with "deleteoldrdn:"
@@ -955,7 +955,7 @@
* @param iter
* The lines
*/
- private void parseModify( Entry entry, Iterator<String> iter ) throws NamingException
+ private void parseModify( LdifEntry entry, Iterator<String> iter ) throws NamingException
{
int state = MOD_SPEC;
String modified = null;
@@ -1105,7 +1105,7 @@
* The associated control, if any
* @return A modification entry
*/
- private void parseChange( Entry entry, Iterator<String> iter, ChangeType operation, Control control ) throws NamingException
+ private void parseChange( LdifEntry entry, Iterator<String> iter, ChangeType operation, Control control ) throws NamingException
{
// The changetype and operation has already been parsed.
entry.setChangeType( operation );
@@ -1187,7 +1187,7 @@
* <distinguishedName> | "dn::" <fill> <base64-distinguishedName>
* <changerecord> ::= "changetype:" <fill> <change-op>
*/
- private Entry parseEntry() throws NamingException
+ private LdifEntry parseEntry() throws NamingException
{
if ( ( lines == null ) || ( lines.size() == 0 ) )
{
@@ -1201,7 +1201,7 @@
String dn = parseDn( line );
// Ok, we have found a DN
- Entry entry = new Entry();
+ LdifEntry entry = new LdifEntry();
entry.setDn( dn );
// We remove this dn from the lines
@@ -1501,7 +1501,7 @@
* @throws NamingException
* If the parsing fails
*/
- public List<Entry> parseLdifFile( String fileName ) throws NamingException
+ public List<LdifEntry> parseLdifFile( String fileName ) throws NamingException
{
return parseLdifFile( fileName, Charset.forName( StringTools.getDefaultCharsetName() ).toString() );
}
@@ -1517,7 +1517,7 @@
* @throws NamingException
* If the parsing fails
*/
- public List<Entry> parseLdifFile( String fileName, String encoding ) throws NamingException
+ public List<LdifEntry> parseLdifFile( String fileName, String encoding ) throws NamingException
{
if ( StringTools.isEmpty( fileName ) )
{
@@ -1558,13 +1558,13 @@
* @throws NamingException
* If something went wrong
*/
- public List<Entry> parseLdif( String ldif ) throws NamingException
+ public List<LdifEntry> parseLdif( String ldif ) throws NamingException
{
LOG.debug( "Starts parsing ldif buffer" );
if ( StringTools.isEmpty( ldif ) )
{
- return new ArrayList<Entry>();
+ return new ArrayList<LdifEntry>();
}
StringReader strIn = new StringReader( ldif );
@@ -1572,7 +1572,7 @@
try
{
- List<Entry> entries = parseLdif( inf );
+ List<LdifEntry> entries = parseLdif( inf );
if ( LOG.isDebugEnabled() )
{
@@ -1597,13 +1597,13 @@
*
* @return the next LDIF as a String.
*/
- public Entry next() throws NoSuchElementException
+ public LdifEntry next() throws NoSuchElementException
{
try
{
LOG.debug( "next(): -- called" );
- Entry entry = prefetched;
+ LdifEntry entry = prefetched;
readLines();
try
@@ -1652,7 +1652,7 @@
/**
* @return An iterator on the file
*/
- public Iterator<Entry> iterator()
+ public Iterator<LdifEntry> iterator()
{
return this;
}
@@ -1683,10 +1683,10 @@
* @throws NamingException
* If something went wrong
*/
- public List<Entry> parseLdif( BufferedReader inf ) throws NamingException
+ public List<LdifEntry> parseLdif( BufferedReader inf ) throws NamingException
{
// Create a list that will contain the read entries
- List<Entry> entries = new ArrayList<Entry>();
+ List<LdifEntry> entries = new ArrayList<LdifEntry>();
this.in = inf;
@@ -1697,7 +1697,7 @@
// When done, get the entries one by one.
while ( hasNext() )
{
- Entry entry = next();
+ LdifEntry entry = next();
if ( error != null )
{
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifUtils.java?rev=617618&r1=617617&r2=617618&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifUtils.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifUtils.java Fri Feb 1 11:46:08 2008
@@ -188,7 +188,7 @@
* @return the corresponding LDIF as a String
* @throws NamingException If a naming exception is encountered.
*/
- public static String convertToLdif( Entry entry ) throws NamingException
+ public static String convertToLdif( LdifEntry entry ) throws NamingException
{
return convertToLdif( entry, DEFAULT_LINE_LENGTH );
}
@@ -199,7 +199,7 @@
* @return the corresponding LDIF as a String
* @throws NamingException If a naming exception is encountered.
*/
- public static String convertToLdif( Entry entry, int length ) throws NamingException
+ public static String convertToLdif( LdifEntry entry, int length ) throws NamingException
{
StringBuilder sb = new StringBuilder();
@@ -471,9 +471,9 @@
* @return a reverse LDIF
* @throws NamingException If something went wrong
*/
- public static Entry reverseAdd( LdapDN dn ) throws NamingException
+ public static LdifEntry reverseAdd( LdapDN dn ) throws NamingException
{
- Entry entry = new Entry();
+ LdifEntry entry = new LdifEntry();
entry.setChangeType( ChangeType.Delete );
entry.setDn( dn.getUpName() );
return entry;
@@ -489,9 +489,9 @@
* @return A reverse LDIF
* @throws NamingException If something went wrong
*/
- public static Entry reverseDel( LdapDN dn, Attributes deletedEntry ) throws NamingException
+ public static LdifEntry reverseDel( LdapDN dn, Attributes deletedEntry ) throws NamingException
{
- Entry entry = new Entry();
+ LdifEntry entry = new LdifEntry();
entry.setDn( dn.getUpName() );
entry.setChangeType( ChangeType.Add );
@@ -516,9 +516,9 @@
* @return a reverse LDIF
* @throws NamingException if something went wrong
*/
- public static Entry reverseModifyDn( LdapDN newSuperiorDn, LdapDN modifiedDn ) throws NamingException
+ public static LdifEntry reverseModifyDn( LdapDN newSuperiorDn, LdapDN modifiedDn ) throws NamingException
{
- Entry entry = new Entry();
+ LdifEntry entry = new LdifEntry();
LdapDN currentParent;
LdapDN newDn;
@@ -551,9 +551,9 @@
}
- public static Entry reverseRename( Attributes t0, LdapDN t0_dn, Rdn t1_rdn ) throws NamingException
+ public static LdifEntry reverseRename( Attributes t0, LdapDN t0_dn, Rdn t1_rdn ) throws NamingException
{
- Entry entry = new Entry();
+ LdifEntry entry = new LdifEntry();
LdapDN parent;
LdapDN newDn;
@@ -598,7 +598,7 @@
* @return A reverse LDIF
* @throws NamingException If something went wrong
*/
- public static Entry reverseModifyRdn( Attributes t0, LdapDN t1_parentDn, LdapDN t0_dn, Rdn t1_rdn )
+ public static LdifEntry reverseModifyRdn( Attributes t0, LdapDN t1_parentDn, LdapDN t0_dn, Rdn t1_rdn )
throws NamingException
{
if ( t0_dn == null )
@@ -630,7 +630,7 @@
// -------------------------------------------------------------------
// the reverse LDIF we will create
- Entry reverse = new Entry();
+ LdifEntry reverse = new LdifEntry();
// take the dn before the forward change was applied, and get it's
// parent, this parent will be the newSuperiorDn to be used for the
@@ -709,13 +709,13 @@
* @return A reversed LDIF
* @throws NamingException If something went wrong
*/
- public static Entry reverseModify( LdapDN dn, List<ModificationItemImpl> forwardModifications,
+ public static LdifEntry reverseModify( LdapDN dn, List<ModificationItemImpl> forwardModifications,
Attributes modifiedEntry ) throws NamingException
{
// First, protect the original entry by cloning it : we will modify it
Attributes clonedEntry = ( Attributes ) modifiedEntry.clone();
- Entry entry = new Entry();
+ LdifEntry entry = new LdifEntry();
entry.setChangeType( ChangeType.Modify );
entry.setDn( dn.getUpName() );
Modified: directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/util/PropertiesUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/util/PropertiesUtils.java?rev=617618&r1=617617&r2=617618&view=diff
==============================================================================
--- directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/util/PropertiesUtils.java (original)
+++ directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/util/PropertiesUtils.java Fri Feb 1 11:46:08 2008
@@ -35,7 +35,7 @@
import javax.naming.NamingException;
import org.apache.directory.shared.ldap.NotImplementedException;
-import org.apache.directory.shared.ldap.ldif.Entry;
+import org.apache.directory.shared.ldap.ldif.LdifEntry;
import org.apache.directory.shared.ldap.ldif.LdifReader;
import org.apache.directory.shared.ldap.message.AttributesImpl;
@@ -585,7 +585,7 @@
LdifReader ldifReader = new LdifReader( new StringReader( ldif ) );
- Entry entry = ldifReader.next();
+ LdifEntry entry = ldifReader.next();
if ( entry != null )
{