directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1804081 [1/6] - in /directory/studio/branches/studio-value: ./ dist/ eclipse-trgt-platform/template/ features/apacheds.feature/ features/ldapbrowser.feature/ features/ldifeditor.feature/ features/nls.feature/ features/openldap.feature/ fea...
Date Fri, 04 Aug 2017 08:59:17 GMT
Author: elecharny
Date: Fri Aug  4 08:59:15 2017
New Revision: 1804081

URL: http://svn.apache.org/viewvc?rev=1804081&view=rev
Log:
merged Studio changes since the value branch was created

Added:
    directory/studio/branches/studio-value/LICENSE
      - copied unchanged from r1803215, directory/studio/trunk/LICENSE
    directory/studio/branches/studio-value/NOTICE
      - copied unchanged from r1803215, directory/studio/trunk/NOTICE
    directory/studio/branches/studio-value/installers/
      - copied from r1803215, directory/studio/trunk/installers/
    directory/studio/branches/studio-value/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/StringValueEditorUtils.java
      - copied unchanged from r1803215, directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/StringValueEditorUtils.java
    directory/studio/branches/studio-value/plugins/ldapbrowser.common/src/test/java/org/apache/directory/studio/valueeditors/
      - copied from r1803215, directory/studio/trunk/plugins/ldapbrowser.common/src/test/java/org/apache/directory/studio/valueeditors/
    directory/studio/branches/studio-value/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/AbstractLinkWithEditorAction.java
      - copied unchanged from r1803215, directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/AbstractLinkWithEditorAction.java
    directory/studio/branches/studio-value/plugins/ldapservers.apacheds/src/main/java/org/apache/directory/studio/ldapservers/apacheds/ExtensionUtils.java
      - copied unchanged from r1803215, directory/studio/trunk/plugins/ldapservers.apacheds/src/main/java/org/apache/directory/studio/ldapservers/apacheds/ExtensionUtils.java
    directory/studio/branches/studio-value/plugins/ldapservers.apacheds/src/main/java/org/apache/directory/studio/ldapservers/apacheds/RepairAction.java
      - copied unchanged from r1803215, directory/studio/trunk/plugins/ldapservers.apacheds/src/main/java/org/apache/directory/studio/ldapservers/apacheds/RepairAction.java
    directory/studio/branches/studio-value/plugins/ldapservers.apacheds/src/main/java/org/apache/directory/studio/ldapservers/apacheds/RepairRunnable.java
      - copied unchanged from r1803215, directory/studio/trunk/plugins/ldapservers.apacheds/src/main/java/org/apache/directory/studio/ldapservers/apacheds/RepairRunnable.java
    directory/studio/branches/studio-value/product/LICENSE
      - copied unchanged from r1803215, directory/studio/trunk/product/LICENSE
    directory/studio/branches/studio-value/product/NOTICE
      - copied unchanged from r1803215, directory/studio/trunk/product/NOTICE
    directory/studio/branches/studio-value/tests/test.integration.core/src/main/java/org/apache/directory/studio/test/integration/core/ConnectionWrapperTestBase.java
      - copied unchanged from r1803215, directory/studio/trunk/tests/test.integration.core/src/main/java/org/apache/directory/studio/test/integration/core/ConnectionWrapperTestBase.java
    directory/studio/branches/studio-value/tests/test.integration.core/src/main/resources/
      - copied from r1803215, directory/studio/trunk/tests/test.integration.core/src/main/resources/
    directory/studio/branches/studio-value/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/CertificateUtils.java
      - copied unchanged from r1803215, directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/CertificateUtils.java
    directory/studio/branches/studio-value/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/CertificateValidationTest.java
      - copied unchanged from r1803215, directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/CertificateValidationTest.java
    directory/studio/branches/studio-value/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/GssApiTest.java
      - copied unchanged from r1803215, directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/GssApiTest.java
    directory/studio/branches/studio-value/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/SchemaEditorSearchTest.java
      - copied unchanged from r1803215, directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/SchemaEditorSearchTest.java
    directory/studio/branches/studio-value/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ValueEditorTest.java
      - copied unchanged from r1803215, directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ValueEditorTest.java
    directory/studio/branches/studio-value/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/CertificateViewerDialogBot.java
      - copied unchanged from r1803215, directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/CertificateViewerDialogBot.java
    directory/studio/branches/studio-value/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/CheckAuthenticationDialogBot.java
      - copied unchanged from r1803215, directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/CheckAuthenticationDialogBot.java
    directory/studio/branches/studio-value/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/NewSchemaProjectWizardBot.java
      - copied unchanged from r1803215, directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/NewSchemaProjectWizardBot.java
    directory/studio/branches/studio-value/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/SchemaProjectsViewBot.java
      - copied unchanged from r1803215, directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/SchemaProjectsViewBot.java
    directory/studio/branches/studio-value/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/SchemaSearchViewBot.java
      - copied unchanged from r1803215, directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/SchemaSearchViewBot.java
    directory/studio/branches/studio-value/tests/test.integration.ui/src/main/resources/org/apache/directory/studio/test/integration/ui/GssApiTest.ldif
      - copied unchanged from r1803215, directory/studio/trunk/tests/test.integration.ui/src/main/resources/org/apache/directory/studio/test/integration/ui/GssApiTest.ldif
    directory/studio/branches/studio-value/tools/run-ui-tests.sh
      - copied unchanged from r1803215, directory/studio/trunk/tools/run-ui-tests.sh
    directory/studio/branches/studio-value/tools/start-xvfb-docker-container
      - copied unchanged from r1803215, directory/studio/trunk/tools/start-xvfb-docker-container
    directory/studio/branches/studio-value/tools/stop-and-rm-xvfb-docker-container
      - copied unchanged from r1803215, directory/studio/trunk/tools/stop-and-rm-xvfb-docker-container
Removed:
    directory/studio/branches/studio-value/LICENSE.txt
    directory/studio/branches/studio-value/NOTICE.txt
    directory/studio/branches/studio-value/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/model/AclWhatClauseEnum.java
