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 2011/01/19 17:42:19 UTC
svn commit: r1060859 - in
/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor:
ServerConfigurationEditor.java ServerConfigurationEditorUtils.java
Author: pamarcelot
Date: Wed Jan 19 16:42:19 2011
New Revision: 1060859
URL: http://svn.apache.org/viewvc?rev=1060859&view=rev
Log:
Used shared methods in the ServerConfigurationEditorUtils class.
Modified:
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditor.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditorUtils.java
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditor.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/ServerConfigurationEditor.java?rev=1060859&r1=1060858&r2=1060859&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditor.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditor.java Wed Jan 19 16:42:19 2011
@@ -20,27 +20,14 @@
package org.apache.directory.studio.apacheds.configuration.v2.editor;
-import java.io.ByteArrayInputStream;
-import java.io.File;
import java.lang.reflect.InvocationTargetException;
-import java.util.List;
import org.apache.directory.server.config.ConfigWriter;
-import org.apache.directory.server.config.ConfigurationException;
import org.apache.directory.server.config.beans.ConfigBean;
-import org.apache.directory.shared.ldap.entry.DefaultEntry;
-import org.apache.directory.shared.ldap.ldif.LdifEntry;
-import org.apache.directory.shared.ldap.schema.SchemaManager;
import org.apache.directory.studio.apacheds.configuration.v2.ApacheDS2ConfigurationPlugin;
-import org.apache.directory.studio.apacheds.configuration.v2.jobs.EntryBasedConfigurationPartition;
import org.apache.directory.studio.apacheds.configuration.v2.jobs.LoadConfigurationRunnable;
-import org.apache.directory.studio.apacheds.configuration.v2.jobs.PartitionsDiffComputer;
import org.apache.directory.studio.common.core.jobs.StudioJob;
-import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.common.core.jobs.StudioRunnableWithProgress;
-import org.apache.directory.studio.ldapbrowser.core.BrowserCorePlugin;
-import org.apache.directory.studio.ldapbrowser.core.jobs.ExecuteLdifRunnable;
-import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.swt.custom.CTabFolder;
@@ -172,7 +159,8 @@ public class ServerConfigurationEditor e
// from a project in the workspace.
{
// Saving the ServerConfiguration to disk
- saveConfiguration( ( FileEditorInput ) input, monitor );
+ ServerConfigurationEditorUtils.saveConfiguration( ( FileEditorInput ) input, getConfigWriter(),
+ monitor );
success = true;
}
// If the input is a ConnectionServerConfigurationInput, then we
@@ -180,13 +168,15 @@ public class ServerConfigurationEditor e
if ( input instanceof ConnectionServerConfigurationInput )
{
// Saving the ServerConfiguration to the connection
- saveConfiguration( ( ConnectionServerConfigurationInput ) input, monitor );
+ ServerConfigurationEditorUtils.saveConfiguration( ( ConnectionServerConfigurationInput ) input,
+ getConfigWriter(), monitor );
success = true;
}
else if ( input instanceof IPathEditorInput )
{
// Saving the ServerConfiguration to disk
- saveConfiguration( ( ( IPathEditorInput ) input ).getPath().toFile() );
+ ServerConfigurationEditorUtils
+ .saveConfiguration( ( ( IPathEditorInput ) input ).getPath().toFile(), getConfigWriter() );
success = true;
}
else if ( inputClassName.equals( "org.eclipse.ui.internal.editors.text.JavaFileEditorInput" ) //$NON-NLS-1$
@@ -197,7 +187,7 @@ public class ServerConfigurationEditor e
// opening a file from the menu File > Open... in Eclipse 3.3.x
{
// Saving the ServerConfiguration to disk
- saveConfiguration( input.getToolTipText() );
+ ServerConfigurationEditorUtils.saveConfiguration( input.getToolTipText(), getConfigWriter() );
success = true;
}
else if ( input instanceof NewServerConfigurationInput )
@@ -222,120 +212,6 @@ public class ServerConfigurationEditor e
/**
- * Saves the configuration.
- *
- * @param input
- * the file editor input
- * @param monitor
- * the monitor
- * @throws Exception
- */
- private void saveConfiguration( FileEditorInput input, IProgressMonitor monitor ) throws Exception
- {
- input.getFile().setContents( new ByteArrayInputStream( getConfigWriter().writeToString().getBytes() ), true,
- true, monitor );
- }
-
-
- /**
- * Saves the configuration.
- *
- * @param input
- * the connection server configuration input
- * @param monitor
- * the monitor
- * @return
- * <code>true</code> if the operation is successful,
- * <code>false</code> if not
- * @throws ConfigurationException
- * @throws Exception
- */
- private void saveConfiguration( ConnectionServerConfigurationInput input, IProgressMonitor monitor )
- throws ConfigurationException, Exception
- {
- // Getting the original configuration partition
- EntryBasedConfigurationPartition originalPartition = input.getOriginalPartition();
-
- // Creating a new configuration partition
- SchemaManager schemaManager = ApacheDS2ConfigurationPlugin.getDefault().getSchemaManager();
- EntryBasedConfigurationPartition newconfigurationPartition = new EntryBasedConfigurationPartition(
- schemaManager );
- newconfigurationPartition.initialize();
- List<LdifEntry> convertedLdifEntries = getConfigWriter().getConvertedLdifEntries();
- for ( LdifEntry ldifEntry : convertedLdifEntries )
- {
- newconfigurationPartition.addEntry( new DefaultEntry( schemaManager, ldifEntry.getEntry() ) );
- }
-
- // Comparing both partitions to get the list of modifications to be applied
- PartitionsDiffComputer partitionsDiffComputer = new PartitionsDiffComputer();
- partitionsDiffComputer.setOriginalPartition( originalPartition );
- partitionsDiffComputer.setDestinationPartition( newconfigurationPartition );
- List<LdifEntry> modificationsList = partitionsDiffComputer.computeModifications( new String[]
- { "*" } );
-
- System.out.println( modificationsList );
-
- // Building the resulting LDIF
- StringBuilder modificationsLdif = new StringBuilder();
- for ( LdifEntry ldifEntry : modificationsList )
- {
- modificationsLdif.append( ldifEntry.toString() );
- }
-
- // Getting the browser connection associated with the
- IBrowserConnection browserConnection = BrowserCorePlugin.getDefault().getConnectionManager()
- .getBrowserConnection( input.getConnection() );
-
- // Creating a StudioProgressMonitor to run the LDIF with
- StudioProgressMonitor studioProgressMonitor = new StudioProgressMonitor( monitor );
-
- // Updating the configuration with the resulting LDIF
- ExecuteLdifRunnable.executeLdif( browserConnection, modificationsLdif.toString(), true, true,
- studioProgressMonitor );
-
- // Checking if there were errors during the execution of the LDIF
- if ( studioProgressMonitor.errorsReported() )
- {
- // TODO handle error
- }
- else
- {
- System.out.println( "swapping partition" );
-
- // Swapping the new configuration partition
- input.setOriginalPartition( newconfigurationPartition );
- }
- }
-
-
- /**
- * Saves the configuration.
- *
- * @param file
- * the file
- * @throws Exception
- */
- private void saveConfiguration( File file ) throws Exception
- {
- getConfigWriter().writeToFile( file );
- }
-
-
- /**
- * Saves the configuration.
- *
- * @param path
- * the path
- * @throws Exception
- */
- private void saveConfiguration( String path ) throws Exception
- {
- saveConfiguration( new File( path ) );
- }
-
-
- /**
* {@inheritDoc}
*/
public void doSaveAs()
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditorUtils.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/ServerConfigurationEditorUtils.java?rev=1060859&r1=1060858&r2=1060859&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditorUtils.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditorUtils.java Wed Jan 19 16:42:19 2011
@@ -25,7 +25,7 @@ import java.io.File;
import java.util.List;
import org.apache.directory.server.config.ConfigWriter;
-import org.apache.directory.server.config.ConfigurationException;
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.entry.DefaultEntry;
import org.apache.directory.shared.ldap.ldif.LdifEntry;
import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -41,6 +41,7 @@ import org.apache.directory.studio.ldapb
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
@@ -66,17 +67,15 @@ public class ServerConfigurationEditorUt
* Performs the "Save as..." action.
*
* @param monitor
- * the monitor to use
- * @throws Exception
- */
- /**
- * TODO doSaveAs.
- *
- * @param monitor
+ * the monitor
* @param shell
+ * the shell
* @param input
+ * the editor input
* @param configWriter
+ * the configuration writer
* @return
+ * the new input for the editor
* @throws Exception
*/
public static IEditorInput doSaveAs( IProgressMonitor monitor, Shell shell, IEditorInput input,
@@ -226,12 +225,11 @@ public class ServerConfigurationEditorUt
* @return
* <code>true</code> if the operation is successful,
* <code>false</code> if not
- * @throws ConfigurationException
* @throws Exception
*/
public static void saveConfiguration( ConnectionServerConfigurationInput input, ConfigWriter configWriter,
IProgressMonitor monitor )
- throws ConfigurationException, Exception
+ throws Exception
{
// Getting the original configuration partition
EntryBasedConfigurationPartition originalPartition = input.getOriginalPartition();
@@ -252,7 +250,7 @@ public class ServerConfigurationEditorUt
partitionsDiffComputer.setOriginalPartition( originalPartition );
partitionsDiffComputer.setDestinationPartition( newconfigurationPartition );
List<LdifEntry> modificationsList = partitionsDiffComputer.computeModifications( new String[]
- { "*" } );
+ { SchemaConstants.ALL_USER_ATTRIBUTES } );
System.out.println( modificationsList );