Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 52892 invoked from network); 17 Feb 2011 08:58:21 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 17 Feb 2011 08:58:21 -0000 Received: (qmail 50218 invoked by uid 500); 17 Feb 2011 08:58:21 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 50148 invoked by uid 500); 17 Feb 2011 08:58:19 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 50141 invoked by uid 99); 17 Feb 2011 08:58:19 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Feb 2011 08:58:19 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Feb 2011 08:58:16 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 763752388A39; Thu, 17 Feb 2011 08:57:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1071551 - in /directory/studio/trunk/tests: test.integration.core/ test.integration.core/src/main/java/org/apache/directory/studio/test/integration/core/ test.integration.ui/ test.integration.ui/src/main/java/org/apache/directory/studio/te... Date: Thu, 17 Feb 2011 08:57:56 -0000 To: commits@directory.apache.org From: pamarcelot@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110217085756.763752388A39@eris.apache.org> Author: pamarcelot Date: Thu Feb 17 08:57:55 2011 New Revision: 1071551 URL: http://svn.apache.org/viewvc?rev=1071551&view=rev Log: Fixed compilation failures on SWT Bot UI tests for Studio (I'm not yet sure the tests can be run ATM). Modified: directory/studio/trunk/tests/test.integration.core/pom.xml directory/studio/trunk/tests/test.integration.core/src/main/java/org/apache/directory/studio/test/integration/core/JNDIConnectionWrapperTest.java directory/studio/trunk/tests/test.integration.ui/pom.xml directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/BrowserTest.java directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/EntryEditorTest.java directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ImportExportTest.java directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewConnectionWizardTest.java directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewEntryWizardTest.java directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ReferralDialogTest.java directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/SearchTest.java directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/NewEntryWizardBot.java Modified: directory/studio/trunk/tests/test.integration.core/pom.xml URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.core/pom.xml?rev=1071551&r1=1071550&r2=1071551&view=diff ============================================================================== --- directory/studio/trunk/tests/test.integration.core/pom.xml (original) +++ directory/studio/trunk/tests/test.integration.core/pom.xml Thu Feb 17 08:57:55 2011 @@ -251,9 +251,10 @@ META-INF - ${groupId}.${artifactId};singleton:=true + ${project.groupId}.${project.artifactId};singleton:=true plugin org.eclipse.core.runtime, + org.apache.directory.studio.common.core, org.apache.directory.studio.connection.core, org.junit @@ -290,22 +291,22 @@ org.apache.directory.server apacheds-server-unit - 1.5.5-SNAPSHOT + 1.5.5 org.apache.directory.server apacheds-core-integ - 1.5.5-SNAPSHOT + 1.5.5 org.apache.directory.shared shared-ldap - 0.9.15-SNAPSHOT + 0.9.15 org.apache.directory.shared shared-asn1 - 0.9.15-SNAPSHOT + 0.9.15 junit @@ -327,6 +328,11 @@ org.apache.directory.studio + common.core + provided + + + org.apache.directory.studio connection.core provided Modified: directory/studio/trunk/tests/test.integration.core/src/main/java/org/apache/directory/studio/test/integration/core/JNDIConnectionWrapperTest.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.core/src/main/java/org/apache/directory/studio/test/integration/core/JNDIConnectionWrapperTest.java?rev=1071551&r1=1071550&r2=1071551&view=diff ============================================================================== --- directory/studio/trunk/tests/test.integration.core/src/main/java/org/apache/directory/studio/test/integration/core/JNDIConnectionWrapperTest.java (original) +++ directory/studio/trunk/tests/test.integration.core/src/main/java/org/apache/directory/studio/test/integration/core/JNDIConnectionWrapperTest.java Thu Feb 17 08:57:55 2011 @@ -32,14 +32,16 @@ import javax.naming.directory.SearchCont import javax.naming.directory.SearchResult; import org.apache.directory.server.unit.AbstractServerTest; +import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor; import org.apache.directory.studio.connection.core.Connection; -import org.apache.directory.studio.connection.core.ConnectionParameter; import org.apache.directory.studio.connection.core.Connection.AliasDereferencingMethod; import org.apache.directory.studio.connection.core.Connection.ReferralHandlingMethod; +import org.apache.directory.studio.connection.core.ConnectionParameter; import org.apache.directory.studio.connection.core.ConnectionParameter.AuthenticationMethod; import org.apache.directory.studio.connection.core.ConnectionParameter.EncryptionMethod; +import org.apache.directory.studio.connection.core.ConnectionParameter.NetworkProvider; +import org.apache.directory.studio.connection.core.io.ConnectionWrapper; import org.apache.directory.studio.connection.core.io.jndi.JNDIConnectionWrapper; -import org.apache.directory.studio.connection.core.jobs.StudioProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; @@ -67,9 +69,9 @@ public class JNDIConnectionWrapperTest e { StudioProgressMonitor monitor = getProgressMonitor(); ConnectionParameter connectionParameter = new ConnectionParameter( null, "localhost", ldapServer.getPort(), - EncryptionMethod.NONE, AuthenticationMethod.NONE, null, null, null, true, null ); + EncryptionMethod.NONE, NetworkProvider.JNDI, AuthenticationMethod.NONE, null, null, null, true, null ); Connection connection = new Connection( connectionParameter ); - JNDIConnectionWrapper connectionWrapper = connection.getJNDIConnectionWrapper(); + ConnectionWrapper connectionWrapper = connection.getConnectionWrapper(); assertFalse( connectionWrapper.isConnected() ); @@ -92,14 +94,14 @@ public class JNDIConnectionWrapperTest e StudioProgressMonitor monitor = null; ConnectionParameter connectionParameter = null; Connection connection = null; - JNDIConnectionWrapper connectionWrapper = null; + ConnectionWrapper connectionWrapper = null; // invalid port monitor = getProgressMonitor(); connectionParameter = new ConnectionParameter( null, "localhost", ldapServer.getPort() + 1, - EncryptionMethod.NONE, AuthenticationMethod.NONE, null, null, null, true, null ); + EncryptionMethod.NONE, NetworkProvider.JNDI, AuthenticationMethod.NONE, null, null, null, true, null ); connection = new Connection( connectionParameter ); - connectionWrapper = connection.getJNDIConnectionWrapper(); + connectionWrapper = connection.getConnectionWrapper(); connectionWrapper.connect( monitor ); assertFalse( connectionWrapper.isConnected() ); assertNotNull( monitor.getException() ); @@ -110,9 +112,9 @@ public class JNDIConnectionWrapperTest e // unknown host monitor = getProgressMonitor(); connectionParameter = new ConnectionParameter( null, "555.555.555.555", ldapServer.getPort(), - EncryptionMethod.NONE, AuthenticationMethod.NONE, null, null, null, true, null ); + EncryptionMethod.NONE, NetworkProvider.JNDI, AuthenticationMethod.NONE, null, null, null, true, null ); connection = new Connection( connectionParameter ); - connectionWrapper = connection.getJNDIConnectionWrapper(); + connectionWrapper = connection.getConnectionWrapper(); connectionWrapper.connect( monitor ); assertFalse( connectionWrapper.isConnected() ); assertNotNull( monitor.getException() ); @@ -131,9 +133,10 @@ public class JNDIConnectionWrapperTest e { StudioProgressMonitor monitor = getProgressMonitor(); ConnectionParameter connectionParameter = new ConnectionParameter( null, "localhost", ldapServer.getPort(), - EncryptionMethod.NONE, AuthenticationMethod.SIMPLE, "uid=admin,ou=system", "secret", null, true, null ); + EncryptionMethod.NONE, NetworkProvider.JNDI, AuthenticationMethod.SIMPLE, "uid=admin,ou=system", "secret", + null, true, null ); Connection connection = new Connection( connectionParameter ); - JNDIConnectionWrapper connectionWrapper = connection.getJNDIConnectionWrapper(); + ConnectionWrapper connectionWrapper = connection.getConnectionWrapper(); assertFalse( connectionWrapper.isConnected() ); @@ -157,14 +160,15 @@ public class JNDIConnectionWrapperTest e StudioProgressMonitor monitor = null; ConnectionParameter connectionParameter = null; Connection connection = null; - JNDIConnectionWrapper connectionWrapper = null; + ConnectionWrapper connectionWrapper = null; // simple auth without principal and credential monitor = getProgressMonitor(); connectionParameter = new ConnectionParameter( null, "localhost", ldapServer.getPort(), - EncryptionMethod.NONE, AuthenticationMethod.SIMPLE, "uid=admin", "invalid", null, true, null ); + EncryptionMethod.NONE, NetworkProvider.JNDI, AuthenticationMethod.SIMPLE, "uid=admin", "invalid", null, + true, null ); connection = new Connection( connectionParameter ); - connectionWrapper = connection.getJNDIConnectionWrapper(); + connectionWrapper = connection.getConnectionWrapper(); connectionWrapper.connect( monitor ); connectionWrapper.bind( monitor ); assertFalse( connectionWrapper.isConnected() ); @@ -174,9 +178,10 @@ public class JNDIConnectionWrapperTest e // simple auth with invalid principal and credential monitor = getProgressMonitor(); connectionParameter = new ConnectionParameter( null, "localhost", ldapServer.getPort(), - EncryptionMethod.NONE, AuthenticationMethod.SIMPLE, "uid=admin,ou=system", "bar", null, true, null ); + EncryptionMethod.NONE, NetworkProvider.JNDI, AuthenticationMethod.SIMPLE, "uid=admin,ou=system", "bar", + null, true, null ); connection = new Connection( connectionParameter ); - connectionWrapper = connection.getJNDIConnectionWrapper(); + connectionWrapper = connection.getConnectionWrapper(); connectionWrapper.connect( monitor ); connectionWrapper.bind( monitor ); assertFalse( connectionWrapper.isConnected() ); @@ -193,14 +198,15 @@ public class JNDIConnectionWrapperTest e StudioProgressMonitor monitor = null; ConnectionParameter connectionParameter = null; Connection connection = null; - JNDIConnectionWrapper connectionWrapper = null; + ConnectionWrapper connectionWrapper = null; // simple auth without principal and credential monitor = getProgressMonitor(); connectionParameter = new ConnectionParameter( null, "localhost", ldapServer.getPort(), - EncryptionMethod.NONE, AuthenticationMethod.SIMPLE, "uid=admin,ou=system", "secret", null, true, null ); + EncryptionMethod.NONE, NetworkProvider.JNDI, AuthenticationMethod.SIMPLE, "uid=admin,ou=system", "secret", + null, true, null ); connection = new Connection( connectionParameter ); - connectionWrapper = connection.getJNDIConnectionWrapper(); + connectionWrapper = connection.getConnectionWrapper(); connectionWrapper.connect( monitor ); connectionWrapper.bind( monitor ); assertTrue( connectionWrapper.isConnected() ); Modified: directory/studio/trunk/tests/test.integration.ui/pom.xml URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.ui/pom.xml?rev=1071551&r1=1071550&r2=1071551&view=diff ============================================================================== --- directory/studio/trunk/tests/test.integration.ui/pom.xml (original) +++ directory/studio/trunk/tests/test.integration.ui/pom.xml Thu Feb 17 08:57:55 2011 @@ -261,7 +261,7 @@ META-INF - ${groupId}.${artifactId};singleton:=true + ${project.groupId}.${project.artifactId};singleton:=true plugin org.eclipse.core.runtime, org.eclipse.ui, @@ -338,8 +338,8 @@ provided - org.apache.directory.studio - org.apache.directory.shared.ldap + org.apache.directory.shared + shared-ldap provided Modified: directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/BrowserTest.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/BrowserTest.java?rev=1071551&r1=1071550&r2=1071551&view=diff ============================================================================== --- directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/BrowserTest.java (original) +++ directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/BrowserTest.java Thu Feb 17 08:57:55 2011 @@ -33,9 +33,9 @@ import org.apache.directory.server.annot import org.apache.directory.server.core.annotations.ApplyLdifFiles; import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; -import org.apache.directory.shared.ldap.entry.DefaultEntry; -import org.apache.directory.shared.ldap.entry.Entry; -import org.apache.directory.shared.ldap.name.DN; +import org.apache.directory.shared.ldap.model.entry.DefaultEntry; +import org.apache.directory.shared.ldap.model.entry.Entry; +import org.apache.directory.shared.ldap.model.name.Dn; import org.apache.directory.studio.connection.core.Connection; import org.apache.directory.studio.connection.core.Connection.ReferralHandlingMethod; import org.apache.directory.studio.ldapbrowser.core.BrowserCoreMessages; @@ -181,7 +181,7 @@ public class BrowserTest extends Abstrac IBrowserConnection browserConnection = BrowserCorePlugin.getDefault().getConnectionManager() .getBrowserConnection( connection ); browserConnection.getBookmarkManager().addBookmark( - new Bookmark( browserConnection, new DN( "uid=user.1,ou=users,ou=system" ), "Existing Bookmark" ) ); + new Bookmark( browserConnection, new Dn( "uid=user.1,ou=users,ou=system" ), "Existing Bookmark" ) ); // select the bookmark browserViewBot.selectEntry( "Bookmarks", "Existing Bookmark" ); @@ -214,7 +214,7 @@ public class BrowserTest extends Abstrac // add the entry directly in the server Entry entry = new DefaultEntry( service.getSchemaManager() ); - entry.setDn( new DN( "cn=refresh,ou=users,ou=system" ) ); + entry.setDn( new Dn( "cn=refresh,ou=users,ou=system" ) ); entry.add( "objectClass", "top", "person" ); entry.add( "cn", "refresh" ); entry.add( "sn", "refresh" ); @@ -233,7 +233,7 @@ public class BrowserTest extends Abstrac browserViewBot.selectEntry( "DIT", "Root DSE", "ou=system", "ou=users", "cn=refresh" ); // delete the entry directly in the server - ldapServer.getDirectoryService().getAdminSession().delete( new DN( "cn=refresh,ou=users,ou=system" ) ); + ldapServer.getDirectoryService().getAdminSession().delete( new Dn( "cn=refresh,ou=users,ou=system" ) ); // check the entry still is now visible in the tree assertTrue( browserViewBot.existsEntry( "DIT", "Root DSE", "ou=system", "ou=users", "cn=refresh" ) ); @@ -264,7 +264,7 @@ public class BrowserTest extends Abstrac // add the entry directly in the server Entry entry = new DefaultEntry( service.getSchemaManager() ); - entry.setDn( new DN( "cn=refresh,ou=users,ou=system" ) ); + entry.setDn( new Dn( "cn=refresh,ou=users,ou=system" ) ); entry.add( "objectClass", "top", "person" ); entry.add( "cn", "refresh" ); entry.add( "sn", "refresh" ); @@ -283,7 +283,7 @@ public class BrowserTest extends Abstrac browserViewBot.selectEntry( "DIT", "Root DSE", "ou=system", "ou=users", "cn=refresh" ); // delete the entry directly in the server - ldapServer.getDirectoryService().getAdminSession().delete( new DN( "cn=refresh,ou=users,ou=system" ) ); + ldapServer.getDirectoryService().getAdminSession().delete( new Dn( "cn=refresh,ou=users,ou=system" ) ); // check the entry still is now visible in the tree assertTrue( browserViewBot.existsEntry( "DIT", "Root DSE", "ou=system", "ou=users", "cn=refresh" ) ); @@ -314,7 +314,7 @@ public class BrowserTest extends Abstrac // add the entry directly in the server Entry entry = new DefaultEntry( service.getSchemaManager() ); - entry.setDn( new DN( "cn=refresh,ou=users,ou=system" ) ); + entry.setDn( new Dn( "cn=refresh,ou=users,ou=system" ) ); entry.add( "objectClass", "top", "person" ); entry.add( "cn", "refresh" ); entry.add( "sn", "refresh" ); @@ -333,7 +333,7 @@ public class BrowserTest extends Abstrac browserViewBot.selectEntry( "DIT", "Root DSE", "ou=system", "ou=users", "cn=refresh" ); // delete the entry directly in the server - ldapServer.getDirectoryService().getAdminSession().delete( new DN( "cn=refresh,ou=users,ou=system" ) ); + ldapServer.getDirectoryService().getAdminSession().delete( new Dn( "cn=refresh,ou=users,ou=system" ) ); // check the entry still is now visible in the tree assertTrue( browserViewBot.existsEntry( "DIT", "Root DSE", "ou=system", "ou=users", "cn=refresh" ) ); @@ -361,7 +361,7 @@ public class BrowserTest extends Abstrac // preparation: add referral entry and set referral handling String url = "ldap://localhost:" + ldapServer.getPort() + "/ou=users,ou=system"; Entry refEntry = new DefaultEntry( service.getSchemaManager() ); - refEntry.setDn( new DN( "cn=referral,ou=system" ) ); + refEntry.setDn( new Dn( "cn=referral,ou=system" ) ); refEntry.add( "objectClass", "top", "referral", "extensibleObject" ); refEntry.add( "cn", "referral" ); refEntry.add( "ref", url ); @@ -380,7 +380,7 @@ public class BrowserTest extends Abstrac // add the entry directly in the server Entry entry = new DefaultEntry( service.getSchemaManager() ); - entry.setDn( new DN( "cn=refresh,ou=users,ou=system" ) ); + entry.setDn( new Dn( "cn=refresh,ou=users,ou=system" ) ); entry.add( "objectClass", "top", "person" ); entry.add( "cn", "refresh" ); entry.add( "sn", "refresh" ); @@ -399,7 +399,7 @@ public class BrowserTest extends Abstrac browserViewBot.selectEntry( "DIT", "Root DSE", "ou=system", url, "cn=refresh" ); // delete the entry directly in the server - ldapServer.getDirectoryService().getAdminSession().delete( new DN( "cn=refresh,ou=users,ou=system" ) ); + ldapServer.getDirectoryService().getAdminSession().delete( new Dn( "cn=refresh,ou=users,ou=system" ) ); // check the entry still is now visible in the tree assertTrue( browserViewBot.existsEntry( "DIT", "Root DSE", "ou=system", url, "cn=refresh" ) ); @@ -485,7 +485,7 @@ public class BrowserTest extends Abstrac // create entry with multi-valued RDN containing an IP address value Entry entry = new DefaultEntry( service.getSchemaManager() ); - entry.setDn( new DN( "cn=loopback+ipHostNumber=127.0.0.1,ou=users,ou=system" ) ); + entry.setDn( new Dn( "cn=loopback+ipHostNumber=127.0.0.1,ou=users,ou=system" ) ); entry.add( "objectClass", "top", "device", "ipHost" ); entry.add( "cn", "loopback" ); entry.add( "ipHostNumber", "127.0.0.1" ); @@ -511,7 +511,7 @@ public class BrowserTest extends Abstrac IBrowserConnection browserConnection = BrowserCorePlugin.getDefault().getConnectionManager() .getBrowserConnection( connection ); browserConnection.getBookmarkManager().addBookmark( - new Bookmark( browserConnection, new DN( "uid=user.2,ou=users,ou=system" ), "My Bookmark" ) ); + new Bookmark( browserConnection, new Dn( "uid=user.2,ou=users,ou=system" ), "My Bookmark" ) ); // copy a value browserViewBot.selectEntry( "DIT", "Root DSE", "ou=system", "ou=users", "uid=user.1" ); @@ -536,7 +536,7 @@ public class BrowserTest extends Abstrac // assert pasted value was written to directory Entry entry = ldapServer.getDirectoryService().getAdminSession().lookup( - new DN( "uid=user.2,ou=users,ou=system" ) ); + new Dn( "uid=user.2,ou=users,ou=system" ) ); assertTrue( entry.contains( "uid", "user.1" ) ); } Modified: directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/EntryEditorTest.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/EntryEditorTest.java?rev=1071551&r1=1071550&r2=1071551&view=diff ============================================================================== --- directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/EntryEditorTest.java (original) +++ directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/EntryEditorTest.java Thu Feb 17 08:57:55 2011 @@ -32,8 +32,8 @@ import org.apache.directory.server.annot import org.apache.directory.server.core.annotations.ApplyLdifFiles; import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; -import org.apache.directory.shared.ldap.entry.Entry; -import org.apache.directory.shared.ldap.name.DN; +import org.apache.directory.shared.ldap.model.entry.Entry; +import org.apache.directory.shared.ldap.model.name.Dn; import org.apache.directory.studio.ldapbrowser.core.BrowserCoreMessages; import org.apache.directory.studio.test.integration.ui.bots.BrowserViewBot; import org.apache.directory.studio.test.integration.ui.bots.ConnectionsViewBot; @@ -250,7 +250,7 @@ public class EntryEditorTest extends Abs // assert pasted value was written to directory Entry entry = ldapServer.getDirectoryService().getAdminSession() - .lookup( new DN( "cn=\\#\\\\\\+\\, \\\"\u00F6\u00E9\\\",ou=users,ou=system" ) ); + .lookup( new Dn( "cn=\\#\\\\\\+\\, \\\"\u00F6\u00E9\\\",ou=users,ou=system" ) ); assertTrue( entry.contains( "uid", "bjensen" ) ); } Modified: directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ImportExportTest.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ImportExportTest.java?rev=1071551&r1=1071550&r2=1071551&view=diff ============================================================================== --- directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ImportExportTest.java (original) +++ directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ImportExportTest.java Thu Feb 17 08:57:55 2011 @@ -39,7 +39,7 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.server.core.partition.Partition; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition; -import org.apache.directory.shared.ldap.name.DN; +import org.apache.directory.shared.ldap.model.name.Dn; import org.apache.directory.studio.ldapbrowser.core.events.EventRegistry; import org.apache.directory.studio.test.integration.ui.bots.BrowserViewBot; import org.apache.directory.studio.test.integration.ui.bots.ConnectionsViewBot; @@ -206,7 +206,7 @@ public class ImportExportTest extends Ab // add a new partition Partition partition = new JdbmPartition(); partition.setId( "example" ); - partition.setSuffix( new DN( "dc=example,dc=com" ) ); + partition.setSuffix( new Dn( "dc=example,dc=com" ) ); ldapServer.getDirectoryService().addPartition( partition ); // refresh root DSE and ensure that the partition is in root DSE Modified: directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewConnectionWizardTest.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewConnectionWizardTest.java?rev=1071551&r1=1071550&r2=1071551&view=diff ============================================================================== --- directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewConnectionWizardTest.java (original) +++ directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewConnectionWizardTest.java Thu Feb 17 08:57:55 2011 @@ -50,11 +50,11 @@ import org.apache.directory.server.annot import org.apache.directory.server.core.CoreSession; import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; -import org.apache.directory.shared.ldap.entry.Entry; -import org.apache.directory.shared.ldap.entry.Modification; -import org.apache.directory.shared.ldap.message.ModifyRequest; -import org.apache.directory.shared.ldap.message.ModifyRequestImpl; -import org.apache.directory.shared.ldap.name.DN; +import org.apache.directory.shared.ldap.model.entry.Entry; +import org.apache.directory.shared.ldap.model.entry.Modification; +import org.apache.directory.shared.ldap.model.message.ModifyRequest; +import org.apache.directory.shared.ldap.model.message.ModifyRequestImpl; +import org.apache.directory.shared.ldap.model.name.Dn; import org.apache.directory.studio.connection.core.Connection; import org.apache.directory.studio.connection.core.ConnectionCorePlugin; import org.apache.directory.studio.connection.core.ConnectionManager; @@ -1088,7 +1088,7 @@ public class NewConnectionWizardTest ext private void updateCertificate( String issuerDN, String subjectDN, Date startDate, Date expiryDate ) throws Exception { - DN dn = new DN( PRINCIPAL ); + Dn dn = new Dn( PRINCIPAL ); List modifications = new ArrayList(); // Get old key algorithm @@ -1145,7 +1145,7 @@ public class NewConnectionWizardTest ext ksFile = File.createTempFile( "testStore", "ks" ); CoreSession session = ldapServer.getDirectoryService().getAdminSession(); - Entry entry = session.lookup( new DN( "uid=admin,ou=system" ), new String[] + Entry entry = session.lookup( new Dn( "uid=admin,ou=system" ), new String[] { USER_CERTIFICATE_AT } ); byte[] userCertificate = entry.get( USER_CERTIFICATE_AT ).getBytes(); assertNotNull( userCertificate ); Modified: directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewEntryWizardTest.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewEntryWizardTest.java?rev=1071551&r1=1071550&r2=1071551&view=diff ============================================================================== --- directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewEntryWizardTest.java (original) +++ directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewEntryWizardTest.java Thu Feb 17 08:57:55 2011 @@ -29,9 +29,9 @@ import org.apache.directory.server.annot import org.apache.directory.server.annotations.CreateTransport; import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; -import org.apache.directory.shared.ldap.entry.DefaultEntry; -import org.apache.directory.shared.ldap.entry.Entry; -import org.apache.directory.shared.ldap.name.DN; +import org.apache.directory.shared.ldap.model.entry.DefaultEntry; +import org.apache.directory.shared.ldap.model.entry.Entry; +import org.apache.directory.shared.ldap.model.name.Dn; import org.apache.directory.studio.connection.core.Connection; import org.apache.directory.studio.connection.core.Connection.ReferralHandlingMethod; import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection; @@ -77,7 +77,7 @@ public class NewEntryWizardTest extends // create referral entry Entry entry = new DefaultEntry( service.getSchemaManager() ); - entry.setDn( new DN( "cn=referral,ou=system" ) ); + entry.setDn( new Dn( "cn=referral,ou=system" ) ); entry.add( "objectClass", "top", "referral", "extensibleObject" ); entry.add( "cn", "referralDialogTest" ); entry.add( "ref", "ldap://localhost:" + ldapServer.getPort() + "/ou=users,ou=system" ); Modified: directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ReferralDialogTest.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ReferralDialogTest.java?rev=1071551&r1=1071550&r2=1071551&view=diff ============================================================================== --- directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ReferralDialogTest.java (original) +++ directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ReferralDialogTest.java Thu Feb 17 08:57:55 2011 @@ -29,9 +29,9 @@ import org.apache.directory.server.annot import org.apache.directory.server.annotations.CreateTransport; import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; -import org.apache.directory.shared.ldap.entry.DefaultEntry; -import org.apache.directory.shared.ldap.entry.Entry; -import org.apache.directory.shared.ldap.name.DN; +import org.apache.directory.shared.ldap.model.entry.DefaultEntry; +import org.apache.directory.shared.ldap.model.entry.Entry; +import org.apache.directory.shared.ldap.model.name.Dn; import org.apache.directory.studio.connection.core.Connection; import org.apache.directory.studio.connection.core.Connection.ReferralHandlingMethod; import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection; @@ -78,7 +78,7 @@ public class ReferralDialogTest extends // create referral entry Entry entry = new DefaultEntry( service.getSchemaManager() ); - entry.setDn( new DN( "cn=referralDialogTest,ou=system" ) ); + entry.setDn( new Dn( "cn=referralDialogTest,ou=system" ) ); entry.add( "objectClass", "top", "referral", "extensibleObject" ); entry.add( "cn", "referralDialogTest" ); entry.add( "ref", "ldap://localhost:" + ldapServer.getPort() + "/ou=users,ou=system" ); Modified: directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/SearchTest.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/SearchTest.java?rev=1071551&r1=1071550&r2=1071551&view=diff ============================================================================== --- directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/SearchTest.java (original) +++ directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/SearchTest.java Thu Feb 17 08:57:55 2011 @@ -28,9 +28,9 @@ import org.apache.directory.server.annot import org.apache.directory.server.annotations.CreateTransport; import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; -import org.apache.directory.shared.ldap.message.ModifyRequest; -import org.apache.directory.shared.ldap.message.ModifyRequestImpl; -import org.apache.directory.shared.ldap.name.DN; +import org.apache.directory.shared.ldap.model.message.ModifyRequest; +import org.apache.directory.shared.ldap.model.message.ModifyRequestImpl; +import org.apache.directory.shared.ldap.model.name.Dn; import org.apache.directory.studio.connection.core.Connection; import org.apache.directory.studio.ldapbrowser.core.BrowserConnectionManager; import org.apache.directory.studio.ldapbrowser.core.BrowserCorePlugin; @@ -195,7 +195,7 @@ public class SearchTest extends Abstract // add description ModifyRequest request = new ModifyRequestImpl(); - request.setName( new DN( "uid=admin,ou=system" ) ); + request.setName( new Dn( "uid=admin,ou=system" ) ); request.replace( "description", "The 1st description." ); ldapServer.getDirectoryService().getAdminSession().modify( request ); Modified: directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/NewEntryWizardBot.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/NewEntryWizardBot.java?rev=1071551&r1=1071550&r2=1071551&view=diff ============================================================================== --- directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/NewEntryWizardBot.java (original) +++ directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/NewEntryWizardBot.java Thu Feb 17 08:57:55 2011 @@ -19,8 +19,9 @@ */ package org.apache.directory.studio.test.integration.ui.bots; +import org.apache.directory.shared.ldap.model.name.Dn; + -import org.apache.directory.shared.ldap.name.DN; public class NewEntryWizardBot extends WizardBot @@ -106,7 +107,7 @@ public class NewEntryWizardBot extends W for ( int i = 0;; i++ ) { String text = bot.text( 1 ).getText(); - if ( DN.isValid( text ) ) + if ( Dn.isValid( text ) ) { return text; }