Modified:
    directory/studio/branches/studio-value/   (props changed)
    directory/studio/branches/studio-value/.gitignore
    directory/studio/branches/studio-value/README.md
    directory/studio/branches/studio-value/dist/dist.sh
    directory/studio/branches/studio-value/eclipse-trgt-platform/template/org.apache.directory.studio.eclipse-trgt-platform.template
    directory/studio/branches/studio-value/features/apacheds.feature/feature.xml
    directory/studio/branches/studio-value/features/ldapbrowser.feature/feature.xml
    directory/studio/branches/studio-value/features/ldifeditor.feature/feature.xml
    directory/studio/branches/studio-value/features/nls.feature/feature.xml
    directory/studio/branches/studio-value/features/openldap.feature/feature.xml
    directory/studio/branches/studio-value/features/rcp.feature/feature.xml
    directory/studio/branches/studio-value/features/schemaeditor.feature/feature.xml
    directory/studio/branches/studio-value/helps/apacheds.help/src/main/docbook/0_index.xml
    directory/studio/branches/studio-value/helps/ldapbrowser.help/src/main/docbook/0_index.xml
    directory/studio/branches/studio-value/helps/ldapbrowser.help/src/main/resources/about.html
    directory/studio/branches/studio-value/helps/ldifeditor.help/src/main/docbook/0_index.xml
    directory/studio/branches/studio-value/helps/rcp.help/src/main/docbook/0_index.xml
    directory/studio/branches/studio-value/helps/schemaeditor.help/src/main/docbook/0_index.xml
    directory/studio/branches/studio-value/helps/schemaeditor.help/src/main/resources/about.html
    directory/studio/branches/studio-value/p2repositories/pom.xml
    directory/studio/branches/studio-value/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/UserClassWrapper.java
    directory/studio/branches/studio-value/plugins/apacheds.configuration/about.ini
    directory/studio/branches/studio-value/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/KerberosServerPage.java
    directory/studio/branches/studio-value/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/LdapLdapsServersPage.java
    directory/studio/branches/studio-value/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/OverviewPage.java
    directory/studio/branches/studio-value/plugins/combinededitor/src/main/java/org/apache/directory/studio/combinededitor/editor/CombinedEntryEditor.java
    directory/studio/branches/studio-value/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/CursorStudioNamingEnumeration.java
    directory/studio/branches/studio-value/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java
    directory/studio/branches/studio-value/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JNDIConnectionWrapper.java
    directory/studio/branches/studio-value/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JndiStudioNamingEnumeration.java
    directory/studio/branches/studio-value/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/ReferralsInfo.java
    directory/studio/branches/studio-value/plugins/connection.core/src/main/resources/org/apache/directory/studio/connection/core/OIDDescriptions.properties
    directory/studio/branches/studio-value/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/UIAuthHandler.java
    directory/studio/branches/studio-value/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/CertificateListComposite.java
    directory/studio/branches/studio-value/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/HexDialog.java
    directory/studio/branches/studio-value/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/TextDialog.java
    directory/studio/branches/studio-value/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenBestEditorAction.java
    directory/studio/branches/studio-value/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/wizards/AttributeTypeWizardPage.java
    directory/studio/branches/studio-value/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/AbstractDialogBinaryValueEditor.java
    directory/studio/branches/studio-value/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/AbstractDialogStringValueEditor.java
    directory/studio/branches/studio-value/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/AbstractInPlaceStringValueEditor.java
    directory/studio/branches/studio-value/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/IValueEditor.java
    directory/studio/branches/studio-value/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/valueeditors/TextValueEditor.java
    directory/studio/branches/studio-value/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapAndFilterComponent.java
    directory/studio/branches/studio-value/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapFilterComponent.java
    directory/studio/branches/studio-value/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapNotFilterComponent.java
    directory/studio/branches/studio-value/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/filter/LdapOrFilterComponent.java
    directory/studio/branches/studio-value/plugins/ldapbrowser.ui/about.ini
    directory/studio/branches/studio-value/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorManager.java
    directory/studio/branches/studio-value/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/entryeditors/EntryEditorUtils.java
    directory/studio/branches/studio-value/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/BrowserUIConstants.java
    directory/studio/branches/studio-value/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditor.java
    directory/studio/branches/studio-value/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/LdifEntryEditor.java
    directory/studio/branches/studio-value/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/MultiTabEntryEditor.java
    directory/studio/branches/studio-value/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/SingleTabEntryEditor.java
    directory/studio/branches/studio-value/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditor.java
    directory/studio/branches/studio-value/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/LinkWithEditorAction.java
    directory/studio/branches/studio-value/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/connection/LinkWithEditorAction.java
    directory/studio/branches/studio-value/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportModificationLogsWizard.java
    directory/studio/branches/studio-value/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportSearchLogsWizard.java
    directory/studio/branches/studio-value/plugins/ldapservers.apacheds/plugin.properties
    directory/studio/branches/studio-value/plugins/ldapservers.apacheds/plugin.xml
    directory/studio/branches/studio-value/plugins/ldapservers.apacheds/resources/conf/log4j.properties
    directory/studio/branches/studio-value/plugins/ldapservers.apacheds/src/main/java/org/apache/directory/studio/ldapservers/apacheds/ApacheDS200LdapServerAdapter.java
    directory/studio/branches/studio-value/plugins/ldapservers.apacheds/src/main/java/org/apache/directory/studio/ldapservers/apacheds/CreateConnectionAction.java
    directory/studio/branches/studio-value/plugins/ldapservers.apacheds/src/main/java/org/apache/directory/studio/ldapservers/apacheds/messages.properties
    directory/studio/branches/studio-value/plugins/ldapservers/pom-first.xml
    directory/studio/branches/studio-value/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServersUtils.java
    directory/studio/branches/studio-value/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/jobs/StudioLdapServerJob.java
    directory/studio/branches/studio-value/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/model/LdapServerStatus.java
    directory/studio/branches/studio-value/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/views/ServersTableViewer.java
    directory/studio/branches/studio-value/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/views/ServersView.java
    directory/studio/branches/studio-value/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/views/ServersViewLabelProvider.java
    directory/studio/branches/studio-value/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/views/messages.properties
    directory/studio/branches/studio-value/plugins/ldifeditor/about.ini
    directory/studio/branches/studio-value/plugins/openldap.acl.editor/src/main/antlr/Acl.g
    directory/studio/branches/studio-value/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/model/AclAttribute.java
    directory/studio/branches/studio-value/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/model/AclAttributeStyleEnum.java
    directory/studio/branches/studio-value/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/model/AclAttributeVal.java
    directory/studio/branches/studio-value/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/model/AclItem.java
    directory/studio/branches/studio-value/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/model/AclWhatClause.java
    directory/studio/branches/studio-value/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/model/AclWhatClauseAttributes.java
    directory/studio/branches/studio-value/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/model/AclWhatClauseDn.java
    directory/studio/branches/studio-value/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/model/AclWhatClauseFilter.java
    directory/studio/branches/studio-value/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/model/AclWhatClauseStar.java
    directory/studio/branches/studio-value/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/model/AclWhoClauseDn.java
    directory/studio/branches/studio-value/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/widgets/OpenLdapAclWhatClauseWidget.java
    directory/studio/branches/studio-value/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/widgets/composites/WhatClauseDnComposite.java
    directory/studio/branches/studio-value/plugins/openldap.acl.editor/src/test/java/org/apache/directory/studio/openldap/config/acl/model/OpenLdapAclParserTest.java
    directory/studio/branches/studio-value/plugins/rcp/about.ini
    directory/studio/branches/studio-value/plugins/rcp/plugin.properties
    directory/studio/branches/studio-value/plugins/rcp/plugin_de.properties
    directory/studio/branches/studio-value/plugins/rcp/plugin_fr.properties
    directory/studio/branches/studio-value/plugins/rcp/resources/intro/overview.xhtml
    directory/studio/branches/studio-value/plugins/rcp/src/main/resources/about.ini
    directory/studio/branches/studio-value/plugins/rcp/src/main/resources/splash.bmp
    directory/studio/branches/studio-value/plugins/schemaeditor/about.ini
    directory/studio/branches/studio-value/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java
    directory/studio/branches/studio-value/plugins/templateeditor/src/main/java/org/apache/directory/studio/templateeditor/editor/TemplateEntryEditor.java
    directory/studio/branches/studio-value/plugins/valueeditors/pom-first.xml
    directory/studio/branches/studio-value/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/bool/InPlaceBooleanValueEditor.java
    directory/studio/branches/studio-value/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/image/ImageDialog.java
    directory/studio/branches/studio-value/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/image/ImageValueEditor.java
    directory/studio/branches/studio-value/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/objectclass/ObjectClassValueEditor.java
    directory/studio/branches/studio-value/plugins/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/oid/InPlaceOidValueEditor.java
    directory/studio/branches/studio-value/plugins/valueeditors/src/test/java/org/apache/directory/studio/valueeditors/msad/InPlaceMsAdObjectGuidValueEditorTest.java
    directory/studio/branches/studio-value/plugins/valueeditors/src/test/java/org/apache/directory/studio/valueeditors/msad/InPlaceMsAdObjectSidValueEditorTest.java
    directory/studio/branches/studio-value/plugins/valueeditors/src/test/java/org/apache/directory/studio/valueeditors/uuid/InPlaceUuidValueEditorTest.java
    directory/studio/branches/studio-value/pom.xml
    directory/studio/branches/studio-value/product/org.apache.directory.studio.p2.inf
    directory/studio/branches/studio-value/product/org.apache.directory.studio.product
    directory/studio/branches/studio-value/product/pom.xml
    directory/studio/branches/studio-value/tests/test.integration.core/pom-first.xml
    directory/studio/branches/studio-value/tests/test.integration.core/src/main/java/org/apache/directory/studio/test/integration/core/DirectoryApiConnectionWrapperTest.java
    directory/studio/branches/studio-value/tests/test.integration.core/src/main/java/org/apache/directory/studio/test/integration/core/JNDIConnectionWrapperTest.java
    directory/studio/branches/studio-value/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ApacheDSPluginTest.java
    directory/studio/branches/studio-value/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/BrowserTest.java
    directory/studio/branches/studio-value/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/EntryEditorTest.java
    directory/studio/branches/studio-value/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ImportExportTest.java
    directory/studio/branches/studio-value/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewConnectionWizardTest.java
    directory/studio/branches/studio-value/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewEntryWizardTest.java
    directory/studio/branches/studio-value/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/PreferencesTest.java
    directory/studio/branches/studio-value/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/RcpAppTest.java
    directory/studio/branches/studio-value/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/ApacheDSConfigurationEditorBot.java
    directory/studio/branches/studio-value/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/ApacheDSServersViewBot.java
    directory/studio/branches/studio-value/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/BotUtils.java
    directory/studio/branches/studio-value/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/BrowserViewBot.java
    directory/studio/branches/studio-value/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/BrowserWidgetBot.java
    directory/studio/branches/studio-value/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/CertificateTrustDialogBot.java
    directory/studio/branches/studio-value/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/CertificateValidationPreferencePageBot.java
    directory/studio/branches/studio-value/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/ConnectionsViewBot.java
    directory/studio/branches/studio-value/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/ErrorDialogBot.java
    directory/studio/branches/studio-value/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/NewConnectionWizardBot.java
    directory/studio/branches/studio-value/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/ReferralDialogBot.java
    directory/studio/branches/studio-value/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/StudioBot.java
    directory/studio/branches/studio-value/tools/Windows Installer/windows_installer.nsi

Propchange: directory/studio/branches/studio-value/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug  4 08:59:15 2017
@@ -2,4 +2,4 @@
 /directory/studio/branches/shared-trunk-merge:1004968-1005876
 /directory/studio/branches/studio-connection-refactoring:1022102-1030058
 /directory/studio/branches/studio-tycho:1623666-1668689
-/directory/studio/trunk:1066125-1067996,1068027-1072726,1072812-1075332
+/directory/studio/trunk:1066125-1067996,1068027-1072726,1072812-1075332,1734872-1803215

Modified: directory/studio/branches/studio-value/.gitignore
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/.gitignore?rev=1804081&r1=1804080&r2=1804081&view=diff
==============================================================================
--- directory/studio/branches/studio-value/.gitignore (original)
+++ directory/studio/branches/studio-value/.gitignore Fri Aug  4 08:59:15 2017
@@ -4,7 +4,8 @@
 .pmd
 target/
 META-INF/
-eclipse-target-platform/eclipse-target-platform.target
+eclipse-trgt-platform/org.apache.directory.studio.eclipse-trgt-platform.target
 plugins/ldapbrowser.core/lib/
 plugins/ldapservers.apacheds/resources/libs/
