From commits-return-29681-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Tue Jan 18 13:59:25 2011 Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 9403 invoked from network); 18 Jan 2011 13:59:25 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 18 Jan 2011 13:59:25 -0000 Received: (qmail 78850 invoked by uid 500); 18 Jan 2011 13:59:25 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 78788 invoked by uid 500); 18 Jan 2011 13:59:23 -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 78772 invoked by uid 99); 18 Jan 2011 13:59:22 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Jan 2011 13:59:22 +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; Tue, 18 Jan 2011 13:59:21 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9CC0F23889DE; Tue, 18 Jan 2011 13:58:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1060382 - in /directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2: ApacheDS2ConfigurationPlugin.java actions/OpenConfigurationAction.java Date: Tue, 18 Jan 2011 13:58:55 -0000 To: commits@directory.apache.org From: pamarcelot@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110118135855.9CC0F23889DE@eris.apache.org> Author: pamarcelot Date: Tue Jan 18 13:58:55 2011 New Revision: 1060382 URL: http://svn.apache.org/viewvc?rev=1060382&view=rev Log: Applying package change in shared-ldap-schema to fix OSGI issues. Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationPlugin.java directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/actions/OpenConfigurationAction.java Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationPlugin.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationPlugin.java?rev=1060382&r1=1060381&r2=1060382&view=diff ============================================================================== --- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationPlugin.java (original) +++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationPlugin.java Tue Jan 18 13:58:55 2011 @@ -25,9 +25,9 @@ import java.net.URL; import java.util.PropertyResourceBundle; import org.apache.directory.shared.ldap.schema.SchemaManager; -import org.apache.directory.shared.ldap.schema.loader.ldif.JarLdifSchemaLoader; -import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.schema.registries.SchemaLoader; +import org.apache.directory.shared.ldap.schemaloader.JarLdifSchemaLoader; +import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/actions/OpenConfigurationAction.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/actions/OpenConfigurationAction.java?rev=1060382&r1=1060381&r2=1060382&view=diff ============================================================================== --- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/actions/OpenConfigurationAction.java (original) +++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/actions/OpenConfigurationAction.java Tue Jan 18 13:58:55 2011 @@ -29,9 +29,9 @@ import org.apache.directory.server.confi import org.apache.directory.server.core.partition.ldif.SingleFileLdifPartition; import org.apache.directory.shared.ldap.name.DN; import org.apache.directory.shared.ldap.schema.SchemaManager; -import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader; -import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.schema.registries.SchemaLoader; +import org.apache.directory.shared.ldap.schemaloader.LdifSchemaLoader; +import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; import org.apache.directory.shared.ldap.util.LdapExceptionUtils; import org.apache.directory.studio.apacheds.configuration.v2.ApacheDS2ConfigurationPlugin; import org.apache.directory.studio.apacheds.configuration.v2.editor.ConnectionServerConfigurationInput;