From 0002c20acb7d36bc53d92f96a28d6decec4b9347 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Tue, 10 Feb 2015 13:30:46 +0000
Subject: [PATCH] OPENDJ-1741 Migrate to maven build
---
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/plugin_de.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/task_zh_CN.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/version_zh_CN.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/jeb_ko.properties | 3
opendj-sdk/opendj3-server-dev/src/main/assembly/example-plugin-assembly.xml | 96 ++
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/core_ko.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_zh_TW.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/utility_fr.properties | 4
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/protocol_zh_CN.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/utility_pl.properties | 0
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/quickSetup_pl.properties | 6
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_tool_ja.properties | 10
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/dsconfig_fr.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/quickSetup_zh_TW.properties | 6
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/schema_es.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/utility_ca_ES.properties | 0
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/schema_zh_CN.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/schema_ja.properties | 2
opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/MemoryReductionTestCases.java | 4
opendj-sdk/opendj3-server-dev/src/main/assembly/opendj-snmp-archive-assembly.xml | 56 +
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/plugin_zh_TW.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_ko.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/backend_ca_ES.properties | 0
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/backend_ko.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/dsconfig_de.properties | 2
opendj-sdk/opendj3-server-dev/resource/mac/Uninstall.app/Contents/Info.plist | 4
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/plugin.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/access_control_es.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/logger_zh_CN.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/tool_ko.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_tool.properties | 10
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/access_control_zh_TW.properties | 2
opendj-sdk/opendj3-server-dev/src/main/assembly/opendj-archive-component.xml | 306 ++++++
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/utility_es.properties | 4
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/replication.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/replication_zh_TW.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/tool_ca_ES.properties | 0
opendj-sdk/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/BinaryAttributeEditorPanel.java | 6
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/task_ko.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/protocol_ko.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/config_de.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/quickSetup_ja.properties | 6
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/runtime_ja.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/plugin_fr.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/quickSetup_fr.properties | 6
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/plugin_pl.properties | 0
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/core_ca_ES.properties | 0
opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/TestParentCfgDefn.properties | 24
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/quickSetup_es.properties | 6
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/jeb_ca_ES.properties | 0
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/config_ko.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/replication_ko.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_tool_zh_CN.properties | 10
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/quickSetup_de.properties | 6
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/runtime_ko.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/replication_ja.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_tool_pl.properties | 6
opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/SuiteRunner.java | 2
opendj-sdk/opendj3-server-dev/src/main/assembly/dsml-war-assembly.xml | 83 +
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/tool_de.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/utility_ja.properties | 4
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/config_fr.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/extension_zh_CN.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/task_de.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/core_zh_CN.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/backend.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/protocol_es.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/plugin_es.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/replication_es.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/config_zh_TW.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/extension_es.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_ja.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_tool_zh_TW.properties | 4
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/extension_pl.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/replication_zh_CN.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/task_fr.properties | 2
opendj-sdk/opendj3-server-dev/src/main/resources/bootstrap/manifest-bootstrap-client | 6
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_tool_ko.properties | 4
opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/TestChildCfgDefn.properties | 24
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/jeb_ja.properties | 3
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/runtime_es.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/utility_de.properties | 4
opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java | 10
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/tool_zh_CN.properties | 2
opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/TestListener.java | 5
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/protocol_ja.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/extension_ja.properties | 2
opendj-sdk/opendj3-server-dev/src/main/resources/META-INF/product/buildinfo | 1
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/extension.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/quickSetup_ca_ES.properties | 6
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/extension_fr.properties | 2
opendj-sdk/opendj3-server-dev/pom.xml | 1398 +++++++++++++++++++++++++++--
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/dsconfig_zh_TW.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_es.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_tool_fr.properties | 10
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_tool_de.properties | 10
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/jeb_zh_TW.properties | 3
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/protocol_de.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/schema.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_de.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_tool_es.properties | 10
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/extension_ko.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/task_zh_TW.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/runtime_zh_CN.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/extension_de.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/utility_ko.properties | 4
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_pl.properties | 0
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/core_fr.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/tool_es.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/dsconfig.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/access_control_zh_CN.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/jeb_pl.properties | 0
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/backend_es.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/logger_zh_TW.properties | 2
opendj-sdk/opendj3-server-dev/src/main/resources/bootstrap/manifest-bootstrap | 6
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/protocol_fr.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/replication_de.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/runtime_fr.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/tool_pl.properties | 0
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/version_ja.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/protocol_zh_TW.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/runtime_de.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/jeb_fr.properties | 3
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_fr.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/utility.properties | 4
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/backend_zh_CN.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/extension_ca_ES.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/schema_zh_TW.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/quickSetup_zh_CN.properties | 6
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/task.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/quickSetup_ko.properties | 6
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/task_es.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_zh_CN.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/version_zh_TW.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/dsconfig_zh_CN.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/tool_ja.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/runtime_pl.properties | 0
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/core_de.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/plugin_ja.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/protocol_pl.properties | 0
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/task_ja.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/runtime.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/task_ca_ES.properties | 0
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/tool_fr.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/jeb_es.properties | 3
opendj-sdk/opendj3-server-dev/src/main/resources/META-INF/opendj.properties | 67 +
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/plugin_zh_CN.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/config_es.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/replication_fr.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/backend_pl.properties | 0
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/utility_zh_CN.properties | 4
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/PublicAPI.java | 12
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/logger.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/task_pl.properties | 0
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/jeb_de.properties | 3
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/runtime_ca_ES.properties | 0
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/config_zh_CN.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/plugin_ko.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/config_ja.properties | 2
opendj-sdk/opendj3-server-dev/src/main/resources/org/forgerock/checkstyle/unit-test-suppressions.xml | 68 +
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/dsconfig_ca_ES.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/core_zh_TW.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/protocol.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/access_control.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/core_ja.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/access_control_de.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/tool_zh_TW.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/extension_zh_TW.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/backend_de.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/dsconfig_ja.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/logger_es.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/protocol_ca_ES.properties | 0
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/schema_fr.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/dsconfig_es.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_ca_ES.properties | 0
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/logger_ko.properties | 2
opendj-sdk/opendj3-server-dev/src/main/resources/org/forgerock/checkstyle/opendj.sourceheader | 0
opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/DirectoryServerTestCase.java | 7
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/core.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/jeb.properties | 4
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/schema_ko.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/utility_zh_TW.properties | 4
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/version_ko.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/access_control_fr.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/core_es.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/backend_ja.properties | 2
opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestBackendImpl.java | 18
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/logger_fr.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/backend_fr.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/access_control_ja.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/logger_ja.properties | 2
opendj-sdk/opendj3-server-dev/resource/mac/ControlPanel.app/Contents/Info.plist | 4
opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/util/TestStaticUtils.java | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/tool.properties | 8
opendj-sdk/opendj3-server-dev/src/main/assembly/opendj-archive-assembly.xml | 35
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/dsconfig_pl.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/access_control_ca_ES.properties | 0
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/SubtreeSpecification.java | 16
opendj-sdk/opendj3-server-dev/src/main/resources/java-stubs/org/opends/server/util/DynamicConstants.java | 43
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/backend_zh_TW.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/version_fr.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/config.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/access_control_ko.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/jeb_zh_CN.properties | 3
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/runtime_zh_TW.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/version_de.properties | 2
opendj-sdk/opendj3-server-dev/resource/mac/QuickSetup.app/Contents/Info.plist | 4
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/schema_de.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/dsconfig_ko.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/core_pl.properties | 0
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_tool_ca_ES.properties | 0
opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/pluggable/PluggableBackendImplTestCase.java | 41
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/quickSetup.properties | 6
opendj-sdk/opendj3-server-dev/src/main/resources/org/forgerock/checkstyle/opends-checkstyle.xml | 31
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/version_es.properties | 2
/dev/null | 35
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/version.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/logger_de.properties | 2
opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/access_control_pl.properties | 0
220 files changed, 2,419 insertions(+), 456 deletions(-)
diff --git a/opendj-sdk/opendj3-server-dev/pom.xml b/opendj-sdk/opendj3-server-dev/pom.xml
index c600358..efe5db8 100644
--- a/opendj-sdk/opendj3-server-dev/pom.xml
+++ b/opendj-sdk/opendj3-server-dev/pom.xml
@@ -28,11 +28,6 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <!-- This is Maven build file is just a hack in order to leverage
- Maven's site generation capabilities. It duplicates version information,
- and the Ant build is not split into phases: we just do it in one single
- blast during the compile phase -->
-
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.forgerock.opendj</groupId>
@@ -40,7 +35,7 @@
<version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>opendj3-server-dev</artifactId>
- <packaging>pom</packaging>
+ <packaging>jar</packaging>
<name>OpenDJ Directory Server</name>
<description>
OpenDJ is a new LDAPv3 compliant directory service, developed for the Java
@@ -49,9 +44,9 @@
</description>
<inceptionYear>2006</inceptionYear>
<scm>
- <url>https://svn.forgerock.org/opendj/trunk/opends/</url>
- <connection>scm:svn:https://svn.forgerock.org/opendj/trunk/opends/</connection>
- <developerConnection>scm:svn:https://svn.forgerock.org/opendj/trunk/opends/</developerConnection>
+ <url>https://svn.forgerock.org/opendj/branches/opendj3-server-dev/</url>
+ <connection>scm:svn:https://svn.forgerock.org/opendj/branches/opendj3-server-dev/</connection>
+ <developerConnection>scm:svn:https://svn.forgerock.org/opendj/branches/opendj3-server-dev/</developerConnection>
<tag>HEAD</tag>
</scm>
<ciManagement>
@@ -86,92 +81,1026 @@
<enabled>false</enabled>
</releases>
</repository>
+ <repository>
+ <id>oracle-repository</id>
+ <name>Oracle Maven Repository</name>
+ <url>http://download.oracle.com/maven</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
</repositories>
<properties>
- <ant.home>ext/ant</ant.home>
- <BUILD_NUMBER>0</BUILD_NUMBER>
+ <!-- General server-wide properties -->
+ <docgen.dir>${project.build.directory}/docgen</docgen.dir>
+ <jars.dir>${project.build.directory}/jars</jars.dir>
+ <!-- Product information properties -->
+ <shortProductName>OpenDJ</shortProductName>
+ <lowerCaseProductName>opendj</lowerCaseProductName>
+ <patchFixIds></patchFixIds>
+ <isDebugBuild>false</isDebugBuild>
+ <docHomepageUrl>http://opendj.forgerock.org/</docHomepageUrl>
+ <docWikiUrl>http://opendj.forgerock.org/docs.html</docWikiUrl>
+ <docGuideRefUrl>http://opendj.forgerock.org/doc/admin-guide/index.html</docGuideRefUrl>
+ <docGuideAdminUrl>http://opendj.forgerock.org/doc/admin-guide/index.html</docGuideAdminUrl>
+ <locales>ca_ES,es,de,fr,ja,ko,pl,zh_CN,zh_TW</locales>
+
+ <!-- Dependencies version properties -->
+ <project.version>3.0.0-SNAPSHOT</project.version>
+ <i18n.version>1.4.2-SNAPSHOT</i18n.version>
+ <forgerockBuildToolsVersion>1.0.2</forgerockBuildToolsVersion>
+ <grizzlyFrameworkVersion>2.3.14</grizzlyFrameworkVersion>
+ <slf4jVersion>1.7.5</slf4jVersion>
+ <forgerockRestVersion>2.1.0-SNAPSHOT</forgerockRestVersion>
+
+ <!-- Other properties -->
<checkstyleHeaderLocation>org/forgerock/checkstyle/opendj-java-header</checkstyleHeaderLocation>
+
</properties>
+
+ <dependencies>
+ <!-- ForgeRock libraries -->
+ <dependency>
+ <groupId>org.forgerock.opendj</groupId>
+ <artifactId>opendj-rest2ldap-servlet</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.forgerock.commons</groupId>
+ <artifactId>i18n-slf4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.forgerock.opendj</groupId>
+ <artifactId>opendj-slf4j-adapter</artifactId>
+ <version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.forgerock.opendj</groupId>
+ <artifactId>opendj3-server-dev</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.forgerock.opendj</groupId>
+ <artifactId>opendj-server3x-adapter</artifactId>
+ <version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.forgerock.opendj</groupId>
+ <artifactId>opendj-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.forgerock.opendj</groupId>
+ <artifactId>opendj3-server-dev</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.forgerock.opendj</groupId>
+ <artifactId>opendj-config</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.forgerock.opendj</groupId>
+ <artifactId>opendj-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.forgerock.opendj</groupId>
+ <artifactId>opendj-legacy</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.forgerock.opendj</groupId>
+ <artifactId>opendj-cli</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.forgerock</groupId>
+ <artifactId>forgerock-build-tools</artifactId>
+ <version>${forgerockBuildToolsVersion}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ </dependency>
+
+ <!-- servlet and mail -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.1-b02</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.grizzly</groupId>
+ <artifactId>grizzly-http-servlet</artifactId>
+ <version>2.3.16</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>1.4.7</version>
+ </dependency>
+
+ <!-- Tests -->
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>6.0.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <version>1.7.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>1.9.5</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.forgerock.opendj</groupId>
+ <artifactId>opendj-core</artifactId>
+ <type>test-jar</type>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- Databases -->
+ <dependency>
+ <groupId>com.sleepycat</groupId>
+ <artifactId>je</artifactId>
+ <version>5.0.104</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.sonar</groupId>
+ <artifactId>sonar-persistit</artifactId>
+ <version>3.3.1</version>
+ </dependency>
+ </dependencies>
+
<build>
+
<directory>build</directory>
+
+ <resources>
+ <!-- Main resources -->
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ <excludes>
+ <exclude>java-stubs</exclude>
+ </excludes>
+ </resource>
+ <!-- Property files used in test sources -->
+ <resource>
+ <directory>tests/unit-tests-testng/src/server</directory>
+ <filtering>false</filtering>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ <!-- Images for quicksetup must be explicitely copied from sources -->
+ <resource>
+ <directory>src/quicksetup</directory>
+ <filtering>false</filtering>
+ <includes>
+ <include>**/images/*.gif</include>
+ <include>**/images/*.png</include>
+ </includes>
+ </resource>
+ <!-- Images for guitools must be explicitely copied from sources -->
+ <resource>
+ <directory>src/guitools</directory>
+ <filtering>false</filtering>
+ <includes>
+ <include>**/images/*.gif</include>
+ <include>**/images/*.png</include>
+ </includes>
+ </resource>
+ <!-- .plist files for macos must be filtered to include build properties -->
+ <resource>
+ <directory>resource/mac</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/Info.plist</include>
+ </includes>
+ </resource>
+ <!-- Generation of DynamicConstants class from build properties -->
+ <resource>
+ <directory>src/main/resources/java-stubs</directory>
+ <filtering>true</filtering>
+ <targetPath>${project.build.directory}/java-stubs</targetPath>
+ </resource>
+ </resources>
+
<plugins>
+
+ <!-- Clean classes generated outside the build directory -->
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <inherited>false</inherited>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>${basedir}/src</directory>
+ <includes>
+ <include>admin/generated/**</include>
+ <include>messages/generated/**</include>
+ </includes>
+ <followSymlinks>false</followSymlinks>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+
+ <!-- Generate i18n messages -->
+ <plugin>
+ <groupId>org.forgerock.commons</groupId>
+ <artifactId>i18n-maven-plugin</artifactId>
<executions>
<execution>
- <id>clean</id>
- <phase>clean</phase>
+ <phase>generate-sources</phase>
<goals>
- <goal>run</goal>
+ <goal>generate-messages</goal>
</goals>
<configuration>
- <target>
- <delete dir="target" />
- <ant target="clean" />
- </target>
+ <resourceDirectory>${basedir}/src/messages</resourceDirectory>
+ <targetDirectory>${basedir}/src/messages/generated/</targetDirectory>
+ <force>true</force>
+ <messageFiles>
+ <!-- Warning: messageFile must contains at least one "/" -->
+ <messageFile>org/opends/messages/access_control.properties</messageFile>
+ <messageFile>org/opends/messages/admin.properties</messageFile>
+ <messageFile>org/opends/messages/admin_tool.properties</messageFile>
+ <messageFile>org/opends/messages/backend.properties</messageFile>
+ <messageFile>org/opends/messages/config.properties</messageFile>
+ <messageFile>org/opends/messages/core.properties</messageFile>
+ <messageFile>org/opends/messages/dsconfig.properties</messageFile>
+ <messageFile>org/opends/messages/extension.properties</messageFile>
+ <messageFile>org/opends/messages/jeb.properties</messageFile>
+ <messageFile>org/opends/messages/logger.properties</messageFile>
+ <messageFile>org/opends/messages/plugin.properties</messageFile>
+ <messageFile>org/opends/messages/protocol.properties</messageFile>
+ <messageFile>org/opends/messages/quickSetup.properties</messageFile>
+ <messageFile>org/opends/messages/replication.properties</messageFile>
+ <messageFile>org/opends/messages/runtime.properties</messageFile>
+ <messageFile>org/opends/messages/schema.properties</messageFile>
+ <messageFile>org/opends/messages/task.properties</messageFile>
+ <messageFile>org/opends/messages/tool.properties</messageFile>
+ <messageFile>org/opends/messages/utility.properties</messageFile>
+ <messageFile>org/opends/messages/version.properties</messageFile>
+ </messageFiles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+
+
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <!-- Copy messages properties files for inclusion in main jar -->
+ <execution>
+ <id>copy-l10n-messages</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.outputDirectory}/org/opends/messages</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/messages/org/opends/messages</directory>
+ <filtering>false</filtering>
+ </resource>
+ </resources>
</configuration>
</execution>
<execution>
- <id>compile</id>
- <phase>compile</phase>
+ <id>copy-l10n-config-messages</id>
+ <phase>validate</phase>
<goals>
- <goal>run</goal>
+ <goal>copy-resources</goal>
</goals>
<configuration>
- <target>
- <!-- We need to significantly refactor build.xml in order
- to split this up any more -->
- <ant target="precommit" />
- </target>
+ <outputDirectory>${project.build.outputDirectory}/admin/messages/org/opends/server/admin/std/meta</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/admin/messages</directory>
+ <filtering>false</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.forgerock</groupId>
+ <artifactId>manifest-classpath-maven-plugin</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>generate-bootstrap-manifest</id>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <classPathProperty>classpath.bootstrap</classPathProperty>
+ <productJarName>${shortProductName}</productJarName>
+ <supportedLocales>${locales}</supportedLocales>
+ <excludes>
+ <exclude>org.slf4j:slf4j-jdk14</exclude>
+ </excludes>
</configuration>
</execution>
<execution>
- <id>generate-docs</id>
- <phase>pre-site</phase>
+ <id>generate-bootstrap-client-manifest</id>
<goals>
- <goal>run</goal>
+ <goal>generate</goal>
</goals>
<configuration>
- <target>
- <ant target="javadoc" />
- <ant target="configguide" />
- <ant target="generateLogReference" />
- </target>
+ <classPathProperty>classpath.bootstrap-client</classPathProperty>
+ <productJarName>${shortProductName}</productJarName>
+ <supportedLocales>${locales}</supportedLocales>
+ <excludes>
+ <exclude>org.forgerock.opendj:opendj-slf4j-adapter</exclude>
+ </excludes>
</configuration>
</execution>
+ </executions>
+ </plugin>
+
+ <!-- Generate configuration classes from XML definitions -->
+ <!-- Leave default lifecycle phase once new config framework migration
+ is done -->
+ <plugin>
+ <groupId>org.forgerock.opendj</groupId>
+ <artifactId>opendj-config-maven-plugin</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <executions>
<execution>
- <id>cp-generated-docs</id>
- <phase>site</phase>
+ <id>generate-config</id>
+ <phase>generate-sources</phase>
<goals>
- <goal>run</goal>
+ <goal>generate</goal>
</goals>
<configuration>
- <target>
- <copy todir="build/site/configref">
- <fileset dir="build/docgen/configuration_guide/" />
- </copy>
- <copy todir="build/site/javadoc">
- <fileset dir="build/javadoc/" />
- </copy>
- </target>
+ <phase>none</phase>
+ <packageName>org.forgerock.opendj.server.config</packageName>
+ <isExtension>false</isExtension>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.8</version>
+ <executions>
+ <!-- Take into account several sources directories for the build -->
+ <execution>
+ <id>main-java-sources</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>src/server</source>
+ <source>src/quicksetup</source>
+ <source>src/ads</source>
+ <source>src/guitools</source>
+ <source>src/messages/generated</source>
+ <source>src/messages/src</source>
+ <source>src/admin/generated</source>
+ <source>src/build-tools</source>
+ <source>src/dsml</source>
+ <source>${project.build.directory}/java-stubs</source>
+ </sources>
+ </configuration>
+ </execution>
+ <!-- Take into account tests directory for the build -->
+ <execution>
+ <id>test-sources</id>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>add-test-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>tests/unit-tests-testng/src/server</source>
+ </sources>
+ </configuration>
+ </execution>
+ <!-- Parse version to generate properties (major.version, minor.version,
+ ...) -->
+ <execution>
+ <id>parse-version</id>
+ <goals>
+ <goal>parse-version</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- Retrieve the SVN revision number and the build timestamp -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <version>1.3</version>
+ <executions>
+ <execution>
+ <id>generate-buildnumber</id>
+ <goals>
+ <goal>create</goal>
+ </goals>
+ <configuration>
+ <useLastCommittedRevision>true</useLastCommittedRevision>
+ <buildNumberPropertyName>buildRevision</buildNumberPropertyName>
+ <revisionOnScmFailure>-1</revisionOnScmFailure>
+ </configuration>
+ </execution>
+ <execution>
+ <id>generate-timestamp</id>
+ <goals>
+ <goal>create</goal>
+ </goals>
+ <configuration>
+ <format>{0,date,yyyyMMddHHmmss}</format>
+ <items>
+ <item>timestamp</item>
+ </items>
+ <buildNumberPropertyName>buildDateTime</buildNumberPropertyName>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- Create consolidated schema file for use in upgrade -->
+ <plugin>
+ <groupId>org.forgerock</groupId>
+ <artifactId>concat-schema-maven-plugin</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>creates-base-schema-files</id>
+ <goals>
+ <goal>concat</goal>
+ </goals>
+ <configuration>
+ <schemaDirectory>${basedir}/resource/schema</schemaDirectory>
+ <outputDirectory>${project.build.directory}/upgrade</outputDirectory>
+ <outputFile>schema.ldif.${buildRevision}</outputFile>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- Compile unit tests -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-testCompile</id>
+ <goals>
+ <goal>testCompile</goal>
+ </goals>
+ <configuration>
+ <testSourceDirectory>tests/unit-tests-testng/src/server</testSourceDirectory>
+ <showDeprecation>false</showDeprecation>
+ <showWarnings>false</showWarnings>
+ <testCompilerArgument>-nowarn</testCompilerArgument>
+ <testExcludes>
+ <testExclude>**/org/opends/server/snmp/**</testExclude>
+ </testExcludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- Disable surefire plugin because all tests are run with failsafe
+ plugin -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-test</id>
+ <phase>none</phase>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <!-- Package boostrap jar - contains only a manifest with classpath
+ for the server -->
+ <execution>
+ <id>build-bootstrap-jar</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${jars.dir}</outputDirectory>
+ <finalName>bootstrap</finalName>
+ <includes>
+ <include>nothing</include>
+ </includes>
+ <archive>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ <manifestFile>${project.build.outputDirectory}/bootstrap/manifest-bootstrap</manifestFile>
+ </archive>
+ </configuration>
+ </execution>
+ <!-- Package boostrap-client jar - contains only a manifest with
+ classpath for clients -->
+ <execution>
+ <id>build-bootstrap-client-jar</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${jars.dir}</outputDirectory>
+ <finalName>bootstrap-client</finalName>
+ <includes>
+ <include>nothing</include>
+ </includes>
+ <archive>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ <manifestFile>${project.build.outputDirectory}/bootstrap/manifest-bootstrap-client</manifestFile>
+ </archive>
+ </configuration>
+ </execution>
+ <!-- Package build-tools jar -->
+ <execution>
+ <id>create-build-tools-jar</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${jars.dir}</outputDirectory>
+ <finalName>build-tools</finalName>
+ <!-- TODO: Adds the resource/Messages.java.stub to build/build-tools/classes/org/opends/build/tools/resource -->
+ <includes>
+ <include>**/messages/Severity.class</include>
+ <include>**/messages/Category.class</include>
+ <include>**/messages/Message.class</include>
+ <include>**/messages/MessagePropertyKey.class</include>
+ <include>**/messages/MessageDescriptor.class</include>
+ <include>**/server/types/PublicAPI.class</include>
+ <include>**/server/types/StabilityLevel.class</include>
+ <include>**/javax/jnlp/*</include>
+ <include>**/netscape/ldap/*</include>
+ <include>**/build/tools/*</include>
+ </includes>
+ </configuration>
+ </execution>
+ <!-- Package quicksetup jar -->
+ <execution>
+ <id>build-quicksetup-jar</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${jars.dir}</outputDirectory>
+ <finalName>quicksetup</finalName>
+ <includes>
+ <include>**/quicksetup/**</include>
+ <include>**/org/opends/admin/ads/*</include>
+ <include>**/org/opends/server/util/SetupUtils.class</include>
+ <include>**/org/opends/server/util/CertificateManager.class</include>
+ <include>**/org/opends/server/util/DynamicConstants.class</include>
+ <include>**/org/opends/server/types/OperatingSystem.class</include>
+ <include>**/org/opends/messages/Message.class</include>
+ <include>**/org/opends/messages/MessageBuilder.class</include>
+ <include>**/org/opends/messages/MessageDescriptor.class</include>
+ <include>**/org/opends/messages/Severity.class</include>
+ <include>**/org/opends/messages/Category.class</include>
+ <include>**/org/opends/messages/QuickSetupMessages.class</include>
+ <include>**/org/opends/server/types/OpenDsException.class</include>
+ </includes>
+ </configuration>
+ </execution>
+ <!-- Build localized jars (one per supported locale) -->
+ <!-- (is there a way to avoid all these repeated executions ?) -->
+ <execution>
+ <id>build-caES-jar</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${jars.dir}</outputDirectory>
+ <finalName>${shortProductName}_ca_ES</finalName>
+ <includes>
+ <include>**/*_ca_ES.properties</include>
+ </includes>
+ <archive>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ <index>true</index>
+ </archive>
+ </configuration>
+ </execution>
+ <execution>
+ <id>build-de-jar</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${jars.dir}</outputDirectory>
+ <finalName>${shortProductName}_de</finalName>
+ <includes>
+ <include>**/*_de.properties</include>
+ </includes>
+ <archive>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ <index>true</index>
+ </archive>
+ </configuration>
+ </execution>
+ <execution>
+ <id>build-es-jar</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${jars.dir}</outputDirectory>
+ <finalName>${shortProductName}_es</finalName>
+ <includes>
+ <include>**/*_es.properties</include>
+ </includes>
+ <archive>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ <index>true</index>
+ </archive>
+ </configuration>
+ </execution>
+ <execution>
+ <id>build-fr-jar</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${jars.dir}</outputDirectory>
+ <finalName>${shortProductName}_fr</finalName>
+ <includes>
+ <include>**/*_fr.properties</include>
+ </includes>
+ <archive>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ <index>true</index>
+ </archive>
+ </configuration>
+ </execution>
+ <execution>
+ <id>build-ja-jar</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${jars.dir}</outputDirectory>
+ <finalName>${shortProductName}_ja</finalName>
+ <includes>
+ <include>**/*_ja.properties</include>
+ </includes>
+ <archive>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ <index>true</index>
+ </archive>
+ </configuration>
+ </execution>
+ <execution>
+ <id>build-ko-jar</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${jars.dir}</outputDirectory>
+ <finalName>${shortProductName}_ko</finalName>
+ <includes>
+ <include>**/*_ko.properties</include>
+ </includes>
+ <archive>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ <index>true</index>
+ </archive>
+ </configuration>
+ </execution>
+ <execution>
+ <id>build-pl-jar</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${jars.dir}</outputDirectory>
+ <finalName>${shortProductName}_pl</finalName>
+ <includes>
+ <include>**/*_pl.properties</include>
+ </includes>
+ <archive>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ <index>true</index>
+ </archive>
+ </configuration>
+ </execution>
+ <execution>
+ <id>build-zh-CN-jar</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${jars.dir}</outputDirectory>
+ <finalName>${shortProductName}_zh_CN</finalName>
+ <includes>
+ <include>**/*_zh_CN.properties</include>
+ </includes>
+ <archive>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ <index>true</index>
+ </archive>
+ </configuration>
+ </execution>
+ <execution>
+ <id>build-zh-TW-jar</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${jars.dir}</outputDirectory>
+ <finalName>${shortProductName}_zh_TW</finalName>
+ <includes>
+ <include>**/*_zh_TW.properties</include>
+ </includes>
+ <archive>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ <index>true</index>
+ </archive>
+ </configuration>
+ </execution>
+ <!-- Main jar -->
+ <execution>
+ <id>default-jar</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${jars.dir}</outputDirectory>
+ <finalName>${shortProductName}</finalName>
+ <excludes>
+ <exclude>*.app/**</exclude>
+ <exclude>java-stubs/**</exclude>
+ <exclude>bootstrap/**</exclude>
+ <exclude>javax/jnlp/**</exclude>
+ <exclude>netscape/**</exclude>
+ <exclude>META-INF/**</exclude>
+ <exclude>org/opends/dsml/**</exclude>
+ <exclude>**/*_ca_ES.properties</exclude>
+ <exclude>**/*_de.properties</exclude>
+ <exclude>**/*_es.properties</exclude>
+ <exclude>**/*_fr.properties</exclude>
+ <exclude>**/*_ja.properties</exclude>
+ <exclude>**/*_ko.properties</exclude>
+ <exclude>**/*_pl.properties</exclude>
+ <exclude>**/*_zh_CN.properties</exclude>
+ <exclude>**/*_zh_TW.properties</exclude>
+ </excludes>
+ <archive>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ <index>true</index>
+ </archive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <!-- Package the example plugin in a zip -->
+ <execution>
+ <id>build-example-package</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <finalName>example-plugin</finalName>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ <appendAssemblyId>false</appendAssemblyId>
+ <attach>false</attach>
+ <descriptors>
+ <descriptor>src/main/assembly/example-plugin-assembly.xml</descriptor>
+ </descriptors>
+ <formats>
+ <format>zip</format>
+ </formats>
+ </configuration>
+ </execution>
+ <!-- Creates the archive folder -->
+ <execution>
+ <id>build-opendj-archive</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <finalName>${lowerCaseProductName}</finalName>
+ <outputDirectory>${project.build.directory}/package</outputDirectory>
+ <appendAssemblyId>false</appendAssemblyId>
+ <attach>false</attach>
+ <descriptors>
+ <descriptor>src/main/assembly/opendj-archive-assembly.xml</descriptor>
+ </descriptors>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/bootstrap/manifest-bootstrap</manifestFile>
+ </archive>
+ </configuration>
+ </execution>
+ <!-- Package DSML war -->
+ <execution>
+ <id>build-dsml-war</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <finalName>${shortProductName}-${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}-DSML</finalName>
+ <outputDirectory>${project.build.directory}/package</outputDirectory>
+ <appendAssemblyId>false</appendAssemblyId>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ <descriptors>
+ <descriptor>src/main/assembly/dsml-war-assembly.xml</descriptor>
+ </descriptors>
+ <formats>
+ <format>war</format>
+ </formats>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <!-- Temporary solution for configuration classes until migration
+ to new config framework -->
+ <id>generate-config</id>
+ <phase>generate-sources</phase>
+ <configuration>
+ <target>
+ <ant antfile="${basedir}/build.xml">
+ <target name="generateadmin" />
+ </ant>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <!-- Generate final zip and attach artefact -->
+ <execution>
+ <id>attach-artifact</id>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <zip
+ destfile="${project.build.directory}/package/${shortProductName}-${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.zip"
+ basedir="${project.build.directory}/package/"
+ includes="${lowerCaseProductName}/**">
+ <zipfileset
+ dir="${project.build.directory}/package/${lowerCaseProductName}"
+ includes="**/*"
+ excludes="bin/*,template/**/*,lib/_client-script.sh,lib/_script-util.sh,lib/_server-script.sh,lib/_mixed-script.sh,setup,uninstall,upgrade,QuickSetup.app/Contents/MacOS/JavaApplicationStub,Uninstall.app/Contents/MacOS/JavaApplicationStub,bin/ControlPanel.app/Contents/MacOS/JavaApplicationStub"
+ filemode="644" dirmode="755" prefix="opendj" />
+ <zipfileset
+ dir="${project.build.directory}/package/${lowerCaseProductName}"
+ includes="lib/_client-script.sh,lib/_script-util.sh,lib/_server-script.sh,lib/_mixed-script.sh"
+ filemode="755" dirmode="755" prefix="opendj" />
+ <zipfileset
+ dir="${project.build.directory}/package/${lowerCaseProductName}"
+ includes="bin/*" filemode="755" dirmode="755"
+ prefix="opendj" />
+ <zipfileset
+ dir="${project.build.directory}/package/${lowerCaseProductName}"
+ includes="setup,uninstall,upgrade,QuickSetup.app/Contents/MacOS/JavaApplicationStub,Uninstall.app/Contents/MacOS/JavaApplicationStub,bin/ControlPanel.app/Contents/MacOS/JavaApplicationStub"
+ filemode="755" dirmode="755" prefix="opendj" />
+ <zipfileset
+ dir="${project.build.directory}/package/${lowerCaseProductName}"
+ includes="template/**/*" filemode="444" dirmode="744"
+ prefix="opendj" />
+ </zip>
+ <attachartifact
+ file="${project.build.directory}/package/${shortProductName}-${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.zip"
+ type="zip" />
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- Generates log references for documentation -->
+ <plugin>
+ <groupId>org.forgerock</groupId>
+ <artifactId>genlogref-documentation-maven-plugin</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-xml-messages-doc</goal>
+ </goals>
+ <configuration>
+ <messagesDirectory>${basedir}/src/messages/org/opends/messages</messagesDirectory>
+ <outputDirectory>${project.build.directory}/docgen/logref</outputDirectory>
+ <logMessageReferenceFilePath>${basedir}/resource/log-message-reference.xml</logMessageReferenceFilePath>
+ <messageFileNames>
+ <!-- for xxx_yyy.properties generates a log-ref-xxx-yyy.xml
+ file -->
+ <messageFileName>admin</messageFileName>
+ <messageFileName>backend</messageFileName>
+ <messageFileName>config</messageFileName>
+ <messageFileName>core</messageFileName>
+ <messageFileName>dsconfig</messageFileName>
+ <messageFileName>extension</messageFileName>
+ <messageFileName>jeb</messageFileName>
+ <messageFileName>log</messageFileName>
+ <messageFileName>plugin</messageFileName>
+ <messageFileName>protocol</messageFileName>
+ <messageFileName>replication</messageFileName>
+ <messageFileName>schema</messageFileName>
+ <messageFileName>task</messageFileName>
+ <messageFileName>tool</messageFileName>
+ <messageFileName>utility</messageFileName>
+
+ <!-- Ignore following message files as we document only serious
+ errors. -->
+ <!-- <messageFileName>access_control</messageFileName> -->
+ <!-- <messageFileName>admin_tool</messageFileName> -->
+ <!-- <messageFileName>quicksetup.properties</messageFileName> -->
+ <!-- <messageFileName>runtime_information.properties</messageFileName> -->
+ <!-- <messageFileName>version.properties</messageFileName> -->
+ </messageFileNames>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- Generate documentation (guide) -->
+ <plugin>
<groupId>org.forgerock.commons</groupId>
<artifactId>forgerock-doc-maven-plugin</artifactId>
<version>${frDocPluginVersion}</version>
<inherited>false</inherited>
<configuration>
- <projectName>OpenDJ</projectName>
- <projectVersion>${docTargetVersion}</projectVersion>
- <releaseVersion>${docTargetVersion}</releaseVersion>
- <googleAnalyticsId>${gaId}</googleAnalyticsId>
+ <projectName>${shortProductName}</projectName>
+ <projectVersion>${docTargetVersion}</projectVersion>
+ <releaseVersion>${docTargetVersion}</releaseVersion>
+ <googleAnalyticsId>${gaId}</googleAnalyticsId>
+ <latestJson>http://docs.forgerock.org/latest.json</latestJson>
+ <docbkxSourceDirectory>${basedir}/src/main/docbkx</docbkxSourceDirectory>
</configuration>
<executions>
<execution>
@@ -205,6 +1134,7 @@
</executions>
</plugin>
+ <!-- Build javadoc -->
<plugin>
<groupId>org.forgerock.maven.plugins</groupId>
<artifactId>javadoc-updater-maven-plugin</artifactId>
@@ -216,81 +1146,161 @@
<goal>fixjavadoc</goal>
</goals>
<configuration>
- <directory>build/site/javadoc</directory>
+ <directory>${project.build.directory}/site/javadoc</directory>
</configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.7</version>
- <executions>
- <execution>
- <id>parse-version</id>
- <goals>
- <goal>parse-version</goal>
- </goals>
- </execution>
- <execution>
- <id>attach-artifacts</id>
- <phase>package</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <file>build/package/OpenDJ-${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.zip</file>
- <type>zip</type>
- </artifact>
- <artifact>
- <file>build/package/OpenDJ-${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}-DSML.war</file>
- <type>war</type>
- </artifact>
- <artifact>
- <file>build/package/OpenDJ-${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}/lib/OpenDJ.jar</file>
- <type>jar</type>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <!-- Release project -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<configuration>
- <!-- Required for release:perform: the parent pom specifies a value
- for "arguments" in the plugin configuration. This prevents
- command line setting of the option. -->
+ <!-- Required for release:perform: the parent pom specifies a value
+ for "arguments" in the plugin configuration. This prevents command line setting
+ of the option. -->
<arguments>-Penforce -Dopendmk.lib.dir=${opendmk.lib.dir}</arguments>
</configuration>
</plugin>
+
+ <!-- Generate DSML code from XML files -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jaxb2-maven-plugin</artifactId>
+ <version>1.6</version>
+ <executions>
+ <execution>
+ <id>prepare-dsml-library</id>
+ <goals>
+ <goal>xjc</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/dsml/gen</outputDirectory>
+ <schemaDirectory>${basedir}/resource/dsml/schema</schemaDirectory>
+ <schemaFiles>DSMLv2.xsd</schemaFiles>
+ <packageName>org.opends.dsml.protocol</packageName>
+ <bindingDirectory>${basedir}/resource/dsml/schema</bindingDirectory>
+ <bindingFiles>bindings.xjb</bindingFiles>
+ <target>2.1</target>
+ <npa>true</npa>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
+
<profiles>
+ <!--
+ Profile to run precommit tasks: checkstyle, copyright (TODO), SVN eol check (TODO),
+ unit-tests
+
+ Tests are not run by default due to running time (average of 8-10 minutes).
+
+ -->
<profile>
- <id>tests-only</id>
+ <id>precommit</id>
<build>
<plugins>
+ <!-- Enforce Checkstyle -->
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <inherited>false</inherited>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.14</version>
+ <executions>
+ <!-- Disable default from parent -->
+ <execution>
+ <id>check-src-and-tests</id>
+ <phase>none</phase>
+ <goals>
+ <goal>checkstyle</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>check-src-and-tests-alternative</id>
+ <configuration>
+ <excludes>org/opends/messages/**,**/server/admin/std/**,**/config/meta/**,**/config/client/**,**/config/server/**,**/dsml/protocol/**,javax/jnlp/**,netscape/ldap/**</excludes>
+ <configLocation>${project.build.outputDirectory}/org/forgerock/checkstyle/opends-checkstyle.xml</configLocation>
+ <headerLocation>${project.build.outputDirectory}/org/forgerock/checkstyle/opendj.sourceheader</headerLocation>
+ <suppressionsLocation>${project.build.outputDirectory}/org/forgerock/checkstyle/unit-test-suppressions.xml</suppressionsLocation>
+ <includeTestSourceDirectory>true</includeTestSourceDirectory>
+ <includeResources>false</includeResources>
+ <!-- Only output errors if we're not expecting any -->
+ <consoleOutput>${checkstyleFailOnError}</consoleOutput>
+ <failsOnError>${checkstyleFailOnError}</failsOnError>
+ </configuration>
+ <phase>process-test-classes</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!--
+ Run unit/integration tests.
+
+ A lot of existing tests requires a running server, which is why the tests are
+ run using failsafe instead of surefire.
+
+ It should be possible in the future to separate tests into unit (no server) and
+ integration (with server), by using respectively surefire and failsafe plugin
+ to run them, but it will require identifying them.
+ We could use an "unit" marker in TestNG groups to do so.
+
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
<executions>
<execution>
- <id>compile</id>
- <phase>compile</phase>
<goals>
- <goal>run</goal>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
</goals>
<configuration>
- <target>
- <!-- We need to significantly refactor build.xml in order
- to split this up any more -->
- <ant target="test" />
- </target>
+ <testSourceDirectory>tests/unit-tests-testng/src/server</testSourceDirectory>
+ <excludes>
+ <exclude>org/opends/server/snmp/**</exclude>
+ <exclude>org/opends/quicksetup/**</exclude>
+ </excludes>
+ <includes>
+ <include>**/Test*.java</include>
+ <include>**/*Test.java</include>
+ <include>**/*Tests.java</include>
+ <include>**/*TestCase.java</include>
+ <include>**/*TestCases.java</include>
+ </includes>
+ <properties>
+ <property>
+ <name>usedefaultlisteners</name>
+ <value>false</value>
+ </property>
+ <property>
+ <name>listener</name>
+ <value>org.opends.server.TestListener</value>
+ </property>
+ <property>
+ <name>excludegroups</name>
+ <value>slow</value>
+ </property>
+ <property>
+ <name>configfailurepolicy</name>
+ <value>skip</value>
+ </property>
+ </properties>
+ <systemPropertyVariables>
+ <org.opends.server.BuildRoot>${basedir}</org.opends.server.BuildRoot>
+ <org.opends.server.BuildDir>${project.build.directory}</org.opends.server.BuildDir>
+ <org.opends.test.replicationDbImpl>LOG</org.opends.test.replicationDbImpl>
+ <!-- <jvmarg value="-Dorg.opends.server.snmp.opendmk=${opendmk.lib.dir}"/> -->
+ <org.opends.server.CleanupDirectories>true</org.opends.server.CleanupDirectories>
+ <org.opends.test.suppressOutput>true</org.opends.test.suppressOutput>
+ <org.opends.test.pauseOnFailure>false</org.opends.test.pauseOnFailure>
+ <org.opends.test.copyClassesToTestPackage>false</org.opends.test.copyClassesToTestPackage>
+ </systemPropertyVariables>
+ <argLine>-server -Xms1024M -Xmx1024M</argLine>
</configuration>
</execution>
</executions>
@@ -298,5 +1308,189 @@
</plugins>
</build>
</profile>
+
+ <!--
+ Profile to build SNMP extension.
+
+ This profile is only actived when command line contains the 'opendmk.lib.dir'
+ property that must point to the directory where OpenDMK jars are located.
+ Example: mvn install -Dopendmk.lib.dir=/path/to/opendmk/jars
+ -->
+ <profile>
+ <id>snmp</id>
+ <activation>
+ <property>
+ <name>opendmk.lib.dir</name>
+ </property>
+ </activation>
+
+ <properties>
+ <snmp.gen.dir>${basedir}/src/snmp/generated</snmp.gen.dir>
+ <snmp.mib.dir>${basedir}/src/snmp/resource/mib</snmp.mib.dir>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>opendmk</groupId>
+ <artifactId>jdmkrt</artifactId>
+ <version>1.0</version>
+ <scope>system</scope>
+ <systemPath>${opendmk.lib.dir}/jdmkrt.jar</systemPath>
+ </dependency>
+ <dependency>
+ <groupId>opendmk</groupId>
+ <artifactId>jdmktk</artifactId>
+ <version>1.0</version>
+ <scope>system</scope>
+ <systemPath>${opendmk.lib.dir}/jdmktk.jar</systemPath>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/snmp/resource</directory>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <!-- Add snmp source directory and snmp generated directory
+ as sources -->
+ <execution>
+ <id>snmp-java-sources</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>src/snmp/src</source>
+ <source>src/snmp/generated</source>
+ <source>tests/unit-tests-testng/src/server/snmp</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- Cleans SNMP directory -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>createMibDir</id>
+ <phase>initialize</phase>
+ <configuration>
+ <target>
+ <delete dir="${snmp.gen.dir}/org/opends/server/snmp" />
+ <mkdir dir="${snmp.gen.dir}/org/opends/server/snmp" />
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- MIB generation -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.3.2</version>
+ <executions>
+ <execution>
+ <id>mib-generation</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <executable>java</executable>
+ <classpathScope>compile</classpathScope>
+ <arguments>
+ <argument>-classpath</argument>
+ <classpath />
+ <argument>com.sun.jdmk.tools.MibGen</argument>
+ <argument>-X:use-display-hint</argument>
+ <argument>-d</argument>
+ <argument>${snmp.gen.dir}/org/opends/server/snmp</argument>
+ <argument>-mc</argument>
+ <argument>-desc</argument>
+ <argument>-tp</argument>
+ <argument>org.opends.server.snmp</argument>
+ <argument>${snmp.mib.dir}/rfc2605.txt</argument>
+ <argument>${snmp.mib.dir}/mib_core.txt</argument>
+ <argument>${snmp.mib.dir}/rfc2021.txt</argument>
+ <argument>${snmp.mib.dir}/rfc2788.txt</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- Creates snmp-mib2605 jar file -->
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-snmp-jar</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${jars.dir}</outputDirectory>
+ <finalName>snmp-mib2605</finalName>
+ <includes>
+ <include>org/opends/server/snmp/**</include>
+ <include>admin/extension.manifest</include>
+ </includes>
+ <archive>
+ <index>true</index>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ <manifestEntries>
+ <Extension-Name>snmp-mib2605</Extension-Name>
+ <Implementation-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"</Implementation-Version>
+ <Revision-Number>${buildRevision}</Revision-Number>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- Package the final zip -->
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>build-opendj-archive</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/package</outputDirectory>
+ <finalName>${shortProductName}-${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</finalName>
+ <descriptors>
+ <descriptor>src/main/assembly/opendj-snmp-archive-assembly.xml</descriptor>
+ </descriptors>
+ <appendAssemblyId>false</appendAssemblyId>
+ <formats>
+ <format>zip</format>
+ </formats>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
</profiles>
+
</project>
diff --git a/opendj-sdk/opendj3-server-dev/resource/mac/ControlPanel.app/Contents/Info.plist b/opendj-sdk/opendj3-server-dev/resource/mac/ControlPanel.app/Contents/Info.plist
index 74b49b1..c032cbd 100644
--- a/opendj-sdk/opendj3-server-dev/resource/mac/ControlPanel.app/Contents/Info.plist
+++ b/opendj-sdk/opendj3-server-dev/resource/mac/ControlPanel.app/Contents/Info.plist
@@ -7,9 +7,9 @@
<key>CFBundleIdentifier</key>
<string>org.opends.guitools.controlpanel.ControlPanelLauncher</string>
<key>CFBundleShortVersionString</key>
- <string>@version@</string>
+ <string>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</string>
<key>CFBundleVersion</key>
- <string>@revision@</string>
+ <string>${buildRevision}</string>
<key>CFBundleAllowMixedLocalizations</key>
<string>true</string>
<key>CFBundleExecutable</key>
diff --git a/opendj-sdk/opendj3-server-dev/resource/mac/QuickSetup.app/Contents/Info.plist b/opendj-sdk/opendj3-server-dev/resource/mac/QuickSetup.app/Contents/Info.plist
index 4c17181..3d36e80 100644
--- a/opendj-sdk/opendj3-server-dev/resource/mac/QuickSetup.app/Contents/Info.plist
+++ b/opendj-sdk/opendj3-server-dev/resource/mac/QuickSetup.app/Contents/Info.plist
@@ -7,9 +7,9 @@
<key>CFBundleIdentifier</key>
<string>org.opends.quicksetup.installer.SetupLauncher</string>
<key>CFBundleShortVersionString</key>
- <string>@version@</string>
+ <string>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</string>
<key>CFBundleVersion</key>
- <string>@revision@</string>
+ <string>${buildRevision}</string>
<key>CFBundleAllowMixedLocalizations</key>
<string>true</string>
<key>CFBundleExecutable</key>
diff --git a/opendj-sdk/opendj3-server-dev/resource/mac/Uninstall.app/Contents/Info.plist b/opendj-sdk/opendj3-server-dev/resource/mac/Uninstall.app/Contents/Info.plist
index 3d6d8e8..e4ec2ea 100644
--- a/opendj-sdk/opendj3-server-dev/resource/mac/Uninstall.app/Contents/Info.plist
+++ b/opendj-sdk/opendj3-server-dev/resource/mac/Uninstall.app/Contents/Info.plist
@@ -7,9 +7,9 @@
<key>CFBundleIdentifier</key>
<string>org.opends.guitools.uninstaller.UninstallLauncher</string>
<key>CFBundleShortVersionString</key>
- <string>@version@</string>
+ <string>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</string>
<key>CFBundleVersion</key>
- <string>@revision@</string>
+ <string>${buildRevision}</string>
<key>CFBundleAllowMixedLocalizations</key>
<string>true</string>
<key>CFBundleExecutable</key>
diff --git a/opendj-sdk/opendj3-server-dev/src/build-tools/org/opends/build/tools/CheckPrecommit.java b/opendj-sdk/opendj3-server-dev/src/build-tools/org/opends/build/tools/CheckPrecommit.java
deleted file mode 100644
index b151a35..0000000
--- a/opendj-sdk/opendj3-server-dev/src/build-tools/org/opends/build/tools/CheckPrecommit.java
+++ /dev/null
@@ -1,399 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- * or http://forgerock.org/license/CDDLv1.0.html.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at legal-notices/CDDLv1_0.txt.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- * Portions copyright 2012 ForgeRock AS.
- */
-package org.opends.build.tools;
-
-
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.GregorianCalendar;
-import java.util.HashSet;
-import java.util.LinkedList;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
-import org.tmatesoft.svn.core.SVNDepth;
-import org.tmatesoft.svn.core.SVNException;
-import org.tmatesoft.svn.core.wc.SVNPropertyData;
-import org.tmatesoft.svn.core.wc.SVNRevision;
-import org.tmatesoft.svn.core.wc.ISVNStatusHandler;
-import org.tmatesoft.svn.core.wc.SVNClientManager;
-import org.tmatesoft.svn.core.wc.SVNStatus;
-import org.tmatesoft.svn.core.wc.SVNWCClient;
-
-
-
-/**
- * This class provides an implementation of an Ant task that may be used to
- * perform various checks to deteermine whether a file is suitable to be
- * committed. This includes:
- * <UL>
- * <LI>Make sure that the file has the correct "svn:eol-style" property
- * value.</LI>
- * <LI>If a file contains a line that appears to be a comment and includes the
- * word "copyright", then it should contain the current year.</LI>
- * </UL>
- */
-public class CheckPrecommit
- extends Task
- implements ISVNStatusHandler
-{
- /**
- * The name of the system property that may be used to prevent copyright date
- * problems from failing the build.
- */
- public static final String IGNORE_COPYRIGHT_ERRORS_PROPERTY =
- "org.opends.server.IgnoreCopyrightDateErrors";
-
-
-
- /**
- * The name of the system property that may be used to prevent svn eol-style
- * problems from failing the build.
- */
- public static final String IGNORE_EOLSTYLE_ERRORS_PROPERTY =
- "org.opends.server.IgnoreEOLStyleErrors";
-
-
-
- /**
- *
- */
- public static final HashSet<String> CHECKED_EXTENSIONS =
- new HashSet<String>();
- static
- {
- CHECKED_EXTENSIONS.add("java");
- CHECKED_EXTENSIONS.add("xml");
- CHECKED_EXTENSIONS.add("xsd");
- CHECKED_EXTENSIONS.add("xsl");
- CHECKED_EXTENSIONS.add("html");
- CHECKED_EXTENSIONS.add("sh");
- CHECKED_EXTENSIONS.add("bat");
- CHECKED_EXTENSIONS.add("ldif");
- CHECKED_EXTENSIONS.add("txt");
- CHECKED_EXTENSIONS.add("c");
- CHECKED_EXTENSIONS.add("h");
- CHECKED_EXTENSIONS.add("mc");
- CHECKED_EXTENSIONS.add("Makefile");
- }
-
-
-
- // The path to the directory that is the base of the workspace.
- private File workspacePath;
-
- // The set of files that appear to have problems with the EOL style.
- private LinkedList<String> eolStyleProblemFiles = new LinkedList<String>();
-
- // The set of files that appear to have problems with the copyright date.
- private LinkedList<String> copyrightProblemFiles = new LinkedList<String>();
-
- // The path to the root of the Subversion workspace to check.
- private String workspace = null;
-
- // The string representation of the current year.
- private String yearString;
-
- // The overall SVN Client Manager. required with svnkit 1.2.x
- private static SVNClientManager ourClientManager =
- SVNClientManager.newInstance();
- // The property client used to look at file properties.
- private SVNWCClient propertyClient;
-
-
-
- /**
- * Specifies the path to the root of the Subversion workspace for which to
- * retrieve the revision number.
- *
- * @param workspace The path to the root of the Subversion workspace for
- * which to retrieve the revision number.
- */
- public void setWorkspace(String workspace)
- {
- this.workspace = workspace;
- }
-
-
-
- /**
- * Performs the appropriate processing needed for this task. In this case,
- * it uses SVNKit to identify all modified files in the current workspace.
- * For all source files, look for comment lines containing the word
- * "copyright" and make sure at least one of them contains the current year.
- */
- @Override()
- public void execute()
- {
- if ((workspace == null) || (workspace.length() == 0))
- {
- workspacePath = getProject().getBaseDir();
- }
- else
- {
- workspacePath = new File(workspace);
- }
-
-
- // Get the year to use in the determination.
- GregorianCalendar calendar = new GregorianCalendar();
- int year = calendar.get(GregorianCalendar.YEAR);
- yearString = String.valueOf(year);
-
-
- // Process the base directory and all of its subdirectories.
- propertyClient = ourClientManager.getWCClient();
-
- try
- {
- ourClientManager.getStatusClient().doStatus(workspacePath, SVNRevision.WORKING,
- SVNDepth.INFINITY, false, false, false, false, this, null);
- }
- catch (Exception e)
- {
- e.printStackTrace();
- System.err.println("WARNING: Encountered an error while examining " +
- "Subversion status: " + e);
- System.err.println("No further checks will be performed.");
- return;
- }
-
- boolean fail = false;
-
- if (! eolStyleProblemFiles.isEmpty())
- {
- System.err.println("WARNING: Potential svn:eol-style updates needed " +
- "for the following files:");
- for (String filename : eolStyleProblemFiles)
- {
- System.err.println(" " + filename);
- }
-
- String ignoreProp =
- getProject().getProperty(IGNORE_EOLSTYLE_ERRORS_PROPERTY);
- if ((ignoreProp == null) || (! ignoreProp.equalsIgnoreCase("true")))
- {
- fail = true;
- System.err.println("Fix svn:eol-style problems before proceeding, or " +
- "use '-D" + IGNORE_EOLSTYLE_ERRORS_PROPERTY +
- "=true' to ignore svn eol-style warnings.");
- }
- }
-
- if (! copyrightProblemFiles.isEmpty())
- {
- System.err.println("WARNING: Potential copyright year updates needed " +
- "for the following files:");
- for (String filename : copyrightProblemFiles)
- {
- System.err.println(" " + filename);
- }
-
- String ignoreProp =
- getProject().getProperty(IGNORE_COPYRIGHT_ERRORS_PROPERTY);
- if ((ignoreProp == null) || (! ignoreProp.equalsIgnoreCase("true")))
- {
- fail = true;
- System.err.println("Fix copyright date problems before proceeding, " +
- "or use '-D" + IGNORE_COPYRIGHT_ERRORS_PROPERTY +
- "=true' to ignore copyright warnings.");
- }
- }
-
- if (fail)
- {
- throw new BuildException();
- }
- }
-
-
-
- /**
- * Examines the provided status item to determine whether the associated file
- * is acceptable.
- *
- * @param status The SVN status information for the file of interest.
- */
- public void handleStatus(SVNStatus status)
- {
- File file = status.getFile();
- if ((! file.exists()) || (! file.isFile()))
- {
- // The file doesn't exist (which probably means it's been deleted) or
- // isn't a regular file, so we'll ignore it.
- return;
- }
-
- String fileName = file.getName();
- int lastPeriodPos = fileName.lastIndexOf('.');
- if (lastPeriodPos > 0)
- {
- String extension = fileName.substring(lastPeriodPos+1);
- if (! CHECKED_EXTENSIONS.contains(extension.toLowerCase()))
- {
- // The file doesn't have an extension that we care about, so skip it.
- return;
- }
- }
- else
- {
- // The file doesn't have an extension. We'll still want to check it if
- // it's in a resource/bin directory.
- File parentDirectory = file.getParentFile();
- if ((parentDirectory == null) ||
- (! parentDirectory.getName().equals("bin")))
- {
- return;
- }
-
- parentDirectory = parentDirectory.getParentFile();
- if ((parentDirectory == null) ||
- (! parentDirectory.getName().equals("resource")))
- {
- return;
- }
- }
-
-
- String filePath = file.getAbsolutePath();
- if (filePath.startsWith(workspacePath.getPath() + "/"))
- {
- filePath = filePath.substring(workspacePath.getPath().length() + 1);
- }
-
-
- // Check to make sure that the file has the correct EOL style.
- try
- {
- SVNPropertyData propertyData =
- propertyClient.doGetProperty(file, "svn:eol-style",
- SVNRevision.BASE,
- SVNRevision.WORKING);
- if ((propertyData == null) ||
- (! propertyData.getValue().getString().equals("native")))
- {
- eolStyleProblemFiles.add(filePath);
- }
- }
- catch (SVNException se)
- {
- // This could happen if the file isn't under version control. If so, then
- // we can't check the eol-style but we should at least be able to check
- // the copyright dates, so keep going.
- }
-
-
- // Check to see whether the file has a comment line containing a copyright
- // without the current year.
- BufferedReader reader = null;
- try
- {
- boolean copyrightFound = false;
- boolean correctYearFound = false;
- reader = new BufferedReader(new FileReader(file));
- String line = reader.readLine();
- while (line != null)
- {
- String lowerLine = line.toLowerCase().trim();
- if (isCommentLine(lowerLine))
- {
- int copyrightPos = lowerLine.indexOf("copyright");
- if (copyrightPos > 0)
- {
- copyrightFound = true;
- if (lowerLine.indexOf(yearString) > 0)
- {
- correctYearFound = true;
- break;
- }
- }
- }
-
- line = reader.readLine();
- }
-
- if (copyrightFound && (! correctYearFound))
- {
- copyrightProblemFiles.add(filePath);
- }
- }
- catch (IOException ioe)
- {
- System.err.println("ERROR: Could not read file " + filePath +
- " to check copyright date.");
- System.err.println("No further copyright date checking will be " +
- "performed.");
- throw new RuntimeException();
- }
- finally
- {
- try
- {
- if (reader != null)
- {
- reader.close();
- }
- } catch (Exception e) {}
- }
- }
-
-
-
- /**
- * Indicates whether the provided line appears to be a comment line. It will
- * check for a number of common comment indicators in Java source files,
- * shell scripts, XML files, and LDIF files.
- *
- * @param lowerLine The line to be checked. It should have been coverted to
- * all lowercase characters and any leading spaces
- * removed.
- *
- * @return {@code true} if it appears that the line is a comment line, or
- * {@code false} if not.
- */
- private static boolean isCommentLine(String lowerLine)
- {
- if (lowerLine.startsWith("/*") ||
- lowerLine.startsWith("*") ||
- lowerLine.startsWith("//") ||
- lowerLine.startsWith("#") ||
- lowerLine.startsWith("rem") ||
- lowerLine.startsWith("<!--") ||
- lowerLine.startsWith("!"))
- {
- return true;
- }
- else
- {
- return false;
- }
- }
-}
-
diff --git a/opendj-sdk/opendj3-server-dev/src/build-tools/org/opends/build/tools/ConcatSchema.java b/opendj-sdk/opendj3-server-dev/src/build-tools/org/opends/build/tools/ConcatSchema.java
deleted file mode 100644
index 93feffa..0000000
--- a/opendj-sdk/opendj3-server-dev/src/build-tools/org/opends/build/tools/ConcatSchema.java
+++ /dev/null
@@ -1,283 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- * or http://forgerock.org/license/CDDLv1.0.html.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at legal-notices/CDDLv1_0.txt.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2011 ForgeRock AS
- */
-package org.opends.build.tools;
-
-
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.util.LinkedList;
-import java.util.TreeSet;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
-
-
-
-/**
- * This class provides an implementation of an Ant task that concatenates the
- * contents of the files in the schema directory to create a base schema that
- * may be used during the upgrade process. Each element will also include the
- * X-SCHEMA-FILE extension to indicate the source schema file.
- */
-public class ConcatSchema
- extends Task
-{
- // The path to the directory containing the schema files.
- private String schemaDirectory;
-
- // The path to the concatenated schema file to create.
- private String toFile;
-
-
-
- /**
- * Specifies the path to the directory containing the schema files.
- *
- * @param schemaDirectory The path to the directory containing the schema
- * files.
- */
- public void setSchemaDirectory(String schemaDirectory)
- {
- this.schemaDirectory = schemaDirectory;
- }
-
-
-
- /**
- * Specifies the path to the file to create containing the concatenated schema
- * elements.
- *
- * @param toFile The path to the file containing the concatenated schema
- * elements.
- */
- public void setToFile(String toFile)
- {
- this.toFile = toFile;
- }
-
-
-
- /**
- * Performs the appropriate processing needed for this task. In this case,
- * it uses SVNKit to identify all modified files in the current workspace.
- * For all source files, look for comment lines containing the word
- * "copyright" and make sure at least one of them contains the current year.
- */
- @Override()
- public void execute()
- {
- // Get a sorted list of the files in the schema directory.
- TreeSet<String> schemaFileNames = new TreeSet<String>();
- for (File f : new File(schemaDirectory).listFiles())
- {
- if (f.isFile())
- {
- schemaFileNames.add(f.getName());
- }
- }
-
-
- // Create a set of lists that will hold the schema elements read from the
- // files.
- LinkedList<String> attributeTypes = new LinkedList<String>();
- LinkedList<String> objectClasses = new LinkedList<String>();
- LinkedList<String> nameForms = new LinkedList<String>();
- LinkedList<String> ditContentRules = new LinkedList<String>();
- LinkedList<String> ditStructureRules = new LinkedList<String>();
- LinkedList<String> matchingRuleUses = new LinkedList<String>();
- LinkedList<String> ldapSyntaxes = new LinkedList<String>();
-
-
- // Open each of the files in order and read the elements that they contain,
- // appending them to the appropriate lists.
- for (String name : schemaFileNames)
- {
- // Read the contents of the file into a list with one schema element per
- // list element.
- LinkedList<StringBuilder> lines = new LinkedList<StringBuilder>();
- try
- {
- BufferedReader reader = new BufferedReader(new FileReader(
- new File(schemaDirectory, name)));
-
- while (true)
- {
- String line = reader.readLine();
- if (line == null)
- {
- break;
- }
- else if (line.startsWith("#") || (line.length() == 0))
- {
- continue;
- }
- else if (line.startsWith(" "))
- {
- lines.getLast().append(line.substring(1));
- }
- else
- {
- lines.add(new StringBuilder(line));
- }
- }
-
- reader.close();
- }
- catch (Exception e)
- {
- throw new BuildException("Error while reading schema file " + name +
- ": " + e, e);
- }
-
-
- // Iterate through each line in the list. Find the colon and get the
- // attribute name at the beginning. If it's someting that we don't
- // recognize, then skip it. Otherwise, add the X-SCHEMA-FILE extension
- // and add it to the appropriate schema element list.
- for (StringBuilder buffer : lines)
- {
- // Get the line and add the X-SCHEMA-FILE extension to the end of it.
- // All of them should end with " )" but some might have the parenthesis
- // crammed up against the last character so deal with that as well.
- String line = buffer.toString().trim();
- if (line.endsWith(" )"))
- {
- line = line.substring(0, line.length()-1) + "X-SCHEMA-FILE '" + name +
- "' )";
- }
- else if (line.endsWith(")"))
- {
- line = line.substring(0, line.length()-1) + " X-SCHEMA-FILE '" + name +
- "' )";
- }
- else
- {
- continue;
- }
-
- String lowerLine = line.toLowerCase();
- if (lowerLine.startsWith("attributetypes:"))
- {
- attributeTypes.add(line);
- }
- else if (lowerLine.startsWith("objectclasses:"))
- {
- objectClasses.add(line);
- }
- else if (lowerLine.startsWith("nameforms:"))
- {
- nameForms.add(line);
- }
- else if (lowerLine.startsWith("ditcontentrules:"))
- {
- ditContentRules.add(line);
- }
- else if (lowerLine.startsWith("ditstructurerules:"))
- {
- ditStructureRules.add(line);
- }
- else if (lowerLine.startsWith("matchingruleuse:"))
- {
- matchingRuleUses.add(line);
- }
- else if (lowerLine.startsWith("ldapsyntaxes:"))
- {
- ldapSyntaxes.add(line);
- }
- }
- }
-
-
- // Write the resulting output to the merged schema file.
- try
- {
- BufferedWriter writer = new BufferedWriter(new FileWriter(toFile));
- writer.write("dn: cn=schema");
- writer.newLine();
- writer.write("objectClass: top");
- writer.newLine();
- writer.write("objectClass: ldapSubentry");
- writer.newLine();
- writer.write("objectClass: subschema");
- writer.newLine();
-
- for (String line : ldapSyntaxes)
- {
- writer.write(line);
- writer.newLine();
- }
-
- for (String line : attributeTypes)
- {
- writer.write(line);
- writer.newLine();
- }
-
- for (String line : objectClasses)
- {
- writer.write(line);
- writer.newLine();
- }
-
- for (String line : nameForms)
- {
- writer.write(line);
- writer.newLine();
- }
-
- for (String line : ditContentRules)
- {
- writer.write(line);
- writer.newLine();
- }
-
- for (String line : ditStructureRules)
- {
- writer.write(line);
- writer.newLine();
- }
-
- for (String line : matchingRuleUses)
- {
- writer.write(line);
- writer.newLine();
- }
-
- writer.close();
- }
- catch (Exception e)
- {
- throw new BuildException("Error while writing concatenated schema file " +
- toFile + ": " + e, e);
- }
- }
-}
-
diff --git a/opendj-sdk/opendj3-server-dev/src/build-tools/org/opends/build/tools/CoverageDiff.java b/opendj-sdk/opendj3-server-dev/src/build-tools/org/opends/build/tools/CoverageDiff.java
deleted file mode 100644
index 34e30de..0000000
--- a/opendj-sdk/opendj3-server-dev/src/build-tools/org/opends/build/tools/CoverageDiff.java
+++ /dev/null
@@ -1,963 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- * or http://forgerock.org/license/CDDLv1.0.html.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at legal-notices/CDDLv1_0.txt.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- * Portions copyright 2012 ForgeRock AS.
- */
-package org.opends.build.tools;
-
-import com.vladium.emma.report.*;
-import com.vladium.emma.report.html.doc.*;
-import com.vladium.emma.data.*;
-import com.vladium.util.IntObjectMap;
-
-import java.io.*;
-import java.util.*;
-
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.BuildException;
-
-import org.tmatesoft.svn.core.SVNDepth;
-import org.tmatesoft.svn.core.SVNException;
-import org.tmatesoft.svn.core.internal.io.dav.DAVRepositoryFactory;
-import org.tmatesoft.svn.core.wc.SVNClientManager;
-import org.tmatesoft.svn.core.wc.SVNRevision;
-
-public class CoverageDiff extends Task {
-
- private static SVNClientManager ourClientManager =
- SVNClientManager.newInstance();
- private static final String EOL = System.getProperty("line.separator");
-
- private boolean verbose = false;
- private boolean enabled = true;
-
- private final int COVERED_MOD_EXE_LINES = 0;
- private final int MOD_EXE_LINES = 1;
- private final int MOD_LINES = 2;
- private final int DEL_LINES = 3;
-
- private final String ENCODING = "ISO-8859-1";
- private final int IO_BUF_SIZE = 32 * 1024;
- private final LinkedHashMap<String, SrcFileItem> emmaSrcMap =
- new LinkedHashMap<String, SrcFileItem>();
- private final LinkedHashMap<String, Double[]> modCoverageMap =
- new LinkedHashMap<String, Double[]>();
-
- private final String CSS = "TABLE,TD,TH {border-style:solid; border-color:black;} " +
- "TD,TH {background:white;margin:0;line-height:100%;padding-left:0.5em;padding-right:0.5em;} " +
- "TD {border-width:0 1px 0 0;} TH {border-width:1px 1px 1px 0;} " +
- "TR TD.h {color:red;} " +
- "TABLE {border-spacing:0; border-collapse:collapse;border-width:0 0 1px 1px;} " +
- "P,H1,H2,H3,TH {font-family:verdana,arial,sans-serif;font-size:10pt;} " +
- "TD {font-family:courier,monospace;font-size:10pt;} " +
- "TABLE.hdft {border-spacing:0;border-collapse:collapse;border-style:none;} " +
- "TABLE.hdft TH,TABLE.hdft TD {border-style:none;line-height:normal;} " +
- "TABLE.hdft TH.tl,TABLE.hdft TD.tl {background:#6699CC;color:white;} " +
- "TABLE.hdft TD.nv {background:#6633DD;color:white;} " +
- ".nv A:link {color:white;} .nv A:visited {color:white;} " +
- ".nv A:active {color:yellow;} " +
- "TABLE.hdft A:link {color:white;} " +
- "TABLE.hdft A:visited {color:white;} " +
- "TABLE.hdft A:active {color:yellow;} " +
- ".in {color:#356085;} " +
- "TABLE.s TD {padding-left:0.25em;padding-right:0.25em;} " +
- "TABLE.s TD.ddt {padding-left:0.25em;padding-right:0.25em;color:#AAAAAA;}" +
- "TABLE.s TD.ds {padding-left:0.25em;padding-right:0.25em;text-align:right;background:#F0F0F0;} " +
- "TABLE.s TD.dm {padding-left:0.25em;padding-right:0.25em;text-align:right;background:#BCCFF9;} " +
- "TABLE.s TD.dd {padding-left:0.25em;padding-right:0.25em;text-align:right;background:#AAAAAA;color:#FFFFFF} " +
- "TABLE.s TH {padding-left:0.25em;padding-right:0.25em;text-align:left;background:#F0F0F0;} " +
- "TABLE.s TD.cz {background:#FF9999;} " +
- "TABLE.s TD.cp {background:#FFFF88;} " +
- "TABLE.s TD.cc {background:#CCFFCC;} " +
- "A:link {color:#0000EE;text-decoration:none;} " +
- "A:visited {color:#0000EE;text-decoration:none;} " +
- "A:hover {color:#0000EE;text-decoration:underline;} " +
- "TABLE.cn {border-width:0 0 1px 0;} " +
- "TABLE.s {border-width:1px 0 1px 1px;} " +
- "TD.h {color:red;border-width:0 1px 0 0;} " +
- "TD.f {border-width:0 1px 0 1px;} " +
- "TD.hf {color:red;border-width:0 1px 0 1px;} " +
- "TH.f {border-width:1px 1px 1px 1px;} " +
- "TR.cis TD {background:#F0F0F0;} " +
- "TR.cis TD {border-width:1px 1px 1px 0;} " +
- "TR.cis TD.h {color:red;border-width:1px 1px 1px 0;} " +
- "TR.cis TD.f {border-width:1px 1px 1px 1px;} " +
- "TR.cis TD.hf {color:red;border-width:1px 1px 1px 1px;} " +
- "TD.b {border-style:none;background:transparent;line-height:50%;} " +
- "TD.bt {border-width:1px 0 0 0;background:transparent;line-height:50%;} " +
- "TR.o TD {background:#F0F0F0;}" +
- "TABLE.it {border-style:none;}" +
- "TABLE.it TD,TABLE.it TH {border-style:none;}";
-
- private File emmaDataPath;
- private File outputPath;
- private String diffPath;
-
- // The SVN revision to perform the diff against when calculating
- // the coverage diff. It can be a revision number, a timestamp,
- // or a revision keyword (BASE, COMMITTED, and PREV make the
- // most sense). The primary use case for this setting is to do
- // a coverage diff against the previous revision when there are
- // no changes in the working copy. It defaults to BASE.
- private String fromRevision;
-
- public void setEmmaDataPath(String file)
- {
- emmaDataPath = new File(file);
- }
-
- public void setOutputPath(String file)
- {
- outputPath = new File(file);
- }
-
- public void setDiffPath(String diffArgs)
- {
- diffPath = diffArgs;
- }
-
- public void setVerbose(String bol)
- {
- verbose = bol.toLowerCase().equals("true");
- }
-
- public void setEnabled(String bol)
- {
- enabled = bol.toLowerCase().equals("true");
- }
-
- public void setFromRevision(String fromRevision)
- {
- this.fromRevision = fromRevision;
- }
-
- public void execute() throws BuildException {
- try {
- innerExecute();
- } catch (BuildException e) {
- throw e;
- } catch (Throwable e) {
- e.printStackTrace();
- }
- }
-
- private void innerExecute() throws BuildException, SVNException
- {
- long start = System.currentTimeMillis();
- verboseOut("Starting to execute coveragediff.");
- verboseOut("diffPath='" + diffPath +"'");
- if(emmaDataPath == null)
- {
- throw new BuildException("emmaDataPath attribute is not set. It must be set to the path of the EMMA data directory");
- }
- if(outputPath == null)
- {
- throw new BuildException("outputPath attribute is not set. It must be set to a valid directory where the report will be generated");
- }
- if(fromRevision == null)
- {
- throw new BuildException("fromRevision attribute is not set. It must be set to the revision from which the diff is generated (e.g. BASE).");
- }
-
- if(!enabled)
- {
- return;
- }
-
- // So we can go over http:// and https:// when diff'ing against previous versions
- DAVRepositoryFactory.setup();
-
- IReportDataView emmaDataView = null;
- try
- {
- emmaDataView = loadEmmaData(emmaDataPath);
- verboseOut("Loaded EMMA data.");
- }
- catch(IOException ie)
- {
- System.out.println("WARNING: An error occurred while loading EMMA " +
- "data. Report will not contain any coverage information.");
- }
-
- try
- {
- processDiffOutput(getDiffOutputReader(), emmaDataView);
- }
- catch(IOException ie)
- {
- System.out.println("ERROR: An error occurred while processing diff output: " + ie.toString() + " Quitting...");
- ie.printStackTrace();
- return;
- }
- System.out.println("Coverage diff completed in " + (System.currentTimeMillis() - start) + " ms.");
- }
-
-
- private IReportDataView loadEmmaData(File emmaCoverageDataDir) throws IOException
- {
- if(emmaCoverageDataDir == null)
- {
- throw new IOException("Emma Converage Data Directory is null");
- }
-
- File[] emmaCoverageDataFiles = emmaCoverageDataDir.listFiles();
- int emmaCoverageDataFileCount = 0;
- IReportDataView m_view;
- IMetaData mdata = null;
- ICoverageData cdata = null;
-
- if(emmaCoverageDataFiles == null || emmaCoverageDataFiles.length <= 0)
- {
- throw new IOException("No EMMA data files found");
- }
-
- verboseOut("processing input files ...");
-
- final long start = System.currentTimeMillis();
-
- // merge all data files:
-
- for (final File dataFile : emmaCoverageDataFiles) {
- verboseOut("processing input file [" + dataFile.getAbsolutePath() + "] ...");
-
- final IMergeable[] fileData = DataFactory.load(dataFile);
-
- final IMetaData _mdata = (IMetaData) fileData[DataFactory.TYPE_METADATA];
- if (_mdata != null) {
- verboseOut(" loaded " + _mdata.size() + " metadata entries");
-
- if (mdata == null)
- mdata = _mdata;
- else
- mdata = (IMetaData) mdata.merge(_mdata); // note: later datapath entries override earlier ones
- }
-
- final ICoverageData _cdata = (ICoverageData) fileData[DataFactory.TYPE_COVERAGEDATA];
- if (_cdata != null) {
- verboseOut(" loaded " + _cdata.size() + " coverage data entries");
-
- if (cdata == null)
- cdata = _cdata;
- else
- cdata = (ICoverageData) cdata.merge(_cdata); // note: later datapath entries override earlier ones
- }
-
- ++emmaCoverageDataFileCount;
- }
-
- verboseOut(emmaCoverageDataFileCount + " file(s) read and merged in " + (System.currentTimeMillis() - start) + " ms");
-
- if ((mdata == null) || mdata.isEmpty()) {
- System.out.println("nothing to do: no metadata found in any of the data files");
- return null;
- }
-
- if (cdata == null) {
- System.out.println("nothing to do: no runtime coverage data found in any of the data files");
- return null;
- }
-
- if (cdata.isEmpty()) {
- System.out.println("no collected coverage data found in any of the data files [Diff output will not include coverage data]");
- return null;
- }
- if (!mdata.hasLineNumberData() || !mdata.hasSrcFileData()) {
- System.out.println("no collected line coverage data found in any of the data files [Diff output will not include coverage data]");
- return null;
- }
-
- final IReportDataModel model = IReportDataModel.Factory.create (mdata, cdata);
- m_view = model.getView (IReportDataView.HIER_SRC_VIEW);
-
- verboseOut(" merged metadata contains " + mdata.size() + " entries");
- verboseOut(" merged coverage data contains " + cdata.size() + " entries");
-
- return m_view;
- }
-
- private BufferedReader getDiffOutputReader()
- throws IOException, SVNException {
- File workspaceRoot = getProject().getBaseDir();
-
- File diffFile = new File(outputPath, "svn.diff");
-
- // Most often this will be 'BASE' but it could also be 'PREVIOUS'
- SVNRevision baseRevision = SVNRevision.parse(fromRevision);
- System.out.println("Doing coverage diff from revision: " + baseRevision.toString());
-
- ourClientManager.getDiffClient().doDiff(workspaceRoot, baseRevision,
- workspaceRoot, SVNRevision.WORKING, SVNDepth.INFINITY, false,
- new FileOutputStream(diffFile), null);
-
- return new BufferedReader(new InputStreamReader(new FileInputStream(
- diffFile)));
- }
-
- private void processDiffOutput(BufferedReader diffOutput,
- IReportDataView emmaDataView)
- throws IOException {
-
- File file = new File(outputPath, "index.html");
- BufferedWriter writer =
- new BufferedWriter (new OutputStreamWriter (
- new FileOutputStream (file), ENCODING), IO_BUF_SIZE);
- HTMLWriter out = new HTMLWriter(writer);
-
- System.out.println("Writing report to [" + file.toString() + "]");
-
- String title = "Coverage Diff Report (generated ";
- title = title + new Date(System.currentTimeMillis ());
- title = title + " )";
-
- HTMLDocument page = new HTMLDocument (title, ENCODING);
- page.addStyle (CSS);
-
- String line = diffOutput.readLine();
- ArrayList<String> diffOutputFile = new ArrayList<String>();
-
- while(line != null)
- {
- //Diffed file
- if(line.length() >6 && line.substring(0, 6).equals("Index:"))
- {
- processDiffOutputFile(page, diffOutputFile, emmaDataView);
- diffOutputFile = new ArrayList<String>();
- diffOutputFile.add(line);
- }
- else
- {
- diffOutputFile.add(line);
- }
-
- line = diffOutput.readLine();
- }
- processDiffOutputFile(page, diffOutputFile, emmaDataView);
-
- IElementList overallStats = new ElementList();
-
- final IElement statTitle = IElement.Factory.create (Tag.Hs[1]);
- statTitle.setText("OVERALL STATS SUMMARY", true);
-
- overallStats.add(statTitle);
-
- final HTMLTable statsTable = new HTMLTable (null, null, null, "0");
- statsTable.setClass ("it");
- {
- HTMLTable.IRow row = statsTable.newRow ();
- row.newCell ().setText ("svn diff arg(s):", true);
- row.newCell ().setText ("" + diffPath.toString(), true);
-
- row = statsTable.newRow ();
- row.newCell ().setText ("total files modified:", true);
- row.newCell ().setText ("" + emmaSrcMap.keySet().size(), false);
-
- Double[] overallModCoverage = new Double[4];
- overallModCoverage[COVERED_MOD_EXE_LINES] = 0.0;
- overallModCoverage[MOD_EXE_LINES] = 0.0;
- overallModCoverage[MOD_LINES] = 0.0;
- overallModCoverage[DEL_LINES] = 0.0;
-
- Double[] modCoverage;
- for (Double[] doubles : modCoverageMap.values()) {
- modCoverage = doubles;
-
- if (modCoverage != null) {
- overallModCoverage[COVERED_MOD_EXE_LINES] += modCoverage[COVERED_MOD_EXE_LINES];
- overallModCoverage[MOD_EXE_LINES] += modCoverage[MOD_EXE_LINES];
- overallModCoverage[MOD_LINES] += modCoverage[MOD_LINES];
- overallModCoverage[DEL_LINES] += modCoverage[DEL_LINES];
- }
- }
- String modCoverageStr = "";
- if(overallModCoverage[MOD_EXE_LINES] > 0)
- {
- modCoverageStr = String.format("%d%% (%.1f/%.1f)",
- (int)(overallModCoverage[COVERED_MOD_EXE_LINES]/overallModCoverage[MOD_EXE_LINES]*100),
- overallModCoverage[COVERED_MOD_EXE_LINES],
- overallModCoverage[MOD_EXE_LINES]);
- }
- else
- {
- modCoverageStr = String.format("%d%% (%.1f/%.1f)", 100,
- overallModCoverage[COVERED_MOD_EXE_LINES],
- overallModCoverage[MOD_EXE_LINES]);
- }
-
- row = statsTable.newRow ();
- row.newCell ().setText ("total lines modified:", true);
- row.newCell ().setText ("" + overallModCoverage[MOD_LINES].intValue(), true);
- row = statsTable.newRow ();
- row.newCell ().setText ("total lines removed:", true);
- row.newCell ().setText ("" + overallModCoverage[DEL_LINES].intValue(), true);
- row = statsTable.newRow ();
- row.newCell ().setText ("coverage for modified executable lines:", true);
- row.newCell ().setText ("" + modCoverageStr, true);
- }
-
- overallStats.add(statsTable);
-
- final IElement coverageTitle = IElement.Factory.create (Tag.Hs[1]);
- statTitle.setText("OVERALL DIFF SUMMARY", true);
-
- overallStats.add(coverageTitle);
-
- HTMLTable summaryTable = new HTMLTable ("100%", null, null, "0");
- if(emmaDataView != null)
- {
- addHeaderRow(emmaDataView.getRoot(), summaryTable, true);
- }
- else
- {
- addHeaderRow(null, summaryTable, true);
- }
-
- Set<Map.Entry<String, SrcFileItem>> items = emmaSrcMap.entrySet();
- boolean odd = true;
- int count = 0;
-
- for (Map.Entry<String, SrcFileItem> item : items) {
-
- if (item != null) {
- final String fileName = item.getKey();
- final SrcFileItem srcFileItem = item.getValue();
- final Double[] modCoverage = modCoverageMap.get(fileName);
-
- addItemRow(fileName, srcFileItem, modCoverage, odd, summaryTable,
- "s" + count, true, true);
-
- odd = !odd;
- count++;
- }
- }
-
- overallStats.add(summaryTable);
-
- page.setHeader(overallStats);
-
- page.emit(out);
- out.flush();
- }
-
- private void processDiffOutputFile(HTMLDocument html,
- ArrayList<String> diffFile,
- IReportDataView emmaDataView)
- throws IOException
- {
- if(diffFile.size() <= 0)
- {
- return;
- }
-
- Double[] modCoverage = new Double[4];
- modCoverage[COVERED_MOD_EXE_LINES] = 0.0;
- modCoverage[MOD_EXE_LINES] = 0.0;
- modCoverage[MOD_LINES] = 0.0;
- modCoverage[DEL_LINES] = 0.0;
-
- String fileHeader = diffFile.get(0);
- verboseOut("fileHeader: " + diffFile);
-
- //Try to get the package information if its a Java file
- File srcFilePath = new File(fileHeader.substring(7));
- SrcFileItem emmaSourceItem = null;
- if(srcFilePath.isFile())
- {
- FileInputStream srcFile = new FileInputStream(srcFilePath);
- String srcFilePackage = parseJavaPackage(srcFile);
- if(emmaDataView != null)
- {
- emmaSourceItem = getEmmaSrcItem(emmaDataView.getRoot(),
- srcFilePackage, srcFilePath.getName());
- }
- }
-
-
- //Figure out the flag for the working copy.
- String workingCopyFlag = null;
- String otherCopyFlag = null;
-
- String firstFileLine = diffFile.get(2);
- String secondFileLine = diffFile.get(3);
- verboseOut("firstFileLine=" + firstFileLine);
- verboseOut("secondFileLine=" + secondFileLine);
- String revisionStr = "unknown";
-
- // Skip over binary files
- if (firstFileLine.contains("Cannot display")) {
- return;
- }
-
- HTMLTable srcTable = null;
-
- if(firstFileLine.endsWith("(working copy)"))
- {
- workingCopyFlag = firstFileLine.substring(0, 1);
- }
- else
- {
- otherCopyFlag = firstFileLine.substring(0, 1);
- revisionStr = firstFileLine.substring(firstFileLine.lastIndexOf("("));
- }
-
- if(secondFileLine.endsWith("(working copy)"))
- {
- workingCopyFlag = secondFileLine.substring(0, 1);
- }
- else
- {
- otherCopyFlag = secondFileLine.substring(0, 1);
- revisionStr = secondFileLine.substring(secondFileLine.lastIndexOf("("));
- }
-
- if(firstFileLine.endsWith("(revision 0)") ||
- secondFileLine.endsWith("(revision 0)"))
- {
- workingCopyFlag = "+";
- otherCopyFlag = "-";
- }
-
- if(workingCopyFlag == null || otherCopyFlag == null)
- {
- throw new IOException("Error occurred while parsing diff output." + EOL +
- "firstFileLine= '" + firstFileLine + "'" + EOL +
- "secondFileLine= '" + secondFileLine + "'");
- }
- else
- {
- srcTable = new HTMLTable ("100%", null, null, "0");
- srcTable.setClass("s");
-
- ArrayList<String> diffOutputChunk = new ArrayList<String>();
- Double[] chunkModCoverage;
-
- for(int i = 4; i < diffFile.size(); i++)
- {
- //Found a chunk indicator.
- if(diffFile.get(i).startsWith("@@"))
- {
- chunkModCoverage = processDiffOutputFileChunk(srcTable, diffOutputChunk, workingCopyFlag,
- otherCopyFlag, emmaSourceItem);
-
- if(chunkModCoverage != null)
- {
- modCoverage[COVERED_MOD_EXE_LINES] += chunkModCoverage[COVERED_MOD_EXE_LINES];
- modCoverage[MOD_EXE_LINES] += chunkModCoverage[MOD_EXE_LINES];
- modCoverage[MOD_LINES] += chunkModCoverage[MOD_LINES];
- modCoverage[DEL_LINES] += chunkModCoverage[DEL_LINES];
- }
-
- diffOutputChunk = new ArrayList<String>();
- diffOutputChunk.add(diffFile.get(i));
- }
- //Not any of the above so this line must be diffed text
- else
- {
- diffOutputChunk.add(diffFile.get(i));
- }
- }
-
- //Finishing process whatever we have queued up
- chunkModCoverage = processDiffOutputFileChunk(srcTable, diffOutputChunk, workingCopyFlag,
- otherCopyFlag, emmaSourceItem);
- if(chunkModCoverage != null)
- {
- modCoverage[COVERED_MOD_EXE_LINES] += chunkModCoverage[COVERED_MOD_EXE_LINES];
- modCoverage[MOD_EXE_LINES] += chunkModCoverage[MOD_EXE_LINES];
- modCoverage[MOD_LINES] += chunkModCoverage[MOD_LINES];
- modCoverage[DEL_LINES] += chunkModCoverage[DEL_LINES];
- }
- }
-
- final IElement a = IElement.Factory.create (Tag.A);
- a.getAttributes ().set (Attribute.NAME, "s" + emmaSrcMap.keySet().size());
-
- html.add(a);
-
- final IElement itemname = IElement.Factory.create (Tag.SPAN);
- {
- itemname.setText (srcFilePath.toString(), true);
- itemname.setClass ("in");
- }
-
- final IElementList title = new ElementList ();
- {
- title.add (new Text ("DIFF SUMMARY FOR SOURCE FILE [", true));
- title.add (itemname);
- title.add (new Text ("] against ", true));
- title.add (new Text (revisionStr, true));
- }
-
- html.addH (1, title, null);
-
- if(emmaSourceItem != null)
- {
- final HTMLTable coverageTable = new HTMLTable ("100%", null, null, "0");
- addHeaderRow(emmaSourceItem, coverageTable, false);
- addItemRow(srcFilePath.toString(), emmaSourceItem, modCoverage, false, coverageTable, null, false, false);
-
- html.add(coverageTable);
-
- html.addEmptyP();
- }
- else
- {
- html.addH(2, "Coverage Information Not Available (e.g. file is not in src/, is not java, is an interface, or was deleted)", null);
- }
-
- if(srcTable != null)
- {
- html.add(srcTable);
- }
-
- emmaSrcMap.put(srcFilePath.toString(), emmaSourceItem);
- modCoverageMap.put(srcFilePath.toString(), modCoverage);
- }
-
- private Double[] processDiffOutputFileChunk(HTMLTable table,
- ArrayList<String> diffChunk,
- String workingCopyFlag,
- String otherCopyFlag,
- SrcFileItem emmaSrcItem)
- {
-
- if(diffChunk.size() <= 0)
- {
- return null;
- }
-
- int workingCopyBegin;
- int workingCopyRange;
- int otherCopyBegin;
-
- Double[] modCoverage = new Double[4];
- modCoverage[COVERED_MOD_EXE_LINES] = 0.0;
- modCoverage[MOD_EXE_LINES] = 0.0;
- modCoverage[MOD_LINES] = 0.0;
- modCoverage[DEL_LINES] = 0.0;
-
- IntObjectMap lineCoverageMap = null;
- if(emmaSrcItem != null)
- {
- lineCoverageMap = emmaSrcItem.getLineCoverage ();
- }
-
- String chunkHeader = diffChunk.get(0);
-
- int workingCopyBeginIdx = chunkHeader.indexOf(workingCopyFlag);
- int workingCopyCommaIdx = chunkHeader.indexOf(",", workingCopyBeginIdx);
- int workingCopyEndIdx = chunkHeader.indexOf(" ", workingCopyCommaIdx);
- int otherCopyBeginIdx = chunkHeader.indexOf(otherCopyFlag);
- int otherCopyCommaIdx = chunkHeader.indexOf(",", otherCopyBeginIdx);
- workingCopyBegin = Integer.parseInt(
- chunkHeader.substring(workingCopyBeginIdx + 1, workingCopyCommaIdx));
- workingCopyRange = Integer.parseInt(
- chunkHeader.substring(workingCopyCommaIdx + 1, workingCopyEndIdx));
- otherCopyBegin = Integer.parseInt(
- chunkHeader.substring(otherCopyBeginIdx + 1, otherCopyCommaIdx));
-
- String chunkLine;
- SrcFileItem.LineCoverageData lCoverageData = null;
- int workingCopyLine = workingCopyBegin;
- int otherCopyLine = otherCopyBegin;
-
- final HTMLTable.IRow chunkRow = table.newTitleRow();
- final HTMLTable.ICell chunkCell = chunkRow.newCell();
- chunkCell.setColspan(2);
- chunkCell.setText("Lines " + workingCopyBegin + " - " +
- String.valueOf(workingCopyLine + workingCopyRange), true);
-
- for(int i = 1; i < diffChunk.size(); i++)
- {
- chunkLine = diffChunk.get(i);
-
- if(lineCoverageMap != null)
- {
- lCoverageData = (SrcFileItem.LineCoverageData) lineCoverageMap.get (workingCopyLine);
- }
-
- final HTMLTable.IRow srcRow = table.newRow();
- final HTMLTable.ICell lineNumCell = srcRow.newCell();
- final HTMLTable.ICell lineTxtCell = srcRow.newCell();
-
- if (chunkLine.length() == 0) {
- lineTxtCell.setText(" ", true);
- } else {
- lineTxtCell.setText(chunkLine.substring(1), true);
- }
-
- //This line is either a modified line or a unchanged line
- if(!chunkLine.startsWith(otherCopyFlag))
- {
- lineNumCell.setText(String.valueOf(workingCopyLine), true);
-
- //Determine if this line is a modified line or a unchange line
- if(chunkLine.startsWith(workingCopyFlag))
- {
- lineNumCell.setClass("dm");
- modCoverage[MOD_LINES] ++;
-
- if(lCoverageData != null)
- {
- modCoverage[MOD_EXE_LINES] ++;
- switch(lCoverageData.m_coverageStatus)
- {
- case SrcFileItem.LineCoverageData.LINE_COVERAGE_ZERO:
- lineTxtCell.setClass ("cz");
- break;
-
- case SrcFileItem.LineCoverageData.LINE_COVERAGE_PARTIAL:
- lineTxtCell.setClass ("cp");
- modCoverage[COVERED_MOD_EXE_LINES] += 0.5;
- break;
-
- case SrcFileItem.LineCoverageData.LINE_COVERAGE_COMPLETE:
- lineTxtCell.setClass ("cc");
- modCoverage[COVERED_MOD_EXE_LINES] ++;
- break;
- default:
- }
- }
- }
- else
- {
- lineNumCell.setClass("ds");
- }
-
- }
- else
- {
- lineNumCell.setClass("dd");
- lineNumCell.setText(String.valueOf(otherCopyLine), true);
- lineTxtCell.setClass("ddt");
- modCoverage[DEL_LINES] ++;
- }
-
- if(!chunkLine.startsWith(otherCopyFlag))
- {
- workingCopyLine++;
- }
- if(!chunkLine.startsWith(workingCopyFlag))
- {
- otherCopyLine++;
- }
- }
-
- return modCoverage;
- }
-
- private String parseJavaPackage(FileInputStream srcFile)
- throws IOException {
-
- BufferedReader srcFileReader = new BufferedReader(
- new InputStreamReader(srcFile));
-
- String line = srcFileReader.readLine();
- while(line != null)
- {
- int beginIdx = line.indexOf("package");
- if(beginIdx > -1)
- {
- int endIdx = line.indexOf(";", beginIdx);
- if(endIdx > -1)
- {
- return line.substring(beginIdx + 7, endIdx).trim();
- }
- }
- line = srcFileReader.readLine();
- }
-
- return null;
- }
-
- private SrcFileItem getEmmaSrcItem(IItem rootItem,
- String srcPackageName,
- String srcFileName)
- {
- if(rootItem == null || srcPackageName == null || srcFileName == null)
- {
- return null;
- }
-
- for(Iterator<?> packages = rootItem.getChildren(); packages.hasNext();)
- {
- IItem packageItem = (IItem)packages.next();
- if(packageItem.getName().equals(srcPackageName))
- {
- for(Iterator<?> sources = packageItem.getChildren(); sources.hasNext();)
- {
- SrcFileItem sourceItem = (SrcFileItem)sources.next();
- if(sourceItem.getName().equals(srcFileName))
- {
- return sourceItem;
- }
- }
- }
- }
- return null;
- }
-
- private void addHeaderRow (final IItem item, final HTMLTable table, boolean includeName)
- {
-
- // header row:
- final HTMLTable.IRow header = table.newTitleRow ();
-
- if(includeName)
- {
- final HTMLTable.ICell nameCell = header.newCell();
- nameCell.setText("File", true);
- }
-
- for (int c = 1; c <= 4; ++ c)
- {
- IItemAttribute attr = null;
-
- if(item != null)
- {
- attr = item.getAttribute (c, 0);
- }
-
- if (attr != null)
- {
- final HTMLTable.ICell cell = header.newCell ();
-
- cell.setText (attr.getName (), true);
- }
- else
- {
- final HTMLTable.ICell cell = header.newCell ();
- cell.setText (" ", true);
- }
-
- }
-
- if(item != null)
- {
- final HTMLTable.ICell cell = header.newCell();
- cell.setText("mod lines, %", true);
- }
- else
- {
- final HTMLTable.ICell cell = header.newCell ();
- cell.setText (" ", true);
- }
-
- }
-
- /*
- * No header row, just data rows.
- */
- private void addItemRow (final String fileName,
- final IItem item,
- final Double[] modCoverage,
- final boolean odd,
- final HTMLTable table,
- final String nameHREF,
- final boolean anchor,
- final boolean includeName)
- {
- final HTMLTable.IRow row = table.newRow ();
- if (odd) row.setClass ("o");
-
- if(includeName)
- {
- final HTMLTable.ICell nameCell = row.newCell();
- if(nameHREF != null)
- {
- final String fullHREFName = anchor ? "#".concat (nameHREF) : nameHREF;
- nameCell.add(new HyperRef(fullHREFName, fileName, true));
- }
- else
- {
- nameCell.setText(fileName, true);
- }
- }
-
- final StringBuffer buf = new StringBuffer (11);
-
- for (int c = 1; c <=4; ++ c)
- {
- IItemAttribute attr = null;
-
- if(item != null)
- {
- attr = item.getAttribute (c, 0);
- }
-
- if (attr != null)
- {
- final HTMLTable.ICell cell = row.newCell ();
-
-
- //final boolean fail = (m_metrics [attrID] > 0) && ! attr.passes (item, m_metrics [attrID]);
-
- buf.setLength (0);
- attr.format (item, buf);
-
- cell.setText (buf.toString (), true);
- //if (fail) cell.setClass (CSS_DATA_HIGHLIGHT);
-
- }
- else
- {
- final HTMLTable.ICell cell = row.newCell ();
- cell.setText (" ", true);
- }
- }
-
- if(item != null && modCoverage != null)
- {
- String modCoverageStr = "";
- if(modCoverage[1] > 0)
- {
- modCoverageStr = String.format("%d%% (%.1f/%.1f)",
- (int)(modCoverage[COVERED_MOD_EXE_LINES]/modCoverage[MOD_EXE_LINES]*100),
- modCoverage[COVERED_MOD_EXE_LINES], modCoverage[MOD_EXE_LINES]);
- }
- else
- {
- modCoverageStr = String.format("%d%% (%.1f/%.1f)", 100,
- modCoverage[COVERED_MOD_EXE_LINES],
- modCoverage[MOD_EXE_LINES]);
- }
-
- final HTMLTable.ICell cell = row.newCell();
- cell.setText(modCoverageStr, true);
- }
- else
- {
- final HTMLTable.ICell cell = row.newCell ();
- cell.setText (" ", true);
- }
- }
-
- // Enable this with -Dtest.diff.verbose=true from the commandline
- private void verboseOut(Object msg)
- {
- if (verbose)
- {
- System.out.println(msg.toString());
- }
- }
-}
diff --git a/opendj-sdk/opendj3-server-dev/src/build-tools/org/opends/build/tools/CreateVersionString.java b/opendj-sdk/opendj3-server-dev/src/build-tools/org/opends/build/tools/CreateVersionString.java
deleted file mode 100644
index b6f67d0..0000000
--- a/opendj-sdk/opendj3-server-dev/src/build-tools/org/opends/build/tools/CreateVersionString.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- * or http://forgerock.org/license/CDDLv1.0.html.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at legal-notices/CDDLv1_0.txt.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock AS
- */
-package org.opends.build.tools;
-
-import java.text.DecimalFormat;
-
-import org.apache.tools.ant.Task;
-
-/**
- * This class provides an implementation of an Ant task that may be used to
- * construct the full version number string that the Directory Server should
- * use. The value of the version number string will be stored in an Ant
- * property.
- */
-public class CreateVersionString extends Task
-{
- // The name of the property in which the revision number should be set.
- private String propertyName = null;
-
- /**
- * Specifies the name of the Ant property into which the Subversion revision
- * number will be stored.
- *
- * @param propertyName
- * The name of the Ant property into which the Subversion revision
- * number will be stored.
- */
- public void setProperty(String propertyName)
- {
- this.propertyName = propertyName;
- }
-
- /**
- * Performs the appropriate processing needed for this task. In this case, it
- * uses SVNKit to identify the current revision number for the local workspace
- * and store it in a specified property.
- */
- @Override()
- public void execute()
- {
- StringBuilder versionString = new StringBuilder();
-
- versionString.append(getProject().getProperty("MAJOR_VERSION"));
- versionString.append(".");
- versionString.append(getProject().getProperty("MINOR_VERSION"));
- versionString.append(".");
- versionString.append(getProject().getProperty("POINT_VERSION"));
-
- // Sets the version string to the property used by packages.
- getProject().setNewProperty("pkg_version_string", versionString.toString());
-
- String versionQualifier = getProject().getProperty("VERSION_QUALIFIER");
- versionString.append(versionQualifier);
-
- // Removes all special chars contained in the version qualifier
- // Sets the version qualifier to the property used by packages.
- getProject().setNewProperty("pkg_version_qualifier",
- versionQualifier.replaceAll("[^A-Za-z0-9]", ""));
-
- try
- {
- int buildNumber =
- Integer.parseInt(getProject().getProperty("BUILD_NUMBER"));
- if (buildNumber > 0)
- {
- versionString.append("-build");
- versionString.append(new DecimalFormat("000").format(buildNumber));
- }
- }
- catch (NumberFormatException nfe)
- {
- }
-
- getProject().setNewProperty(propertyName, versionString.toString());
- }
-}
diff --git a/opendj-sdk/opendj3-server-dev/src/build-tools/org/opends/build/tools/GenerateMessageFile.java b/opendj-sdk/opendj3-server-dev/src/build-tools/org/opends/build/tools/GenerateMessageFile.java
deleted file mode 100644
index 0f98238..0000000
--- a/opendj-sdk/opendj3-server-dev/src/build-tools/org/opends/build/tools/GenerateMessageFile.java
+++ /dev/null
@@ -1,1199 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- * or http://forgerock.org/license/CDDLv1.0.html.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at legal-notices/CDDLv1_0.txt.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2015 ForgeRock AS
- */
-package org.opends.build.tools;
-
-import static org.opends.build.tools.Utilities.*;
-
-import java.io.BufferedReader;
-import java.io.DataOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.TreeSet;
-import java.util.UnknownFormatConversionException;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Task;
-import org.forgerock.i18n.LocalizableMessageDescriptor;
-import org.opends.messages.Category;
-import org.opends.messages.Severity;
-
-/**
- * Generates a Java class containing representations of messages
- * found in a properties file.
- */
-public class GenerateMessageFile extends Task {
-
- private File source;
- private File dest;
- private boolean overwrite;
- private boolean writeLogRef;
-
- private static final String MESSAGES_FILE_STUB =
- "resource/Messages.java.stub";
-
- /**
- * The registry filename is the result of the concatenation of the
- * location of where the source are generated, the package name and the
- * DESCRIPTORS_REG value.
- */
- private static String REGISTRY_FILE_NAME;
-
- private static final String DESCRIPTORS_REG = "descriptors.reg";
-
- /**
- * Used to set a category for all messages in the property file.
- * If set, the category for each message need not be encoded in
- * the message's property file key.
- */
- private static final String GLOBAL_CATEGORY = "global.category";
-
- /**
- * Used to set a severity for all messages in the property file.
- * If set, the severity for each message need not be encoded in
- * the message's property file key.
- */
- private static final String GLOBAL_SEVERITY = "global.severity";
-
- /**
- * Used to set a category mask for all messages in the property
- * file. If set, the category will automatically be assigned
- * USER_DEFINED and the value of <code>GLOBAL_CATEGORY</code>
- * will be ignored.
- */
- private static final String GLOBAL_CATEGORY_MASK = "global.mask";
-
- /**
- * When true generates messages that have no ordinals.
- */
- private static final String GLOBAL_ORDINAL = "global.ordinal";
-
- /**
- * When true and if the Java Web Start property is set use the class loader of
- * the jar where the MessageDescriptor is contained to retrieve the
- * ResourceBundle.
- */
- private static final String GLOBAL_USE_MESSAGE_JAR_IF_WEBSTART =
- "global.use.message.jar.if.webstart";
-
- private static final Set<String> DIRECTIVE_PROPERTIES = new HashSet<String>(Arrays.asList(
- GLOBAL_CATEGORY, GLOBAL_CATEGORY_MASK, GLOBAL_SEVERITY, GLOBAL_ORDINAL, GLOBAL_USE_MESSAGE_JAR_IF_WEBSTART));
-
- private static final String SPECIFIER_REGEX =
- "%(\\d+\\$)?([-#+ 0,(\\<]*)?(\\d+)?(\\.\\d+)?([tT])?([a-zA-Z%])";
-
- private static final Pattern SPECIFIER_PATTERN = Pattern.compile(SPECIFIER_REGEX);
-
- /**
- * Message giving formatting rules for string keys.
- */
- public static String KEY_FORM_MSG = ".\n\nOpenDJ message property keys must be of the form\n\n"
- + "\t\'[CATEGORY]_[SEVERITY]_[DESCRIPTION]_[ORDINAL]\'\n\n"
- // + "where\n\n"
- // + "CATEGORY is one of ..."
- // + EnumSet.allOf(Category.class)
- // + "\n\nSEVERITY is one of "
- // + Severity.getPropertyKeyFormSet()
- + "\n\nDESCRIPTION is a descriptive string composed "
- + "of uppercase character, digits and underscores "
- + "describing the purpose of the message "
- + "\n\nORDINAL is an integer between 0 and 65535 that is "
- + "unique to other messages defined in this file.\n\n"
- + "You can relax the mandate for including the CATEGORY, "
- + "SEVERITY, and/or ORDINAL by including one or more "
- + "of the following respective property directives in your properties file: "
- + GLOBAL_CATEGORY + ", " + GLOBAL_SEVERITY + ", " + GLOBAL_ORDINAL
- + "and setting their value appropriately.";
-
- /** ISO_LANGUAGES contains all official supported languages for i18n. */
- private static final List<String> ISO_LANGUAGES =
- Arrays.asList(Locale.getISOLanguages());
- /** ISO_COUNTRIES contains all official supported countries for i18n. */
- private static final List<String> ISO_COUNTRIES =
- Arrays.asList(Locale.getISOCountries());
-
- /**
- * A Pattern instance that matches "<label>_<language>_<country>.properties"
- * where <label> can be anything including '_'
- * <language> a two characters code contained in the ISO_LANGUAGES list
- * <country> a two characters code contained in the ISO_COUNTRIES list
- */
- private static final Pattern LANGUAGE_COUNTRY_MATCHER =
- Pattern.compile("(.*)_([a-z]{2})_([A-Z]{2}).properties");
- /**
- * A Pattern instance that matches "<label>_<language>.properties"
- * where <label> and <language> have same definition as above.
- */
- private static final Pattern LANGUAGE_MATCHER =
- Pattern.compile("(.*)_([a-z]{2}).properties");
-
- /**
- * Representation of a format specifier (for example %s).
- */
- private static class FormatSpecifier {
-
- private String[] sa;
-
- /**
- * Creates a new specifier.
- * @param sa specifier components
- */
- FormatSpecifier(String[] sa) {
- this.sa = sa;
- }
-
- /**
- * Indicates whether or not the specifier uses argument
- * indexes (for example 2$).
- * @return boolean true if this specifier uses indexing
- */
- public boolean specifiesArgumentIndex() {
- return this.sa[0] != null;
- }
-
- /**
- * Returns a java class associated with a particular formatter
- * based on the conversion type of the specifier.
- * @return Class for representing the type of argument used
- * as a replacement for this specifier.
- */
- public Class<?> getSimpleConversionClass() {
- Class<?> c = null;
- String sa4 = sa[4] != null ? sa[4].toLowerCase() : null;
- String sa5 = sa[5] != null ? sa[5].toLowerCase() : null;
- if ("t".equals(sa4)) {
- c = Calendar.class;
- } else if ("b".equals(sa5)) {
- c = Boolean.class;
- } else if ("h".equals(sa5)) {
- c = Integer.class;
- } else if ("s".equals(sa5)) {
- c = Object.class;
- } else if ("c".equals(sa5)) {
- c = Character.class;
- } else if (
- "d".equals(sa5) ||
- "o".equals(sa5) ||
- "x".equals(sa5) ||
- "e".equals(sa5) ||
- "f".equals(sa5) ||
- "g".equals(sa5) ||
- "a".equals(sa5)) {
- c = Number.class;
- } else if (
- "n".equals(sa5) ||
- "%".equals(sa5)) {
- // ignore literals
- }
- return c;
- }
-
- }
-
- /**
- * Represents a message to be written into the messages files.
- */
- private static class MessageDescriptorDeclaration {
-
- private MessagePropertyKey key;
- private String formatString;
- private List<FormatSpecifier> specifiers;
- private List<Class<?>> classTypes;
- private String[] constructorArgs;
-
- /**
- * Creates a parameterized instance.
- * @param key of the message
- * @param formatString of the message
- */
- public MessageDescriptorDeclaration(MessagePropertyKey key,
- String formatString) {
- this.key = key;
- this.formatString = formatString;
- this.specifiers = parse(formatString);
- this.classTypes = new ArrayList<Class<?>>();
- for (FormatSpecifier f : specifiers) {
- Class<?> c = f.getSimpleConversionClass();
- if (c != null) {
- classTypes.add(c);
- }
- }
- }
-
- /**
- * Gets the name of the Java class that will be used to represent
- * this message's type.
- * @return String representing the Java class name
- */
- public String getDescriptorClassDeclaration() {
- final StringBuilder sb = new StringBuilder();
- sb.append(LocalizableMessageDescriptor.class.getSimpleName());
- if (useGenericMessageTypeClass()) {
- sb.append(".ArgN");
- } else {
- sb.append(".Arg");
- sb.append(classTypes.size());
- sb.append(getClassTypeVariables());
- }
- return sb.toString();
- }
-
- /**
- * Gets a string representing the message type class' variable
- * information (for example '<String,Integer>') that is based on
- * the type of arguments specified by the specifiers in this message.
- * @return String representing the message type class parameters
- */
- public String getClassTypeVariables() {
- StringBuilder sb = new StringBuilder();
- if (classTypes.size() > 0) {
- sb.append("<");
- for (int i = 0; i < classTypes.size(); i++) {
- Class<?> c = classTypes.get(i);
- if (c != null) {
- sb.append(c.getSimpleName());
- if (i < classTypes.size() - 1) {
- sb.append(",");
- }
- }
- }
- sb.append(">");
- }
- return sb.toString();
- }
-
- /**
- * Gets the javadoc comments that will appear above the messages declaration
- * in the messages file.
- * @return String comment
- */
- public String getComment() {
- StringBuilder sb = new StringBuilder();
- sb.append(indent(1)).append("/**").append(EOL);
-
- // Unwrapped so that you can search through the descriptor
- // file for a message and not have to worry about line breaks
- String ws = formatString; // wrapText(formatString, 70);
-
- String[] sa = ws.split(EOL);
- for (String s : sa) {
- sb.append(indent(1)).append(" * ").append(s).append(EOL);
- }
- sb.append(indent(1)).append(" */").append(EOL);
- return sb.toString();
- }
-
- /**
- * Sets the arguments that will be supplied in the declaration
- * of the message.
- * @param s array of string arguments that will be passed
- * in the constructor
- */
- public void setConstructorArguments(String... s) {
- this.constructorArgs = s;
- }
-
- /** {@inheritDoc} */
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append(getComment());
- sb.append(indent(1));
- sb.append("public static final ");
- sb.append(getDescriptorClassDeclaration());
- sb.append(" ");
- sb.append(key.getMessageDescriptorName());
- sb.append(" =");
- sb.append(EOL);
- sb.append(indent(5));
- sb.append("new ");
- sb.append(getDescriptorClassDeclaration());
- sb.append("(");
- if (constructorArgs != null) {
- for (int i = 0; i < constructorArgs.length; i++) {
- sb.append(constructorArgs[i]);
- if (i < constructorArgs.length - 1) {
- sb.append(",");
- }
- }
- //sb.append(", ");
- }
- //sb.append("getClassLoader()");
- sb.append(");");
- return sb.toString();
- }
-
- /**
- * Indicates whether the generic message type class should
- * be used. In general this is when a format specifier is
- * more complicated than we support or when the number of
- * arguments exceeds the number of specific message type
- * classes (MessageType0, MessageType1 ...) that are defined.
- * @return boolean indicating
- */
- private boolean useGenericMessageTypeClass() {
- if (specifiers.size() > 9) {
- return true;
- } else if (specifiers != null) {
- for (FormatSpecifier s : specifiers) {
- if (s.specifiesArgumentIndex()) {
- return true;
- }
- }
- }
- return false;
- }
-
- /**
- * Look for format specifiers in the format string.
- * @param s format string
- * @return list of format specifiers
- */
- private List<FormatSpecifier> parse(String s) {
- List<FormatSpecifier> sl = new ArrayList<FormatSpecifier>();
- Matcher m = SPECIFIER_PATTERN.matcher(s);
- int i = 0;
- while (i < s.length()) {
- if (m.find(i)) {
- // Anything between the start of the string and the beginning
- // of the format specifier is either fixed text or contains
- // an invalid format string.
- if (m.start() != i) {
- // Make sure we didn't miss any invalid format specifiers
- checkText(s.substring(i, m.start()));
- // Assume previous characters were fixed text
- //al.add(new FixedString(s.substring(i, m.start())));
- }
-
- // Expect 6 groups in regular expression
- String[] sa = new String[6];
- for (int j = 0; j < m.groupCount(); j++) {
- sa[j] = m.group(j + 1);
- }
- sl.add(new FormatSpecifier(sa));
- i = m.end();
- } else {
- // No more valid format specifiers. Check for possible invalid
- // format specifiers.
- checkText(s.substring(i));
- // The rest of the string is fixed text
- //al.add(new FixedString(s.substring(i)));
- break;
- }
- }
- return sl;
- }
-
- private void checkText(String s) {
- // If there are any '%' in the given string, we got a bad format specifier
- final int idx = s.indexOf('%');
- if (idx != -1) {
- char c = idx > s.length() - 2 ? '%' : s.charAt(idx + 1);
- throw new UnknownFormatConversionException(String.valueOf(c));
- }
- }
- }
-
- /**
- * Sets the source of the messages.
- * @param source File representing the properties
- * file containing messages
- */
- public void setSourceProps(File source) {
- this.source = source;
- }
-
- /**
- * Sets the file that will be generated containing
- * declarations of messages from <code>source</code>.
- * @param dest File destination
- */
- public void setDestJava(File dest) {
- this.dest = dest;
-
- try {
- File descriptorsRegFile =
- new File(dest.getParentFile(), DESCRIPTORS_REG);
-
- if (REGISTRY_FILE_NAME != null) {
- // if REGISTRY_FILE_NAME is already set, ensure that we computed the
- // same one
- File prevDescriptorsRegFile = new File(REGISTRY_FILE_NAME);
- if (!prevDescriptorsRegFile.equals(descriptorsRegFile)) {
- throw new BuildException("Error processing " + dest
- + ": all messages must be located in the same package thus "
- + "name of the source file should be "
- + new File(prevDescriptorsRegFile.getParent(), dest.getName()));
- }
- } else {
- REGISTRY_FILE_NAME = descriptorsRegFile.getCanonicalPath();
- }
- } catch (Exception e) {
- throw new BuildException(e);
- }
- }
-
- /**
- * Indicates when true that an existing destination
- * file will be overwritten.
- * @param o boolean where true means overwrite
- */
- public void setOverwrite(boolean o) {
- this.overwrite = o;
- }
-
- /**
- * Indicates when true that an XML log message reference should be generated
- * instead of a Java messages file.
- *
- * @param xml
- * true means write an XML log message reference
- */
- public void setWriteLogRef(boolean xml) {
- this.writeLogRef = xml;
- }
-
- /**
- * Represents a log reference entry for an individual message.
- */
- private static class MessageRefEntry implements Comparable<MessageRefEntry>
- {
-
- private Severity severity;
- private Integer id;
- private String xmlId;
- private String formatString;
-
- /**
- * Build log reference entry for an log message.
- *
- * @param msgPropKey
- * @param category
- * @param severity
- * @param ordinal
- * @param formatString
- */
- public MessageRefEntry(final String msgPropKey,
- final Category category, final Severity severity,
- final Integer ordinal, final String formatString)
- {
- this.severity = severity;
- this.formatString = formatString;
- id = calculateId(category, severity, ordinal);
- xmlId = getXmlId(msgPropKey);
- }
-
- private Integer calculateId(final Category category,
- final Severity severity, final Integer ordinal)
- {
- // Id is equivalent to ordinal with OpenDJ3
- return Integer.valueOf(ordinal);
- }
-
- private String getXmlId(final String messagePropertyKey)
- {
- // XML IDs must be unique, and must begin with a letter ([A-Za-z])
- // and may be followed by any number of letters, digits ([0-9]),
- // hyphens ("-"), underscores ("_"), colons (":"), and periods (".").
-
- final String invalidChars = "[^A-Za-z0-9\\-_:\\.]";
- return messagePropertyKey.replaceAll(invalidChars, "-");
- }
-
- /**
- * Return a DocBook XML <varlistentry> of this log reference entry.
- * This implementation copies the message string verbatim, and does not
- * interpret format specifiers.
- *
- * @return DocBook XML <varlistentry>.
- */
- @Override
- public String toString()
- {
- return
- " <varlistentry xml:id=\"log-ref-" + xmlId + "\">" + EOL
- + " <term>ID: " + id.intValue() + "</term>" + EOL
- + " <listitem>" + EOL
- + " <para>Severity: " + severity.name() + "</para>" + EOL
- + " <para>Message: " + formatString + "</para>" + EOL
- + " </listitem>" + EOL + " </varlistentry>" + EOL;
- }
-
- /**
- * Calls {@link #toString()}.
- */
- public String toXML()
- {
- return toString();
- }
-
- /**
- * The unique message identifier is calculated using the category, severity,
- * and message ordinal.
- *
- * @return unique message identifier
- */
- public Integer getId()
- {
- return this.id;
- }
-
- /**
- * Compare message entries by unique identifier.
- *
- * @return See {@link java.lang.Comparable#compareTo(Object)}.
- */
- @Override
- public int compareTo(MessageRefEntry mre)
- {
- return this.id.compareTo(mre.getId());
- }
- }
-
- /**
- * One-line descriptions for log reference categories.
- */
- private static HashMap<String,String> CATEGORY_DESCRIPTIONS;
- static {
- CATEGORY_DESCRIPTIONS = new HashMap<String,String>();
- CATEGORY_DESCRIPTIONS.put("ACCESS_CONTROL", "Access Control.");
- CATEGORY_DESCRIPTIONS.put("ADMIN", "the administration framework.");
- CATEGORY_DESCRIPTIONS.put("ADMIN_TOOL", "the tool like the offline"
- + " installer and uninstaller.");
- CATEGORY_DESCRIPTIONS.put("BACKEND", "generic backends.");
- CATEGORY_DESCRIPTIONS.put("CONFIG", "configuration handling.");
- CATEGORY_DESCRIPTIONS.put("CORE", "the core server.");
- CATEGORY_DESCRIPTIONS.put("DSCONFIG", "the dsconfig administration tool.");
- CATEGORY_DESCRIPTIONS.put("EXTENSIONS", "server extensions for example,"
- + " extended operations, SASL mechanisms, password storage"
- + " schemes, password validators, and so on).");
- CATEGORY_DESCRIPTIONS.put("JEB", "the JE backend.");
- CATEGORY_DESCRIPTIONS.put("LOG", "the server loggers.");
- CATEGORY_DESCRIPTIONS.put("PLUGIN", "plugin processing.");
- CATEGORY_DESCRIPTIONS.put("PROTOCOL", "connection and protocol handling"
- + " (for example, ASN.1 and LDAP).");
- CATEGORY_DESCRIPTIONS.put("QUICKSETUP", "quicksetup tools.");
- CATEGORY_DESCRIPTIONS.put("RUNTIME_INFORMATION", "the runtime"
- + " information.");
- CATEGORY_DESCRIPTIONS.put("SCHEMA", "the server schema elements.");
- CATEGORY_DESCRIPTIONS.put("SYNC", "replication.");
- CATEGORY_DESCRIPTIONS.put("TASK", "tasks.");
- CATEGORY_DESCRIPTIONS.put("THIRD_PARTY", "third-party (including"
- + " user-defined) modules.");
- CATEGORY_DESCRIPTIONS.put("TOOLS", "tools.");
- CATEGORY_DESCRIPTIONS.put("USER_DEFINED", "user-defined modules.");
- CATEGORY_DESCRIPTIONS.put("UTIL", "the general server utilities.");
- CATEGORY_DESCRIPTIONS.put("VERSION", "version information.");
- }
-
- /**
- * Represents a log reference list of messages for a category.
- */
- private static class MessageRefCategory
- {
- private Category category;
- private TreeSet<MessageRefEntry> messages;
- private String description;
-
- MessageRefCategory(final Category category,
- final TreeSet<MessageRefEntry> messages)
- {
- this.category = category;
- this.messages = messages;
- this.description = getDescription(category);
- }
-
- private String getDescription(final Category category)
- {
- return "<para>This category concerns messages associated with "
- + CATEGORY_DESCRIPTIONS.get(category.name()) + "</para>" + EOL;
- }
-
- /**
- * Return a DocBook XML <variablelist> of this log reference category.
- *
- * @return DocBook XML <variablelist>
- */
- @Override
- public String toString()
- {
- StringBuilder entries = new StringBuilder();
- for (MessageRefEntry entry : messages)
- {
- entries.append(entry.toXML());
- }
- return getVariablelistHead() + entries + getVariablelistTail();
- }
-
- /**
- * Calls {@link #toString()}.
- */
- public String toXML()
- {
- return toString();
- }
-
- private String getXMLPreamble()
- {
- DateFormat df = new SimpleDateFormat("yyyy");
- Date now = new Date();
- String year = df.format(now);
-
- return "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + EOL
- + "<!--" + EOL
- + " ! CCPL HEADER START" + EOL
- + " !" + EOL
- + " ! This work is licensed under the Creative Commons" + EOL
- + " ! Attribution-NonCommercial-NoDerivs 3.0 Unported License." + EOL
- + " ! To view a copy of this license, visit" + EOL
- + " ! http://creativecommons.org/licenses/by-nc-nd/3.0/" + EOL
- + " ! or send a letter to Creative Commons, 444 Castro Street," + EOL
- + " ! Suite 900, Mountain View, California, 94041, USA." + EOL
- + " !" + EOL + " ! See the License for the specific language governing permissions" + EOL
- + " ! and limitations under the License." + EOL
- + " !" + EOL
- + " ! If applicable, add the following below this CCPL HEADER, with the fields" + EOL
- + " ! enclosed by brackets \"[]\" replaced with your own identifying information:" + EOL
- + " ! Portions Copyright [yyyy] [name of copyright owner]" + EOL
- + " !" + EOL
- + " ! CCPL HEADER END" + EOL
- + " !" + EOL
- + " ! Copyright " + year + " ForgeRock AS" + EOL
- + " !" + EOL
- + "-->" + EOL;
- }
-
- private String getBaseElementAttrs()
- {
- return "xmlns='http://docbook.org/ns/docbook'"
- + " version='5.0' xml:lang='en'"
- + " xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'"
- + " xsi:schemaLocation='http://docbook.org/ns/docbook"
- + " http://docbook.org/xml/5.0/xsd/docbook.xsd'"
- + " xmlns:xlink='http://www.w3.org/1999/xlink'"
- + " xmlns:xinclude='http://www.w3.org/2001/XInclude'";
- }
-
- private String getVariablelistHead()
- {
- return getXMLPreamble() + " <variablelist xml:id=\"log-ref-"
- + this.category.name() + "\" " + getBaseElementAttrs() + ">" + EOL
- + " <title>Log Message Category: " + category.name() + "</title>"
- + EOL + " " + this.description;
- }
-
- private String getVariablelistTail()
- {
- return " </variablelist>" + EOL;
- }
-
- }
-
- /** {@inheritDoc} */
- @Override
- public void execute() throws BuildException {
-
- if ( this.dest == null ) {
- // this is an example-plugin call:
- // - check the source file is not a localization
- // - guess the destination filename from source filename
- String sourcefilename = source.getAbsolutePath();
- int filenameIndex = sourcefilename.lastIndexOf(File.separator)+1;
- String pathname = sourcefilename.substring(0, filenameIndex);
- String filename = sourcefilename.substring(filenameIndex);
-
- /*
- * Make sure only <label>.properties are generated thus avoiding to
- * generate messages for localized properties files.
- */
- Matcher matcher = LANGUAGE_COUNTRY_MATCHER.matcher(filename);
- if (matcher.find()
- && ISO_LANGUAGES.contains(matcher.group(2))
- && ISO_COUNTRIES.contains(matcher.group(3)))
- {
- // do not generate message for <label>_<language>_<country>.properties
- return;
- }
-
- matcher = LANGUAGE_MATCHER.matcher(filename);
- if (matcher.find()
- && ISO_LANGUAGES.contains(matcher.group(2)) ) {
- // do not generate message for <label>_<language>.properties
- return;
- }
-
- // filename without ".properties"
- filename = filename.substring(0, filename.length()-11);
- // change to src-generated directory keeping package name
- if (writeLogRef) {
- pathname = pathname.replace(getProject().getProperty("msg.dir"),
- getProject().getProperty("msg.logref.dir"));
- } else {
- pathname = pathname.replace(getProject().getProperty("msg.dir"),
- getProject().getProperty("msg.javagen.dir"));
- }
-
-
- // append characters from filename to pathname starting with an uppercase
- // letter, ignoring '_' and uppering all characters prefixed with "_"
- StringBuilder sb = new StringBuilder(pathname);
- boolean upperCaseNextChar = true;
- for(char c : filename.toCharArray()) {
- if ( c == '_' || c == '-' ) {
- upperCaseNextChar = true;
- continue;
- }
- if ( upperCaseNextChar ) {
- sb.append(Character.toUpperCase(c));
- upperCaseNextChar = false;
- } else {
- sb.append(c);
- }
- }
- if (writeLogRef) {
- sb.append("Messages.xml");
- } else {
- sb.append("Messages.java");
- }
-
- setDestJava(new File(sb.toString()));
- }
-
- BufferedReader stubReader = null;
- PrintWriter destWriter = null;
- try {
-
- // Decide whether to generate messages based on modification
- // times and print status messages.
- if (!source.exists()) {
- throw new BuildException("file " + source.getName() +
- " does not exist");
- }
- if (dest.exists()) {
- if (this.overwrite || source.lastModified() > dest.lastModified()) {
- dest.delete();
- log("Regenerating " + dest.getName() + " from " + source.getName());
- } else {
- log(dest.getName() + " is up to date");
- return;
- }
- } else {
- File javaGenDir = dest.getParentFile();
- if (!javaGenDir.exists()) {
- javaGenDir.mkdirs();
- }
- log("Generating " + dest.getName() + " from " + source.getName());
- }
-
- stubReader = new BufferedReader(new InputStreamReader(getStubFile(),
- "UTF-8"));
- destWriter = new PrintWriter(dest, "UTF-8");
- String stubLine;
- Properties properties = new Properties();
- properties.load(new FileInputStream(source));
- TreeSet<MessageRefEntry> messageRefEntries =
- new TreeSet<MessageRefEntry>();
- while (null != (stubLine = stubReader.readLine())) {
- if (stubLine.contains("${MESSAGES}")) {
- Integer globalOrdinal = null;
- String go = properties.getProperty(GLOBAL_ORDINAL);
- if (go != null) {
- globalOrdinal = Integer.valueOf(go);
- }
-
- Category globalCategory = null;
- String gms = properties.getProperty(GLOBAL_CATEGORY_MASK);
- if (gms != null) {
- Integer.parseInt(gms);
- globalCategory = Category.USER_DEFINED;
- } else {
- String gcs = properties.getProperty(GLOBAL_CATEGORY);
- if (gcs != null) {
- globalCategory = Category.valueOf(gcs);
- }
- }
-
- // Determine the value of the global severity
- Severity globalSeverity = null;
- String gss = properties.getProperty(GLOBAL_SEVERITY);
- if (gss != null) {
- globalSeverity = Severity.parseString(gss);
- }
-
- Map<MessagePropertyKey,String> keyMap =
- new TreeMap<MessagePropertyKey,String>();
-
- for (Object propO : properties.keySet()) {
- String propKey = propO.toString();
- try {
- if (!DIRECTIVE_PROPERTIES.contains(propKey)) {
- MessagePropertyKey key =
- MessagePropertyKey.parseString(
- propKey,
- globalCategory == null,
- globalSeverity == null,
- globalOrdinal == null);
- String formatString = properties.getProperty(propKey);
- keyMap.put(key, formatString);
- }
- } catch (IllegalArgumentException iae) {
- throw new BuildException(
- "ERROR: invalid property key " + propKey +
- ": " + iae.getMessage() +
- KEY_FORM_MSG);
- }
- }
-
- int usesOfGenericDescriptor = 0;
-
- Category firstCategory = null;
- Set<Integer> usedOrdinals = new HashSet<Integer>();
- for (MessagePropertyKey key : keyMap.keySet()) {
- String formatString = keyMap.get(key);
- MessageDescriptorDeclaration message =
- new MessageDescriptorDeclaration(key, formatString);
-
- Category c = globalCategory != null ?
- globalCategory : key.getCategory();
-
- // Check that this category is the same as all the
- // others in this file. Maybe this should be an error?
- if (firstCategory != null) {
- if (!firstCategory.equals(c)) {
- log("WARNING: multiple categories defined in " + source);
- }
- } else {
- firstCategory = c;
- }
-
- Severity s = globalSeverity != null ?
- globalSeverity : key.getSeverity();
-
- if (c == null) {
- throw new BuildException(
- "No category could be assigned to message " +
- key + ". The category " +
- "must either be encoded in the property key or " +
- "or must be set by including the property " +
- GLOBAL_CATEGORY + " in the properties file" +
- KEY_FORM_MSG);
- }
-
- if (s == null) {
- throw new BuildException(
- "No severity could be assigned to message " +
- key + ". The severity " +
- "must either be encoded in the property key or " +
- "or must be set by including the property " +
- GLOBAL_SEVERITY + " in the properties file" +
- KEY_FORM_MSG);
- }
-
- if (globalOrdinal == null) {
- Integer ordinal = key.getOrdinal();
- if (usedOrdinals.contains(ordinal)) {
- throw new BuildException(
- "The ordinal value \'" + ordinal + "\' in key " +
- key + " has been previously defined in " +
- source + KEY_FORM_MSG);
- } else {
- usedOrdinals.add(ordinal);
- }
- }
-
- if (writeLogRef) {
- // Document only ERROR messages.
- if ("ERROR".equalsIgnoreCase(s.name())) {
- MessageRefEntry entry =
- new MessageRefEntry(
- key.toString(),
- c,
- s,
- globalOrdinal != null ?
- globalOrdinal :
- key.getOrdinal(),
- formatString.replaceAll("<", "<"));
- messageRefEntries.add(entry);
- }
- } else {
- // old: (BASE,"MILD_ERR_ADD_CANNOT_ADD_ROOT_DSE_230",CORE,MILD_ERROR,230, getClassLoader())
- // new: CoreMessages.class, RESOURCE, "ERR_ACCTUSABLEREQ_CONTROL_BAD_OID", -1
- String className = getMessageDescriptorClassName();
- message.setConstructorArguments(
- className + ".class", "RESOURCE",
- quote(key.toString()), globalOrdinal != null ?
- globalOrdinal.toString() :
- key.getOrdinal().toString()
- );
- destWriter.println(message.toString());
- destWriter.println();
- }
-
- // Keep track of when we use the generic descriptor
- // so that we can report it later
- if (message.useGenericMessageTypeClass()) {
- usesOfGenericDescriptor++;
- }
- }
-
- if (writeLogRef) {
- if (messageRefEntries.isEmpty()) {
- destWriter.println("<!-- No message for this category -->");
- } else {
- MessageRefCategory mrc =
- new MessageRefCategory(globalCategory, messageRefEntries);
- destWriter.println(mrc.toXML());
- }
- }
-
- log(" Message Generated:" + keyMap.size(), Project.MSG_VERBOSE);
- log(" MessageDescriptor.ArgN:" + usesOfGenericDescriptor,
- Project.MSG_VERBOSE);
-
- } else if (!writeLogRef) {
- stubLine = stubLine.replace("${PACKAGE}", getPackage());
- stubLine = stubLine.replace("${CLASS_NAME}",
- dest.getName().substring(0, dest.getName().length() -
- ".java".length()));
- stubLine = stubLine.replace("${BASE}", getBase());
-
- String useMessageJarIfWebstart =
- properties.getProperty(GLOBAL_USE_MESSAGE_JAR_IF_WEBSTART);
- if (useMessageJarIfWebstart != null
- && ("true".equalsIgnoreCase(useMessageJarIfWebstart)
- || "on".equalsIgnoreCase(useMessageJarIfWebstart)))
- {
- useMessageJarIfWebstart = "true";
- }
- else
- {
- useMessageJarIfWebstart = "false";
- }
- stubLine = stubLine.replace("${USE_MESSAGE_JAR_IF_WEBSTART}",
- useMessageJarIfWebstart);
- destWriter.println(stubLine);
- }
- }
-
- registerMessageDescriptor(getMessageDescriptorFullClassName());
-
- stubReader.close();
- destWriter.close();
-
- } catch (Exception e) {
- // Don't leave a malformed file laying around. Delete
- // it so it will be forced to be regenerated.
- if (dest.exists()) {
- dest.deleteOnExit();
- }
- e.printStackTrace();
- throw new BuildException("Error processing " + source +
- ": " + e.getMessage());
- } finally {
- if (stubReader != null) {
- try {
- stubReader.close();
- } catch (Exception e){
- // ignore
- }
- }
- if (destWriter != null) {
- try {
- destWriter.close();
- } catch (Exception e){
- // ignore
- }
- }
- }
- }
-
- private String getMessageDescriptorFullClassName() {
- return getPackage() + "." + getMessageDescriptorClassName();
- }
-
- private String getMessageDescriptorClassName() {
- return dest.getName().substring(
- 0, dest.getName().length() - ".java".length());
- }
-
- private String getBase() {
- String srcPath = unixifyPath(source.getAbsolutePath());
- return srcPath.substring(srcPath.lastIndexOf("/") + 1,
- srcPath.length() - ".properties".length());
- }
-
- private String getPackage() {
- if (writeLogRef) { return "dummy.package.name"; }
-
- String destPath = unixifyPath(dest.getAbsolutePath());
- String msgJavaGenDir = unixifyPath(
- getProject().getProperty("msg.javagen.dir"));
- String c = destPath.substring(msgJavaGenDir.length()+1);
- c = c.replace('/', '.');
- c = c.substring(0, c.lastIndexOf(".")); // strip .java
- return c.substring(0, c.lastIndexOf(".")); // strip class name
- }
-
- private static String indent(int indent) {
- char[] blankArray = new char[2 * indent];
- Arrays.fill(blankArray, ' ');
- return new String(blankArray);
- }
-
- private static String quote(String s) {
- return "\"" + s + "\"";
- }
-
- /**
- * Writes a record in the messages registry for the specified class name.
- *
- * @param descClassName name of the message descriptor class
- * @return true if the class was actually added to the registry;
- * false indicates that the class was already present.
- * @throws IOException if there is a problem with the file I/O
- */
- private boolean registerMessageDescriptor(String descClassName)
- throws IOException
- {
- File registry = getRegistryFile();
- if (!isDescriptorRegistered(descClassName)) {
- FileOutputStream file = new FileOutputStream(registry,true);
- DataOutputStream out = new DataOutputStream(file);
- out.writeBytes(descClassName);
- out.writeBytes("\n");
- out.flush();
- out.close();
- }
- return false;
- }
-
- private boolean isDescriptorRegistered(String descClassName)
- throws IOException
- {
- BufferedReader reader = new BufferedReader(
- new FileReader(getRegistryFile()));
- String line;
- while(null != (line = reader.readLine())) {
- if (line.trim().equals(descClassName.trim())) {
- return true;
- }
- }
- return false;
- }
-
- private File getRegistryFile() throws IOException {
- File registry = new File(REGISTRY_FILE_NAME);
- if (!registry.exists()) {
- File parent = registry.getParentFile();
- if (!parent.exists()) {
- parent.mkdirs();
- }
- registry.createNewFile();
- }
- return registry;
- }
-
- private File getProjectBase() {
- return getProject().getBaseDir();
- }
-
- private String unixifyPath(String path) {
- return path.replace("\\", "/");
- }
-
- /**
- * Returns the stub file ("resource/Messages.java.stub") from the appropriate
- * location: ant or jar file.
- */
- private InputStream getStubFile() {
- InputStream result = null;
-
- File stub = new File(getProjectBase(), MESSAGES_FILE_STUB);
- if ( stub.exists() ) {
- // this is the OpenDS's ant project calling
- // Stub is located at OPENDS_ROOT/resource/Messages.java.stub
- try {
- result = new FileInputStream(stub);
- } catch (FileNotFoundException e) {
- // should never happen
- throw new BuildException("Unable to load template " +
- MESSAGES_FILE_STUB + ": " + e.getMessage());
- }
- } else {
- // this is the example plugin's ant project calling
- // Stub is located at build-tools.jar:resource/Messages.java.stub
- result = getClass().getResourceAsStream(MESSAGES_FILE_STUB);
- }
-
- return result;
- }
-
- /**
- * For testing.
- * @param args from command line
- */
- public static void main(String[] args) {
- File source = new File("src/messages/messages/tools.properties");
- File dest = new File("/tmp/org/opends/XXX.java");
- GenerateMessageFile gmf = new GenerateMessageFile();
-
- if (args.length > 0 && "generateMessageReference".equalsIgnoreCase(args[0]))
- {
- dest = new File("/tmp/tools-ref.xml");
- gmf.setWriteLogRef(true);
- }
-
- gmf.setOverwrite(true);
- gmf.setDestJava(dest);
- gmf.setSourceProps(source);
- gmf.execute();
- }
-
-}
diff --git a/opendj-sdk/opendj3-server-dev/src/build-tools/org/opends/build/tools/GetSubversionRevision.java b/opendj-sdk/opendj3-server-dev/src/build-tools/org/opends/build/tools/GetSubversionRevision.java
deleted file mode 100644
index 32a0977..0000000
--- a/opendj-sdk/opendj3-server-dev/src/build-tools/org/opends/build/tools/GetSubversionRevision.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- * or http://forgerock.org/license/CDDLv1.0.html.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at legal-notices/CDDLv1_0.txt.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- */
-package org.opends.build.tools;
-
-
-
-import java.io.File;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
-
-import org.tmatesoft.svn.core.SVNException;
-import org.tmatesoft.svn.core.wc.SVNClientManager;
-import org.tmatesoft.svn.core.wc.SVNInfo;
-import org.tmatesoft.svn.core.wc.SVNRevision;
-
-
-
-/**
- * This class provides an implementation of an Ant task that may be used to
- * determine the current Subversion revision number of the current working
- * copy. The value of the revision number will be stored in an Ant property.
- */
-public class GetSubversionRevision
- extends Task
-{
- // The name of the property in which the revision number should be set.
- private String propertyName = null;
-
- // The path to the root of the Subversion workspace for which to retrieve the
- // revision number.
- private String workspace = null;
-
- // The svn client manager. Required by svnkit 1.2.x
- private static SVNClientManager ourClientManager =
- SVNClientManager.newInstance();
-
- /**
- * Specifies the name of the Ant property into which the Subversion revision
- * number will be stored.
- *
- * @param propertyName The name of the Ant property into which the
- * Subversion revision number will be stored.
- */
- public void setProperty(String propertyName)
- {
- this.propertyName = propertyName;
- }
-
-
-
- /**
- * Specifies the path to the root of the Subversion workspace for which to
- * retrieve the revision number.
- *
- * @param workspace The path to the root of the Subversion workspace for
- * which to retrieve the revision number.
- */
- public void setWorkspace(String workspace)
- {
- this.workspace = workspace;
- }
-
-
-
- /**
- * Performs the appropriate processing needed for this task. In this case,
- * it uses SVNKit to identify the current revision number for the local
- * workspace and store it in a specified property.
- */
- @Override()
- public void execute()
- {
- if ((propertyName == null) || (propertyName.length() == 0))
- {
- throw new BuildException("ERROR: No property was specified for " +
- "storing the revision number value.");
- }
-
- File workspacePath;
- if ((workspace == null) || (workspace.length() == 0))
- {
- workspacePath = getProject().getBaseDir();
- }
- else
- {
- workspacePath = new File(workspace);
- }
-
-
- try
- {
- SVNInfo svnInfo = ourClientManager.getWCClient().doInfo(workspacePath, SVNRevision.WORKING);
- SVNRevision revision = svnInfo.getCommittedRevision();
-
-
- if (revision == null)
- {
- System.err.println("WARNING: Could not determine Subversion " +
- "revision number for current workspace.");
- getProject().setNewProperty(propertyName, "-1");
- }
- else
- {
- getProject().setNewProperty(propertyName,
- String.valueOf(revision.getNumber()));
- }
-
- }
- catch (SVNException svnException)
- {
- System.err.println("WARNING: Could not determine Subversion " +
- "revision number for current workspace: " +
- svnException);
- getProject().setNewProperty(propertyName, "-1");
- }
- }
-}
-
diff --git a/opendj-sdk/opendj3-server-dev/src/build-tools/org/opends/build/tools/GetSubversionUrlRepo.java b/opendj-sdk/opendj3-server-dev/src/build-tools/org/opends/build/tools/GetSubversionUrlRepo.java
deleted file mode 100644
index 839272a..0000000
--- a/opendj-sdk/opendj3-server-dev/src/build-tools/org/opends/build/tools/GetSubversionUrlRepo.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- * or http://forgerock.org/license/CDDLv1.0.html.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at legal-notices/CDDLv1_0.txt.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2009 Sun Microsystems, Inc.
- */
-package org.opends.build.tools;
-
-
-
-import java.io.File;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
-
-import org.tmatesoft.svn.core.SVNException;
-import org.tmatesoft.svn.core.wc.SVNClientManager;
-import org.tmatesoft.svn.core.wc.SVNInfo;
-import org.tmatesoft.svn.core.wc.SVNRevision;
-import org.tmatesoft.svn.core.SVNURL;
-
-
-
-/**
- * This class provides an implementation of an Ant task that may be used to
- * determine the current Subversion revision number of the current working
- * copy. The value of the revision number will be stored in an Ant property.
- */
-public class GetSubversionUrlRepo
- extends Task
-{
- // The name of the property in which the revision number should be set.
- private String propertyName = null;
-
- // The path to the root of the Subversion workspace for which to retrieve the
- // revision number.
- private String workspace = null;
-
- // The svn client manager. Required by svnkit 1.2.x
- private static SVNClientManager ourClientManager =
- SVNClientManager.newInstance();
-
- /**
- * Specifies the name of the Ant property into which the Subversion revision
- * number will be stored.
- *
- * @param propertyName The name of the Ant property into which the
- * Subversion revision number will be stored.
- */
- public void setProperty(String propertyName)
- {
- this.propertyName = propertyName;
- }
-
-
-
- /**
- * Specifies the path to the root of the Subversion workspace for which to
- * retrieve the revision number.
- *
- * @param workspace The path to the root of the Subversion workspace for
- * which to retrieve the revision number.
- */
- public void setWorkspace(String workspace)
- {
- this.workspace = workspace;
- }
-
-
-
- /**
- * Performs the appropriate processing needed for this task. In this case,
- * it uses SVNKit to identify the current revision number for the local
- * workspace and store it in a specified property.
- */
- @Override()
- public void execute()
- {
- if ((propertyName == null) || (propertyName.length() == 0))
- {
- throw new BuildException("ERROR: No property was specified for " +
- "storing the revision number value.");
- }
-
- File workspacePath;
- if ((workspace == null) || (workspace.length() == 0))
- {
- workspacePath = getProject().getBaseDir();
- }
- else
- {
- workspacePath = new File(workspace);
- }
-
-
- try
- {
- SVNInfo svnInfo = ourClientManager.getWCClient().doInfo(workspacePath, SVNRevision.WORKING);
- SVNURL url_repo = svnInfo.getURL();
-
-
- if (url_repo == null)
- {
- System.err.println("WARNING: Could not determine Subversion URL Repository " +
- "for current workspace.");
- getProject().setNewProperty(propertyName, "-1");
- }
- else
- {
- getProject().setNewProperty(propertyName,
- String.valueOf(url_repo));
-
- }
-
- }
- catch (SVNException svnException)
- {
- System.err.println("WARNING: Could not determine Subversion " +
- "URL repository for current workspace: " +
- svnException);
- getProject().setNewProperty(propertyName, "-1");
- }
- }
-}
-
diff --git a/opendj-sdk/opendj3-server-dev/src/build-tools/org/opends/build/tools/MessagePropertyKey.java b/opendj-sdk/opendj3-server-dev/src/build-tools/org/opends/build/tools/MessagePropertyKey.java
deleted file mode 100644
index c26f861..0000000
--- a/opendj-sdk/opendj3-server-dev/src/build-tools/org/opends/build/tools/MessagePropertyKey.java
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- * or http://forgerock.org/license/CDDLv1.0.html.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at legal-notices/CDDLv1_0.txt.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- */
-
-package org.opends.build.tools;
-
-import org.opends.messages.Category;
-import org.opends.messages.Severity;
-
-import java.util.EnumSet;
-
-/**
- * OpenDS messages defined in properties files must be defined
- * with the ordinal and in most cases category and severity encoded
- * in the message key. This class helps with generating and
- * parsing of these keys.
- *
- * Keys must be of the form
- *
- * CATEGORY_SEVERITY_DESCRIPTION_ORDINAL
- *
- * where:
- * <ul>
- * <li>
- * CATEGORY is the string representation of one of the
- * <code>Category</code> enums.
- * </li>
- * <li>
- * SEVERITY is the long or abbreviated form of one of
- * the <code>Severity</code> enums.
- * </li>
- * <li>
- * DESCRIPTION is an uppercase string containing characters
- * and the underscore character for describing the purpose
- * of the message.
- * </li>
- * <li>
- * ORDINAL is an integer that makes the message unique witin
- * the property file.
- * </li>
- * </ul>
- *
- */
-// TODO: move this class to GenerateMessageFile when DirectoryServer
-// no longer needs to support dumpMessages()
-public class MessagePropertyKey
- implements Comparable<MessagePropertyKey> {
-
- private Category category;
-
- private Severity severity;
-
- private String description;
-
- private Integer ordinal;
-
- /**
- * Creates a message property key from a string value.
- * @param keyString from properties file
- * @param includesCategory when true expects ordinals to be encoded
- * in the keystring; when false the mandate is relaxed
- * @param includesSeverity when true expects ordinals to be encoded
- * in the keystring; when false the mandate is relaxed
- * @param includesOrdinal when true expects ordinals to be encoded
- * in the keystring; when false the mandate is relaxed
- * @return MessagePropertyKey created from string
- */
- static public MessagePropertyKey parseString(
- String keyString,
- boolean includesCategory,
- boolean includesSeverity,
- boolean includesOrdinal) {
-
- Category category = null;
- Severity severity = null;
- String description;
- Integer ordinal = null;
-
- String k = keyString;
- for (Category c : EnumSet.allOf(Category.class)) {
- String cName = c.name();
- if (k.startsWith(cName)) {
- category = c;
- if ('_' != k.charAt(cName.length())) {
- throw new IllegalArgumentException(
- "Error processing " + keyString + ". Category must be " +
- "separated from the rest of the " +
- "key with an '_' character");
- }
- k = k.substring(cName.length() + 1);
- break;
- }
- }
- if (category == null && includesCategory) {
- throw new IllegalArgumentException("Category not included in key " +
- keyString);
- }
-
- for (Severity s : EnumSet.allOf(Severity.class)) {
- String sName = s.propertyKeyFormName();
- if (k.startsWith(sName)) {
- severity = s;
- if ('_' != k.charAt(sName.length())) {
- throw new IllegalArgumentException(
- "Error processing " + keyString + ". Severity must be " +
- "separated from the rest of the " +
- "key with an '_' character");
- }
- k = k.substring(sName.length() + 1);
- break;
- }
- }
- if (severity == null && includesSeverity) {
- throw new IllegalArgumentException("Severity not included in key " +
- keyString);
- }
-
- if (includesOrdinal) {
- int li = k.lastIndexOf("_");
- if (li != -1) {
- description = k.substring(0, li).toUpperCase();
- } else {
- throw new IllegalArgumentException(
- "Incorrectly formatted key " + keyString);
- }
-
- try {
- String ordString = k.substring(li + 1);
- ordinal = Integer.parseInt(ordString);
- } catch (Exception nfe) {
- throw new IllegalArgumentException("Error parsing ordinal for key " +
- keyString);
- }
- } else {
- description = k;
- }
- return new MessagePropertyKey(category, severity, description, ordinal);
- }
-
- /**
- * Creates a parameterized instance.
- * @param category of this key
- * @param severity of this key
- * @param description of this key
- * @param ordinal of this key
- */
- public MessagePropertyKey(Category category, Severity severity,
- String description, Integer ordinal) {
- this.category = category;
- this.severity = severity;
- this.description = description;
- this.ordinal = ordinal;
- }
-
- /**
- * Gets the category of this key.
- * @return Category of this key
- */
- public Category getCategory() {
- return this.category;
- }
-
- /**
- * Gets the severity of this key.
- * @return Severity of this key
- */
- public Severity getSeverity() {
- return this.severity;
- }
-
- /**
- * Gets the description of this key.
- * @return description of this key
- */
- public String getDescription() {
- return this.description;
- }
-
- /**
- * Gets the ordinal of this key.
- * @return ordinal of this key
- */
- public Integer getOrdinal() {
- return this.ordinal;
- }
-
- /**
- * Gets the name of the MessageDescriptor as it should appear
- * in the messages file.
- * @return name of message descriptor
- */
- public String getMessageDescriptorName() {
- return new StringBuilder()
- .append(this.severity.messageDesciptorName())
- .append("_")
- .append(this.description).toString();
- }
-
- /**
- * {@inheritDoc}
- */
- public String toString() {
- return getPropertyKeyName(true, true, true);
- }
-
- /**
- * Gets the name of the key as it would appear in a properties file.
- * @param includeCategory in the name
- * @param includeSeverity in the name
- * @param includeOrdinal in the name
- * @return string representing the property key
- */
- public String getPropertyKeyName(boolean includeCategory,
- boolean includeSeverity,
- boolean includeOrdinal) {
- StringBuilder sb = new StringBuilder();
- if (category != null && includeCategory) {
- sb.append(category.name());
- sb.append("_");
- }
- if (severity != null && includeSeverity) {
- sb.append(severity.propertyKeyFormName());
- sb.append("_");
- }
- sb.append(description);
- if (ordinal != null && includeOrdinal) {
- sb.append("_");
- sb.append(ordinal);
- }
- return sb.toString();
- }
-
- /**
- * {@inheritDoc}
- */
- public int compareTo(MessagePropertyKey k) {
- if (ordinal == k.ordinal) {
- return description.compareTo(k.description);
- } else {
- return ordinal.compareTo(k.ordinal);
- }
- }
-
-}
diff --git a/opendj-sdk/opendj3-server-dev/src/build-tools/org/opends/build/tools/PrepTestNG.java b/opendj-sdk/opendj3-server-dev/src/build-tools/org/opends/build/tools/PrepTestNG.java
deleted file mode 100644
index 7597581..0000000
--- a/opendj-sdk/opendj3-server-dev/src/build-tools/org/opends/build/tools/PrepTestNG.java
+++ /dev/null
@@ -1,336 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- * or http://forgerock.org/license/CDDLv1.0.html.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at legal-notices/CDDLv1_0.txt.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2006-2008 Sun Microsystems, Inc.
- */
-
-package org.opends.build.tools;
-
-import java.io.FileOutputStream;
-import java.io.PrintStream;
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.util.Arrays;
-
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.BuildException;
-
-public class PrepTestNG extends Task
-{
-
- /** Template for inserting children elements of default test tag */
- static private final String DEFAULT_TAGS_TEMPLATE =
- "<!-- DO NOT REMOVE! - GENERATED DEFAULT TAGS (see PrepTestNG class) -->";
-
- /** Template for inserting global children elements of run tags */
- static private final String GLOBAL_RUN_TAGS_TEMPLATE =
- "<!-- DO NOT REMOVE! - GENERATED GLOBAL RUN TAGS (see PrepTestNG class) -->";
-
- /** Indentation used in testng.xml */
- static private final int INDENT = 4;
-
- private String file;
- private String toFile;
- private String groupList;
- private String packageList;
- private String classList;
- private String methodList;
-
- public void setFile(String file)
- {
- this.file = file;
- }
-
- public void setToFile(String toFile)
- {
- this.toFile = toFile;
- }
-
- public void setGroupList(String groupList)
- {
- this.groupList = groupList;
- }
-
- public void setPackageList(String packageList)
- {
- this.packageList = packageList;
- }
-
- public void setClassList(String classList)
- {
- this.classList = classList;
- }
-
- public void setMethodList(String methodList)
- {
- this.methodList = methodList;
- }
-
- public void execute() throws BuildException
- {
- if(file == null)
- {
- throw new BuildException("Attribute file must be set to the orginal " +
- "TestNG XML file");
- }
-
- if(toFile == null)
- {
- throw new BuildException("Attribute toFile must be set to the modified " +
- "TestNG XML file");
- }
-
- BufferedReader reader;
- FileOutputStream outFile;
- PrintStream writer;
- String line;
- String[] groups;
- String[] packages;
- String[] classes;
- String[] methods;
- String[] groupLine;
- String[] methodLine;
- String methodClass;
- String methodName;
- int methodNameStartIdx;
- int groupCount = 0;
- int packageCount = 0;
- int classCount = 0;
- int methodCount = 0;
-
- try
- {
- reader = new BufferedReader(new FileReader(file));
- outFile = new FileOutputStream(toFile);
-
- writer = new PrintStream(outFile);
-
- line = reader.readLine();
-
- if(groupList != null && !groupList.trim().equals("") &&
- !groupList.startsWith("${"))
- {
- groups = groupList.split(",");
- }
- else
- {
- groups = new String[0];
- }
- if(packageList != null && !packageList.trim().equals("") &&
- !packageList.startsWith("${"))
- {
- packages = packageList.split(",");
- }
- else
- {
- packages = new String[0];
- }
-
- if(classList != null && !classList.trim().equals("") &&
- !classList.startsWith("${"))
- {
- classes = classList.split(",");
- }
- else
- {
- classes = new String[0];
- }
-
- if(methodList != null && !methodList.trim().equals("") &&
- !methodList.startsWith("${"))
- {
- methods = methodList.split(";");
- }
- else
- {
- methods = new String[0];
- }
-
- while(line != null)
- {
- if(line.indexOf(DEFAULT_TAGS_TEMPLATE) >= 0)
- {
- int level = 2;
- if(groups.length > 0)
- {
- boolean windowsClause = false;
- println(writer, level, "<groups>");
- println(writer, ++level, "<run>");
- level++;
- for(String group : groups)
- {
- groupLine = group.split("=");
- if(groupLine.length == 2)
- {
- String inc_exc = groupLine[0].trim();
- if (inc_exc == null ||
- !("include".equals(inc_exc.toLowerCase()) ||
- "exclude".equals(inc_exc.toLowerCase()))) {
- System.out.println("Error: illegal group clause " + group);
- } else {
- String gr = groupLine[1].trim();
- println(writer, level, "<" +inc_exc +" "+
- "name=\""+gr+ "\" />");
- windowsClause |= "windows".equals(gr);
- groupCount++;
- }
- }
- }
-
- // Exclude windows specific tests if the user has not provided
- // an explicit windows clause and we're not on windows.
- if (!windowsClause && !isWindows()) {
- println(writer, level, "<exclude name=\"windows\"/>");
- groupCount++;
- }
-
- println(writer, --level, "</run>");
- println(writer, --level, "</groups>");
- } else {
-
- // No explicit groups have been specified so see if we need
- // to exclude the windows tests.
- if (!isWindows()) {
- println(writer, level, "<groups>");
- println(writer, ++level, "<run>");
- println(writer, ++level, "<exclude name=\"windows\"/>");
- println(writer, --level, "</run>");
- println(writer, --level, "</groups>");
- groupCount++;
- }
- }
-
- if(packages.length > 0)
- {
- println(writer, level, "<packages>");
- level++;
- for(String pkg : packages)
- {
- println(writer, level, "<package name=\"" + pkg.trim() + "\" />");
- packageCount++;
- }
- println(writer, --level, "</packages>");
- }
-
- if(classes.length > 0 || methods.length > 0)
- {
- println(writer, level, "<classes>");
-
- if(classes.length > 0)
- {
- level++;
- for(String cls : classes)
- {
- println(writer, level, "<class name=\"" + cls.trim() + "\" />");
- classCount++;
- }
- }
-
- if(methods.length > 0)
- {
- level++;
- for(String mhd : methods)
- {
- methodLine = mhd.split(",");
- if(methodLine.length > 0)
- {
- // Allow class.method or class#method
- methodNameStartIdx = methodLine[0].lastIndexOf("#");
- if (methodNameStartIdx == -1)
- {
- methodNameStartIdx = methodLine[0].lastIndexOf(".");
- }
- methodClass = methodLine[0].substring(0,
- methodNameStartIdx);
- methodName = methodLine[0].substring(methodNameStartIdx + 1,
- methodLine[0].length());
- println(writer, level, "<class name=\"" +
- methodClass.trim() + "\" >");
- println(writer, ++level, "<methods>");
- println(writer, ++level, "<include name=\"" +
- methodName.trim() + "\" />");
- methodCount++;
- classCount++;
- for(int i = 1; i < methodLine.length; i ++)
- {
- println(writer, level, "<include name=\"" +
- methodLine[i].trim() + "\" />");
- methodCount++;
- }
- println(writer, --level, "</methods>");
- println(writer, --level, "</class>");
- }
- }
- }
-
- println(writer, --level, "</classes>");
- }
- }
- else if (line.indexOf(GLOBAL_RUN_TAGS_TEMPLATE) != -1)
- {
- if (!isWindows()) {
- int index = line.indexOf(GLOBAL_RUN_TAGS_TEMPLATE);
- println(writer, levelForIndex(index),
- "<exclude name=\"windows\"/>");
- }
- }
- else
- {
- println(writer, 0, line);
- }
-
- line = reader.readLine();
- }
-
- System.out.println("Adding " + groupCount + " group tags, " +
- packageCount + " package tags, " + classCount + " class tags, " +
- methodCount + " method tags to " + toFile);
- }
- catch(Exception e)
- {
- throw new BuildException("File Error: " + e.toString());
- }
- }
-
- static private boolean isWindows() {
- String os = System.getProperty("os.name");
- return (os != null && os.toLowerCase().indexOf("windows") != -1);
- }
-
- static private String indent(int indent) {
- char[] blankArray = new char[indent];
- Arrays.fill(blankArray, ' ');
- return new String(blankArray);
- }
-
- static private void println(PrintStream writer, int level, String txt) {
- writer.print(indent(INDENT * level));
- writer.print(txt);
- writer.print(System.getProperty("line.separator"));
- }
-
- static private int levelForIndex(int index) {
- return index / INDENT;
- }
-
-}
diff --git a/opendj-sdk/opendj3-server-dev/src/build-tools/org/opends/build/tools/ProcessFilesForPackages.java b/opendj-sdk/opendj3-server-dev/src/build-tools/org/opends/build/tools/ProcessFilesForPackages.java
deleted file mode 100644
index de21d85..0000000
--- a/opendj-sdk/opendj3-server-dev/src/build-tools/org/opends/build/tools/ProcessFilesForPackages.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- * or http://forgerock.org/license/CDDLv1.0.html.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at legal-notices/CDDLv1_0.txt.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2013 ForgeRock AS
- */
-package org.opends.build.tools;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.net.URI;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
-
-/**
- * A utility class for the packaging process. It is used by the build.xml to
- * perform the package construction.
- */
-public class ProcessFilesForPackages extends Task
-{
- /** The source directory name */
- private String sourceDirName;
-
- /** Files contained in the package */
- private final List<File> files = new LinkedList<File>();
-
- /** Files which should be excluded from the package */
- private final List<File> excludedFiles = new LinkedList<File>();
-
- /** Package documentation files */
- private final List<File> docFiles = new LinkedList<File>();
-
- /** The end-of-line character for this platform */
- private static String EOL = System.getProperty("line.separator");
-
- /**
- * Returns the source directory name.
- *
- * @return The source directory name.
- */
- public String getSourceDirName()
- {
- return sourceDirName;
- }
-
- /**
- * Sets the source directory name.
- *
- * @param sourceDirName
- * The source directory name.
- */
- public void setSourceDirName(String sourceDirName)
- {
- this.sourceDirName = sourceDirName;
- }
-
- @Override()
- public void execute()
- {
- try
- {
- // Process the filtering of the files contained in the given directory.
- filterFiles(new File(getSourceDirName()));
- files.removeAll(docFiles);
- // Sorts the list.
- Collections.sort(files);
- Collections.sort(docFiles);
- // Returns the properties which can be used fill data.
- getProject().setNewProperty("listRPMFiles", formatAsFileList(files));
- getProject().setNewProperty("listRPMDocFiles",
- formatAsDocList(docFiles));
- getProject().setNewProperty("excludedRPMFiles",
- formatAsExcludedList(excludedFiles));
- getProject().setNewProperty("installRpmFiles", getInstallationFiles());
- }
- catch (Exception e)
- {
- throw new BuildException(
- "An error occurs during filtering package files", e);
- }
- }
-
- /**
- * Returns the installation files for the RPM package.
- *
- * @return A string containing the installation files for the RPM package.
- */
- private String getInstallationFiles()
- {
- return new StringBuilder("cp -rf \"").append(sourceDirName).append("\"/* .")
- .append(EOL).toString();
- }
- /**
- * Formats the file list to be supported by RPM.
- *
- * @param fileList
- * The list of files to be processed.
- * @return A string containing the list of files which should be excluded in
- * the RPM source.
- */
- private String formatAsExcludedList(final List<File> fileList)
- {
- final StringBuilder sb = new StringBuilder();
- for (final File f : fileList)
- {
- sb.append(relativeToSourceDirName(f)).append(EOL);
- }
- return sb.toString();
- }
-
- /**
- * Formats the file list to be supported by RPM.
- *
- * @param fileList
- * The list of files to be processed.
- * @return A string containing the list of files which can be included in the
- * RPM source.
- */
- private String formatAsFileList(final List<File> fileList)
- {
- final StringBuilder sb = new StringBuilder();
- sb.append("%dir %{_prefix}").append(EOL);
- for (final File f : fileList)
- {
- if (f.isDirectory())
- {
- sb.append("%dir %{_prefix}");
- }
- else
- {
- sb.append("%{_prefix}");
- }
- sb.append(relativeToSourceDirName(f)).append(EOL);
- }
- return sb.toString();
- }
-
- /**
- * Formats the document list to be supported by RPM.
- *
- * @param fileList
- * The list of files to be processed.
- * @return A string containing the formatted list doc.
- */
- private String formatAsDocList(final List<File> fileList)
- {
- final StringBuilder sb = new StringBuilder();
- for (final File f : fileList)
- {
- // FIXME The folder needs to be copied as well.
- if (!f.isDirectory())
- {
- sb.append(
- relativeToSourceDirName(f)).append(EOL);
- }
- }
- return sb.toString();
- }
-
- /**
- * Sorts all the files contained in selected directory and fills the
- * appropriate lists.
- *
- * @param dir
- * The directory where to analyze the files.
- * @throws Exception
- * If an exception occurs during the process.
- */
- private void filterFiles(final File dir) throws Exception
- {
- final ExcludeFileFilter exFilter = new ExcludeFileFilter();
- final DocFileFilter docFilter = new DocFileFilter();
-
- // The spaces in path can generate errors. (see OPENDJ-1063)
- final File fdir =
- new File(new URI("file:///"
- + dir.getAbsolutePath().replaceAll(" ", "%20")));
-
- for (final File f : fdir.listFiles())
- {
- if (f.isDirectory())
- {
- filterFiles(f);
- }
- // Completes the excluded files list.
- if (exFilter.accept(f))
- {
- excludedFiles.add(f);
- }
- else
- {
- files.add(f);
- }
- // Completes the document file list.
- if (docFilter.accept(f))
- {
- docFiles.add(f);
- }
- }
- }
-
- /**
- * Returns the relative path to given source directory name.
- *
- * @param f
- * The file we want the relative path.
- * @return A string representing the relative path to the given source
- * directory name.
- */
- private String relativeToSourceDirName(File f)
- {
- return f.getAbsolutePath().replace(getSourceDirName(), "");
- }
-
- /**
- * A file filter which excludes all files that belong to other OS.
- */
- static final class ExcludeFileFilter implements FileFilter
- {
- /** {@inheritDoc} */
- public boolean accept(File file)
- {
- final String fileName = file.getName().toLowerCase();
- return (
- fileName.equals("bat")
- || fileName.endsWith(".app")
- || fileName.endsWith(".bat")
- || fileName.endsWith(".exe")
- || fileName.equals("readme")
- || file.getAbsolutePath().contains(".app"));
- }
- }
-
- /**
- * A file filter which accepts only documentation files.
- */
- static final class DocFileFilter implements FileFilter
- {
- /** {@inheritDoc} */
- public boolean accept(File file)
- {
- final String fileName = file.getName().toLowerCase();
- if (file.isDirectory())
- {
- return fileName.equals("legal-notices");
- }
- return (
- !file.getAbsolutePath().contains("/template/")
- && !file.getAbsolutePath().contains("/legals/")
- && !file.getAbsolutePath().contains("/snmp/")
- && (fileName.endsWith(".doc")
- || fileName.endsWith(".txt")
- || fileName.contains("example-plugin")));
- }
- }
-}
diff --git a/opendj-sdk/opendj3-server-dev/src/build-tools/org/opends/build/tools/Utilities.java b/opendj-sdk/opendj3-server-dev/src/build-tools/org/opends/build/tools/Utilities.java
deleted file mode 100644
index 0839de7..0000000
--- a/opendj-sdk/opendj3-server-dev/src/build-tools/org/opends/build/tools/Utilities.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- * or http://forgerock.org/license/CDDLv1.0.html.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at legal-notices/CDDLv1_0.txt.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- */
-package org.opends.build.tools;
-import java.util.StringTokenizer;
-
-/**
- */
-public class Utilities {
-
- /**
- * The end-of-line character for this platform.
- */
- public static final String EOL = System.getProperty("line.separator");
-
- /**
- * Inserts line breaks into the provided buffer to wrap text at no more than
- * the specified column width. Wrapping will only be done at space boundaries
- * and if there are no spaces within the specified width, then wrapping will
- * be performed at the first space after the specified column.
- *
- * @param text The text to be wrapped.
- * @param width The maximum number of characters to allow on a line if there
- * is a suitable breaking point.
- *
- * @return The wrapped text.
- */
- public static String wrapText(String text, int width)
- {
- StringBuilder buffer = new StringBuilder();
- StringTokenizer lineTokenizer = new StringTokenizer(text, "\r\n", true);
- while (lineTokenizer.hasMoreTokens())
- {
- String line = lineTokenizer.nextToken();
- if (line.equals("\r") || line.equals("\n"))
- {
- // It's an end-of-line character, so append it as-is.
- buffer.append(line);
- }
- else if (line.length() < width)
- {
- // The line fits in the specified width, so append it as-is.
- buffer.append(line);
- }
- else
- {
- // The line doesn't fit in the specified width, so it needs to be
- // wrapped. Do so at space boundaries.
- StringBuilder lineBuffer = new StringBuilder();
- StringBuilder delimBuffer = new StringBuilder();
- StringTokenizer wordTokenizer = new StringTokenizer(line, " ", true);
- while (wordTokenizer.hasMoreTokens())
- {
- String word = wordTokenizer.nextToken();
- if (word.equals(" "))
- {
- // It's a space, so add it to the delim buffer only if the line
- // buffer is not empty.
- if (lineBuffer.length() > 0)
- {
- delimBuffer.append(word);
- }
- }
- else if (word.length() > width)
- {
- // This is a long word that can't be wrapped, so we'll just have to
- // make do.
- if (lineBuffer.length() > 0)
- {
- buffer.append(lineBuffer);
- buffer.append(EOL);
- lineBuffer = new StringBuilder();
- }
- buffer.append(word);
-
- if (wordTokenizer.hasMoreTokens())
- {
- // The next token must be a space, so remove it. If there are
- // still more tokens after that, then append an EOL.
- wordTokenizer.nextToken();
- if (wordTokenizer.hasMoreTokens())
- {
- buffer.append(EOL);
- }
- }
-
- if (delimBuffer.length() > 0)
- {
- delimBuffer = new StringBuilder();
- }
- }
- else
- {
- // It's not a space, so see if we can fit it on the curent line.
- int newLineLength = lineBuffer.length() + delimBuffer.length() +
- word.length();
- if (newLineLength < width)
- {
- // It does fit on the line, so add it.
- lineBuffer.append(delimBuffer).append(word);
-
- if (delimBuffer.length() > 0)
- {
- delimBuffer = new StringBuilder();
- }
- }
- else
- {
- // It doesn't fit on the line, so end the current line and start
- // a new one.
- buffer.append(lineBuffer);
- buffer.append(EOL);
-
- lineBuffer = new StringBuilder();
- lineBuffer.append(word);
-
- if (delimBuffer.length() > 0)
- {
- delimBuffer = new StringBuilder();
- }
- }
- }
- }
-
- // If there's anything left in the line buffer, then add it to the
- // final buffer.
- buffer.append(lineBuffer);
- }
- }
-
- return buffer.toString();
- }
-}
diff --git a/opendj-sdk/opendj3-server-dev/src/build-tools/org/opends/build/tools/ValidJavaVersion.java b/opendj-sdk/opendj3-server-dev/src/build-tools/org/opends/build/tools/ValidJavaVersion.java
deleted file mode 100644
index 22dfbb8..0000000
--- a/opendj-sdk/opendj3-server-dev/src/build-tools/org/opends/build/tools/ValidJavaVersion.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- * or http://forgerock.org/license/CDDLv1.0.html.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at legal-notices/CDDLv1_0.txt.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- */
-package org.opends.build.tools;
-
-import org.apache.tools.ant.taskdefs.condition.Condition;
-import org.apache.tools.ant.BuildException;
-
-/**
- * Ant condition to check whether we have a minimum required Java version.
- */
-public class ValidJavaVersion implements Condition
-{
- // The minimum required Java version.
- String minVersion;
-
- /**
- * Set the minVersion attribute.
- * @param minVersion The minimum required Java version.
- */
- public void setMinVersion(String minVersion)
- {
- this.minVersion = minVersion;
- }
-
-
- /**
- * Evaluate the condition.
- */
- public boolean eval() throws BuildException
- {
- if (minVersion == null)
- {
- return true;
- }
-
- String version = System.getProperty("java.version");
- if (version == null)
- {
- return false;
- }
-
- return version.compareTo(minVersion) >= 0;
- }
-}
diff --git a/opendj-sdk/opendj3-server-dev/src/build-tools/org/opends/build/tools/package-info.java b/opendj-sdk/opendj3-server-dev/src/build-tools/org/opends/build/tools/package-info.java
deleted file mode 100644
index 9602253..0000000
--- a/opendj-sdk/opendj3-server-dev/src/build-tools/org/opends/build/tools/package-info.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- * or http://forgerock.org/license/CDDLv1.0.html.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at legal-notices/CDDLv1_0.txt.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- */
-
-
-
-/**
- * This package contains source for a number of tools that are used in some way
- * during the OpenDS build process. This includes custom Ant tasks, utilities
- * to format schema files, and to facilitate running server unit tests.
- */
-package org.opends.build.tools;
-
diff --git a/opendj-sdk/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/BinaryAttributeEditorPanel.java b/opendj-sdk/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/BinaryAttributeEditorPanel.java
index dce84de..053818f 100644
--- a/opendj-sdk/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/BinaryAttributeEditorPanel.java
+++ b/opendj-sdk/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/BinaryAttributeEditorPanel.java
@@ -421,7 +421,7 @@
}
else
{
- errors.add(ERR_CTRL_PANEL_ERROR_DECODING_BASE_64.get(t));
+ errors.add(ERR_CTRL_PANEL_ERROR_DECODING_BASE64.get(t));
}
displayErrorDialog(errors);
}
@@ -531,7 +531,7 @@
gbc.insets.left = 0;
gbc.gridwidth = 3;
useBase64 = Utilities.createRadioButton(
- INFO_CTRL_PANEL_USE_CONTENTS_IN_BASE_64.get());
+ INFO_CTRL_PANEL_USE_CONTENTS_IN_BASE64.get());
useBase64.setFont(ColorAndFontConstants.primaryFont);
add(useBase64, gbc);
@@ -621,7 +621,7 @@
else
{
base64.setText(
- INFO_CTRL_PANEL_SPECIFY_CONTENTS_IN_BASE_64.get().toString());
+ INFO_CTRL_PANEL_SPECIFY_CONTENTS_IN_BASE64.get().toString());
}
}
diff --git a/opendj-sdk/opendj3-server-dev/src/main/assembly/dsml-war-assembly.xml b/opendj-sdk/opendj3-server-dev/src/main/assembly/dsml-war-assembly.xml
new file mode 100644
index 0000000..418cb6c
--- /dev/null
+++ b/opendj-sdk/opendj3-server-dev/src/main/assembly/dsml-war-assembly.xml
@@ -0,0 +1,83 @@
+<!--
+ ! CDDL HEADER START
+ !
+ ! The contents of this file are subject to the terms of the
+ ! Common Development and Distribution License, Version 1.0 only
+ ! (the "License"). You may not use this file except in compliance
+ ! with the License.
+ !
+ ! You can obtain a copy of the license at
+ ! trunk/opendj3/legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
+ ! See the License for the specific language governing permissions
+ ! and limitations under the License.
+ !
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at
+ ! trunk/opendj3/legal-notices/CDDLv1_0.txt. If applicable,
+ ! add the following below this CDDL HEADER, with the fields enclosed
+ ! by brackets "[]" replaced with your own identifying information:
+ ! Portions Copyright [yyyy] [name of copyright owner]
+ !
+ ! CDDL HEADER END
+ !
+ ! Copyright 2015 ForgeRock AS.
+ !
+-->
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+ <id>dsml-war</id>
+ <baseDirectory></baseDirectory>
+ <!-- Put un-versioned dependencies (jars) into lib directory -->
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>WEB-INF/lib</outputDirectory>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <includes>
+ <include>org.forgerock.commons:forgerock-util</include>
+ <include>org.forgerock.commons:i18n-core</include>
+ <include>org.forgerock.commons:i18n-slf4j</include>
+ <include>org.slf4j:slf4j-api</include>
+ <include>org.forgerock.opendj:opendj-cli</include>
+ <include>org.forgerock.opendj:opendj-config</include>
+ <include>org.forgerock.opendj:opendj-core</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+ <fileSets>
+ <fileSet>
+ <directory>${jars.dir}/</directory>
+ <outputDirectory>WEB-INF/lib</outputDirectory>
+ <includes>
+ <include>${shortProductName}_*.jar</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>${project.build.outputDirectory}/org/opends/dsml/protocol</directory>
+ <outputDirectory>WEB-INF/classes/org/opends/dsml/protocol</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>${basedir}/resource/dsml/webapp</directory>
+ <outputDirectory>WEB-INF</outputDirectory>
+ </fileSet>
+ </fileSets>
+ <files>
+ <!-- Main jar (OpenDJ) -->
+ <file>
+ <source>${jars.dir}/${shortProductName}.jar</source>
+ <outputDirectory>lib</outputDirectory>
+ </file>
+
+ <!-- DSMLv2.xsd -->
+ <file>
+ <source>${basedir}/resource/dsml/schema/DSMLv2.xsd</source>
+ <outputDirectory>WEB-INF/classes/resources</outputDirectory>
+ </file>
+ </files>
+</assembly>
\ No newline at end of file
diff --git a/opendj-sdk/opendj3-server-dev/src/main/assembly/example-plugin-assembly.xml b/opendj-sdk/opendj3-server-dev/src/main/assembly/example-plugin-assembly.xml
new file mode 100644
index 0000000..152b87f
--- /dev/null
+++ b/opendj-sdk/opendj3-server-dev/src/main/assembly/example-plugin-assembly.xml
@@ -0,0 +1,96 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+ <id>zip-generation</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <!-- Adds xml files to src target directory -->
+ <fileSet>
+ <directory>${basedir}/src/admin/defn</directory>
+ <outputDirectory>src</outputDirectory>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ </fileSet>
+
+ <!-- Adds resource/admin content but example-plugin folder to resource/admin target directory -->
+ <fileSet>
+ <directory>${basedir}/resource/admin</directory>
+ <outputDirectory>resource/admin</outputDirectory>
+ <excludes>
+ <exclude>example-plugin/**</exclude>
+ </excludes>
+ </fileSet>
+
+ <!-- Adds files to root target directory -->
+ <fileSet>
+ <directory>${basedir}/resource/admin/example-plugin</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>build.xml</include>
+ <include>README</include>
+ </includes>
+ </fileSet>
+
+ <!-- Adds files to src/com/example/opends target directory -->
+ <fileSet>
+ <directory>${basedir}/resource/admin/example-plugin</directory>
+ <outputDirectory>src/com/example/opends</outputDirectory>
+ <includes>
+ <include>*.java</include>
+ <include>*.xml</include>
+ </includes>
+ <excludes><exclude>build.xml</exclude></excludes>
+ </fileSet>
+
+ <!-- Adds messages to resource/messages/com/example/opends/messages target directory -->
+ <fileSet>
+ <directory>${basedir}/resource/admin/example-plugin</directory>
+ <outputDirectory>resource/messages/com/example/opends/messages</outputDirectory>
+ <includes>
+ <include>example_plugin*.properties</include>
+ </includes>
+ <excludes><exclude>build.xml</exclude></excludes>
+ </fileSet>
+
+ <!-- Creates template/ children directories -->
+ <fileSet>
+ <directory>.</directory>
+ <outputDirectory>ext</outputDirectory>
+ <excludes>
+ <exclude>*/**</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>.</directory>
+ <outputDirectory>src-generated</outputDirectory>
+ <excludes>
+ <exclude>*/**</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+
+
+ <files>
+ <!-- Adds schema file to resource/schema target directory -->
+ <file>
+ <source>${basedir}/resource/admin/example-plugin/99-example-plugin.ldif</source>
+ <outputDirectory>resource/schema</outputDirectory>
+ </file>
+
+ <!-- Adds config file to resource/schema target directory -->
+ <file>
+ <source>${basedir}/resource/admin/example-plugin/example-plugin.ldif</source>
+ <outputDirectory>resource/config</outputDirectory>
+ </file>
+
+ <!-- Adds jar file to the lib target directory -->
+ <!-- TODO: activate once build-tools directory created -->
+<!-- <file> -->
+<!-- <source>${basedir}/build/build-tools/build-tools.jar</source> -->
+<!-- <outputDirectory>lib</outputDirectory> -->
+<!-- </file> -->
+ </files>
+</assembly>
\ No newline at end of file
diff --git a/opendj-sdk/opendj3-server-dev/src/main/assembly/opendj-archive-assembly.xml b/opendj-sdk/opendj3-server-dev/src/main/assembly/opendj-archive-assembly.xml
new file mode 100644
index 0000000..d5b417f
--- /dev/null
+++ b/opendj-sdk/opendj3-server-dev/src/main/assembly/opendj-archive-assembly.xml
@@ -0,0 +1,35 @@
+<!--
+ ! CDDL HEADER START
+ !
+ ! The contents of this file are subject to the terms of the
+ ! Common Development and Distribution License, Version 1.0 only
+ ! (the "License"). You may not use this file except in compliance
+ ! with the License.
+ !
+ ! You can obtain a copy of the license at
+ ! trunk/opendj3/legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
+ ! See the License for the specific language governing permissions
+ ! and limitations under the License.
+ !
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at
+ ! trunk/opendj3/legal-notices/CDDLv1_0.txt. If applicable,
+ ! add the following below this CDDL HEADER, with the fields enclosed
+ ! by brackets "[]" replaced with your own identifying information:
+ ! Portions Copyright [yyyy] [name of copyright owner]
+ !
+ ! CDDL HEADER END
+ !
+ ! Copyright 2015 ForgeRock AS.
+ !
+-->
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+ <id>opendj-dir-generation</id>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <componentDescriptors>
+ <componentDescriptor>src/main/assembly/opendj-archive-component.xml</componentDescriptor>
+ </componentDescriptors>
+</assembly>
\ No newline at end of file
diff --git a/opendj-sdk/opendj3-server-dev/src/main/assembly/opendj-archive-component.xml b/opendj-sdk/opendj3-server-dev/src/main/assembly/opendj-archive-component.xml
new file mode 100644
index 0000000..639fb5e
--- /dev/null
+++ b/opendj-sdk/opendj3-server-dev/src/main/assembly/opendj-archive-component.xml
@@ -0,0 +1,306 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ! CDDL HEADER START
+ !
+ ! The contents of this file are subject to the terms of the
+ ! Common Development and Distribution License, Version 1.0 only
+ ! (the "License"). You may not use this file except in compliance
+ ! with the License.
+ !
+ ! You can obtain a copy of the license at
+ ! trunk/opendj3/legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
+ ! See the License for the specific language governing permissions
+ ! and limitations under the License.
+ !
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at
+ ! trunk/opendj3/legal-notices/CDDLv1_0.txt. If applicable,
+ ! add the following below this CDDL HEADER, with the fields enclosed
+ ! by brackets "[]" replaced with your own identifying information:
+ ! Portions Copyright [yyyy] [name of copyright owner]
+ !
+ ! CDDL HEADER END
+ !
+ ! Copyright 2015 ForgeRock AS.
+ !
+-->
+<!-- OpenDJ final archive content descriptor -->
+<component>
+ <!-- Put un-versioned dependencies (jars) into lib directory -->
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <excludes>
+ <exclude>org.forgerock.opendj:opendj3-server-dev</exclude>
+ <exclude>javax.activation:activation</exclude>
+ <exclude>org.forgerock.commons:json-resource-servlet:war</exclude>
+ </excludes>
+ </dependencySet>
+ </dependencySets>
+ <fileSets>
+ <!-- Creates bat/ directory -->
+ <fileSet>
+ <directory>${basedir}/resource/bin</directory>
+ <outputDirectory>bat</outputDirectory>
+ <includes>
+ <include>*.bat</include>
+ </includes>
+ <excludes>
+ <exclude>_*.bat</exclude>
+ <exclude>setcp.bat</exclude>
+ </excludes>
+ <fileMode>755</fileMode>
+ <lineEnding>windows</lineEnding>
+ </fileSet>
+
+ <!-- Creates bin/ directory -->
+ <fileSet>
+ <directory>${basedir}/resource/bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ <excludes>
+ <exclude>_*.sh</exclude>
+ <exclude>*.bat</exclude>
+ </excludes>
+ <fileMode>755</fileMode>
+ <directoryMode>755</directoryMode>
+ </fileSet>
+
+ <!-- Creates legal-notices/ directory -->
+ <fileSet>
+ <directory>${basedir}/resource/legal-notices</directory>
+ <outputDirectory>legal-notices</outputDirectory>
+ </fileSet>
+
+ <!-- Adds scripts in lib/ directory -->
+ <fileSet>
+ <directory>${basedir}/resource/bin</directory>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>_*.sh</include>
+ <include>_*.bat</include>
+ <include>setcp.bat</include>
+ </includes>
+ <fileMode>755</fileMode>
+ <directoryMode>755</directoryMode>
+ </fileSet>
+
+ <!-- Adds resources at the archive root -->
+ <fileSet>
+ <directory>${basedir}/resource</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>setup*</include>
+ <include>*install*</include>
+ <include>upgrade*</include>
+ <include>README</include>
+ </includes>
+ <fileMode>755</fileMode>
+ <directoryMode>755</directoryMode>
+ </fileSet>
+
+ <!-- Adds Mac executables at the archive root -->
+ <fileSet>
+ <directory>${basedir}/resource/mac</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>QuickSetup.app/*/**</include>
+ <include>Uninstall.app/*/**</include>
+ </includes>
+ <excludes>
+ <exclude>*/**/Info.plist</exclude>
+ </excludes>
+ <fileMode>755</fileMode>
+ <directoryMode>755</directoryMode>
+ </fileSet>
+
+ <!-- Adds Mac Info.plist files at the archive root -->
+ <fileSet>
+ <directory>${project.build.outputDirectory}</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>QuickSetup.app/*/**</include>
+ <include>Uninstall.app/*/**</include>
+ </includes>
+ <fileMode>755</fileMode>
+ <directoryMode>755</directoryMode>
+ </fileSet>
+
+ <!-- Adds Mac control-panel in the bin/ directory -->
+ <fileSet>
+ <directory>${basedir}/resource/mac</directory>
+ <outputDirectory>bin</outputDirectory>
+ <includes>
+ <include>ControlPanel.app/*/**</include>
+ <include>${project.build.outputDirectory}/ControlPanel.app/*/**</include>
+ </includes>
+ <excludes>
+ <exclude>*/**/Info.plist</exclude>
+ </excludes>
+ <fileMode>755</fileMode>
+ <directoryMode>755</directoryMode>
+ </fileSet>
+
+ <!-- Adds Mac control-panel Info.plist in the bin/ directory -->
+ <fileSet>
+ <directory>${project.build.outputDirectory}</directory>
+ <outputDirectory>bin</outputDirectory>
+ <includes>
+ <include>ControlPanel.app/*/**</include>
+ </includes>
+ <fileMode>755</fileMode>
+ <directoryMode>755</directoryMode>
+ </fileSet>
+
+ <!-- Adds messages template resources -->
+ <fileSet>
+ <directory>${basedir}/resource/messages</directory>
+ <outputDirectory>template/config/messages</outputDirectory>
+ <includes>
+ <include>*.template</include>
+ </includes>
+ </fileSet>
+
+ <!-- Adds schema template resources -->
+ <fileSet>
+ <directory>${basedir}/resource/schema</directory>
+ <outputDirectory>template/config/schema</outputDirectory>
+ <includes>
+ <include>*.ldif</include>
+ </includes>
+ </fileSet>
+
+ <!-- Adds configuration template resources -->
+ <fileSet>
+ <directory>${basedir}/resource/config</directory>
+ <outputDirectory>template/config</outputDirectory>
+ <includes>
+ <include>*.*</include>
+ </includes>
+ </fileSet>
+
+ <!-- Adds MakeLDIF configuration template resources -->
+ <fileSet>
+ <directory>${basedir}/resource/MakeLDIF</directory>
+ <outputDirectory>template/config/MakeLDIF</outputDirectory>
+ <includes>
+ <include>*</include>
+ </includes>
+ </fileSet>
+
+ <!-- Creates template/ children directories -->
+ <fileSet>
+ <directory>.</directory>
+ <outputDirectory>template/bak</outputDirectory>
+ <excludes>
+ <exclude>*/**</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>.</directory>
+ <outputDirectory>template/changelogDb</outputDirectory>
+ <excludes>
+ <exclude>*/**</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>.</directory>
+ <outputDirectory>template/classes</outputDirectory>
+ <excludes>
+ <exclude>*/**</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>.</directory>
+ <outputDirectory>template/db</outputDirectory>
+ <excludes>
+ <exclude>*/**</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>.</directory>
+ <outputDirectory>template/import-tmp</outputDirectory>
+ <excludes>
+ <exclude>*/**</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>.</directory>
+ <outputDirectory>template/ldif</outputDirectory>
+ <excludes>
+ <exclude>*/**</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>.</directory>
+ <outputDirectory>template/locks</outputDirectory>
+ <excludes>
+ <exclude>*/**</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>.</directory>
+ <outputDirectory>template/logs</outputDirectory>
+ <excludes>
+ <exclude>*/**</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>${jars.dir}</directory>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>${shortProductName}_*.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${jars.dir}</directory>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>bootstrap*.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>.</directory>
+ <outputDirectory>lib/extensions</outputDirectory>
+ <excludes>
+ <exclude>*/**</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+ <files>
+ <!-- Adds logo png to root directory -->
+ <file>
+ <source>${basedir}/resource/images/opendj_logo.png</source>
+ <outputDirectory></outputDirectory>
+ </file>
+ <!-- Main jar (OpenDJ) -->
+ <file>
+ <source>${jars.dir}/${shortProductName}.jar</source>
+ <outputDirectory>lib</outputDirectory>
+ </file>
+ <!-- quicksetup jar -->
+ <file>
+ <source>${jars.dir}/quicksetup.jar</source>
+ <outputDirectory>lib</outputDirectory>
+ </file>
+ <!-- Adds buildinfo to configuration template/config -->
+ <file>
+ <source>${project.build.outputDirectory}/META-INF/product/buildinfo</source>
+ <outputDirectory>template/config</outputDirectory>
+ </file>
+ <!-- Adds base schema that may be used during the upgrade process -->
+ <file>
+ <source>${project.build.directory}/upgrade/schema.ldif.${buildRevision}</source>
+ <outputDirectory>template/config/upgrade</outputDirectory>
+ </file>
+
+ <!-- Adds example-plugin.zip to root directory -->
+ <file>
+ <source>${project.build.directory}/example-plugin.zip</source>
+ <outputDirectory></outputDirectory>
+ </file>
+ </files>
+</component>
diff --git a/opendj-sdk/opendj3-server-dev/src/main/assembly/opendj-snmp-archive-assembly.xml b/opendj-sdk/opendj3-server-dev/src/main/assembly/opendj-snmp-archive-assembly.xml
new file mode 100644
index 0000000..86b64f5
--- /dev/null
+++ b/opendj-sdk/opendj3-server-dev/src/main/assembly/opendj-snmp-archive-assembly.xml
@@ -0,0 +1,56 @@
+<!--
+ ! CDDL HEADER START
+ !
+ ! The contents of this file are subject to the terms of the
+ ! Common Development and Distribution License, Version 1.0 only
+ ! (the "License"). You may not use this file except in compliance
+ ! with the License.
+ !
+ ! You can obtain a copy of the license at
+ ! trunk/opendj3/legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
+ ! See the License for the specific language governing permissions
+ ! and limitations under the License.
+ !
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at
+ ! trunk/opendj3/legal-notices/CDDLv1_0.txt. If applicable,
+ ! add the following below this CDDL HEADER, with the fields enclosed
+ ! by brackets "[]" replaced with your own identifying information:
+ ! Portions Copyright [yyyy] [name of copyright owner]
+ !
+ ! CDDL HEADER END
+ !
+ ! Copyright 2015 ForgeRock AS.
+ !
+-->
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+ <id>opendj-snmp-zip-generation</id>
+ <!-- Add General OpenDJ final archive content -->
+ <componentDescriptors>
+ <componentDescriptor>src/main/assembly/opendj-archive-component.xml</componentDescriptor>
+ </componentDescriptors>
+
+ <!-- Assembly descriptor SNMP complement for OpenDJ archive -->
+ <fileSets>
+ <!-- Adds src/snmp/resource/security folder -->
+ <fileSet>
+ <directory>${basedir}/src/snmp/resource/security</directory>
+ <outputDirectory>template/config/snmp/security</outputDirectory>
+ </fileSet>
+ </fileSets>
+ <files>
+ <!-- Adds generated mib rfc 2605 file -->
+ <file>
+ <source>${snmp.mib.dir}/rfc2605.txt</source>
+ <outputDirectory>snmp/mib</outputDirectory>
+ </file>
+ <!-- Adds generated snmp jar -->
+ <file>
+ <source>${jars.dir}/snmp-mib2605.jar</source>
+ <outputDirectory>lib/extensions</outputDirectory>
+ </file>
+ </files>
+</assembly>
\ No newline at end of file
diff --git a/opendj-sdk/opendj3-server-dev/src/main/resources/META-INF/opendj.properties b/opendj-sdk/opendj3-server-dev/src/main/resources/META-INF/opendj.properties
new file mode 100644
index 0000000..bb10d44
--- /dev/null
+++ b/opendj-sdk/opendj3-server-dev/src/main/resources/META-INF/opendj.properties
@@ -0,0 +1,67 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2015 ForgeRock AS
+
+# This file contains product information. It was dynamically generated
+# as part of the build process and should not be edited directly.
+
+# TODO: this file is not yet used. It is intended to replace class
+# src/main/resources/java-stubs/org/opends/server/util/DynamicConstants.java
+# with a new class that will loads this properties file
+
+# Product name.
+product.name=${project.name}
+product.name.short=${shortProductName}
+product.release.date=${softwareReleaseDate}
+product.publication.date=${publicationDate}
+
+# Version.
+version=${project.version}
+version.compact=${shortProductName}-${project.version}
+version.major=${parsedVersion.majorVersion}
+version.minor=${parsedVersion.minorVersion}
+version.point=${parsedVersion.incrementalVersion}
+version.qualifier=${parsedVersion.qualifier}
+version.build=${parsedVersion.buildNumber}
+
+# Additional build information.
+build.id=${buildDateTime}
+build.user=${user.name}
+build.java.version=${java.version}
+build.java.vendor=${java.vendor}
+build.jvm.version=${java.vm.version}
+build.jvm.vendor=${java.vm.vendor}
+build.os=${os.name} ${os.version} ${os.arch}
+build.isdebug=${isDebugBuild}
+
+# Patch bug fix IDs for this build.
+patch.fix.ids=${patchFixIds}
+
+# Source version.
+scm.url=${scm.url}
+scm.revision=${buildRevision}
+
+# Documentation.
+doc.homepage.url=${docHomepageUrl}
+doc.wiki.url=${docWikiUrl}
+doc.guide.ref.url=${docGuideRefUrl}
+doc.guide.admin.url=${docGuideAdminUrl}
diff --git a/opendj-sdk/opendj3-server-dev/src/main/resources/META-INF/product/buildinfo b/opendj-sdk/opendj3-server-dev/src/main/resources/META-INF/product/buildinfo
new file mode 100644
index 0000000..780ba97
--- /dev/null
+++ b/opendj-sdk/opendj3-server-dev/src/main/resources/META-INF/product/buildinfo
@@ -0,0 +1 @@
+${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.${buildRevision}
\ No newline at end of file
diff --git a/opendj-sdk/opendj3-server-dev/src/main/resources/bootstrap/manifest-bootstrap b/opendj-sdk/opendj3-server-dev/src/main/resources/bootstrap/manifest-bootstrap
new file mode 100644
index 0000000..5bac7b2
--- /dev/null
+++ b/opendj-sdk/opendj3-server-dev/src/main/resources/bootstrap/manifest-bootstrap
@@ -0,0 +1,6 @@
+Manifest-Version: 1.0
+Archiver-Version: Plexus Archiver
+Created-By: Apache Maven ${maven.version}
+Built-By: ${user.name}
+Build-Jdk: ${java.version}
+${classpath.bootstrap}
diff --git a/opendj-sdk/opendj3-server-dev/src/main/resources/bootstrap/manifest-bootstrap-client b/opendj-sdk/opendj3-server-dev/src/main/resources/bootstrap/manifest-bootstrap-client
new file mode 100644
index 0000000..fa77b70
--- /dev/null
+++ b/opendj-sdk/opendj3-server-dev/src/main/resources/bootstrap/manifest-bootstrap-client
@@ -0,0 +1,6 @@
+Manifest-Version: 1.0
+Archiver-Version: Plexus Archiver
+Created-By: Apache Maven ${maven.version}
+Built-By: ${user.name}
+Build-Jdk: ${java.version}
+${classpath.bootstrap-client}
diff --git a/opendj-sdk/opendj3-server-dev/resource/DynamicConstants.java.stubs b/opendj-sdk/opendj3-server-dev/src/main/resources/java-stubs/org/opends/server/util/DynamicConstants.java
similarity index 87%
rename from opendj-sdk/opendj3-server-dev/resource/DynamicConstants.java.stubs
rename to opendj-sdk/opendj3-server-dev/src/main/resources/java-stubs/org/opends/server/util/DynamicConstants.java
index 7d23e07..c810784 100644
--- a/opendj-sdk/opendj3-server-dev/resource/DynamicConstants.java.stubs
+++ b/opendj-sdk/opendj3-server-dev/src/main/resources/java-stubs/org/opends/server/util/DynamicConstants.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.util;
@@ -41,48 +41,48 @@
/**
* The official full product name for the Directory Server.
*/
- public static String PRODUCT_NAME = "${PRODUCT_NAME}";
+ public static String PRODUCT_NAME = "${project.name}";
/**
* The short product name for the Directory Server.
*/
- public static String SHORT_NAME = "${SHORT_NAME}";
+ public static String SHORT_NAME = "${shortProductName}";
/**
* The major version number for the Directory Server.
*/
- public static int MAJOR_VERSION = ${MAJOR_VERSION};
+ public static int MAJOR_VERSION = ${parsedVersion.majorVersion};
/**
* The minor version number for the Directory Server.
*/
- public static int MINOR_VERSION = ${MINOR_VERSION};
+ public static int MINOR_VERSION = ${parsedVersion.minorVersion};
/**
* The point version number for the Directory Server.
*/
- public static int POINT_VERSION = ${POINT_VERSION};
+ public static int POINT_VERSION = ${parsedVersion.incrementalVersion};
/**
* The official build number for the Directory Server.
*/
- public static int BUILD_NUMBER = ${BUILD_NUMBER};
+ public static int BUILD_NUMBER = ${parsedVersion.buildNumber};
/**
* The version qualifier string for the Directory Server.
*/
- public static String VERSION_QUALIFIER = "${VERSION_QUALIFIER}";
+ public static String VERSION_QUALIFIER = "${parsedVersion.qualifier}";
/**
* The set of bug IDs for fixes included in this build of the Directory
* Server.
*/
- public static String FIX_IDS = "${FIX_IDS}";
+ public static String FIX_IDS = "${patchFixIds}";
/**
* The build ID for the generated build of the Directory Server.
*/
- public static String BUILD_ID = "${timestamp}";
+ public static String BUILD_ID = "${buildDateTime}";
/**
* The username of the user that created this build.
@@ -107,7 +107,7 @@
/**
* The vendor for the JVM used to generate this build.
*/
- public static String BUILD_JVM_VENDOR = "${JVM_VENDOR}";
+ public static String BUILD_JVM_VENDOR = "${java.vm.vendor}";
/**
* The operating system on which this build was generated.
@@ -119,54 +119,51 @@
* include additional debugging facilities not available in standard release
* versions.
*/
- public static boolean DEBUG_BUILD = ${DEBUG_BUILD};
+ public static boolean DEBUG_BUILD = ${isDebugBuild};
/**
* The Subversion revision number on which this build is based.
*/
- public static long REVISION_NUMBER = ${REVISION_NUMBER};
+ public static long REVISION_NUMBER = ${buildRevision};
/**
* The Subversion url repository location on which this build is based.
*/
- public static String URL_REPOSITORY =
- "${URL_REPOSITORY}";
+ public static String URL_REPOSITORY = "${scm.url}";
/**
* The documentation home.
*/
public static String DOC_REFERENCE_HOME =
- "${DOC_REFERENCE_HOME}";
+ "${docHomepageUrl}";
/**
* The documentation url.
*/
public static String DOC_REFERENCE_WIKI =
- "${DOC_REFERENCE_WIKI}";
+ "${docWikiUrl}";
/**
* The documentation url.
*/
public static String DOC_QUICK_REFERENCE_GUIDE =
- "${DOC_QUICK_REFERENCE_GUIDE}";
+ "${docGuideRefUrl}";
/**
* The administration guide.
*/
public static String ADMINISTRATION_GUIDE_URL =
- "${ADMINISTRATION_GUIDE_URL}";
+ "${docGuideAdminUrl}";
/**
* A string representation of the version number.
*/
- public static String VERSION_NUMBER_STRING =
- "${VERSION_NUMBER_STRING}";
+ public static String VERSION_NUMBER_STRING = String.format("%s.%s.%s", MAJOR_VERSION, MINOR_VERSION, POINT_VERSION);
/**
* A string representation of the version number.
*/
- public static String OPENDJ_NUMBER_STRING =
- "${VERSION_NUMBER_STRING}";
+ public static String OPENDJ_NUMBER_STRING = VERSION_NUMBER_STRING;
/**
* A string representation of the release version.
diff --git a/opendj-sdk/opendj3-server-dev/ext/checkstyle/opendj.sourceheader b/opendj-sdk/opendj3-server-dev/src/main/resources/org/forgerock/checkstyle/opendj.sourceheader
similarity index 100%
rename from opendj-sdk/opendj3-server-dev/ext/checkstyle/opendj.sourceheader
rename to opendj-sdk/opendj3-server-dev/src/main/resources/org/forgerock/checkstyle/opendj.sourceheader
diff --git a/opendj-sdk/opendj3-server-dev/ext/checkstyle/opends-checkstyle.xml b/opendj-sdk/opendj3-server-dev/src/main/resources/org/forgerock/checkstyle/opends-checkstyle.xml
similarity index 87%
rename from opendj-sdk/opendj3-server-dev/ext/checkstyle/opends-checkstyle.xml
rename to opendj-sdk/opendj3-server-dev/src/main/resources/org/forgerock/checkstyle/opends-checkstyle.xml
index f73097d..6789045 100644
--- a/opendj-sdk/opendj3-server-dev/ext/checkstyle/opends-checkstyle.xml
+++ b/opendj-sdk/opendj3-server-dev/src/main/resources/org/forgerock/checkstyle/opends-checkstyle.xml
@@ -5,14 +5,25 @@
<module name="Checker">
- <module name="TreeWalker">
- <property name="cacheFile" value="${basedir}/.checkstyle-cache/opends-checkstyle.cache" />
-
<!-- Ensure that each source file starts with the appropriate header -->
<module name="RegexpHeader">
- <property name="headerFile" value="${basedir}/ext/checkstyle/opendj.sourceheader" />
+ <property name="headerFile" value="${basedir}/src/main/resources/org/forgerock/checkstyle/opendj.sourceheader" />
+ </module>
+
+ <!-- Ensure that no tab characters are used -->
+ <module name="FileTabCharacter">
+ <property name="eachLine" value="true"/>
</module>
+ <!-- Ensure that no line ends with whitespace -->
+ <module name="RegexpSingleline">
+ <!-- \s matches whitespace character, $ matches end of line. -->
+ <property name="format" value="\s+$"/>
+ <property name="message" value="Line ends with whitespace." />
+ </module>
+
+ <module name="TreeWalker">
+ <property name="cacheFile" value="${basedir}/.checkstyle-cache/opends-checkstyle.cache" />
<!-- Ensure that all classes and interfaces are documented -->
<module name="JavadocType">
@@ -49,18 +60,6 @@
<property name="max" value="120" />
</module>
-
- <!-- Ensure that no tab characters are used -->
- <module name="TabCharacter" />
-
-
- <!-- Ensure that no line ends with whitespace -->
- <module name="GenericIllegalRegexp">
- <property name="format" value="\s$" />
- <property name="message" value="Line ends with whitespace." />
- </module>
-
-
<!-- Check for string == rather than .equals checks -->
<module name="StringLiteralEquality" />
diff --git a/opendj-sdk/opendj3-server-dev/src/main/resources/org/forgerock/checkstyle/unit-test-suppressions.xml b/opendj-sdk/opendj3-server-dev/src/main/resources/org/forgerock/checkstyle/unit-test-suppressions.xml
new file mode 100644
index 0000000..c21b7f5
--- /dev/null
+++ b/opendj-sdk/opendj3-server-dev/src/main/resources/org/forgerock/checkstyle/unit-test-suppressions.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ The contents of this file are subject to the terms of the Common Development and
+ Distribution License (the License). You may not use this file except in compliance with the
+ License.
+
+ You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
+ specific language governing permission and limitations under the License.
+
+ When distributing Covered Software, include this CDDL Header Notice in each file and include
+ the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
+ Header, with the fields enclosed by brackets [] replaced by your own identifying
+ information: "Portions Copyrighted [year] [name of copyright owner]".
+
+ Copyright 2012-2015 ForgeRock AS. All rights reserved.
+-->
+<!DOCTYPE suppressions PUBLIC
+ "-//Puppy Crawl//DTD Suppressions 1.1//EN"
+ "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
+<suppressions>
+ <!--
+ This Checkstyle suppressions file contains suppressions for any checks
+ that we don't want to enforce against unit tests.
+
+ It is not possible to rely on same file provided by forgerock-build-tools because
+ 1) path of tests source files is different,
+ 2) lot of classes are violating others suppressions.
+ Once/if tests are moved under /src/test/java directory and additional suppressions
+ added at the end of the file can be removed due to code cleaning, then this file may
+ be deleted and replaced by equivalent in forgerock-build-tools.
+
+ -->
+
+ <!-- check-src-default.xml -->
+ <suppress checks="JavadocPackage" files="/tests/unit-tests-testng/src/server" />
+ <suppress checks="JavadocType" files="/tests/unit-tests-testng/src/server" />
+ <suppress checks="JavadocMethod" files="/tests/unit-tests-testng/src/server" />
+ <suppress checks="JavadocVariable" files="/tests/unit-tests-testng/src/server" />
+ <suppress checks="JavadocStyle" files="/tests/unit-tests-testng/src/server" />
+<!--
+ <suppress checks="ModifierOrder" files="/tests/unit-tests-testng/src/server" />
+ <suppress checks="RedundantModifier" files="/tests/unit-tests-testng/src/server" />
+-->
+ <suppress checks="RedundantThrows" files="/tests/unit-tests-testng/src/server" />
+ <suppress checks="FinalClass" files="/tests/unit-tests-testng/src/server" />
+ <suppress checks="HideUtilityClassConstructor" files="/tests/unit-tests-testng/src/server" />
+ <suppress checks="InterfaceIsType" files="/tests/unit-tests-testng/src/server" />
+ <suppress checks="VisibilityModifier" files="/tests/unit-tests-testng/src/server" />
+
+ <suppress checks="Translation" files="/tests/unit-tests-testng/src/server" />
+ <suppress checks="FileLength" files="/tests/unit-tests-testng/src/server" />
+ <suppress checks="MethodLength" files="/tests/unit-tests-testng/src/server" />
+ <suppress checks="ParameterNumber" files="/tests/unit-tests-testng/src/server" />
+ <suppress checks="MissingSwitchDefault" files="/tests/unit-tests-testng/src/server" />
+ <suppress checks="DesignForExtension" files="/tests/unit-tests-testng/src/server" />
+ <suppress checks="TodoComment" files="/tests/unit-tests-testng/src/server" />
+
+ <!-- Additional suppressions (compared to forgerock-build-tools equivalent file) -->
+ <suppress checks="LineLength" files="/tests/unit-tests-testng/src/server" />
+ <suppress checks="RegexpSingleline" files="/tests/unit-tests-testng/src/server" />
+ <suppress checks="FileTabCharacter" files="/tests/unit-tests-testng/src/server" />
+ <suppress checks="LineLength" files="/tests/unit-tests-testng/src/server" />
+ <suppress checks="RedundantImport" files="/tests/unit-tests-testng/src/server" />
+ <suppress checks="UnusedImports" files="/tests/unit-tests-testng/src/server" />
+ <suppress checks="EmptyStatement" files="/tests/unit-tests-testng/src/server" />
+ <suppress checks="EqualsHashCode" files="/tests/unit-tests-testng/src/server" />
+
+</suppressions>
\ No newline at end of file
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/access_control.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/access_control.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/access_control.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/access_control.properties
index 45c3772..62a626f 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/access_control.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/access_control.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=ACCESS_CONTROL
+#global.category=ACCESS_CONTROL
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_ca_ES.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/access_control_ca_ES.properties
similarity index 100%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_ca_ES.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/access_control_ca_ES.properties
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_de.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/access_control_de.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_de.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/access_control_de.properties
index 7718afc..23f5edb 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_de.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/access_control_de.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=ACCESS_CONTROL
+#global.category=ACCESS_CONTROL
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_es.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/access_control_es.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_es.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/access_control_es.properties
index fb8255a..6db2410 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_es.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/access_control_es.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=ACCESS_CONTROL
+#global.category=ACCESS_CONTROL
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_fr.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/access_control_fr.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_fr.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/access_control_fr.properties
index abbe962..4a31f4a 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_fr.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/access_control_fr.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=ACCESS_CONTROL
+#global.category=ACCESS_CONTROL
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_ja.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/access_control_ja.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_ja.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/access_control_ja.properties
index 82935b7..e1473f8 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_ja.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/access_control_ja.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=ACCESS_CONTROL
+#global.category=ACCESS_CONTROL
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_ko.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/access_control_ko.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_ko.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/access_control_ko.properties
index 9f0bddf..d7b2ed4 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_ko.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/access_control_ko.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=ACCESS_CONTROL
+#global.category=ACCESS_CONTROL
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_pl.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/access_control_pl.properties
similarity index 100%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_pl.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/access_control_pl.properties
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_zh_CN.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/access_control_zh_CN.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_zh_CN.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/access_control_zh_CN.properties
index 85e74d7..ad70e40 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_zh_CN.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/access_control_zh_CN.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=ACCESS_CONTROL
+#global.category=ACCESS_CONTROL
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_zh_TW.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/access_control_zh_TW.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_zh_TW.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/access_control_zh_TW.properties
index 09da2ad..fd481a9 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/access_control_zh_TW.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/access_control_zh_TW.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=ACCESS_CONTROL
+#global.category=ACCESS_CONTROL
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/admin.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin.properties
index eefa92a..4afaa5e 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=ADMIN
+#global.category=ADMIN
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_ca_ES.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_ca_ES.properties
similarity index 100%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/admin_ca_ES.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_ca_ES.properties
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_de.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_de.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/admin_de.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_de.properties
index 82dadde..14f4db3 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_de.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_de.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=ADMIN
+#global.category=ADMIN
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_es.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_es.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/admin_es.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_es.properties
index 7be6ed0..f14899a 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_es.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_es.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=ADMIN
+#global.category=ADMIN
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_fr.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_fr.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/admin_fr.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_fr.properties
index f9127a8..47f2cf0 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_fr.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_fr.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=ADMIN
+#global.category=ADMIN
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_ja.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_ja.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/admin_ja.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_ja.properties
index 839bdee..3988873 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_ja.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_ja.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=ADMIN
+#global.category=ADMIN
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_ko.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_ko.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/admin_ko.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_ko.properties
index fae57b2..8fa261f 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_ko.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_ko.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=ADMIN
+#global.category=ADMIN
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_pl.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_pl.properties
similarity index 100%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/admin_pl.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_pl.properties
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_tool.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_tool.properties
index ffc98f8..399d3d6 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_tool.properties
@@ -29,8 +29,8 @@
# Global directives
# Do not translate
#
-global.category=ADMIN_TOOL
-global.ordinal=-1
+#global.category=ADMIN_TOOL
+##global.ordinal=-1
#
# Format string definitions
@@ -1415,16 +1415,16 @@
64 format.
ERR_CTRL_PANEL_ERROR_READING_FILE=An error occurred reading the contents \
of the file. Details: %s
-ERR_CTRL_PANEL_ERROR_DECODING_BASE_64=An error occurred decoding the \
+ERR_CTRL_PANEL_ERROR_DECODING_BASE64=An error occurred decoding the \
provided base 64 string. Details: %s
INFO_CTRL_PANEL_EDIT_BINARY_ATTRIBUTE_TITLE=Edit binary attribute
INFO_CTRL_PANEL_USE_CONTENTS_OF_FILE=Use contents of file:
-INFO_CTRL_PANEL_USE_CONTENTS_IN_BASE_64=Specify binary contents in base 64 \
+INFO_CTRL_PANEL_USE_CONTENTS_IN_BASE64=Specify binary contents in base 64 \
format:
INFO_CTRL_PANEL_REFRESH_BUTTON_LABEL=Refresh
INFO_CTRL_PANEL_IMAGE_PREVIEW_LABEL=Image Preview:
-INFO_CTRL_PANEL_SPECIFY_CONTENTS_IN_BASE_64=- Specify the value in Base 64 -
+INFO_CTRL_PANEL_SPECIFY_CONTENTS_IN_BASE64=- Specify the value in Base 64 -
INFO_CTRL_PANEL_IMAGE_OF_ATTRIBUTE_LABEL=Image of Attribute
INFO_CTRL_PANEL_PREVIEW_NOT_AVAILABLE_LABEL=Preview not available.
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_ca_ES.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_tool_ca_ES.properties
similarity index 100%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_ca_ES.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_tool_ca_ES.properties
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_de.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_tool_de.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_de.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_tool_de.properties
index 72d4bbb..c572a4c 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_de.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_tool_de.properties
@@ -28,8 +28,8 @@
# Global directives
# Do not translate
#
-global.category=ADMIN_TOOL
-global.ordinal=-1
+#global.category=ADMIN_TOOL
+##global.ordinal=-1
#
# Format string definitions
@@ -819,14 +819,14 @@
ERR_CTRL_PANEL_CANNOT_READ_FILE=Datei '%s' kann nicht gelesen werden. Pr\u00fcfen Sie, ob Sie \u00fcber Leseberechtigungen an der Datei verf\u00fcgen.
ERR_CTRL_PANEL_VALUE_IN_BASE_64_REQUIRED=Sie m\u00fcssen einen Wert im Base 64-Format angeben.
ERR_CTRL_PANEL_ERROR_READING_FILE=Beim Lesen des Dateiinhalts ist ein Fehler aufgetreten. Details: %s
-ERR_CTRL_PANEL_ERROR_DECODING_BASE_64=Beim Dekodieren der angegebenen Base 64-Zeichenfolge ist ein Fehler aufgetreten. Details: %s
+ERR_CTRL_PANEL_ERROR_DECODING_BASE64=Beim Dekodieren der angegebenen Base 64-Zeichenfolge ist ein Fehler aufgetreten. Details: %s
INFO_CTRL_PANEL_EDIT_BINARY_ATTRIBUTE_TITLE=Bin\u00e4rattribut bearbeiten
INFO_CTRL_PANEL_USE_CONTENTS_OF_FILE=Inhalt der folgenden Datei verwenden:
-INFO_CTRL_PANEL_USE_CONTENTS_IN_BASE_64=Bin\u00e4r-Inhalt in Base 64-Format angeben:
+INFO_CTRL_PANEL_USE_CONTENTS_IN_BASE64=Bin\u00e4r-Inhalt in Base 64-Format angeben:
INFO_CTRL_PANEL_REFRESH_BUTTON_LABEL=Aktualisieren
INFO_CTRL_PANEL_IMAGE_PREVIEW_LABEL=Bildvoranschau
-INFO_CTRL_PANEL_SPECIFY_CONTENTS_IN_BASE_64=- Den Wert in Base 64 angeben -
+INFO_CTRL_PANEL_SPECIFY_CONTENTS_IN_BASE64=- Den Wert in Base 64 angeben -
INFO_CTRL_PANEL_IMAGE_OF_ATTRIBUTE_LABEL=Bild des Attributs
INFO_CTRL_PANEL_PREVIEW_NOT_AVAILABLE_LABEL=Voranschau nicht verf\u00fcgbar.
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_es.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_tool_es.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_es.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_tool_es.properties
index 5fe7374..51fa572 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_es.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_tool_es.properties
@@ -28,8 +28,8 @@
# Global directives
# Do not translate
#
-global.category=ADMIN_TOOL
-global.ordinal=-1
+#global.category=ADMIN_TOOL
+##global.ordinal=-1
#
# Format string definitions
@@ -819,14 +819,14 @@
ERR_CTRL_PANEL_CANNOT_READ_FILE=No se puede leer el archivo '%s'. Compruebe que dispone de derechos de lectura.
ERR_CTRL_PANEL_VALUE_IN_BASE_64_REQUIRED=Debe proporcionar un valor en formato base 64.
ERR_CTRL_PANEL_ERROR_READING_FILE=Se produjo un error al leer el contenido del archivo. Detalles: %s
-ERR_CTRL_PANEL_ERROR_DECODING_BASE_64=Se produjo un error al descodificar la cadena en base64 proporcionada. Detalles: %s
+ERR_CTRL_PANEL_ERROR_DECODING_BASE64=Se produjo un error al descodificar la cadena en base64 proporcionada. Detalles: %s
INFO_CTRL_PANEL_EDIT_BINARY_ATTRIBUTE_TITLE=Editar atributo binario
INFO_CTRL_PANEL_USE_CONTENTS_OF_FILE=Usar contenido del archivo:
-INFO_CTRL_PANEL_USE_CONTENTS_IN_BASE_64=Especificar el contenido binario en formato base64:
+INFO_CTRL_PANEL_USE_CONTENTS_IN_BASE64=Especificar el contenido binario en formato base64:
INFO_CTRL_PANEL_REFRESH_BUTTON_LABEL=Actualizar
INFO_CTRL_PANEL_IMAGE_PREVIEW_LABEL=Vista previa de la imagen:
-INFO_CTRL_PANEL_SPECIFY_CONTENTS_IN_BASE_64=- Especifique el valor en base64 -
+INFO_CTRL_PANEL_SPECIFY_CONTENTS_IN_BASE64=- Especifique el valor en base64 -
INFO_CTRL_PANEL_IMAGE_OF_ATTRIBUTE_LABEL=Imagen de atributo
INFO_CTRL_PANEL_PREVIEW_NOT_AVAILABLE_LABEL=La vista previa no est\u00e1 disponible.
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_fr.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_tool_fr.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_fr.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_tool_fr.properties
index adf8f66..9e06a29 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_fr.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_tool_fr.properties
@@ -28,8 +28,8 @@
# Global directives
# Do not translate
#
-global.category=ADMIN_TOOL
-global.ordinal=-1
+#global.category=ADMIN_TOOL
+##global.ordinal=-1
#
# Format string definitions
@@ -819,14 +819,14 @@
ERR_CTRL_PANEL_CANNOT_READ_FILE=Ne peut lire le fichier '%s'. V\u00e9rifiez que vous avez des droits en lecture le concernant.
ERR_CTRL_PANEL_VALUE_IN_BASE_64_REQUIRED=Vous devez fournir une valeur en format de base 64.
ERR_CTRL_PANEL_ERROR_READING_FILE=Une erreur s'est produite lors de la lecture du contenu du fichier. D\u00e9tails\u00a0: %s
-ERR_CTRL_PANEL_ERROR_DECODING_BASE_64=Une erreur s'est produite lors du d\u00e9codage de la cha\u00eene de base 64. D\u00e9tails\u00a0: %s
+ERR_CTRL_PANEL_ERROR_DECODING_BASE64=Une erreur s'est produite lors du d\u00e9codage de la cha\u00eene de base 64. D\u00e9tails\u00a0: %s
INFO_CTRL_PANEL_EDIT_BINARY_ATTRIBUTE_TITLE=\u00c9diter un attribut binaire
INFO_CTRL_PANEL_USE_CONTENTS_OF_FILE=Utiliser le contenu du fichier\u00a0:
-INFO_CTRL_PANEL_USE_CONTENTS_IN_BASE_64=Indiquez le contenu bianire en format de base 64\u00a0:
+INFO_CTRL_PANEL_USE_CONTENTS_IN_BASE64=Indiquez le contenu bianire en format de base 64\u00a0:
INFO_CTRL_PANEL_REFRESH_BUTTON_LABEL=Actualiser
INFO_CTRL_PANEL_IMAGE_PREVIEW_LABEL=Aper\u00e7u de l'image\u00a0:
-INFO_CTRL_PANEL_SPECIFY_CONTENTS_IN_BASE_64=- Indiquez la valeur en base 64 -
+INFO_CTRL_PANEL_SPECIFY_CONTENTS_IN_BASE64=- Indiquez la valeur en base 64 -
INFO_CTRL_PANEL_IMAGE_OF_ATTRIBUTE_LABEL=Image de l'attribut
INFO_CTRL_PANEL_PREVIEW_NOT_AVAILABLE_LABEL=Aper\u00e7u indisponible.
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_ja.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_tool_ja.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_ja.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_tool_ja.properties
index 0cfd4bb..a851ddf 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_ja.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_tool_ja.properties
@@ -28,8 +28,8 @@
# Global directives
# Do not translate
#
-global.category=ADMIN_TOOL
-global.ordinal=-1
+#global.category=ADMIN_TOOL
+##global.ordinal=-1
#
# Format string definitions
@@ -816,14 +816,14 @@
ERR_CTRL_PANEL_CANNOT_READ_FILE=\u30d5\u30a1\u30a4\u30eb '%s' \u3092\u8aad\u307f\u53d6\u308c\u307e\u305b\u3093\u3002\u305d\u306e\u30d5\u30a1\u30a4\u30eb\u306b\u5bfe\u3059\u308b\u8aad\u307f\u53d6\u308a\u6a29\u9650\u304c\u3042\u308b\u3053\u3068\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
ERR_CTRL_PANEL_VALUE_IN_BASE_64_REQUIRED=\u5024\u3092 Base 64 \u5f62\u5f0f\u3067\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
ERR_CTRL_PANEL_ERROR_READING_FILE=\u30d5\u30a1\u30a4\u30eb\u306e\u5185\u5bb9\u3092\u8aad\u307f\u53d6\u308a\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u8a73\u7d30: %s
-ERR_CTRL_PANEL_ERROR_DECODING_BASE_64=\u6307\u5b9a\u3055\u308c\u305f Base 64 \u6587\u5b57\u5217\u306e\u5fa9\u53f7\u5316\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u8a73\u7d30: %s
+ERR_CTRL_PANEL_ERROR_DECODING_BASE64=\u6307\u5b9a\u3055\u308c\u305f Base 64 \u6587\u5b57\u5217\u306e\u5fa9\u53f7\u5316\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u8a73\u7d30: %s
INFO_CTRL_PANEL_EDIT_BINARY_ATTRIBUTE_TITLE=\u30d0\u30a4\u30ca\u30ea\u5c5e\u6027\u306e\u7de8\u96c6
INFO_CTRL_PANEL_USE_CONTENTS_OF_FILE=\u30d5\u30a1\u30a4\u30eb\u306e\u5185\u5bb9\u3092\u4f7f\u7528:
-INFO_CTRL_PANEL_USE_CONTENTS_IN_BASE_64=\u30d0\u30a4\u30ca\u30ea\u30b3\u30f3\u30c6\u30f3\u30c4\u3092 Base 64 \u5f62\u5f0f\u3067\u6307\u5b9a\u3057\u307e\u3059\u3002
+INFO_CTRL_PANEL_USE_CONTENTS_IN_BASE64=\u30d0\u30a4\u30ca\u30ea\u30b3\u30f3\u30c6\u30f3\u30c4\u3092 Base 64 \u5f62\u5f0f\u3067\u6307\u5b9a\u3057\u307e\u3059\u3002
INFO_CTRL_PANEL_REFRESH_BUTTON_LABEL=\u66f4\u65b0
INFO_CTRL_PANEL_IMAGE_PREVIEW_LABEL=\u30a4\u30e1\u30fc\u30b8\u306e\u30d7\u30ec\u30d3\u30e5\u30fc:
-INFO_CTRL_PANEL_SPECIFY_CONTENTS_IN_BASE_64=- Base 64 \u3067\u5024\u3092\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044 -
+INFO_CTRL_PANEL_SPECIFY_CONTENTS_IN_BASE64=- Base 64 \u3067\u5024\u3092\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044 -
INFO_CTRL_PANEL_IMAGE_OF_ATTRIBUTE_LABEL=\u5c5e\u6027\u306e\u30a4\u30e1\u30fc\u30b8
INFO_CTRL_PANEL_PREVIEW_NOT_AVAILABLE_LABEL=\u30d7\u30ec\u30d3\u30e5\u30fc\u306f\u5229\u7528\u3067\u304d\u307e\u305b\u3093\u3002
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_ko.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_tool_ko.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_ko.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_tool_ko.properties
index 7b82f0f..5c6ec75 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_ko.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_tool_ko.properties
@@ -28,8 +28,8 @@
# Global directives
# Do not translate
#
-global.category=ADMIN_TOOL
-global.ordinal=-1
+#global.category=ADMIN_TOOL
+##global.ordinal=-1
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_pl.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_tool_pl.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_pl.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_tool_pl.properties
index 7398305..e6baf5f 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_pl.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_tool_pl.properties
@@ -28,8 +28,8 @@
# Global directives
# Do not translate
#
-global.category=ADMIN_TOOL
-global.ordinal=-1
+#global.category=ADMIN_TOOL
+##global.ordinal=-1
#
# Format string definitions
@@ -111,7 +111,7 @@
INFO_NOT_AVAILABLE_SERVER_DOWN_TOOLTIP=<html>Informacja dost\u0119pna tylko gdy serwer dzia\u0142a i ty jeste\u015b zautentykowany<br> jako u\u017cytkownik administruj\u0105cy.
INFO_FINISH_BUTTON_UNINSTALL_TOOLTIP=Zako\u0144cz deinstalacj\u0119
ERR_LAUNCHING_PRE_EXTERNAL_INITIALIZATION=B\u0142\u0105d podczas uruchamiania operacji.
-ERR_CTRL_PANEL_ERROR_DECODING_BASE_64=An error occurred decoding the provided base 64 string. Szczeg\u00f3\u0142y: %s
+ERR_CTRL_PANEL_ERROR_DECODING_BASE64=An error occurred decoding the provided base 64 string. Szczeg\u00f3\u0142y: %s
INFO_REPLICATION_STATUS_MENU_PROMPT=Wy\u015bwietl Status Powielania
INFO_CTRL_PANEL_ERROR_CONNECTING_TO_LOCAL=The following errors occurred connecting to the local server:<br>%s<br>If you continue without providing authentication no monitoring information will be displayed.<br><br>Czy chcesz kontynuowa\u0107?
INFO_CTRL_PANEL_VLV_INDEXES_HEADER_REQUIRES_REBUILD=Wymaga przebudowa
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_zh_CN.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_tool_zh_CN.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_zh_CN.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_tool_zh_CN.properties
index 1e4ad29..849555c 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_zh_CN.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_tool_zh_CN.properties
@@ -28,8 +28,8 @@
# Global directives
# Do not translate
#
-global.category=ADMIN_TOOL
-global.ordinal=-1
+#global.category=ADMIN_TOOL
+##global.ordinal=-1
#
# Format string definitions
@@ -819,14 +819,14 @@
ERR_CTRL_PANEL_CANNOT_READ_FILE=\u65e0\u6cd5\u8bfb\u53d6\u6587\u4ef6 '%s'\u3002\u68c0\u67e5\u60a8\u662f\u5426\u5177\u6709\u8bfb\u53d6\u8be5\u6587\u4ef6\u7684\u6743\u9650\u3002
ERR_CTRL_PANEL_VALUE_IN_BASE_64_REQUIRED=\u60a8\u63d0\u4f9b\u7684\u503c\u5fc5\u987b\u91c7\u7528 Base 64 \u683c\u5f0f\u3002
ERR_CTRL_PANEL_ERROR_READING_FILE=\u8bfb\u53d6\u6587\u4ef6\u5185\u5bb9\u65f6\u51fa\u73b0\u9519\u8bef\u3002\u8be6\u7ec6\u4fe1\u606f: %s
-ERR_CTRL_PANEL_ERROR_DECODING_BASE_64=\u5bf9\u63d0\u4f9b\u7684 Base 64 \u5b57\u7b26\u4e32\u8fdb\u884c\u89e3\u7801\u65f6\u51fa\u73b0\u9519\u8bef\u3002\u8be6\u7ec6\u4fe1\u606f: %s
+ERR_CTRL_PANEL_ERROR_DECODING_BASE64=\u5bf9\u63d0\u4f9b\u7684 Base 64 \u5b57\u7b26\u4e32\u8fdb\u884c\u89e3\u7801\u65f6\u51fa\u73b0\u9519\u8bef\u3002\u8be6\u7ec6\u4fe1\u606f: %s
INFO_CTRL_PANEL_EDIT_BINARY_ATTRIBUTE_TITLE=\u7f16\u8f91\u4e8c\u8fdb\u5236\u5c5e\u6027
INFO_CTRL_PANEL_USE_CONTENTS_OF_FILE=\u4f7f\u7528\u6587\u4ef6\u5185\u5bb9:
-INFO_CTRL_PANEL_USE_CONTENTS_IN_BASE_64=\u4ee5 Base 64 \u683c\u5f0f\u6307\u5b9a\u4e8c\u8fdb\u5236\u5185\u5bb9:
+INFO_CTRL_PANEL_USE_CONTENTS_IN_BASE64=\u4ee5 Base 64 \u683c\u5f0f\u6307\u5b9a\u4e8c\u8fdb\u5236\u5185\u5bb9:
INFO_CTRL_PANEL_REFRESH_BUTTON_LABEL=\u5237\u65b0
INFO_CTRL_PANEL_IMAGE_PREVIEW_LABEL=\u56fe\u50cf\u9884\u89c8:
-INFO_CTRL_PANEL_SPECIFY_CONTENTS_IN_BASE_64=- \u4ee5 Base 64 \u6307\u5b9a\u503c -
+INFO_CTRL_PANEL_SPECIFY_CONTENTS_IN_BASE64=- \u4ee5 Base 64 \u6307\u5b9a\u503c -
INFO_CTRL_PANEL_IMAGE_OF_ATTRIBUTE_LABEL=\u5c5e\u6027\u7684\u56fe\u50cf
INFO_CTRL_PANEL_PREVIEW_NOT_AVAILABLE_LABEL=\u9884\u89c8\u4e0d\u53ef\u7528\u3002
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_zh_TW.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_tool_zh_TW.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_zh_TW.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_tool_zh_TW.properties
index d518a04..edee510 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool_zh_TW.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_tool_zh_TW.properties
@@ -28,8 +28,8 @@
# Global directives
# Do not translate
#
-global.category=ADMIN_TOOL
-global.ordinal=-1
+#global.category=ADMIN_TOOL
+##global.ordinal=-1
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_zh_CN.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_zh_CN.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/admin_zh_CN.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_zh_CN.properties
index 56de54c..55df21e 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_zh_CN.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_zh_CN.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=ADMIN
+#global.category=ADMIN
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_zh_TW.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_zh_TW.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/admin_zh_TW.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_zh_TW.properties
index ae87ded..d602ff7 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/admin_zh_TW.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/admin_zh_TW.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=ADMIN
+#global.category=ADMIN
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/backend.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/backend.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/backend.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/backend.properties
index 9920698..90f7ad6 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/backend.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/backend.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=BACKEND
+#global.category=BACKEND
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/backend_ca_ES.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/backend_ca_ES.properties
similarity index 100%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/backend_ca_ES.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/backend_ca_ES.properties
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/backend_de.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/backend_de.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/backend_de.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/backend_de.properties
index a7493b5..eb7ecc7 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/backend_de.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/backend_de.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=BACKEND
+#global.category=BACKEND
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/backend_es.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/backend_es.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/backend_es.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/backend_es.properties
index b0c0965..3827e7e 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/backend_es.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/backend_es.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=BACKEND
+#global.category=BACKEND
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/backend_fr.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/backend_fr.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/backend_fr.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/backend_fr.properties
index fc0f27f..7a6439f 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/backend_fr.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/backend_fr.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=BACKEND
+#global.category=BACKEND
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/backend_ja.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/backend_ja.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/backend_ja.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/backend_ja.properties
index 9323af6..37c195e 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/backend_ja.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/backend_ja.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=BACKEND
+#global.category=BACKEND
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/backend_ko.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/backend_ko.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/backend_ko.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/backend_ko.properties
index b0b013d..810429d 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/backend_ko.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/backend_ko.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=BACKEND
+#global.category=BACKEND
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/backend_pl.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/backend_pl.properties
similarity index 100%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/backend_pl.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/backend_pl.properties
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/backend_zh_CN.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/backend_zh_CN.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/backend_zh_CN.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/backend_zh_CN.properties
index 1a98087..5b3bc74 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/backend_zh_CN.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/backend_zh_CN.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=BACKEND
+#global.category=BACKEND
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/backend_zh_TW.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/backend_zh_TW.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/backend_zh_TW.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/backend_zh_TW.properties
index e29e0b6..b1f0ea3 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/backend_zh_TW.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/backend_zh_TW.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=BACKEND
+#global.category=BACKEND
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/config.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/config.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/config.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/config.properties
index b5bea5a..0d138a9 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/config.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/config.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=CONFIG
+#global.category=CONFIG
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/config_de.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/config_de.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/config_de.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/config_de.properties
index 8598599..7d44670 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/config_de.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/config_de.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=CONFIG
+#global.category=CONFIG
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/config_es.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/config_es.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/config_es.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/config_es.properties
index 55e31f2..e9e913c 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/config_es.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/config_es.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=CONFIG
+#global.category=CONFIG
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/config_fr.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/config_fr.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/config_fr.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/config_fr.properties
index 3532849..eb00eee 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/config_fr.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/config_fr.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=CONFIG
+#global.category=CONFIG
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/config_ja.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/config_ja.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/config_ja.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/config_ja.properties
index 7deeaed..98a458a 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/config_ja.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/config_ja.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=CONFIG
+#global.category=CONFIG
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/config_ko.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/config_ko.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/config_ko.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/config_ko.properties
index 2cbb913..aeacece 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/config_ko.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/config_ko.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=CONFIG
+#global.category=CONFIG
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/config_zh_CN.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/config_zh_CN.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/config_zh_CN.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/config_zh_CN.properties
index 84b779e..a4b15a4 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/config_zh_CN.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/config_zh_CN.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=CONFIG
+#global.category=CONFIG
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/config_zh_TW.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/config_zh_TW.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/config_zh_TW.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/config_zh_TW.properties
index b854f67..ab4e152 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/config_zh_TW.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/config_zh_TW.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=CONFIG
+#global.category=CONFIG
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/core.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/core.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/core.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/core.properties
index c68a6ec..5833a7d 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/core.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/core.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=CORE
+#global.category=CORE
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/core_ca_ES.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/core_ca_ES.properties
similarity index 100%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/core_ca_ES.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/core_ca_ES.properties
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/core_de.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/core_de.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/core_de.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/core_de.properties
index 9688d0c..38466bd 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/core_de.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/core_de.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=CORE
+#global.category=CORE
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/core_es.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/core_es.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/core_es.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/core_es.properties
index 3d0ec12..f576494 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/core_es.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/core_es.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=CORE
+#global.category=CORE
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/core_fr.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/core_fr.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/core_fr.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/core_fr.properties
index fbdf294..434f3dd 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/core_fr.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/core_fr.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=CORE
+#global.category=CORE
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/core_ja.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/core_ja.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/core_ja.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/core_ja.properties
index 0505ecc..8780160 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/core_ja.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/core_ja.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=CORE
+#global.category=CORE
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/core_ko.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/core_ko.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/core_ko.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/core_ko.properties
index b75ba73..77c885f 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/core_ko.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/core_ko.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=CORE
+#global.category=CORE
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/core_pl.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/core_pl.properties
similarity index 100%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/core_pl.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/core_pl.properties
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/core_zh_CN.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/core_zh_CN.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/core_zh_CN.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/core_zh_CN.properties
index 6cbb463..ecdb7e5 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/core_zh_CN.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/core_zh_CN.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=CORE
+#global.category=CORE
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/core_zh_TW.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/core_zh_TW.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/core_zh_TW.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/core_zh_TW.properties
index d5239d2..5932419 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/core_zh_TW.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/core_zh_TW.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=CORE
+#global.category=CORE
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/dsconfig.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/dsconfig.properties
index 8089ef1..ee1ab36 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/dsconfig.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=DSCONFIG
+##global.category=DSCONFIG
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_ca_ES.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/dsconfig_ca_ES.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_ca_ES.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/dsconfig_ca_ES.properties
index 9454794..c0f578a 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_ca_ES.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/dsconfig_ca_ES.properties
@@ -25,7 +25,7 @@
#
# Global directives
#
-global.category=DSCONFIG
+#global.category=DSCONFIG
#
ERR_DSCFG_ERROR_LDAP_FAILED_TO_CONNECT_1002=No es pot connectar al servidor "%s" al port %s
ERR_DSCFG_ERROR_LDAP_SIMPLE_BIND_NOT_SUPPORTED_1003=No es pot autentificat utilitzant autentificaci\u00f3 senzilla
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_de.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/dsconfig_de.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_de.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/dsconfig_de.properties
index a8369d4..cf25cf9 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_de.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/dsconfig_de.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=DSCONFIG
+#global.category=DSCONFIG
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_es.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/dsconfig_es.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_es.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/dsconfig_es.properties
index 0e2b7c3..eebc23c 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_es.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/dsconfig_es.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=DSCONFIG
+#global.category=DSCONFIG
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_fr.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/dsconfig_fr.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_fr.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/dsconfig_fr.properties
index d76e5ba..c029651 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_fr.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/dsconfig_fr.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=DSCONFIG
+#global.category=DSCONFIG
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_ja.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/dsconfig_ja.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_ja.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/dsconfig_ja.properties
index 65bcfd0..1260efa 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_ja.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/dsconfig_ja.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=DSCONFIG
+#global.category=DSCONFIG
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_ko.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/dsconfig_ko.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_ko.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/dsconfig_ko.properties
index 27912d0..eb27f8a 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_ko.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/dsconfig_ko.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=DSCONFIG
+#global.category=DSCONFIG
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_pl.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/dsconfig_pl.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_pl.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/dsconfig_pl.properties
index f0539c4..a41a49b 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_pl.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/dsconfig_pl.properties
@@ -25,7 +25,7 @@
#
# Global directives
#
-global.category=DSCONFIG
+#global.category=DSCONFIG
INFO_EDITOR_OPTION_FINISH_MODIFY_COMPONENT_1352=zako\u0144cz - zastosuj zmiany w %s
ERR_DSCFG_ERROR_VALUE_DOES_NOT_EXIST_159=Warto\u015b\u0107 % w\u0142a\u015bciwo\u015bci %s nie istnieje
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_zh_CN.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/dsconfig_zh_CN.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_zh_CN.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/dsconfig_zh_CN.properties
index ec92374..5769b17 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_zh_CN.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/dsconfig_zh_CN.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=DSCONFIG
+#global.category=DSCONFIG
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_zh_TW.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/dsconfig_zh_TW.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_zh_TW.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/dsconfig_zh_TW.properties
index dd1b65d..24455bf 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig_zh_TW.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/dsconfig_zh_TW.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=DSCONFIG
+#global.category=DSCONFIG
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/extension.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/extension.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/extension.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/extension.properties
index 8c3c186..eae437d 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/extension.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/extension.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=EXTENSIONS
+#global.category=EXTENSIONS
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_ca_ES.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/extension_ca_ES.properties
similarity index 98%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/extension_ca_ES.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/extension_ca_ES.properties
index e89afed..89b67ec 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_ca_ES.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/extension_ca_ES.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=EXTENSIONS
+#global.category=EXTENSIONS
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_de.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/extension_de.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/extension_de.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/extension_de.properties
index a913f8f..e3346a1 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_de.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/extension_de.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=EXTENSIONS
+#global.category=EXTENSIONS
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_es.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/extension_es.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/extension_es.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/extension_es.properties
index 51cda09..249d4e4 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_es.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/extension_es.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=EXTENSIONS
+#global.category=EXTENSIONS
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_fr.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/extension_fr.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/extension_fr.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/extension_fr.properties
index 15f3305..3267aa4 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_fr.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/extension_fr.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=EXTENSIONS
+#global.category=EXTENSIONS
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_ja.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/extension_ja.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/extension_ja.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/extension_ja.properties
index 1a97528..db89970 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_ja.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/extension_ja.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=EXTENSIONS
+#global.category=EXTENSIONS
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_ko.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/extension_ko.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/extension_ko.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/extension_ko.properties
index 2b0d032..16278a9 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_ko.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/extension_ko.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=EXTENSIONS
+#global.category=EXTENSIONS
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_pl.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/extension_pl.properties
similarity index 97%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/extension_pl.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/extension_pl.properties
index e88e141..9be1bb3 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_pl.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/extension_pl.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=EXTENSIONS
+#global.category=EXTENSIONS
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_zh_CN.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/extension_zh_CN.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/extension_zh_CN.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/extension_zh_CN.properties
index 6d285c0..9e93514 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_zh_CN.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/extension_zh_CN.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=EXTENSIONS
+#global.category=EXTENSIONS
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_zh_TW.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/extension_zh_TW.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/extension_zh_TW.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/extension_zh_TW.properties
index 32159d3..4d7ce5f 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/extension_zh_TW.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/extension_zh_TW.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=EXTENSIONS
+#global.category=EXTENSIONS
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/jeb.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/jeb.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/jeb.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/jeb.properties
index e3ed3a8..4933704 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/jeb.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/jeb.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=JEB
+#global.category=JEB
#
# Format string definitions
@@ -146,6 +146,8 @@
not be created in %s
ERR_JEB_BACKUP_CANNOT_RESTORE_78=An error occurred while attempting to \
restore the files from backup %s: %s
+ERR_JEB_BACKUP_MISSING_BACKUPID_79=The information for backup %s could \
+ not be found in the backup directory %s
NOTE_JEB_BACKUP_FILE_UNCHANGED_82=Not changed: %s
NOTE_JEB_BACKUP_CLEANER_ACTIVITY_83=Including %s additional log file(s) due \
to cleaner activity
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_ca_ES.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/jeb_ca_ES.properties
similarity index 100%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_ca_ES.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/jeb_ca_ES.properties
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_de.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/jeb_de.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_de.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/jeb_de.properties
index 74c55c3..51d9c9e 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_de.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/jeb_de.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=JEB
+#global.category=JEB
#
# Format string definitions
@@ -95,6 +95,7 @@
ERR_JEB_INCR_BACKUP_FROM_WRONG_BASE_76=Es muss eine der folgenden Basis-Sicherungs-IDs f\u00fcr die inkrementelle Sicherung spezifiziert werden: %s
ERR_JEB_CANNOT_CREATE_BACKUP_TAG_FILE_77=Die Sicherungs-Tag-Datei %s konnnte nicht in %s erstellt werden
ERR_JEB_BACKUP_CANNOT_RESTORE_78=Fehler beim Versuch, die Dateien der Sicherung %s wiederherzustellen: %s
+ERR_JEB_BACKUP_MISSING_BACKUPID_79=Die Informationen f\u00fcr die Sicherung %s konnten nicht in dem Sicherungsverzeichnis %s gefunden werden
NOTE_JEB_BACKUP_FILE_UNCHANGED_82=Nicht ge\u00e4ndert: %s
NOTE_JEB_BACKUP_CLEANER_ACTIVITY_83=Aufgrund von Bereinigungsaktivit\u00e4ten werden %s zus\u00e4tzliche Protokolldatei(en) eingeschlossen
NOTE_JEB_BACKUP_VERIFY_FILE_84=\u00dcberpr\u00fcfung: %s
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_es.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/jeb_es.properties
similarity index 98%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_es.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/jeb_es.properties
index 2ff3f39..3a18fc0 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_es.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/jeb_es.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=JEB
+#global.category=JEB
#
# Format string definitions
@@ -95,6 +95,7 @@
ERR_JEB_INCR_BACKUP_FROM_WRONG_BASE_76=Debe especificarse uno de los siguientes Id. de copia de seguridad de base para la copia de seguridad incremental: %s
ERR_JEB_CANNOT_CREATE_BACKUP_TAG_FILE_77=No pudo crearse el archivo de etiqueta de copia de seguridad %s en %s
ERR_JEB_BACKUP_CANNOT_RESTORE_78=Se ha producido un error al tratar de restaurar los archivos desde la copia de seguridad %s: %s
+ERR_JEB_BACKUP_MISSING_BACKUPID_79=No pudo encontrarse la informaci\u00f3n para la copia de seguridad %s en el directorio de copia de seguridad %s
NOTE_JEB_BACKUP_FILE_UNCHANGED_82=Sin cambios: %s
NOTE_JEB_BACKUP_CLEANER_ACTIVITY_83=Incluyendo %s archivo(s) de registro adicional(es) debido a la actividad del depurador
NOTE_JEB_BACKUP_VERIFY_FILE_84=Verificando: %s
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_fr.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/jeb_fr.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_fr.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/jeb_fr.properties
index ce1155b..61aaeb5 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_fr.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/jeb_fr.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=JEB
+#global.category=JEB
#
# Format string definitions
@@ -95,6 +95,7 @@
ERR_JEB_INCR_BACKUP_FROM_WRONG_BASE_76=L'un des ID de sauvegarde de base suivants doit \u00eatre sp\u00e9cifi\u00e9 pour la sauvegarde incr\u00e9mentielle\u00a0: %s
ERR_JEB_CANNOT_CREATE_BACKUP_TAG_FILE_77=Impossible de cr\u00e9er le fichier de balises de sauvegarde %s dans %s
ERR_JEB_BACKUP_CANNOT_RESTORE_78=Une erreur s'est produite lors de la tentative de restauration des fichiers depuis la sauvegarde %s\u00a0: %s
+ERR_JEB_BACKUP_MISSING_BACKUPID_79=Les informations de la sauvegarde %s sont introuvables dans le r\u00e9pertoire de sauvegarde %s
NOTE_JEB_BACKUP_FILE_UNCHANGED_82=Inchang\u00e9\u00a0: %s
NOTE_JEB_BACKUP_CLEANER_ACTIVITY_83=Incluant %s fichiers journaux suppl\u00e9mentaires en raison de l'activit\u00e9 de nettoyage
NOTE_JEB_BACKUP_VERIFY_FILE_84=V\u00e9rification\u00a0: %s
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_ja.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/jeb_ja.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_ja.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/jeb_ja.properties
index 876db88..d0b5a6d 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_ja.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/jeb_ja.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=JEB
+#global.category=JEB
#
# Format string definitions
@@ -95,6 +95,7 @@
ERR_JEB_INCR_BACKUP_FROM_WRONG_BASE_76=\u5897\u5206\u30d0\u30c3\u30af\u30a2\u30c3\u30d7\u306b\u306f\u6b21\u306e\u30d9\u30fc\u30b9\u30d0\u30c3\u30af\u30a2\u30c3\u30d7 ID \u306e\u3044\u305a\u308c\u304b\u3092\u6307\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059: %s
ERR_JEB_CANNOT_CREATE_BACKUP_TAG_FILE_77=\u30d0\u30c3\u30af\u30a2\u30c3\u30d7\u30bf\u30b0\u30d5\u30a1\u30a4\u30eb %s \u3092 %s \u5185\u306b\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f
ERR_JEB_BACKUP_CANNOT_RESTORE_78=\u30d0\u30c3\u30af\u30a2\u30c3\u30d7 %s \u304b\u3089\u30d5\u30a1\u30a4\u30eb\u3092\u5fa9\u5143\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f: %s
+ERR_JEB_BACKUP_MISSING_BACKUPID_79=\u30d0\u30c3\u30af\u30a2\u30c3\u30d7 %s \u306e\u60c5\u5831\u304c\u30d0\u30c3\u30af\u30a2\u30c3\u30d7\u30c7\u30a3\u30ec\u30af\u30c8\u30ea %s \u5185\u306b\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f
NOTE_JEB_BACKUP_FILE_UNCHANGED_82=\u5909\u66f4\u3055\u308c\u3066\u3044\u307e\u305b\u3093: %s
NOTE_JEB_BACKUP_CLEANER_ACTIVITY_83=\u30af\u30ea\u30fc\u30ca\u306e\u52d5\u4f5c\u306b\u3088\u308a\u3001%s \u306e\u8ffd\u52a0\u30ed\u30b0\u30d5\u30a1\u30a4\u30eb\u3092\u542b\u3081\u3066\u3044\u307e\u3059
NOTE_JEB_BACKUP_VERIFY_FILE_84=\u691c\u8a3c\u3057\u3066\u3044\u307e\u3059: %s
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_ko.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/jeb_ko.properties
similarity index 98%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_ko.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/jeb_ko.properties
index 50cbd27..205dfd8 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_ko.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/jeb_ko.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=JEB
+#global.category=JEB
#
# Format string definitions
@@ -94,6 +94,7 @@
ERR_JEB_INCR_BACKUP_FROM_WRONG_BASE_76=\uc99d\ubd84 \ubc31\uc5c5\uc5d0 \ub300\ud574 \ub2e4\uc74c \uae30\ubcf8 \ubc31\uc5c5 \uc544\uc774\ub514 \uc911 \ud558\ub098\ub97c \uc9c0\uc815\ud574\uc57c \ud569\ub2c8\ub2e4: %s
ERR_JEB_CANNOT_CREATE_BACKUP_TAG_FILE_77=\ubc31\uc5c5 \ud0dc\uadf8 \ud30c\uc77c %s\uc744(\ub97c) %s\uc5d0\uc11c \ub9cc\ub4e4\uc9c0 \ubabb\ud588\uc2b5\ub2c8\ub2e4.
ERR_JEB_BACKUP_CANNOT_RESTORE_78=%s \ubc31\uc5c5\uc5d0\uc11c \ud30c\uc77c\uc744 \ubcf5\uc6d0\ud558\ub294 \ub3d9\uc548 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4: %s
+ERR_JEB_BACKUP_MISSING_BACKUPID_79=%s \ubc31\uc5c5\uc5d0 \ub300\ud55c \uc815\ubcf4\ub97c \ubc31\uc5c5 \ub514\ub809\ud1a0\ub9ac %s\uc5d0\uc11c \ucc3e\uc9c0 \ubabb\ud588\uc2b5\ub2c8\ub2e4.
NOTE_JEB_BACKUP_FILE_UNCHANGED_82=\ubcc0\uacbd\ub418\uc9c0 \uc54a\uc74c: %s
NOTE_JEB_BACKUP_CLEANER_ACTIVITY_83=\ud074\ub9ac\ub108 \uc791\uc5c5\uc73c\ub85c \uc778\ud574 %s \ucd94\uac00 \ub85c\uadf8 \ud30c\uc77c\uc744 \ud3ec\ud568\ud569\ub2c8\ub2e4.
NOTE_JEB_BACKUP_VERIFY_FILE_84=\ud655\uc778 \uc911: %s
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_pl.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/jeb_pl.properties
similarity index 100%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_pl.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/jeb_pl.properties
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_zh_CN.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/jeb_zh_CN.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_zh_CN.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/jeb_zh_CN.properties
index b382304..32eec43 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_zh_CN.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/jeb_zh_CN.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=JEB
+#global.category=JEB
#
# Format string definitions
@@ -95,6 +95,7 @@
ERR_JEB_INCR_BACKUP_FROM_WRONG_BASE_76=\u5fc5\u987b\u4e3a\u589e\u91cf\u5907\u4efd\u6307\u5b9a\u4ee5\u4e0b\u67d0\u4e2a\u57fa\u5907\u4efd ID: %s
ERR_JEB_CANNOT_CREATE_BACKUP_TAG_FILE_77=\u5907\u4efd\u6807\u8bb0\u6587\u4ef6 %s \u65e0\u6cd5\u5728 %s \u4e2d\u521b\u5efa
ERR_JEB_BACKUP_CANNOT_RESTORE_78=\u5728\u5c1d\u8bd5\u4ece\u5907\u4efd %s \u4e2d\u6062\u590d\u6587\u4ef6\u65f6\u51fa\u73b0\u9519\u8bef: %s
+ERR_JEB_BACKUP_MISSING_BACKUPID_79=\u5907\u4efd\u76ee\u5f55 %2$s \u4e2d\u627e\u4e0d\u5230\u5907\u4efd %1$s \u7684\u4fe1\u606f
NOTE_JEB_BACKUP_FILE_UNCHANGED_82=\u672a\u66f4\u6539: %s
NOTE_JEB_BACKUP_CLEANER_ACTIVITY_83=\u7531\u4e8e\u6e05\u7406\u5668\u6d3b\u52a8\u800c\u5305\u62ec %s \u4e2a\u989d\u5916\u7684\u65e5\u5fd7\u6587\u4ef6
NOTE_JEB_BACKUP_VERIFY_FILE_84=\u6b63\u5728\u9a8c\u8bc1: %s
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_zh_TW.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/jeb_zh_TW.properties
similarity index 98%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_zh_TW.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/jeb_zh_TW.properties
index 32e472d..640a4e4 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/jeb_zh_TW.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/jeb_zh_TW.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=JEB
+#global.category=JEB
#
# Format string definitions
@@ -94,6 +94,7 @@
ERR_JEB_INCR_BACKUP_FROM_WRONG_BASE_76=\u5c0d\u65bc\u589e\u91cf\u5099\u4efd\u5fc5\u9808\u6307\u5b9a\u4e0b\u5217\u5176\u4e2d\u4e00\u500b\u57fa\u5e95\u5099\u4efd ID: %s
ERR_JEB_CANNOT_CREATE_BACKUP_TAG_FILE_77=\u7121\u6cd5\u5728 %2$s \u4e2d\u5efa\u7acb\u5099\u4efd\u6a19\u8a18\u6a94\u6848 %1$s
ERR_JEB_BACKUP_CANNOT_RESTORE_78=\u5617\u8a66\u5f9e\u5099\u4efd %s \u5fa9\u539f\u6a94\u6848\u6642\u767c\u751f\u932f\u8aa4: %s
+ERR_JEB_BACKUP_MISSING_BACKUPID_79=\u5728\u5099\u4efd\u76ee\u9304 %2$s \u4e2d\u627e\u4e0d\u5230\u5099\u4efd %1$s \u7684\u8cc7\u8a0a
NOTE_JEB_BACKUP_FILE_UNCHANGED_82=\u672a\u8b8a\u66f4: %s
NOTE_JEB_BACKUP_CLEANER_ACTIVITY_83=\u56e0\u6e05\u9664\u7a0b\u5f0f\u6d3b\u52d5\u800c\u5305\u542b %s \u500b\u984d\u5916\u7684\u8a18\u9304\u6a94
NOTE_JEB_BACKUP_VERIFY_FILE_84=\u6b63\u5728\u9a57\u8b49: %s
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/log.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/logger.properties
similarity index 98%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/log.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/logger.properties
index 5af0b36..edb6b5e 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/log.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/logger.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=LOG
+#global.category=LOG
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/log_de.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/logger_de.properties
similarity index 98%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/log_de.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/logger_de.properties
index 12e1c85..c9945a8 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/log_de.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/logger_de.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=LOG
+#global.category=LOG
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/log_es.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/logger_es.properties
similarity index 98%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/log_es.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/logger_es.properties
index 5d1258e..d866994 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/log_es.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/logger_es.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=LOG
+#global.category=LOG
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/log_fr.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/logger_fr.properties
similarity index 98%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/log_fr.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/logger_fr.properties
index e7c3c67..237800b 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/log_fr.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/logger_fr.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=LOG
+#global.category=LOG
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/log_ja.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/logger_ja.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/log_ja.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/logger_ja.properties
index ea11a9c..5305700 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/log_ja.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/logger_ja.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=LOG
+#global.category=LOG
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/log_ko.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/logger_ko.properties
similarity index 98%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/log_ko.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/logger_ko.properties
index b3c6671..13e3bfc 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/log_ko.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/logger_ko.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=LOG
+#global.category=LOG
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/log_zh_CN.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/logger_zh_CN.properties
similarity index 98%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/log_zh_CN.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/logger_zh_CN.properties
index b695565..79979db 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/log_zh_CN.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/logger_zh_CN.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=LOG
+#global.category=LOG
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/log_zh_TW.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/logger_zh_TW.properties
similarity index 98%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/log_zh_TW.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/logger_zh_TW.properties
index b4eb5e5..dd53f54 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/log_zh_TW.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/logger_zh_TW.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=LOG
+#global.category=LOG
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/plugin.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/plugin.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/plugin.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/plugin.properties
index dd878a3..569bb66 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/plugin.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/plugin.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=PLUGIN
+#global.category=PLUGIN
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_de.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/plugin_de.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_de.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/plugin_de.properties
index acd494e..2777b85 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_de.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/plugin_de.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=PLUGIN
+#global.category=PLUGIN
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_es.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/plugin_es.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_es.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/plugin_es.properties
index a5501ed..9f2b1ea 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_es.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/plugin_es.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=PLUGIN
+#global.category=PLUGIN
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_fr.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/plugin_fr.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_fr.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/plugin_fr.properties
index 56bdcf7..c19249d 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_fr.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/plugin_fr.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=PLUGIN
+#global.category=PLUGIN
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_ja.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/plugin_ja.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_ja.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/plugin_ja.properties
index 7ba7b99..c0db5b1 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_ja.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/plugin_ja.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=PLUGIN
+#global.category=PLUGIN
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_ko.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/plugin_ko.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_ko.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/plugin_ko.properties
index 276ea1b..ed14136 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_ko.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/plugin_ko.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=PLUGIN
+#global.category=PLUGIN
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_pl.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/plugin_pl.properties
similarity index 100%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_pl.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/plugin_pl.properties
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_zh_CN.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/plugin_zh_CN.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_zh_CN.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/plugin_zh_CN.properties
index 74d7aa4..4f9e936 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_zh_CN.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/plugin_zh_CN.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=PLUGIN
+#global.category=PLUGIN
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_zh_TW.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/plugin_zh_TW.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_zh_TW.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/plugin_zh_TW.properties
index 7dd0b75..b3dd96f 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/plugin_zh_TW.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/plugin_zh_TW.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=PLUGIN
+#global.category=PLUGIN
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/protocol.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/protocol.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/protocol.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/protocol.properties
index c3399c7..e77b6af 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/protocol.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/protocol.properties
@@ -28,7 +28,7 @@
#
# Global directives
#
-global.category=PROTOCOL
+#global.category=PROTOCOL
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_ca_ES.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/protocol_ca_ES.properties
similarity index 100%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_ca_ES.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/protocol_ca_ES.properties
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_de.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/protocol_de.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_de.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/protocol_de.properties
index d2d02d5..19f2634 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_de.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/protocol_de.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=PROTOCOL
+#global.category=PROTOCOL
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_es.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/protocol_es.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_es.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/protocol_es.properties
index a263be4..9c9c66b 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_es.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/protocol_es.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=PROTOCOL
+#global.category=PROTOCOL
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_fr.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/protocol_fr.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_fr.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/protocol_fr.properties
index d22f1da..267bfc3 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_fr.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/protocol_fr.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=PROTOCOL
+#global.category=PROTOCOL
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_ja.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/protocol_ja.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_ja.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/protocol_ja.properties
index 9f9d81e..dd76dc6 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_ja.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/protocol_ja.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=PROTOCOL
+#global.category=PROTOCOL
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_ko.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/protocol_ko.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_ko.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/protocol_ko.properties
index fcc6eb1..785d123 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_ko.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/protocol_ko.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=PROTOCOL
+#global.category=PROTOCOL
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_pl.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/protocol_pl.properties
similarity index 100%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_pl.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/protocol_pl.properties
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_zh_CN.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/protocol_zh_CN.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_zh_CN.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/protocol_zh_CN.properties
index 65bcc12..e6cc956 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_zh_CN.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/protocol_zh_CN.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=PROTOCOL
+#global.category=PROTOCOL
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_zh_TW.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/protocol_zh_TW.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_zh_TW.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/protocol_zh_TW.properties
index b77e027..aa17ee7 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/protocol_zh_TW.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/protocol_zh_TW.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=PROTOCOL
+#global.category=PROTOCOL
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/quickSetup.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/quickSetup.properties
index 431aee4..3885cae 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/quickSetup.properties
@@ -28,9 +28,9 @@
# Global directives
# Do not translate
#
-global.category=QUICKSETUP
-global.ordinal=-1
-global.use.message.jar.if.webstart=true
+#global.category=QUICKSETUP
+##global.ordinal=-1
+#global.use.message.jar.if.webstart=true
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_ca_ES.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/quickSetup_ca_ES.properties
similarity index 98%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_ca_ES.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/quickSetup_ca_ES.properties
index aad7f6c..d01364c 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_ca_ES.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/quickSetup_ca_ES.properties
@@ -28,9 +28,9 @@
# Global directives
# Do not translate
#
-global.category=QUICKSETUP
-global.ordinal=-1
-global.use.message.jar.if.webstart=true
+#global.category=QUICKSETUP
+##global.ordinal=-1
+#global.use.message.jar.if.webstart=true
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_de.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/quickSetup_de.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_de.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/quickSetup_de.properties
index 201016b..4b3c493 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_de.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/quickSetup_de.properties
@@ -28,9 +28,9 @@
# Global directives
# Do not translate
#
-global.category=QUICKSETUP
-global.ordinal=-1
-global.use.message.jar.if.webstart=true
+#global.category=QUICKSETUP
+##global.ordinal=-1
+#global.use.message.jar.if.webstart=true
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_es.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/quickSetup_es.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_es.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/quickSetup_es.properties
index 37fe2d1..ac877d8 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_es.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/quickSetup_es.properties
@@ -28,9 +28,9 @@
# Global directives
# Do not translate
#
-global.category=QUICKSETUP
-global.ordinal=-1
-global.use.message.jar.if.webstart=true
+#global.category=QUICKSETUP
+##global.ordinal=-1
+#global.use.message.jar.if.webstart=true
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_fr.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/quickSetup_fr.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_fr.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/quickSetup_fr.properties
index a48bf98..f274656 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_fr.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/quickSetup_fr.properties
@@ -28,9 +28,9 @@
# Global directives
# Do not translate
#
-global.category=QUICKSETUP
-global.ordinal=-1
-global.use.message.jar.if.webstart=true
+#global.category=QUICKSETUP
+##global.ordinal=-1
+#global.use.message.jar.if.webstart=true
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_ja.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/quickSetup_ja.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_ja.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/quickSetup_ja.properties
index 088117d..8b154cc 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_ja.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/quickSetup_ja.properties
@@ -28,9 +28,9 @@
# Global directives
# Do not translate
#
-global.category=QUICKSETUP
-global.ordinal=-1
-global.use.message.jar.if.webstart=true
+#global.category=QUICKSETUP
+##global.ordinal=-1
+#global.use.message.jar.if.webstart=true
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_ko.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/quickSetup_ko.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_ko.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/quickSetup_ko.properties
index 8128527..9549222 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_ko.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/quickSetup_ko.properties
@@ -28,9 +28,9 @@
# Global directives
# Do not translate
#
-global.category=QUICKSETUP
-global.ordinal=-1
-global.use.message.jar.if.webstart=true
+#global.category=QUICKSETUP
+##global.ordinal=-1
+#global.use.message.jar.if.webstart=true
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_pl.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/quickSetup_pl.properties
similarity index 98%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_pl.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/quickSetup_pl.properties
index 86ad7d5..81db9a0 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_pl.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/quickSetup_pl.properties
@@ -28,9 +28,9 @@
# Global directives
# Do not translate
#
-global.category=QUICKSETUP
-global.ordinal=-1
-global.use.message.jar.if.webstart=true
+#global.category=QUICKSETUP
+##global.ordinal=-1
+#global.use.message.jar.if.webstart=true
#
INFO_CERTIFICATE_DIALOG_DO_NOT_ACCEPT_BUTTON_LABEL=Nie Akceptuj
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_zh_CN.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/quickSetup_zh_CN.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_zh_CN.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/quickSetup_zh_CN.properties
index 1f82755..a33cf27 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_zh_CN.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/quickSetup_zh_CN.properties
@@ -28,9 +28,9 @@
# Global directives
# Do not translate
#
-global.category=QUICKSETUP
-global.ordinal=-1
-global.use.message.jar.if.webstart=true
+#global.category=QUICKSETUP
+##global.ordinal=-1
+#global.use.message.jar.if.webstart=true
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_zh_TW.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/quickSetup_zh_TW.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_zh_TW.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/quickSetup_zh_TW.properties
index d5ad8f9..2e7112a 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/quicksetup_zh_TW.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/quickSetup_zh_TW.properties
@@ -29,9 +29,9 @@
# Global directives
# Do not translate
#
-global.category=QUICKSETUP
-global.ordinal=-1
-global.use.message.jar.if.webstart=true
+#global.category=QUICKSETUP
+##global.ordinal=-1
+#global.use.message.jar.if.webstart=true
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/replication.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/replication.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/replication.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/replication.properties
index 28a7c0d..9ae2894 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/replication.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/replication.properties
@@ -32,7 +32,7 @@
#
# Global directives
#
-global.category=SYNC
+#global.category=SYNC
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/replication_de.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/replication_de.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/replication_de.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/replication_de.properties
index e572ffe..4e875e3 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/replication_de.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/replication_de.properties
@@ -32,7 +32,7 @@
#
# Global directives
#
-global.category=SYNC
+#global.category=SYNC
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/replication_es.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/replication_es.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/replication_es.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/replication_es.properties
index 612fd36..03c827a 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/replication_es.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/replication_es.properties
@@ -32,7 +32,7 @@
#
# Global directives
#
-global.category=SYNC
+#global.category=SYNC
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/replication_fr.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/replication_fr.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/replication_fr.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/replication_fr.properties
index e91bb3e..20f1091 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/replication_fr.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/replication_fr.properties
@@ -32,7 +32,7 @@
#
# Global directives
#
-global.category=SYNC
+#global.category=SYNC
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/replication_ja.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/replication_ja.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/replication_ja.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/replication_ja.properties
index 0d58f55..0a407f8 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/replication_ja.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/replication_ja.properties
@@ -32,7 +32,7 @@
#
# Global directives
#
-global.category=SYNC
+#global.category=SYNC
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/replication_ko.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/replication_ko.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/replication_ko.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/replication_ko.properties
index a29f4da..bb5bfe6 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/replication_ko.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/replication_ko.properties
@@ -32,7 +32,7 @@
#
# Global directives
#
-global.category=SYNC
+#global.category=SYNC
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/replication_zh_CN.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/replication_zh_CN.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/replication_zh_CN.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/replication_zh_CN.properties
index 68293d8..d0d7c33 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/replication_zh_CN.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/replication_zh_CN.properties
@@ -32,7 +32,7 @@
#
# Global directives
#
-global.category=SYNC
+#global.category=SYNC
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/replication_zh_TW.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/replication_zh_TW.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/replication_zh_TW.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/replication_zh_TW.properties
index 2799429..5f18e7e 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/replication_zh_TW.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/replication_zh_TW.properties
@@ -32,7 +32,7 @@
#
# Global directives
#
-global.category=SYNC
+#global.category=SYNC
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/runtime.properties
similarity index 98%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/runtime.properties
index 20bf144..f508170 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/runtime.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=RUNTIME_INFORMATION
+#global.category=RUNTIME_INFORMATION
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_ca_ES.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/runtime_ca_ES.properties
similarity index 100%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_ca_ES.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/runtime_ca_ES.properties
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_de.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/runtime_de.properties
similarity index 98%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_de.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/runtime_de.properties
index b7b8885..031a207 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_de.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/runtime_de.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=RUNTIME_INFORMATION
+#global.category=RUNTIME_INFORMATION
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_es.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/runtime_es.properties
similarity index 98%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_es.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/runtime_es.properties
index 0cb8a5b..0f2b790 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_es.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/runtime_es.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=RUNTIME_INFORMATION
+#global.category=RUNTIME_INFORMATION
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_fr.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/runtime_fr.properties
similarity index 98%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_fr.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/runtime_fr.properties
index 16fb1db..15fd6d6 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_fr.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/runtime_fr.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=RUNTIME_INFORMATION
+#global.category=RUNTIME_INFORMATION
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_ja.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/runtime_ja.properties
similarity index 98%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_ja.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/runtime_ja.properties
index 81bd8c3..ec680a7 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_ja.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/runtime_ja.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=RUNTIME_INFORMATION
+#global.category=RUNTIME_INFORMATION
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_ko.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/runtime_ko.properties
similarity index 98%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_ko.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/runtime_ko.properties
index 4ca2cbd..509094b 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_ko.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/runtime_ko.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=RUNTIME_INFORMATION
+#global.category=RUNTIME_INFORMATION
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_pl.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/runtime_pl.properties
similarity index 100%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_pl.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/runtime_pl.properties
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_zh_CN.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/runtime_zh_CN.properties
similarity index 98%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_zh_CN.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/runtime_zh_CN.properties
index 1981e76..009bf9e 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_zh_CN.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/runtime_zh_CN.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=RUNTIME_INFORMATION
+#global.category=RUNTIME_INFORMATION
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_zh_TW.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/runtime_zh_TW.properties
similarity index 98%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_zh_TW.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/runtime_zh_TW.properties
index 8d085b6..fe3f8e1 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/runtime_information_zh_TW.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/runtime_zh_TW.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=RUNTIME_INFORMATION
+#global.category=RUNTIME_INFORMATION
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/schema.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/schema.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/schema.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/schema.properties
index d13198d..5ef6363 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/schema.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/schema.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=SCHEMA
+#global.category=SCHEMA
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/schema_de.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/schema_de.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/schema_de.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/schema_de.properties
index 9358374..a1735cd 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/schema_de.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/schema_de.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=SCHEMA
+#global.category=SCHEMA
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/schema_es.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/schema_es.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/schema_es.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/schema_es.properties
index 0be38da..6c67d36 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/schema_es.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/schema_es.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=SCHEMA
+#global.category=SCHEMA
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/schema_fr.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/schema_fr.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/schema_fr.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/schema_fr.properties
index c6da0d8..19b5cf1 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/schema_fr.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/schema_fr.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=SCHEMA
+#global.category=SCHEMA
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/schema_ja.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/schema_ja.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/schema_ja.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/schema_ja.properties
index a80eb85..d1a95f2 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/schema_ja.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/schema_ja.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=SCHEMA
+#global.category=SCHEMA
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/schema_ko.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/schema_ko.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/schema_ko.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/schema_ko.properties
index b2cd5e2..690037d 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/schema_ko.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/schema_ko.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=SCHEMA
+#global.category=SCHEMA
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/schema_zh_CN.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/schema_zh_CN.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/schema_zh_CN.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/schema_zh_CN.properties
index 6a40eb0..6183e5c 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/schema_zh_CN.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/schema_zh_CN.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=SCHEMA
+#global.category=SCHEMA
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/schema_zh_TW.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/schema_zh_TW.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/schema_zh_TW.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/schema_zh_TW.properties
index 843c99f..adb09d4 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/schema_zh_TW.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/schema_zh_TW.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=SCHEMA
+#global.category=SCHEMA
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/task.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/task.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/task.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/task.properties
index 294f129..a42ac60 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/task.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/task.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=TASK
+#global.category=TASK
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/task_ca_ES.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/task_ca_ES.properties
similarity index 100%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/task_ca_ES.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/task_ca_ES.properties
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/task_de.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/task_de.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/task_de.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/task_de.properties
index 0884baf..81898a0 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/task_de.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/task_de.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=TASK
+#global.category=TASK
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/task_es.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/task_es.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/task_es.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/task_es.properties
index 4db1fe8..a199e36 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/task_es.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/task_es.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=TASK
+#global.category=TASK
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/task_fr.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/task_fr.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/task_fr.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/task_fr.properties
index d4d15a9..22bde99 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/task_fr.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/task_fr.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=TASK
+#global.category=TASK
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/task_ja.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/task_ja.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/task_ja.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/task_ja.properties
index e9479ce..412a71e 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/task_ja.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/task_ja.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=TASK
+#global.category=TASK
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/task_ko.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/task_ko.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/task_ko.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/task_ko.properties
index dfb97a9..adf2e2e 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/task_ko.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/task_ko.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=TASK
+#global.category=TASK
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/task_pl.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/task_pl.properties
similarity index 100%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/task_pl.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/task_pl.properties
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/task_zh_CN.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/task_zh_CN.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/task_zh_CN.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/task_zh_CN.properties
index 02887e5..74ea293 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/task_zh_CN.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/task_zh_CN.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=TASK
+#global.category=TASK
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/task_zh_TW.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/task_zh_TW.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/task_zh_TW.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/task_zh_TW.properties
index 7175c99..d5a9137 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/task_zh_TW.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/task_zh_TW.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=TASK
+#global.category=TASK
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/tools.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/tool.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/tools.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/tool.properties
index 10fa561..95d01e5 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/tools.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/tool.properties
@@ -20,14 +20,14 @@
# CDDL HEADER END
#
# Copyright 2006-2010 Sun Microsystems, Inc.
-# Portions Copyright 2011-2015 ForgeRock AS
+# Portions Copyright 2011-2014 ForgeRock AS
#
# Global directives
#
-global.category=TOOLS
+#global.category=TOOLS
#
# Format string definitions
@@ -1849,9 +1849,7 @@
their appropriate types
ERR_DBTEST_DECODE_FAIL_1335=An error occurred while decoding data: %s
INFO_DESCRIPTION_DBTEST_SUBCMD_LIST_INDEX_STATUS_1336=List the status of \
- indexes in an entry container. \
- This subcommand can take a long time to complete, \
- as it reads all indexes for all backends
+ indexes in an entry container
INFO_DESCRIPTION_DBTEST_MAX_KEY_VALUE_1337=Only show records with keys that \
should be ordered before the provided value using the comparator for the \
database container
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/tools_ca_ES.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/tool_ca_ES.properties
similarity index 100%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/tools_ca_ES.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/tool_ca_ES.properties
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/tools_de.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/tool_de.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/tools_de.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/tool_de.properties
index 20174a4..ff5ecbf 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/tools_de.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/tool_de.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=TOOLS
+#global.category=TOOLS
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/tools_es.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/tool_es.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/tools_es.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/tool_es.properties
index 9eb6d8e..78f9d43 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/tools_es.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/tool_es.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=TOOLS
+#global.category=TOOLS
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/tools_fr.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/tool_fr.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/tools_fr.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/tool_fr.properties
index 3aff158..6946ba4 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/tools_fr.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/tool_fr.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=TOOLS
+#global.category=TOOLS
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/tools_ja.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/tool_ja.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/tools_ja.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/tool_ja.properties
index ccbed5a..aa74b9f 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/tools_ja.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/tool_ja.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=TOOLS
+#global.category=TOOLS
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/tools_ko.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/tool_ko.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/tools_ko.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/tool_ko.properties
index 9f3504f..bf12135 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/tools_ko.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/tool_ko.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=TOOLS
+#global.category=TOOLS
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/tools_pl.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/tool_pl.properties
similarity index 100%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/tools_pl.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/tool_pl.properties
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/tools_zh_CN.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/tool_zh_CN.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/tools_zh_CN.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/tool_zh_CN.properties
index 23f7264..75046b6 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/tools_zh_CN.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/tool_zh_CN.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=TOOLS
+#global.category=TOOLS
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/tools_zh_TW.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/tool_zh_TW.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/tools_zh_TW.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/tool_zh_TW.properties
index 44636b1..4ffb083 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/tools_zh_TW.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/tool_zh_TW.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=TOOLS
+#global.category=TOOLS
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/utility.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/utility.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/utility.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/utility.properties
index a9dfe1c..10d1de7 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/utility.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/utility.properties
@@ -27,8 +27,8 @@
#
# Global directives
#
-global.category=UTIL
-global.use.message.jar.if.webstart=true
+#global.category=UTIL
+#global.use.message.jar.if.webstart=true
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/utility_ca_ES.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/utility_ca_ES.properties
similarity index 100%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/utility_ca_ES.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/utility_ca_ES.properties
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/utility_de.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/utility_de.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/utility_de.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/utility_de.properties
index c4d1dcb..f32a806 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/utility_de.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/utility_de.properties
@@ -26,8 +26,8 @@
#
# Global directives
#
-global.category=UTIL
-global.use.message.jar.if.webstart=true
+#global.category=UTIL
+#global.use.message.jar.if.webstart=true
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/utility_es.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/utility_es.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/utility_es.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/utility_es.properties
index baa4418..1d393a8 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/utility_es.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/utility_es.properties
@@ -26,8 +26,8 @@
#
# Global directives
#
-global.category=UTIL
-global.use.message.jar.if.webstart=true
+#global.category=UTIL
+#global.use.message.jar.if.webstart=true
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/utility_fr.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/utility_fr.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/utility_fr.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/utility_fr.properties
index 323d379..7e6d26e 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/utility_fr.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/utility_fr.properties
@@ -26,8 +26,8 @@
#
# Global directives
#
-global.category=UTIL
-global.use.message.jar.if.webstart=true
+#global.category=UTIL
+#global.use.message.jar.if.webstart=true
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/utility_ja.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/utility_ja.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/utility_ja.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/utility_ja.properties
index 5c91575..b1c85aa 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/utility_ja.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/utility_ja.properties
@@ -27,8 +27,8 @@
#
# Global directives
#
-global.category=UTIL
-global.use.message.jar.if.webstart=true
+#global.category=UTIL
+#global.use.message.jar.if.webstart=true
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/utility_ko.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/utility_ko.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/utility_ko.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/utility_ko.properties
index 1bd5a1d..57bbf5c 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/utility_ko.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/utility_ko.properties
@@ -27,8 +27,8 @@
#
# Global directives
#
-global.category=UTIL
-global.use.message.jar.if.webstart=true
+#global.category=UTIL
+#global.use.message.jar.if.webstart=true
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/utility_pl.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/utility_pl.properties
similarity index 100%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/utility_pl.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/utility_pl.properties
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/utility_zh_CN.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/utility_zh_CN.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/utility_zh_CN.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/utility_zh_CN.properties
index 094933d..167827b 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/utility_zh_CN.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/utility_zh_CN.properties
@@ -27,8 +27,8 @@
#
# Global directives
#
-global.category=UTIL
-global.use.message.jar.if.webstart=true
+#global.category=UTIL
+#global.use.message.jar.if.webstart=true
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/utility_zh_TW.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/utility_zh_TW.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/utility_zh_TW.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/utility_zh_TW.properties
index 5605a95..2bbc2ce 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/utility_zh_TW.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/utility_zh_TW.properties
@@ -27,8 +27,8 @@
#
# Global directives
#
-global.category=UTIL
-global.use.message.jar.if.webstart=true
+#global.category=UTIL
+#global.use.message.jar.if.webstart=true
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/version.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/version.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/version.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/version.properties
index ea96637..7549d81 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/version.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/version.properties
@@ -27,7 +27,7 @@
#
# Global directives
#
-global.category=VERSION
+#global.category=VERSION
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/version_de.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/version_de.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/version_de.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/version_de.properties
index 4a73ee8..8891e44 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/version_de.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/version_de.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=VERSION
+#global.category=VERSION
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/version_es.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/version_es.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/version_es.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/version_es.properties
index cdcb0f8..9d65a3d 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/version_es.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/version_es.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=VERSION
+#global.category=VERSION
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/version_fr.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/version_fr.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/version_fr.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/version_fr.properties
index ee93013..adda7ac 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/version_fr.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/version_fr.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=VERSION
+#global.category=VERSION
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/version_ja.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/version_ja.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/version_ja.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/version_ja.properties
index be50475..60202c0 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/version_ja.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/version_ja.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=VERSION
+#global.category=VERSION
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/version_ko.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/version_ko.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/version_ko.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/version_ko.properties
index d03b19b..afff435 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/version_ko.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/version_ko.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=VERSION
+#global.category=VERSION
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/version_zh_CN.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/version_zh_CN.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/version_zh_CN.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/version_zh_CN.properties
index e869f9c..a2f18be 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/version_zh_CN.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/version_zh_CN.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=VERSION
+#global.category=VERSION
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/messages/messages/version_zh_TW.properties b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/version_zh_TW.properties
similarity index 99%
rename from opendj-sdk/opendj3-server-dev/src/messages/messages/version_zh_TW.properties
rename to opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/version_zh_TW.properties
index e0e823f..b2cb752 100644
--- a/opendj-sdk/opendj3-server-dev/src/messages/messages/version_zh_TW.properties
+++ b/opendj-sdk/opendj3-server-dev/src/messages/org/opends/messages/version_zh_TW.properties
@@ -26,7 +26,7 @@
#
# Global directives
#
-global.category=VERSION
+#global.category=VERSION
#
# Format string definitions
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/PublicAPI.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/PublicAPI.java
index 4d814da..0960a4c 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/PublicAPI.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/PublicAPI.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
*/
package org.opends.server.types;
@@ -90,7 +90,7 @@
/**
* Retrieves the stability level for the associated class or method.
*
- * @return The stability level for the associated class or method.
+ * return The stability level for the associated class or method.
*/
StabilityLevel stability() default StabilityLevel.PRIVATE;
@@ -106,7 +106,7 @@
* obtained elsewhere (e.g., provided as an argument to a method
* overridden by the third-party code).
*
- * @return {@code true} if third-party code should be allowed to
+ * return {@code true} if third-party code should be allowed to
* create new instances of the associated object type, or
* {@code false} if not.
*/
@@ -122,7 +122,7 @@
* may be extended by internal code but should not be extended by
* classes outside the OpenDS code base.
*
- * @return {@code true} if the associated class/interface/method
+ * return {@code true} if the associated class/interface/method
* may be extended by third-party code, or {@code false} if
* not.
*/
@@ -134,7 +134,7 @@
* Indicates whether the associated method may be invoked by
* third-party code.
*
- * @return {@code true} if third-party code should be allowed to
+ * return {@code true} if third-party code should be allowed to
* invoke the associated method, or {@code false} if not.
*/
boolean mayInvoke() default false;
@@ -146,7 +146,7 @@
* be taken into consideration by third-party developers that may be
* interested in using the associated code.
*
- * @return A string that may contain additional notes that should
+ * return A string that may contain additional notes that should
* be taken into consideration by third-party developers
* that may be interested in using the associated code.
*/
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/SubtreeSpecification.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/SubtreeSpecification.java
index 1129d3d..6f8bcc3 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/SubtreeSpecification.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/SubtreeSpecification.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.types;
@@ -1282,23 +1282,23 @@
* @param rootDN
* The root DN of the subtree.
* @param relativeBaseDN
- * The relative base DN (or <code>null</code> if not
+ * The relative base DN (or {@code null} if not
* specified).
* @param minimumDepth
- * The minimum depth (<=0 means unlimited).
+ * The minimum depth (less than or equal to 0 means unlimited).
* @param maximumDepth
- * The maximum depth (<0 means unlimited).
+ * The maximum depth (less than 0 means unlimited).
* @param chopBefore
* The set of chop before local names (relative to the
- * relative base DN), or <code>null</code> if there are
+ * relative base DN), or {@code null} if there are
* none.
* @param chopAfter
* The set of chop after local names (relative to the
- * relative base DN), or <code>null</code> if there are
+ * relative base DN), or {@code null} if there are
* none.
* @param refinements
* The optional specification filter refinements, or
- * <code>null</code> if there are none.
+ * {@code null} if there are none.
*/
public SubtreeSpecification(final DN rootDN,
final DN relativeBaseDN, final int minimumDepth,
@@ -1439,7 +1439,7 @@
/**
* Get the maximum depth of the subtree specification.
*
- * @return Returns the maximum depth (<0 indicates unlimited depth).
+ * @return Returns the maximum depth (less than 0 indicates unlimited depth).
*/
public int getMaximumDepth()
{
diff --git a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/DirectoryServerTestCase.java b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/DirectoryServerTestCase.java
index 91a8b11..8e292d0 100644
--- a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/DirectoryServerTestCase.java
+++ b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/DirectoryServerTestCase.java
@@ -32,6 +32,7 @@
import org.testng.annotations.Test;
import org.testng.annotations.AfterClass;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.testng.ForgeRockTestCase;
import org.opends.server.replication.ReplicationTestCase;
import java.util.ArrayList;
@@ -51,7 +52,7 @@
*/
@Test(sequential=true)
@SuppressWarnings("javadoc")
-public abstract class DirectoryServerTestCase {
+public abstract class DirectoryServerTestCase extends ForgeRockTestCase {
@BeforeSuite
public final void suppressOutput() {
@@ -113,7 +114,7 @@
* since we might need these again.
*/
@AfterClass(alwaysRun = true)
- public void clearSuccessfulTestParams() {
+ public void clearSuccessfulTestParams2() {
Set<Object[]> paramsSet = successfulTestParams.keySet();
if (paramsSet == null) { // Can this ever happen?
return;
@@ -139,7 +140,7 @@
* all of the subclass methods, so this isn't too dangerous.
*/
@AfterClass(alwaysRun = true)
- public void nullMemberVariablesAfterTest() {
+ public void nullMemberVariablesAfterTest2() {
Class<?> cls = this.getClass();
// Iterate through all of the fields in all subclasses of
// DirectoryServerTestCase, but not DirectoryServerTestCase itself.
diff --git a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/MemoryReductionTestCases.java b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/MemoryReductionTestCases.java
index 8fadf80..a4c4585 100644
--- a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/MemoryReductionTestCases.java
+++ b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/MemoryReductionTestCases.java
@@ -45,7 +45,7 @@
*/
@Test
public void testNullMemberVariablesAfterTest() {
- nullMemberVariablesAfterTest();
+ nullMemberVariablesAfterTest2();
Assert.assertNull(normalMemberStr);
Assert.assertNull(normalMemberObj);
@@ -66,7 +66,7 @@
addParamsFromFailedTest(successfulAndFailed);
addParamsFromFailedTest(failedOnly);
- clearSuccessfulTestParams();
+ clearSuccessfulTestParams2();
Assert.assertEquals(successfulOnly, new String[]{null, null});
Assert.assertEquals(successfulAndFailed, new String[]{"", ""});
diff --git a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/SuiteRunner.java b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/SuiteRunner.java
index d8c7393..3c3ce46 100644
--- a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/SuiteRunner.java
+++ b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/SuiteRunner.java
@@ -40,7 +40,7 @@
} catch (Throwable e) {
originalSystemErr.println("TestNG.main threw an expected exception:");
e.printStackTrace(originalSystemErr);
- System.exit(TestNG.HAS_FAILURE);
+ System.exit(1);
}
}
}
diff --git a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java
index cfb6dba..86df35e 100644
--- a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java
+++ b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java
@@ -286,9 +286,13 @@
testInstallRoot = new File(unitRoot, "package");
testInstanceRoot = testInstallRoot;
}
+ System.out.println("unitRoot=" + unitRoot);
+ System.out.println("testInstallRoot=" + testInstallRoot);
+ System.out.println("testInstanceRoot=" + testInstanceRoot);
File testSrcRoot = new File(buildRoot + File.separator + "tests" +
File.separator + "unit-tests-testng");
+ System.out.println("testSrcRoot=" + testSrcRoot);
String cleanupRequiredString = System.getProperty(PROPERTY_CLEANUP_REQUIRED, "true");
boolean cleanupRequired = !"false".equalsIgnoreCase(cleanupRequiredString);
@@ -327,7 +331,9 @@
// appropriate place under the test package.
File serverClassesDir = new File(buildDir, "classes");
File unitClassesDir = new File(unitRoot, "classes");
- File libDir = new File(buildRoot, "lib");
+ File libDir = new File(buildDirStr + "/package/opendj/lib");
+ File upgradeDir = new File(buildDirStr + "/package/opendj/template/config/upgrade");
+ System.out.println("libDir=" + libDir);
File resourceDir = new File(buildRoot, "resource");
File testResourceDir = new File(testSrcRoot, "resource");
// Set the class variable
@@ -367,6 +373,8 @@
copyDirectory(libDir, testLibDir);
copyDirectory(new File(resourceDir, "bin"), testBinDir);
copyDirectory(new File(resourceDir, "config"), testConfigDir );
+ // copy upgrade directory
+ copyDirectory(upgradeDir, new File(testConfigDir, "upgrade"));
copyDirectory(new File(resourceDir, "schema"),
new File(testSchemaDir, "schema"));
copyDirectory(new File(resourceDir, "MakeLDIF"),
diff --git a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/TestListener.java b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/TestListener.java
index 24b44c0..1d8a737 100644
--- a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/TestListener.java
+++ b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/TestListener.java
@@ -152,6 +152,11 @@
@Override
public void generateReport(List<XmlSuite> xmlSuites, List<ISuite> suites, String outputDirectory) {
+ File outputDir = new File(outputDirectory);
+ if (!outputDir.exists()) {
+ outputDir.mkdir();
+ }
+
File reportFile = new File(outputDirectory, REPORT_FILE_NAME);
writeReportToFile(reportFile);
diff --git a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/TestChildCfgDefn.properties b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/TestChildCfgDefn.properties
index a5d5ac7..76211a9 100644
--- a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/TestChildCfgDefn.properties
+++ b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/TestChildCfgDefn.properties
@@ -1,3 +1,27 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2007-2008 Sun Microsystems, Inc.
+# Portions Copyright 2015 ForgeRock AS
+
user-friendly-name=Test Child
user-friendly-plural-name=Test Children
synopsis=A configuration for testing components that are subordinate to a parent component. It re-uses the virtual-attribute configuration LDAP profile.
diff --git a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/TestParentCfgDefn.properties b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/TestParentCfgDefn.properties
index 2e5c044..ce3bac6 100644
--- a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/TestParentCfgDefn.properties
+++ b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/TestParentCfgDefn.properties
@@ -1,3 +1,27 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2007-2008 Sun Microsystems, Inc.
+# Portions Copyright 2015 ForgeRock AS
+
user-friendly-name=Test Parent
user-friendly-plural-name=Test Parents
synopsis=A configuration for testing components that have child components. It re-uses the virtual-attribute configuration LDAP profile.
diff --git a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestBackendImpl.java b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestBackendImpl.java
index 1bd4671..c75cc05 100644
--- a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestBackendImpl.java
+++ b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestBackendImpl.java
@@ -565,11 +565,23 @@
TestCaseUtils.disableBackend("importRoot");
}
- @Test(expectedExceptions = DirectoryException.class)
+ // Note: this test has been rewritten to avoid expectedException in the test annotation because
+ // it was skipping all tests that depends on this method
+ @Test
public void testAddNoParent() throws Exception {
- for (Entry entry : entries) {
- backend.addEntry(entry, null);
+
+ try
+ {
+ for (Entry entry : entries) {
+ backend.addEntry(entry, null);
+ }
+ failBecauseExceptionWasNotThrown(DirectoryException.class);
}
+ catch (DirectoryException e)
+ {
+ // expected
+ }
+
}
@Test(dependsOnMethods = "testAddNoParent")
diff --git a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/pluggable/PluggableBackendImplTestCase.java b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/pluggable/PluggableBackendImplTestCase.java
index a2d00ea..46f8ea1 100644
--- a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/pluggable/PluggableBackendImplTestCase.java
+++ b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/pluggable/PluggableBackendImplTestCase.java
@@ -102,7 +102,7 @@
/**
* Configures a backend for the specified backend
- *
+ *
* @param homeDirName
* Directory where database file live
* @param testBaseDN
@@ -110,17 +110,17 @@
* @return a backend object.
*/
protected abstract BackendImpl createBackend() throws Exception;
-
+
@BeforeClass
public void setUp() throws Exception
{
// Need the schema to be available, so make sure the server is started.
TestCaseUtils.startServer();
-
+
testBaseDN = DN.valueOf("dc=test,dc=com");
backend = createBackend();
backend.initializeBackend();
-
+
topEntries = TestCaseUtils.makeEntries(
"dn: " + testBaseDN,
"objectclass: top",
@@ -429,7 +429,7 @@
"postalCode: 93507",
"postalAddress: Ardyth Bainton$81170 Taylor Street$Syracuse, WV 93507",
"description: This is the description for Ardyth Bainton.");
-
+
workEntries = TestCaseUtils.makeEntries(
"dn: uid=user.11,ou=People," + testBaseDN,
"objectClass: top",
@@ -480,13 +480,13 @@
"postalCode: 60905",
"postalAddress: Andaree Asawa$81028 Forest Street$Wheeling, IA 60905",
"description: This is the description for Andaree Asawa.");
-
+
dnToMod = workEntries.get(0).getName();
dnToDel = workEntries.get(1).getName();
searchDN = entries.get(8).getName();
badEntryDN = testBaseDN.child(DN.valueOf("ou=bogus")).child(DN.valueOf("ou=dummy"));
backupID = "backupID1";
-
+
ldifNumberOfEntries = 20;
ldifTemplate = new String [] {
"define suffix=" + testBaseDN,
@@ -534,7 +534,10 @@
{
try
{
- backend.removeBackup(backupDirectory, backupID);
+ if (backupDirectory != null)
+ {
+ backend.removeBackup(backupDirectory, backupID);
+ }
}
catch (DirectoryException ignore)
{
@@ -605,7 +608,7 @@
assertEquals(backend.hasSubordinates(searchDN), ConditionResult.FALSE,
"Leaf entry should not have any subordinates.");
}
-
+
private List<SearchResultEntry> runSearch(SearchRequest request, boolean useInternalConnection) throws Exception
{
InternalClientConnection conn = getRootConnection();
@@ -622,19 +625,19 @@
return search.getSearchEntries();
}
}
-
+
@Test(dependsOnMethods = { "testAdd", "testModifyEntry", "testRenameEntry", "testDeleteAlreadyDeletedEntry" })
public void testBaseSearch() throws Exception
{
baseSearch(false);
baseSearch(true);
}
-
+
private void baseSearch(boolean useInternalConnection) throws Exception
{
SearchRequest request = newSearchRequest(testBaseDN, SearchScope.BASE_OBJECT, "objectclass=*");
List<SearchResultEntry> result = runSearch(request, useInternalConnection);
-
+
assertEquals(result.size(), 1, "Base Search should return only one Entry");
assertEquals(result.get(0).getName(), testBaseDN, "Base Search on the suffix should return the suffix itself");
}
@@ -650,7 +653,7 @@
{
SearchRequest request = newSearchRequest(testBaseDN, SearchScope.SINGLE_LEVEL, "objectclass=*");
List<SearchResultEntry> result = runSearch(request, useInternalConnection);
-
+
assertEquals(result.size(), 1, "One Level search should return a single child entry");
SearchResultEntry resEntry = result.get(0);
assertEquals(topEntries.get(1).getName(), resEntry.getName(),
@@ -668,7 +671,7 @@
{
SearchRequest request = newSearchRequest(testBaseDN, SearchScope.WHOLE_SUBTREE, "objectclass=*");
List<SearchResultEntry> result = runSearch(request, useInternalConnection);
-
+
// Sum of all entry sets minus a delete
assertEquals(result.size(), getTotalNumberOfLDIFEntries() - 1,
"Subtree search should return a correct number of entries");
@@ -685,7 +688,7 @@
{
SearchRequest request = newSearchRequest(searchDN, SearchScope.BASE_OBJECT, "objectclass=*");
List<SearchResultEntry> result = runSearch(request, useInternalConnection);
-
+
assertEquals(result.size(), 1, "User entry search should return a single child entry");
assertEquals(searchDN, result.get(0).getName(), "User entry search should return the expected entry");
}
@@ -695,7 +698,7 @@
{
Assertions.assertThat(getDbEntries(entries)).isEqualTo(entries);
}
-
+
private List<Entry> getDbEntries(List<Entry> entries) throws DirectoryException
{
List<Entry> result = new ArrayList<Entry>(entries.size());
@@ -739,7 +742,7 @@
modifyAttribute = DirectoryServer.getAttributeType("jpegphoto");
newEntry.applyModifications(Arrays.asList(new Modification(ADD, create(modifyAttribute, modifyValue))));
-
+
backend.replaceEntry(oldEntry, newEntry, null);
assertTrue(backend.getEntry(oldEntry.getName()).hasValue(modifyAttribute, null, modifyValue));
}
@@ -749,7 +752,7 @@
{
deleteEntry(dnToDel);
}
-
+
@Test(dependsOnMethods = "testDeleteEntry", expectedExceptions = DirectoryException.class)
public void testDeleteAlreadyDeletedEntry() throws Exception
{
@@ -761,7 +764,7 @@
backend.deleteEntry(dn, null);
assertNull(backend.getEntry(workEntries.get(1).getName()));
}
-
+
@Test(dependsOnMethods = { "testBaseSearch", "testOneLevelSearch", "testSubTreeSearch", "testUserEntrySearch" })
public void testImportLDIF() throws Exception
{
diff --git a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/util/TestStaticUtils.java b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/util/TestStaticUtils.java
index fdf2625..830fa42 100644
--- a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/util/TestStaticUtils.java
+++ b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/util/TestStaticUtils.java
@@ -920,7 +920,7 @@
*
* @throws Exception If the test failed unexpectedly.
*/
- @Test(groups={"windows"}, expectedExceptions=IOException.class)
+ @Test(enabled=false, groups={"windows"}, expectedExceptions=IOException.class)
public void testRenameFileLockedTarget() throws Exception {
File src = File.createTempFile("src", null);
File target = File.createTempFile("target", null);
--
Gitblit v1.10.0