+tests/test.integration.ui/screenshots
 

Modified: directory/studio/branches/studio-value/README.md
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/README.md?rev=1804081&r1=1804080&r2=1804081&view=diff
==============================================================================
--- directory/studio/branches/studio-value/README.md (original)
+++ directory/studio/branches/studio-value/README.md Fri Aug  4 08:59:15 2017
@@ -25,7 +25,7 @@ Apache Directory Studio is a complete di
 
 ### Prerequisites
 
-* JDK 7 or newer
+* JDK 8 or newer
 * Maven 3 or newer
 * Sufficient heap space for Maven: `export MAVEN_OPTS="-Xmx512m"`
 * FIXME: Windows users have to replace the repository location `file://${basedir}/target/repository` in `eclipse-trgt-platform/template/org.apache.directory.studio.eclipse-trgt-platform.template` with the actual path, e.g. `file:///C:/Development/studio/eclipse-trgt-platform/target/repository`
@@ -65,7 +65,11 @@ or on Windows :
 
 ### Build issues
 
-Tycho doesn't handle snapshot dependencies well. The first time a snapshot dependency is used within the build it is cached in `~/.m2/repository/p2`. Afterwards any change in the dependency (e.g. ApacheDS or LDAP API) is the considered unless it is deleted from the cache.
+Tycho doesn't handle snapshot dependencies well. The first time a snapshot dependency is used within the build it is cached in `~/.m2/repository/p2`. Afterwards any change in the dependency (e.g. ApacheDS or LDAP API) is not considered unless it is deleted from the cache.
+
+To delete all Apache Directory related snapshots run:
+
+    rm -rf ~/.m2/repository/p2/osgi/bundle/org.apache.directory.*
 
 
 ## Setup Eclipse workspace
@@ -109,6 +113,12 @@ The build produces binaries for all plat
 
 tentative, not fully tested yet...
 
+### Licenses
+
+The root directory contains LICENSE and NOTICE files for the source distribution.
+The product directory contains LICENSE and NOTICE files for the binary distributions, including licenses for bundled dependencies.
+
+
 ### Release artifacts
 
 We release the following artifacts:
@@ -122,12 +132,12 @@ We release the following artifacts:
 * P2 repositories
     * the main features (LDAP Browser, Schema Editor, ApacheDS)
     * dependencies
-* Product archives for
+* Product archives and installers for
     * Linux GTK 32bit tar.gz
     * Linux GTK 64bit tar.gz
-    * Mac OS X 64bit tar.gz
-    * Windows 32bit zip
-    * Windows 64bit zip
+    * Mac OS X 64bit dmg
+    * Windows 32bit exe installer and zip
+    * Windows 64bit exe installer and zip
 * Userguides
 
 
@@ -136,7 +146,7 @@ We release the following artifacts:
 Test the release build: rat check, javadoc and source jar generation, GPG signing, userguide generation
 
     mvn -f pom-first.xml clean install
-    mvn -Papache-release -Duserguides clean install
+    mvn -Papache-release,windows,macos -Duserguides clean install
 
 Run UI tests (if possible on all platforms)
 
@@ -170,15 +180,18 @@ Also create an empty directory used duri
     svn checkout https://svn.apache.org/repos/asf/directory/studio/branches/$VERSION branch-$VERSION
     cd branch-$VERSION
 
-#### Set the version
+#### Remove OpenLDAP feature
+
+As long as the `org.apache.directory.studio.openldap.feature` is not ready for release it needs to be removed from `product/org.apache.directory.studio.product`.
+
+#### Set the version and commit
 
     find . -name pom-first.xml | xargs sed -i 's/2.0.0-SNAPSHOT/'$VERSION'/'
     find . -name pom-first.xml | xargs sed -i 's/2.0.0.qualifier/'$VERSION'/'
+    sed -i 's/2.0.0-SNAPSHOT/'$VERSION'/' pom.xml
     mvn -f pom-first.xml clean install
-    mvn org.eclipse.tycho:tycho-versions-plugin:0.22.0:set-version -DnewVersion=$VERSION
-
-#### Commit
-
+    svn revert pom.xml
+    mvn org.eclipse.tycho:tycho-versions-plugin:0.24.0:set-version -DnewVersion=$VERSION
     svn commit -m "Set version number for release $VERSION"
 
 #### Create and checkout tag
@@ -191,7 +204,7 @@ Also create an empty directory used duri
 #### Build the release and deploy to staging Nexus repository
 
     mvn -f pom-first.xml clean install
-    mvn -Papache-release -Duserguides -DretryFailedDeploymentCount=3 clean deploy
+    mvn -Papache-release,windows,macos -Duserguides -DretryFailedDeploymentCount=3 clean deploy
 
 #### Close the staging Nexus repository
 
@@ -212,20 +225,27 @@ Run the dist script:
 
 Afterwards all distribution packages are located in `target`.
 
-### Call the vote
+#### Upload the artifacts to SVN
 
-Upload `target/$VERSION` to people.apache.org
+    cd target/$VERSION
+    svn mkdir https://dist.apache.org/repos/dist/dev/directory/studio/$VERSION -m "Create dev area for release $VERSION"
+    svn co https://dist.apache.org/repos/dist/dev/directory/studio/$VERSION .
+    svn add *
+    svn commit -m "Add release $VERSION"
 
-    scp -r target/$VERSION people.apache.org:~/public_html/
+### Call the vote
 
-and start the vote.
+Start the vote.
 
 ### Publish
 
-After successful vote we can publish the artifacts
+After successful vote publish the artifacts.
+
+Release artifacts in Nexus.
+
+Move distribution packages from `dev` area to `release`:
 
-* Release artifacts in Nexus
-* Commit distribution packages to https://dist.apache.org/repos/dist/release/directory/studio, the content of `dist/target` can be used as-is.
+	svn mv https://dist.apache.org/repos/dist/dev/directory/studio/$VERSION https://dist.apache.org/repos/dist/release/directory/studio/$VERSION -m "Release $VERSION"
 
 Wait 24h for mirror rsync.
 
@@ -246,8 +266,8 @@ change the location path to the new rele
 
 Update news and download links
 
-* Versions (2x) in `lib/path.pm`
-* Version in `content/index.mdtext`
+* `lib/path.pm`: `$version_studio` and `$version_studio_name`
+* `content/index.mdtext`: version string
 * `content/studio/changelog.mdtext`
 * `content/studio/news.mdtext`
 
@@ -257,7 +277,7 @@ TODO
 
 #### Cleanup
 
-Delete old releases.
+Delete old releases from `https://dist.apache.org/repos/dist/release/directory/studio/`, ensure they were already archived to `https://archive.apache.org/dist/directory/studio/`.
 
 
 ## Misc tips and tricks

Modified: directory/studio/branches/studio-value/dist/dist.sh
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/dist/dist.sh?rev=1804081&r1=1804080&r2=1804081&view=diff
==============================================================================
--- directory/studio/branches/studio-value/dist/dist.sh (original)
+++ directory/studio/branches/studio-value/dist/dist.sh Fri Aug  4 08:59:15 2017
@@ -35,31 +35,24 @@ if [ -e "$TARGET_DIR" ]; then
 fi
 
 echo
-echo "### Creating dist folders"
+echo "### Creating dist folder"
 DIST_DIR=${TARGET_DIR}/${VERSION}
-UPDATE_SITE_DIR=${TARGET_DIR}/update/${VERSION}
 mkdir -p ${DIST_DIR}
-mkdir -p ${UPDATE_SITE_DIR}
 
-echo
-echo "### Copying update sites"
-cp -a ../p2repositories/dependencies/target/repository ${UPDATE_SITE_DIR}/dependencies
-cp -a ../p2repositories/eclipse/target/repository ${UPDATE_SITE_DIR}/eclipse
-
-echo
-echo "### Signing update sites"
-cd ${UPDATE_SITE_DIR}/dependencies
-sh ${WORK_DIR}/sign.sh
-zip -r ${DIST_DIR}/ApacheDirectoryStudio-${VERSION}-p2repository-dependencies.zip *
-cd ${UPDATE_SITE_DIR}/eclipse
-sh ${WORK_DIR}/sign.sh
-zip -r ${DIST_DIR}/ApacheDirectoryStudio-${VERSION}-p2repository.zip *
 
 echo
 echo "### Copying dist files"
 cd ${WORK_DIR}
 cp ../target/org.apache.directory.studio.parent-${VERSION}-source-release.zip ${DIST_DIR}/ApacheDirectoryStudio-${VERSION}-src.zip
-cp ../product/target/products/ApacheDirectoryStudio-${VERSION}-*.{zip,tar.gz} ${DIST_DIR}/
+#cp ../product/target/products/ApacheDirectoryStudio-${VERSION}-*.{zip,tar.gz} ${DIST_DIR}/
+cp ../product/target/products/ApacheDirectoryStudio-${VERSION}-win32.win32.x86_64.zip ${DIST_DIR}/
+cp ../product/target/products/ApacheDirectoryStudio-${VERSION}-win32.win32.x86.zip ${DIST_DIR}/
+cp ../product/target/products/ApacheDirectoryStudio-${VERSION}-linux.gtk.x86_64.tar.gz ${DIST_DIR}/
+cp ../product/target/products/ApacheDirectoryStudio-${VERSION}-linux.gtk.x86.tar.gz ${DIST_DIR}/
+cp ../installers/windows/32bit/target/ApacheDirectoryStudio-${VERSION}-win32.win32.x86.exe ${DIST_DIR}/
+cp ../installers/windows/64bit/target/ApacheDirectoryStudio-${VERSION}-win32.win32.x86_64.exe ${DIST_DIR}/
+cp ../installers/macos/target/ApacheDirectoryStudio-${VERSION}-macosx.cocoa.x86_64.dmg ${DIST_DIR}/
+
 
 echo
 echo "### Checking legal files"
