Ensure the servlet API (needed by the aacli) is on the classpath but not within the WAR

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/branches/REL_2@2799 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/pom.xml b/pom.xml
index 2f5e348..727604f 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -41,14 +41,14 @@
         </dependency>
         
         <!-- Provided dependencies -->
+                
+        <!-- Runtime dependencies -->
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
             <version>2.4</version>
-            <scope>provided</scope>
+            <scope>runtime</scope>
         </dependency>
-                
-        <!-- Runtime dependencies -->
         <dependency>
             <groupId>org.apache.xerces</groupId>
             <artifactId>xml-apis</artifactId>

diff --git a/src/installer/resources/build.xml b/src/installer/resources/build.xml
index 0e14cd7..ea7e07a 100755 (executable)
--- a/src/installer/resources/build.xml
+++ b/src/installer/resources/build.xml
@@ -169,7 +169,7 @@
 
         <!-- build the war file -->
         <war warfile="${installer.dir}/${war.name}.war" webxml="${installer.dir}/web.xml">
-            <lib dir="${basedir}/lib" />
+            <lib dir="${basedir}/lib" excludesfile="servlet-api*.jar"/>
             <webinf dir="${webapp.dir}/WEB-INF" excludes="web.xml" />
             <fileset dir="${webapp.dir}" excludes="WEB-INF/**" />
         </war>