Fix for DS-3440 replacing sword-server config reference with

swordv2-server in swordv2
This commit is contained in:
cjuergen
2017-01-05 13:03:53 +01:00
parent 740486cf1c
commit d95902b680

View File

@@ -96,7 +96,7 @@ public class SwordMETSContentIngester extends AbstractSwordContentIngester
File depositFile = deposit.getFile(); File depositFile = deposit.getFile();
// load the plugin manager for the required configuration // load the plugin manager for the required configuration
String cfg = ConfigurationManager.getProperty("sword-server", String cfg = ConfigurationManager.getProperty("swordv2-server",
"mets-ingester.package-ingester"); "mets-ingester.package-ingester");
if (cfg == null || "".equals(cfg)) if (cfg == null || "".equals(cfg))
{ {
@@ -117,7 +117,7 @@ public class SwordMETSContentIngester extends AbstractSwordContentIngester
// Should restore mode be enabled, i.e. keep existing handle? // Should restore mode be enabled, i.e. keep existing handle?
if (ConfigurationManager.getBooleanProperty( if (ConfigurationManager.getBooleanProperty(
"sword-server", "restore-mode.enable", false)) "swordv2-server", "restore-mode.enable", false))
{ {
params.setRestoreModeEnabled(true); params.setRestoreModeEnabled(true);
} }
@@ -226,7 +226,7 @@ public class SwordMETSContentIngester extends AbstractSwordContentIngester
// load the plugin manager for the required configuration // load the plugin manager for the required configuration
String cfg = ConfigurationManager.getProperty( String cfg = ConfigurationManager.getProperty(
"sword-server", "mets-ingester.package-ingester"); "swordv2-server", "mets-ingester.package-ingester");
if (cfg == null || "".equals(cfg)) if (cfg == null || "".equals(cfg))
{ {
cfg = "METS"; // default to METS cfg = "METS"; // default to METS
@@ -246,7 +246,7 @@ public class SwordMETSContentIngester extends AbstractSwordContentIngester
// Should restore mode be enabled, i.e. keep existing handle? // Should restore mode be enabled, i.e. keep existing handle?
if (ConfigurationManager.getBooleanProperty( if (ConfigurationManager.getBooleanProperty(
"sword-server", "restore-mode.enable", false)) "swordv2-server", "restore-mode.enable", false))
{ {
params.setRestoreModeEnabled(true); params.setRestoreModeEnabled(true);
} }