@@ -74,13 +67,19 @@ do
         *.tar.gz)
             cmd="tar -tzvf $file"
             ;;
+        *.exe)
+            continue
+            ;;
+        *.dmg)
+            continue
+            ;;
         *)
             echo "Unknown file type: $file"
             exit 1
             ;;
     esac
-    eval "$cmd" | grep "LICENSE.txt"
-    eval "$cmd" | grep "NOTICE.txt"
+    eval "$cmd" | grep "LICENSE"
+    eval "$cmd" | grep "NOTICE"
 done
 
 echo
@@ -88,5 +87,23 @@ echo "### Signing dist files"
 sh ${WORK_DIR}/sign.sh
 
 echo
+echo "### Copying update sites"
+UPDATE_SITE_DIR=${TARGET_DIR}/${VERSION}/update
+mkdir -p ${UPDATE_SITE_DIR}
+cd ${WORK_DIR}
+cp -a ../p2repositories/dependencies/target/repository ${UPDATE_SITE_DIR}/dependencies
+cp -a ../p2repositories/eclipse/target/repository ${UPDATE_SITE_DIR}/eclipse
+
+echo
+echo "### Signing update sites"
+cd ${UPDATE_SITE_DIR}/dependencies
+sh ${WORK_DIR}/sign.sh
+#zip -r ${DIST_DIR}/ApacheDirectoryStudio-${VERSION}-p2repository-dependencies.zip *
+cd ${UPDATE_SITE_DIR}/eclipse
+sh ${WORK_DIR}/sign.sh
+#zip -r ${DIST_DIR}/ApacheDirectoryStudio-${VERSION}-p2repository.zip *
+
+
+echo
 echo "### Success"
 

Modified: directory/studio/branches/studio-value/eclipse-trgt-platform/template/org.apache.directory.studio.eclipse-trgt-platform.template
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/eclipse-trgt-platform/template/org.apache.directory.studio.eclipse-trgt-platform.template?rev=1804081&r1=1804080&r2=1804081&view=diff
==============================================================================
--- directory/studio/branches/studio-value/eclipse-trgt-platform/template/org.apache.directory.studio.eclipse-trgt-platform.template (original)
+++ directory/studio/branches/studio-value/eclipse-trgt-platform/template/org.apache.directory.studio.eclipse-trgt-platform.template Fri Aug  4 08:59:15 2017
@@ -19,7 +19,7 @@
   @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
 -->
 <?pde version="3.8"?>
-<target name="Apache Directory Studio Platform" sequenceNumber="255">
+<target name="Apache Directory Studio Platform" sequenceNumber="307">
   <locations>
 
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
@@ -105,17 +105,17 @@
     </location>
 
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-      <unit id="org.eclipse.rcp.feature.group" version="4.5.2.v20160212-1500"/>
-      <unit id="org.eclipse.rcp.source.feature.group" version="4.5.2.v20160212-1500"/>
-      <unit id="org.eclipse.platform.feature.group" version="4.5.2.v20160212-1500"/>
-      <unit id="org.eclipse.platform.source.feature.group" version="4.5.2.v20160212-1500"/>
-      <unit id="org.eclipse.jdt.feature.group" version="3.11.2.v20160212-1500"/>
-      <unit id="org.eclipse.jdt.source.feature.group" version="3.11.2.v20160212-1500"/>
-      <unit id="org.eclipse.pde.feature.group" version="3.11.2.v20160212-1500"/>
-      <unit id="org.eclipse.pde.source.feature.group" version="3.11.2.v20160212-1500"/>
-      <unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.2.102.v20160129-0947"/>
-      <unit id="org.eclipse.equinox.executable.feature.group" version="3.6.200.v20150602-1417"/>
-      <repository location="http://download.eclipse.org/eclipse/updates/4.5"/>
+      <unit id="org.eclipse.rcp.feature.group" version="4.6.3.v20170301-0400"/>
+      <unit id="org.eclipse.rcp.source.feature.group" version="4.6.3.v20170301-0400"/>
+      <unit id="org.eclipse.platform.feature.group" version="4.6.3.v20170301-0400"/>
+      <unit id="org.eclipse.platform.source.feature.group" version="4.6.3.v20170301-0400"/>
+      <unit id="org.eclipse.jdt.feature.group" version="3.12.3.v20170301-0400"/>
+      <unit id="org.eclipse.jdt.source.feature.group" version="3.12.3.v20170301-0400"/>
+      <unit id="org.eclipse.pde.feature.group" version="3.12.3.v20170301-0400"/>
+      <unit id="org.eclipse.pde.source.feature.group" version="3.12.3.v20170301-0400"/>
+      <unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.2.203.v20170131-1444"/>
+      <unit id="org.eclipse.equinox.executable.feature.group" version="3.6.300.v20161122-1740"/>
+      <repository location="http://download.eclipse.org/eclipse/updates/4.6"/>
     </location>
 
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
@@ -126,17 +126,17 @@
     </location>
 
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-      <unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.3.0.201506081302"/>
+      <unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.5.0.201609021837"/>
       <unit id="org.hamcrest.core" version="1.3.0.v201303031735"/>
-      <unit id="org.hamcrest.library" version="1.3.0.v201305281000"/>
+      <unit id="org.hamcrest.library" version="1.3.0.v201505072020"/>
       <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
-      <repository location="http://download.eclipse.org/technology/swtbot/releases/2.3.0/"/>
+      <repository location="http://download.eclipse.org/technology/swtbot/releases/2.5.0/"/>
     </location>
 
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="org.eclipse.babel.nls_eclipse_de.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.babel.nls_eclipse_fr.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/technology/babel/update-site/R0.13.1/mars"/>
+      <repository location="http://download.eclipse.org/technology/babel/update-site/R0.14.1/neon"/>
     </location>
 
   </locations>

Modified: directory/studio/branches/studio-value/features/apacheds.feature/feature.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/features/apacheds.feature/feature.xml?rev=1804081&r1=1804080&r2=1804081&view=diff
==============================================================================
--- directory/studio/branches/studio-value/features/apacheds.feature/feature.xml (original)
+++ directory/studio/branches/studio-value/features/apacheds.feature/feature.xml Fri Aug  4 08:59:15 2017
@@ -12,7 +12,7 @@
    </description>
 
    <copyright>
-      Copyright © 2006-2015 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
+      Copyright © 2006-2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
    </copyright>
 
    <license url="http://www.apache.org/licenses/LICENSE-2.0.html">

Modified: directory/studio/branches/studio-value/features/ldapbrowser.feature/feature.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/features/ldapbrowser.feature/feature.xml?rev=1804081&r1=1804080&r2=1804081&view=diff
==============================================================================
--- directory/studio/branches/studio-value/features/ldapbrowser.feature/feature.xml (original)
+++ directory/studio/branches/studio-value/features/ldapbrowser.feature/feature.xml Fri Aug  4 08:59:15 2017
@@ -12,7 +12,7 @@
    </description>
 
    <copyright>
-      Copyright © 2006-2015 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
+      Copyright © 2006-2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
    </copyright>
 
    <license url="http://www.apache.org/licenses/LICENSE-2.0.html">

Modified: directory/studio/branches/studio-value/features/ldifeditor.feature/feature.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/features/ldifeditor.feature/feature.xml?rev=1804081&r1=1804080&r2=1804081&view=diff
==============================================================================
--- directory/studio/branches/studio-value/features/ldifeditor.feature/feature.xml (original)
+++ directory/studio/branches/studio-value/features/ldifeditor.feature/feature.xml Fri Aug  4 08:59:15 2017
@@ -12,7 +12,7 @@
    </description>
 
    <copyright>
-      Copyright © 2006-2015 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
+      Copyright © 2006-2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
    </copyright>
 
    <license url="http://www.apache.org/licenses/LICENSE-2.0.html">

Modified: directory/studio/branches/studio-value/features/nls.feature/feature.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/features/nls.feature/feature.xml?rev=1804081&r1=1804080&r2=1804081&view=diff
==============================================================================
--- directory/studio/branches/studio-value/features/nls.feature/feature.xml (original)
+++ directory/studio/branches/studio-value/features/nls.feature/feature.xml Fri Aug  4 08:59:15 2017
@@ -11,7 +11,7 @@
    </description>
 
    <copyright>
-      Copyright © 2006-2015 The Apache Software Foundation, Licensed
+      Copyright © 2006-2016 The Apache Software Foundation, Licensed
 under the Apache License, Version 2.0.
    </copyright>
 

Modified: directory/studio/branches/studio-value/features/openldap.feature/feature.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/features/openldap.feature/feature.xml?rev=1804081&r1=1804080&r2=1804081&view=diff
==============================================================================
--- directory/studio/branches/studio-value/features/openldap.feature/feature.xml (original)
+++ directory/studio/branches/studio-value/features/openldap.feature/feature.xml Fri Aug  4 08:59:15 2017
@@ -11,7 +11,7 @@
    </description>
 
    <copyright>
