Organize libraries, remove old ones

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

diff --git a/.classpath b/.classpath
index 8f6282d..5ee7e10 100644 (file)
--- a/.classpath
+++ b/.classpath
@@ -2,32 +2,26 @@
 <classpath>
        <classpathentry kind="src" path="src"/>
        <classpathentry kind="src" path="tests"/>
-       <classpathentry kind="lib" path="endorsed/resolver.jar"/>
-       <classpathentry kind="lib" path="endorsed/xml-apis.jar"/>
-       <classpathentry kind="lib" path="webApplication/WEB-INF/lib/opensaml-1.1.jar"/>
-       <classpathentry kind="lib" path="webApplication/WEB-INF/lib/struts.jar"/>
-       <classpathentry sourcepath="lib/junit-3.8.1-src.jar" kind="lib" path="lib/junit-3.8.1.jar"/>
-       <classpathentry kind="lib" path="lib/servlet-2.3.jar"/>
-       <classpathentry kind="lib" path="lib/jargs-0.4.jar"/>
-       <classpathentry kind="lib" path="webApplication/WEB-INF/lib/commons-collections.jar"/>
-       <classpathentry kind="lib" path="webApplication/WEB-INF/lib/commons-logging-1.03.jar"/>
-       <classpathentry sourcepath="lib/commons-pool-1.2-src.jar" kind="lib" path="lib/commons-pool-1.2.jar"/>
-       <classpathentry sourcepath="lib/commons-dbcp-1.2.1-src.jar" kind="lib" path="lib/commons-dbcp-1.2.1.jar"/>
-       <classpathentry sourcepath="C:/cvs/xml-security/src" kind="lib" path="webApplication/WEB-INF/lib/xmlsec-20050514.jar"/>
-       <classpathentry kind="lib" path="webApplication/WEB-INF/lib/bc-asn1.jar"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-       <classpathentry kind="lib" path="lib/ant-launcher-1.6.3.jar"/>
-       <classpathentry kind="lib" path="lib/ant-contrib.jar"/>
-       <classpathentry kind="lib" path="lib/ant-1.6.3.jar"/>
-       <classpathentry kind="lib" path="endorsed/xalan.jar"/>
-       <classpathentry kind="lib" path="endorsed/xercesImpl.jar"/>
-       <classpathentry kind="lib" path="testlib/mockrunner-servlet.jar"/>
-       <classpathentry kind="lib" path="webApplication/WEB-INF/lib/commons-codec-1.3.jar"/>
-       <classpathentry kind="lib" path="lib/commons-io-1.1.jar"/>
-       <classpathentry kind="lib" path="webApplication/WEB-INF/lib/bsh-2.0b1.jar"/>
-       <classpathentry kind="lib" path="lib/antext-04Jul2006.jar"/>
        <classpathentry combineaccessrules="false" kind="src" path="/OpenSAML2-J"/>
+       <classpathentry kind="lib" path="build-lib/junit-3.8.1.jar"/>
+       <classpathentry kind="lib" path="build-lib/log4j-1.2.13.jar"/>
+       <classpathentry kind="lib" path="build-lib/servlet-2.3.jar"/>
+       <classpathentry kind="lib" path="lib/bc-asn1.jar"/>
+       <classpathentry kind="lib" path="lib/bsh-2.0b1.jar"/>
+       <classpathentry kind="lib" path="lib/commons-codec-1.3.jar"/>
+       <classpathentry kind="lib" path="lib/commons-collections.jar"/>
+       <classpathentry kind="lib" path="lib/commons-dbcp-1.2.1.jar"/>
+       <classpathentry kind="lib" path="lib/commons-io-1.1.jar"/>
+       <classpathentry kind="lib" path="lib/commons-logging-1.03.jar"/>
+       <classpathentry kind="lib" path="lib/commons-pool-1.2.jar"/>
+       <classpathentry 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 combineaccessrules="false" kind="src" path="/XMLTooling-J"/>
-       <classpathentry kind="lib" path="lib/log4j-1.2.13.jar"/>
-       <classpathentry kind="output" path="webApplication/WEB-INF/classes"/>
+       <classpathentry kind="output" path="bin"/>
 </classpath>

