You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2015/03/31 23:57:11 UTC
svn commit: r1670491 [1/2] - in /directory/studio/trunk:
features/apacheds.feature/ plugins/apacheds.configuration.v2/
plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/
plugins/apacheds.configuration.v2...
Author: seelmann
Date: Tue Mar 31 21:57:10 2015
New Revision: 1670491
URL: http://svn.apache.org/r1670491
Log:
Rename apacheds.configuration.v2 to apacheds.configuration, part 1 (DIRSTUDIO-1005)
Added:
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/ApacheDS2ConfigurationContentDescriber.java
- copied, changed from r1670485, directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationContentDescriber.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/ApacheDS2ConfigurationPlugin.java
- copied, changed from r1670485, 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/ApacheDS2ConfigurationPluginConstants.java
- copied, changed from r1670485, directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationPluginConstants.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/Messages.java
- copied, changed from r1670485, directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/Messages.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/actions/
- copied from r1670485, directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/actions/
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/dialogs/
- copied from r1670485, directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/dialogs/
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/
- copied from r1670485, directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/jobs/
- copied from r1670485, directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/messages.properties
- copied unchanged from r1670485, directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/messages.properties
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/messages_de.properties
- copied unchanged from r1670485, directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/messages_de.properties
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/messages_fr.properties
- copied unchanged from r1670485, directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/messages_fr.properties
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/wizards/
- copied from r1670485, directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/wizards/
Removed:
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/
Modified:
directory/studio/trunk/features/apacheds.feature/feature.xml
directory/studio/trunk/plugins/apacheds.configuration.v2/plugin.properties
directory/studio/trunk/plugins/apacheds.configuration.v2/plugin.xml
directory/studio/trunk/plugins/apacheds.configuration.v2/pom-first.xml
directory/studio/trunk/plugins/apacheds.configuration.v2/pom.xml
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/actions/EditorExportConfigurationAction.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/actions/EditorImportConfigurationAction.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/actions/Messages.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/actions/OpenConfigurationAction.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/dialogs/AttributeDialog.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/dialogs/AttributeValueDialog.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/dialogs/JdbmIndexDialog.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/dialogs/MavibotIndexDialog.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/dialogs/Messages.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/AbstractPartitionSpecificDetailsBlock.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/AttributeValueObject.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/Configuration.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ConnectionServerConfigurationInput.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ErrorPage.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/JavaVersion.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/JdbmPartitionSpecificDetailsBlock.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/KerberosServerPage.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/LdapLdapsServersPage.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/LoadingPage.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/MavibotPartitionSpecificDetailsBlock.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/Messages.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/NewServerConfigurationInput.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/OverviewPage.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/PartitionDetailsPage.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/PartitionSpecificDetailsBlock.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/PartitionType.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/PartitionWrapper.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/PartitionsMasterDetailsBlock.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/PartitionsPage.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/PasswordPoliciesMasterDetailsBlock.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/PasswordPoliciesPage.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/PasswordPolicyDetailsPage.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ReplicationDetailsPage.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ReplicationMasterDetailsBlock.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ReplicationPage.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationEditor.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationEditorPage.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationEditorUtils.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationInput.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/SupportedCipher.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/jobs/EntryBasedConfigurationPartition.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/jobs/LoadConfigurationRunnable.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/jobs/Messages.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/jobs/PartitionsDiffComputer.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/jobs/PartitionsDiffException.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/jobs/SaveConfigurationRunnable.java
directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/wizards/NewApacheDSConfigurationFileWizard.java
directory/studio/trunk/plugins/ldapservers.apacheds.v200/pom-first.xml
directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/ApacheDS200LdapServerAdapter.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/OpenLdapConfigurationPlugin.java
directory/studio/trunk/tests/test.integration.ui/pom-first.xml
Modified: directory/studio/trunk/features/apacheds.feature/feature.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/features/apacheds.feature/feature.xml?rev=1670491&r1=1670490&r2=1670491&view=diff
==============================================================================
--- directory/studio/trunk/features/apacheds.feature/feature.xml (original)
+++ directory/studio/trunk/features/apacheds.feature/feature.xml Tue Mar 31 21:57:10 2015
@@ -4,7 +4,7 @@
label="Apache Directory Studio ApacheDS"
version="2.0.0.qualifier"
provider-name="Apache Software Foundation"
- plugin="org.apache.directory.studio.apacheds.configuration.v2"
+ plugin="org.apache.directory.studio.apacheds.configuration"
image="studio.png">
<description>
@@ -214,7 +214,7 @@ http://www.apache.org/licenses/
unpack="false"/>
<plugin
- id="org.apache.directory.studio.apacheds.configuration.v2"
+ id="org.apache.directory.studio.apacheds.configuration"
download-size="0"
install-size="0"
version="0.0.0"
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/plugin.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/plugin.properties?rev=1670491&r1=1670490&r2=1670491&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/plugin.properties (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/plugin.properties Tue Mar 31 21:57:10 2015
@@ -15,19 +15,19 @@
# specific language governing permissions and limitations
# under the License.
-Plugin_id=org.apache.directory.studio.apacheds.configuration.v2
+Plugin_id=org.apache.directory.studio.apacheds.configuration
-ContentType_ServerConfiguration_id=org.apache.directory.studio.apacheds.configuration.v2.contenttype
+ContentType_ServerConfiguration_id=org.apache.directory.studio.apacheds.configuration.contenttype
ContentType_ServerConfiguration_name=ApacheDS Configuration File
-Editor_ServerConfigurationEditor_id=org.apache.directory.studio.apacheds.configuration.v2.editor.ServerConfigurationEditor
+Editor_ServerConfigurationEditor_id=org.apache.directory.studio.apacheds.configuration.editor.ServerConfigurationEditor
Editor_ServerConfigurationEditor_name=Server Configuration
-OpenConfigurationAction_id=org.apache.directory.studio.apacheds.configuration.v2.actions.OpenConfigurationAction
+OpenConfigurationAction_id=org.apache.directory.studio.apacheds.configuration.actions.OpenConfigurationAction
OpenConfigurationAction_label=Open Configuration
NewWizards_Category_id=org.apache.directory.studio.apacheds.newWizards
NewWizards_Category_name=ApacheDS
-NewWizards_NewApacheDSConfigurationFileWizard_id=org.apache.directory.studio.apacheds.configuration.v2.wizards.NewApacheDSConfigurationFileWizard
+NewWizards_NewApacheDSConfigurationFileWizard_id=org.apache.directory.studio.apacheds.configuration.wizards.NewApacheDSConfigurationFileWizard
NewWizards_NewApacheDSConfigurationFileWizard_name=ApacheDS 2.0 Configuration File
\ No newline at end of file
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/plugin.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/plugin.xml?rev=1670491&r1=1670490&r2=1670491&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/plugin.xml (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/plugin.xml Tue Mar 31 21:57:10 2015
@@ -22,7 +22,7 @@
<extension
point="org.eclipse.ui.editors">
<editor
- class="org.apache.directory.studio.apacheds.configuration.v2.editor.ServerConfigurationEditor"
+ class="org.apache.directory.studio.apacheds.configuration.editor.ServerConfigurationEditor"
default="false"
icon="resources/icons/editor.gif"
id="%Editor_ServerConfigurationEditor_id"
@@ -35,7 +35,7 @@
<extension
point="org.eclipse.core.contenttype.contentTypes">
<content-type
- describer="org.apache.directory.studio.apacheds.configuration.v2.ApacheDS2ConfigurationContentDescriber"
+ describer="org.apache.directory.studio.apacheds.configuration.ApacheDS2ConfigurationContentDescriber"
file-names="config.ldif"
id="%ContentType_ServerConfiguration_id"
name="%ContentType_ServerConfiguration_name">
@@ -47,7 +47,7 @@
objectClass="org.apache.directory.studio.connection.core.Connection"
id="org.apache.directory.studio.connection.core.Connection">
<action
- class="org.apache.directory.studio.apacheds.configuration.v2.actions.OpenConfigurationAction"
+ class="org.apache.directory.studio.apacheds.configuration.actions.OpenConfigurationAction"
enablesFor="1"
id="%OpenConfigurationAction_id"
label="%OpenConfigurationAction_label"
@@ -82,7 +82,7 @@
<wizard
canFinishEarly="true"
category="%NewWizards_Category_id"
- class="org.apache.directory.studio.apacheds.configuration.v2.wizards.NewApacheDSConfigurationFileWizard"
+ class="org.apache.directory.studio.apacheds.configuration.wizards.NewApacheDSConfigurationFileWizard"
hasPages="false"
icon="resources/icons/editor_new.gif"
id="%NewWizards_NewApacheDSConfigurationFileWizard_id"
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/pom-first.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/pom-first.xml?rev=1670491&r1=1670490&r2=1670491&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/pom-first.xml (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/pom-first.xml Tue Mar 31 21:57:10 2015
@@ -27,7 +27,7 @@
<relativePath>../pom-first.xml</relativePath>
</parent>
- <artifactId>org.apache.directory.studio.apacheds.configuration.v2</artifactId>
+ <artifactId>org.apache.directory.studio.apacheds.configuration</artifactId>
<name>Apache Directory Studio ApacheDS 2.0 Configuration</name>
<description/>
<packaging>bundle</packaging>
@@ -45,14 +45,14 @@
<Bundle-SymbolicName>${project.artifactId};singleton:=true</Bundle-SymbolicName>
<Bundle-Localization>plugin</Bundle-Localization>
<Eclipse-LazyStart>true</Eclipse-LazyStart>
- <Bundle-Activator>org.apache.directory.studio.apacheds.configuration.v2.ApacheDS2ConfigurationPlugin</Bundle-Activator>
+ <Bundle-Activator>org.apache.directory.studio.apacheds.configuration.ApacheDS2ConfigurationPlugin</Bundle-Activator>
- <Export-Package>org.apache.directory.studio.apacheds.configuration.v2,
- org.apache.directory.studio.apacheds.configuration.v2.actions,
- org.apache.directory.studio.apacheds.configuration.v2.dialogs,
- org.apache.directory.studio.apacheds.configuration.v2.editor,
- org.apache.directory.studio.apacheds.configuration.v2.jobs,
- org.apache.directory.studio.apacheds.configuration.v2.wizards</Export-Package>
+ <Export-Package>org.apache.directory.studio.apacheds.configuration,
+ org.apache.directory.studio.apacheds.configuration.actions,
+ org.apache.directory.studio.apacheds.configuration.dialogs,
+ org.apache.directory.studio.apacheds.configuration.editor,
+ org.apache.directory.studio.apacheds.configuration.jobs,
+ org.apache.directory.studio.apacheds.configuration.wizards</Export-Package>
<Import-Package>org.apache.directory.server.core.api,
org.apache.directory.server.config,
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/pom.xml?rev=1670491&r1=1670490&r2=1670491&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/pom.xml (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/pom.xml Tue Mar 31 21:57:10 2015
@@ -27,7 +27,7 @@
<relativePath>../</relativePath>
</parent>
- <artifactId>org.apache.directory.studio.apacheds.configuration.v2</artifactId>
+ <artifactId>org.apache.directory.studio.apacheds.configuration</artifactId>
<name>Apache Directory Studio ApacheDS 2.0 Configuration</name>
<packaging>eclipse-plugin</packaging>
Copied: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/ApacheDS2ConfigurationContentDescriber.java (from r1670485, 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/ApacheDS2ConfigurationContentDescriber.java?p2=directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/ApacheDS2ConfigurationContentDescriber.java&p1=directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationContentDescriber.java&r1=1670485&r2=1670491&rev=1670491&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/ApacheDS2ConfigurationContentDescriber.java Tue Mar 31 21:57:10 2015
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.studio.apacheds.configuration.v2;
+package org.apache.directory.studio.apacheds.configuration;
import java.io.IOException;
Copied: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/ApacheDS2ConfigurationPlugin.java (from r1670485, 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/ApacheDS2ConfigurationPlugin.java?p2=directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/ApacheDS2ConfigurationPlugin.java&p1=directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationPlugin.java&r1=1670485&r2=1670491&rev=1670491&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/ApacheDS2ConfigurationPlugin.java Tue Mar 31 21:57:10 2015
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.studio.apacheds.configuration.v2;
+package org.apache.directory.studio.apacheds.configuration;
import java.io.IOException;
@@ -199,7 +199,7 @@ public class ApacheDS2ConfigurationPlugi
// We can't use the PLUGIN_ID constant since loading the plugin.properties file has failed,
// So we're using a default plugin id.
getLog().log(
- new Status( Status.ERROR, "org.apache.directory.studio.apacheds.configuration.v2", Status.OK, //$NON-NLS-1$
+ new Status( Status.ERROR, "org.apache.directory.studio.apacheds.configuration", Status.OK, //$NON-NLS-1$
Messages.getString( "ApacheDS2ConfigurationPlugin.UnableGetProperties" ), e ) ); //$NON-NLS-1$
}
}
Copied: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/ApacheDS2ConfigurationPluginConstants.java (from r1670485, directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationPluginConstants.java)
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/ApacheDS2ConfigurationPluginConstants.java?p2=directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/ApacheDS2ConfigurationPluginConstants.java&p1=directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationPluginConstants.java&r1=1670485&r2=1670491&rev=1670491&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/ApacheDS2ConfigurationPluginConstants.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/ApacheDS2ConfigurationPluginConstants.java Tue Mar 31 21:57:10 2015
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.studio.apacheds.configuration.v2;
+package org.apache.directory.studio.apacheds.configuration;
/**
Copied: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/Messages.java (from r1670485, directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/Messages.java)
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/Messages.java?p2=directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/Messages.java&p1=directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/Messages.java&r1=1670485&r2=1670491&rev=1670491&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/Messages.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/Messages.java Tue Mar 31 21:57:10 2015
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.studio.apacheds.configuration.v2;
+package org.apache.directory.studio.apacheds.configuration;
import java.util.MissingResourceException;
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/actions/EditorExportConfigurationAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/actions/EditorExportConfigurationAction.java?rev=1670491&r1=1670485&r2=1670491&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/actions/EditorExportConfigurationAction.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/actions/EditorExportConfigurationAction.java Tue Mar 31 21:57:10 2015
@@ -18,13 +18,13 @@
*
*/
-package org.apache.directory.studio.apacheds.configuration.v2.actions;
+package org.apache.directory.studio.apacheds.configuration.actions;
-import org.apache.directory.studio.apacheds.configuration.v2.ApacheDS2ConfigurationPlugin;
-import org.apache.directory.studio.apacheds.configuration.v2.ApacheDS2ConfigurationPluginConstants;
-import org.apache.directory.studio.apacheds.configuration.v2.editor.ServerConfigurationEditor;
-import org.apache.directory.studio.apacheds.configuration.v2.editor.ServerConfigurationEditorUtils;
+import org.apache.directory.studio.apacheds.configuration.ApacheDS2ConfigurationPlugin;
+import org.apache.directory.studio.apacheds.configuration.ApacheDS2ConfigurationPluginConstants;
+import org.apache.directory.studio.apacheds.configuration.editor.ServerConfigurationEditor;
+import org.apache.directory.studio.apacheds.configuration.editor.ServerConfigurationEditorUtils;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.action.Action;
@@ -88,7 +88,7 @@ public class EditorExportConfigurationAc
catch ( Exception e )
{
ApacheDS2ConfigurationPlugin.getDefault().getLog().log(
- new Status( Status.ERROR, "org.apache.directory.studio.apacheds.configuration.v2",
+ new Status( Status.ERROR, "org.apache.directory.studio.apacheds.configuration",
e.getMessage() ) );
MessageDialog
.openError( editor.getSite().getShell(),
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/actions/EditorImportConfigurationAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/actions/EditorImportConfigurationAction.java?rev=1670491&r1=1670485&r2=1670491&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/actions/EditorImportConfigurationAction.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/actions/EditorImportConfigurationAction.java Tue Mar 31 21:57:10 2015
@@ -18,16 +18,16 @@
*
*/
-package org.apache.directory.studio.apacheds.configuration.v2.actions;
+package org.apache.directory.studio.apacheds.configuration.actions;
import java.io.File;
-import org.apache.directory.studio.apacheds.configuration.v2.ApacheDS2ConfigurationPlugin;
-import org.apache.directory.studio.apacheds.configuration.v2.ApacheDS2ConfigurationPluginConstants;
-import org.apache.directory.studio.apacheds.configuration.v2.editor.Configuration;
-import org.apache.directory.studio.apacheds.configuration.v2.editor.ServerConfigurationEditor;
-import org.apache.directory.studio.apacheds.configuration.v2.jobs.LoadConfigurationRunnable;
+import org.apache.directory.studio.apacheds.configuration.ApacheDS2ConfigurationPlugin;
+import org.apache.directory.studio.apacheds.configuration.ApacheDS2ConfigurationPluginConstants;
+import org.apache.directory.studio.apacheds.configuration.editor.Configuration;
+import org.apache.directory.studio.apacheds.configuration.editor.ServerConfigurationEditor;
+import org.apache.directory.studio.apacheds.configuration.jobs.LoadConfigurationRunnable;
import org.apache.directory.studio.common.ui.CommonUIUtils;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.ResourcesPlugin;
@@ -189,7 +189,7 @@ public class EditorImportConfigurationAc
catch ( Exception e )
{
ApacheDS2ConfigurationPlugin.getDefault().getLog().log(
- new Status( Status.ERROR, "org.apache.directory.studio.apacheds.configuration.v2",
+ new Status( Status.ERROR, "org.apache.directory.studio.apacheds.configuration",
e.getMessage() ) );
MessageDialog
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/actions/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/actions/Messages.java?rev=1670491&r1=1670485&r2=1670491&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/actions/Messages.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/actions/Messages.java Tue Mar 31 21:57:10 2015
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.studio.apacheds.configuration.v2.actions;
+package org.apache.directory.studio.apacheds.configuration.actions;
import java.util.MissingResourceException;
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/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/actions/OpenConfigurationAction.java?rev=1670491&r1=1670485&r2=1670491&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/actions/OpenConfigurationAction.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/actions/OpenConfigurationAction.java Tue Mar 31 21:57:10 2015
@@ -18,12 +18,12 @@
*
*/
-package org.apache.directory.studio.apacheds.configuration.v2.actions;
+package org.apache.directory.studio.apacheds.configuration.actions;
-import org.apache.directory.studio.apacheds.configuration.v2.ApacheDS2ConfigurationPlugin;
-import org.apache.directory.studio.apacheds.configuration.v2.editor.ConnectionServerConfigurationInput;
-import org.apache.directory.studio.apacheds.configuration.v2.editor.ServerConfigurationEditor;
+import org.apache.directory.studio.apacheds.configuration.ApacheDS2ConfigurationPlugin;
+import org.apache.directory.studio.apacheds.configuration.editor.ConnectionServerConfigurationInput;
+import org.apache.directory.studio.apacheds.configuration.editor.ServerConfigurationEditor;
import org.apache.directory.studio.connection.core.Connection;
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.action.IAction;
@@ -66,14 +66,14 @@ public class OpenConfigurationAction imp
catch ( PartInitException e )
{
ApacheDS2ConfigurationPlugin.getDefault().getLog().log(
- new Status( Status.ERROR, "org.apache.directory.studio.apacheds.configuration.v2",
+ new Status( Status.ERROR, "org.apache.directory.studio.apacheds.configuration",
e.getMessage() ) );
}
}
catch ( Exception e )
{
ApacheDS2ConfigurationPlugin.getDefault().getLog().log(
- new Status( Status.ERROR, "org.apache.directory.studio.apacheds.configuration.v2",
+ new Status( Status.ERROR, "org.apache.directory.studio.apacheds.configuration",
e.getMessage() ) );
}
}
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/dialogs/AttributeDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/dialogs/AttributeDialog.java?rev=1670491&r1=1670485&r2=1670491&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/dialogs/AttributeDialog.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/dialogs/AttributeDialog.java Tue Mar 31 21:57:10 2015
@@ -18,7 +18,7 @@
*
*/
-package org.apache.directory.studio.apacheds.configuration.v2.dialogs;
+package org.apache.directory.studio.apacheds.configuration.dialogs;
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/dialogs/AttributeValueDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/dialogs/AttributeValueDialog.java?rev=1670491&r1=1670485&r2=1670491&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/dialogs/AttributeValueDialog.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/dialogs/AttributeValueDialog.java Tue Mar 31 21:57:10 2015
@@ -17,10 +17,10 @@
* under the License.
*
*/
-package org.apache.directory.studio.apacheds.configuration.v2.dialogs;
+package org.apache.directory.studio.apacheds.configuration.dialogs;
-import org.apache.directory.studio.apacheds.configuration.v2.editor.AttributeValueObject;
+import org.apache.directory.studio.apacheds.configuration.editor.AttributeValueObject;
import org.eclipse.jface.dialogs.Dialog;
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/dialogs/JdbmIndexDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/dialogs/JdbmIndexDialog.java?rev=1670491&r1=1670485&r2=1670491&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/dialogs/JdbmIndexDialog.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/dialogs/JdbmIndexDialog.java Tue Mar 31 21:57:10 2015
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.studio.apacheds.configuration.v2.dialogs;
+package org.apache.directory.studio.apacheds.configuration.dialogs;
import org.apache.directory.server.config.beans.JdbmIndexBean;
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/dialogs/MavibotIndexDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/dialogs/MavibotIndexDialog.java?rev=1670491&r1=1670485&r2=1670491&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/dialogs/MavibotIndexDialog.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/dialogs/MavibotIndexDialog.java Tue Mar 31 21:57:10 2015
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.studio.apacheds.configuration.v2.dialogs;
+package org.apache.directory.studio.apacheds.configuration.dialogs;
import org.apache.directory.server.config.beans.MavibotIndexBean;
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/dialogs/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/dialogs/Messages.java?rev=1670491&r1=1670485&r2=1670491&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/dialogs/Messages.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/dialogs/Messages.java Tue Mar 31 21:57:10 2015
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.studio.apacheds.configuration.v2.dialogs;
+package org.apache.directory.studio.apacheds.configuration.dialogs;
import java.util.MissingResourceException;
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/AbstractPartitionSpecificDetailsBlock.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/AbstractPartitionSpecificDetailsBlock.java?rev=1670491&r1=1670485&r2=1670491&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/AbstractPartitionSpecificDetailsBlock.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/AbstractPartitionSpecificDetailsBlock.java Tue Mar 31 21:57:10 2015
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.studio.apacheds.configuration.v2.editor;
+package org.apache.directory.studio.apacheds.configuration.editor;
import org.apache.directory.server.config.beans.PartitionBean;
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/AttributeValueObject.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/AttributeValueObject.java?rev=1670491&r1=1670485&r2=1670491&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/AttributeValueObject.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/AttributeValueObject.java Tue Mar 31 21:57:10 2015
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.studio.apacheds.configuration.v2.editor;
+package org.apache.directory.studio.apacheds.configuration.editor;
/**
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/Configuration.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/Configuration.java?rev=1670491&r1=1670485&r2=1670491&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/Configuration.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/Configuration.java Tue Mar 31 21:57:10 2015
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.studio.apacheds.configuration.v2.editor;
+package org.apache.directory.studio.apacheds.configuration.editor;
import org.apache.directory.server.config.beans.ConfigBean;
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ConnectionServerConfigurationInput.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ConnectionServerConfigurationInput.java?rev=1670491&r1=1670485&r2=1670491&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ConnectionServerConfigurationInput.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ConnectionServerConfigurationInput.java Tue Mar 31 21:57:10 2015
@@ -17,10 +17,10 @@
* under the License.
*
*/
-package org.apache.directory.studio.apacheds.configuration.v2.editor;
+package org.apache.directory.studio.apacheds.configuration.editor;
-import org.apache.directory.studio.apacheds.configuration.v2.jobs.EntryBasedConfigurationPartition;
+import org.apache.directory.studio.apacheds.configuration.jobs.EntryBasedConfigurationPartition;
import org.apache.directory.studio.connection.core.Connection;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.osgi.util.NLS;
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ErrorPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ErrorPage.java?rev=1670491&r1=1670485&r2=1670491&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ErrorPage.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ErrorPage.java Tue Mar 31 21:57:10 2015
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.studio.apacheds.configuration.v2.editor;
+package org.apache.directory.studio.apacheds.configuration.editor;
import java.io.PrintWriter;
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/JavaVersion.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/JavaVersion.java?rev=1670491&r1=1670485&r2=1670491&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/JavaVersion.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/JavaVersion.java Tue Mar 31 21:57:10 2015
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.studio.apacheds.configuration.v2.editor;
+package org.apache.directory.studio.apacheds.configuration.editor;
/**
* An enum used to define the server's Java targeted version. It can be one of :
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/JdbmPartitionSpecificDetailsBlock.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/JdbmPartitionSpecificDetailsBlock.java?rev=1670491&r1=1670485&r2=1670491&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/JdbmPartitionSpecificDetailsBlock.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/JdbmPartitionSpecificDetailsBlock.java Tue Mar 31 21:57:10 2015
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.studio.apacheds.configuration.v2.editor;
+package org.apache.directory.studio.apacheds.configuration.editor;
import org.apache.directory.server.config.beans.JdbmPartitionBean;
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/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/editor/KerberosServerPage.java?rev=1670491&r1=1670485&r2=1670491&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/KerberosServerPage.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/KerberosServerPage.java Tue Mar 31 21:57:10 2015
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.studio.apacheds.configuration.v2.editor;
+package org.apache.directory.studio.apacheds.configuration.editor;
import java.util.ArrayList;
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/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/editor/LdapLdapsServersPage.java?rev=1670491&r1=1670485&r2=1670491&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/LdapLdapsServersPage.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/LdapLdapsServersPage.java Tue Mar 31 21:57:10 2015
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.studio.apacheds.configuration.v2.editor;
+package org.apache.directory.studio.apacheds.configuration.editor;
import java.io.File;
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/LoadingPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/LoadingPage.java?rev=1670491&r1=1670485&r2=1670491&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/LoadingPage.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/LoadingPage.java Tue Mar 31 21:57:10 2015
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.studio.apacheds.configuration.v2.editor;
+package org.apache.directory.studio.apacheds.configuration.editor;
import org.eclipse.swt.SWT;
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/MavibotPartitionSpecificDetailsBlock.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/MavibotPartitionSpecificDetailsBlock.java?rev=1670491&r1=1670485&r2=1670491&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/MavibotPartitionSpecificDetailsBlock.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/MavibotPartitionSpecificDetailsBlock.java Tue Mar 31 21:57:10 2015
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.studio.apacheds.configuration.v2.editor;
+package org.apache.directory.studio.apacheds.configuration.editor;
import org.apache.directory.server.config.beans.MavibotPartitionBean;
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/Messages.java?rev=1670491&r1=1670485&r2=1670491&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/Messages.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/Messages.java Tue Mar 31 21:57:10 2015
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.studio.apacheds.configuration.v2.editor;
+package org.apache.directory.studio.apacheds.configuration.editor;
import java.util.MissingResourceException;
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/NewServerConfigurationInput.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/NewServerConfigurationInput.java?rev=1670491&r1=1670485&r2=1670491&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/NewServerConfigurationInput.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/NewServerConfigurationInput.java Tue Mar 31 21:57:10 2015
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.studio.apacheds.configuration.v2.editor;
+package org.apache.directory.studio.apacheds.configuration.editor;
import org.eclipse.jface.resource.ImageDescriptor;
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/OverviewPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/OverviewPage.java?rev=1670491&r1=1670485&r2=1670491&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/OverviewPage.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/OverviewPage.java Tue Mar 31 21:57:10 2015
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.studio.apacheds.configuration.v2.editor;
+package org.apache.directory.studio.apacheds.configuration.editor;
import java.util.List;
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/PartitionDetailsPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/PartitionDetailsPage.java?rev=1670491&r1=1670485&r2=1670491&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/PartitionDetailsPage.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/PartitionDetailsPage.java Tue Mar 31 21:57:10 2015
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.studio.apacheds.configuration.v2.editor;
+package org.apache.directory.studio.apacheds.configuration.editor;
import java.io.StringReader;
@@ -42,11 +42,11 @@ import org.apache.directory.server.confi
import org.apache.directory.server.config.beans.MavibotIndexBean;
import org.apache.directory.server.config.beans.MavibotPartitionBean;
import org.apache.directory.server.config.beans.PartitionBean;
-import org.apache.directory.studio.apacheds.configuration.v2.ApacheDS2ConfigurationPlugin;
-import org.apache.directory.studio.apacheds.configuration.v2.ApacheDS2ConfigurationPluginConstants;
-import org.apache.directory.studio.apacheds.configuration.v2.dialogs.AttributeValueDialog;
-import org.apache.directory.studio.apacheds.configuration.v2.dialogs.JdbmIndexDialog;
-import org.apache.directory.studio.apacheds.configuration.v2.dialogs.MavibotIndexDialog;
+import org.apache.directory.studio.apacheds.configuration.ApacheDS2ConfigurationPlugin;
+import org.apache.directory.studio.apacheds.configuration.ApacheDS2ConfigurationPluginConstants;
+import org.apache.directory.studio.apacheds.configuration.dialogs.AttributeValueDialog;
+import org.apache.directory.studio.apacheds.configuration.dialogs.JdbmIndexDialog;
+import org.apache.directory.studio.apacheds.configuration.dialogs.MavibotIndexDialog;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.ArrayContentProvider;
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/PartitionSpecificDetailsBlock.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/PartitionSpecificDetailsBlock.java?rev=1670491&r1=1670485&r2=1670491&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/PartitionSpecificDetailsBlock.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/PartitionSpecificDetailsBlock.java Tue Mar 31 21:57:10 2015
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.studio.apacheds.configuration.v2.editor;
+package org.apache.directory.studio.apacheds.configuration.editor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/PartitionType.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/PartitionType.java?rev=1670491&r1=1670485&r2=1670491&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/PartitionType.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/PartitionType.java Tue Mar 31 21:57:10 2015
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.studio.apacheds.configuration.v2.editor;
+package org.apache.directory.studio.apacheds.configuration.editor;
import org.apache.directory.server.config.beans.JdbmPartitionBean;
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/PartitionWrapper.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/PartitionWrapper.java?rev=1670491&r1=1670485&r2=1670491&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/PartitionWrapper.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/PartitionWrapper.java Tue Mar 31 21:57:10 2015
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.studio.apacheds.configuration.v2.editor;
+package org.apache.directory.studio.apacheds.configuration.editor;
import org.apache.directory.server.config.beans.PartitionBean;
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/PartitionsMasterDetailsBlock.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/PartitionsMasterDetailsBlock.java?rev=1670491&r1=1670485&r2=1670491&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/PartitionsMasterDetailsBlock.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/PartitionsMasterDetailsBlock.java Tue Mar 31 21:57:10 2015
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.studio.apacheds.configuration.v2.editor;
+package org.apache.directory.studio.apacheds.configuration.editor;
import java.util.ArrayList;
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/PartitionsPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/PartitionsPage.java?rev=1670491&r1=1670485&r2=1670491&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/PartitionsPage.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/PartitionsPage.java Tue Mar 31 21:57:10 2015
@@ -17,12 +17,12 @@
* under the License.
*
*/
-package org.apache.directory.studio.apacheds.configuration.v2.editor;
+package org.apache.directory.studio.apacheds.configuration.editor;
import org.apache.directory.server.config.beans.PartitionBean;
-import org.apache.directory.studio.apacheds.configuration.v2.ApacheDS2ConfigurationPlugin;
-import org.apache.directory.studio.apacheds.configuration.v2.ApacheDS2ConfigurationPluginConstants;
+import org.apache.directory.studio.apacheds.configuration.ApacheDS2ConfigurationPlugin;
+import org.apache.directory.studio.apacheds.configuration.ApacheDS2ConfigurationPluginConstants;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.jface.viewers.Viewer;
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/PasswordPoliciesMasterDetailsBlock.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/PasswordPoliciesMasterDetailsBlock.java?rev=1670491&r1=1670485&r2=1670491&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/PasswordPoliciesMasterDetailsBlock.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/PasswordPoliciesMasterDetailsBlock.java Tue Mar 31 21:57:10 2015
@@ -17,14 +17,14 @@
* under the License.
*
*/
-package org.apache.directory.studio.apacheds.configuration.v2.editor;
+package org.apache.directory.studio.apacheds.configuration.editor;
import org.apache.directory.server.config.beans.AuthenticationInterceptorBean;
import org.apache.directory.server.config.beans.InterceptorBean;
import org.apache.directory.server.config.beans.PasswordPolicyBean;
-import org.apache.directory.studio.apacheds.configuration.v2.ApacheDS2ConfigurationPlugin;
-import org.apache.directory.studio.apacheds.configuration.v2.ApacheDS2ConfigurationPluginConstants;
+import org.apache.directory.studio.apacheds.configuration.ApacheDS2ConfigurationPlugin;
+import org.apache.directory.studio.apacheds.configuration.ApacheDS2ConfigurationPluginConstants;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.ArrayContentProvider;
import org.eclipse.jface.viewers.ISelectionChangedListener;
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/PasswordPoliciesPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/PasswordPoliciesPage.java?rev=1670491&r1=1670485&r2=1670491&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/PasswordPoliciesPage.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/PasswordPoliciesPage.java Tue Mar 31 21:57:10 2015
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.studio.apacheds.configuration.v2.editor;
+package org.apache.directory.studio.apacheds.configuration.editor;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/PasswordPolicyDetailsPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/PasswordPolicyDetailsPage.java?rev=1670491&r1=1670485&r2=1670491&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/PasswordPolicyDetailsPage.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/PasswordPolicyDetailsPage.java Tue Mar 31 21:57:10 2015
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.studio.apacheds.configuration.v2.editor;
+package org.apache.directory.studio.apacheds.configuration.editor;
import org.apache.directory.server.config.beans.PasswordPolicyBean;
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ReplicationDetailsPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ReplicationDetailsPage.java?rev=1670491&r1=1670485&r2=1670491&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ReplicationDetailsPage.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ReplicationDetailsPage.java Tue Mar 31 21:57:10 2015
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.studio.apacheds.configuration.v2.editor;
+package org.apache.directory.studio.apacheds.configuration.editor;
import java.util.ArrayList;
@@ -32,7 +32,7 @@ import org.apache.directory.api.ldap.mod
import org.apache.directory.api.ldap.model.name.Dn;
import org.apache.directory.api.ldap.model.schema.AttributeType;
import org.apache.directory.server.config.beans.ReplConsumerBean;
-import org.apache.directory.studio.apacheds.configuration.v2.dialogs.AttributeDialog;
+import org.apache.directory.studio.apacheds.configuration.dialogs.AttributeDialog;
import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyEvent;
import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyListener;
import org.apache.directory.studio.ldapbrowser.common.widgets.search.EntryWidget;
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ReplicationMasterDetailsBlock.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ReplicationMasterDetailsBlock.java?rev=1670491&r1=1670485&r2=1670491&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ReplicationMasterDetailsBlock.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ReplicationMasterDetailsBlock.java Tue Mar 31 21:57:10 2015
@@ -17,15 +17,15 @@
* under the License.
*
*/
-package org.apache.directory.studio.apacheds.configuration.v2.editor;
+package org.apache.directory.studio.apacheds.configuration.editor;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.message.AliasDerefMode;
import org.apache.directory.api.ldap.model.message.SearchScope;
import org.apache.directory.server.config.beans.ReplConsumerBean;
-import org.apache.directory.studio.apacheds.configuration.v2.ApacheDS2ConfigurationPlugin;
-import org.apache.directory.studio.apacheds.configuration.v2.ApacheDS2ConfigurationPluginConstants;
+import org.apache.directory.studio.apacheds.configuration.ApacheDS2ConfigurationPlugin;
+import org.apache.directory.studio.apacheds.configuration.ApacheDS2ConfigurationPluginConstants;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.ArrayContentProvider;
import org.eclipse.jface.viewers.ISelectionChangedListener;
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ReplicationPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ReplicationPage.java?rev=1670491&r1=1670485&r2=1670491&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ReplicationPage.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ReplicationPage.java Tue Mar 31 21:57:10 2015
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.studio.apacheds.configuration.v2.editor;
+package org.apache.directory.studio.apacheds.configuration.editor;
import org.eclipse.swt.widgets.Composite;
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/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/editor/ServerConfigurationEditor.java?rev=1670491&r1=1670485&r2=1670491&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationEditor.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationEditor.java Tue Mar 31 21:57:10 2015
@@ -17,15 +17,15 @@
* under the License.
*
*/
-package org.apache.directory.studio.apacheds.configuration.v2.editor;
+package org.apache.directory.studio.apacheds.configuration.editor;
import java.lang.reflect.InvocationTargetException;
import org.apache.directory.server.config.ConfigWriter;
-import org.apache.directory.studio.apacheds.configuration.v2.ApacheDS2ConfigurationPlugin;
-import org.apache.directory.studio.apacheds.configuration.v2.jobs.LoadConfigurationRunnable;
-import org.apache.directory.studio.apacheds.configuration.v2.jobs.SaveConfigurationRunnable;
+import org.apache.directory.studio.apacheds.configuration.ApacheDS2ConfigurationPlugin;
+import org.apache.directory.studio.apacheds.configuration.jobs.LoadConfigurationRunnable;
+import org.apache.directory.studio.apacheds.configuration.jobs.SaveConfigurationRunnable;
import org.apache.directory.studio.common.core.jobs.StudioJob;
import org.apache.directory.studio.common.core.jobs.StudioRunnableWithProgress;
import org.eclipse.core.runtime.IProgressMonitor;
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationEditorPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationEditorPage.java?rev=1670491&r1=1670485&r2=1670491&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationEditorPage.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationEditorPage.java Tue Mar 31 21:57:10 2015
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.studio.apacheds.configuration.v2.editor;
+package org.apache.directory.studio.apacheds.configuration.editor;
import java.net.InetAddress;
@@ -25,8 +25,8 @@ import java.net.UnknownHostException;
import org.apache.directory.server.config.beans.ConfigBean;
import org.apache.directory.server.config.beans.DirectoryServiceBean;
-import org.apache.directory.studio.apacheds.configuration.v2.actions.EditorExportConfigurationAction;
-import org.apache.directory.studio.apacheds.configuration.v2.actions.EditorImportConfigurationAction;
+import org.apache.directory.studio.apacheds.configuration.actions.EditorExportConfigurationAction;
+import org.apache.directory.studio.apacheds.configuration.actions.EditorImportConfigurationAction;
import org.apache.directory.studio.connection.core.Connection;
import org.eclipse.jface.action.IToolBarManager;
import org.eclipse.jface.action.Separator;
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/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/editor/ServerConfigurationEditorUtils.java?rev=1670491&r1=1670485&r2=1670491&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationEditorUtils.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationEditorUtils.java Tue Mar 31 21:57:10 2015
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.studio.apacheds.configuration.v2.editor;
+package org.apache.directory.studio.apacheds.configuration.editor;
import java.io.ByteArrayInputStream;
@@ -41,10 +41,10 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.partition.ldif.AbstractLdifPartition;
import org.apache.directory.server.core.partition.ldif.LdifPartition;
import org.apache.directory.server.core.partition.ldif.SingleFileLdifPartition;
-import org.apache.directory.studio.apacheds.configuration.v2.ApacheDS2ConfigurationPlugin;
-import org.apache.directory.studio.apacheds.configuration.v2.ApacheDS2ConfigurationPluginConstants;
-import org.apache.directory.studio.apacheds.configuration.v2.jobs.EntryBasedConfigurationPartition;
-import org.apache.directory.studio.apacheds.configuration.v2.jobs.PartitionsDiffComputer;
+import org.apache.directory.studio.apacheds.configuration.ApacheDS2ConfigurationPlugin;
+import org.apache.directory.studio.apacheds.configuration.ApacheDS2ConfigurationPluginConstants;
+import org.apache.directory.studio.apacheds.configuration.jobs.EntryBasedConfigurationPartition;
+import org.apache.directory.studio.apacheds.configuration.jobs.PartitionsDiffComputer;
import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.common.ui.CommonUIUtils;
import org.apache.directory.studio.common.ui.filesystem.PathEditorInput;
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationInput.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationInput.java?rev=1670491&r1=1670485&r2=1670491&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationInput.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationInput.java Tue Mar 31 21:57:10 2015
@@ -17,11 +17,11 @@
* under the License.
*
*/
-package org.apache.directory.studio.apacheds.configuration.v2.editor;
+package org.apache.directory.studio.apacheds.configuration.editor;
-import org.apache.directory.studio.apacheds.configuration.v2.ApacheDS2ConfigurationPlugin;
-import org.apache.directory.studio.apacheds.configuration.v2.ApacheDS2ConfigurationPluginConstants;
+import org.apache.directory.studio.apacheds.configuration.ApacheDS2ConfigurationPlugin;
+import org.apache.directory.studio.apacheds.configuration.ApacheDS2ConfigurationPluginConstants;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IPersistableElement;
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/SupportedCipher.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/SupportedCipher.java?rev=1670491&r1=1670485&r2=1670491&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/SupportedCipher.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/SupportedCipher.java Tue Mar 31 21:57:10 2015
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.studio.apacheds.configuration.v2.editor;
+package org.apache.directory.studio.apacheds.configuration.editor;
import java.util.ArrayList;
import java.util.HashMap;
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/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/jobs/EntryBasedConfigurationPartition.java?rev=1670491&r1=1670485&r2=1670491&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/jobs/EntryBasedConfigurationPartition.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/jobs/EntryBasedConfigurationPartition.java Tue Mar 31 21:57:10 2015
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.studio.apacheds.configuration.v2.jobs;
+package org.apache.directory.studio.apacheds.configuration.jobs;
import java.util.UUID;
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/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/jobs/LoadConfigurationRunnable.java?rev=1670491&r1=1670485&r2=1670491&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/jobs/LoadConfigurationRunnable.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/jobs/LoadConfigurationRunnable.java Tue Mar 31 21:57:10 2015
@@ -18,7 +18,7 @@
*
*/
-package org.apache.directory.studio.apacheds.configuration.v2.jobs;
+package org.apache.directory.studio.apacheds.configuration.jobs;
import java.io.File;
@@ -50,12 +50,12 @@ import org.apache.directory.server.core.
import org.apache.directory.server.constants.ServerDNConstants;
import org.apache.directory.server.core.partition.impl.btree.AbstractBTreePartition;
import org.apache.directory.server.core.partition.ldif.LdifPartition;
-import org.apache.directory.studio.apacheds.configuration.v2.ApacheDS2ConfigurationPlugin;
-import org.apache.directory.studio.apacheds.configuration.v2.ApacheDS2ConfigurationPluginConstants;
-import org.apache.directory.studio.apacheds.configuration.v2.editor.Configuration;
-import org.apache.directory.studio.apacheds.configuration.v2.editor.ConnectionServerConfigurationInput;
-import org.apache.directory.studio.apacheds.configuration.v2.editor.NewServerConfigurationInput;
-import org.apache.directory.studio.apacheds.configuration.v2.editor.ServerConfigurationEditor;
+import org.apache.directory.studio.apacheds.configuration.ApacheDS2ConfigurationPlugin;
+import org.apache.directory.studio.apacheds.configuration.ApacheDS2ConfigurationPluginConstants;
+import org.apache.directory.studio.apacheds.configuration.editor.Configuration;
+import org.apache.directory.studio.apacheds.configuration.editor.ConnectionServerConfigurationInput;
+import org.apache.directory.studio.apacheds.configuration.editor.NewServerConfigurationInput;
+import org.apache.directory.studio.apacheds.configuration.editor.ServerConfigurationEditor;
import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.common.core.jobs.StudioRunnableWithProgress;
import org.apache.directory.studio.connection.core.Connection;
@@ -152,7 +152,7 @@ public class LoadConfigurationRunnable i
catch ( Exception e )
{
ApacheDS2ConfigurationPlugin.getDefault().getLog().log(
- new Status( Status.ERROR, "org.apache.directory.studio.apacheds.configuration.v2",
+ new Status( Status.ERROR, "org.apache.directory.studio.apacheds.configuration",
e.getMessage() ) );
// Reporting the error to the monitor
@@ -377,7 +377,7 @@ public class LoadConfigurationRunnable i
if ( configEntry == null )
{
ApacheDS2ConfigurationPlugin.getDefault().getLog().log(
- new Status( Status.ERROR, "org.apache.directory.studio.apacheds.configuration.v2",
+ new Status( Status.ERROR, "org.apache.directory.studio.apacheds.configuration",
Messages.getString( "LoadConfigurationRunnable.UnableToFindConfigBaseEntry" ) ) );
throw new LdapNoSuchObjectException(
Messages.getString( "LoadConfigurationRunnable.UnableToFindConfigBaseEntry" ) ); //$NON-NLS-1$
Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/jobs/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/jobs/Messages.java?rev=1670491&r1=1670485&r2=1670491&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/jobs/Messages.java (original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/jobs/Messages.java Tue Mar 31 21:57:10 2015
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.studio.apacheds.configuration.v2.jobs;
+package org.apache.directory.studio.apacheds.configuration.jobs;
import java.util.MissingResourceException;