Fix up library versions and classpath

Use new parser pool

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

diff --git a/.classpath b/.classpath
index b17ed03..73117c0 100644 (file)
--- a/.classpath
+++ b/.classpath
@@ -1,19 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry kind="src" path="src"/>
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry kind="src" path="src"/>

+    <classpathentry kind="src" path="tests"/>

        <classpathentry excluding="*|classpath/" including="META-INF" kind="src" path="resources"/>
        <classpathentry kind="src" path="resources/classpath"/>
        <classpathentry excluding="*|classpath/" including="META-INF" kind="src" path="resources"/>
        <classpathentry kind="src" path="resources/classpath"/>

-       <classpathentry kind="src" path="tests"/>

        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>

-       <classpathentry exported="true" kind="lib" path="lib/jargs-0.4.jar"/>
-       <classpathentry kind="lib" path="build-lib/ant-1.6.3.jar"/>
-       <classpathentry kind="lib" path="build-lib/ant-contrib.jar"/>
-       <classpathentry kind="lib" path="build-lib/antext-04Jul2006.jar"/>
-       <classpathentry kind="lib" path="build-lib/ant-junit-1.6.3.jar"/>
-       <classpathentry kind="lib" path="build-lib/ant-launcher-1.6.3.jar"/>
-       <classpathentry kind="lib" path="build-lib/ant-nodeps-1.6.3.jar"/>
-       <classpathentry kind="lib" path="build-lib/mockrunner-servlet.jar"/>

        <classpathentry combineaccessrules="false" exported="true" kind="src" path="/java-shib-common"/>
        <classpathentry combineaccessrules="false" exported="true" kind="src" path="/java-shib-common"/>

-       <classpathentry kind="lib" path="build-lib/jsp-2.0.jar"/>
+       <classpathentry kind="lib" path="build-lib/servlet-2.4.jar"/>
+       <classpathentry kind="lib" path="build-lib/junit-3.8.1.jar"/>

        <classpathentry kind="output" path="bin"/>
 </classpath>
        <classpathentry kind="output" path="bin"/>
 </classpath>

diff --git a/build-lib/ant-junit-1.6.3.jar b/build-lib/ant-1.6.5-junit.jar
similarity index 93%
rename from build-lib/ant-junit-1.6.3.jar
rename to build-lib/ant-1.6.5-junit.jar
index 7f508c3..5ee4f7f 100644 (file)
Binary files a/build-lib/ant-junit-1.6.3.jar and b/build-lib/ant-1.6.5-junit.jar differ

diff --git a/build-lib/ant-launcher-1.6.3.jar b/build-lib/ant-1.6.5-launcher.jar
similarity index 84%
rename from build-lib/ant-launcher-1.6.3.jar
rename to build-lib/ant-1.6.5-launcher.jar
index 5355ccc..1a71612 100644 (file)
Binary files a/build-lib/ant-launcher-1.6.3.jar and b/build-lib/ant-1.6.5-launcher.jar differ

diff --git a/build-lib/ant-nodeps-1.6.3.jar b/build-lib/ant-1.6.5-nodeps.jar
similarity index 92%
rename from build-lib/ant-nodeps-1.6.3.jar
rename to build-lib/ant-1.6.5-nodeps.jar
index 5f0a54c..3e0e5d4 100644 (file)
Binary files a/build-lib/ant-nodeps-1.6.3.jar and b/build-lib/ant-1.6.5-nodeps.jar differ

diff --git a/build-lib/ant-1.6.3.jar b/build-lib/ant-1.6.5.jar
similarity index 86%
rename from build-lib/ant-1.6.3.jar
rename to build-lib/ant-1.6.5.jar
index 15aae90..3beb3b8 100644 (file)
Binary files a/build-lib/ant-1.6.3.jar and b/build-lib/ant-1.6.5.jar differ

diff --git a/build-lib/ant-contrib.jar b/build-lib/ant-contrib-1.0b2.jar
similarity index 72%
rename from build-lib/ant-contrib.jar
rename to build-lib/ant-contrib-1.0b2.jar
index 68ed490..ea817cd 100644 (file)
Binary files a/build-lib/ant-contrib.jar and b/build-lib/ant-contrib-1.0b2.jar differ

diff --git a/build-lib/jsp-2.0.jar b/build-lib/jsp-2.0.jar
deleted file mode 100644 (file)
index 073461b..0000000
Binary files a/build-lib/jsp-2.0.jar and /dev/null differ

diff --git a/build-lib/junit-3.8.1.jar b/build-lib/junit-3.8.1.jar
new file mode 100644 (file)
index 0000000..674d71e
Binary files /dev/null and b/build-lib/junit-3.8.1.jar differ

diff --git a/build-lib/mockrunner-servlet.jar b/build-lib/mockrunner-servlet.jar
deleted file mode 100644 (file)
index b89e3db..0000000
Binary files a/build-lib/mockrunner-servlet.jar and /dev/null differ

diff --git a/build-lib/servlet-2.4.jar b/build-lib/servlet-2.4.jar
new file mode 100644 (file)
index 0000000..ea36070
Binary files /dev/null and b/build-lib/servlet-2.4.jar differ

diff --git a/lib/jargs-0.4.jar b/lib/jargs-0.4.jar
deleted file mode 100644 (file)
index 92d9b9b..0000000
Binary files a/lib/jargs-0.4.jar and /dev/null differ