diff --git a/lib/ant-1.6.3.jar b/build-lib/ant-1.6.3.jar
similarity index 100%
rename from lib/ant-1.6.3.jar
rename to build-lib/ant-1.6.3.jar

diff --git a/lib/ant-contrib.jar b/build-lib/ant-contrib.jar
similarity index 100%
rename from lib/ant-contrib.jar
rename to build-lib/ant-contrib.jar

diff --git a/lib/ant-junit-1.6.3.jar b/build-lib/ant-junit-1.6.3.jar
similarity index 100%
rename from lib/ant-junit-1.6.3.jar
rename to build-lib/ant-junit-1.6.3.jar

diff --git a/lib/ant-launcher-1.6.3.jar b/build-lib/ant-launcher-1.6.3.jar
similarity index 100%
rename from lib/ant-launcher-1.6.3.jar
rename to build-lib/ant-launcher-1.6.3.jar

diff --git a/lib/ant-nodeps-1.6.3.jar b/build-lib/ant-nodeps-1.6.3.jar
similarity index 100%
rename from lib/ant-nodeps-1.6.3.jar
rename to build-lib/ant-nodeps-1.6.3.jar

diff --git a/lib/antext-04Jul2006.jar b/build-lib/antext-04Jul2006.jar
similarity index 100%
rename from lib/antext-04Jul2006.jar
rename to build-lib/antext-04Jul2006.jar

diff --git a/lib/junit-3.8.1.jar b/build-lib/junit-3.8.1.jar
similarity index 100%
rename from lib/junit-3.8.1.jar
rename to build-lib/junit-3.8.1.jar

diff --git a/lib/log4j-1.2.13.jar b/build-lib/log4j-1.2.13.jar
similarity index 100%
rename from lib/log4j-1.2.13.jar
rename to build-lib/log4j-1.2.13.jar

diff --git a/lib/servlet-2.3.jar b/build-lib/servlet-2.3.jar
similarity index 100%
rename from lib/servlet-2.3.jar
rename to build-lib/servlet-2.3.jar

diff --git a/endorsed/resolver.jar b/endorsed/resolver.jar
deleted file mode 100644 (file)
index 073d789..0000000
Binary files a/endorsed/resolver.jar and /dev/null differ

diff --git a/endorsed/xalan.jar b/endorsed/xalan.jar
deleted file mode 100644 (file)
index f70243a..0000000
Binary files a/endorsed/xalan.jar and /dev/null differ

diff --git a/endorsed/xercesImpl.jar b/endorsed/xercesImpl.jar
deleted file mode 100644 (file)
index eac75ae..0000000
Binary files a/endorsed/xercesImpl.jar and /dev/null differ

diff --git a/endorsed/xml-apis.jar b/endorsed/xml-apis.jar
deleted file mode 100644 (file)
index 243eaea..0000000
Binary files a/endorsed/xml-apis.jar and /dev/null differ

diff --git a/webApplication/WEB-INF/lib/bc-asn1.jar b/lib/bc-asn1.jar
similarity index 100%
rename from webApplication/WEB-INF/lib/bc-asn1.jar
rename to lib/bc-asn1.jar

diff --git a/lib/bcprov-jdk14-117-src.jar b/lib/bcprov-jdk14-117-src.jar
deleted file mode 100755 (executable)
index 3a3cbaa..0000000
Binary files a/lib/bcprov-jdk14-117-src.jar and /dev/null differ

diff --git a/lib/bcprov-jdk14-117.jar b/lib/bcprov-jdk14-117.jar
deleted file mode 100755 (executable)
index 1bac52e..0000000
Binary files a/lib/bcprov-jdk14-117.jar and /dev/null differ

diff --git a/webApplication/WEB-INF/lib/bsh-2.0b1.jar b/lib/bsh-2.0b1.jar
similarity index 100%
rename from webApplication/WEB-INF/lib/bsh-2.0b1.jar
rename to lib/bsh-2.0b1.jar

