changed order on collection settings, fix serializable ws bug, set audit-tokens as default

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

ace-am/src/main/java/edu/umiacs/ace/driver/StorageDriverFactory.java

@@ -36,6 +36,8 @@ import edu.umiacs.ace.monitor.core.Collection;
 import edu.umiacs.ace.driver.srb.SrbAccess;
 import edu.umiacs.ace.driver.swap.SwapFileAccess;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -68,7 +70,9 @@ public final class StorageDriverFactory {
     }
 
     public static final List<String> listResources() {
-        return new ArrayList<String>(implementationMap.keySet());
+        List<String> lt = new ArrayList<String>(implementationMap.keySet());
+        Collections.sort(lt,comp);
+        return lt;
     }
 
     public static final StorageDriver createStorageAccess( Collection c,
@@ -86,4 +90,15 @@ public final class StorageDriverFactory {
             throw new RuntimeException(ex);
         }
     }
+
+    private static final Comparator<String> comp = new Comparator<String>() {
+
+        public int compare(String o1, String o2) {
+            if ("local".equals(o1))
+                return -1;
+            if ("local".equals(o2))
+                return 1;
+            return o1.compareTo(o2);
+        }
+    };
 }

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

@@ -119,13 +119,13 @@ Author     : toaster
             <td>Audit tokens</td>
             <td>
                 <c:choose>
-                    <c:when test="${collection.auditTokens}">
-                        <input type="radio" name="audittokens" value="true" checked>Check Digests
-                        <input type="radio" name="audittokens" value="false">Do Not Check Digests
+                    <c:when test="${!collection.auditTokens && collection.id > 0}">
+                        <input type="radio" name="audittokens" value="true" >Check Digests
+                        <input type="radio" name="audittokens" value="false" checked>Do Not Check Digests
                     </c:when>
                     <c:otherwise>
-                        <input type="radio" name="audittokens" value="true">Check Digests
-                        <input type="radio" name="audittokens" value="false" checked>Do Not Check Digests
+                        <input type="radio" name="audittokens" value="true" checked>Check Digests
+                        <input type="radio" name="audittokens" value="false">Do Not Check Digests
                     </c:otherwise>
                 </c:choose>
             </td>

ace-ims-ws/pom.xml

@@ -28,6 +28,9 @@
 http://ims.umiacs.umd.edu:8080/ace-ims/IMSWebService?wsdl
                    </wsdlUrl>
                  </wsdlUrls>
+                 <bindingFiles>
+                   <bindingFile>${basedir}/src/main/resources/jaxb-bindings.xml</bindingFile>
+                 </bindingFiles>
              <packageName>edu.umiacs.ace.ims.ws</packageName>
                </configuration>
              </execution>

ace-ims-ws/src/main/resources/jaxb-bindings.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<jxb:bindings
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
+    version="1.0">
+    <jxb:bindings schemaLocation="http://ims.umiacs.umd.edu:8080/ace-ims/IMSWebService?xsd=1" node="/xsd:schema">
+        <jxb:globalBindings>
+            <jxb:serializable/>
+        </jxb:globalBindings>
+    </jxb:bindings>
+</jxb:bindings>