-      Copyright © 2006-2015 The Apache Software Foundation, Licensed
+      Copyright © 2006-2016 The Apache Software Foundation, Licensed
 under the Apache License, Version 2.0.
    </copyright>
 

Modified: directory/studio/branches/studio-value/features/rcp.feature/feature.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/features/rcp.feature/feature.xml?rev=1804081&r1=1804080&r2=1804081&view=diff
==============================================================================
--- directory/studio/branches/studio-value/features/rcp.feature/feature.xml (original)
+++ directory/studio/branches/studio-value/features/rcp.feature/feature.xml Fri Aug  4 08:59:15 2017
@@ -12,7 +12,7 @@
    </description>
 
    <copyright>
-      Copyright © 2006-2015 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
+      Copyright © 2006-2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
    </copyright>
 
    <license url="http://www.apache.org/licenses/LICENSE-2.0.html">

Modified: directory/studio/branches/studio-value/features/schemaeditor.feature/feature.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/features/schemaeditor.feature/feature.xml?rev=1804081&r1=1804080&r2=1804081&view=diff
==============================================================================
--- directory/studio/branches/studio-value/features/schemaeditor.feature/feature.xml (original)
+++ directory/studio/branches/studio-value/features/schemaeditor.feature/feature.xml Fri Aug  4 08:59:15 2017
@@ -12,7 +12,7 @@
    </description>
 
    <copyright>
-      Copyright © 2006-2015 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
+      Copyright © 2006-2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
    </copyright>
 
    <license url="http://www.apache.org/licenses/LICENSE-2.0.html">

Modified: directory/studio/branches/studio-value/helps/apacheds.help/src/main/docbook/0_index.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/helps/apacheds.help/src/main/docbook/0_index.xml?rev=1804081&r1=1804080&r2=1804081&view=diff
==============================================================================
--- directory/studio/branches/studio-value/helps/apacheds.help/src/main/docbook/0_index.xml (original)
+++ directory/studio/branches/studio-value/helps/apacheds.help/src/main/docbook/0_index.xml Fri Aug  4 08:59:15 2017
@@ -45,7 +45,7 @@
 		<subtitle>User's Guide</subtitle>
 		<releaseinfo>Version ${pom.version}</releaseinfo>
 		<copyright>
-			<year>2006 - 2015</year>
+			<year>2006 - 2016</year>
 			<holder>Apache Software Foundation</holder>
 		</copyright>
 		<legalnotice>

Modified: directory/studio/branches/studio-value/helps/ldapbrowser.help/src/main/docbook/0_index.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/helps/ldapbrowser.help/src/main/docbook/0_index.xml?rev=1804081&r1=1804080&r2=1804081&view=diff
==============================================================================
--- directory/studio/branches/studio-value/helps/ldapbrowser.help/src/main/docbook/0_index.xml (original)
+++ directory/studio/branches/studio-value/helps/ldapbrowser.help/src/main/docbook/0_index.xml Fri Aug  4 08:59:15 2017
@@ -105,7 +105,7 @@
 		<subtitle>User's Guide</subtitle>
 		<releaseinfo>Version ${pom.version}</releaseinfo>
 		<copyright>
-			<year>2006 - 2015</year>
+			<year>2006 - 2016</year>
 			<holder>Apache Software Foundation</holder>
 		</copyright>
 		<legalnotice>

Modified: directory/studio/branches/studio-value/helps/ldapbrowser.help/src/main/resources/about.html
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/helps/ldapbrowser.help/src/main/resources/about.html?rev=1804081&r1=1804080&r2=1804081&view=diff
==============================================================================
--- directory/studio/branches/studio-value/helps/ldapbrowser.help/src/main/resources/about.html (original)
+++ directory/studio/branches/studio-value/helps/ldapbrowser.help/src/main/resources/about.html Fri Aug  4 08:59:15 2017
@@ -9,7 +9,7 @@
 
 <h3>Copyright</h3>
 
-<p>Copyright (c) 2006-2015 Apache Software Foundation. All rights reserved.</p>
+<p>Copyright (c) 2006-2016 Apache Software Foundation. All rights reserved.</p>
 
 <h3>License</h3>
 

Modified: directory/studio/branches/studio-value/helps/ldifeditor.help/src/main/docbook/0_index.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/helps/ldifeditor.help/src/main/docbook/0_index.xml?rev=1804081&r1=1804080&r2=1804081&view=diff
==============================================================================
--- directory/studio/branches/studio-value/helps/ldifeditor.help/src/main/docbook/0_index.xml (original)
+++ directory/studio/branches/studio-value/helps/ldifeditor.help/src/main/docbook/0_index.xml Fri Aug  4 08:59:15 2017
@@ -35,7 +35,7 @@
 		<subtitle>User's Guide</subtitle>
 		<releaseinfo>Version ${pom.version}</releaseinfo>
 		<copyright>
-			<year>2006 - 2015</year>
+			<year>2006 - 2016</year>
 			<holder>Apache Software Foundation</holder>
 		</copyright>
 		<legalnotice>

Modified: directory/studio/branches/studio-value/helps/rcp.help/src/main/docbook/0_index.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/helps/rcp.help/src/main/docbook/0_index.xml?rev=1804081&r1=1804080&r2=1804081&view=diff
==============================================================================
--- directory/studio/branches/studio-value/helps/rcp.help/src/main/docbook/0_index.xml (original)
+++ directory/studio/branches/studio-value/helps/rcp.help/src/main/docbook/0_index.xml Fri Aug  4 08:59:15 2017
@@ -47,7 +47,7 @@
 		<subtitle>User's Guide</subtitle>
 		<releaseinfo>Version ${pom.version}</releaseinfo>
 		<copyright>
-			<year>2006 - 2015</year>
+			<year>2006 - 2016</year>
 			<holder>Apache Software Foundation</holder>
 		</copyright>
 		<legalnotice>

Modified: directory/studio/branches/studio-value/helps/schemaeditor.help/src/main/docbook/0_index.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/helps/schemaeditor.help/src/main/docbook/0_index.xml?rev=1804081&r1=1804080&r2=1804081&view=diff
==============================================================================
--- directory/studio/branches/studio-value/helps/schemaeditor.help/src/main/docbook/0_index.xml (original)
+++ directory/studio/branches/studio-value/helps/schemaeditor.help/src/main/docbook/0_index.xml Fri Aug  4 08:59:15 2017
@@ -62,7 +62,7 @@
 		<subtitle>User's Guide</subtitle>
 		<releaseinfo>Version ${pom.version}</releaseinfo>
 		<copyright>
-			<year>2006 - 2015</year>
+			<year>2006 - 2016</year>
 			<holder>Apache Software Foundation</holder>
 		</copyright>
 		<legalnotice>

Modified: directory/studio/branches/studio-value/helps/schemaeditor.help/src/main/resources/about.html
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/helps/schemaeditor.help/src/main/resources/about.html?rev=1804081&r1=1804080&r2=1804081&view=diff
==============================================================================
--- directory/studio/branches/studio-value/helps/schemaeditor.help/src/main/resources/about.html (original)
+++ directory/studio/branches/studio-value/helps/schemaeditor.help/src/main/resources/about.html Fri Aug  4 08:59:15 2017
@@ -9,7 +9,7 @@
 
 <h3>Copyright</h3>
 
-<p>Copyright (c) 2006-2015 Apache Software Foundation. All rights reserved.</p>
+<p>Copyright (c) 2006-2016 Apache Software Foundation. All rights reserved.</p>
 
 <h3>License</h3>
 

Modified: directory/studio/branches/studio-value/p2repositories/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/p2repositories/pom.xml?rev=1804081&r1=1804080&r2=1804081&view=diff
==============================================================================
--- directory/studio/branches/studio-value/p2repositories/pom.xml (original)
+++ directory/studio/branches/studio-value/p2repositories/pom.xml Fri Aug  4 08:59:15 2017
@@ -87,8 +87,8 @@
                 <resource>
                   <directory>${basedir}/../..</directory>
                   <includes>
-                    <include>LICENSE.txt</include>
-                    <include>NOTICE.txt</include>
+                    <include>LICENSE</include>
+                    <include>NOTICE</include>
                   </includes>
                 </resource>
                 <resource>

Modified: directory/studio/branches/studio-value/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/UserClassWrapper.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/UserClassWrapper.java?rev=1804081&r1=1804080&r2=1804081&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/UserClassWrapper.java (original)
+++ directory/studio/branches/studio-value/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/UserClassWrapper.java Fri Aug  4 08:59:15 2017
@@ -175,8 +175,8 @@ public class UserClassWrapper
         }
         else if ( userClass.getClass() == UserClass.UserGroup.class )
         {
-            UserClass.UserGroup userGrops = ( UserClass.UserGroup ) userClass;
-            Set<Dn> jndiNames = userGrops.getNames();
+            UserClass.UserGroup userGroups = ( UserClass.UserGroup ) userClass;
+            Set<Dn> jndiNames = userGroups.getNames();
             for ( Dn jndiName : jndiNames )
             {
                 values.add( jndiName.toString() );

Modified: directory/studio/branches/studio-value/plugins/apacheds.configuration/about.ini
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/apacheds.configuration/about.ini?rev=1804081&r1=1804080&r2=1804081&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/apacheds.configuration/about.ini (original)
+++ directory/studio/branches/studio-value/plugins/apacheds.configuration/about.ini Fri Aug  4 08:59:15 2017
@@ -1,2 +1,2 @@
 featureImage=studio.png
-aboutText=Apache Directory Studio ApacheDS - ApacheDS (Apache Directory Server) specific tools: configuration editor for ApacheDS and a launchable ApacheDS.\n\nVersion: ${unqualifiedVersion}.${buildQualifier}\n\nCopyright \u00A9 2006-2015 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.\nVisit http://directory.apache.org/studio
+aboutText=Apache Directory Studio ApacheDS - ApacheDS (Apache Directory Server) specific tools: configuration editor for ApacheDS and a launchable ApacheDS.\n\nVersion: ${unqualifiedVersion}.${buildQualifier}\n\nCopyright \u00A9 2006-2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.\nVisit http://directory.apache.org/studio

Modified: directory/studio/branches/studio-value/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/KerberosServerPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/KerberosServerPage.java?rev=1804081&r1=1804080&r2=1804081&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/KerberosServerPage.java (original)
+++ directory/studio/branches/studio-value/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/KerberosServerPage.java Fri Aug  4 08:59:15 2017
@@ -123,7 +123,6 @@ public class KerberosServerPage extends
         }
     };
 
