browse fixes for settings change, build instructions, swap file closing fix

git-svn-id: https://subversion.umiacs.umd.edu/ace/trunk@143 f1b3a171-7291-4a19-a512-95ad0ad9394a

README.building

+ACE uses Maven 3 to compile all sources and create releases. 
+
+Quick build guide:
+ - svn co https://subversion.umiacs.umd.edu/ace/trunk ace
+ - cd ace
+ - mvn package
+ - Look in ace-dist/target for package artifacts 
+  - If you just want the audit manager war, look in ace-am/target
+ - Follow the ACE INSTALL document using the build artifacts
+
+
+Details on ACE Packages used by the maven build:
+ - ace - top level package 
+ - ace-dist - mvn project to create releasable artifacts (packages zip,tgz,etc)
+ - ace-common - common libraries for ace token parsing
+ - ace-ims-api - API for communicating with the ACE IMS (depends on common,ims-ws)
+ - ace-ims-ws - mvn project for autogenerating webservice code from IMS wsdl
+ - ace-am - core audit manager web application

ace-am/src/main/java/edu/umiacs/ace/driver/swap/SwapIterator.java

@@ -294,15 +294,15 @@ if (rootFile.getFullPath().equals("/"))
                         new ThrottledInputStream(connection.getInputStream(), QueryThrottle.getMaxBps(), lastDelay);
                 dis = new DigestInputStream(tis, digest);
                 int read = 0;
-                while ( (read = dis.read(buffer)) >= 0) {
+                while ( (read = dis.read(buffer)) != -1) {
                     fileSize += read;
                     statebean.updateLastChange();
                     statebean.setRead(fileSize);
                 }
                 lastDelay = tis.getSleepTime();
 
-                byte[] hashValue = digest.digest();
                 dis.close();
+                byte[] hashValue = digest.digest();
                 fb.setHash(HashValue.asHexString(hashValue));
                 fb.setFileSize(fileSize);
                 connection.disconnect();

ace-am/src/main/java/edu/umiacs/ace/monitor/compare/CompareResults.java

@@ -69,6 +69,9 @@ public final class CompareResults {
         return unseenSupplied;
     }
 
+    public int getUnseenSuppliedFilesSize() {
+        return unseenSupplied.size();
+    }
     /**
      * Files that exist in the target but not collection
      * @return
@@ -78,14 +81,28 @@ public final class CompareResults {
         return Collections.unmodifiableSet(unseenTarget);
     }
 
+    public int getUnseenTargetFilesSize()
+    {
+        return unseenTarget.size();
+    }
+
     public Set<DifferingDigest> getDifferingDigests() {
         return differingDigests;
     }
 
+    public int getDifferingDigestsSize()
+    {
+        return differingDigests.size();
+    }
+
     public Set<DifferingName> getDifferingNames() {
         return differingNames;
     }
 
+    public int getDifferingNamesSize() {
+        return differingNames.size();
+    }
+
     public static class DifferingName implements Comparable<DifferingName> {
 
         private String compString;

ace-am/src/main/webapp/browse.jsp

@@ -187,7 +187,7 @@ on Libraries node in Projects view can be used to add the JSTL 1.1 library.
                         <a href="Summary?collectionid=${selectedFile.root.parentCollection.id}&amp;itemid=${selectedFile.root.id}&amp;output=digest">Download&nbsp;Digests</a>&nbsp;&nbsp;&nbsp;&nbsp;
                         <a href="Summary?collectionid=${selectedFile.root.parentCollection.id}&amp;itemid=${selectedFile.root.id}&amp;output=checkm">Checkm&nbsp;Manifest</a>&nbsp;&nbsp;&nbsp;&nbsp;
 
-                        <c:if test="${selectedFile.root.parentCollection.proxyData}">
+                        <c:if test="${selectedFile.root.parentCollection.settings['proxy.data']}">
                             <a href="Summary?collectionid=${selectedFile.root.parentCollection.id}&amp;itemid=${selectedFile.root.id}&amp;output=wget">Web&nbsp;Crawler&nbsp;URL&nbsp;List</a>
                         </c:if>
 

ace-am/src/main/webapp/comparison.jsp

@@ -57,21 +57,21 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
                     <h3>Collection Differences</h3>
                 <pre>${results.message}</pre>
                     
-                    <h4>Files monitored here, but not in supplied/remote</h4>
+                    <h4>Files monitored here, but not in supplied/remote (${results.unseenTargetFilesSize})</h4>
                     <ul>
                         <c:forEach items="${results.unseenTargetFiles}" var="item" >
                             <li> ${item} </li>
                         </c:forEach>
                     </ul>
                     
-                    <h4>Files in supplied/remote, but not monitored here</h4>
+                    <h4>Files in supplied/remote, but not monitored here (${results.unseenSuppliedFilesSize})</h4>
                     <ul>
                         <c:forEach items="${results.unseenSuppliedFiles}" var="item" >
                             <li> ${item} </li>
                         </c:forEach>
                     </ul>
                     
-                    <h4>Files with different names, but same digests</h4>
+                    <h4>Files with different names, but same digests (${results.differingNamesSize})</h4>
                     <c:forEach items="${results.differingNames}" var="item" >
                         <ul>
                             <li>Hash: ${item.digest}</li>
@@ -82,7 +82,7 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
                         </ul>
                     </c:forEach>
                     
-                    <h4>Files with same names, but different digests</h4>
+                    <h4>Files with same names, but different digests (${results.differingDigestsSize})</h4>
                     <c:forEach items="${results.differingDigests}" var="item" >
                         <ul>
                             <li>Name: ${item.name}</li>