diff --git a/catalog/catalog-app/src/main/resources/features.xml b/catalog/catalog-app/src/main/resources/features.xml index 657aed893221..f33cce04cf98 100644 --- a/catalog/catalog-app/src/main/resources/features.xml +++ b/catalog/catalog-app/src/main/resources/features.xml @@ -119,7 +119,7 @@ mvn:ddf.catalog.core/catalog-core-sourcemetricsplugin/${project.version} - catalog-app mvn:ddf.catalog.core/catalog-core-backupplugin/${project.version} diff --git a/catalog/core/catalog-core-backupplugin/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/catalog/core/catalog-core-backupplugin/src/main/resources/OSGI-INF/blueprint/blueprint.xml index 790cef08a4c1..737605e1cc67 100644 --- a/catalog/core/catalog-core-backupplugin/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/catalog/core/catalog-core-backupplugin/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -15,16 +15,16 @@ xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0"> - + - - + diff --git a/catalog/core/catalog-core-backupplugin/src/main/resources/OSGI-INF/metatype/metatype.xml b/catalog/core/catalog-core-backupplugin/src/main/resources/OSGI-INF/metatype/metatype.xml index dbc5df266339..bac11c92fdfc 100644 --- a/catalog/core/catalog-core-backupplugin/src/main/resources/OSGI-INF/metatype/metatype.xml +++ b/catalog/core/catalog-core-backupplugin/src/main/resources/OSGI-INF/metatype/metatype.xml @@ -13,13 +13,8 @@ --> - - - + - - + + - \ No newline at end of file + diff --git a/distribution/docs/src/main/jdocs/content/_configuring/managing-certificates-contents.adoc b/distribution/docs/src/main/jdocs/content/_configuring/managing-certificates-contents.adoc index 2c989c93ca21..9d0ae3c422ee 100644 --- a/distribution/docs/src/main/jdocs/content/_configuring/managing-certificates-contents.adoc +++ b/distribution/docs/src/main/jdocs/content/_configuring/managing-certificates-contents.adoc @@ -131,14 +131,6 @@ For example: `127.0.0.1 ` ==== -[NOTE] -==== -By default, the Catalog Backup Post-Ingest Plugin is *NOT* enabled. -To enable, the Enable Backup Plugin configuration item must be checked in the Backup Post-Ingest Plugin configuration. - -`Enable Backup Plugin: true` -==== - .Changing Default Passwords [NOTE] ==== diff --git a/distribution/docs/src/main/jdocs/content/_running/ingesting-contents.adoc b/distribution/docs/src/main/jdocs/content/_running/ingesting-contents.adoc index c19a3b005e81..5aef56dbc689 100644 --- a/distribution/docs/src/main/jdocs/content/_running/ingesting-contents.adoc +++ b/distribution/docs/src/main/jdocs/content/_running/ingesting-contents.adoc @@ -167,11 +167,6 @@ Therefore, whether an administrator's data store is from Oracle, Solr, or any ot ==== Automatic Catalog Backup To backup local catalog records, a <<_catalog_backup_plugin,Catalog Backup Plugin>> is available. -It is disabled by default for performance reasons. +It is not installed by default for performance reasons. -It can be enabled and configured in the *${admin-console}: - -. Navigate to the *${admin-console}. -. Select the *${ddf-catalog} application. -. Select the *Configuration* tab. -. Select the <<_catalog_backup_plugin,Backup Post-Ingest Plugin>>. +It can be installed and configured in the *${admin-console}* (see <<_catalog_backup_plugin,Catalog Backup Plugin>> for instructions). diff --git a/distribution/docs/src/main/resources/_contents/_catalog-contents/managing-catalog-contents.adoc b/distribution/docs/src/main/resources/_contents/_catalog-contents/managing-catalog-contents.adoc index 8a529347997f..f5298181d6d8 100644 --- a/distribution/docs/src/main/resources/_contents/_catalog-contents/managing-catalog-contents.adoc +++ b/distribution/docs/src/main/resources/_contents/_catalog-contents/managing-catalog-contents.adoc @@ -26,7 +26,7 @@ These configurations are available throught the ${ddf-catalog} application. |ID |Description -include::{adoc-include}/_tables/conf-plugin.backup-table-contents.adoc[] +include::{adoc-include}/_tables/conf-ddf.catalog.backup.CatalogBackupPlugin-table-contents.adoc[] include::{adoc-include}/_tables/conf-OpenSearchSource-table-contents.adoc[] diff --git a/distribution/docs/src/main/resources/_contents/_plugins/catalog-backup-plugin-contents.adoc b/distribution/docs/src/main/resources/_contents/_plugins/catalog-backup-plugin-contents.adoc index bbeff0e99dfa..401a396c8233 100644 --- a/distribution/docs/src/main/resources/_contents/_plugins/catalog-backup-plugin-contents.adoc +++ b/distribution/docs/src/main/resources/_contents/_plugins/catalog-backup-plugin-contents.adoc @@ -4,15 +4,22 @@ The Catalog Backup Plugin is used to enable data backup of the catalog and the m ===== Installing the Catalog Backup Plugin -The Catalog Backup Plugin is installed by default with a standard installation in the ${ddf-catalog} application. +The Catalog Backup Plugin is not installed by default with a standard installation. + +To install: + +* Navigate to the *${admin-console}*. +* Navigate to *${ddf-catalog}* application. +* Navigate to *Features* tab. +* Install the *catalog-core-backupplugin* feature. ===== Configuring the Catalog Backup Plugin To configure the Catalog Backup Plugin: . Navigate to the *${admin-console}*. -. Select ${ddf-catalog} application. +. Select *${ddf-catalog}* application. . Select *Configuration* tab. -. Select *Backup Post-Ingest Plugin*. +. Select *Catalog Backup Plugin*. -include::{adoc-include}/_tables/plugin.backup-table-contents.adoc[] +include::{adoc-include}/_tables/ddf.catalog.backup.CatalogBackupPlugin-table-contents.adoc[] diff --git a/distribution/docs/src/main/resources/_contents/_running/ingesting-contents.adoc b/distribution/docs/src/main/resources/_contents/_running/ingesting-contents.adoc index c19a3b005e81..5aef56dbc689 100644 --- a/distribution/docs/src/main/resources/_contents/_running/ingesting-contents.adoc +++ b/distribution/docs/src/main/resources/_contents/_running/ingesting-contents.adoc @@ -167,11 +167,6 @@ Therefore, whether an administrator's data store is from Oracle, Solr, or any ot ==== Automatic Catalog Backup To backup local catalog records, a <<_catalog_backup_plugin,Catalog Backup Plugin>> is available. -It is disabled by default for performance reasons. +It is not installed by default for performance reasons. -It can be enabled and configured in the *${admin-console}: - -. Navigate to the *${admin-console}. -. Select the *${ddf-catalog} application. -. Select the *Configuration* tab. -. Select the <<_catalog_backup_plugin,Backup Post-Ingest Plugin>>. +It can be installed and configured in the *${admin-console}* (see <<_catalog_backup_plugin,Catalog Backup Plugin>> for instructions). diff --git a/distribution/docs/src/main/resources/_contents/_securing/managing-certificates-contents.adoc b/distribution/docs/src/main/resources/_contents/_securing/managing-certificates-contents.adoc index a6fcbc58b769..dcda50058ff1 100644 --- a/distribution/docs/src/main/resources/_contents/_securing/managing-certificates-contents.adoc +++ b/distribution/docs/src/main/resources/_contents/_securing/managing-certificates-contents.adoc @@ -126,14 +126,6 @@ For example: `127.0.0.1 ` ==== -[NOTE] -==== -By default, the Catalog Backup Post-Ingest Plugin is *NOT* enabled. -To enable, the Enable Backup Plugin configuration item must be checked in the Backup Post-Ingest Plugin configuration. - -`Enable Backup Plugin: true` -==== - .Changing Default Passwords [NOTE] ==== diff --git a/distribution/docs/src/main/resources/_contents/_tables/conf-ddf.catalog.backup.CatalogBackupPlugin-table-contents.adoc b/distribution/docs/src/main/resources/_contents/_tables/conf-ddf.catalog.backup.CatalogBackupPlugin-table-contents.adoc new file mode 100644 index 000000000000..184151470b5e --- /dev/null +++ b/distribution/docs/src/main/resources/_contents/_tables/conf-ddf.catalog.backup.CatalogBackupPlugin-table-contents.adoc @@ -0,0 +1,3 @@ +|<> +|ddf.catalog.backup.CatalogBackupPlugin +|Catalog Backup Plugin Configuration diff --git a/distribution/docs/src/main/resources/_contents/_tables/conf-plugin.backup-table-contents.adoc b/distribution/docs/src/main/resources/_contents/_tables/conf-plugin.backup-table-contents.adoc deleted file mode 100644 index eb0e9cab3fb8..000000000000 --- a/distribution/docs/src/main/resources/_contents/_tables/conf-plugin.backup-table-contents.adoc +++ /dev/null @@ -1,4 +0,0 @@ -|<> -|plugin.backup -|Backup Post-Ingest Plugin Configuration - diff --git a/distribution/docs/src/main/resources/_contents/_tables/plugin.backup-table-contents.adoc b/distribution/docs/src/main/resources/_contents/_tables/ddf.catalog.backup.CatalogBackupPlugin-table-contents.adoc similarity index 70% rename from distribution/docs/src/main/resources/_contents/_tables/plugin.backup-table-contents.adoc rename to distribution/docs/src/main/resources/_contents/_tables/ddf.catalog.backup.CatalogBackupPlugin-table-contents.adoc index 551a0dffa9f8..adb0808a092b 100644 --- a/distribution/docs/src/main/resources/_contents/_tables/plugin.backup-table-contents.adoc +++ b/distribution/docs/src/main/resources/_contents/_tables/ddf.catalog.backup.CatalogBackupPlugin-table-contents.adoc @@ -1,4 +1,4 @@ -.[[plugin.backup]]Backup Post-Ingest Plugin +.[[ddf.catalog.backup.CatalogBackupPlugin]]Catalog Backup Plugin [cols="1,1m,1,3,1,1" options="header"] |=== @@ -9,13 +9,6 @@ |Default Value |Required -|Enable Backup Plugin -|enableBackupPlugin -|Boolean -|Enable the Backup Ingest plugin which will write each result to a directory -|true -|false - | Root backup directory path | rootBackupDir | String diff --git a/distribution/test/itests/test-itests-common/src/main/java/org/codice/ddf/itests/common/AbstractIntegrationTest.java b/distribution/test/itests/test-itests-common/src/main/java/org/codice/ddf/itests/common/AbstractIntegrationTest.java index 5300e20ffb9e..e5f66a4715d5 100644 --- a/distribution/test/itests/test-itests-common/src/main/java/org/codice/ddf/itests/common/AbstractIntegrationTest.java +++ b/distribution/test/itests/test-itests-common/src/main/java/org/codice/ddf/itests/common/AbstractIntegrationTest.java @@ -356,10 +356,6 @@ public void waitForBaseSystemFeatures() { getServiceManager().waitForHttpEndpoint(SERVICE_ROOT + "/catalog/query"); getServiceManager().waitForHttpEndpoint(SERVICE_ROOT + "/csw?_wadl"); - //currently none of the test use this feature but - //it generates a lot of error/warnings so turning it off - getServiceManager().stopFeature(false, "catalog-core-backupplugin"); - getServiceManager().startFeature(true, "search-ui", "search-ui-app", "catalog-ui"); getServiceManager().waitForAllBundles(); } catch (Exception e) {