-    
     /**
      * The Kerberos port listener
      */
@@ -131,20 +130,10 @@ public class KerberosServerPage extends
     {
         public void modifyText( ModifyEvent e )
         {
-            try
-            {
-                int port = Integer.parseInt( kerberosPortText.getText() );
-                
-                getKdcServerTransportBean().setSystemPort( port );
-            }
-            catch ( NumberFormatException nfe )
-            {
-                System.out.println( "Wrong KDC TCP/UDP Port : it must be an integer" );
-            }
+            setKerberosPort( getDirectoryServiceBean(), kerberosPortText.getText() );
         }
     };
 
-    
     /**
      * The Kerberos address modify listener
      */
@@ -152,11 +141,10 @@ public class KerberosServerPage extends
     {
         public void modifyText( ModifyEvent e )
         {
-            getKdcServerTransportBean().setTransportAddress( kerberosAddressText.getText() );
+            setKerberosAddress( getDirectoryServiceBean(), kerberosAddressText.getText() );
         }
     };
 
-    
     /**
      * The ChangePassword checkbox listener
      */
@@ -180,16 +168,7 @@ public class KerberosServerPage extends
     {
         public void modifyText( ModifyEvent e )
         {
-            try
-            {
-                int port = Integer.parseInt( changePasswordPortText.getText() );
-                
-                getChangePasswordServerTransportBean().setSystemPort( port );
-            }
-            catch ( NumberFormatException nfe )
-            {
-                System.out.println( "Wrong ChangePassword TCP Port : it must be an integer" );
-            }
+            setChangePasswordPort( getDirectoryServiceBean(), changePasswordPortText.getText() );
         }
     };
 
@@ -201,7 +180,7 @@ public class KerberosServerPage extends
     {
         public void modifyText( ModifyEvent e )
         {
-            getChangePasswordServerTransportBean().setTransportAddress( changePasswordAddressText.getText() );
+            setChangePasswordAddress( getDirectoryServiceBean(), changePasswordAddressText.getText() );
         }
     };
 
@@ -609,16 +588,16 @@ public class KerberosServerPage extends
             setSelection( enableKerberosCheckbox, kdcServerBean.isEnabled() );
             setEnabled( kerberosPortText, enableKerberosCheckbox.getSelection() );
             setEnabled( kerberosAddressText, enableKerberosCheckbox.getSelection() );
-            setText( kerberosPortText, Integer.toString( getKdcServerTransportBean().getSystemPort() ) );
-            setText( kerberosAddressText, getKdcServerTransportBean().getTransportAddress() );
+            setText( kerberosPortText, Integer.toString( kdcServerBean.getTransports()[0].getSystemPort() ) );
+            setText( kerberosAddressText, kdcServerBean.getTransports()[0].getTransportAddress() );
 
             // Change Password Checkbox
             ChangePasswordServerBean changePasswordServerBean = getChangePasswordServerBean();
             setSelection( enableChangePasswordCheckbox, changePasswordServerBean.isEnabled() );
             setEnabled( changePasswordPortText, enableChangePasswordCheckbox.getSelection() );
             setEnabled( changePasswordAddressText, enableChangePasswordCheckbox.getSelection() );
-            setText( changePasswordPortText, Integer.toString( getChangePasswordServerTransportBean().getSystemPort() ) );
-            setText( changePasswordAddressText, getChangePasswordServerTransportBean().getTransportAddress() );
+            setText( changePasswordPortText, Integer.toString( changePasswordServerBean.getTransports()[0].getSystemPort() ) );
+            setText( changePasswordAddressText, changePasswordServerBean.getTransports()[0].getTransportAddress() );
 
             // Kerberos Settings
             setText( primaryKdcRealmText, kdcServerBean.getKrbPrimaryRealm() );
@@ -912,103 +891,83 @@ public class KerberosServerPage extends
 
 
     /**
-     * Gets the KDC Server Transport bean.
-     * 
-     * @return
-     *       the KDC Server Transport bean
+     * Gets the Key Derivation Interceptor.
+     *
+     * @return the Key Derivation Interceptor.
      */
-    private TransportBean getKdcServerTransportBean()
+    private static InterceptorBean getKeyDerivationInterceptor( DirectoryServiceBean directoryServiceBean )
     {
-        KdcServerBean kdcServerBean = getKdcServerBean();
-
-        TransportBean transportBean = null;
-
-        // Looking for the transport in the list
-        TransportBean[] kdcServerTransportBeans = kdcServerBean.getTransports();
-        if ( kdcServerTransportBeans != null )
+        if ( directoryServiceBean != null )
         {
-            for ( TransportBean kdcServerTransportBean : kdcServerTransportBeans )
+            List<InterceptorBean> interceptors = directoryServiceBean.getInterceptors();
+
+            for ( InterceptorBean interceptor : interceptors )
             {
-                if ( ( "tcp".equals( kdcServerTransportBean.getTransportId() ) ) //$NON-NLS-1$
-                    || ( "udp".equals( kdcServerTransportBean.getTransportId() ) ) ) //$NON-NLS-1$
+                if ( "org.apache.directory.server.core.kerberos.KeyDerivationInterceptor".equalsIgnoreCase( interceptor
+                    .getInterceptorClassName() ) )
                 {
-                    transportBean = kdcServerTransportBean;
-                    break;
+                    return interceptor;
                 }
             }
         }
 
-        // No corresponding transport has been found
-        if ( transportBean == null )
-        {
-            transportBean = new TransportBean();
-            transportBean.setTransportId( "tcp" ); // TODO can either 'tcp' or 'udp' //$NON-NLS-1$
-            kdcServerBean.addTransports( transportBean );
-        }
-
-        return transportBean;
+        return null;
     }
 
 
-    /**
-     * Gets the Change Password Server Transport bean.
-     * 
-     * @return
-     *       the Change Password Server Transport bean
-     */
-    private TransportBean getChangePasswordServerTransportBean()
+    public static void setKerberosPort( DirectoryServiceBean directoryServiceBean, String portAsText )
     {
-        ChangePasswordServerBean changePasswordServerBean = getChangePasswordServerBean();
-
-        TransportBean transportBean = null;
-
-        // Looking for the transport in the list
-        TransportBean[] changePasswordServerTransportBeans = changePasswordServerBean.getTransports();
-        if ( changePasswordServerTransportBeans != null )
+        try
         {
-            for ( TransportBean changePasswordServerTransportBean : changePasswordServerTransportBeans )
+            int port = Integer.parseInt( portAsText );
+            KdcServerBean kdcServerBean = directoryServiceBean.getKdcServerBean();
+            for ( TransportBean transportBean : kdcServerBean.getTransports() )
             {
-                if ( "tcp".equals( changePasswordServerTransportBean.getTransportId() ) ) // TODO can either 'tcp' or 'udp' //$NON-NLS-1$
-                {
-                    transportBean = changePasswordServerTransportBean;
-                    break;
-                }
+                transportBean.setSystemPort( port );
             }
         }
-
-        // No corresponding transport has been found
-        if ( transportBean == null )
+        catch ( NumberFormatException nfe )
         {
-            transportBean = new TransportBean();
-            transportBean.setTransportId( "tcp" ); // TODO can either 'tcp' or 'udp' //$NON-NLS-1$
-            changePasswordServerBean.addTransports( transportBean );
+            System.out.println( "Wrong Kerberos TCP/UDP Port : it must be an integer" );
         }
-
-        return transportBean;
     }
 
 
-    /**
-     * Gets the Key Derivation Interceptor.
-     *
-     * @return the Key Derivation Interceptor.
-     */
-    private static InterceptorBean getKeyDerivationInterceptor( DirectoryServiceBean directoryServiceBean )
+    private void setKerberosAddress( DirectoryServiceBean directoryServiceBean, String address )
     {
-        if ( directoryServiceBean != null )
+        KdcServerBean kdcServerBean = directoryServiceBean.getKdcServerBean();
+        for ( TransportBean transportBean : kdcServerBean.getTransports() )
         {
-            List<InterceptorBean> interceptors = directoryServiceBean.getInterceptors();
+            transportBean.setTransportAddress( address );
+        }
+    }
 
