Merge pull request ome#5771 from jburel/inplace-import

Inplace import

components/blitz/src/ome/formats/importer/cli/CommandLineImporter.java

@@ -419,7 +419,7 @@ public static void advUsage() {
             + "          cp              \t# Use local copy command.\n"
             + "          cp_rm           \t# Caution! Copy followed by source deletion.\n\n"
             + "\n"
-            + "  e.g. $ bin/omero import -- --transfer=ln_s foo.tiff\n"
+            + "  e.g. $ bin/omero import --transfer=ln_s foo.tiff\n"
             + "       $ ./importer-cli --transfer=ln bar.tiff\n"
             + "       $ CLASSPATH=mycode.jar ./importer-cli --transfer=com.example.MyTransfer baz.tiff\n"
             + "\n"
@@ -442,16 +442,16 @@ public static void advUsage() {
             + "    --exclude=filename      \tExclude files based on filename.\n\n"
             + "    --exclude=clientpath    \tExclude files based on the original path.\n\n"
             + "\n"
-            + "  e.g. $ bin/omero import -- --exclude=filename foo.tiff # First-time imports\n"
-            + "       $ bin/omero import -- --exclude=filename foo.tiff # Second-time skips\n"
+            + "  e.g. $ bin/omero import --exclude=filename foo.tiff # First-time imports\n"
+            + "       $ bin/omero import --exclude=filename foo.tiff # Second-time skips\n"
             + "\n"
             + "  Import speed:\n"
             + "  -------------\n\n"
             + "    --checksum-algorithm=ARG\tChoose a possibly faster algorithm for detecting file corruption,\n"
             + "                            \te.g. Adler-32 (fast), CRC-32 (fast), File-Size-64 (fast),\n"
             + "                            \t     MD5-128, Murmur3-32, Murmur3-128,\n"
             + "                            \t     SHA1-160 (slow, default)\n\n"
-            + "  e.g. $ bin/omero import -- --checksum-algorithm=CRC-32 foo.tiff\n"
+            + "  e.g. $ bin/omero import --checksum-algorithm=CRC-32 foo.tiff\n"
             + "       $ ./importer-cli --checksum-algorithm=Murmur3-128 bar.tiff\n\n"
             + "    --no-stats-info\t\tDisable calculation of minima and maxima"
             + " when as part of the Bio-Formats reader metadata\n\n"
@@ -469,10 +469,10 @@ public static void advUsage() {
             + "    --qa-baseurl=ARG\tSpecify the base URL for reporting feedback\n"
             + "  e.g. $ bin/omero import broken_image.tif"
             + " -- --email EMAIL --report --upload --logs"
-            + " --qa-baseurl=https://qa.staging.openmicroscopy.org/qa\n"
+            + " --qa-baseurl=http://qa.example.com\n"
             + "       $ ./importer-cli broken_image.tif"
             + " --email EMAIL --report --upload --logs"
-            + " --qa-baseurl=https://qa.staging.openmicroscopy.org/qa\n"
+            + " --qa-baseurl=http://qa.openmicroscopy.org.uk/qa\n"
             + "\n"
             + "Report bugs to <[email protected]>");
         System.exit(1);