litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop

Browse source
This commit is contained in:
tworrall 2013-04-22 15:09:47 -04:00
commit 556af80432
2 changed files with 31 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
webapp/build.xml
View file

@ -9,6 +9,36 @@
====================================================================== -->
<project name="vitroCore" default="describe">
<property environment="env" />
<!-- We must be using a suitable version of Java. -->
<fail>
<condition>
<not>
<or>
<equals arg1="1.7" arg2="${ant.java.version}" />
<equals arg1="1.8" arg2="${ant.java.version}" />
</or>
</not>
</condition>
The Vitro build script requires Java 7 or later.
Java system property java.version = ${java.version}
Java system property java.home = ${java.home}
JAVA_HOME environment variable = ${env.JAVA_HOME}
</fail>
<!-- We must be using a suitable version of Ant. -->
<fail>
<condition>
<not>
<antversion atleast="1.8" />
</not>
</condition>
The Vitro build script requires Ant 1.8 or later.
Ant property ant.version = ${ant.version}
Ant property ant.home = ${ant.home}
ANT_HOME environment variable = ${env.ANT_HOME}
</fail>
<!-- A product script will override appbase.dir, but not corebase.dir -->
<dirname property="corebase.dir" file="${ant.file.vitroCore}" />

3
webapp/src/edu/cornell/mannlib/vitro/webapp/filters/SessionTimeoutLimitingFilter.java
View file

@ -43,8 +43,7 @@ public class SessionTimeoutLimitingFilter implements Filter {
/**
* If this request has a trivial session object -- that is, the user is not
* logged in and not self-editing -- then give it a short expiration
* interval.
* logged in -- then give it a short expiration interval.
*/
private void limitTrivialSession(ServletRequest servletRequest) {
if (!(servletRequest instanceof HttpServletRequest)) {