diff --git a/lib/commons-dbcp-1.2.1-src.jar b/lib/commons-dbcp-1.2.1-src.jar
deleted file mode 100644 (file)
index e539698..0000000
Binary files a/lib/commons-dbcp-1.2.1-src.jar and /dev/null differ

diff --git a/lib/commons-pool-1.2-src.jar b/lib/commons-pool-1.2-src.jar
deleted file mode 100644 (file)
index 7ade47f..0000000
Binary files a/lib/commons-pool-1.2-src.jar and /dev/null differ

diff --git a/lib/junit-3.8.1-src.jar b/lib/junit-3.8.1-src.jar
deleted file mode 100755 (executable)
index 63c80be..0000000
Binary files a/lib/junit-3.8.1-src.jar and /dev/null differ

diff --git a/lib/opensaml-1.1.jar b/lib/opensaml-1.1.jar
deleted file mode 100644 (file)
index ec97f2c..0000000
Binary files a/lib/opensaml-1.1.jar and /dev/null differ

diff --git a/lib/xmlsec-20050514.jar b/lib/xmlsec-20050514.jar
deleted file mode 100644 (file)
index 4c7fb25..0000000
Binary files a/lib/xmlsec-20050514.jar and /dev/null differ

diff --git a/webApplication/WEB-INF/lib/commons-codec-1.3.jar b/webApplication/WEB-INF/lib/commons-codec-1.3.jar
deleted file mode 100644 (file)
index 957b675..0000000
Binary files a/webApplication/WEB-INF/lib/commons-codec-1.3.jar and /dev/null differ

diff --git a/webApplication/WEB-INF/lib/commons-collections.jar b/webApplication/WEB-INF/lib/commons-collections.jar
deleted file mode 100644 (file)
index 0b490e0..0000000
Binary files a/webApplication/WEB-INF/lib/commons-collections.jar and /dev/null differ

diff --git a/webApplication/WEB-INF/lib/commons-dbcp-1.2.1.jar b/webApplication/WEB-INF/lib/commons-dbcp-1.2.1.jar
deleted file mode 100644 (file)
index 08440c0..0000000
Binary files a/webApplication/WEB-INF/lib/commons-dbcp-1.2.1.jar and /dev/null differ

diff --git a/webApplication/WEB-INF/lib/commons-logging-1.03.jar b/webApplication/WEB-INF/lib/commons-logging-1.03.jar
deleted file mode 100644 (file)
index b99c937..0000000
Binary files a/webApplication/WEB-INF/lib/commons-logging-1.03.jar and /dev/null differ

diff --git a/webApplication/WEB-INF/lib/commons-pool-1.2.jar b/webApplication/WEB-INF/lib/commons-pool-1.2.jar
deleted file mode 100644 (file)
index 4ba534c..0000000
Binary files a/webApplication/WEB-INF/lib/commons-pool-1.2.jar and /dev/null differ

diff --git a/webApplication/WEB-INF/lib/log4j-1.2.13.jar b/webApplication/WEB-INF/lib/log4j-1.2.13.jar
deleted file mode 100644 (file)
index dde9972..0000000
Binary files a/webApplication/WEB-INF/lib/log4j-1.2.13.jar and /dev/null differ

diff --git a/webApplication/WEB-INF/lib/opensaml-1.1.jar b/webApplication/WEB-INF/lib/opensaml-1.1.jar
deleted file mode 100644 (file)
index ec97f2c..0000000
Binary files a/webApplication/WEB-INF/lib/opensaml-1.1.jar and /dev/null differ

diff --git a/webApplication/WEB-INF/lib/struts.jar b/webApplication/WEB-INF/lib/struts.jar
deleted file mode 100644 (file)
index d8fefc4..0000000
Binary files a/webApplication/WEB-INF/lib/struts.jar and /dev/null differ

diff --git a/webApplication/WEB-INF/lib/xmlsec-20050514.jar b/webApplication/WEB-INF/lib/xmlsec-20050514.jar
deleted file mode 100644 (file)
index 4c7fb25..0000000
Binary files a/webApplication/WEB-INF/lib/xmlsec-20050514.jar and /dev/null differ