-            for ( InterceptorBean interceptor : interceptors )
+
+    public static void setChangePasswordPort( DirectoryServiceBean directoryServiceBean, String portAsText )
+    {
+        try
+        {
+            int port = Integer.parseInt( portAsText );
+            ChangePasswordServerBean changePasswordServerBean = directoryServiceBean.getChangePasswordServerBean();
+            for ( TransportBean transportBean : changePasswordServerBean.getTransports() )
             {
-                if ( "org.apache.directory.server.core.kerberos.KeyDerivationInterceptor".equalsIgnoreCase( interceptor
-                    .getInterceptorClassName() ) )
-                {
-                    return interceptor;
-                }
+                transportBean.setSystemPort( port );
             }
         }
+        catch ( NumberFormatException nfe )
+        {
+            System.out.println( "Wrong ChangePassword TCP/UDP Port : it must be an integer" );
+        }
+    }
 
-        return null;
+
+    private void setChangePasswordAddress( DirectoryServiceBean directoryServiceBean, String address )
+    {
+        ChangePasswordServerBean changePasswordServerBean = directoryServiceBean.getChangePasswordServerBean();
+        for ( TransportBean transportBean : changePasswordServerBean.getTransports() )
+        {
+            transportBean.setTransportAddress( address );
+        }
     }
+
 }

Modified: directory/studio/branches/studio-value/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/LdapLdapsServersPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/LdapLdapsServersPage.java?rev=1804081&r1=1804080&r2=1804081&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/LdapLdapsServersPage.java (original)
+++ directory/studio/branches/studio-value/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/LdapLdapsServersPage.java Fri Aug  4 08:59:15 2017
@@ -1022,7 +1022,7 @@ public class LdapLdapsServersPage extend
     {
         public void widgetSelected( SelectionEvent e )
         {
-            setProtocol( tlsv1_0Checkbox.getSelection(), "TLSV1" );
+            setProtocol( tlsv1_0Checkbox.getSelection(), "TLSv1" );
         }
     };
     
@@ -1034,7 +1034,7 @@ public class LdapLdapsServersPage extend
     {
         public void widgetSelected( SelectionEvent e )
         {
-            setProtocol( tlsv1_1Checkbox.getSelection(), "TLSV1.1" );
+            setProtocol( tlsv1_1Checkbox.getSelection(), "TLSv1.1" );
         }
     };
     
@@ -1046,7 +1046,7 @@ public class LdapLdapsServersPage extend
     {
         public void widgetSelected( SelectionEvent e )
         {
-            setProtocol( tlsv1_2Checkbox.getSelection(), "TLSV1.2" );
+            setProtocol( tlsv1_2Checkbox.getSelection(), "TLvV1.2" );
         }
     };
 

Modified: directory/studio/branches/studio-value/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/OverviewPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/OverviewPage.java?rev=1804081&r1=1804080&r2=1804081&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/OverviewPage.java (original)
+++ directory/studio/branches/studio-value/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/OverviewPage.java Fri Aug  4 08:59:15 2017
@@ -218,8 +218,7 @@ public class OverviewPage extends Server
             setEnabled( kerberosPortText, enableKerberos );
         }
     };
-    
-    
+
     /**
      * The Kerberos port listener
      */
@@ -227,22 +226,10 @@ public class OverviewPage extends Server
     {
         public void modifyText( ModifyEvent e )
         {
-            KdcServerBean kdcServerBean = getDirectoryServiceBean().getKdcServerBean();
-
-            try
-            {
-                int port = Integer.parseInt( kerberosPortText.getText() );
-                
-                kdcServerBean.getTransports()[0].setSystemPort( port );
-            }
-            catch ( NumberFormatException nfe )
-            {
-                System.out.println( "Wrong Kerberos TCP/UDP Port : it must be an integer" );
-            }
+            KerberosServerPage.setKerberosPort( getDirectoryServiceBean(), kerberosPortText.getText() );
         }
     };
-    
-    
+
     /**
      * The ChangePassword server selection adapter 
      */
@@ -256,8 +243,7 @@ public class OverviewPage extends Server
             setEnabled( changePasswordPortText, enableChangePassword );
         }
     };
-    
-    
+
     /**
      * The ChangePassword server port listener
      */
@@ -265,22 +251,10 @@ public class OverviewPage extends Server
     {
         public void modifyText( ModifyEvent e )
         {
-            ChangePasswordServerBean changePasswordServerBean = getDirectoryServiceBean().getChangePasswordServerBean();
-
-            try
-            {
-                int port = Integer.parseInt( changePasswordPortText.getText() );
-                
-                changePasswordServerBean.getTransports()[0].setSystemPort( port );
-            }
-            catch ( NumberFormatException nfe )
-            {
-                System.out.println( "Wrong ChnagePassword Port : it must be an integer" );
-            }
+            KerberosServerPage.setChangePasswordPort( getDirectoryServiceBean(), changePasswordPortText.getText() );
         }
     };
-    
-    
+
     /**
      * The advanced Kerberos configuration hyperlink
      */
@@ -736,14 +710,15 @@ public class OverviewPage extends Server
             KdcServerBean kdcServerBean = KerberosServerPage.getKdcServerBean( directoryServiceBean );
             setSelection( enableKerberosCheckbox, kdcServerBean.isEnabled() );
             setEnabled( kerberosPortText, enableKerberosCheckbox.getSelection() );
-            setText( kerberosPortText, "" + kdcServerBean.getTransports()[0].getSystemPort() ); //$NON-NLS-1$
+            setText( kerberosPortText, Integer.toString( kdcServerBean.getTransports()[0].getSystemPort() ) );
 
             // Change Password Server
             ChangePasswordServerBean changePasswordServerBean = KerberosServerPage
                 .getChangePasswordServerBean( directoryServiceBean );
             setSelection( enableChangePasswordCheckbox, changePasswordServerBean.isEnabled() );
             setEnabled( changePasswordPortText, enableChangePasswordCheckbox.getSelection() );
-            setText( changePasswordPortText, "" + changePasswordServerBean.getTransports()[0].getSystemPort() ); //$NON-NLS-1$
+            setText( changePasswordPortText,
+                Integer.toString( changePasswordServerBean.getTransports()[0].getSystemPort() ) );
 
             // Partitions
             List<PartitionBean> partitions = directoryServiceBean.getPartitions();

Modified: directory/studio/branches/studio-value/plugins/combinededitor/src/main/java/org/apache/directory/studio/combinededitor/editor/CombinedEntryEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/combinededitor/src/main/java/org/apache/directory/studio/combinededitor/editor/CombinedEntryEditor.java?rev=1804081&r1=1804080&r2=1804081&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/combinededitor/src/main/java/org/apache/directory/studio/combinededitor/editor/CombinedEntryEditor.java (original)
+++ directory/studio/branches/studio-value/plugins/combinededitor/src/main/java/org/apache/directory/studio/combinededitor/editor/CombinedEntryEditor.java Fri Aug  4 08:59:15 2017
@@ -23,9 +23,8 @@ package org.apache.directory.studio.comb
 import org.apache.directory.studio.entryeditors.EntryEditorInput;
 import org.apache.directory.studio.entryeditors.EntryEditorUtils;
 import org.apache.directory.studio.entryeditors.IEntryEditor;
-import org.apache.directory.studio.ldapbrowser.core.model.IBookmark;
 import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
-import org.apache.directory.studio.ldapbrowser.core.model.ISearchResult;
+import org.apache.directory.studio.ldapbrowser.ui.BrowserUIConstants;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.swt.SWT;
@@ -33,7 +32,6 @@ import org.eclipse.swt.custom.CTabFolder
 import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IEditorSite;
 import org.eclipse.ui.INavigationLocation;
 import org.eclipse.ui.INavigationLocationProvider;
