Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 35406 invoked from network); 23 Jan 2011 20:13:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 23 Jan 2011 20:13:03 -0000 Received: (qmail 45205 invoked by uid 500); 23 Jan 2011 20:13:03 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 45157 invoked by uid 500); 23 Jan 2011 20:13:03 -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 45150 invoked by uid 99); 23 Jan 2011 20:13:03 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 23 Jan 2011 20:13:03 +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; Sun, 23 Jan 2011 20:12:52 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 984992388C42; Sun, 23 Jan 2011 20:11:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1062511 [15/15] - 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: Sun, 23 Jan 2011 20:11:43 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110123201159.984992388C42@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Added: directory/shared/trunk/ldap/src/test/resources/org/apache/directory/shared/ldap/schema/parsers/dyngroup.schema URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/resources/org/apache/directory/shared/ldap/schema/parsers/dyngroup.schema?rev=1062511&view=auto ============================================================================== --- directory/shared/trunk/ldap/src/test/resources/org/apache/directory/shared/ldap/schema/parsers/dyngroup.schema (added) +++ directory/shared/trunk/ldap/src/test/resources/org/apache/directory/shared/ldap/schema/parsers/dyngroup.schema Sun Jan 23 20:11:02 2011 @@ -0,0 +1,99 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +# dyngroup.schema -- Dynamic Group schema +# $OpenLDAP: pkg/ldap/servers/slapd/schema/dyngroup.schema,v 1.6.2.2 2007/08/31 23:14:06 quanah Exp $ +## This work is part of OpenLDAP Software . +## +## Copyright 1998-2007 The OpenLDAP Foundation. +## All rights reserved. +## +## Redistribution and use in source and binary forms, with or without +## modification, are permitted only as authorized by the OpenLDAP +## Public License. +## +## A copy of this license is available in the file LICENSE in the +## top-level directory of the distribution or, alternatively, at +## . +# +# Dynamic Group schema (experimental), as defined by Netscape. See +# http://www.redhat.com/docs/manuals/ent-server/pdf/esadmin611.pdf +# page 70 for details on how these groups were used. +# +# A description of the objectclass definition is available here: +# http://www.redhat.com/docs/manuals/dir-server/schema/7.1/oc_dir.html#1303745 +# +# depends upon: +# core.schema +# +# These definitions are considered experimental due to the lack of +# a formal specification (e.g., RFC). +# +# NOT RECOMMENDED FOR PRODUCTION USE! USE WITH CAUTION! +# +# The Netscape documentation describes this as an auxiliary objectclass +# but their implementations have always defined it as a structural class. +# The sloppiness here is because Netscape-derived servers don't actually +# implement the X.500 data model, and they don't honor the distinction +# between structural and auxiliary classes. This fact is noted here: +# http://forum.java.sun.com/thread.jspa?threadID=5016864&messageID=9034636 +# +# In accordance with other existing implementations, we define it as a +# structural class. +# +# Our definition of memberURL also does not match theirs but again +# their published definition and what works in practice do not agree. +# In other words, the Netscape definitions are broken and interoperability +# is not guaranteed. +# +# Also see the new DynGroup proposed spec at +# http://tools.ietf.org/html/draft-haripriya-dynamicgroup-02 + +objectIdentifier NetscapeRoot 2.16.840.1.113730 + +objectIdentifier NetscapeLDAP NetscapeRoot:3 +objectIdentifier NetscapeLDAPattributeType NetscapeLDAP:1 +objectIdentifier NetscapeLDAPobjectClass NetscapeLDAP:2 + +objectIdentifier OpenLDAPExp11 1.3.6.1.4.1.4203.666.11 +objectIdentifier DynGroupBase OpenLDAPExp11:8 +objectIdentifier DynGroupAttr DynGroupBase:1 +objectIdentifier DynGroupOC DynGroupBase:2 + +attributetype ( NetscapeLDAPattributeType:198 + NAME 'memberURL' + DESC 'Identifies an URL associated with each member of a group. Any type of labeled URL can be used.' + SUP labeledURI ) + +attributetype ( DynGroupAttr:1 + NAME 'dgIdentity' + DESC 'Identity to use when processing the memberURL' + SUP distinguishedName SINGLE-VALUE ) + +objectClass ( NetscapeLDAPobjectClass:33 + NAME 'groupOfURLs' + SUP top STRUCTURAL + MUST cn + MAY ( memberURL $ businessCategory $ description $ o $ ou $ + owner $ seeAlso ) ) + +# The Haripriya dyngroup schema still needs a lot of work. +# We're just adding support for the dgIdentity attribute for now... +objectClass ( DynGroupOC:1 + NAME 'dgIdentityAux' + SUP top AUXILIARY + MAY dgIdentity ) Added: directory/shared/trunk/ldap/src/test/resources/org/apache/directory/shared/ldap/schema/parsers/inetorgperson.schema URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/resources/org/apache/directory/shared/ldap/schema/parsers/inetorgperson.schema?rev=1062511&view=auto ============================================================================== --- directory/shared/trunk/ldap/src/test/resources/org/apache/directory/shared/ldap/schema/parsers/inetorgperson.schema (added) +++ directory/shared/trunk/ldap/src/test/resources/org/apache/directory/shared/ldap/schema/parsers/inetorgperson.schema Sun Jan 23 20:11:02 2011 @@ -0,0 +1,172 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +# inetorgperson.schema -- InetOrgPerson (RFC2798) +# $OpenLDAP: pkg/ldap/servers/slapd/schema/inetorgperson.schema,v 1.18.2.2 2007/08/31 23:14:06 quanah Exp $ +## This work is part of OpenLDAP Software . +## +## Copyright 1998-2007 The OpenLDAP Foundation. +## All rights reserved. +## +## Redistribution and use in source and binary forms, with or without +## modification, are permitted only as authorized by the OpenLDAP +## Public License. +## +## A copy of this license is available in the file LICENSE in the +## top-level directory of the distribution or, alternatively, at +## . +# +# InetOrgPerson (RFC2798) +# +# Depends upon +# Definition of an X.500 Attribute Type and an Object Class to Hold +# Uniform Resource Identifiers (URIs) [RFC2079] +# (core.schema) +# +# A Summary of the X.500(96) User Schema for use with LDAPv3 [RFC2256] +# (core.schema) +# +# The COSINE and Internet X.500 Schema [RFC1274] (cosine.schema) + +# carLicense +# This multivalued field is used to record the values of the license or +# registration plate associated with an individual. +attributetype ( 2.16.840.1.113730.3.1.1 + NAME 'carLicense' + DESC 'RFC2798: vehicle license or registration plate' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) + +# departmentNumber +# Code for department to which a person belongs. This can also be +# strictly numeric (e.g., 1234) or alphanumeric (e.g., ABC/123). +attributetype ( 2.16.840.1.113730.3.1.2 + NAME 'departmentNumber' + DESC 'RFC2798: identifies a department within an organization' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) + +# displayName +# When displaying an entry, especially within a one-line summary list, it +# is useful to be able to identify a name to be used. Since other attri- +# bute types such as 'cn' are multivalued, an additional attribute type is +# needed. Display name is defined for this purpose. +attributetype ( 2.16.840.1.113730.3.1.241 + NAME 'displayName' + DESC 'RFC2798: preferred name to be used when displaying entries' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 + SINGLE-VALUE ) + +# employeeNumber +# Numeric or alphanumeric identifier assigned to a person, typically based +# on order of hire or association with an organization. Single valued. +attributetype ( 2.16.840.1.113730.3.1.3 + NAME 'employeeNumber' + DESC 'RFC2798: numerically identifies an employee within an organization' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 + SINGLE-VALUE ) + +# employeeType +# Used to identify the employer to employee relationship. Typical values +# used will be "Contractor", "Employee", "Intern", "Temp", "External", and +# "Unknown" but any value may be used. +attributetype ( 2.16.840.1.113730.3.1.4 + NAME 'employeeType' + DESC 'RFC2798: type of employment for a person' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) + +# jpegPhoto +# Used to store one or more images of a person using the JPEG File +# Interchange Format [JFIF]. +# Note that the jpegPhoto attribute type was defined for use in the +# Internet X.500 pilots but no referencable definition for it could be +# located. +attributetype ( 0.9.2342.19200300.100.1.60 + NAME 'jpegPhoto' + DESC 'RFC2798: a JPEG image' + SYNTAX 1.3.6.1.4.1.1466.115.121.1.28 ) + +# preferredLanguage +# Used to indicate an individual's preferred written or spoken +# language. This is useful for international correspondence or human- +# computer interaction. Values for this attribute type MUST conform to +# the definition of the Accept-Language header field defined in +# [RFC2068] with one exception: the sequence "Accept-Language" ":" +# should be omitted. This is a single valued attribute type. +attributetype ( 2.16.840.1.113730.3.1.39 + NAME 'preferredLanguage' + DESC 'RFC2798: preferred written or spoken language for a person' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 + SINGLE-VALUE ) + +# userSMIMECertificate +# A PKCS#7 [RFC2315] SignedData, where the content that is signed is +# ignored by consumers of userSMIMECertificate values. It is +# recommended that values have a `contentType' of data with an absent +# `content' field. Values of this attribute contain a person's entire +# certificate chain and an smimeCapabilities field [RFC2633] that at a +# minimum describes their SMIME algorithm capabilities. Values for +# this attribute are to be stored and requested in binary form, as +# 'userSMIMECertificate;binary'. If available, this attribute is +# preferred over the userCertificate attribute for S/MIME applications. +## OpenLDAP note: ";binary" transfer should NOT be used as syntax is binary +attributetype ( 2.16.840.1.113730.3.1.40 + NAME 'userSMIMECertificate' + DESC 'RFC2798: PKCS#7 SignedData used to support S/MIME' + SYNTAX 1.3.6.1.4.1.1466.115.121.1.5 ) + +# userPKCS12 +# PKCS #12 [PKCS12] provides a format for exchange of personal identity +# information. When such information is stored in a directory service, +# the userPKCS12 attribute should be used. This attribute is to be stored +# and requested in binary form, as 'userPKCS12;binary'. The attribute +# values are PFX PDUs stored as binary data. +## OpenLDAP note: ";binary" transfer should NOT be used as syntax is binary +attributetype ( 2.16.840.1.113730.3.1.216 + NAME 'userPKCS12' + DESC 'RFC2798: personal identity information, a PKCS #12 PFX' + SYNTAX 1.3.6.1.4.1.1466.115.121.1.5 ) + + +# inetOrgPerson +# The inetOrgPerson represents people who are associated with an +# organization in some way. It is a structural class and is derived +# from the organizationalPerson which is defined in X.521 [X521]. +objectclass ( 2.16.840.1.113730.3.2.2 + NAME 'inetOrgPerson' + DESC 'RFC2798: Internet Organizational Person' + SUP organizationalPerson + STRUCTURAL + MAY ( + audio $ businessCategory $ carLicense $ departmentNumber $ + displayName $ employeeNumber $ employeeType $ givenName $ + homePhone $ homePostalAddress $ initials $ jpegPhoto $ + labeledURI $ mail $ manager $ mobile $ o $ pager $ + photo $ roomNumber $ secretary $ uid $ userCertificate $ + x500uniqueIdentifier $ preferredLanguage $ + userSMIMECertificate $ userPKCS12 ) + ) Modified: directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/ExclusionDialog.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/ExclusionDialog.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/ExclusionDialog.java (original) +++ directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/ExclusionDialog.java Sun Jan 23 20:11:02 2011 @@ -23,7 +23,7 @@ package org.apache.directory.studio.acii import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.directory.shared.ldap.exception.LdapInvalidDnException; +import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.studio.aciitemeditor.Activator; import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils; Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationContentDescriber.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationContentDescriber.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationContentDescriber.java (original) +++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationContentDescriber.java Sun Jan 23 20:11:02 2011 @@ -24,8 +24,8 @@ import java.io.IOException; import java.io.InputStream; import java.io.Reader; -import org.apache.directory.shared.ldap.exception.LdapException; -import org.apache.directory.shared.ldap.exception.LdapInvalidDnException; +import org.apache.directory.shared.ldap.model.exception.LdapException; +import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException; import org.apache.directory.shared.ldap.ldif.LdifEntry; import org.apache.directory.shared.ldap.ldif.LdifReader; import org.apache.directory.shared.ldap.name.Dn; Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/KerberosServerPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/KerberosServerPage.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/KerberosServerPage.java (original) +++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/KerberosServerPage.java Sun Jan 23 20:11:02 2011 @@ -23,7 +23,7 @@ package org.apache.directory.studio.apac import org.apache.directory.server.config.beans.ChangePasswordServerBean; import org.apache.directory.server.config.beans.KdcServerBean; import org.apache.directory.server.config.beans.TransportBean; -import org.apache.directory.shared.ldap.exception.LdapInvalidDnException; +import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException; import org.apache.directory.shared.ldap.name.Dn; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/LdapLdapsServersPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/LdapLdapsServersPage.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/LdapLdapsServersPage.java (original) +++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/LdapLdapsServersPage.java Sun Jan 23 20:11:02 2011 @@ -22,7 +22,7 @@ package org.apache.directory.studio.apac import org.apache.directory.server.config.beans.LdapServerBean; import org.apache.directory.server.config.beans.TransportBean; -import org.apache.directory.shared.ldap.exception.LdapInvalidDnException; +import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException; import org.apache.directory.shared.ldap.name.Dn; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/EntryBasedConfigurationPartition.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/EntryBasedConfigurationPartition.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/EntryBasedConfigurationPartition.java (original) +++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/EntryBasedConfigurationPartition.java Sun Jan 23 20:11:02 2011 @@ -34,7 +34,7 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.partition.ldif.AbstractLdifPartition; import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.entry.Entry; -import org.apache.directory.shared.ldap.exception.LdapException; +import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.ldap.schema.SchemaManager; Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/LoadConfigurationRunnable.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/LoadConfigurationRunnable.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/LoadConfigurationRunnable.java (original) +++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/LoadConfigurationRunnable.java Sun Jan 23 20:11:02 2011 @@ -36,8 +36,8 @@ import org.apache.directory.server.core. import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.entry.DefaultEntry; import org.apache.directory.shared.ldap.entry.Entry; -import org.apache.directory.shared.ldap.exception.LdapException; -import org.apache.directory.shared.ldap.exception.LdapNoSuchObjectException; +import org.apache.directory.shared.ldap.model.exception.LdapException; +import org.apache.directory.shared.ldap.model.exception.LdapNoSuchObjectException; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.ldap.schema.SchemaManager; import org.apache.directory.shared.ldap.entry.AttributeUtils; Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/PartitionsDiffComputer.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/PartitionsDiffComputer.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/PartitionsDiffComputer.java (original) +++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/PartitionsDiffComputer.java Sun Jan 23 20:11:02 2011 @@ -37,12 +37,12 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.Modification; import org.apache.directory.shared.ldap.entry.ModificationOperation; import org.apache.directory.shared.ldap.entry.Value; -import org.apache.directory.shared.ldap.exception.LdapException; +import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.shared.ldap.filter.FilterParser; import org.apache.directory.shared.ldap.filter.SearchScope; import org.apache.directory.shared.ldap.ldif.ChangeType; import org.apache.directory.shared.ldap.ldif.LdifEntry; -import org.apache.directory.shared.ldap.message.AliasDerefMode; +import org.apache.directory.shared.ldap.model.message.AliasDerefMode; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.ldap.schema.AttributeType; import org.apache.directory.shared.ldap.schema.AttributeTypeOptions; @@ -246,7 +246,7 @@ public class PartitionsDiffComputer * the attribute IDs * @param soc * the search operation context - * @throws LdapException + * @throws org.apache.directory.shared.ldap.model.exception.LdapException */ private void setReturningAttributes( SchemaManager schemaManager, String[] attributeIds, SearchOperationContext soc ) throws LdapException Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/PartitionDetailsPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/PartitionDetailsPage.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/PartitionDetailsPage.java (original) +++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/PartitionDetailsPage.java Sun Jan 23 20:11:02 2011 @@ -28,7 +28,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.Entry; import org.apache.directory.shared.ldap.entry.EntryAttribute; import org.apache.directory.shared.ldap.entry.Value; -import org.apache.directory.shared.ldap.exception.LdapException; +import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.studio.apacheds.configuration.editor.v150.dialogs.AttributeValueDialog; import org.apache.directory.studio.apacheds.configuration.editor.v150.dialogs.AttributeValueObject; import org.apache.directory.studio.apacheds.configuration.editor.v150.dialogs.IndexedAttributeDialog; Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/PartitionDetailsPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/PartitionDetailsPage.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/PartitionDetailsPage.java (original) +++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/PartitionDetailsPage.java Sun Jan 23 20:11:02 2011 @@ -28,7 +28,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.Entry; import org.apache.directory.shared.ldap.entry.EntryAttribute; import org.apache.directory.shared.ldap.entry.Value; -import org.apache.directory.shared.ldap.exception.LdapException; +import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.studio.apacheds.configuration.editor.v151.dialogs.AttributeValueDialog; import org.apache.directory.studio.apacheds.configuration.editor.v151.dialogs.AttributeValueObject; import org.apache.directory.studio.apacheds.configuration.editor.v151.dialogs.IndexedAttributeDialog; Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/PartitionDetailsPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/PartitionDetailsPage.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/PartitionDetailsPage.java (original) +++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/PartitionDetailsPage.java Sun Jan 23 20:11:02 2011 @@ -28,7 +28,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.Entry; import org.apache.directory.shared.ldap.entry.EntryAttribute; import org.apache.directory.shared.ldap.entry.Value; -import org.apache.directory.shared.ldap.exception.LdapException; +import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.studio.apacheds.configuration.editor.v152.dialogs.AttributeValueDialog; import org.apache.directory.studio.apacheds.configuration.editor.v152.dialogs.AttributeValueObject; import org.apache.directory.studio.apacheds.configuration.editor.v152.dialogs.IndexedAttributeDialog; Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/PartitionDetailsPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/PartitionDetailsPage.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/PartitionDetailsPage.java (original) +++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/PartitionDetailsPage.java Sun Jan 23 20:11:02 2011 @@ -28,7 +28,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.Entry; import org.apache.directory.shared.ldap.entry.EntryAttribute; import org.apache.directory.shared.ldap.entry.Value; -import org.apache.directory.shared.ldap.exception.LdapException; +import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.studio.apacheds.configuration.editor.v153.dialogs.AttributeValueDialog; import org.apache.directory.studio.apacheds.configuration.editor.v153.dialogs.AttributeValueObject; import org.apache.directory.studio.apacheds.configuration.editor.v153.dialogs.IndexedAttributeDialog; Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/DnUtils.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/DnUtils.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/DnUtils.java (original) +++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/DnUtils.java Sun Jan 23 20:11:02 2011 @@ -22,7 +22,7 @@ package org.apache.directory.studio.conn import javax.naming.InvalidNameException; -import org.apache.directory.shared.ldap.exception.LdapInvalidDnException; +import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.ldap.name.Rdn; Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/IJndiLogger.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/IJndiLogger.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/IJndiLogger.java (original) +++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/IJndiLogger.java Sun Jan 23 20:11:02 2011 @@ -26,7 +26,7 @@ import javax.naming.directory.Modificati import javax.naming.directory.SearchControls; import javax.naming.ldap.Control; -import org.apache.directory.shared.ldap.message.Referral; +import org.apache.directory.shared.ldap.model.message.Referral; import org.apache.directory.studio.connection.core.Connection.AliasDereferencingMethod; import org.apache.directory.studio.connection.core.io.jndi.ReferralsInfo; import org.apache.directory.studio.connection.core.io.jndi.StudioSearchResult; Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Utils.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Utils.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Utils.java (original) +++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Utils.java Sun Jan 23 20:11:02 2011 @@ -27,7 +27,7 @@ import java.util.ResourceBundle; import javax.naming.directory.SearchControls; -import org.apache.directory.shared.ldap.exception.LdapInvalidDnException; +import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException; import org.apache.directory.shared.ldap.filter.LdapURL; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.util.Strings; Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/ConnectionWrapperUtils.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/ConnectionWrapperUtils.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/ConnectionWrapperUtils.java (original) +++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/ConnectionWrapperUtils.java Sun Jan 23 20:11:02 2011 @@ -22,7 +22,7 @@ package org.apache.directory.studio.conn import java.util.ArrayList; -import org.apache.directory.shared.ldap.message.Referral; +import org.apache.directory.shared.ldap.model.message.Referral; import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor; import org.apache.directory.studio.connection.core.Connection; import org.apache.directory.studio.connection.core.ConnectionCorePlugin; Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/CursorStudioNamingEnumeration.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/CursorStudioNamingEnumeration.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/CursorStudioNamingEnumeration.java (original) +++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/CursorStudioNamingEnumeration.java Sun Jan 23 20:11:02 2011 @@ -37,11 +37,11 @@ import javax.naming.ldap.PagedResultsRes import org.apache.directory.shared.ldap.cursor.SearchCursor; import org.apache.directory.shared.ldap.entry.AttributeUtils; import org.apache.directory.shared.ldap.filter.LdapURL; -import org.apache.directory.shared.ldap.message.Referral; -import org.apache.directory.shared.ldap.message.Response; -import org.apache.directory.shared.ldap.message.SearchResultDone; -import org.apache.directory.shared.ldap.message.SearchResultEntry; -import org.apache.directory.shared.ldap.message.SearchResultReference; +import org.apache.directory.shared.ldap.model.message.Referral; +import org.apache.directory.shared.ldap.model.message.*; +import org.apache.directory.shared.ldap.model.message.Response; +import org.apache.directory.shared.ldap.model.message.SearchResultDone; +import org.apache.directory.shared.ldap.model.message.SearchResultReference; 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; @@ -151,7 +151,7 @@ public class CursorStudioNamingEnumerati if ( referralsHandlingMethod != ReferralHandlingMethod.IGNORE ) { // Storing the referral for later use - referralsList.add( ( ( SearchResultReference ) currentResponse ).getReferral() ); + referralsList.add( ( (SearchResultReference) currentResponse ).getReferral() ); } } } Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java (original) +++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java Sun Jan 23 20:11:02 2011 @@ -46,24 +46,22 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.Modification; import org.apache.directory.shared.ldap.entry.ModificationOperation; import org.apache.directory.shared.ldap.filter.SearchScope; -import org.apache.directory.shared.ldap.message.AddRequest; +import org.apache.directory.shared.ldap.model.message.AddRequest; import org.apache.directory.shared.ldap.message.AddRequestImpl; -import org.apache.directory.shared.ldap.message.AddResponse; -import org.apache.directory.shared.ldap.message.AliasDerefMode; -import org.apache.directory.shared.ldap.message.BindResponse; -import org.apache.directory.shared.ldap.message.DeleteRequest; +import org.apache.directory.shared.ldap.model.message.AddResponse; +import org.apache.directory.shared.ldap.model.message.*; +import org.apache.directory.shared.ldap.model.message.DeleteRequest; import org.apache.directory.shared.ldap.message.DeleteRequestImpl; -import org.apache.directory.shared.ldap.message.DeleteResponse; -import org.apache.directory.shared.ldap.message.LdapResult; -import org.apache.directory.shared.ldap.message.ModifyDnRequest; +import org.apache.directory.shared.ldap.model.message.LdapResult; +import org.apache.directory.shared.ldap.model.message.ModifyDnRequest; import org.apache.directory.shared.ldap.message.ModifyDnRequestImpl; -import org.apache.directory.shared.ldap.message.ModifyDnResponse; -import org.apache.directory.shared.ldap.message.ModifyRequest; +import org.apache.directory.shared.ldap.model.message.ModifyDnResponse; +import org.apache.directory.shared.ldap.model.message.ModifyRequest; import org.apache.directory.shared.ldap.message.ModifyRequestImpl; -import org.apache.directory.shared.ldap.message.ModifyResponse; -import org.apache.directory.shared.ldap.message.ResultCodeEnum; -import org.apache.directory.shared.ldap.message.ResultResponse; -import org.apache.directory.shared.ldap.message.SearchRequest; +import org.apache.directory.shared.ldap.model.message.ModifyResponse; +import org.apache.directory.shared.ldap.model.message.DeleteResponse; +import org.apache.directory.shared.ldap.model.message.ResultResponse; +import org.apache.directory.shared.ldap.model.message.SearchRequest; import org.apache.directory.shared.ldap.message.SearchRequestImpl; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor; Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JNDIConnectionWrapper.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JNDIConnectionWrapper.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JNDIConnectionWrapper.java (original) +++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JNDIConnectionWrapper.java Sun Jan 23 20:11:02 2011 @@ -66,9 +66,9 @@ import javax.security.auth.login.LoginEx import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; -import org.apache.directory.shared.ldap.exception.LdapURLEncodingException; +import org.apache.directory.shared.ldap.model.exception.LdapURLEncodingException; import org.apache.directory.shared.ldap.filter.LdapURL; -import org.apache.directory.shared.ldap.message.Referral; +import org.apache.directory.shared.ldap.model.message.Referral; import org.apache.directory.shared.ldap.message.ReferralImpl; import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor; import org.apache.directory.studio.connection.core.Connection; Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JndiStudioNamingEnumeration.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JndiStudioNamingEnumeration.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JndiStudioNamingEnumeration.java (original) +++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JndiStudioNamingEnumeration.java Sun Jan 23 20:11:02 2011 @@ -33,9 +33,9 @@ import javax.naming.directory.SearchResu import javax.naming.ldap.Control; import javax.naming.ldap.LdapContext; -import org.apache.directory.shared.ldap.exception.LdapURLEncodingException; +import org.apache.directory.shared.ldap.model.exception.LdapURLEncodingException; import org.apache.directory.shared.ldap.filter.LdapURL; -import org.apache.directory.shared.ldap.message.Referral; +import org.apache.directory.shared.ldap.model.message.Referral; 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/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/LdifModificationLogger.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/LdifModificationLogger.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/LdifModificationLogger.java (original) +++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/LdifModificationLogger.java Sun Jan 23 20:11:02 2011 @@ -47,8 +47,8 @@ import javax.naming.directory.Modificati import javax.naming.directory.SearchControls; import javax.naming.ldap.Control; -import org.apache.directory.shared.ldap.exception.LdapInvalidDnException; -import org.apache.directory.shared.ldap.message.Referral; +import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException; +import org.apache.directory.shared.ldap.model.message.Referral; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.ldap.name.Rdn; import org.apache.directory.studio.connection.core.Connection; Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/LdifSearchLogger.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/LdifSearchLogger.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/LdifSearchLogger.java (original) +++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/LdifSearchLogger.java Sun Jan 23 20:11:02 2011 @@ -48,7 +48,7 @@ import javax.naming.ldap.Control; import org.apache.commons.lang.StringUtils; import org.apache.directory.shared.ldap.filter.LdapURL; -import org.apache.directory.shared.ldap.message.Referral; +import org.apache.directory.shared.ldap.model.message.Referral; import org.apache.directory.studio.connection.core.Connection; import org.apache.directory.studio.connection.core.Connection.AliasDereferencingMethod; import org.apache.directory.studio.connection.core.ConnectionCoreConstants; Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/ReferralsInfo.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/ReferralsInfo.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/ReferralsInfo.java (original) +++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/ReferralsInfo.java Sun Jan 23 20:11:02 2011 @@ -26,7 +26,7 @@ import java.util.Set; import javax.naming.LinkLoopException; -import org.apache.directory.shared.ldap.message.Referral; +import org.apache.directory.shared.ldap.model.message.Referral; /** Modified: directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIReferralHandler.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIReferralHandler.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIReferralHandler.java (original) +++ directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIReferralHandler.java Sun Jan 23 20:11:02 2011 @@ -25,7 +25,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.directory.shared.ldap.exception.LdapURLEncodingException; +import org.apache.directory.shared.ldap.model.exception.LdapURLEncodingException; import org.apache.directory.shared.ldap.filter.LdapURL; import org.apache.directory.studio.connection.core.Connection; import org.apache.directory.studio.connection.core.ConnectionCorePlugin; Modified: directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/PasteAction.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/PasteAction.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/PasteAction.java (original) +++ directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/PasteAction.java Sun Jan 23 20:11:02 2011 @@ -25,7 +25,7 @@ import java.util.ArrayList; import java.util.List; import org.apache.commons.lang.StringUtils; -import org.apache.directory.shared.ldap.exception.LdapURLEncodingException; +import org.apache.directory.shared.ldap.model.exception.LdapURLEncodingException; import org.apache.directory.shared.ldap.filter.LdapURL; import org.apache.directory.studio.connection.core.Connection; import org.apache.directory.studio.connection.core.ConnectionCoreConstants; Modified: directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/dialogs/SelectReferralConnectionDialog.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/dialogs/SelectReferralConnectionDialog.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/dialogs/SelectReferralConnectionDialog.java (original) +++ directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/dialogs/SelectReferralConnectionDialog.java Sun Jan 23 20:11:02 2011 @@ -23,7 +23,7 @@ package org.apache.directory.studio.conn import java.util.List; -import org.apache.directory.shared.ldap.exception.LdapURLEncodingException; +import org.apache.directory.shared.ldap.model.exception.LdapURLEncodingException; import org.apache.directory.shared.ldap.filter.LdapURL; import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils; import org.apache.directory.studio.connection.core.Connection; Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/EntryWidget.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/EntryWidget.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/EntryWidget.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/EntryWidget.java Sun Jan 23 20:11:02 2011 @@ -21,7 +21,7 @@ package org.apache.directory.studio.ldapbrowser.common.widgets.search; -import org.apache.directory.shared.ldap.exception.LdapInvalidDnException; +import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils; import org.apache.directory.studio.connection.core.DnUtils; Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryDnWizardPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryDnWizardPage.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryDnWizardPage.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/NewEntryDnWizardPage.java Sun Jan 23 20:11:02 2011 @@ -27,7 +27,7 @@ import java.util.Iterator; import org.apache.commons.lang.ArrayUtils; import org.apache.directory.shared.ldap.constants.SchemaConstants; -import org.apache.directory.shared.ldap.exception.LdapInvalidDnException; +import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException; import org.apache.directory.shared.ldap.name.Ava; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.ldap.name.Rdn; Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionIO.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionIO.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionIO.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionIO.java Sun Jan 23 20:11:02 2011 @@ -32,7 +32,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.directory.shared.ldap.exception.LdapInvalidDnException; +import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.util.Base64; import org.apache.directory.studio.connection.core.Connection; Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportCsvRunnable.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportCsvRunnable.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportCsvRunnable.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportCsvRunnable.java Sun Jan 23 20:11:02 2011 @@ -32,7 +32,7 @@ import java.util.Map; import javax.naming.NamingException; import org.apache.commons.codec.digest.DigestUtils; -import org.apache.directory.shared.ldap.exception.LdapInvalidDnException; +import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException; import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor; import org.apache.directory.studio.connection.core.Connection; import org.apache.directory.studio.connection.core.jobs.StudioConnectionRunnableWithProgress; Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java Sun Jan 23 20:11:02 2011 @@ -42,16 +42,16 @@ import org.apache.directory.shared.dsmlv import org.apache.directory.shared.dsmlv2.reponse.SearchResultReferenceDsml; import org.apache.directory.shared.dsmlv2.request.AddRequestDsml; import org.apache.directory.shared.dsmlv2.request.BatchRequestDsml; -import org.apache.directory.shared.ldap.codec.MessageTypeEnum; +import org.apache.directory.shared.ldap.model.exception.LdapURLEncodingException; +import org.apache.directory.shared.ldap.model.message.MessageTypeEnum; import org.apache.directory.shared.ldap.entry.AttributeUtils; -import org.apache.directory.shared.ldap.exception.LdapURLEncodingException; import org.apache.directory.shared.ldap.entry.Entry; import org.apache.directory.shared.ldap.entry.EntryAttribute; import org.apache.directory.shared.ldap.entry.Value; -import org.apache.directory.shared.ldap.exception.LdapException; -import org.apache.directory.shared.ldap.message.LdapResult; -import org.apache.directory.shared.ldap.message.ResultCodeEnum; -import org.apache.directory.shared.ldap.message.SearchResultDone; +import org.apache.directory.shared.ldap.model.exception.LdapException; +import org.apache.directory.shared.ldap.model.message.LdapResult; +import org.apache.directory.shared.ldap.model.message.ResultCodeEnum; +import org.apache.directory.shared.ldap.model.message.SearchResultDone; import org.apache.directory.shared.ldap.message.SearchResultDoneImpl; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.ldap.filter.LdapURL; @@ -261,7 +261,7 @@ public class ExportDsmlRunnable implemen * @param searchParameter * the search parameter * @throws LdapURLEncodingException - * @throws LdapException + * @throws org.apache.directory.shared.ldap.model.exception.LdapException */ public static void processAsDsmlResponse( StudioNamingEnumeration ne, BatchResponseDsml batchResponse, StudioProgressMonitor monitor, SearchParameter searchParameter ) throws LdapURLEncodingException, LdapException @@ -334,7 +334,7 @@ public class ExportDsmlRunnable implemen * the search result * @return * the associated search result entry DSML - * @throws LdapException + * @throws org.apache.directory.shared.ldap.model.exception.LdapException */ private static DsmlDecorator convertSearchResultToDsml( SearchResult searchResult, SearchParameter searchParameter ) throws LdapException, LdapURLEncodingException Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportLdifRunnable.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportLdifRunnable.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportLdifRunnable.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportLdifRunnable.java Sun Jan 23 20:11:02 2011 @@ -36,7 +36,7 @@ import javax.naming.ldap.Control; import javax.naming.ldap.PagedResultsResponseControl; import org.apache.commons.codec.digest.DigestUtils; -import org.apache.directory.shared.ldap.exception.LdapInvalidDnException; +import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor; import org.apache.directory.studio.connection.core.Connection; Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportOdfRunnable.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportOdfRunnable.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportOdfRunnable.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportOdfRunnable.java Sun Jan 23 20:11:02 2011 @@ -28,7 +28,7 @@ import java.util.Map; import javax.naming.NamingException; import org.apache.commons.codec.digest.DigestUtils; -import org.apache.directory.shared.ldap.exception.LdapInvalidDnException; +import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException; import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor; import org.apache.directory.studio.connection.core.Connection; import org.apache.directory.studio.connection.core.jobs.StudioConnectionRunnableWithProgress; Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportXlsRunnable.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportXlsRunnable.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportXlsRunnable.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportXlsRunnable.java Sun Jan 23 20:11:02 2011 @@ -29,7 +29,7 @@ import java.util.Map; import javax.naming.NamingException; import org.apache.commons.codec.digest.DigestUtils; -import org.apache.directory.shared.ldap.exception.LdapInvalidDnException; +import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException; import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor; import org.apache.directory.studio.connection.core.Connection; import org.apache.directory.studio.connection.core.jobs.StudioConnectionRunnableWithProgress; Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java Sun Jan 23 20:11:02 2011 @@ -47,24 +47,21 @@ import org.apache.directory.shared.dsmlv import org.apache.directory.shared.dsmlv2.reponse.ModDNResponseDsml; import org.apache.directory.shared.dsmlv2.reponse.ModifyResponseDsml; import org.apache.directory.shared.dsmlv2.request.BatchRequest; -import org.apache.directory.shared.ldap.codec.MessageTypeEnum; +import org.apache.directory.shared.ldap.model.message.*; import org.apache.directory.shared.ldap.entry.AttributeUtils; -import org.apache.directory.shared.ldap.exception.LdapURLEncodingException; +import org.apache.directory.shared.ldap.model.exception.LdapURLEncodingException; import org.apache.directory.shared.ldap.entry.Entry; import org.apache.directory.shared.ldap.entry.Modification; import org.apache.directory.shared.ldap.entry.ModificationOperation; -import org.apache.directory.shared.ldap.exception.LdapException; -import org.apache.directory.shared.ldap.message.AddRequest; -import org.apache.directory.shared.ldap.message.BindRequest; -import org.apache.directory.shared.ldap.message.CompareRequest; -import org.apache.directory.shared.ldap.message.DeleteRequest; -import org.apache.directory.shared.ldap.message.ExtendedRequest; -import org.apache.directory.shared.ldap.message.LdapResult; -import org.apache.directory.shared.ldap.message.Message; -import org.apache.directory.shared.ldap.message.ModifyDnRequest; -import org.apache.directory.shared.ldap.message.ModifyRequest; -import org.apache.directory.shared.ldap.message.ResultCodeEnum; -import org.apache.directory.shared.ldap.message.SearchRequest; +import org.apache.directory.shared.ldap.model.exception.LdapException; +import org.apache.directory.shared.ldap.model.message.AddRequest; +import org.apache.directory.shared.ldap.model.message.BindRequest; +import org.apache.directory.shared.ldap.model.message.CompareRequest; +import org.apache.directory.shared.ldap.model.message.DeleteRequest; +import org.apache.directory.shared.ldap.model.message.ExtendedRequest; +import org.apache.directory.shared.ldap.model.message.LdapResult; +import org.apache.directory.shared.ldap.model.message.ModifyDnRequest; +import org.apache.directory.shared.ldap.model.message.SearchRequest; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor; import org.apache.directory.studio.connection.core.Connection; @@ -268,19 +265,19 @@ public class ImportDsmlRunnable implemen * @param batchResponseDsml * the DSML batch response (can be null) * @throws NamingException - * @throws LdapURLEncodingException + * @throws org.apache.directory.shared.ldap.model.exception.LdapURLEncodingException * @throws LdapException */ private void processRequest( Object request, BatchResponseDsml batchResponseDsml, StudioProgressMonitor monitor ) throws NamingException, LdapURLEncodingException, LdapException { - if ( request instanceof BindRequest ) + if ( request instanceof BindRequest) { processBindRequest( ( BindRequest ) request, batchResponseDsml, monitor ); } else if ( request instanceof AddRequest ) { - processAddRequest( ( AddRequest ) request, batchResponseDsml, monitor ); + processAddRequest( (AddRequest) request, batchResponseDsml, monitor ); } else if ( request instanceof CompareRequest ) { @@ -605,8 +602,8 @@ public class ImportDsmlRunnable implemen * @param batchResponseDsml * the DSML batch response (can be null) * @throws NamingException - * @throws LdapURLEncodingException - * @throws LdapException + * @throws org.apache.directory.shared.ldap.model.exception.LdapURLEncodingException + * @throws org.apache.directory.shared.ldap.model.exception.LdapException */ private void processSearchRequest( SearchRequest request, BatchResponseDsml batchResponseDsml, StudioProgressMonitor monitor ) throws NamingException, LdapURLEncodingException, LdapException Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportLdifRunnable.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportLdifRunnable.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportLdifRunnable.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportLdifRunnable.java Sun Jan 23 20:11:02 2011 @@ -47,7 +47,7 @@ import javax.naming.ldap.BasicControl; import javax.naming.ldap.Control; import org.apache.commons.codec.digest.DigestUtils; -import org.apache.directory.shared.ldap.exception.LdapInvalidDnException; +import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor; import org.apache.directory.studio.connection.core.Connection; Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeRootDSERunnable.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeRootDSERunnable.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeRootDSERunnable.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/InitializeRootDSERunnable.java Sun Jan 23 20:11:02 2011 @@ -29,7 +29,7 @@ import java.util.Map; import java.util.Set; import org.apache.directory.shared.ldap.constants.SchemaConstants; -import org.apache.directory.shared.ldap.exception.LdapInvalidDnException; +import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor; import org.apache.directory.studio.connection.core.Connection; Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/BrowserConnection.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/BrowserConnection.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/BrowserConnection.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/BrowserConnection.java Sun Jan 23 20:11:02 2011 @@ -25,7 +25,7 @@ import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import org.apache.directory.shared.ldap.exception.LdapInvalidDnException; +import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.shared.ldap.filter.LdapURL; import org.apache.directory.studio.connection.core.Connection; Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/CompoundModification.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/CompoundModification.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/CompoundModification.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/CompoundModification.java Sun Jan 23 20:11:02 2011 @@ -26,7 +26,7 @@ import java.util.Collection; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.StringUtils; -import org.apache.directory.shared.ldap.exception.LdapInvalidDnException; +import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException; import org.apache.directory.studio.ldapbrowser.core.events.EventRegistry; import org.apache.directory.studio.ldapbrowser.core.events.ValueAddedEvent; import org.apache.directory.studio.ldapbrowser.core.events.ValueDeletedEvent; Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/JNDIUtils.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/JNDIUtils.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/JNDIUtils.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/JNDIUtils.java Sun Jan 23 20:11:02 2011 @@ -21,7 +21,7 @@ package org.apache.directory.studio.ldapbrowser.core.utils; -import org.apache.directory.shared.ldap.exception.LdapInvalidDnException; +import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException; import org.apache.directory.shared.ldap.name.Dn; Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/ModelConverter.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/ModelConverter.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/ModelConverter.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/ModelConverter.java Sun Jan 23 20:11:02 2011 @@ -31,7 +31,7 @@ import javax.naming.directory.BasicAttri import javax.naming.directory.DirContext; import javax.naming.directory.ModificationItem; -import org.apache.directory.shared.ldap.exception.LdapInvalidDnException; +import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.studio.connection.core.StudioControl; import org.apache.directory.studio.ldapbrowser.core.BrowserCoreConstants; @@ -68,7 +68,7 @@ public class ModelConverter * * @return the resulting dummy entry * - * @throws LdapInvalidDnException + * @throws org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException */ public static DummyEntry ldifContentRecordToEntry( LdifContentRecord ldifContentRecord, IBrowserConnection connection ) throws LdapInvalidDnException @@ -85,7 +85,7 @@ public class ModelConverter * * @return the resulting dummy entry * - * @throws LdapInvalidDnException + * @throws org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException */ public static DummyEntry ldifChangeAddRecordToEntry( LdifChangeAddRecord ldifChangeAddRecord, IBrowserConnection connection ) throws LdapInvalidDnException Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/LocateDnInDitAction.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/LocateDnInDitAction.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/LocateDnInDitAction.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/LocateDnInDitAction.java Sun Jan 23 20:11:02 2011 @@ -21,7 +21,7 @@ package org.apache.directory.studio.ldapbrowser.ui.actions; -import org.apache.directory.shared.ldap.exception.LdapInvalidDnException; +import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.studio.ldapbrowser.core.model.ISearchResult; import org.apache.directory.studio.ldapbrowser.core.model.IValue; Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorNavigationLocation.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorNavigationLocation.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorNavigationLocation.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorNavigationLocation.java Sun Jan 23 20:11:02 2011 @@ -21,7 +21,7 @@ package org.apache.directory.studio.ldapbrowser.ui.editors.entry; -import org.apache.directory.shared.ldap.exception.LdapInvalidDnException; +import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.studio.entryeditors.EntryEditorExtension; import org.apache.directory.studio.entryeditors.EntryEditorInput; Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/LdifEntryEditorDocumentProvider.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/LdifEntryEditorDocumentProvider.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/LdifEntryEditorDocumentProvider.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/LdifEntryEditorDocumentProvider.java Sun Jan 23 20:11:02 2011 @@ -23,7 +23,7 @@ package org.apache.directory.studio.ldap import java.util.Arrays; -import org.apache.directory.shared.ldap.exception.LdapInvalidDnException; +import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.studio.entryeditors.EntryEditorInput; import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection; Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationApplyOnWizardPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationApplyOnWizardPage.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationApplyOnWizardPage.java (original) +++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationApplyOnWizardPage.java Sun Jan 23 20:11:02 2011 @@ -26,7 +26,7 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Set; -import org.apache.directory.shared.ldap.exception.LdapInvalidDnException; +import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils; import org.apache.directory.studio.connection.core.Connection; Modified: directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/LdifEntryEditorDialog.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/LdifEntryEditorDialog.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/LdifEntryEditorDialog.java (original) +++ directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/dialogs/LdifEntryEditorDialog.java Sun Jan 23 20:11:02 2011 @@ -21,7 +21,7 @@ package org.apache.directory.studio.ldifeditor.dialogs; -import org.apache.directory.shared.ldap.exception.LdapInvalidDnException; +import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException; import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils; import org.apache.directory.studio.ldapbrowser.common.BrowserCommonConstants; import org.apache.directory.studio.ldapbrowser.common.widgets.entryeditor.EntryEditorWidget; Modified: directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifOutlinePage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifOutlinePage.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifOutlinePage.java (original) +++ directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifOutlinePage.java Sun Jan 23 20:11:02 2011 @@ -26,7 +26,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.apache.directory.shared.ldap.exception.LdapInvalidDnException; +import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator; import org.apache.directory.studio.ldapbrowser.common.BrowserCommonConstants; Modified: directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/AbstractOpenValueEditorAction.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/AbstractOpenValueEditorAction.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/AbstractOpenValueEditorAction.java (original) +++ directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/AbstractOpenValueEditorAction.java Sun Jan 23 20:11:02 2011 @@ -21,7 +21,7 @@ package org.apache.directory.studio.ldifeditor.editor.actions; -import org.apache.directory.shared.ldap.exception.LdapInvalidDnException; +import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection; import org.apache.directory.studio.ldapbrowser.core.model.impl.Attribute; Modified: directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/EditLdifAttributeAction.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/EditLdifAttributeAction.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/EditLdifAttributeAction.java (original) +++ directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/actions/EditLdifAttributeAction.java Sun Jan 23 20:11:02 2011 @@ -21,7 +21,7 @@ package org.apache.directory.studio.ldifeditor.editor.actions; -import org.apache.directory.shared.ldap.exception.LdapInvalidDnException; +import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.studio.ldapbrowser.common.BrowserCommonConstants; import org.apache.directory.studio.ldapbrowser.common.wizards.AttributeWizard; Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.java (original) +++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.java Sun Jan 23 20:11:02 2011 @@ -36,7 +36,7 @@ import javax.naming.NamingException; import org.apache.directory.shared.converter.schema.AttributeTypeHolder; import org.apache.directory.shared.converter.schema.ObjectClassHolder; -import org.apache.directory.shared.ldap.exception.LdapException; +import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.studio.schemaeditor.Activator; import org.apache.directory.studio.schemaeditor.PluginUtils; import org.apache.directory.studio.schemaeditor.controller.SchemaHandler; Modified: directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/dn/DnValueEditor.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/dn/DnValueEditor.java?rev=1062511&r1=1062510&r2=1062511&view=diff ============================================================================== --- directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/dn/DnValueEditor.java (original) +++ directory/studio/trunk/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/dn/DnValueEditor.java Sun Jan 23 20:11:02 2011 @@ -21,7 +21,7 @@ package org.apache.directory.studio.valueeditors.dn; -import org.apache.directory.shared.ldap.exception.LdapInvalidDnException; +import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException; import org.apache.directory.shared.ldap.name.Dn; import org.apache.directory.studio.ldapbrowser.common.dialogs.DnDialog; import org.apache.directory.studio.ldapbrowser.common.dialogs.TextDialog;