Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 39777 invoked from network); 24 Jan 2011 02:51:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 24 Jan 2011 02:51:38 -0000 Received: (qmail 52798 invoked by uid 500); 24 Jan 2011 02:51:38 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 52746 invoked by uid 500); 24 Jan 2011 02:51:38 -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 52739 invoked by uid 99); 24 Jan 2011 02:51:38 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Jan 2011 02:51:38 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Mon, 24 Jan 2011 02:51:30 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CFE002388C1C; Mon, 24 Jan 2011 02:50:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1062611 [10/10] - in /directory: apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/ apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/ apacheds/trunk/core-api/src/main/java/org/apac... Date: Mon, 24 Jan 2011 02:50:27 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110124025037.CFE002388C1C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/LdapSyntaxDescriptionPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/LdapSyntaxDescriptionPage.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/LdapSyntaxDescriptionPage.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/LdapSyntaxDescriptionPage.java Mon Jan 24 02:50:09 2011 @@ -21,7 +21,7 @@ package org.apache.directory.studio.ldapbrowser.ui.editors.schemabrowser; -import org.apache.directory.shared.ldap.schema.LdapSyntax; +import org.apache.directory.shared.ldap.model.schema.LdapSyntax; import org.apache.directory.studio.ldapbrowser.core.model.schema.Schema; import org.apache.directory.studio.ldapbrowser.core.model.schema.SchemaUtils; import org.eclipse.jface.viewers.IStructuredContentProvider; Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleDescriptionDetailsPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleDescriptionDetailsPage.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleDescriptionDetailsPage.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleDescriptionDetailsPage.java Mon Jan 24 02:50:09 2011 @@ -23,9 +23,9 @@ package org.apache.directory.studio.ldap import java.util.Collection; -import org.apache.directory.shared.ldap.schema.AttributeType; -import org.apache.directory.shared.ldap.schema.LdapSyntax; -import org.apache.directory.shared.ldap.schema.MatchingRule; +import org.apache.directory.shared.ldap.model.schema.AttributeType; +import org.apache.directory.shared.ldap.model.schema.LdapSyntax; +import org.apache.directory.shared.ldap.model.schema.MatchingRule; import org.apache.directory.studio.ldapbrowser.core.model.schema.Schema; import org.apache.directory.studio.ldapbrowser.core.model.schema.SchemaUtils; import org.eclipse.osgi.util.NLS; Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleDescriptionPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleDescriptionPage.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleDescriptionPage.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleDescriptionPage.java Mon Jan 24 02:50:09 2011 @@ -21,7 +21,7 @@ package org.apache.directory.studio.ldapbrowser.ui.editors.schemabrowser; -import org.apache.directory.shared.ldap.schema.MatchingRule; +import org.apache.directory.shared.ldap.model.schema.MatchingRule; import org.apache.directory.studio.ldapbrowser.core.model.schema.Schema; import org.apache.directory.studio.ldapbrowser.core.model.schema.SchemaUtils; import org.eclipse.jface.viewers.IStructuredContentProvider; Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleUseDescriptionDetailsPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleUseDescriptionDetailsPage.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleUseDescriptionDetailsPage.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleUseDescriptionDetailsPage.java Mon Jan 24 02:50:09 2011 @@ -23,9 +23,9 @@ package org.apache.directory.studio.ldap import java.util.List; -import org.apache.directory.shared.ldap.schema.AttributeType; -import org.apache.directory.shared.ldap.schema.MatchingRule; -import org.apache.directory.shared.ldap.schema.MatchingRuleUse; +import org.apache.directory.shared.ldap.model.schema.AttributeType; +import org.apache.directory.shared.ldap.model.schema.MatchingRule; +import org.apache.directory.shared.ldap.model.schema.MatchingRuleUse; import org.apache.directory.studio.ldapbrowser.core.model.schema.Schema; import org.apache.directory.studio.ldapbrowser.core.model.schema.SchemaUtils; import org.eclipse.osgi.util.NLS; Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleUseDescriptionPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleUseDescriptionPage.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleUseDescriptionPage.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleUseDescriptionPage.java Mon Jan 24 02:50:09 2011 @@ -21,7 +21,7 @@ package org.apache.directory.studio.ldapbrowser.ui.editors.schemabrowser; -import org.apache.directory.shared.ldap.schema.MatchingRuleUse; +import org.apache.directory.shared.ldap.model.schema.MatchingRuleUse; import org.apache.directory.studio.ldapbrowser.core.model.schema.Schema; import org.apache.directory.studio.ldapbrowser.core.model.schema.SchemaUtils; import org.eclipse.jface.viewers.IStructuredContentProvider; Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/ObjectClassDescriptionDetailsPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/ObjectClassDescriptionDetailsPage.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/ObjectClassDescriptionDetailsPage.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/ObjectClassDescriptionDetailsPage.java Mon Jan 24 02:50:09 2011 @@ -24,8 +24,8 @@ package org.apache.directory.studio.ldap import java.util.Collection; import java.util.List; -import org.apache.directory.shared.ldap.schema.AttributeType; -import org.apache.directory.shared.ldap.schema.ObjectClass; +import org.apache.directory.shared.ldap.model.schema.AttributeType; +import org.apache.directory.shared.ldap.model.schema.ObjectClass; import org.apache.directory.studio.ldapbrowser.core.model.schema.SchemaUtils; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/ObjectClassDescriptionPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/ObjectClassDescriptionPage.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/ObjectClassDescriptionPage.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/ObjectClassDescriptionPage.java Mon Jan 24 02:50:09 2011 @@ -21,7 +21,7 @@ package org.apache.directory.studio.ldapbrowser.ui.editors.schemabrowser; -import org.apache.directory.shared.ldap.schema.ObjectClass; +import org.apache.directory.shared.ldap.model.schema.ObjectClass; import org.apache.directory.studio.ldapbrowser.core.model.schema.Schema; import org.apache.directory.studio.ldapbrowser.core.model.schema.SchemaUtils; import org.eclipse.jface.viewers.IStructuredContentProvider; Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowser.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowser.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowser.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowser.java Mon Jan 24 02:50:09 2011 @@ -21,12 +21,12 @@ package org.apache.directory.studio.ldapbrowser.ui.editors.schemabrowser; -import org.apache.directory.shared.ldap.schema.AbstractSchemaObject; -import org.apache.directory.shared.ldap.schema.AttributeType; -import org.apache.directory.shared.ldap.schema.LdapSyntax; -import org.apache.directory.shared.ldap.schema.MatchingRule; -import org.apache.directory.shared.ldap.schema.MatchingRuleUse; -import org.apache.directory.shared.ldap.schema.ObjectClass; +import org.apache.directory.shared.ldap.model.schema.AbstractSchemaObject; +import org.apache.directory.shared.ldap.model.schema.AttributeType; +import org.apache.directory.shared.ldap.model.schema.LdapSyntax; +import org.apache.directory.shared.ldap.model.schema.MatchingRule; +import org.apache.directory.shared.ldap.model.schema.MatchingRuleUse; +import org.apache.directory.shared.ldap.model.schema.ObjectClass; import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection; import org.apache.directory.studio.ldapbrowser.ui.BrowserUIConstants; import org.apache.directory.studio.ldapbrowser.ui.BrowserUIPlugin; Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowserInput.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowserInput.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowserInput.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowserInput.java Mon Jan 24 02:50:09 2011 @@ -21,7 +21,7 @@ package org.apache.directory.studio.ldapbrowser.ui.editors.schemabrowser; -import org.apache.directory.shared.ldap.schema.AbstractSchemaObject; +import org.apache.directory.shared.ldap.model.schema.AbstractSchemaObject; import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection; import org.apache.directory.studio.ldapbrowser.ui.BrowserUIConstants; import org.apache.directory.studio.ldapbrowser.ui.BrowserUIPlugin; Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowserManager.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowserManager.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowserManager.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowserManager.java Mon Jan 24 02:50:09 2011 @@ -21,7 +21,7 @@ package org.apache.directory.studio.ldapbrowser.ui.editors.schemabrowser; -import org.apache.directory.shared.ldap.schema.AbstractSchemaObject; +import org.apache.directory.shared.ldap.model.schema.AbstractSchemaObject; import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection; import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowserNavigationLocation.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowserNavigationLocation.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowserNavigationLocation.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowserNavigationLocation.java Mon Jan 24 02:50:09 2011 @@ -21,12 +21,12 @@ package org.apache.directory.studio.ldapbrowser.ui.editors.schemabrowser; -import org.apache.directory.shared.ldap.schema.AbstractSchemaObject; -import org.apache.directory.shared.ldap.schema.AttributeType; -import org.apache.directory.shared.ldap.schema.LdapSyntax; -import org.apache.directory.shared.ldap.schema.MatchingRule; -import org.apache.directory.shared.ldap.schema.MatchingRuleUse; -import org.apache.directory.shared.ldap.schema.ObjectClass; +import org.apache.directory.shared.ldap.model.schema.AbstractSchemaObject; +import org.apache.directory.shared.ldap.model.schema.AttributeType; +import org.apache.directory.shared.ldap.model.schema.LdapSyntax; +import org.apache.directory.shared.ldap.model.schema.MatchingRule; +import org.apache.directory.shared.ldap.model.schema.MatchingRuleUse; +import org.apache.directory.shared.ldap.model.schema.ObjectClass; import org.apache.directory.studio.ldapbrowser.core.BrowserCorePlugin; import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection; import org.apache.directory.studio.ldapbrowser.core.model.schema.SchemaUtils; Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaDetailsPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaDetailsPage.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaDetailsPage.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaDetailsPage.java Mon Jan 24 02:50:09 2011 @@ -23,7 +23,7 @@ package org.apache.directory.studio.ldap import java.util.List; -import org.apache.directory.shared.ldap.schema.AbstractSchemaObject; +import org.apache.directory.shared.ldap.model.schema.AbstractSchemaObject; import org.apache.directory.studio.ldapbrowser.core.model.schema.Schema; import org.apache.directory.studio.ldapbrowser.core.model.schema.SchemaUtils; import org.eclipse.swt.SWT; Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaPage.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaPage.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaPage.java Mon Jan 24 02:50:09 2011 @@ -21,7 +21,7 @@ package org.apache.directory.studio.ldapbrowser.ui.editors.schemabrowser; -import org.apache.directory.shared.ldap.schema.AbstractSchemaObject; +import org.apache.directory.shared.ldap.model.schema.AbstractSchemaObject; import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection; import org.apache.directory.studio.ldapbrowser.core.model.schema.Schema; import org.eclipse.jface.action.Separator; Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenBestEditorAction.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenBestEditorAction.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenBestEditorAction.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenBestEditorAction.java Mon Jan 24 02:50:09 2011 @@ -23,7 +23,7 @@ package org.apache.directory.studio.ldap import java.util.Collection; -import org.apache.directory.shared.ldap.schema.AttributeType; +import org.apache.directory.shared.ldap.model.schema.AttributeType; import org.apache.directory.studio.ldapbrowser.core.BrowserCoreConstants; import org.apache.directory.studio.ldapbrowser.core.model.AttributeHierarchy; import org.apache.directory.studio.ldapbrowser.core.model.IEntry; Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/ProblemsViewController.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/ProblemsViewController.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/ProblemsViewController.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/ProblemsViewController.java Mon Jan 24 02:50:09 2011 @@ -20,7 +20,7 @@ package org.apache.directory.studio.schemaeditor.controller; -import org.apache.directory.shared.ldap.schema.SchemaObject; +import org.apache.directory.shared.ldap.model.schema.SchemaObject; import org.apache.directory.studio.schemaeditor.Activator; import org.apache.directory.studio.schemaeditor.PluginUtils; import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl; Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandler.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandler.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandler.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandler.java Mon Jan 24 02:50:09 2011 @@ -25,7 +25,7 @@ import java.util.List; import org.apache.commons.collections.MultiMap; import org.apache.commons.collections.map.MultiValueMap; -import org.apache.directory.shared.ldap.schema.SchemaObject; +import org.apache.directory.shared.ldap.model.schema.SchemaObject; import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl; import org.apache.directory.studio.schemaeditor.model.MatchingRuleImpl; import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl; Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/DeleteSchemaElementAction.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/DeleteSchemaElementAction.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/DeleteSchemaElementAction.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/DeleteSchemaElementAction.java Mon Jan 24 02:50:09 2011 @@ -26,7 +26,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.directory.shared.ldap.schema.SchemaObject; +import org.apache.directory.shared.ldap.model.schema.SchemaObject; import org.apache.directory.studio.schemaeditor.Activator; import org.apache.directory.studio.schemaeditor.PluginConstants; import org.apache.directory.studio.schemaeditor.controller.SchemaHandler; Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/LinkWithEditorHierarchyViewAction.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/LinkWithEditorHierarchyViewAction.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/LinkWithEditorHierarchyViewAction.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/LinkWithEditorHierarchyViewAction.java Mon Jan 24 02:50:09 2011 @@ -20,7 +20,7 @@ package org.apache.directory.studio.schemaeditor.controller.actions; -import org.apache.directory.shared.ldap.schema.SchemaObject; +import org.apache.directory.shared.ldap.model.schema.SchemaObject; import org.apache.directory.studio.schemaeditor.Activator; import org.apache.directory.studio.schemaeditor.PluginConstants; import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl; Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenTypeHierarchyAction.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenTypeHierarchyAction.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenTypeHierarchyAction.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenTypeHierarchyAction.java Mon Jan 24 02:50:09 2011 @@ -20,7 +20,7 @@ package org.apache.directory.studio.schemaeditor.controller.actions; -import org.apache.directory.shared.ldap.schema.SchemaObject; +import org.apache.directory.shared.ldap.model.schema.SchemaObject; import org.apache.directory.studio.schemaeditor.PluginConstants; import org.apache.directory.studio.schemaeditor.PluginUtils; import org.apache.directory.studio.schemaeditor.view.ViewUtils; Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/AttributeTypeImpl.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/AttributeTypeImpl.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/AttributeTypeImpl.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/AttributeTypeImpl.java Mon Jan 24 02:50:09 2011 @@ -20,7 +20,7 @@ package org.apache.directory.studio.schemaeditor.model; -import org.apache.directory.shared.ldap.schema.AttributeType; +import org.apache.directory.shared.ldap.model.schema.AttributeType; /** Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/DependenciesComputer.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/DependenciesComputer.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/DependenciesComputer.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/DependenciesComputer.java Mon Jan 24 02:50:09 2011 @@ -27,7 +27,7 @@ import java.util.List; import org.apache.commons.collections.MultiMap; import org.apache.commons.collections.map.MultiValueMap; -import org.apache.directory.shared.ldap.schema.SchemaObject; +import org.apache.directory.shared.ldap.model.schema.SchemaObject; import org.apache.directory.studio.schemaeditor.controller.SchemaHandler; import org.eclipse.osgi.util.NLS; Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/MatchingRuleImpl.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/MatchingRuleImpl.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/MatchingRuleImpl.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/MatchingRuleImpl.java Mon Jan 24 02:50:09 2011 @@ -20,7 +20,7 @@ package org.apache.directory.studio.schemaeditor.model; -import org.apache.directory.shared.ldap.schema.MatchingRule; +import org.apache.directory.shared.ldap.model.schema.MatchingRule; /** Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/ObjectClassImpl.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/ObjectClassImpl.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/ObjectClassImpl.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/ObjectClassImpl.java Mon Jan 24 02:50:09 2011 @@ -20,7 +20,7 @@ package org.apache.directory.studio.schemaeditor.model; -import org.apache.directory.shared.ldap.schema.ObjectClass; +import org.apache.directory.shared.ldap.model.schema.ObjectClass; /** Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/SyntaxImpl.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/SyntaxImpl.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/SyntaxImpl.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/SyntaxImpl.java Mon Jan 24 02:50:09 2011 @@ -20,7 +20,7 @@ package org.apache.directory.studio.schemaeditor.model; -import org.apache.directory.shared.ldap.schema.LdapSyntax; +import org.apache.directory.shared.ldap.model.schema.LdapSyntax; /** Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/difference/DifferenceEngine.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/difference/DifferenceEngine.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/difference/DifferenceEngine.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/difference/DifferenceEngine.java Mon Jan 24 02:50:09 2011 @@ -25,9 +25,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.directory.shared.ldap.schema.ObjectClassTypeEnum; -import org.apache.directory.shared.ldap.schema.SchemaObject; -import org.apache.directory.shared.ldap.schema.UsageEnum; +import org.apache.directory.shared.ldap.model.schema.ObjectClassTypeEnum; +import org.apache.directory.shared.ldap.model.schema.SchemaObject; +import org.apache.directory.shared.ldap.model.schema.UsageEnum; import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl; import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl; import org.apache.directory.studio.schemaeditor.model.Schema; Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/hierarchy/HierarchyManager.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/hierarchy/HierarchyManager.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/hierarchy/HierarchyManager.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/hierarchy/HierarchyManager.java Mon Jan 24 02:50:09 2011 @@ -23,7 +23,7 @@ package org.apache.directory.studio.sche import java.util.List; import org.apache.commons.collections.map.MultiValueMap; -import org.apache.directory.shared.ldap.schema.SchemaObject; +import org.apache.directory.shared.ldap.model.schema.SchemaObject; import org.apache.directory.studio.schemaeditor.Activator; import org.apache.directory.studio.schemaeditor.controller.SchemaHandler; import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl; Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java Mon Jan 24 02:50:09 2011 @@ -29,8 +29,8 @@ import javax.naming.directory.Attribute; import javax.naming.directory.SearchControls; import javax.naming.directory.SearchResult; -import org.apache.directory.shared.ldap.schema.ObjectClassTypeEnum; -import org.apache.directory.shared.ldap.schema.UsageEnum; +import org.apache.directory.shared.ldap.model.schema.ObjectClassTypeEnum; +import org.apache.directory.shared.ldap.model.schema.UsageEnum; import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor; import org.apache.directory.studio.connection.core.Connection; import org.apache.directory.studio.connection.core.Connection.AliasDereferencingMethod; Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java Mon Jan 24 02:50:09 2011 @@ -30,10 +30,10 @@ import javax.naming.directory.Attribute; import javax.naming.directory.SearchControls; import javax.naming.directory.SearchResult; -import org.apache.directory.shared.ldap.schema.AttributeType; -import org.apache.directory.shared.ldap.schema.LdapSyntax; -import org.apache.directory.shared.ldap.schema.MatchingRule; -import org.apache.directory.shared.ldap.schema.ObjectClass; +import org.apache.directory.shared.ldap.model.schema.AttributeType; +import org.apache.directory.shared.ldap.model.schema.LdapSyntax; +import org.apache.directory.shared.ldap.model.schema.MatchingRule; +import org.apache.directory.shared.ldap.model.schema.ObjectClass; import org.apache.directory.shared.ldap.schema.parsers.AttributeTypeDescriptionSchemaParser; import org.apache.directory.shared.ldap.schema.parsers.LdapSyntaxDescriptionSchemaParser; import org.apache.directory.shared.ldap.schema.parsers.MatchingRuleDescriptionSchemaParser; Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileExporter.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileExporter.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileExporter.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileExporter.java Mon Jan 24 02:50:09 2011 @@ -22,8 +22,8 @@ package org.apache.directory.studio.sche import java.util.List; -import org.apache.directory.shared.ldap.schema.ObjectClassTypeEnum; -import org.apache.directory.shared.ldap.schema.UsageEnum; +import org.apache.directory.shared.ldap.model.schema.ObjectClassTypeEnum; +import org.apache.directory.shared.ldap.model.schema.UsageEnum; import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl; import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl; import org.apache.directory.studio.schemaeditor.model.Schema; Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java Mon Jan 24 02:50:09 2011 @@ -29,8 +29,8 @@ import java.util.List; import java.util.Scanner; import java.util.regex.MatchResult; -import org.apache.directory.shared.ldap.schema.AttributeType; -import org.apache.directory.shared.ldap.schema.ObjectClass; +import org.apache.directory.shared.ldap.model.schema.AttributeType; +import org.apache.directory.shared.ldap.model.schema.ObjectClass; import org.apache.directory.shared.ldap.schema.parsers.OpenLdapSchemaParser; import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl; import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl; Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java Mon Jan 24 02:50:09 2011 @@ -25,8 +25,8 @@ import java.io.IOException; import java.io.OutputStream; import java.util.List; -import org.apache.directory.shared.ldap.schema.ObjectClassTypeEnum; -import org.apache.directory.shared.ldap.schema.UsageEnum; +import org.apache.directory.shared.ldap.model.schema.ObjectClassTypeEnum; +import org.apache.directory.shared.ldap.model.schema.UsageEnum; import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl; import org.apache.directory.studio.schemaeditor.model.MatchingRuleImpl; import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl; Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java Mon Jan 24 02:50:09 2011 @@ -26,8 +26,8 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.apache.directory.shared.ldap.schema.ObjectClassTypeEnum; -import org.apache.directory.shared.ldap.schema.UsageEnum; +import org.apache.directory.shared.ldap.model.schema.ObjectClassTypeEnum; +import org.apache.directory.shared.ldap.model.schema.UsageEnum; import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl; import org.apache.directory.studio.schemaeditor.model.MatchingRuleImpl; import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl; Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/ClassTypeHierarchyError.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/ClassTypeHierarchyError.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/ClassTypeHierarchyError.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/ClassTypeHierarchyError.java Mon Jan 24 02:50:09 2011 @@ -20,7 +20,7 @@ package org.apache.directory.studio.schemaeditor.model.schemachecker; -import org.apache.directory.shared.ldap.schema.SchemaObject; +import org.apache.directory.shared.ldap.model.schema.SchemaObject; /** Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/DifferentCollectiveAsSuperiorError.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/DifferentCollectiveAsSuperiorError.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/DifferentCollectiveAsSuperiorError.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/DifferentCollectiveAsSuperiorError.java Mon Jan 24 02:50:09 2011 @@ -20,7 +20,7 @@ package org.apache.directory.studio.schemaeditor.model.schemachecker; -import org.apache.directory.shared.ldap.schema.SchemaObject; +import org.apache.directory.shared.ldap.model.schema.SchemaObject; /** Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/DifferentUsageAsSuperiorError.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/DifferentUsageAsSuperiorError.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/DifferentUsageAsSuperiorError.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/DifferentUsageAsSuperiorError.java Mon Jan 24 02:50:09 2011 @@ -20,7 +20,7 @@ package org.apache.directory.studio.schemaeditor.model.schemachecker; -import org.apache.directory.shared.ldap.schema.SchemaObject; +import org.apache.directory.shared.ldap.model.schema.SchemaObject; /** Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/DuplicateAliasError.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/DuplicateAliasError.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/DuplicateAliasError.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/DuplicateAliasError.java Mon Jan 24 02:50:09 2011 @@ -20,7 +20,7 @@ package org.apache.directory.studio.schemaeditor.model.schemachecker; -import org.apache.directory.shared.ldap.schema.SchemaObject; +import org.apache.directory.shared.ldap.model.schema.SchemaObject; /** Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/DuplicateOidError.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/DuplicateOidError.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/DuplicateOidError.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/DuplicateOidError.java Mon Jan 24 02:50:09 2011 @@ -20,7 +20,7 @@ package org.apache.directory.studio.schemaeditor.model.schemachecker; -import org.apache.directory.shared.ldap.schema.SchemaObject; +import org.apache.directory.shared.ldap.model.schema.SchemaObject; /** Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/NoAliasWarning.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/NoAliasWarning.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/NoAliasWarning.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/NoAliasWarning.java Mon Jan 24 02:50:09 2011 @@ -20,7 +20,7 @@ package org.apache.directory.studio.schemaeditor.model.schemachecker; -import org.apache.directory.shared.ldap.schema.SchemaObject; +import org.apache.directory.shared.ldap.model.schema.SchemaObject; /** Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/NonExistingATSuperiorError.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/NonExistingATSuperiorError.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/NonExistingATSuperiorError.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/NonExistingATSuperiorError.java Mon Jan 24 02:50:09 2011 @@ -20,7 +20,7 @@ package org.apache.directory.studio.schemaeditor.model.schemachecker; -import org.apache.directory.shared.ldap.schema.SchemaObject; +import org.apache.directory.shared.ldap.model.schema.SchemaObject; /** Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/NonExistingMandatoryATError.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/NonExistingMandatoryATError.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/NonExistingMandatoryATError.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/NonExistingMandatoryATError.java Mon Jan 24 02:50:09 2011 @@ -20,7 +20,7 @@ package org.apache.directory.studio.schemaeditor.model.schemachecker; -import org.apache.directory.shared.ldap.schema.SchemaObject; +import org.apache.directory.shared.ldap.model.schema.SchemaObject; /** Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/NonExistingMatchingRuleError.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/NonExistingMatchingRuleError.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/NonExistingMatchingRuleError.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/NonExistingMatchingRuleError.java Mon Jan 24 02:50:09 2011 @@ -20,7 +20,7 @@ package org.apache.directory.studio.schemaeditor.model.schemachecker; -import org.apache.directory.shared.ldap.schema.SchemaObject; +import org.apache.directory.shared.ldap.model.schema.SchemaObject; /** Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/NonExistingOCSuperiorError.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/NonExistingOCSuperiorError.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/NonExistingOCSuperiorError.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/NonExistingOCSuperiorError.java Mon Jan 24 02:50:09 2011 @@ -20,7 +20,7 @@ package org.apache.directory.studio.schemaeditor.model.schemachecker; -import org.apache.directory.shared.ldap.schema.SchemaObject; +import org.apache.directory.shared.ldap.model.schema.SchemaObject; /** Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/NonExistingOptionalATError.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/NonExistingOptionalATError.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/NonExistingOptionalATError.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/NonExistingOptionalATError.java Mon Jan 24 02:50:09 2011 @@ -20,7 +20,7 @@ package org.apache.directory.studio.schemaeditor.model.schemachecker; -import org.apache.directory.shared.ldap.schema.SchemaObject; +import org.apache.directory.shared.ldap.model.schema.SchemaObject; /** Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/NonExistingSyntaxError.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/NonExistingSyntaxError.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/NonExistingSyntaxError.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/NonExistingSyntaxError.java Mon Jan 24 02:50:09 2011 @@ -20,7 +20,7 @@ package org.apache.directory.studio.schemaeditor.model.schemachecker; -import org.apache.directory.shared.ldap.schema.SchemaObject; +import org.apache.directory.shared.ldap.model.schema.SchemaObject; /** Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java Mon Jan 24 02:50:09 2011 @@ -25,9 +25,9 @@ import java.util.List; import org.apache.commons.collections.MultiMap; import org.apache.commons.collections.map.MultiValueMap; -import org.apache.directory.shared.ldap.schema.ObjectClassTypeEnum; -import org.apache.directory.shared.ldap.schema.SchemaObject; -import org.apache.directory.shared.ldap.schema.UsageEnum; +import org.apache.directory.shared.ldap.model.schema.ObjectClassTypeEnum; +import org.apache.directory.shared.ldap.model.schema.SchemaObject; +import org.apache.directory.shared.ldap.model.schema.UsageEnum; import org.apache.directory.studio.schemaeditor.Activator; import org.apache.directory.studio.schemaeditor.controller.ProjectsHandlerAdapter; import org.apache.directory.studio.schemaeditor.controller.SchemaHandler; Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaCheckerElement.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaCheckerElement.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaCheckerElement.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaCheckerElement.java Mon Jan 24 02:50:09 2011 @@ -20,7 +20,7 @@ package org.apache.directory.studio.schemaeditor.model.schemachecker; -import org.apache.directory.shared.ldap.schema.SchemaObject; +import org.apache.directory.shared.ldap.model.schema.SchemaObject; /** Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/SchemaEditorTypeLabelDecorator.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/SchemaEditorTypeLabelDecorator.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/SchemaEditorTypeLabelDecorator.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/SchemaEditorTypeLabelDecorator.java Mon Jan 24 02:50:09 2011 @@ -20,8 +20,8 @@ package org.apache.directory.studio.schemaeditor.view; -import org.apache.directory.shared.ldap.schema.ObjectClassTypeEnum; -import org.apache.directory.shared.ldap.schema.UsageEnum; +import org.apache.directory.shared.ldap.model.schema.ObjectClassTypeEnum; +import org.apache.directory.shared.ldap.model.schema.UsageEnum; import org.apache.directory.studio.schemaeditor.Activator; import org.apache.directory.studio.schemaeditor.PluginConstants; import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl; Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java Mon Jan 24 02:50:09 2011 @@ -25,7 +25,7 @@ import java.util.ArrayList; import java.util.List; import org.apache.directory.shared.asn1.util.OID; -import org.apache.directory.shared.ldap.schema.UsageEnum; +import org.apache.directory.shared.ldap.model.schema.UsageEnum; import org.apache.directory.studio.schemaeditor.Activator; import org.apache.directory.studio.schemaeditor.PluginConstants; import org.apache.directory.studio.schemaeditor.controller.SchemaHandler; Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorSourceCodePage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorSourceCodePage.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorSourceCodePage.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorSourceCodePage.java Mon Jan 24 02:50:09 2011 @@ -25,7 +25,7 @@ import java.io.IOException; import java.text.ParseException; import java.util.List; -import org.apache.directory.shared.ldap.schema.AttributeType; +import org.apache.directory.shared.ldap.model.schema.AttributeType; import org.apache.directory.shared.ldap.schema.parsers.OpenLdapSchemaParser; import org.apache.directory.studio.schemaeditor.PluginConstants; import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl; Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java Mon Jan 24 02:50:09 2011 @@ -25,7 +25,7 @@ import java.util.ArrayList; import java.util.List; import org.apache.directory.shared.asn1.util.OID; -import org.apache.directory.shared.ldap.schema.ObjectClassTypeEnum; +import org.apache.directory.shared.ldap.model.schema.ObjectClassTypeEnum; import org.apache.directory.studio.schemaeditor.Activator; import org.apache.directory.studio.schemaeditor.PluginConstants; import org.apache.directory.studio.schemaeditor.controller.SchemaHandler; Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSourceCodePage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSourceCodePage.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSourceCodePage.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSourceCodePage.java Mon Jan 24 02:50:09 2011 @@ -25,7 +25,7 @@ import java.io.IOException; import java.text.ParseException; import java.util.List; -import org.apache.directory.shared.ldap.schema.ObjectClass; +import org.apache.directory.shared.ldap.model.schema.ObjectClass; import org.apache.directory.shared.ldap.schema.parsers.OpenLdapSchemaParser; import org.apache.directory.studio.schemaeditor.PluginConstants; import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl; Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyView.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyView.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyView.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyView.java Mon Jan 24 02:50:09 2011 @@ -22,7 +22,7 @@ package org.apache.directory.studio.sche import java.util.List; -import org.apache.directory.shared.ldap.schema.SchemaObject; +import org.apache.directory.shared.ldap.model.schema.SchemaObject; import org.apache.directory.studio.schemaeditor.Activator; import org.apache.directory.studio.schemaeditor.PluginConstants; import org.apache.directory.studio.schemaeditor.controller.HierarchyViewController; Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewLabelProvider.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewLabelProvider.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewLabelProvider.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewLabelProvider.java Mon Jan 24 02:50:09 2011 @@ -20,8 +20,8 @@ package org.apache.directory.studio.schemaeditor.view.views; -import org.apache.directory.shared.ldap.schema.ObjectClassTypeEnum; -import org.apache.directory.shared.ldap.schema.SchemaObject; +import org.apache.directory.shared.ldap.model.schema.ObjectClassTypeEnum; +import org.apache.directory.shared.ldap.model.schema.SchemaObject; import org.apache.directory.studio.schemaeditor.Activator; import org.apache.directory.studio.schemaeditor.PluginConstants; import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl; Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java Mon Jan 24 02:50:09 2011 @@ -26,7 +26,7 @@ import java.util.Arrays; import java.util.List; import java.util.regex.Pattern; -import org.apache.directory.shared.ldap.schema.SchemaObject; +import org.apache.directory.shared.ldap.model.schema.SchemaObject; import org.apache.directory.studio.schemaeditor.Activator; import org.apache.directory.studio.schemaeditor.PluginConstants; import org.apache.directory.studio.schemaeditor.PluginUtils; Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewContentProvider.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewContentProvider.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewContentProvider.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewContentProvider.java Mon Jan 24 02:50:09 2011 @@ -25,7 +25,7 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; -import org.apache.directory.shared.ldap.schema.SchemaObject; +import org.apache.directory.shared.ldap.model.schema.SchemaObject; import org.apache.directory.studio.schemaeditor.Activator; import org.apache.directory.studio.schemaeditor.PluginConstants; import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl; Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewLabelProvider.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewLabelProvider.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewLabelProvider.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewLabelProvider.java Mon Jan 24 02:50:09 2011 @@ -22,7 +22,7 @@ package org.apache.directory.studio.sche import java.util.List; -import org.apache.directory.shared.ldap.schema.SchemaObject; +import org.apache.directory.shared.ldap.model.schema.SchemaObject; import org.apache.directory.studio.schemaeditor.Activator; import org.apache.directory.studio.schemaeditor.PluginConstants; import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl; Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/FirstNameSorter.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/FirstNameSorter.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/FirstNameSorter.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/FirstNameSorter.java Mon Jan 24 02:50:09 2011 @@ -24,7 +24,7 @@ package org.apache.directory.studio.sche import java.util.Comparator; import java.util.List; -import org.apache.directory.shared.ldap.schema.SchemaObject; +import org.apache.directory.shared.ldap.model.schema.SchemaObject; import org.apache.directory.studio.schemaeditor.model.difference.AttributeTypeDifference; import org.apache.directory.studio.schemaeditor.model.difference.ObjectClassDifference; Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/OidSorter.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/OidSorter.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/OidSorter.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/OidSorter.java Mon Jan 24 02:50:09 2011 @@ -23,7 +23,7 @@ package org.apache.directory.studio.sche import java.util.Comparator; -import org.apache.directory.shared.ldap.schema.SchemaObject; +import org.apache.directory.shared.ldap.model.schema.SchemaObject; import org.apache.directory.studio.schemaeditor.model.difference.AttributeTypeDifference; import org.apache.directory.studio.schemaeditor.model.difference.ObjectClassDifference; Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasSelectionWizardPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasSelectionWizardPage.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasSelectionWizardPage.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasSelectionWizardPage.java Mon Jan 24 02:50:09 2011 @@ -25,8 +25,8 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; -import org.apache.directory.shared.ldap.schema.AttributeType; -import org.apache.directory.shared.ldap.schema.ObjectClass; +import org.apache.directory.shared.ldap.model.schema.AttributeType; +import org.apache.directory.shared.ldap.model.schema.ObjectClass; import org.apache.directory.studio.schemaeditor.Activator; import org.apache.directory.studio.schemaeditor.PluginConstants; import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl; Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasWizard.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasWizard.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasWizard.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasWizard.java Mon Jan 24 02:50:09 2011 @@ -27,7 +27,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.directory.shared.ldap.schema.AbstractSchemaObject; +import org.apache.directory.shared.ldap.model.schema.AbstractSchemaObject; import org.apache.directory.studio.schemaeditor.Activator; import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl; import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl; Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeContentWizardPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeContentWizardPage.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeContentWizardPage.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeContentWizardPage.java Mon Jan 24 02:50:09 2011 @@ -25,7 +25,7 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; -import org.apache.directory.shared.ldap.schema.UsageEnum; +import org.apache.directory.shared.ldap.model.schema.UsageEnum; import org.apache.directory.studio.schemaeditor.Activator; import org.apache.directory.studio.schemaeditor.PluginConstants; import org.apache.directory.studio.schemaeditor.controller.SchemaHandler; Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassContentWizardPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassContentWizardPage.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassContentWizardPage.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassContentWizardPage.java Mon Jan 24 02:50:09 2011 @@ -25,7 +25,7 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; -import org.apache.directory.shared.ldap.schema.ObjectClassTypeEnum; +import org.apache.directory.shared.ldap.model.schema.ObjectClassTypeEnum; import org.apache.directory.studio.schemaeditor.Activator; import org.apache.directory.studio.schemaeditor.PluginConstants; import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl; Modified: directory/studio/trunk/plugins/schemaeditor/src/test/java/org/apache/directory/studio/schemaeditor/model/difference/DifferenceEngineTest.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/test/java/org/apache/directory/studio/schemaeditor/model/difference/DifferenceEngineTest.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/test/java/org/apache/directory/studio/schemaeditor/model/difference/DifferenceEngineTest.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/test/java/org/apache/directory/studio/schemaeditor/model/difference/DifferenceEngineTest.java Mon Jan 24 02:50:09 2011 @@ -20,14 +20,13 @@ package org.apache.directory.studio.schemaeditor.model.difference; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; import junit.framework.TestCase; -import org.apache.directory.shared.ldap.schema.ObjectClassTypeEnum; -import org.apache.directory.shared.ldap.schema.UsageEnum; +import org.apache.directory.shared.ldap.model.schema.ObjectClassTypeEnum; +import org.apache.directory.shared.ldap.model.schema.UsageEnum; import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl; import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl; Modified: directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/objectclass/ObjectClassValueEditor.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/objectclass/ObjectClassValueEditor.java?rev=1062611&r1=1062610&r2=1062611&view=diff ============================================================================== --- directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/objectclass/ObjectClassValueEditor.java (original) +++ directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/objectclass/ObjectClassValueEditor.java Mon Jan 24 02:50:09 2011 @@ -21,7 +21,7 @@ package org.apache.directory.studio.valueeditors.objectclass; -import org.apache.directory.shared.ldap.schema.ObjectClass; +import org.apache.directory.shared.ldap.model.schema.ObjectClass; import org.apache.directory.studio.ldapbrowser.common.dialogs.TextDialog; import org.apache.directory.studio.ldapbrowser.core.model.AttributeHierarchy; import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;