removed unnecessary repos from pom.xml; a few more words in the advan…

…ced guide; #6505
IQSS · Jun 26, 2020 · 96c3708 · 96c3708
1 parent 72394a4
commit 96c3708
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 30 deletions.
diff --git a/doc/sphinx-guides/source/installation/advanced.rst b/doc/sphinx-guides/source/installation/advanced.rst
@@ -43,18 +43,20 @@ Standalone "Zipper" Service Tool
 ++++++++++++++++++++++++++++++++
 
 As of Dataverse v5.0 we offer an experimental optimization for the
-multi-file, download-as-zip functionality. If this option is enabled,
-instead of enforcing size limits, we attempt to serve all the files
-that the user requested (that they are authorized to download), but
-the request is redirected to a standalone zipper service running as a
-cgi-bin executable under Apache. Thus moving these potentially
+multi-file, download-as-zip functionality. If this option
+(``:CustomZipDownloadServiceUrl``) is enabled, instead of enforcing
+the size limit on multi-file zipped downloads (as normally specified
+by the option ``:ZipDownloadLimit``), we attempt to serve all the
+files that the user requested (that they are authorized to download),
+but the request is redirected to a standalone zipper service running
+as a cgi-bin executable under Apache. Thus moving these potentially
 long-running jobs completely outside the Application Server (Payara);
 and preventing worker threads from becoming locked serving them. Since
 zipping is also a CPU-intensive task, it is possible to have this
-service running on a different host system, thus freeing the cycles on
-the main Application Server. (The system running the service needs to
-have access to the database as well as to the storage filesystem,
-and/or S3 bucket).
+service running on a different host system, freeing the cycles on the
+main Application Server. (The system running the service needs to have
+access to the database as well as to the storage filesystem, and/or S3
+bucket).
 
 Please consult the scripts/zipdownload/README.md in the Dataverse 5
 source tree for more information. 

diff --git a/scripts/zipdownload/pom.xml b/scripts/zipdownload/pom.xml
@@ -29,27 +29,6 @@
             <url>https://repo1.maven.org/maven2</url>
             <layout>default</layout>
         </repository>
-        <repository>
-            <id>prime-repo</id>
-            <name>PrimeFaces Maven Repository</name>
-            <url>https://repository.primefaces.org</url>
-            <layout>default</layout>
-        </repository>
-        <repository>
-            <id>dataone.org</id>
-            <url>https://maven.dataone.org</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>dvn.private</id>
-            <name>Local repository for hosting jars not available from network repositories.</name>
-            <url>file://${project.basedir}/local_lib</url>
-        </repository>
     </repositories>
     <dependencyManagement>
         <dependencies>

diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/DataverseRequest.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/DataverseRequest.java
@@ -91,6 +91,7 @@ public DataverseRequest(User aUser, HttpServletRequest aHttpServletRequest) {
                     if (index >= 0) {
                         ip = ip.substring(index + 1);
                     }
+                    ip=ip.trim();
                     /*
                      * We should have a valid, single IP address string here. The IpAddress.valueOf
                      * call will throw an exception if it can't be parsed into a valid address (e.g.