Fixed problem with combining deploy xml and cmd argument definition o…

…f bundler zip.
netarchivesuite · Jul 9, 2015 · f466144 · f466144
1 parent 834eafa
commit f466144
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/deploy/deploy-core/src/main/java/dk/netarkivet/deploy/DeployApplication.java b/deploy/deploy-core/src/main/java/dk/netarkivet/deploy/DeployApplication.java
@@ -543,7 +543,8 @@ private static class ArgumentParameters {
             options.addOption(Constants.ARG_JAR_FOLDER, HAS_ARG, "[OPTIONAL] Installing the external jar library "
                     + "files within the given folder.");
             options.addOption(Constants.ARG_SOURCE_ENCODING, HAS_ARG, "[OPTIONAL] Encoding to use for source files.");
-            options.addOption(Constants.ARG_DEFAULT_BUNDLER_ZIP, HAS_ARG, "[OPTIONAL] The bundled harvester to use.");
+            options.addOption(Constants.ARG_DEFAULT_BUNDLER_ZIP, HAS_ARG, "[OPTIONAL] The bundled harvester to use. "
+                    + "If not provided here the bundler needs to be provided in the settings for each (H3) harvester");
         }
 
         /**

diff --git a/deploy/deploy-core/src/main/java/dk/netarkivet/deploy/LinuxMachine.java b/deploy/deploy-core/src/main/java/dk/netarkivet/deploy/LinuxMachine.java
@@ -79,7 +79,7 @@ public LinuxMachine(Element subTreeRoot, XmlStructure parentSettings, Parameters
         for (Application app : applications) {
             if (app.isBundledHarvester()) {
                 bundlesArr = app.getSettingsValues(Constants.SETTINGS_HARVEST_HERITRIX3_BUNDLE_LEAF);
-                if ((bundlesArr != null || bundlesArr.length == 0)
+                if ((bundlesArr == null || bundlesArr.length == 0)
                         && deployConfiguration.getDefaultBundlerZip().isPresent()) {
                     bundlesArr = new String[] { deployConfiguration.getDefaultBundlerZip().get().getAbsolutePath() };
                 } else if ((bundlesArr == null || bundlesArr.length == 0)

diff --git a/deploy/distribution/src/main/resources/examples/deploy_standalone_example.xml b/deploy/distribution/src/main/resources/examples/deploy_standalone_example.xml
@@ -232,7 +232,7 @@ National Library.
                 <jmxUsername>controlRole</jmxUsername>
                 <jmxPassword>R_D</jmxPassword>
               </heritrix>
-              <serverDir>harvester3_low</serverDir>
+              <serverDir>harvester_snapshot</serverDir>
             </harvesting>
           </harvester>
         </settings>
@@ -260,7 +260,7 @@ National Library.
                 <jmxUsername>controlRole</jmxUsername>
                 <jmxPassword>R_D</jmxPassword>
               </heritrix>
-              <serverDir>harvester3_high</serverDir>
+              <serverDir>harvester_focused</serverDir>
             </harvesting>
           </harvester>
         </settings>