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 2019/06/14 19:52:32 UTC
[directory-studio] 01/01: Merge pull request #21 from
apache/remove-jndi-provider-and-jndi-layer
This is an automated email from the ASF dual-hosted git repository.
seelmann pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-studio.git
commit 418ce6ef102bec685b73ecdc706d11d1a81ba3f4
Merge: 311e870 9001bb2
Author: Stefan Seelmann <ma...@stefan-seelmann.de>
AuthorDate: Fri Jun 14 21:52:25 2019 +0200
Merge pull request #21 from apache/remove-jndi-provider-and-jndi-layer
DIRSTUDIO-1207: Remove JNDI provider and JNDI layer
README.md | 2 +-
eclipse-trgt-platform/pom-first.xml | 20 +-
...directory.studio.eclipse-trgt-platform.template | 40 +-
features/rcp.feature/feature.xml | 8 +-
plugins/apacheds.configuration/pom-first.xml | 6 +-
.../configuration/editor/PartitionDetailsPage.java | 2 +-
.../editor/ServerConfigurationEditorUtils.java | 26 +-
.../jobs/LoadConfigurationRunnable.java | 41 +-
plugins/common.core/pom-first.xml | 2 +-
.../common/core/jobs/StudioProgressMonitor.java | 2 +-
plugins/connection.core/plugin.properties | 10 +-
plugins/connection.core/plugin.xml | 26 +-
plugins/connection.core/plugin_de.properties | 8 +-
plugins/connection.core/pom-first.xml | 4 +-
.../studio/connection/core/Connection.java | 42 +-
.../core/ConnectionActionFilterAdapter.java | 6 -
.../connection/core/ConnectionCoreConstants.java | 12 -
.../connection/core/ConnectionCorePlugin.java | 120 +-
.../core/ConnectionCorePreferencesInitializer.java | 4 -
.../connection/core/ConnectionParameter.java | 51 +-
.../directory/studio/connection/core/Controls.java | 102 ++
.../connection/core/ICertificateHandler.java | 27 +-
.../core/{IJndiLogger.java => ILdapLogger.java} | 69 +-
.../directory/studio/connection/core/Messages.java | 2 +-
.../core/{io/jndi => }/ReferralsInfo.java | 17 +-
.../directory/studio/connection/core/Utils.java | 69 -
.../core/io/AbstractStudioNamingEnumeration.java | 85 --
.../studio/connection/core/io/ConnectionIO.java | 27 -
.../connection/core/io/ConnectionWrapper.java | 27 +-
.../connection/core/io/LdapRuntimeException.java | 16 +-
.../core/io/StudioNamingEnumeration.java | 54 -
.../connection/core/io/StudioTrustManager.java | 78 +-
.../core/io/{jndi => api}/CancelException.java | 8 +-
.../core/io/api/DirectoryApiConnectionWrapper.java | 429 ++----
.../io/{jndi => api}/LdifModificationLogger.java | 237 ++-
.../core/io/{jndi => api}/LdifSearchLogger.java | 127 +-
.../core/io/{jndi => api}/StudioSearchResult.java | 45 +-
...ion.java => StudioSearchResultEnumeration.java} | 206 +--
.../core/io/jndi/DummySSLSocketFactory.java | 215 ---
.../core/io/jndi/JNDIConnectionWrapper.java | 1571 --------------------
.../core/io/jndi/JNDISubentriesControl.java | 57 -
.../core/io/jndi/JndiStudioNamingEnumeration.java | 400 -----
.../core/io/jndi/StudioSSLSocketFactory.java | 227 ---
.../studio/connection/core/messages.properties | 2 +-
.../studio/connection/core/messages_de.properties | 2 +-
.../studio/connection/core/messages_fr.properties | 2 +-
.../resources/{jndiLogger.exsd => ldapLogger.exsd} | 35 +-
plugins/connection.ui/pom-first.xml | 4 +-
.../ui/ConnectionUICertificateHandler.java | 8 +-
.../connection/ui/RunnableContextRunner.java | 2 +-
.../studio/connection/ui/UIAuthHandler.java | 2 +-
.../ui/actions/NewConnectionFolderAction.java | 2 +-
.../studio/connection/ui/actions/PasteAction.java | 2 +-
.../ui/dialogs/CertificateTrustDialog.java | 70 +-
.../connection/ui/dialogs/PasswordDialog.java | 2 +-
.../connection/ui/dialogs/ResetPasswordDialog.java | 2 +-
.../connection/ui/dialogs/SetupPasswordDialog.java | 2 +-
.../ui/preferences/ConnectionsPreferencePage.java | 53 -
.../PasswordsKeystorePreferencePage.java | 2 +-
.../ui/widgets/AuthenticationParameterPage.java | 2 +-
.../ui/widgets/CertificateInfoComposite.java | 4 +-
.../ui/widgets/ConnectionLabelProvider.java | 2 +-
.../ui/widgets/NetworkParameterPage.java | 95 +-
.../ui/wizards/ExportCertificateWizardPage.java | 2 +-
plugins/ldapbrowser.common/pom-first.xml | 2 +-
.../common/dialogs/RenameEntryDialog.java | 2 +-
.../widgets/connection/BrowserParameterPage.java | 2 +-
.../common/widgets/search/SearchPageWrapper.java | 34 +-
.../common/wizards/NewEntryDnWizardPage.java | 2 +-
plugins/ldapbrowser.core/pom-first.xml | 4 +-
.../ldapbrowser/core/BrowserConnectionIO.java | 65 +-
.../ldapbrowser/core/jobs/CopyEntriesRunnable.java | 115 +-
.../ldapbrowser/core/jobs/CreateEntryRunnable.java | 59 +-
.../core/jobs/DeleteEntriesRunnable.java | 25 +-
.../ldapbrowser/core/jobs/ExportCsvRunnable.java | 14 +-
.../ldapbrowser/core/jobs/ExportDsmlRunnable.java | 72 +-
.../ldapbrowser/core/jobs/ExportLdifRunnable.java | 95 +-
.../ldapbrowser/core/jobs/ExportOdfRunnable.java | 14 +-
.../ldapbrowser/core/jobs/ExportXlsRunnable.java | 14 +-
.../ldapbrowser/core/jobs/ImportDsmlRunnable.java | 109 +-
.../ldapbrowser/core/jobs/ImportLdifRunnable.java | 84 +-
.../core/jobs/InitializeAttributesRunnable.java | 7 +-
.../core/jobs/InitializeChildrenRunnable.java | 64 +-
.../core/jobs/InitializeRootDSERunnable.java | 8 +-
.../ldapbrowser/core/jobs/MoveEntriesRunnable.java | 11 +-
.../ldapbrowser/core/jobs/ReadEntryRunnable.java | 6 +-
.../core/jobs/ReloadSchemaRunnable.java | 46 +-
.../ldapbrowser/core/jobs/RenameEntryRunnable.java | 21 +-
.../ldapbrowser/core/jobs/SearchRunnable.java | 187 +--
.../studio/ldapbrowser/core/model/IEntry.java | 42 +
.../studio/ldapbrowser/core/model/ISearch.java | 24 +-
.../ldapbrowser/core/model/SearchParameter.java | 35 +-
.../studio/ldapbrowser/core/model/impl/Search.java | 28 +-
.../core/model/impl/SearchContinuation.java | 2 +-
.../ldapbrowser/core/model/schema/Schema.java | 20 +-
.../ldapbrowser/core/model/schema/SchemaUtils.java | 2 +-
.../core/utils/CompoundModification.java | 6 +-
.../studio/ldapbrowser/core/utils/JNDIUtils.java | 50 +-
.../ldapbrowser/core/utils/ModelConverter.java | 70 +-
.../studio/ldapbrowser/core/utils/Utils.java | 2 +-
.../core/utils/AttributeComparatorTest.java | 19 +
plugins/ldapbrowser.ui/pom-first.xml | 2 +-
.../ui/dialogs/properties/RootDSEPropertyPage.java | 2 +-
.../ModificationLogsViewUniversalListener.java | 2 +-
.../ui/views/modificationlogs/OlderAction.java | 2 +-
.../ui/views/searchlogs/OlderAction.java | 2 +-
.../SearchLogsViewUniversalListener.java | 2 +-
.../ui/wizards/ExportModificationLogsWizard.java | 2 +-
.../ui/wizards/ExportSearchLogsWizard.java | 2 +-
.../apacheds/CreateConnectionAction.java | 3 -
plugins/ldapservers/pom-first.xml | 3 +-
...LdapServerAdapterExtensionsContentProvider.java | 7 +-
.../studio/ldifparser/model/LdifEnumeration.java | 5 +-
plugins/openldap.config.editor/pom-first.xml | 2 +-
.../OpenLdapServerConfigurationEditorUtils.java | 24 +-
.../config/model/io/ConfigurationReader.java | 30 +-
plugins/schemaeditor/pom-first.xml | 4 +-
.../directory/studio/schemaeditor/PluginUtils.java | 12 +-
.../controller/ProblemsViewController.java | 3 +-
.../schemaeditor/controller/ProjectsHandler.java | 11 +-
.../schemaeditor/controller/SchemaHandler.java | 36 +-
.../actions/RenameSchemaElementAction.java | 11 +-
.../schemaeditor/model/DependenciesComputer.java | 22 +-
.../studio/schemaeditor/model/Schema.java | 3 +-
.../model/hierarchy/HierarchyManager.java | 43 +-
.../model/io/ApacheDsSchemaConnector.java | 267 ++--
.../model/io/GenericSchemaConnector.java | 95 +-
.../model/io/OpenLdapSchemaFileImporter.java | 10 +-
.../model/io/XMLSchemaFileImporter.java | 18 +-
.../model/schemachecker/SchemaChecker.java | 8 +-
.../AbstractAttributeTypeEditorPage.java | 3 +-
.../editors/attributetype/AttributeTypeEditor.java | 11 +-
.../AttributeTypeEditorOverviewPage.java | 15 +-
.../AttributeTypeEditorSourceCodePage.java | 3 +-
.../AttributeTypeEditorUsedByPage.java | 5 +-
.../objectclass/AbstractObjectClassEditorPage.java | 3 +-
.../editors/objectclass/ObjectClassEditor.java | 11 +-
.../objectclass/ObjectClassEditorOverviewPage.java | 17 +-
.../ObjectClassEditorSourceCodePage.java | 3 +-
.../editors/schema/SchemaEditorOverviewPage.java | 3 +-
.../view/views/HierarchyViewContentProvider.java | 9 +-
.../view/views/SchemaViewContentProvider.java | 36 +-
.../studio/schemaeditor/view/views/SearchView.java | 3 +-
.../view/wizards/ExportSchemasForADSWizard.java | 10 +-
.../view/wizards/MergeSchemasWizard.java | 8 +-
.../view/wizards/NewAttributeTypeWizard.java | 4 +-
.../view/wizards/NewObjectClassWizard.java | 4 +-
.../model/difference/DifferenceEngineTest.java | 88 +-
.../model/io/OpenLdapSchemaFileExporterTest.java | 20 +-
plugins/templateeditor/pom-first.xml | 3 +-
.../templateeditor/EntryTemplatePluginUtils.java | 5 +-
.../studio/templateeditor/TemplatesManager.java | 5 +-
.../view/preferences/TemplatesContentProvider.java | 9 +-
plugins/valueeditors/pom-first.xml | 4 +-
pom.xml | 45 +-
product/org.apache.directory.studio.product | 11 +-
tests/test.integration.core/pom-first.xml | 5 +-
.../studio/test/integration/core/Activator.java | 1 +
.../core/ConnectionWrapperTestBase.java | 215 +--
.../core/DirectoryApiConnectionWrapperTest.java | 28 +-
.../core/JNDIConnectionWrapperTest.java | 44 -
tests/test.integration.ui/pom-first.xml | 5 +-
tests/test.integration.ui/pom.xml | 3 -
.../studio/test/integration/ui/Activator.java | 1 +
.../test/integration/ui/ApacheDSPluginTest.java | 2 +
.../studio/test/integration/ui/AutomatedSuite.java | 2 +-
.../studio/test/integration/ui/BrowserTest.java | 129 +-
.../test/integration/ui/CertificateUtils.java | 98 --
.../integration/ui/CertificateValidationTest.java | 630 ++++----
.../studio/test/integration/ui/CopyEntryTest.java | 308 ++++
.../test/integration/ui/EntryEditorTest.java | 123 +-
.../studio/test/integration/ui/GssApiTest.java | 3 +
.../test/integration/ui/ImportExportTest.java | 281 +++-
.../studio/test/integration/ui/LdifEditorTest.java | 2 +
.../studio/test/integration/ui/MoveEntryTest.java | 119 ++
.../integration/ui/NewConnectionWizardTest.java | 4 +-
.../test/integration/ui/NewEntryWizardTest.java | 124 +-
.../test/integration/ui/PreferencesTest.java | 17 +-
.../test/integration/ui/ProgressViewTest.java | 17 +-
.../studio/test/integration/ui/RcpAppTest.java | 2 +
.../test/integration/ui/ReferralDialogTest.java | 2 +
...meEntryDialogTest.java => RenameEntryTest.java} | 10 +-
.../test/integration/ui/SchemaBrowserTest.java | 2 +
.../integration/ui/SchemaEditorSearchTest.java | 102 --
.../test/integration/ui/SchemaEditorTest.java | 264 ++++
.../studio/test/integration/ui/SearchTest.java | 156 +-
.../test/integration/ui/SwtResourcesTest.java | 2 +
...ogsViewBot.java => AttributeTypeEditorBot.java} | 13 +-
...emaBrowserBot.java => BaseSchemaEditorBot.java} | 39 +-
.../test/integration/ui/bots/BrowserViewBot.java | 48 +-
.../ui/bots/CertificateTrustDialogBot.java | 12 +-
.../integration/ui/bots/ConnectionsViewBot.java | 17 -
.../test/integration/ui/bots/DeleteDialogBot.java | 17 +-
.../studio/test/integration/ui/bots/DialogBot.java | 23 +
.../integration/ui/bots/DnEditorDialogBot.java | 6 +
.../test/integration/ui/bots/EntryEditorBot.java | 12 +
.../integration/ui/bots/EntryEditorWidgetBot.java | 39 +-
.../test/integration/ui/bots/ExportWizardBot.java | 50 +-
.../test/integration/ui/bots/LdifEditorBot.java | 2 -
.../ui/bots/ModificationLogsViewBot.java | 71 +
...torDialogBot.java => MoveEntriesDialogBot.java} | 32 +-
.../ui/bots/NewConnectionWizardBot.java | 17 -
.../ui/bots/NewSchemaProjectWizardBot.java | 35 +
...nLogsViewBot.java => ObjectClassEditorBot.java} | 13 +-
.../ui/bots/PasswordEditorDialogBot.java | 6 +
.../test/integration/ui/bots/SchemaBrowserBot.java | 2 +-
...cationLogsViewBot.java => SchemaEditorBot.java} | 13 +-
.../integration/ui/bots/SchemaProjectsViewBot.java | 23 +-
.../test/integration/ui/bots/SchemaViewBot.java | 147 ++
.../test/integration/ui/bots/SearchDialogBot.java | 42 +-
.../integration/ui/bots/SearchPageWrapperBot.java | 97 ++
...ialogBot.java => SelectCopyDepthDialogBot.java} | 58 +-
...teDialogBot.java => SelectCopyStrategyBot.java} | 59 +-
.../studio/test/integration/ui/bots/StudioBot.java | 13 +
...va => SubtreeSpecificationEditorDialogBot.java} | 12 +-
.../test/integration/ui/bots/utils/Assertions.java | 59 +
.../test/integration/ui/bots/utils/Characters.java | 79 +
.../test/integration/ui/bots/utils/JobWatcher.java | 4 +-
.../studio/test/integration/ui/BrowserTest.ldif | 33 +
.../test/integration/ui/EntryEditorTest.ldif | 24 +
.../test/integration/ui/ImportExportTest.ldif | 27 +
.../ui/ImportExportTest_Modifications.ldif | 127 ++
222 files changed, 4812 insertions(+), 6317 deletions(-)