servlet-api 2.5 - to be on par with mvn

Author: tarzanek

.gitignore

@@ -29,6 +29,7 @@ jdepend/report.xml
 lib/derby.jar
 lib/jrcs.jar
 lib/lucene-*
+lib/servlet-api-*
 derby.log
 opengrok*.log
 nbproject/genfiles.properties

README.txt

@@ -38,18 +38,18 @@ Offical page of the project is on:
     * Latest Java (At least 1.8)
       http://www.oracle.com/technetwork/java/
     * A servlet container like Tomcat (8.x or later)
-      supporting Servlet 2.4 and JSP 2.0
+      supporting Servlet 2.5 and JSP 2.1
       http://tomcat.apache.org/
     * Exuberant Ctags
       http://ctags.sourceforge.net/
     * Source Code Management installation
       depending on type of repositories indexed
     * If you want to build OpenGrok:
-      - Ant (1.9.3 and later)
+      - Ant (1.9.4 and later)
         http://ant.apache.org/
       - JFlex
         http://www.jflex.de/
-      - Netbeans (optional, at least 8.0, will need Ant 1.9.3)
+      - Netbeans (optional, at least 8.0, will need Ant 1.9.4)
         http://netbeans.org/
 
 3. Usage

build.xml

@@ -282,7 +282,7 @@ Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
     </target>
 
     <property name="coverage.dir" value="${basedir}/coverage"/>
-    <target name="-pre-compile" depends="jrcs,jflex,download-lucene"/>
+    <target name="-pre-compile" depends="jrcs,jflex,download-lucene,download-servlet-api"/>
     <target name="eclipse" depends="-pre-compile"
         description="satisfy eclipse dependencies"/>
     <target name="-post-clean">
@@ -390,11 +390,32 @@ Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
         dest="lib/${lucene-suggest.jar}" verbose="true" usetimestamp="true"/>
     </target>
 
+    <target name="-check-servlet-api" description="Check that servlet-api jar file is present">
+        <available file="${servlet-api.jar}" type="file" property="servlet-api.jar.present">
+            <filepath refid="plainlib.search.path"/>
+        </available>        
+        <condition property="servlet-api_not_downloaded">
+            <not>            
+                <isset property="servlet-api.jar.present"/>
+             </not>
+        </condition>
+    </target>
+
+    <target name="download-servlet-api" depends="-check-servlet-api" if="servlet-api_not_downloaded">
+        <delete>
+         <fileset dir="lib">
+          <include name="servlet-api-*.jar"/>
+         </fileset>
+        </delete>
+        <get src="${mvn.repository}/javax/servlet/servlet-api/${servlet-api.version}/${servlet-api.jar}"
+        dest="lib/${servlet-api.jar}" verbose="true" usetimestamp="true"/>        
+    </target>
+
     <target name="-post-jar" depends="-copy-lib-without-netbeans">
         <war destfile="${dist.war}" webxml="web/WEB-INF/web.xml">
             <fileset dir="web" excludes="META-INF/context.xml"/>
             <lib dir="${dist.dir}" includes="opengrok.jar"/>
-            <lib dir="${dist.dir}/lib" includes="*.jar" excludes="servlet-api.jar"/>
+            <lib dir="${dist.dir}/lib" includes="*.jar" excludes="${servlet-api.jar}"/>
         </war>
         <echo message="Generating man page.."/>
         <java classname="org.opensolaris.opengrok.index.CommandLineOptions"
@@ -439,7 +460,7 @@ Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
                 <include name="opengrok.jar"/>
                 <include name="source.war"/>
                 <include name="lib/*"/>
-                <exclude name="lib/servlet-api.jar"/>
+                <exclude name="lib/${servlet-api.jar}"/>
             </tarfileset>
             <tarfileset dir="${dist.dir}" prefix="${distname}-${version}/man/man1">
                 <include name="opengrok.1"/>

lib/servlet-api.jar

@@ -50,12 +50,14 @@ lucene-core.jar=lucene-core-${lucene.version}.jar
 lucene-analyzers-common.jar=lucene-analyzers-common-${lucene.version}.jar
 lucene-queryparser.jar=lucene-queryparser-${lucene.version}.jar
 lucene-suggest.jar=lucene-suggest-${lucene.version}.jar
+servlet-api.version=2.5
+servlet-api.jar=servlet-api-${servlet-api.version}.jar
 file.reference.lucene-core.jar=lib/${lucene-core.jar}
 file.reference.lucene-analyzers-common.jar=lib/${lucene-analyzers-common.jar}
 file.reference.lucene-queryparser.jar=lib/${lucene-queryparser.jar}
 file.reference.lucene-suggest.jar=lib/${lucene-suggest.jar}
 file.reference.json-simple-1.1.1.jar=lib/json-simple-1.1.1.jar
-file.reference.servlet-api.jar=lib/servlet-api.jar
+file.reference.servlet-api.jar=lib/${servlet-api.jar}
 file.reference.swing-layout-0.9.jar=lib/swing-layout-0.9.jar
 includes=**
 jar.compress=false