@@ -415,6 +413,15 @@ public abstract class CombinedEntryEdito
     {
         if ( input instanceof EntryEditorInput )
         {
+            /*
+             * Optimization: no need to set the input again if the same input is already set
+             */
+            if ( getEntryEditorInput() != null
+                && getEntryEditorInput().getResolvedEntry() == ( ( EntryEditorInput ) input ).getResolvedEntry() )
+            {
+                return;
+            }
+
             // If the editor is dirty, let's ask for a save before changing the input
             if ( isDirty() )
             {
@@ -424,39 +431,10 @@ public abstract class CombinedEntryEdito
                 }
             }
 
-            /*
-             * Workaround to make link-with-editor working for the single-tab editor:
-             * The call of firePropertyChange is used to inform the link-with-editor action.
-             * However firePropertyChange also modifies the navigation history.
-             * Thus, a dummy input with the real entry but a null extension is set.
-             * This avoids to modification of the navigation history.
-             * Afterwards the real input is set.
-             */
-            EntryEditorInput eei = ( EntryEditorInput ) input;
-            IEntry entryInput = eei.getEntryInput();
-            ISearchResult searchResultInput = eei.getSearchResultInput();
-            IBookmark bookmarkInput = eei.getBookmarkInput();
-            EntryEditorInput dummyInput;
-            
-            if ( entryInput != null )
-            {
-                dummyInput = new EntryEditorInput( entryInput, null );
-            }
-            else if ( searchResultInput != null )
-            {
-                dummyInput = new EntryEditorInput( searchResultInput, null );
-            }
-            else
-            {
-                dummyInput = new EntryEditorInput( bookmarkInput, null );
-            }
-            
-            setInput( dummyInput );
-            firePropertyChange( IEditorPart.PROP_INPUT );
-
             // now set the real input and mark history location
             setInput( input );
             getSite().getPage().getNavigationHistory().markLocation( this );
+            firePropertyChange( BrowserUIConstants.INPUT_CHANGED );
 
             // Getting the preference store
             IPreferenceStore store = CombinedEditorPlugin.getDefault().getPreferenceStore();

Modified: directory/studio/branches/studio-value/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/CursorStudioNamingEnumeration.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/CursorStudioNamingEnumeration.java?rev=1804081&r1=1804080&r2=1804081&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/CursorStudioNamingEnumeration.java (original)
+++ directory/studio/branches/studio-value/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/CursorStudioNamingEnumeration.java Fri Aug  4 08:59:15 2017
@@ -37,8 +37,10 @@ import javax.naming.ldap.PagedResultsRes
 import org.apache.directory.api.ldap.codec.api.CodecControl;
 import org.apache.directory.api.ldap.codec.api.LdapApiService;
 import org.apache.directory.api.ldap.codec.api.LdapApiServiceFactory;
+import org.apache.directory.api.ldap.model.cursor.CursorException;
 import org.apache.directory.api.ldap.model.cursor.SearchCursor;
 import org.apache.directory.api.ldap.model.entry.AttributeUtils;
+import org.apache.directory.api.ldap.model.exception.LdapException;
 import org.apache.directory.api.ldap.model.message.Referral;
 import org.apache.directory.api.ldap.model.message.Response;
 import org.apache.directory.api.ldap.model.message.SearchResultDone;
@@ -67,7 +69,6 @@ public class CursorStudioNamingEnumerati
 {
     private SearchCursor cursor;
     private SearchResultEntry currentSearchResultEntry;
-    private List<Referral> referralsList = new ArrayList<Referral>();
     private List<String> currentReferralUrlsList;
     private StudioNamingEnumeration cursorNamingEnumeration;
     private SearchResultDone searchResultDone;
@@ -90,13 +91,13 @@ public class CursorStudioNamingEnumerati
      * @param monitor the progress monitor
      * @param referralsInfo the referrals info
      */
-    public CursorStudioNamingEnumeration( Connection connection, SearchCursor cursor,
-        String searchBase, String filter, SearchControls searchControls,
-        AliasDereferencingMethod aliasesDereferencingMethod, ReferralHandlingMethod referralsHandlingMethod,
-        Control[] controls, long requestNum, StudioProgressMonitor monitor, ReferralsInfo referralsInfo )
+    public CursorStudioNamingEnumeration( Connection connection, SearchCursor cursor, String searchBase, String filter,
+        SearchControls searchControls, AliasDereferencingMethod aliasesDereferencingMethod,
+        ReferralHandlingMethod referralsHandlingMethod, Control[] controls, long requestNum,
+        StudioProgressMonitor monitor, ReferralsInfo referralsInfo )
     {
-        super( connection, searchBase, filter, searchControls, aliasesDereferencingMethod,
-            referralsHandlingMethod, controls, requestNum, monitor, referralsInfo );
+        super( connection, searchBase, filter, searchControls, aliasesDereferencingMethod, referralsHandlingMethod,
+            controls, requestNum, monitor, referralsInfo );
         this.connection = connection;
         this.cursor = cursor;
 
@@ -107,7 +108,11 @@ public class CursorStudioNamingEnumerati
         this.referralsHandlingMethod = referralsHandlingMethod;
         this.controls = controls;
         this.monitor = monitor;
-        this.referralsInfo = referralsInfo;
+
+        if ( super.referralsInfo == null )
+        {
+            super.referralsInfo = new ReferralsInfo( false );
+        }
     }
 
 
@@ -157,7 +162,7 @@ public class CursorStudioNamingEnumerati
                     if ( referralsHandlingMethod != ReferralHandlingMethod.IGNORE )
                     {
                         // Storing the referral for later use
-                        referralsList.add( ( ( SearchResultReference ) currentResponse ).getReferral() );
+                        referralsInfo.addReferral( ( ( SearchResultReference ) currentResponse ).getReferral() );
                     }
                 }
             }
@@ -166,6 +171,12 @@ public class CursorStudioNamingEnumerati
             if ( searchResultDone == null )
             {
                 searchResultDone = ( ( SearchCursor ) cursor ).getSearchResultDone();
+                Referral referral = searchResultDone.getLdapResult().getReferral();
+                if ( referralsHandlingMethod != ReferralHandlingMethod.IGNORE && referral != null )
+                {
+                    // Storing the referral for later use
+                    referralsInfo.addReferral( referral );
+                }
             }
 
             // Are we following referrals manually?
@@ -179,10 +190,10 @@ public class CursorStudioNamingEnumerati
                 }
 
                 // Checking the referrals list
-                if ( ( referralsList != null ) && ( referralsList.size() > 0 ) )
+                if ( referralsInfo.hasMoreReferrals() )
                 {
                     // Getting the list of the next referral
-                    currentReferralUrlsList = new ArrayList<String>( referralsList.remove( 0 ).getLdapUrls() );
+                    currentReferralUrlsList = new ArrayList<String>( referralsInfo.getNextReferral().getLdapUrls() );
 
                     // return true if there's at least one referral LDAP URL to handle
                     return currentReferralUrlsList.size() > 0;
@@ -197,9 +208,9 @@ public class CursorStudioNamingEnumerati
                     return true;
                 }
 
-                if ( ( referralsList != null ) && ( referralsList.size() > 0 ) )
+                if ( referralsInfo.hasMoreReferrals() )
                 {
-                    Referral referral = referralsList.remove( 0 );
+                    Referral referral = referralsInfo.getNextReferral();
                     List<String> referralUrls = new ArrayList<String>( referral.getLdapUrls() );
                     LdapUrl url = new LdapUrl( referralUrls.get( 0 ) );
 
@@ -207,28 +218,25 @@ public class CursorStudioNamingEnumerati
                         this );
                     if ( referralConnection != null )
                     {
-                        String referralSearchBase = url.getDn() != null && !url.getDn().isEmpty() ? url.getDn()
-                            .getName()
-                            : searchBase;
-                        String referralFilter = url.getFilter() != null && url.getFilter().length() == 0 ? url
-                            .getFilter()
-                            : filter;
+                        String referralSearchBase = url.getDn() != null && !url.getDn().isEmpty()
+                            ? url.getDn().getName() : searchBase;
+                        String referralFilter = url.getFilter() != null && url.getFilter().length() == 0
+                            ? url.getFilter() : filter;
                         SearchControls referralSearchControls = new SearchControls();
-                        referralSearchControls.setSearchScope( url.getScope().getScope() > -1 ? url.getScope()
-                            .getScope()
-                            : searchControls.getSearchScope() );
-                        referralSearchControls.setReturningAttributes( url.getAttributes() != null
-                            && url.getAttributes().size() > 0 ? url.getAttributes().toArray(
-                            new String[url.getAttributes().size()] ) : searchControls.getReturningAttributes() );
+                        referralSearchControls.setSearchScope( url.getScope().getScope() > -1
+                            ? url.getScope().getScope() : searchControls.getSearchScope() );
+                        referralSearchControls
+                            .setReturningAttributes( url.getAttributes() != null && url.getAttributes().size() > 0
+                                ? url.getAttributes().toArray( new String[url.getAttributes().size()] )
+                                : searchControls.getReturningAttributes() );
                         referralSearchControls.setCountLimit( searchControls.getCountLimit() );
                         referralSearchControls.setTimeLimit( searchControls.getTimeLimit() );
                         referralSearchControls.setDerefLinkFlag( searchControls.getDerefLinkFlag() );
                         referralSearchControls.setReturningObjFlag( searchControls.getReturningObjFlag() );
 
-                        cursorNamingEnumeration = referralConnection.getConnectionWrapper()
-                            .search(
-                                referralSearchBase, referralFilter, referralSearchControls, aliasesDereferencingMethod,
-                                referralsHandlingMethod, controls, monitor, referralsInfo );
+                        cursorNamingEnumeration = referralConnection.getConnectionWrapper().search( referralSearchBase,
+                            referralFilter, referralSearchControls, aliasesDereferencingMethod, referralsHandlingMethod,
+                            controls, monitor, referralsInfo );
 
                         return cursorNamingEnumeration.hasMore();
                     }
@@ -242,7 +250,7 @@ public class CursorStudioNamingEnumerati
 
             return false;
         }
-        catch ( Exception e )
+        catch ( CursorException | LdapException e )
         {
             throw new NamingException( e.getMessage() );
         }
@@ -288,8 +296,7 @@ public class CursorStudioNamingEnumerati
                     LdapUrl url = new LdapUrl( currentReferralUrlsList.remove( 0 ) );
 
                     // Building the search result
-                    SearchResult searchResult = new SearchResult( url.getDn().getName(), null,
-                        new BasicAttributes(),
+                    SearchResult searchResult = new SearchResult( url.getDn().getName(), null, new BasicAttributes(),
                         false );
                     searchResult.setNameInNamespace( url.getDn().getName() );
 
@@ -400,8 +407,7 @@ public class CursorStudioNamingEnumerati
                 else
                 {
                     // Default case
-                    convertedControl = new BasicControl( wrapped.getOid(), wrapped.isCritical(),
-                        wrapped.getValue() );
+                    convertedControl = new BasicControl( wrapped.getOid(), wrapped.isCritical(), wrapped.getValue() );
                 }
 
                 convertedControls.add( convertedControl );



Mime
View raw message