Commit 58dfd0a2 authored by toaster's avatar toaster
Browse files

[maven-release-plugin] copy for tag 1.6

git-svn-id: https://subversion.umiacs.umd.edu/ace/tags/1.6@96 f1b3a171-7291-4a19-a512-95ad0ad9394a
parents 8b030bad 177e5068
......@@ -17,6 +17,33 @@
<netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<warSourceExcludes>**/footer.jsp</warSourceExcludes>
<webResources>
<resource>
<directory>src/main/webapp</directory>
<filtering>true</filtering>
<includes>
<include>**/footer.jsp</include>
</includes>
</resource>
<!--<resource>
<directory>src/main/webapp</directory>
<filtering>false</filtering>
<excludes>
<exclude>**/footer.jsp</exclude>
</excludes>
</resource>-->
</webResources>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<!-- local ace deps -->
......
......@@ -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);
}
};
}
......@@ -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>
......
......@@ -5,5 +5,5 @@
"http://www.w3.org/TR/html4/loose.dtd">
<div class="footer">
Version 1.6beta2 &copy; 2010, University of Maryland Institute for Advanced Computer Studies. All Rights Reserved. <a href="http://adapt.umiacs.umd.edu/ace">ACE Website</a>
Version ${project.version} &copy; 2010, University of Maryland Institute for Advanced Computer Studies. All Rights Reserved. <a href="http://adapt.umiacs.umd.edu/ace">ACE Website</a>
</div>
......@@ -27,6 +27,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>
......
<?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>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment