You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2010/12/09 16:11:38 UTC
svn commit: r1043995 -
/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/LoadConfigurationRunnable.java
Author: pamarcelot
Date: Thu Dec 9 15:11:38 2010
New Revision: 1043995
URL: http://svn.apache.org/viewvc?rev=1043995&view=rev
Log:
Used the new common Schema Manager accessible through the Plugin Class.
Modified:
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/LoadConfigurationRunnable.java
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=1043995&r1=1043994&r2=1043995&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 Thu Dec 9 15:11:38 2010
@@ -35,6 +35,7 @@ import org.apache.directory.shared.ldap.
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.util.LdapExceptionUtils;
+import org.apache.directory.studio.apacheds.configuration.v2.ApacheDS2ConfigurationPlugin;
import org.apache.directory.studio.apacheds.configuration.v2.editor.ServerConfigurationEditor;
import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.common.core.jobs.StudioRunnableWithProgress;
@@ -124,16 +125,8 @@ public class LoadConfigurationRunnable i
public void initConfigBean() throws Exception
{
long t1 = System.currentTimeMillis();
- //SchemaLoader schemaLoader = new SingleLdifSchemaLoader();
- SchemaLoader schemaLoader = new JarLdifSchemaLoader();
- SchemaManager schemaManager = new DefaultSchemaManager( schemaLoader );
-
-
- // We have to load the schema now, otherwise we won't be able
- // to initialize the Partitions, as we won't be able to parse
- // and normalize their suffix DN
- schemaManager.loadAllEnabled();
-// schemaManager.loadWithDeps( "adsconfig" );
+
+ SchemaManager schemaManager = ApacheDS2ConfigurationPlugin.getDefault().getSchemaManager();
long t2 = System.currentTimeMillis();