2
0
Эх сурвалжийг харах

Tidy up Maven migration by eliminating unnecessary directories and having Eclipse classpath use MAVEN_REPO.

Ben Alex 21 жил өмнө
parent
commit
b8b31d6f65
47 өөрчлөгдсөн 25 нэмэгдсэн , 3876 устгасан
  1. 17 19
      .classpath
  2. 0 0
      doc/xdocs/dbinit.txt
  3. 0 2
      extractor/.cvsignore
  4. 0 154
      extractor/build.xml
  5. 0 35
      extractor/project.properties
  6. 0 45
      extractor/readme.txt
  7. 0 61
      extractor/source/catalina/LICENSE
  8. 0 458
      extractor/source/jboss/LICENSE.txt
  9. 0 159
      extractor/source/jetty/LICENSE.html
  10. 0 65
      extractor/source/resin/LICENSE
  11. 0 19
      hsqldb/acegisecurity.properties
  12. 0 27
      hsqldb/acegisecurity.script
  13. 0 2
      hsqldb/manager.bat
  14. 0 1
      hsqldb/manager.sh
  15. 0 1
      hsqldb/server.bat
  16. 0 1
      hsqldb/server.sh
  17. 0 6
      integration-test/.cvsignore
  18. 0 466
      integration-test/build.xml
  19. 0 384
      integration-test/container-configs/catalina-4.1.30/server.xml
  20. 0 366
      integration-test/container-configs/catalina-5.0.19/server.xml
  21. 0 143
      integration-test/container-configs/jboss-3.2.3/login-config.xml
  22. 0 87
      integration-test/container-configs/jetty-4.2.18/jetty.xml
  23. 0 4
      integration-test/lib/LICENSE
  24. 0 33
      integration-test/project.properties
  25. 0 26
      integration-test/readme.txt
  26. 0 327
      integration-test/src/net/sf/acegisecurity/integrationtests/web/AbstractContactsTests.java
  27. 0 31
      integration-test/src/net/sf/acegisecurity/integrationtests/web/ContainerAdapterContactsTests.java
  28. 0 31
      integration-test/src/net/sf/acegisecurity/integrationtests/web/FilterContactsTests.java
  29. 0 5
      lib/LICENSE
  30. 0 29
      lib/cas/LICENSE
  31. 0 58
      lib/ehcache/LICENSE.txt
  32. 0 1
      lib/ehcache/version.txt
  33. 0 61
      lib/extracted/catalina/LICENSE
  34. 0 458
      lib/extracted/jboss/LICENSE.txt
  35. 0 159
      lib/extracted/jetty/LICENSE.html
  36. 0 65
      lib/extracted/resin/LICENSE
  37. 0 1
      lib/hsqldb/version.txt
  38. 0 56
      lib/jakarta-commons/commons-codec-LICENSE.txt
  39. 0 4
      lib/jalopy/license-antlr.html
  40. 0 4
      lib/jalopy/license-apache.html
  41. 0 4
      lib/jalopy/license-bsd.html
  42. 0 4
      lib/jalopy/license-common-public.html
  43. 0 4
      lib/jalopy/license-gnu-doc.html
  44. 0 4
      lib/jalopy/license-gnu.html
  45. 0 4
      lib/jalopy/license-sun-public.html
  46. 8 2
      project.xml
  47. 0 0
      test/.cvsignore

+ 17 - 19
.classpath

@@ -23,26 +23,7 @@
 	<classpathentry kind="src" path="adapters/resin/src/test/java"/>
 	<classpathentry kind="src" path="core/src/main/java"/>
 	<classpathentry kind="src" path="core/src/test/java"/>
-	<classpathentry kind="src" path="integration-test/src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="lib/jakarta-commons/commons-logging.jar"/>
-	<classpathentry kind="lib" path="lib/j2ee/servlet.jar"/>
-	<classpathentry kind="lib" path="lib/junit/junit.jar"/>
-	<classpathentry kind="lib" path="lib/extracted/jboss/jboss-common-extracted.jar"/>
-	<classpathentry kind="lib" path="lib/extracted/jboss/jbosssx-extracted.jar"/>
-	<classpathentry kind="lib" path="lib/extracted/catalina/catalina-extracted.jar"/>
-	<classpathentry kind="lib" path="lib/extracted/catalina/jmx-extracted.jar"/>
-	<classpathentry kind="lib" path="lib/extracted/jetty/org.mortbay.jetty-extracted.jar"/>
-	<classpathentry kind="lib" path="integration-test/lib/httpunit.jar"/>
-	<classpathentry kind="lib" path="lib/regexp/jakarta-oro.jar"/>
-	<classpathentry kind="lib" path="lib/jakarta-commons/commons-codec.jar"/>
-	<classpathentry kind="lib" path="lib/hsqldb/hsqldb.jar"/>
-	<classpathentry kind="lib" path="lib/ehcache/ehcache.jar"/>
-	<classpathentry kind="lib" path="lib/aopalliance/aopalliance-1.0.jar"/>
-	<classpathentry kind="lib" path="lib/cas/cas-2.0.12-beta3.jar"/>
-	<classpathentry kind="lib" path="lib/cas/casclient-2.0.10.jar"/>
-	<classpathentry kind="lib" path="lib/jakarta-commons/commons-collections.jar"/>
-	<classpathentry kind="lib" path="lib/aspectj/aspectjrt.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/resin/jars/resin-3.0.9.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/retroweaver/jars/retroweaver-1.0fcs.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/springframework/jars/spring-aop-1.1.2.jar"/>
@@ -54,5 +35,22 @@
 	<classpathentry kind="var" path="MAVEN_REPO/springframework/jars/spring-web-1.1.2.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/springframework/jars/spring-webmvc-1.1.2.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/log4j/jars/log4j-1.2.8.jar"/>
+	<classpathentry kind="var" path="MAVEN_REPO/aopalliance/jars/aopalliance-1.0.jar"/>
+	<classpathentry kind="var" path="MAVEN_REPO/aspectj/jars/aspectjrt-1.2.jar"/>
+	<classpathentry kind="var" path="MAVEN_REPO/cas/jars/casclient-2.0.11.jar"/>
+	<classpathentry kind="var" path="MAVEN_REPO/cas/jars/cas-2.0.12.jar"/>
+	<classpathentry kind="var" path="MAVEN_REPO/commons-codec/jars/commons-codec-1.2.jar"/>
+	<classpathentry kind="var" path="MAVEN_REPO/commons-collections/jars/commons-collections-3.1.jar"/>
+	<classpathentry kind="var" path="MAVEN_REPO/commons-logging/jars/commons-logging-1.0.4.jar"/>
+	<classpathentry kind="var" path="MAVEN_REPO/ehcache/jars/ehcache-0.9.jar"/>
+	<classpathentry kind="var" path="MAVEN_REPO/hsqldb/jars/hsqldb-1.7.2-rc6c.jar"/>
+	<classpathentry kind="var" path="MAVEN_REPO/oro/jars/oro-2.0.7.jar"/>
+	<classpathentry kind="var" path="MAVEN_REPO/servletapi/jars/servletapi-2.3.jar"/>
+	<classpathentry kind="var" path="MAVEN_REPO/tomcat/jars/catalina-4.1.9.jar"/>
+	<classpathentry kind="var" path="MAVEN_REPO/jetty/jars/org.mortbay.jetty-4.2.20.jar"/>
+	<classpathentry kind="var" path="MAVEN_REPO/jboss/jars/jboss-common-3.2.3.jar"/>
+	<classpathentry kind="var" path="MAVEN_REPO/jboss/jars/jboss-jmx-3.2.1.jar"/>
+	<classpathentry kind="var" path="MAVEN_REPO/jboss/jars/jbosssx-3.2.3.jar"/>
+	<classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.1.jar"/>
 	<classpathentry kind="output" path="target/eclipseclasses"/>
 </classpath>

+ 0 - 0
hsqldb/dbinit.txt → doc/xdocs/dbinit.txt


+ 0 - 2
extractor/.cvsignore

@@ -1,2 +0,0 @@
-temporary
-

+ 0 - 154
extractor/build.xml

@@ -1,154 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-    Build file for extracting relevant classes out of distribution JARs.
- 
-    $Id$
--->
-
-<project name="acegi-security-lib-extractor" default="usage" basedir=".">
-
-	<property file="build.properties"/>
-	<property file="project.properties"/>
-
-	<target name="usage">
-		<echo message=""/>
-		<echo message="${name} build file"/>
-		<echo message="------------------------------------------------------"/>
-		<echo message=""/>
-		<echo message="Among the available targets are:"/>
-		<echo message=""/>
-		<echo message="extract           --> runs all extract targets below"/>
-		<echo message="extract-catalina  --> extracts required classes from Catalina"/>
-		<echo message="extract-jboss     --> extracts required classes from JBoss"/>
-		<echo message="extract-jetty     --> extracts required classes from Jetty"/>
-		<echo message="extract-resin     --> extracts required classes from Resin"/>
-		<echo message=""/>
-	</target>
-
-	<target name="extract" depends="extract-jboss,extract-catalina,extract-jetty,extract-resin" description="Extract required files from all source JARs"/>
-
-	<target name="extract-jboss" depends="" description="Extract required classes from JBoss">
-		<delete dir="${tmp.dir}"/>
-		<mkdir dir="${tmp.dir}"/>
-		<mkdir dir="${dest.dir.jboss}"/>
-
-		<copy todir="${dest.dir.jboss}" file="${source.license.jboss}"/>
-
-		<unzip src="${source.dir.jboss}/jbosssx.jar" dest="${tmp.dir}/jbosssx"/>
-		<jar update="no" jarfile="${dest.dir.jboss}/jbosssx-extracted.jar">
-			<fileset dir="${tmp.dir}/jbosssx">
-				<include name="org/jboss/security/Simple*"/>
-				<include name="org/jboss/security/auth/spi/AbstractServerLoginModule*"/>
-				<include name="org/jboss/security/NestableGroup*"/>
-			</fileset>
-			<manifest>
-				<attribute name="Extracted-By-Acegi-Security-System-Extractor-Version" value="${extractor-version}"/>
-				<attribute name="Extracted-From-Info" value="${extract.info.jboss}"/>
-			</manifest>
-		</jar>
-		
-		<unzip src="${source.dir.jboss}/jboss-common.jar" dest="${tmp.dir}/jboss-common"/>
-		<jar update="no" jarfile="${dest.dir.jboss}/jboss-common-extracted.jar">
-			<fileset dir="${tmp.dir}/jboss-common">
-				<include name="org/jboss/logging/Logger*"/>
-				<include name="org/jboss/logging/NullLoggerPlugin*"/>
-			</fileset>
-			<manifest>
-				<attribute name="Extracted-By-Acegi-Security-System-Extractor-Version" value="${extractor-version}"/>
-				<attribute name="Extracted-From-Info" value="${extract.info.jboss}"/>
-			</manifest>
-		</jar>
-
-		<delete dir="${tmp.dir}"/>
-	</target>
-
-	<target name="extract-catalina" depends="" description="Extract required classes from Catalina">
-		<delete dir="${tmp.dir}"/>
-		<mkdir dir="${tmp.dir}"/>
-		<mkdir dir="${dest.dir.catalina}"/>
-
-		<copy todir="${dest.dir.catalina}" file="${source.license.catalina}"/>
-
-		<unzip src="${source.dir.catalina}/catalina.jar" dest="${tmp.dir}/catalina"/>
-		<jar update="no" jarfile="${dest.dir.catalina}/catalina-extracted.jar">
-			<fileset dir="${tmp.dir}/catalina">
-				<include name="org/apache/catalina/Container*"/>
-				<include name="org/apache/catalina/LifecycleException*"/>
-				<include name="org/apache/catalina/Lifecycle*"/>
-				<include name="org/apache/catalina/Realm*"/>
-				<include name="org/apache/catalina/realm/RealmBase*"/>
-				<include name="org/apache/catalina/util/MD5Encoder*"/>
-				<include name="org/apache/catalina/util/StringManager*"/>
-				<include name="org/apache/catalina/util/LifecycleSupport*"/>
-			</fileset>
-			<manifest>
-				<attribute name="Extracted-By-Acegi-Security-System-Extractor-Version" value="${extractor-version}"/>
-				<attribute name="Extracted-From-Info" value="${extract.info.catalina}"/>
-			</manifest>
-		</jar>
-		
-		<unzip src="${source.dir.catalina}/jmx.jar" dest="${tmp.dir}/jmx"/>
-		<jar update="no" jarfile="${dest.dir.catalina}/jmx-extracted.jar">
-			<fileset dir="${tmp.dir}/jmx">
-				<include name="javax/management/MBeanRegistration*"/>
-			</fileset>
-			<manifest>
-				<attribute name="Extracted-By-Acegi-Security-System-Extractor-Version" value="${extractor-version}"/>
-				<attribute name="Extracted-From-Info" value="${extract.info.catalina}"/>
-			</manifest>
-		</jar>
-
-		<delete dir="${tmp.dir}"/>
-	</target>
-
-	<target name="extract-jetty" depends="" description="Extract required classes from Jetty">
-		<delete dir="${tmp.dir}"/>
-		<mkdir dir="${tmp.dir}"/>
-		<mkdir dir="${dest.dir.jetty}"/>
-
-		<copy todir="${dest.dir.jetty}" file="${source.license.jetty}"/>
-
-		<unzip src="${source.dir.jetty}/org.mortbay.jetty.jar" dest="${tmp.dir}/org.mortbay.jetty"/>
-		<jar update="no" jarfile="${dest.dir.jetty}/org.mortbay.jetty-extracted.jar">
-			<fileset dir="${tmp.dir}/org.mortbay.jetty">
-				<include name="org/mortbay/http/HttpRequest*"/>
-				<include name="org/mortbay/http/User*"/>
-			</fileset>
-			<manifest>
-				<attribute name="Extracted-By-Acegi-Security-System-Extractor-Version" value="${extractor-version}"/>
-				<attribute name="Extracted-From-Info" value="${extract.info.jetty}"/>
-			</manifest>
-		</jar>
-		
-		<delete dir="${tmp.dir}"/>
-	</target>
-
-	<target name="extract-resin" depends="" description="Extract required classes from Resin">
-		<delete dir="${tmp.dir}"/>
-		<mkdir dir="${tmp.dir}"/>
-		<mkdir dir="${dest.dir.resin}"/>
-
-		<copy todir="${dest.dir.resin}" file="${source.license.resin}"/>
-
-		<unzip src="${source.dir.resin}/resin.jar" dest="${tmp.dir}/resin"/>
-		<jar update="no" jarfile="${dest.dir.resin}/resin-extracted.jar">
-			<fileset dir="${tmp.dir}/resin">
-				<include name="com/caucho/http/security/AbstractAuthenticator*"/>
-				<include name="com/caucho/vfs/Path*"/>
-				<include name="com/caucho/server/security/AbstractAuthenticator*"/>
-				<include name="com/caucho/server/security/ServletAuthenticator*"/>
-				<include name="com/caucho/log/Log*"/>
-				<include name="com/caucho/util/L10N*"/>
-				<include name="com/caucho/util/LruCache*"/>
-			</fileset>
-			<manifest>
-				<attribute name="Extracted-By-Acegi-Security-System-Extractor-Version" value="${extractor-version}"/>
-				<attribute name="Extracted-From-Info" value="${extract.info.resin}"/>
-			</manifest>
-		</jar>
-		
-		<delete dir="${tmp.dir}"/>
-	</target>
-
-</project>

+ 0 - 35
extractor/project.properties

@@ -1,35 +0,0 @@
-# Ant properties for running the lib file extractor.
-
-# Values in this file will be overriden by any values with the same name
-# in the user-created build.properties file.
-
-# $Id$
-
-name=acegi-security-lib-extractor
-extractor-version=0.4
-
-tmp.dir=${basedir}/temporary
-
-# This is where extracted JARs are built (ie directly into the main lib dir)
-# WARNING: This directory and subdirs will be deleted each time build is run
-dest.dir=${basedir}/../lib/extracted
-
-source.dir.jboss=${basedir}/source/jboss
-source.license.jboss=${basedir}/source/jboss/LICENSE.txt
-dest.dir.jboss=${dest.dir}/jboss
-extract.info.jboss=JBoss 3.2.3 see http://www.jboss.org
-
-source.dir.jetty=${basedir}/source/jetty
-source.license.jetty=${basedir}/source/jetty/LICENSE.html
-dest.dir.jetty=${dest.dir}/jetty
-extract.info.jetty=Jetty 4.2.18 see http://jetty.mortbay.org
-
-source.dir.catalina=${basedir}/source/catalina
-source.license.catalina=${basedir}/source/catalina/LICENSE
-dest.dir.catalina=${dest.dir}/catalina
-extract.info.catalina=Jakarta Tomcat 5.0.19 see http://jakarta.apache.org/tomcat/
-
-source.dir.resin=${basedir}/source/resin
-source.license.resin=${basedir}/source/resin/LICENSE
-dest.dir.resin=${dest.dir}/resin
-extract.info.resin=Resin 3.0.6 see http://www.caucho.com

+ 0 - 45
extractor/readme.txt

@@ -1,45 +0,0 @@
-===============================================================================
-                   ACEGI SECURITY SYSTEM FOR SPRING - EXTRACTOR
-===============================================================================
-
-*** OVERVIEW ***
-
-To compile container adapters, it is necessary to have classes from each
-container on the classpath. Because container JAR files are usually quite
-large, including them in the "with dependencies" release ZIPs would rapidly
-bloat the file size.
-
-Under this solution, the extractor Ant build file takes a container JAR file
-and extracts only those classes required by the Acegi Security System for
-Spring. The full container JARs will be provided by the relevant container at
-deployment time.
-
-Of course, the classes are extracted from specific versions of the container
-JAR files. The resulting "extracted" JAR files (named in the format
-container-extracted.jar), include in their manifest file various information
-about the source JAR. A copy of the container license is also provided.
-
-If you run a different container version than those the extracted JARs were
-built from, you can create a build.properties that specifies your
-source.dir.container. Running "ant extract-container" will then cause your
-exact container JAR file to be used to build the extracted JAR, which will be
-written to the Acegi Security System for Spring main lib directory. You can
-then recompile the Acegi Security System for Spring and you should end up
-with compatible versions.
-
-Two unavoidable issues from doing this include your version might package
-required classes differently (so the files referred to by the Ant build file
-are incorrect) or your container JAR might implement different inheritance
-orders, interface requirements or method signatures than those the Acegi
-Security System for Spring was coded for. In such cases, please let us know or
-contribute a patch that supports your container version.
-
-*** THE "SOURCE" DIRECTORY ***
-
-The "source" directory contains the full container JAR files that the
-container-extracted.jar files are created from. We do not include these in the
-"with dependencies" releases. If you need these files, please download them
-from the container vendor sites (refer to project.properties for URLs) or
-checkout the project from CVS.
-
-$Id$

+ 0 - 61
extractor/source/catalina/LICENSE

@@ -1,61 +0,0 @@
-/* ========================================================================= *
- *                                                                           *
- *                 The Apache Software License,  Version 1.1                 *
- *                                                                           *
- *         Copyright (c) 1999, 2000  The Apache Software Foundation.         *
- *                           All rights reserved.                            *
- *                                                                           *
- * ========================================================================= *
- *                                                                           *
- * Redistribution and use in source and binary forms,  with or without modi- *
- * fication, are permitted provided that the following conditions are met:   *
- *                                                                           *
- * 1. Redistributions of source code must retain the above copyright notice, *
- *    this list of conditions and the following disclaimer.                  *
- *                                                                           *
- * 2. Redistributions  in binary  form  must  reproduce the  above copyright *
- *    notice,  this list of conditions  and the following  disclaimer in the *
- *    documentation and/or other materials provided with the distribution.   *
- *                                                                           *
- * 3. The end-user documentation  included with the redistribution,  if any, *
- *    must include the following acknowlegement:                             *
- *                                                                           *
- *       "This product includes  software developed  by the Apache  Software *
- *        Foundation <http://www.apache.org/>."                              *
- *                                                                           *
- *    Alternately, this acknowlegement may appear in the software itself, if *
- *    and wherever such third-party acknowlegements normally appear.         *
- *                                                                           *
- * 4. The names  "The  Jakarta  Project",  "Tomcat",  and  "Apache  Software *
- *    Foundation"  must not be used  to endorse or promote  products derived *
- *    from this  software without  prior  written  permission.  For  written *
- *    permission, please contact <apache@apache.org>.                        *
- *                                                                           *
- * 5. Products derived from this software may not be called "Apache" nor may *
- *    "Apache" appear in their names without prior written permission of the *
- *    Apache Software Foundation.                                            *
- *                                                                           *
- * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES *
- * INCLUDING, BUT NOT LIMITED TO,  THE IMPLIED WARRANTIES OF MERCHANTABILITY *
- * AND FITNESS FOR  A PARTICULAR PURPOSE  ARE DISCLAIMED.  IN NO EVENT SHALL *
- * THE APACHE  SOFTWARE  FOUNDATION OR  ITS CONTRIBUTORS  BE LIABLE  FOR ANY *
- * DIRECT,  INDIRECT,   INCIDENTAL,  SPECIAL,  EXEMPLARY,  OR  CONSEQUENTIAL *
- * DAMAGES (INCLUDING,  BUT NOT LIMITED TO,  PROCUREMENT OF SUBSTITUTE GOODS *
- * OR SERVICES;  LOSS OF USE,  DATA,  OR PROFITS;  OR BUSINESS INTERRUPTION) *
- * HOWEVER CAUSED AND  ON ANY  THEORY  OF  LIABILITY,  WHETHER IN  CONTRACT, *
- * STRICT LIABILITY, OR TORT  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN *
- * ANY  WAY  OUT OF  THE  USE OF  THIS  SOFTWARE,  EVEN  IF  ADVISED  OF THE *
- * POSSIBILITY OF SUCH DAMAGE.                                               *
- *                                                                           *
- * ========================================================================= *
- *                                                                           *
- * This software  consists of voluntary  contributions made  by many indivi- *
- * duals on behalf of the  Apache Software Foundation.  For more information *
- * on the Apache Software Foundation, please see <http://www.apache.org/>.   *
- *                                                                           *
- * ========================================================================= */
-
-/* CVS information: $Revision: 1.2 $ $Date: 2003/12/24 19:53:47 $
- * $Source: /home/cvs/jakarta-tomcat-5/LICENSE,v $
- * $Author: markt $
- */

+ 0 - 458
extractor/source/jboss/LICENSE.txt

@@ -1,458 +0,0 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS

+ 0 - 159
extractor/source/jetty/LICENSE.html

@@ -1,159 +0,0 @@
-<HTML>
-<HEAD>
-   <TITLE>Jetty License</TITLE>
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<FONT FACE=ARIAL,HELVETICA>
-<CENTER><FONT SIZE=+3><B>Jetty License</B></FONT></CENTER>
-<CENTER><FONT SIZE=-1><B>$Revision$</B></FONT></CENTER>
-
-<B>Preamble:</B><p>
-
-The intent of this document is to state the conditions under which the
-Jetty Package may be copied, such that the Copyright Holder maintains some
-semblance of control over the development of the package, while giving the
-users of the package the right to use, distribute and make reasonable
-modifications to the Package in accordance with the goals and ideals of
-the Open Source concept as described at
-<A HREF="http://www.opensource.org">http://www.opensource.org</A>.
-<P>
-It is the intent of this license to allow commercial usage of the Jetty
-package, so long as the source code is distributed or suitable visible
-credit given or other arrangements made with the copyright holders.
-
-<P><B>Definitions:</B><P>
-
-<UL>
-  <LI> "Jetty" refers to the collection of Java classes that are
-       distributed as a HTTP server with servlet capabilities and
-       associated utilities.<p>
-
-  <LI>	"Package" refers to the collection of files distributed by the
-       Copyright Holder, and derivatives of that collection of files
-       created through textual modification.<P>
-       
-  <LI>	"Standard Version" refers to such a Package if it has not been
-       modified, or has been modified in accordance with the wishes
-       of the Copyright Holder.<P>
-       
-  <LI>	"Copyright Holder" is whoever is named in the copyright or
-       copyrights for the package. <BR>
-       Mort Bay Consulting Pty. Ltd. (Australia) is the "Copyright
-       Holder" for the Jetty package.<P>
-       
-  <LI>	"You" is you, if you're thinking about copying or distributing
-       this Package.<P>
-       
-  <LI>	"Reasonable copying fee" is whatever you can justify on the
-       basis of media cost, duplication charges, time of people involved,
-       and so on.  (You will not be required to justify it to the
-       Copyright Holder, but only to the computing community at large
-       as a market that must bear the fee.)<P>
-       
-  <LI>	"Freely Available" means that no fee is charged for the item
-       itself, though there may be fees involved in handling the item.
-       It also means that recipients of the item may redistribute it
-       under the same conditions they received it.<P>
-</UL>
-
-0. The Jetty Package is Copyright (c) Mort Bay Consulting Pty. Ltd.
-(Australia) and others. Individual files in this package may contain
-additional copyright notices. The javax.servlet packages are copyright
-Sun Microsystems Inc. <P>
-
-1. The Standard Version of the Jetty package is
-available from <A HREF=http://jetty.mortbay.org>http://jetty.mortbay.org</A>.<P>
-
-2. You may make and distribute verbatim copies of the source form 
-of the Standard Version of this Package without restriction, provided that 
-you include this license and all of the original copyright notices
-and associated disclaimers.<P>
-
-3. You may make and distribute verbatim copies of the compiled form of the 
-Standard Version of this Package without restriction, provided that you
-include this license.<P>
-
-4. You may apply bug fixes, portability fixes and other modifications
-derived from the Public Domain or from the Copyright Holder.  A Package
-modified in such a way shall still be considered the Standard Version.<P>
-
-5. You may otherwise modify your copy of this Package in any way, provided
-that you insert a prominent notice in each changed file stating how and
-when you changed that file, and provided that you do at least ONE of the
-following:<P>
-
-<BLOCKQUOTE>
-a) Place your modifications in the Public Domain or otherwise make them
-Freely Available, such as by posting said modifications to Usenet or
-an equivalent medium, or placing the modifications on a major archive
-site such as ftp.uu.net, or by allowing the Copyright Holder to include
-your modifications in the Standard Version of the Package.<P>
-
-b) Use the modified Package only within your corporation or organization.<P>
-
-c) Rename any non-standard classes so the names do not conflict
-with standard classes, which must also be provided, and provide
-a separate manual page for each non-standard class that clearly
-documents how it differs from the Standard Version.<P>
-
-d) Make other arrangements with the Copyright Holder.<P>
-</BLOCKQUOTE>
-
-6. You may distribute modifications or subsets of this Package in source 
-code or compiled form, provided that you do at least ONE of the following:<P>
-
-<BLOCKQUOTE>
-a) Distribute this license and all original copyright messages, together 
-with instructions (in the about dialog, manual page or equivalent) on where 
-to get the complete Standard Version.<P>
-
-b) Accompany the distribution with the machine-readable source of
-the Package with your modifications. The modified package must include
-this license and all of the original copyright notices and associated
-disclaimers, together with instructions on where to get the complete
-Standard Version.<P>
-
-c) Make other arrangements with the Copyright Holder.<P>
-</BLOCKQUOTE>
-
-7. You may charge a reasonable copying fee for any distribution of this
-Package.  You may charge any fee you choose for support of this Package.
-You may not charge a fee for this Package itself.  However,
-you may distribute this Package in aggregate with other (possibly
-commercial) programs as part of a larger (possibly commercial) software
-distribution provided that you meet the other distribution requirements
-of this license.<P>
-
-8. Input to or the output produced from the programs of this Package
-do not automatically fall under the copyright of this Package, but
-belong to whomever generated them, and may be sold commercially, and
-may be aggregated with this Package.<P>
-
-9. Any program subroutines supplied by you and linked into this Package
-shall not be considered part of this Package.<P>
-
-10. The name of the Copyright Holder may not be used to endorse or promote
-products derived from this software without specific prior written
-permission.<P>
-
-11. This license may change with each release of a Standard Version of
-the Package. You may choose to use the license associated with version
-you are using or the license of the latest Standard Version.<P>
-
-12. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.<P>
-
-13. If any superior law implies a warranty, the sole remedy under such shall
-be , at the Copyright Holders option either a) return of any price paid or 
-b) use or reasonable endeavours to repair or replace the software.<P>
-
-14. This license shall be read under the laws of Australia.  <P>
-
-<center>The End</center>
-
-<center><FONT size=-1>This license was derived from the <I>Artistic</I> license published 
-on <a href=http://www.opensource.org>http://www.opensource.com</a></font></center>
-</FONT>
-
-

+ 0 - 65
extractor/source/resin/LICENSE

@@ -1,65 +0,0 @@
-		   Caucho Developer Source License
-			     version 1.1
-
-Caucho Technology, Inc. ("Caucho") permits use of the accompanying software
-and documentation ("the Software") provided that the conditions of the
-Caucho Developer Source License ("the License") are met:
-
-1. You must not alter or remove any copyright or trademark notices
-   in the Software.
-
-2. You may use the Software to develop, evaluate, and demonstrate
-   applications.
-
-3. Provided all the following conditions are met, you may use 
-   the Software to deploy an application:
-   a) You are not paid to use the Software.
-   b) You are not paying anyone else to use the Software.
-
-4. Caucho reserves all rights to the Software not explicitly
-   granted by the License.
-
-5. Each copy of the Software in source or binary form must include
-   an unmodified copy of the License in a plain ASCII text file
-   named LICENSE.
-
-6. Caucho reserves all rights to its names, trademarks and logos.
-   In particular, the names "Resin" and "Caucho" are trademarks of
-   Caucho and may not be used to endorse products derived from
-   this software.  "Resin" and "Caucho" may not appear in
-   the names of products derived from this software.
-
-7. If you transmit any improvement or modification of the Software to
-   Caucho, you agree to assign the copyright of the improvement or
-   modification to Caucho.
-
-8. The License will terminate immediately without notice from Caucho
-   if you fail to comply with any provision of the License.
-   Upon such termination, you must destroy all copies and
-   derived works of the Software.  You may terminate the License at
-   any time by destroying all copies and derived works of the Software.
-
-9. You acknowledge that you are solely responsible for the use you
-   make of the Software. Accordingly, you agrees to indemnify and
-   hold Caucho harmless for any demands, claims, or suits by a third party
-   for loss, damages or expenses (including attorneys' fees) arising out
-   of, or related to, use of the Software by you or any other
-   individuals or entities.
-
-10. The Software is provided "AS IS," without a warranty of any kind.
-    ALL EXPRESS OR IMPLIED REPRESENTATIONS AND WARRANTIES, INCLUDING ANY
-    IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE
-    OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
-
-11. CAUCHO AND ITS LICENSORS SHALL NOT BE LIABLE FOR ANY DAMAGES
-    SUFFERED BY YOU OR ANY THIRD PARTY AS A RESULT OF USING OR DISTRIBUTING
-    THE SOFTWARE. IN NO EVENT WILL CAUCHO TECHNOLOGY OR ITS LICENSORS BE
-    LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT,
-    SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED
-    AND REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF THE USE OF OR
-    INABILITY TO USE THE SOFTWARE, EVEN IF HE HAS BEEN ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGES.      
-
-12. Any action related to the License will be governed by California 
-    law and controlling U.S. federal law. No choice of law rules of 
-    any jurisdiction will apply.

+ 0 - 19
hsqldb/acegisecurity.properties

@@ -1,19 +0,0 @@
-#HSQL database
-#Sat Jul 31 02:59:13 GMT 2004
-hsqldb.script_format=0
-runtime.gc_interval=0
-sql.enforce_strict_size=false
-hsqldb.cache_size_scale=10
-readonly=false
-hsqldb.nio_data_file=true
-version=1.7.2
-hsqldb.cache_scale=14
-hsqldb.first_identity=0
-hsqldb.cache_file_scale=1
-sql.compare_in_locale=false
-hsqldb.log_size=200
-modified=no
-hsqldb.cache_version=1.7.0
-hsqldb.original_version=1.7.2
-hsqldb.compatible_version=1.7.2
-sql.enforce_size=false

+ 0 - 27
hsqldb/acegisecurity.script

@@ -1,27 +0,0 @@
-CREATE TABLE USERS(USERNAME VARCHAR_IGNORECASE(50) NOT NULL PRIMARY KEY,PASSWORD VARCHAR_IGNORECASE(50) NOT NULL,ENABLED BOOLEAN NOT NULL)
-CREATE TABLE AUTHORITIES(USERNAME VARCHAR_IGNORECASE(50) NOT NULL,AUTHORITY VARCHAR_IGNORECASE(50) NOT NULL,CONSTRAINT FK_AUTHORITIES_USERS FOREIGN KEY(USERNAME) REFERENCES USERS(USERNAME))
-CREATE UNIQUE INDEX IX_AUTH_USERNAME ON AUTHORITIES(USERNAME,AUTHORITY)
-CREATE TABLE ACL_OBJECT_IDENTITY(ID INTEGER GENERATED BY DEFAULT AS IDENTITY(START WITH 0)  NOT NULL PRIMARY KEY,OBJECT_IDENTITY VARCHAR_IGNORECASE(250) NOT NULL,PARENT_OBJECT INTEGER,ACL_CLASS VARCHAR_IGNORECASE(250) NOT NULL,CONSTRAINT UNIQUE_OBJECT_IDENTITY UNIQUE(OBJECT_IDENTITY),CONSTRAINT SYS_FK_3 FOREIGN KEY(PARENT_OBJECT) REFERENCES ACL_OBJECT_IDENTITY(ID))
-CREATE TABLE ACL_PERMISSION(ID INTEGER GENERATED BY DEFAULT AS IDENTITY(START WITH 0)  NOT NULL PRIMARY KEY,ACL_OBJECT_IDENTITY INTEGER NOT NULL,RECIPIENT VARCHAR_IGNORECASE(100) NOT NULL,MASK INTEGER NOT NULL,CONSTRAINT UNIQUE_RECIPIENT UNIQUE(ACL_OBJECT_IDENTITY,RECIPIENT),CONSTRAINT SYS_FK_7 FOREIGN KEY(ACL_OBJECT_IDENTITY) REFERENCES ACL_OBJECT_IDENTITY(ID))
-SET IGNORECASE TRUE
-CREATE USER SA PASSWORD "" ADMIN
-INSERT INTO USERS VALUES('dianne','emu',TRUE)
-INSERT INTO USERS VALUES('marissa','koala',TRUE)
-INSERT INTO USERS VALUES('peter','opal',FALSE)
-INSERT INTO USERS VALUES('scott','wombat',TRUE)
-INSERT INTO AUTHORITIES VALUES('marissa','ROLE_TELLER')
-INSERT INTO AUTHORITIES VALUES('marissa','ROLE_SUPERVISOR')
-INSERT INTO AUTHORITIES VALUES('dianne','ROLE_TELLER')
-INSERT INTO AUTHORITIES VALUES('scott','ROLE_TELLER')
-INSERT INTO AUTHORITIES VALUES('peter','ROLE_TELLER')
-INSERT INTO ACL_OBJECT_IDENTITY VALUES(1,'net.sf.acegisecurity.acl.DomainObject:1',NULL,'net.sf.acegisecurity.acl.basic.SimpleAclEntry')
-INSERT INTO ACL_OBJECT_IDENTITY VALUES(2,'net.sf.acegisecurity.acl.DomainObject:2',1,'net.sf.acegisecurity.acl.basic.SimpleAclEntry')
-INSERT INTO ACL_OBJECT_IDENTITY VALUES(3,'net.sf.acegisecurity.acl.DomainObject:3',1,'net.sf.acegisecurity.acl.basic.SimpleAclEntry')
-INSERT INTO ACL_OBJECT_IDENTITY VALUES(4,'net.sf.acegisecurity.acl.DomainObject:4',1,'net.sf.acegisecurity.acl.basic.SimpleAclEntry')
-INSERT INTO ACL_OBJECT_IDENTITY VALUES(5,'net.sf.acegisecurity.acl.DomainObject:5',3,'net.sf.acegisecurity.acl.basic.SimpleAclEntry')
-INSERT INTO ACL_OBJECT_IDENTITY VALUES(6,'net.sf.acegisecurity.acl.DomainObject:6',3,'net.sf.acegisecurity.acl.basic.SimpleAclEntry')
-INSERT INTO ACL_PERMISSION VALUES(0,1,'ROLE_SUPERVISOR',1)
-INSERT INTO ACL_PERMISSION VALUES(1,2,'ROLE_SUPERVISOR',0)
-INSERT INTO ACL_PERMISSION VALUES(2,2,'marissa',2)
-INSERT INTO ACL_PERMISSION VALUES(3,3,'scott',14)
-INSERT INTO ACL_PERMISSION VALUES(4,6,'scott',1)

+ 0 - 2
hsqldb/manager.bat

@@ -1,2 +0,0 @@
-java -classpath ..\lib\hsqldb\hsqldb.jar org.hsqldb.util.DatabaseManager
-

+ 0 - 1
hsqldb/manager.sh

@@ -1 +0,0 @@
-java -cp ../lib/hsqldb/hsqldb.jar org.hsqldb.util.DatabaseManager

+ 0 - 1
hsqldb/server.bat

@@ -1 +0,0 @@
-java -classpath ..\lib\hsqldb\hsqldb.jar org.hsqldb.Server -database acegisecurity

+ 0 - 1
hsqldb/server.sh

@@ -1 +0,0 @@
-java -classpath ../lib/hsqldb/hsqldb.jar org.hsqldb.Server -database acegisecurity

+ 0 - 6
integration-test/.cvsignore

@@ -1,6 +0,0 @@
-classes
-reports
-temporary
-containers
-build.properties
-

+ 0 - 466
integration-test/build.xml

@@ -1,466 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-    Build file for running container integration tests.
-
-    $Id$
--->
-
-<project name="acegi-security-integration-tests" default="usage" basedir=".">
-
-	<property file="build.properties"/>
-	<property file="project.properties"/>
-
-	<path id="qa-portalpath">
-		<fileset dir="${dist.lib.dir}">
-			<include name="acegi-security-spring.jar"/>
-		</fileset>
-		<fileset dir="${lib.dir}">
-			<include name="**/*.jar"/>
-		</fileset>
-		<fileset dir="${httpunit.lib.dir}">
-			<include name="**/*.jar"/>
-		</fileset>
-		<fileset file="${contacts.client.jar}"/>
-	</path>
-
-	<path id="antcontrib-classpath">
-		<fileset dir="${httpunit.lib.dir}">
-			<include name="ant-contrib.jar"/>
-		</fileset>
-	</path>
-
-	<taskdef resource="net/sf/antcontrib/antcontrib.properties">
-		<classpath refid="antcontrib-classpath"/>
-	</taskdef>
-	
-    <path id="jalopy-classpath">
-        <fileset dir="${lib.dir}/jalopy">
-            <include name="**/*.jar"/>
-        </fileset>
-    </path>
-
-	<target name="usage">
-		<echo level="info">
-${name} build file
-------------------------------------------------------
-
-Among the available targets are:
-
-clean             --> deletes output directories
-unzip             --> unzips each container into file system
-tests             --> unzips each container and runs all tests
-tests-all         --> runs all tests (does not unzip each container)
-tests-jetty       --> runs the integration tests with Jetty
-tests-jboss       --> runs the integration tests with JBoss
-tests-catalina    --> runs the integration tests with Catalina
-                          (both 4.1 and 5.0)
-tests-catalina-4.1--> runs the integration tests with Catalina 4.1
-tests-catalina-5  --> runs the integration tests with Catalina 5.0
-
-Each tests-xxxx target assumes the container is unzipped
-</echo>
-	</target>
-
-	<target name="clean" description="Clean all output dirs">
-		<delete dir="${build.dir}"/>
-		<delete dir="${tmp.dir}"/>
-		<delete dir="${reports.dir}"/>
-	</target>
-
-	<target name="buildtests" depends="" description="Compile test source tree Java files into class files">
-		<mkdir dir="${build.dir}"/>
-
-		<javac destdir="${build.dir}" target="1.3" debug="${debug}"
-			deprecation="false" optimize="false" failonerror="true">
-			<src path="${src.dir}"/>
-			<classpath refid="qa-portalpath"/>
-		</javac>
-	</target>
-
-	<target name="format" description="Formats all project source code">
-        <taskdef name="jalopy" classname="de.hunsicker.jalopy.plugin.ant.AntPlugin">
-            <classpath refid="jalopy-classpath"/>
-        </taskdef>
-
-        <jalopy fileformat="unix"
-            convention="${jalopy.xml}"
-            history="file"
-            historymethod="adler32"
-            loglevel="error"
-            threads="2"
-            classpathref="qa-portalpath">
-            <fileset dir="${src.dir}">
-                <include name="**/*.java"/>
-            </fileset>
-        </jalopy>
-	</target>
-
-	<target name="tests" depends="clean,unzip,tests-all">
-	</target>
-	
-	<target name="tests-all" depends="tests-jetty,tests-catalina,tests-jboss"
-		description="Run all integration tests">
-		<condition property="anyerrors" value="true">
-			<or>
-				<isset property="jetty-${jetty.version}.errored"/>
-				<isset property="jboss-${jboss.version}.errored"/>
-				<isset property="jakarta-tomcat-${tomcat-4.1.version}.errored"/>
-				<isset property="jakarta-tomcat-${tomcat-5.version}.errored"/>
-			</or>
-		</condition>
-
-		<condition property="anyfailures" value="true">
-			<or>
-				<isset property="jetty-${jetty.version}.failed"/>
-				<isset property="jboss-${jboss.version}.failed"/>
-				<isset property="jakarta-tomcat-${tomcat-4.1.version}.failed"/>
-				<isset property="jakarta-tomcat-${tomcat-5.version}.failed"/>
-			</or>
-		</condition>
-
-		<fileset id="availablereports" dir="${reports.dir}"
-			includes="**/html/index.html"/>
-		<condition property="is.windows">
-			<os family="windows"/>
-		</condition>
-		<antcall target="-prepare.availablereports.unix"/>
-		<antcall target="-prepare.availablereports.windows"/>
-
-		<condition property="jetty.errored" value="YES!">
-			<isset property="jetty-${jetty.version}.errored"/>
-		</condition>
-
-		<condition property="jboss.errored" value="YES!">
-			<isset property="jboss-${jboss.version}.errored"/>
-		</condition>
-
-		<condition property="jakarta-tomcat-4.1.errored" value="YES!">
-			<isset property="jakarta-tomcat-${tomcat-4.1.version}.errored"/>
-		</condition>
-
-		<condition property="jakarta-tomcat-5.errored" value="YES!">
-			<isset property="jakarta-tomcat-${tomcat-5.version}.errored"/>
-		</condition>
-
-		<condition property="jetty.failed" value="YES!">
-			<isset property="jetty-${jetty.version}.failed"/>
-		</condition>
-
-		<condition property="jboss.failed" value="YES!">
-			<isset property="jboss-${jboss.version}.failed"/>
-		</condition>
-
-		<condition property="jakarta-tomcat-4.1.failed" value="YES!">
-			<isset property="jakarta-tomcat-${tomcat-4.1.version}.failed"/>
-		</condition>
-
-		<condition property="jakarta-tomcat-5.failed" value="YES!">
-			<isset property="jakarta-tomcat-${tomcat-5.version}.failed"/>
-		</condition>
-		
-		<condition property="jakarta-tomcat-4.1.run" value="yes">
-			<isset property="jakarta-tomcat-${tomcat-4.1.version}.run"/>
-		</condition>
-
-		<condition property="jakarta-tomcat-5.run" value="yes">
-			<isset property="jakarta-tomcat-${tomcat-5.version}.run"/>
-		</condition>
-
-		<property name="jetty.errored" value="no  "/>
-		<property name="jboss.errored" value="no  "/>
-		<property name="jakarta-tomcat-4.1.errored" value="no  "/>
-		<property name="jakarta-tomcat-5.errored" value="no  "/>
-		<property name="jetty.failed" value="no  "/>
-		<property name="jboss.failed" value="no  "/>
-		<property name="jakarta-tomcat-4.1.failed" value="no  "/>
-		<property name="jakarta-tomcat-5.failed" value="no  "/>
-		<property name="jetty.run" value="no "/>
-		<property name="jboss.run" value="no "/>
-		<property name="jakarta-tomcat-4.1.run" value="no "/>
-		<property name="jakarta-tomcat-5.run" value="no "/>
-
-		<echo level="info">
-Jetty ${jetty.version}:&#9;Run: ${jetty.run}&#9;Errored: ${jetty.errored}&#9;Failed: ${jetty.failed}
-JBoss ${jboss.version}:&#9;Run: ${jboss.run}&#9;Errored: ${jboss.errored}&#9;Failed: ${jboss.failed}
-Tomcat ${tomcat-4.1.version}:&#9;Run: ${jakarta-tomcat-4.1.run}&#9;Errored: ${jakarta-tomcat-4.1.errored}&#9;Failed: ${jakarta-tomcat-4.1.failed}
-Tomcat ${tomcat-5.version}:&#9;Run: ${jakarta-tomcat-5.run}&#9;Errored: ${jakarta-tomcat-5.errored}&#9;Failed: ${jakarta-tomcat-5.failed}
-</echo>
-
-		<fail if="anyerrors">*** ERRORS OCCURRED DURING TESTING ***</fail>
-		<fail if="anyfailures">*** Failures occurred during testing ***</fail>
-	</target>
-
-	<target name="-prepare.availablereports.windows" if="is.windows">
-		<pathconvert dirsep="\" pathsep="&#13;&#10;"
-			property="availablereports.paths"
-			refid="availablereports"/>
-		<echo>${availablereports.paths}</echo>
-	</target>
-
-	<target name="-prepare.availablereports.unix" unless="is.windows">
-		<echo>not is.windows: ${is.windows}</echo>
-		<pathconvert dirsep="/" pathsep="&#10;"
-			property="availablereports.paths"
-			refid="availablereports"/>
-		<echo>${availablereports.paths}</echo>
-	</target>
-
-	<target name="tests-jetty" depends="buildtests" description="Runs Jetty integration tests">
-  		<delete dir="${reports.dir}/jetty-${jetty.version}"/>
-
-		<!-- Execute non-container adapter unit tests in normal environment-->
-		<copy file="${contacts.filter.war}" todir="${tmp.dir}/Jetty-${jetty.version}/webapps" overwrite="true"/>
-		<antcallback target="-perform-test-jetty" return="jetty-${jetty.version}.errored, jetty-${jetty.version}.failed">
-			<param name="test.includes" value="**/FilterContactsTests.class"/>
-			<param name="wait.for.url" value="http://localhost:8080/contacts"/>
-		</antcallback>
-
-		<!-- Setup container adapter environment and execute unit tests -->
-		<copy file="${config.dir}/jetty-${jetty.version}/jetty.xml" todir="${tmp.dir}/Jetty-${jetty.version}/etc" overwrite="true"/>
-		<copy file="${acegisecurity.xml}" todir="${tmp.dir}/Jetty-${jetty.version}/etc" overwrite="true"/>
-		<copy file="${dist.lib.dir}/acegi-security-jetty-ext.jar" todir="${tmp.dir}/Jetty-${jetty.version}/ext" overwrite="true"/>
-		<copy file="${lib.dir}/aopalliance/aopalliance-1.0.jar" todir="${tmp.dir}/Jetty-${jetty.version}/ext" overwrite="true"/>
-		<copy file="${lib.dir}/jakarta-commons/commons-logging.jar" todir="${tmp.dir}/Jetty-${jetty.version}/ext" overwrite="true"/>
-		<copy file="${lib.dir}/jakarta-commons/commons-codec.jar" todir="${tmp.dir}/Jetty-${jetty.version}/ext" overwrite="true"/>
-		<copy file="${lib.dir}/caucho/burlap.jar" todir="${tmp.dir}/Jetty-${jetty.version}/ext" overwrite="true"/>
-		<copy file="${lib.dir}/caucho/hessian.jar" todir="${tmp.dir}/Jetty-${jetty.version}/ext" overwrite="true"/>
-		<copy file="${lib.dir}/spring/spring.jar" todir="${tmp.dir}/Jetty-${jetty.version}/ext" overwrite="true"/>
-		<copy file="${contacts.ca.war}" todir="${tmp.dir}/Jetty-${jetty.version}/webapps" overwrite="true"/>
-		<antcallback target="-perform-test-jetty" return="jetty-${jetty.version}.errored, jetty-${jetty.version}.failed">
-			<param name="test.includes" value="**/ContainerAdapterContactsTests.class"/>
-			<param name="wait.for.url" value="http://localhost:8080/contacts-container-adapter"/>
-		</antcallback>
-
-		<antcall target="-report">
-			<param name="product" value="jetty-${jetty.version}"/>
-		</antcall>
-		<property name="jetty.run" value="yes"/>
-	</target>
-
-	<target name="-perform-test-jetty">
-		<parallel>
-			<java fork="true" dir="${tmp.dir}/Jetty-${jetty.version}/" classpath="${tmp.dir}/Jetty-${jetty.version}/start.jar" classname="org.mortbay.start.Main">
-			</java>
-			<sequential>
-                <waitfor maxwait="60" maxwaitunit="second" checkevery="500" checkeveryunit="millisecond">
-                    <http url="${wait.for.url}" />
-                </waitfor>
-				<antcallback target="-runtests" return="jetty-${jetty.version}.errored, jetty-${jetty.version}.failed">
-					<param name="product" value="jetty-${jetty.version}"/>
-				</antcallback>
-		  		<java fork="true" dir="${tmp.dir}/Jetty-${jetty.version}/" classpath="${tmp.dir}/Jetty-${jetty.version}/stop.jar" classname="org.mortbay.stop.Main"/>
-        	</sequential>
-		</parallel>
-	</target>
-
-	<target name="tests-catalina" description="Runs Catalina integration tests">
-		<antcallback target="-tests-catalina" return="jakarta-tomcat-${tomcat-4.1.version}.run, jakarta-tomcat-${tomcat-4.1.version}.errored, jakarta-tomcat-${tomcat-4.1.version}.failed">
-			<param name="tomcat.version" value="${tomcat-4.1.version}"/>
-		</antcallback>
-
-		<antcallback target="-tests-catalina" return="jakarta-tomcat-${tomcat-5.version}.run, jakarta-tomcat-${tomcat-5.version}.errored, jakarta-tomcat-${tomcat-5.version}.failed">
-			<param name="tomcat.version" value="${tomcat-5.version}"/>
-		</antcallback>
-    </target>
-
-	<target name="tests-catalina-4.1" description="Runs Catalina 4.1 integration tests">
-		<antcallback inheritall="true" target="-tests-catalina" >
-			<param name="tomcat.version" value="${tomcat-4.1.version}"/>
-		</antcallback>
-    </target>
-
-	<target name="tests-catalina-5" description="Runs Catalina 5 integration tests">
-		<antcallback target="-tests-catalina">
-			<param name="tomcat.version" value="${tomcat-5.version}"/>
-		</antcallback>
-    </target>
-	
-	<target name="-tests-catalina" depends="buildtests" description="Runs Catalina integration tests">
-		<property name="tomcat.home" value="${tmp.dir}/jakarta-tomcat-${tomcat.version}"/>
-  		<delete dir="${reports.dir}/jakarta-tomcat-${tomcat.version}"/>
-
-		<!-- Execute non-container adapter unit tests in normal environment-->
-		<delete dir="${tmp.dir}/jakarta-tomcat-${tomcat.version}/webapps/contacts"/>
-		<copy file="${contacts.filter.war}" todir="${tmp.dir}/jakarta-tomcat-${tomcat.version}/webapps" overwrite="true"/>
-		<antcallback target="-perform-test-catalina" return="jakarta-tomcat-${tomcat.version}.errored, jakarta-tomcat-${tomcat.version}.failed">
-			<param name="test.includes" value="**/FilterContactsTests.class"/>
-			<param name="wait.for.url" value="http://localhost:8080/contacts"/>
-		</antcallback>
-		
-		<!-- Setup container adapter environment and execute unit tests -->
-		<copy file="${config.dir}/catalina-${tomcat.version}/server.xml" todir="${tmp.dir}/jakarta-tomcat-${tomcat.version}/conf" overwrite="true"/>
-		<copy file="${acegisecurity.xml}" todir="${tmp.dir}/jakarta-tomcat-${tomcat.version}/conf" overwrite="true"/>
-		<copy file="${dist.lib.dir}/acegi-security-catalina-server.jar" todir="${tmp.dir}/jakarta-tomcat-${tomcat.version}/server/lib" overwrite="true"/>
-		<copy file="${dist.lib.dir}/acegi-security-catalina-common.jar" todir="${tmp.dir}/jakarta-tomcat-${tomcat.version}/common/lib" overwrite="true"/>
-		<copy file="${lib.dir}/aopalliance/aopalliance-1.0.jar" todir="${tmp.dir}/jakarta-tomcat-${tomcat.version}/common/lib" overwrite="true"/>
-		<copy file="${lib.dir}/spring/spring.jar" todir="${tmp.dir}/jakarta-tomcat-${tomcat.version}/common/lib" overwrite="true"/>
-		<copy file="${lib.dir}/jakarta-commons/commons-codec.jar" todir="${tmp.dir}/jakarta-tomcat-${tomcat.version}/common/lib" overwrite="true"/>
-		<copy file="${lib.dir}/caucho/burlap.jar" todir="${tmp.dir}/jakarta-tomcat-${tomcat.version}/common/lib" overwrite="true"/>
-		<copy file="${lib.dir}/caucho/hessian.jar" todir="${tmp.dir}/jakarta-tomcat-${tomcat.version}/common/lib" overwrite="true"/>
-		<copy file="${contacts.ca.war}" todir="${tmp.dir}/jakarta-tomcat-${tomcat.version}/webapps" overwrite="true"/>
-		<delete dir="${tmp.dir}/jakarta-tomcat-${tomcat.version}/webapps/contacts-container-adapter"/>
-		<antcallback target="-perform-test-catalina" return="jakarta-tomcat-${tomcat.version}.errored, jakarta-tomcat-${tomcat.version}.failed">
-			<param name="test.includes" value="**/ContainerAdapterContactsTests.class"/>
-			<param name="wait.for.url" value="http://localhost:8080/contacts-container-adapter"/>
-		</antcallback>
-
-		<antcall target="-report">
-			<param name="product" value="jakarta-tomcat-${tomcat.version}"/>
-		</antcall>
-		<property name="jakarta-tomcat-${tomcat.version}.run" value="yes"/>
-	</target>
-
-	<target name="-perform-test-catalina">
-		<parallel>
-			<java fork="true" classname="org.apache.catalina.startup.Bootstrap" dir="${tomcat.home}">
-				<jvmarg value="-Dcatalina.home=${tomcat.home}"/>
-				<arg value="start"/>
-				<classpath>
-					<pathelement path="${java.home}/../lib/tools.jar"/>
-					<fileset dir="${tomcat.home}">
-						<include name="bin/bootstrap.jar"/>
-					</fileset>
-				</classpath>
-			</java>
-			<sequential>
-                <waitfor maxwait="60" maxwaitunit="second" checkevery="500" checkeveryunit="millisecond">
-                    <http url="${wait.for.url}" />
-                </waitfor>
-				<antcallback target="-runtests" return="jakarta-tomcat-${tomcat.version}.errored, jakarta-tomcat-${tomcat.version}.failed">
-					<param name="product" value="jakarta-tomcat-${tomcat.version}"/>
-				</antcallback>
-				<java fork="true" classname="org.apache.catalina.startup.Bootstrap" dir="${tomcat.home}">
-					<jvmarg value="-Dcatalina.home=${tomcat.home}"/>
-					<arg value="stop"/>
-					<classpath>
-						<pathelement path="${java.home}/../lib/tools.jar"/>
-						<fileset dir="${tomcat.home}">
-							<include name="bin/bootstrap.jar"/>
-						</fileset>
-					</classpath>
-				</java>
- 	      	</sequential>
-		</parallel>
-	</target>
-
-	<target name="tests-jboss" depends="buildtests" description="Runs JBoss integration tests">
-  		<delete dir="${reports.dir}/jboss-${jboss.version}"/>
-
-		<!-- Execute non-container adapter unit tests in normal environment-->
-		<copy file="${contacts.filter.war}" todir="${tmp.dir}/jboss-${jboss.version}/server/default/deploy" overwrite="true"/>
-		<antcallback target="-perform-test-jboss" return="jboss-${jboss.version}.errored, jboss-${jboss.version}.failed">
-			<param name="test.includes" value="**/FilterContactsTests.class"/>
-			<param name="wait.for.url" value="http://localhost:8080/contacts"/>
-		</antcallback>
-
-		<!-- Setup container adapter environment and execute unit tests -->
-		<copy file="${config.dir}/jboss-${jboss.version}/login-config.xml" todir="${tmp.dir}/jboss-${jboss.version}/server/default/conf" overwrite="true"/>
-		<copy file="${acegisecurity.xml}" todir="${tmp.dir}/jboss-${jboss.version}/server/default/conf" overwrite="true"/>
-		<copy file="${dist.lib.dir}/acegi-security-jboss-lib.jar" todir="${tmp.dir}/jboss-${jboss.version}/server/default/lib" overwrite="true"/>
-		<copy file="${lib.dir}/aopalliance/aopalliance-1.0.jar" todir="${tmp.dir}/jboss-${jboss.version}/server/default/lib" overwrite="true"/>
-		<copy file="${lib.dir}/spring/spring.jar" todir="${tmp.dir}/jboss-${jboss.version}/server/default/lib" overwrite="true"/>
-		<copy file="${lib.dir}/jakarta-commons/commons-codec.jar" todir="${tmp.dir}/jboss-${jboss.version}/server/default/lib" overwrite="true"/>
-		<copy file="${lib.dir}/caucho/burlap.jar" todir="${tmp.dir}/jboss-${jboss.version}/server/default/lib" overwrite="true"/>
-		<copy file="${lib.dir}/caucho/hessian.jar" todir="${tmp.dir}/jboss-${jboss.version}/server/default/lib" overwrite="true"/>
-		<copy file="${contacts.ca.war}" todir="${tmp.dir}/jboss-${jboss.version}/server/default/deploy" overwrite="true"/>
-		<antcallback target="-perform-test-jboss" return="jboss-${jboss.version}.errored, jboss-${jboss.version}.failed">
-			<param name="test.includes" value="**/ContainerAdapterContactsTests.class"/>
-			<param name="wait.for.url" value="http://localhost:8080/contacts-container-adapter"/>
-		</antcallback>
-
-		<antcall target="-report">
-			<param name="product" value="jboss-${jboss.version}"/>
-		</antcall>
-		<property name="jboss.run" value="yes"/>
-	</target>
-
-	<target name="-perform-test-jboss">
-		<parallel>
-            <java fork="yes" classname="org.jboss.Main" dir="${tmp.dir}/jboss-${jboss.version}">
-                <classpath>
-        			<pathelement path="${java.home}/../lib/tools.jar"/>
-		            <pathelement path="${tmp.dir}/jboss-${jboss.version}/bin/run.jar"/>
-                </classpath>
-            </java>
-			<sequential>
-                <waitfor maxwait="60" maxwaitunit="second" checkevery="500" checkeveryunit="millisecond">
-                    <http url="${wait.for.url}" />
-                </waitfor>
-				<antcallback target="-runtests"  return="jboss-${jboss.version}.errored, jboss-${jboss.version}.failed">
-					<param name="product" value="jboss-${jboss.version}"/>
-				</antcallback>
-		        <java fork="yes" classname="org.jboss.Shutdown" dir="${tmp.dir}/jboss-${jboss.version}">
-					<arg value="--shutdown"/>
-		            <classpath>
-		                <pathelement path="${tmp.dir}/jboss-${jboss.version}/bin/shutdown.jar"/>
-		            </classpath>
-		        </java>
- 	      	</sequential>
-		</parallel>
-	</target>
-
-	<target name="unzip" depends="unzip-jetty,unzip-catalina,unzip-jboss" description="Unzip all containers"/>
-
-	<target name="unzip-jetty" depends="" description="Unzip Jetty container">
-		<delete dir="${tmp.dir}/Jetty-${jetty.version}"/>
-		<mkdir dir="${tmp.dir}/Jetty-${jetty.version}"/>
-		<unzip src="${containers.dir}/Jetty-${jetty.version}-all.zip" dest="${tmp.dir}"/>
-	</target>
-
-	<target name="unzip-catalina" depends="" description="Unzip Catalina container">
-		<antcall target="-unzip-catalina">
-			<param name="tomcat.version" value="${tomcat-4.1.version}"/>
-		</antcall>
-		<antcall target="-unzip-catalina">
-			<param name="tomcat.version" value="${tomcat-5.version}"/>
-		</antcall>
-	</target>
-
-	<target name="unzip-catalina-4.1" depends="" description="Unzip Catalina 4.1 container">
-		<antcall target="-unzip-catalina">
-			<param name="tomcat.version" value="${tomcat-4.1.version}"/>
-		</antcall>
-	</target>
-
-	<target name="unzip-catalina-5" depends="" description="Unzip Catalina 5 container">
-		<antcall target="-unzip-catalina">
-			<param name="tomcat.version" value="${tomcat-4.1.version}"/>
-		</antcall>
-	</target>
-
-	<target name="-unzip-catalina" depends="" description="Unzip Catalina container">
-		<delete dir="${tmp.dir}/jakarta-tomcat-${tomcat.version}"/>
-		<mkdir dir="${tmp.dir}/jakarta-tomcat-${tomcat.version}"/>
-		<unzip src="${containers.dir}/jakarta-tomcat-${tomcat.version}.zip" dest="${tmp.dir}"/>
-	</target>
-
-	<target name="unzip-jboss" depends="" description="Unzip JBoss container">
-		<delete dir="${tmp.dir}/jboss-${jboss.version}"/>
-		<mkdir dir="${tmp.dir}/jboss-${jboss.version}"/>
-		<unzip src="${containers.dir}/jboss-${jboss.version}.zip" dest="${tmp.dir}"/>
-	</target>
-
-	<target name="-report" description="Generates a browsable HTML report of the test run">
-		<mkdir dir="${reports.dir}/${product}/html"/>
-		<junitreport todir="${reports.dir}/${product}">
-			<fileset dir="${reports.dir}/${product}" includes="**/TEST-*.xml"/>
-			<report format="frames" todir="${reports.dir}/${product}/html"/>
-		</junitreport>
-	</target>
-
-	<target name="-runtests" description="Runs the unit tests">
-  		<mkdir dir="${reports.dir}/${product}"/>
-  		<junit printsummary="yes" haltonfailure="no" haltonerror="no"
-			failureproperty="${product}.failed"
-			errorproperty="${product}.errored">
-			<classpath location="${build.dir}"/>
-			<classpath refid="qa-portalpath"/>
-			<formatter type="xml"/>
-			<batchtest fork="yes" todir="${reports.dir}/${product}">
-				<fileset dir="${build.dir}" includes="${test.includes}" excludes="${test.excludes}"/>
-			</batchtest>
-		</junit>
-	</target>
-
-</project>

+ 0 - 384
integration-test/container-configs/catalina-4.1.30/server.xml

@@ -1,384 +0,0 @@
-<!-- Example Server Configuration File -->
-<!-- Note that component elements are nested corresponding to their
-     parent-child relationships with each other -->
-
-<!-- A "Server" is a singleton element that represents the entire JVM,
-     which may contain one or more "Service" instances.  The Server
-     listens for a shutdown command on the indicated port.
-
-     Note:  A "Server" is not itself a "Container", so you may not
-     define subcomponents such as "Valves" or "Loggers" at this level.
- -->
-
-<Server port="8005" shutdown="SHUTDOWN" debug="0">
-
-
-  <!-- Comment these entries out to disable JMX MBeans support -->
-  <!-- You may also configure custom components (e.g. Valves/Realms) by
-       including your own mbean-descriptor file(s), and setting the
-       "descriptors" attribute to point to a ';' seperated list of paths
-       (in the ClassLoader sense) of files to add to the default list.
-       e.g. descriptors="/com/myfirm/mypackage/mbean-descriptor.xml"
-  -->
-  <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener"
-            debug="0"/>
-  <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener"
-            debug="0"/>
-
-  <!-- Global JNDI resources -->
-  <GlobalNamingResources>
-
-    <!-- Test entry for demonstration purposes -->
-    <Environment name="simpleValue" type="java.lang.Integer" value="30"/>
-
-    <!-- Editable user database that can also be used by
-         UserDatabaseRealm to authenticate users -->
-    <Resource name="UserDatabase" auth="Container"
-              type="org.apache.catalina.UserDatabase"
-       description="User database that can be updated and saved">
-    </Resource>
-    <ResourceParams name="UserDatabase">
-      <parameter>
-        <name>factory</name>
-        <value>org.apache.catalina.users.MemoryUserDatabaseFactory</value>
-      </parameter>
-      <parameter>
-        <name>pathname</name>
-        <value>conf/tomcat-users.xml</value>
-      </parameter>
-    </ResourceParams>
-
-  </GlobalNamingResources>
-
-  <!-- A "Service" is a collection of one or more "Connectors" that share
-       a single "Container" (and therefore the web applications visible
-       within that Container).  Normally, that Container is an "Engine",
-       but this is not required.
-
-       Note:  A "Service" is not itself a "Container", so you may not
-       define subcomponents such as "Valves" or "Loggers" at this level.
-   -->
-
-  <!-- Define the Tomcat Stand-Alone Service -->
-  <Service name="Tomcat-Standalone">
-
-    <!-- A "Connector" represents an endpoint by which requests are received
-         and responses are returned.  Each Connector passes requests on to the
-         associated "Container" (normally an Engine) for processing.
-
-         By default, a non-SSL HTTP/1.1 Connector is established on port 8080.
-         You can also enable an SSL HTTP/1.1 Connector on port 8443 by
-         following the instructions below and uncommenting the second Connector
-         entry.  SSL support requires the following steps (see the SSL Config
-         HOWTO in the Tomcat 4.0 documentation bundle for more detailed
-         instructions):
-         * Download and install JSSE 1.0.2 or later, and put the JAR files
-           into "$JAVA_HOME/jre/lib/ext".
-         * Execute:
-             %JAVA_HOME%\bin\keytool -genkey -alias tomcat -keyalg RSA (Windows)
-             $JAVA_HOME/bin/keytool -genkey -alias tomcat -keyalg RSA  (Unix)
-           with a password value of "changeit" for both the certificate and
-           the keystore itself.
-
-         By default, DNS lookups are enabled when a web application calls
-         request.getRemoteHost().  This can have an adverse impact on
-         performance, so you can disable it by setting the
-         "enableLookups" attribute to "false".  When DNS lookups are disabled,
-         request.getRemoteHost() will return the String version of the
-         IP address of the remote client.
-    -->
-
-    <!-- Define a non-SSL Coyote HTTP/1.1 Connector on port 8080 -->
-    <Connector className="org.apache.coyote.tomcat4.CoyoteConnector"
-               port="8080" minProcessors="5" maxProcessors="75"
-               enableLookups="true" redirectPort="8443"
-               acceptCount="100" debug="0" connectionTimeout="20000"
-               useURIValidationHack="false" disableUploadTimeout="true" />
-    <!-- Note : To disable connection timeouts, set connectionTimeout value
-     to 0 -->
-
-    <!-- Define a SSL Coyote HTTP/1.1 Connector on port 8443 -->
-    <!--
-    <Connector className="org.apache.coyote.tomcat4.CoyoteConnector"
-               port="8443" minProcessors="5" maxProcessors="75"
-               enableLookups="true"
-           acceptCount="100" debug="0" scheme="https" secure="true"
-               useURIValidationHack="false" disableUploadTimeout="true">
-      <Factory className="org.apache.coyote.tomcat4.CoyoteServerSocketFactory"
-               clientAuth="false" protocol="TLS" />
-    </Connector>
-    -->
-
-    <!-- Define a Coyote/JK2 AJP 1.3 Connector on port 8009 -->
-    <Connector className="org.apache.coyote.tomcat4.CoyoteConnector"
-               port="8009" minProcessors="5" maxProcessors="75"
-               enableLookups="true" redirectPort="8443"
-               acceptCount="10" debug="0" connectionTimeout="0"
-               useURIValidationHack="false"
-               protocolHandlerClassName="org.apache.jk.server.JkCoyoteHandler"/>
-
-    <!-- Define an AJP 1.3 Connector on port 8009 -->
-    <!--
-    <Connector className="org.apache.ajp.tomcat4.Ajp13Connector"
-               port="8009" minProcessors="5" maxProcessors="75"
-               acceptCount="10" debug="0"/>
-    -->
-
-    <!-- Define a Proxied HTTP/1.1 Connector on port 8082 -->
-    <!-- See proxy documentation for more information about using this. -->
-    <!--
-    <Connector className="org.apache.coyote.tomcat4.CoyoteConnector"
-               port="8082" minProcessors="5" maxProcessors="75"
-               enableLookups="true"
-               acceptCount="100" debug="0" connectionTimeout="20000"
-               proxyPort="80" useURIValidationHack="false"
-               disableUploadTimeout="true" />
-    -->
-
-    <!-- Define a non-SSL legacy HTTP/1.1 Test Connector on port 8083 -->
-    <!--
-    <Connector className="org.apache.catalina.connector.http.HttpConnector"
-               port="8083" minProcessors="5" maxProcessors="75"
-               enableLookups="true" redirectPort="8443"
-               acceptCount="10" debug="0" />
-    -->
-
-    <!-- Define a non-SSL HTTP/1.0 Test Connector on port 8084 -->
-    <!--
-    <Connector className="org.apache.catalina.connector.http10.HttpConnector"
-               port="8084" minProcessors="5" maxProcessors="75"
-               enableLookups="true" redirectPort="8443"
-               acceptCount="10" debug="0" />
-    -->
-
-    <!-- An Engine represents the entry point (within Catalina) that processes
-         every request.  The Engine implementation for Tomcat stand alone
-         analyzes the HTTP headers included with the request, and passes them
-         on to the appropriate Host (virtual host). -->
-
-    <!-- You should set jvmRoute to support load-balancing via JK/JK2 ie :
-    <Engine name="Standalone" defaultHost="localhost" debug="0" jvmRoute="jvm1">
-    -->
-
-    <!-- Define the top level container in our container hierarchy -->
-    <Engine name="Standalone" defaultHost="localhost" debug="0">
-
-      <!-- The request dumper valve dumps useful debugging information about
-           the request headers and cookies that were received, and the response
-           headers and cookies that were sent, for all requests received by
-           this instance of Tomcat.  If you care only about requests to a
-           particular virtual host, or a particular application, nest this
-           element inside the corresponding <Host> or <Context> entry instead.
-
-           For a similar mechanism that is portable to all Servlet 2.3
-           containers, check out the "RequestDumperFilter" Filter in the
-           example application (the source for this filter may be found in
-           "$CATALINA_HOME/webapps/examples/WEB-INF/classes/filters").
-
-           Request dumping is disabled by default.  Uncomment the following
-           element to enable it. -->
-      <!--
-      <Valve className="org.apache.catalina.valves.RequestDumperValve"/>
-      -->
-
-      <!-- Global logger unless overridden at lower levels -->
-      <Logger className="org.apache.catalina.logger.FileLogger"
-              prefix="catalina_log." suffix=".txt"
-              timestamp="true"/>
-
-      <!-- Because this Realm is here, an instance will be shared globally -->
-      <Realm className="net.sf.acegisecurity.adapters.catalina.CatalinaAcegiUserRealm"
-         appContextLocation="conf/acegisecurity.xml"
-         key="my_password"/>
-
-      <!-- Comment out the old realm but leave here for now in case we
-           need to go back quickly -->
-      <!--
-      <Realm className="org.apache.catalina.realm.MemoryRealm" />
-      -->
-
-      <!-- Replace the above Realm with one of the following to get a Realm
-           stored in a database and accessed via JDBC -->
-
-      <!--
-      <Realm  className="org.apache.catalina.realm.JDBCRealm" debug="99"
-             driverName="org.gjt.mm.mysql.Driver"
-          connectionURL="jdbc:mysql://localhost/authority"
-         connectionName="test" connectionPassword="test"
-              userTable="users" userNameCol="user_name" userCredCol="user_pass"
-          userRoleTable="user_roles" roleNameCol="role_name" />
-      -->
-
-      <!--
-      <Realm  className="org.apache.catalina.realm.JDBCRealm" debug="99"
-             driverName="oracle.jdbc.driver.OracleDriver"
-          connectionURL="jdbc:oracle:thin:@ntserver:1521:ORCL"
-         connectionName="scott" connectionPassword="tiger"
-              userTable="users" userNameCol="user_name" userCredCol="user_pass"
-          userRoleTable="user_roles" roleNameCol="role_name" />
-      -->
-
-      <!--
-      <Realm  className="org.apache.catalina.realm.JDBCRealm" debug="99"
-             driverName="sun.jdbc.odbc.JdbcOdbcDriver"
-          connectionURL="jdbc:odbc:CATALINA"
-              userTable="users" userNameCol="user_name" userCredCol="user_pass"
-          userRoleTable="user_roles" roleNameCol="role_name" />
-      -->
-
-      <!-- Define the default virtual host -->
-      <Host name="localhost" debug="0" appBase="webapps"
-       unpackWARs="true" autoDeploy="true">
-
-        <!-- Normally, users must authenticate themselves to each web app
-             individually.  Uncomment the following entry if you would like
-             a user to be authenticated the first time they encounter a
-             resource protected by a security constraint, and then have that
-             user identity maintained across *all* web applications contained
-             in this virtual host. -->
-        <!--
-        <Valve className="org.apache.catalina.authenticator.SingleSignOn"
-                   debug="0"/>
-        -->
-
-        <!-- Access log processes all requests for this virtual host.  By
-             default, log files are created in the "logs" directory relative to
-             $CATALINA_HOME.  If you wish, you can specify a different
-             directory with the "directory" attribute.  Specify either a relative
-             (to $CATALINA_HOME) or absolute path to the desired directory.
-        -->
-        <!--
-        <Valve className="org.apache.catalina.valves.AccessLogValve"
-                 directory="logs"  prefix="localhost_access_log." suffix=".txt"
-                 pattern="common" resolveHosts="false"/>
-        -->
-
-        <!-- Logger shared by all Contexts related to this virtual host.  By
-             default (when using FileLogger), log files are created in the "logs"
-             directory relative to $CATALINA_HOME.  If you wish, you can specify
-             a different directory with the "directory" attribute.  Specify either a
-             relative (to $CATALINA_HOME) or absolute path to the desired
-             directory.-->
-        <Logger className="org.apache.catalina.logger.FileLogger"
-                 directory="logs"  prefix="localhost_log." suffix=".txt"
-            timestamp="true"/>
-
-        <!-- Define properties for each web application.  This is only needed
-             if you want to set non-default properties, or have web application
-             document roots in places other than the virtual host's appBase
-             directory.  -->
-
-        <!-- Tomcat Root Context -->
-        <!--
-          <Context path="" docBase="ROOT" debug="0"/>
-        -->
-
-        <!-- Tomcat Examples Context -->
-        <Context path="/examples" docBase="examples" debug="0"
-                 reloadable="true" crossContext="true">
-          <Logger className="org.apache.catalina.logger.FileLogger"
-                     prefix="localhost_examples_log." suffix=".txt"
-              timestamp="true"/>
-          <Ejb   name="ejb/EmplRecord" type="Entity"
-                 home="com.wombat.empl.EmployeeRecordHome"
-               remote="com.wombat.empl.EmployeeRecord"/>
-
-          <!-- If you wanted the examples app to be able to edit the
-               user database, you would uncomment the following entry.
-               Of course, you would want to enable security on the
-               application as well, so this is not done by default!
-               The database object could be accessed like this:
-
-               Context initCtx = new InitialContext();
-               Context envCtx = (Context) initCtx.lookup("java:comp/env");
-               UserDatabase database =
-                    (UserDatabase) envCtx.lookup("userDatabase");
-          -->
-<!--
-          <ResourceLink name="userDatabase" global="UserDatabase"
-                        type="org.apache.catalina.UserDatabase"/>
--->
-
-
-          <!-- PersistentManager: Uncomment the section below to test Persistent
-               Sessions.
-
-               saveOnRestart: If true, all active sessions will be saved
-                 to the Store when Catalina is shutdown, regardless of
-                 other settings. All Sessions found in the Store will be
-                 loaded on startup. Sessions past their expiration are
-                 ignored in both cases.
-               maxActiveSessions: If 0 or greater, having too many active
-                 sessions will result in some being swapped out. minIdleSwap
-                 limits this. -1 or 0 means unlimited sessions are allowed.
-                 If it is not possible to swap sessions new sessions will
-                 be rejected.
-                 This avoids thrashing when the site is highly active.
-               minIdleSwap: Sessions must be idle for at least this long
-                 (in seconds) before they will be swapped out due to
-                 activity.
-                 0 means sessions will almost always be swapped out after
-                 use - this will be noticeably slow for your users.
-               maxIdleSwap: Sessions will be swapped out if idle for this
-                 long (in seconds). If minIdleSwap is higher, then it will
-                 override this. This isn't exact: it is checked periodically.
-                 -1 means sessions won't be swapped out for this reason,
-                 although they may be swapped out for maxActiveSessions.
-                 If set to >= 0, guarantees that all sessions found in the
-                 Store will be loaded on startup.
-               maxIdleBackup: Sessions will be backed up (saved to the Store,
-                 but left in active memory) if idle for this long (in seconds),
-                 and all sessions found in the Store will be loaded on startup.
-                 If set to -1 sessions will not be backed up, 0 means they
-                 should be backed up shortly after being used.
-
-               To clear sessions from the Store, set maxActiveSessions, maxIdleSwap,
-               and minIdleBackup all to -1, saveOnRestart to false, then restart
-               Catalina.
-          -->
-          <!--
-          <Manager className="org.apache.catalina.session.PersistentManager"
-              debug="0"
-              saveOnRestart="true"
-              maxActiveSessions="-1"
-              minIdleSwap="-1"
-              maxIdleSwap="-1"
-              maxIdleBackup="-1">
-                <Store className="org.apache.catalina.session.FileStore"/>
-          </Manager>
-          -->
-          <Environment name="maxExemptions" type="java.lang.Integer"
-                      value="15"/>
-          <Parameter name="context.param.name" value="context.param.value"
-                     override="false"/>
-          <Resource name="jdbc/EmployeeAppDb" auth="SERVLET"
-                    type="javax.sql.DataSource"/>
-          <ResourceParams name="jdbc/EmployeeAppDb">
-            <parameter><name>username</name><value>sa</value></parameter>
-            <parameter><name>password</name><value></value></parameter>
-            <parameter><name>driverClassName</name>
-              <value>org.hsql.jdbcDriver</value></parameter>
-            <parameter><name>url</name>
-              <value>jdbc:HypersonicSQL:database</value></parameter>
-          </ResourceParams>
-          <Resource name="mail/Session" auth="Container"
-                    type="javax.mail.Session"/>
-          <ResourceParams name="mail/Session">
-            <parameter>
-              <name>mail.smtp.host</name>
-              <value>localhost</value>
-            </parameter>
-          </ResourceParams>
-          <ResourceLink name="linkToGlobalResource"
-                    global="simpleValue"
-                    type="java.lang.Integer"/>
-        </Context>
-
-      </Host>
-
-    </Engine>
-
-  </Service>
-
-
-</Server>

+ 0 - 366
integration-test/container-configs/catalina-5.0.19/server.xml

@@ -1,366 +0,0 @@
-<!-- Example Server Configuration File -->
-<!-- Note that component elements are nested corresponding to their
-     parent-child relationships with each other -->
-
-<!-- A "Server" is a singleton element that represents the entire JVM,
-     which may contain one or more "Service" instances.  The Server
-     listens for a shutdown command on the indicated port.
-
-     Note:  A "Server" is not itself a "Container", so you may not
-     define subcomponents such as "Valves" or "Loggers" at this level.
- -->
-
-<Server port="8005" shutdown="SHUTDOWN" debug="0">
-
-
-  <!-- Comment these entries out to disable JMX MBeans support -->
-  <!-- You may also configure custom components (e.g. Valves/Realms) by 
-       including your own mbean-descriptor file(s), and setting the 
-       "descriptors" attribute to point to a ';' seperated list of paths
-       (in the ClassLoader sense) of files to add to the default list.
-       e.g. descriptors="/com/myfirm/mypackage/mbean-descriptor.xml"
-  -->
-  <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener"
-            debug="0"/>
-  <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener"
-            debug="0"/>
-
-  <!-- Global JNDI resources -->
-  <GlobalNamingResources>
-
-    <!-- Test entry for demonstration purposes -->
-    <Environment name="simpleValue" type="java.lang.Integer" value="30"/>
-
-    <!-- Editable user database that can also be used by
-         UserDatabaseRealm to authenticate users -->
-    <Resource name="UserDatabase" auth="Container"
-              type="org.apache.catalina.UserDatabase"
-       description="User database that can be updated and saved">
-    </Resource>
-    <ResourceParams name="UserDatabase">
-      <parameter>
-        <name>factory</name>
-        <value>org.apache.catalina.users.MemoryUserDatabaseFactory</value>
-      </parameter>
-      <parameter>
-        <name>pathname</name>
-        <value>conf/tomcat-users.xml</value>
-      </parameter>
-    </ResourceParams>
-
-  </GlobalNamingResources>
-
-  <!-- A "Service" is a collection of one or more "Connectors" that share
-       a single "Container" (and therefore the web applications visible
-       within that Container).  Normally, that Container is an "Engine",
-       but this is not required.
-
-       Note:  A "Service" is not itself a "Container", so you may not
-       define subcomponents such as "Valves" or "Loggers" at this level.
-   -->
-
-  <!-- Define the Tomcat Stand-Alone Service -->
-  <Service name="Catalina">
-
-    <!-- A "Connector" represents an endpoint by which requests are received
-         and responses are returned.  Each Connector passes requests on to the
-         associated "Container" (normally an Engine) for processing.
-
-         By default, a non-SSL HTTP/1.1 Connector is established on port 8080.
-         You can also enable an SSL HTTP/1.1 Connector on port 8443 by
-         following the instructions below and uncommenting the second Connector
-         entry.  SSL support requires the following steps (see the SSL Config
-         HOWTO in the Tomcat 5 documentation bundle for more detailed
-         instructions):
-         * If your JDK version 1.3 or prior, download and install JSSE 1.0.2 or
-           later, and put the JAR files into "$JAVA_HOME/jre/lib/ext".
-         * Execute:
-             %JAVA_HOME%\bin\keytool -genkey -alias tomcat -keyalg RSA (Windows)
-             $JAVA_HOME/bin/keytool -genkey -alias tomcat -keyalg RSA  (Unix)
-           with a password value of "changeit" for both the certificate and
-           the keystore itself.
-
-         By default, DNS lookups are enabled when a web application calls
-         request.getRemoteHost().  This can have an adverse impact on
-         performance, so you can disable it by setting the
-         "enableLookups" attribute to "false".  When DNS lookups are disabled,
-         request.getRemoteHost() will return the String version of the
-         IP address of the remote client.
-    -->
-
-    <!-- Define a non-SSL Coyote HTTP/1.1 Connector on port 8080 -->
-    <Connector port="8080"
-               maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
-               enableLookups="false" redirectPort="8443" acceptCount="100"
-               debug="0" connectionTimeout="20000" 
-               disableUploadTimeout="true" />
-    <!-- Note : To disable connection timeouts, set connectionTimeout value
-     to 0 -->
-	
-	<!-- Note : To use gzip compression you could set the following properties :
-	
-			   compression="on" 
-			   compressionMinSize="2048" 
-			   noCompressionUserAgents="gozilla, traviata" 
-			   compressableMimeType="text/html,text/xml"
-	-->
-
-    <!-- Define a SSL Coyote HTTP/1.1 Connector on port 8443 -->
-    <!--
-    <Connector port="8443" 
-               maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
-               enableLookups="false" disableUploadTimeout="true"
-               acceptCount="100" debug="0" scheme="https" secure="true"
-               clientAuth="false" sslProtocol="TLS" />
-    -->
-
-    <!-- Define a Coyote/JK2 AJP 1.3 Connector on port 8009 -->
-    <Connector port="8009" 
-               enableLookups="false" redirectPort="8443" debug="0"
-               protocol="AJP/1.3" />
-
-    <!-- Define a Proxied HTTP/1.1 Connector on port 8082 -->
-    <!-- See proxy documentation for more information about using this. -->
-    <!--
-    <Connector port="8082" 
-               maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
-               enableLookups="false"
-               acceptCount="100" debug="0" connectionTimeout="20000"
-               proxyPort="80" disableUploadTimeout="true" />
-    -->
-
-    <!-- An Engine represents the entry point (within Catalina) that processes
-         every request.  The Engine implementation for Tomcat stand alone
-         analyzes the HTTP headers included with the request, and passes them
-         on to the appropriate Host (virtual host). -->
-
-    <!-- You should set jvmRoute to support load-balancing via JK/JK2 ie :
-    <Engine name="Standalone" defaultHost="localhost" debug="0" jvmRoute="jvm1">         
-    --> 
-         
-    <!-- Define the top level container in our container hierarchy -->
-    <Engine name="Catalina" defaultHost="localhost" debug="0">
-
-     <Realm className="net.sf.acegisecurity.adapters.catalina.CatalinaAcegiUserRealm"
-             appContextLocation="conf/acegisecurity.xml"
-             key="my_password" />
-
-      <!-- The request dumper valve dumps useful debugging information about
-           the request headers and cookies that were received, and the response
-           headers and cookies that were sent, for all requests received by
-           this instance of Tomcat.  If you care only about requests to a
-           particular virtual host, or a particular application, nest this
-           element inside the corresponding <Host> or <Context> entry instead.
-
-           For a similar mechanism that is portable to all Servlet 2.4
-           containers, check out the "RequestDumperFilter" Filter in the
-           example application (the source for this filter may be found in
-           "$CATALINA_HOME/webapps/examples/WEB-INF/classes/filters").
-
-           Request dumping is disabled by default.  Uncomment the following
-           element to enable it. -->
-      <!--
-      <Valve className="org.apache.catalina.valves.RequestDumperValve"/>
-      -->
-
-      <!-- Global logger unless overridden at lower levels -->
-      <Logger className="org.apache.catalina.logger.FileLogger"
-              prefix="catalina_log." suffix=".txt"
-              timestamp="true"/>
-
-      <!-- Because this Realm is here, an instance will be shared globally -->
-
-      <!-- This Realm uses the UserDatabase configured in the global JNDI
-           resources under the key "UserDatabase".  Any edits
-           that are performed against this UserDatabase are immediately
-           available for use by the Realm. 
-      <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
-                 debug="0" resourceName="UserDatabase"/>   -->
-
-      <!-- Comment out the old realm but leave here for now in case we
-           need to go back quickly -->
-      <!--
-      <Realm className="org.apache.catalina.realm.MemoryRealm" />
-      -->
-
-      <!-- Replace the above Realm with one of the following to get a Realm
-           stored in a database and accessed via JDBC -->
-
-      <!--
-      <Realm  className="org.apache.catalina.realm.JDBCRealm" debug="99"
-             driverName="org.gjt.mm.mysql.Driver"
-          connectionURL="jdbc:mysql://localhost/authority"
-         connectionName="test" connectionPassword="test"
-              userTable="users" userNameCol="user_name" userCredCol="user_pass"
-          userRoleTable="user_roles" roleNameCol="role_name" />
-      -->
-
-      <!--
-      <Realm  className="org.apache.catalina.realm.JDBCRealm" debug="99"
-             driverName="oracle.jdbc.driver.OracleDriver"
-          connectionURL="jdbc:oracle:thin:@ntserver:1521:ORCL"
-         connectionName="scott" connectionPassword="tiger"
-              userTable="users" userNameCol="user_name" userCredCol="user_pass"
-          userRoleTable="user_roles" roleNameCol="role_name" />
-      -->
-
-      <!--
-      <Realm  className="org.apache.catalina.realm.JDBCRealm" debug="99"
-             driverName="sun.jdbc.odbc.JdbcOdbcDriver"
-          connectionURL="jdbc:odbc:CATALINA"
-              userTable="users" userNameCol="user_name" userCredCol="user_pass"
-          userRoleTable="user_roles" roleNameCol="role_name" />
-      -->
-
-      <!-- Define the default virtual host
-           Note: XML Schema validation will not work with Xerces 2.2.
-       -->
-      <Host name="localhost" debug="0" appBase="webapps"
-       unpackWARs="true" autoDeploy="true"
-       xmlValidation="false" xmlNamespaceAware="false">
-
-        <!-- Defines a cluster for this node,
-             By defining this element, means that every manager will be changed.
-             So when running a cluster, only make sure that you have webapps in there
-             that need to be clustered and remove the other ones.
-             A cluster has the following parameters:
-
-             className = the fully qualified name of the cluster class
-
-             name = a descriptive name for your cluster, can be anything
-
-             debug = the debug level, higher means more output
-
-             mcastAddr = the multicast address, has to be the same for all the nodes
-
-             mcastPort = the multicast port, has to be the same for all the nodes
-
-             mcastFrequency = the number of milliseconds in between sending a "I'm alive" heartbeat
-
-             mcastDropTime = the number a milliseconds before a node is considered "dead" if no heartbeat is received
-
-             tcpThreadCount = the number of threads to handle incoming replication requests, optimal would be the same amount of threads as nodes 
-
-             tcpListenAddress = the listen address (bind address) for TCP cluster request on this host, 
-                                in case of multiple ethernet cards.
-                                auto means that address becomes
-                                InetAddress.getLocalHost().getHostAddress()
-
-             tcpListenPort = the tcp listen port
-
-             tcpSelectorTimeout = the timeout (ms) for the Selector.select() method in case the OS
-                                  has a wakup bug in java.nio. Set to 0 for no timeout
-
-             printToScreen = true means that managers will also print to std.out
-
-             expireSessionsOnShutdown = true means that 
-
-             useDirtyFlag = true means that we only replicate a session after setAttribute,removeAttribute has been called.
-                            false means to replicate the session after each request.
-                            false means that replication would work for the following piece of code:
-                            <%
-                            HashMap map = (HashMap)session.getAttribute("map");
-                            map.put("key","value");
-                            %>
-             replicationMode = can be either 'pooled', 'synchronous' or 'asynchronous'.
-                               * Pooled means that the replication happens using several sockets in a synchronous way. Ie, the data gets replicated, then the request return. This is the same as the 'synchronous' setting except it uses a pool of sockets, hence it is multithreaded. This is the fastest and safest configuration. To use this, also increase the nr of tcp threads that you have dealing with replication.
-                               * Synchronous means that the thread that executes the request, is also the
-                               thread the replicates the data to the other nodes, and will not return until all
-                               nodes have received the information.
-                               * Asynchronous means that there is a specific 'sender' thread for each cluster node,
-                               so the request thread will queue the replication request into a "smart" queue,
-                               and then return to the client.
-                               The "smart" queue is a queue where when a session is added to the queue, and the same session
-                               already exists in the queue from a previous request, that session will be replaced
-                               in the queue instead of replicating two requests. This almost never happens, unless there is a 
-                               large network delay.
-        -->             
-        <!--
-            When configuring for clustering, you also add in a valve to catch all the requests
-            coming in, at the end of the request, the session may or may not be replicated.
-            A session is replicated if and only if all the conditions are met:
-            1. useDirtyFlag is true or setAttribute or removeAttribute has been called AND
-            2. a session exists (has been created)
-            3. the request is not trapped by the "filter" attribute
-
-            The filter attribute is to filter out requests that could not modify the session,
-            hence we don't replicate the session after the end of this request.
-            The filter is negative, ie, anything you put in the filter, you mean to filter out,
-            ie, no replication will be done on requests that match one of the filters.
-            The filter attribute is delimited by ;, so you can't escape out ; even if you wanted to.
-
-            filter=".*\.gif;.*\.js;" means that we will not replicate the session after requests with the URI
-            ending with .gif and .js are intercepted.
-        -->
-        
-        <!--
-        <Cluster className="org.apache.catalina.cluster.tcp.SimpleTcpCluster"
-                 managerClassName="org.apache.catalina.cluster.session.DeltaManager"
-                 expireSessionsOnShutdown="false"
-                 useDirtyFlag="true">
-
-            <Membership 
-                className="org.apache.catalina.cluster.mcast.McastService"
-                mcastAddr="228.0.0.4"
-                mcastPort="45564"
-                mcastFrequency="500"
-                mcastDropTime="3000"/>
-
-            <Receiver 
-                className="org.apache.catalina.cluster.tcp.ReplicationListener"
-                tcpListenAddress="auto"
-                tcpListenPort="4001"
-                tcpSelectorTimeout="100"
-                tcpThreadCount="6"/>
-
-            <Sender
-                className="org.apache.catalina.cluster.tcp.ReplicationTransmitter"
-                replicationMode="pooled"/>
-
-            <Valve className="org.apache.catalina.cluster.tcp.ReplicationValve"
-                   filter=".*\.gif;.*\.js;.*\.jpg;.*\.htm;.*\.html;.*\.txt;"/>
-        </Cluster>
-        -->        
-
-
-
-        <!-- Normally, users must authenticate themselves to each web app
-             individually.  Uncomment the following entry if you would like
-             a user to be authenticated the first time they encounter a
-             resource protected by a security constraint, and then have that
-             user identity maintained across *all* web applications contained
-             in this virtual host. -->
-        <!--
-        <Valve className="org.apache.catalina.authenticator.SingleSignOn"
-                   debug="0"/>
-        -->
-
-        <!-- Access log processes all requests for this virtual host.  By
-             default, log files are created in the "logs" directory relative to
-             $CATALINA_HOME.  If you wish, you can specify a different
-             directory with the "directory" attribute.  Specify either a relative
-             (to $CATALINA_HOME) or absolute path to the desired directory.
-        -->
-        <!--
-        <Valve className="org.apache.catalina.valves.AccessLogValve"
-                 directory="logs"  prefix="localhost_access_log." suffix=".txt"
-                 pattern="common" resolveHosts="false"/>
-        -->
-
-        <!-- Logger shared by all Contexts related to this virtual host.  By
-             default (when using FileLogger), log files are created in the "logs"
-             directory relative to $CATALINA_HOME.  If you wish, you can specify
-             a different directory with the "directory" attribute.  Specify either a
-             relative (to $CATALINA_HOME) or absolute path to the desired
-             directory.-->
-        <Logger className="org.apache.catalina.logger.FileLogger"
-                 directory="logs"  prefix="localhost_log." suffix=".txt"
-            timestamp="true"/>
-
-      </Host>
-
-    </Engine>
-
-  </Service>
-
-</Server>

+ 0 - 143
integration-test/container-configs/jboss-3.2.3/login-config.xml

@@ -1,143 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE policy PUBLIC
-      "-//JBoss//DTD JBOSS Security Config 3.0//EN"
-      "http://www.jboss.org/j2ee/dtd/security_config.dtd">
-
-<!-- The XML based JAAS login configuration read by the
-org.jboss.security.auth.login.XMLLoginConfig mbean. Add
-an application-policy element for each security domain.
-
-The outline of the application-policy is:
-<application-policy name="security-domain-name">
-  <authentication>
-    <login-module code="login.module1.class.name" flag="control_flag">
-      <module-option name = "option1-name">option1-value</module-option>
-      <module-option name = "option2-name">option2-value</module-option>
-      ...
-    </login-module>
-
-    <login-module code="login.module2.class.name" flag="control_flag">
-      ...
-    </login-module>
-    ...
-  </authentication>
-</application-policy>
-
-$Revision$
--->
-
-<policy>
-    <!-- Used by clients within the application server VM such as
-    mbeans and servlets that access EJBs.
-    -->
-    <application-policy name = "client-login">
-       <authentication>
-          <login-module code = "org.jboss.security.ClientLoginModule"
-             flag = "required">
-          </login-module>
-       </authentication>
-    </application-policy>
-
-    <!-- Security domain for JBossMQ -->
-    <application-policy name = "jbossmq">
-       <authentication>
-          <login-module code = "org.jboss.mq.sm.file.DynamicLoginModule"
-             flag = "required">
-             <module-option name = "unauthenticatedIdentity">guest</module-option>
-             <module-option name = "sm.objectname">jboss.mq:service=StateManager</module-option>
-          </login-module>
-       </authentication>
-    </application-policy>
-
-	<application-policy name = "SpringPoweredRealm">
-		<authentication>
-			<login-module code = "net.sf.acegisecurity.adapters.jboss.JbossAcegiLoginModule"
-				flag = "required">
-				<module-option name = "appContextLocation">acegisecurity.xml</module-option>
-				<module-option name = "key">my_password</module-option>
-			</login-module>
-		</authentication>
-	</application-policy>
-
-    <!-- Security domains for testing new jca framework -->
-    <application-policy name = "HsqlDbRealm">
-       <authentication>
-          <login-module code = "org.jboss.resource.security.ConfiguredIdentityLoginModule"
-             flag = "required">
-             <module-option name = "principal">sa</module-option>
-             <module-option name = "userName">sa</module-option>
-             <module-option name = "password"></module-option>
-             <module-option name = "managedConnectionFactoryName">jboss.jca:service=LocalTxCM,name=DefaultDS</module-option>
-          </login-module>
-       </authentication>
-    </application-policy>
-
-    <application-policy name = "FirebirdDBRealm">
-       <authentication>
-          <login-module code = "org.jboss.resource.security.ConfiguredIdentityLoginModule"
-             flag = "required">
-             <module-option name = "principal">sysdba</module-option>
-             <module-option name = "userName">sysdba</module-option>
-             <module-option name = "password">masterkey</module-option>
-             <module-option name = "managedConnectionFactoryName">jboss.jca:service=XaTxCM,name=FirebirdDS</module-option>
-          </login-module>
-       </authentication>
-    </application-policy>
-
-    <application-policy name = "JmsXARealm">
-       <authentication>
-          <login-module code = "org.jboss.resource.security.ConfiguredIdentityLoginModule"
-             flag = "required">
-             <module-option name = "principal">guest</module-option>
-             <module-option name = "userName">guest</module-option>
-             <module-option name = "password">guest</module-option>
-             <module-option name = "managedConnectionFactoryName">jboss.jca:service=TxCM,name=JmsXA</module-option>
-          </login-module>
-       </authentication>
-    </application-policy>
-
-    <!-- A template configuration for the jmx-console web application. This
-      defaults to the UsersRolesLoginModule the same as other and should be
-      changed to a stronger authentication mechanism as required.
-    -->
-    <application-policy name = "jmx-console">
-       <authentication>
-          <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
-             flag = "required" />
-       </authentication>
-    </application-policy>
-
-    <!-- A template configuration for the web-console web application. This
-      defaults to the UsersRolesLoginModule the same as other and should be
-      changed to a stronger authentication mechanism as required.
-    -->
-    <application-policy name = "web-console">
-       <authentication>
-          <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
-             flag = "required" />
-       </authentication>
-    </application-policy>
-
-    <!-- The default login configuration used by any security domain that
-    does not have a application-policy entry with a matching name
-    -->
-    <application-policy name = "other">
-       <!-- A simple server login module, which can be used when the number 
-       of users is relatively small. It uses two properties files:
-       users.properties, which holds users (key) and their password (value).
-       roles.properties, which holds users (key) and a comma-separated list of
-       their roles (value).
-       The unauthenticatedIdentity property defines the name of the principal
-       that will be used when a null username and password are presented as is
-       the case for an unuathenticated web client or MDB. If you want to
-       allow such users to be authenticated add the property, e.g.,
-       unauthenticatedIdentity="nobody"
-       -->
-       <authentication>
-          <login-module code = "org.jboss.security.auth.spi.UsersRolesLoginModule"
-             flag = "required" />
-       </authentication>
-    </application-policy>
-
-</policy>
-

+ 0 - 87
integration-test/container-configs/jetty-4.2.18/jetty.xml

@@ -1,87 +0,0 @@
-<?xml version="1.0"?> 
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure 1.2//EN" "http://jetty.mortbay.org/configure_1_2.dtd">
-
-<!-- $Id$ -->
-
-<!-- =============================================================== -->
-<!-- Configure the Jetty Server                                      -->
-<!-- =============================================================== -->
-<Configure class="org.mortbay.jetty.Server">
-
-  <!-- =============================================================== -->
-  <!-- Configure the Request Listeners                                 -->
-  <!-- =============================================================== -->
-
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <!-- Add and configure a HTTP listener to port 8080                       -->
-  <!-- The default port can be changed using: java -Djetty.port=80     -->
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <Call name="addListener">
-    <Arg>
-      <New class="org.mortbay.http.SocketListener">
-        <Set name="Port"><SystemProperty name="jetty.port" default="8080"/></Set>
-        <Set name="MinThreads">5</Set>
-        <Set name="MaxThreads">50</Set>
-        <Set name="MaxIdleTimeMs">30000</Set>
-        <Set name="LowResourcePersistTimeMs">1000</Set>
-        <Set name="ConfidentialPort">8443</Set>
-        <Set name="IntegralPort">8443</Set>
-        <Set name="PoolName">main</Set>
-      </New>
-    </Arg>
-  </Call>
-  
-  <Call name="instance" class="org.mortbay.util.Log">
-    <Call name="add">
-      <Arg>
-        <New class="org.mortbay.util.OutputStreamLogSink">  
-          <Set name="filename"><SystemProperty name="jetty.home" default="."/>/logs/yyyy_mm_dd.jetty.log</Set>
-          <Set name="retainDays">90</Set>
-          <Set name="append">true</Set>
-          <Set name="logLabels">true</Set>
-          <Set name="logStackSize">true</Set>
-          <Set name="logStackTrace">false</Set>
-          <Set name="logOneLine">false</Set>
-          <Set name="logTimeZone">GMT</Set>
-          <Call name="start"/>
-        </New>
-      </Arg>
-    </Call>
-  </Call>
-
-  <!-- =============================================================== -->
-  <!-- Configure the Contexts                                          -->
-  <!-- =============================================================== -->
-
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <!-- Add a all web application within the webapps directory.         -->
-  <!-- + No virtual host specified                                     -->
-  <!-- + Look in the webapps directory relative to jetty.home or .     -->
-  <!-- + Use the webdefault.xml resource for the defaults descriptor   -->
-  <!-- + Upack the war file                                            -->
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <Set name="rootWebApp">root</Set>
-  <Call name="addWebApplications">
-    <Arg></Arg>
-    <Arg><SystemProperty name="jetty.home" default="."/>/webapps/</Arg>
-    <Arg><SystemProperty name="jetty.home" default="."/>/etc/webdefault.xml</Arg>
-    <Arg type="boolean">true</Arg>
-  </Call>
-
-  <!-- =============================================================== -->
-  <!-- Configure the Other Server Options                              -->
-  <!-- =============================================================== -->
-  <Set name="requestsPerGC">2000</Set>
-  <Set name="statsOn">false</Set>
-
-  <Call name="addRealm">
-    <Arg>
-      <New class="net.sf.acegisecurity.adapters.jetty.JettyAcegiUserRealm">
-        <Arg>Spring Powered Realm</Arg>
-        <Arg>my_password</Arg>
-        <Arg>etc/acegisecurity.xml</Arg>
-      </New>
-    </Arg>
-  </Call>
-  
-</Configure>

+ 0 - 4
integration-test/lib/LICENSE

@@ -1,4 +0,0 @@
-All of the JARs included in this lib directory were obtained from the 
-HttpUnit distribution archive. See http://httpunit.sourceforge.net.
-
-$Id$

+ 0 - 33
integration-test/project.properties

@@ -1,33 +0,0 @@
-# Ant properties for running the integration test.
-
-# Values in this file will be overriden by any values with the same name
-# in the user-created build.properties file.
-
-# $Id$
-
-name=acegi-security-integration-tests
-
-tmp.dir=${basedir}/temporary
-httpunit.lib.dir=${basedir}/lib
-containers.dir=${basedir}/containers
-config.dir=${basedir}/container-configs
-
-lib.dir=${basedir}/../lib
-dist.lib.dir=${basedir}/../dist
-contacts.ca.war=${basedir}/../samples/contacts/dist/contacts-container-adapter.war
-contacts.filter.war=${basedir}/../samples/contacts/dist/contacts.war
-contacts.client.jar=${basedir}/../samples/contacts/client/contacts.jar
-
-acegisecurity.xml=../src/net/sf/acegisecurity/adapters/acegisecurity.xml
-jalopy.xml=${basedir}/../jalopy.xml
-
-src.dir=src
-build.dir=classes
-reports.dir=reports
-
-test.excludes=**/Abstract*
-
-tomcat-4.1.version=4.1.30
-tomcat-5.version=5.0.19
-jetty.version=4.2.18
-jboss.version=3.2.3

+ 0 - 26
integration-test/readme.txt

@@ -1,26 +0,0 @@
-===============================================================================
-               ACEGI SECURITY SYSTEM FOR SPRING - INTEGRATION TESTS
-===============================================================================
-
-This directory allows execution of "in container" integration tests. To run
-the tests, the original distribution files for various containers are required
-to be placed into the containers directory. These are not included in CVS or 
-ZIP releases due to their large size.
-
-To execute these tests:
-
-1. The following files should be placed into the containers directory:
-
-   Jetty-4.2.18-all.zip         (see http://mortbay.jetty.org)
-   jakarta-tomcat-5-0.19.zip    (see http://jakarta.apache.org/tomcat)
-   jakarta-tomcat-4-1.30.zip    (see http://jakarta.apache.org/tomcat)
-   jboss-3.2.3.zip              (see http://www.jboss.org)
-
-2. Shutdown any container or service bound to port 8080.
-
-3. Run "ant tests" (you can safely ignore the console output).
-
-4. At the completion of execution, a summary report will be displayed on the
-   console.
-
-$Id$

+ 0 - 327
integration-test/src/net/sf/acegisecurity/integrationtests/web/AbstractContactsTests.java

@@ -1,327 +0,0 @@
-/* Copyright 2004 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.sf.acegisecurity.integrationtests.web;
-
-import com.meterware.httpunit.GetMethodWebRequest;
-import com.meterware.httpunit.WebConversation;
-import com.meterware.httpunit.WebForm;
-import com.meterware.httpunit.WebLink;
-import com.meterware.httpunit.WebRequest;
-import com.meterware.httpunit.WebResponse;
-
-import junit.framework.TestCase;
-
-import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.beans.factory.support.PropertiesBeanDefinitionReader;
-
-import org.springframework.remoting.RemoteAccessException;
-
-import sample.contact.ContactManager;
-
-import java.net.URL;
-
-import java.util.Properties;
-
-
-/**
- * Tests the Contacts sample application from a HTTP user's perspective.
- *
- * @author Ben Alex
- * @version $Id$
- */
-public abstract class AbstractContactsTests extends TestCase {
-    //~ Methods ================================================================
-
-    /**
-     * Returns the base URL where the Contacts application can be found, such
-     * as <code>http://localhost:8080/contacts</code>. There should be no
-     * ending slash.
-     *
-     * @return DOCUMENT ME!
-     */
-    public abstract String getBaseUrl();
-
-    public final void setUp() throws Exception {
-        super.setUp();
-    }
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(AbstractContactsTests.class);
-    }
-
-    public void testHelloPageAccessible() throws Exception {
-        WebConversation conversation = new WebConversation();
-        WebRequest request = new GetMethodWebRequest(getBaseUrl());
-
-        WebResponse response = conversation.getResponse(request);
-        assertEquals("Contacts Security Demo", response.getTitle());
-        assertEquals(2, response.getLinks().length); // debug and manage links
-        assertTrue(response.getText().lastIndexOf("sample.contact.Contact@") != -1);
-    }
-
-    public void testHessianFailsWithIncorrectCredentials() {
-        String PREFIX = "beans.";
-        DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
-        Properties p = new Properties();
-        p.setProperty(PREFIX + "hessianProxy.class",
-            "org.springframework.remoting.caucho.HessianProxyFactoryBean");
-        p.setProperty(PREFIX + "hessianProxy.serviceInterface",
-            "sample.contact.ContactManager");
-        p.setProperty(PREFIX + "hessianProxy.serviceUrl",
-            getBaseUrl() + "/caucho/ContactManager-hessian");
-        p.setProperty(PREFIX + "hessianProxy.username", "marissa");
-        p.setProperty(PREFIX + "hessianProxy.password", "WRONG_PASSWORD");
-
-        (new PropertiesBeanDefinitionReader(lbf)).registerBeanDefinitions(p,
-            PREFIX);
-
-        ContactManager contactManager = (ContactManager) lbf.getBean(
-                "hessianProxy");
-
-        try {
-            contactManager.getRandomContact();
-            fail("Should have thrown RemoteAccessException");
-        } catch (RemoteAccessException exception) {
-            assertTrue(true);
-        }
-    }
-
-    public void testHessianOperational() {
-        String PREFIX = "beans.";
-        DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
-        Properties p = new Properties();
-        p.setProperty(PREFIX + "hessianProxy.class",
-            "org.springframework.remoting.caucho.HessianProxyFactoryBean");
-        p.setProperty(PREFIX + "hessianProxy.serviceInterface",
-            "sample.contact.ContactManager");
-        p.setProperty(PREFIX + "hessianProxy.serviceUrl",
-            getBaseUrl() + "/caucho/ContactManager-hessian");
-        p.setProperty(PREFIX + "hessianProxy.username", "marissa");
-        p.setProperty(PREFIX + "hessianProxy.password", "koala");
-
-        (new PropertiesBeanDefinitionReader(lbf)).registerBeanDefinitions(p,
-            PREFIX);
-
-        ContactManager contactManager = (ContactManager) lbf.getBean(
-                "hessianProxy");
-        assertTrue(contactManager.getRandomContact() != null);
-    }
-
-    public void testLoginNameCaseSensitive() throws Exception {
-        WebConversation conversation = new WebConversation();
-        WebRequest request = new GetMethodWebRequest(getBaseUrl());
-
-        WebResponse helloPage = conversation.getResponse(request);
-        WebLink debugLink = helloPage.getLinkWith("Debug");
-        WebResponse loginPage = debugLink.click();
-        assertEquals(1, loginPage.getForms()[0].getSubmitButtons().length);
-
-        WebForm loginForm = loginPage.getForms()[0];
-        loginPage = null;
-
-        loginForm.setParameter("j_username", "mArIsSA");
-        loginForm.setParameter("j_password", "koala");
-
-        WebResponse loginOutcome = conversation.getResponse(loginForm
-                .getRequest("submit"));
-
-        assertTrue(loginOutcome.getText().lastIndexOf("SUCCESS!") != -1);
-    }
-
-    public void testLoginPasswordCaseSensitive() throws Exception {
-        WebConversation conversation = new WebConversation();
-        WebRequest request = new GetMethodWebRequest(getBaseUrl());
-
-        WebResponse helloPage = conversation.getResponse(request);
-        WebLink debugLink = helloPage.getLinkWith("Debug");
-        WebResponse loginPage = debugLink.click();
-        assertEquals(1, loginPage.getForms()[0].getSubmitButtons().length);
-
-        WebForm loginForm = loginPage.getForms()[0];
-        loginPage = null;
-
-        loginForm.setParameter("j_username", "dianne");
-        loginForm.setParameter("j_password", "EmU");
-
-        WebResponse loginOutcome = conversation.getResponse(loginForm
-                .getRequest("submit"));
-
-        assertEquals("Login", loginOutcome.getTitle());
-    }
-
-    public void testLoginSuccess() throws Exception {
-        WebConversation conversation = new WebConversation();
-        WebRequest request = new GetMethodWebRequest(getBaseUrl());
-
-        WebResponse helloPage = conversation.getResponse(request);
-        WebLink debugLink = helloPage.getLinkWith("Debug");
-        WebResponse loginPage = debugLink.click();
-        assertEquals(1, loginPage.getForms()[0].getSubmitButtons().length);
-
-        WebForm loginForm = loginPage.getForms()[0];
-        loginPage = null;
-
-        loginForm.setParameter("j_username", "marissa");
-        loginForm.setParameter("j_password", "koala");
-
-        WebResponse loginOutcome = conversation.getResponse(loginForm
-                .getRequest("submit"));
-
-        assertTrue(loginOutcome.getText().lastIndexOf("SUCCESS!") != -1);
-    }
-
-    public void testLoginUnknownUsername() throws Exception {
-        WebConversation conversation = new WebConversation();
-        WebRequest request = new GetMethodWebRequest(getBaseUrl());
-
-        WebResponse helloPage = conversation.getResponse(request);
-        WebLink debugLink = helloPage.getLinkWith("Debug");
-        WebResponse loginPage = debugLink.click();
-        assertEquals(1, loginPage.getForms()[0].getSubmitButtons().length);
-
-        WebForm loginForm = loginPage.getForms()[0];
-        loginPage = null;
-
-        loginForm.setParameter("j_username", "angella");
-        loginForm.setParameter("j_password", "echidna");
-
-        WebResponse loginOutcome = conversation.getResponse(loginForm
-                .getRequest("submit"));
-
-        assertEquals("Login", loginOutcome.getTitle());
-    }
-
-    public void testSessionAsMarissa() throws Exception {
-        WebConversation conversation = new WebConversation();
-        WebRequest request = new GetMethodWebRequest(getBaseUrl());
-
-        WebResponse helloPage = conversation.getResponse(request);
-        WebLink manageLink = helloPage.getLinkWith("Manage");
-        WebResponse loginPage = manageLink.click();
-        manageLink = null;
-        assertEquals(1, loginPage.getForms()[0].getSubmitButtons().length);
-
-        WebForm loginForm = loginPage.getForms()[0];
-        loginPage = null;
-
-        loginForm.setParameter("j_username", "marissa");
-        loginForm.setParameter("j_password", "koala");
-
-        WebResponse loginOutcome = conversation.getResponse(loginForm
-                .getRequest("submit"));
-
-        assertEquals("Your Contacts", loginOutcome.getTitle());
-        assertTrue(loginOutcome.getText().lastIndexOf("marissa's Contacts") != -1);
-        assertEquals(4, loginOutcome.getTables()[0].getRowCount()); // 3 contacts + header
-        assertEquals(5, loginOutcome.getLinks().length); // 3 contacts + add + logoff
-
-        WebLink addLink = loginOutcome.getLinkWith("Add");
-        loginOutcome = null;
-
-        WebResponse addPage = addLink.click();
-        WebForm addForm = addPage.getForms()[0];
-        addPage = null;
-
-        addForm.setParameter("name", "");
-        addForm.setParameter("email", "");
-
-        WebResponse addOutcomeFail = conversation.getResponse(addForm
-                .getRequest("execute"));
-
-        assertEquals(new URL(getBaseUrl() + "/secure/add.htm"),
-            addOutcomeFail.getURL());
-        assertTrue(addOutcomeFail.getText().lastIndexOf("Please fix all errors!") != -1);
-        addOutcomeFail = null;
-
-        addForm.setParameter("name", "somebody");
-        addForm.setParameter("email", "them@somewhere.com");
-
-        WebResponse addOutcomeSuccess = conversation.getResponse(addForm
-                .getRequest("execute"));
-
-        assertEquals("Your Contacts", addOutcomeSuccess.getTitle());
-        assertTrue(addOutcomeSuccess.getText().lastIndexOf("marissa's Contacts") != -1);
-        assertEquals(5, addOutcomeSuccess.getTables()[0].getRowCount()); // 4 contacts + header
-        assertEquals(6, addOutcomeSuccess.getLinks().length); // 4 contacts + add + logoff
-
-        WebLink logout = addOutcomeSuccess.getLinkWith("Logoff");
-        addOutcomeSuccess = null;
-
-        WebResponse loggedOut = logout.click();
-        assertEquals("Contacts Security Demo", loggedOut.getTitle());
-
-        WebLink debugLink = loggedOut.getLinkWith("Debug");
-        loggedOut = null;
-
-        WebResponse loginAgainPage = debugLink.click();
-        assertEquals("Login", loginAgainPage.getTitle());
-    }
-
-    public void testSessionAsScott() throws Exception {
-        WebConversation conversation = new WebConversation();
-        WebRequest request = new GetMethodWebRequest(getBaseUrl());
-
-        WebResponse helloPage = conversation.getResponse(request);
-        WebLink manageLink = helloPage.getLinkWith("Manage");
-        WebResponse loginPage = manageLink.click();
-        manageLink = null;
-        assertEquals(1, loginPage.getForms()[0].getSubmitButtons().length);
-
-        WebForm loginForm = loginPage.getForms()[0];
-        loginPage = null;
-
-        loginForm.setParameter("j_username", "scott");
-        loginForm.setParameter("j_password", "wombat");
-
-        WebResponse loginOutcome = conversation.getResponse(loginForm
-                .getRequest("submit"));
-
-        assertEquals("Your Contacts", loginOutcome.getTitle());
-        assertTrue(loginOutcome.getText().lastIndexOf("scott's Contacts") != -1);
-        assertEquals(3, loginOutcome.getTables()[0].getRowCount()); // 2 contacts + header
-        assertEquals(2, loginOutcome.getLinks().length); // add + logoff only
-
-        WebLink addLink = loginOutcome.getLinkWith("Add");
-        loginOutcome = null;
-
-        WebResponse addPage = addLink.click();
-        WebForm addForm = addPage.getForms()[0];
-        addPage = null;
-
-        addForm.setParameter("name", "somebody");
-        addForm.setParameter("email", "them@somewhere.com");
-
-        WebResponse addOutcomeSuccess = conversation.getResponse(addForm
-                .getRequest("execute"));
-
-        assertEquals("Your Contacts", addOutcomeSuccess.getTitle());
-        assertTrue(addOutcomeSuccess.getText().lastIndexOf("scott's Contacts") != -1);
-        assertEquals(4, addOutcomeSuccess.getTables()[0].getRowCount()); // 3 contacts + header
-        assertEquals(2, addOutcomeSuccess.getLinks().length); // add + logoff only
-
-        WebLink logout = addOutcomeSuccess.getLinkWith("Logoff");
-        addOutcomeSuccess = null;
-
-        WebResponse loggedOut = logout.click();
-        assertEquals("Contacts Security Demo", loggedOut.getTitle());
-
-        WebLink debugLink = loggedOut.getLinkWith("Debug");
-        loggedOut = null;
-
-        WebResponse loginAgainPage = debugLink.click();
-        assertEquals("Login", loginAgainPage.getTitle());
-    }
-}

+ 0 - 31
integration-test/src/net/sf/acegisecurity/integrationtests/web/ContainerAdapterContactsTests.java

@@ -1,31 +0,0 @@
-/* Copyright 2004 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.sf.acegisecurity.integrationtests.web;
-
-/**
- * Returns information required to run container adapters version of Contacts
- * application test.
- *
- * @author Ben Alex
- * @version $Id$
- */
-public class ContainerAdapterContactsTests extends AbstractContactsTests {
-    //~ Methods ================================================================
-
-    public String getBaseUrl() {
-        return "http://localhost:8080/contacts-container-adapter";
-    }
-}

+ 0 - 31
integration-test/src/net/sf/acegisecurity/integrationtests/web/FilterContactsTests.java

@@ -1,31 +0,0 @@
-/* Copyright 2004 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.sf.acegisecurity.integrationtests.web;
-
-/**
- * Returns information required to run filters version of Contacts application
- * test.
- *
- * @author Ben Alex
- * @version $Id$
- */
-public class FilterContactsTests extends AbstractContactsTests {
-    //~ Methods ================================================================
-
-    public String getBaseUrl() {
-        return "http://localhost:8080/contacts";
-    }
-}

+ 0 - 5
lib/LICENSE

@@ -1,5 +0,0 @@
-Unless an alternate license file is provided, all of the included lib JARs were
-obtained from the Spring Framework "with dependencies" ZIP file.
-
-$Id$
-

+ 0 - 29
lib/cas/LICENSE

@@ -1,29 +0,0 @@
-   Copyright (c) 2000-2003 Yale University. All rights reserved.
-
-   THIS SOFTWARE IS PROVIDED "AS IS," AND ANY EXPRESS OR IMPLIED
-   WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE EXPRESSLY
-   DISCLAIMED. IN NO EVENT SHALL YALE UNIVERSITY OR ITS EMPLOYEES BE
-   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED, THE COSTS OF
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED IN ADVANCE OF THE POSSIBILITY OF SUCH
-   DAMAGE.
-
-   Redistribution and use of this software in source or binary forms,
-   with or without modification, are permitted, provided that the
-   following conditions are met:
-
-   1. Any redistribution must include the above copyright notice and
-   disclaimer and this list of conditions in any related documentation
-   and, if feasible, in the redistributed software.
-
-   2. Any redistribution must include the acknowledgment, "This product
-   includes software developed by Yale University," in any related
-   documentation and, if feasible, in the redistributed software.
-
-   3. The names "Yale" and "Yale University" must not be used to endorse
-   or promote products derived from this software.

+ 0 - 58
lib/ehcache/LICENSE.txt

@@ -1,58 +0,0 @@
-/*
- * $Id$
- *
- * ====================================================================
- *
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2003 The Apache Software Foundation.  All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution, if
- *    any, must include the following acknowlegement:
- *       "This product includes software developed by the
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowlegement may appear in the software itself,
- *    if and wherever such third-party acknowlegements normally appear.
- *
- * 4. The names "The Jakarta Project", "Commons", and "Apache Software
- *    Foundation" must not be used to endorse or promote products derived
- *    from this software without prior written permission. For written
- *    permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache"
- *    nor may "Apache" appear in their names without prior written
- *    permission of the Apache Group.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- */

+ 0 - 1
lib/ehcache/version.txt

@@ -1 +0,0 @@
-EHCACHE 0.7

+ 0 - 61
lib/extracted/catalina/LICENSE

@@ -1,61 +0,0 @@
-/* ========================================================================= *
- *                                                                           *
- *                 The Apache Software License,  Version 1.1                 *
- *                                                                           *
- *         Copyright (c) 1999, 2000  The Apache Software Foundation.         *
- *                           All rights reserved.                            *
- *                                                                           *
- * ========================================================================= *
- *                                                                           *
- * Redistribution and use in source and binary forms,  with or without modi- *
- * fication, are permitted provided that the following conditions are met:   *
- *                                                                           *
- * 1. Redistributions of source code must retain the above copyright notice, *
- *    this list of conditions and the following disclaimer.                  *
- *                                                                           *
- * 2. Redistributions  in binary  form  must  reproduce the  above copyright *
- *    notice,  this list of conditions  and the following  disclaimer in the *
- *    documentation and/or other materials provided with the distribution.   *
- *                                                                           *
- * 3. The end-user documentation  included with the redistribution,  if any, *
- *    must include the following acknowlegement:                             *
- *                                                                           *
- *       "This product includes  software developed  by the Apache  Software *
- *        Foundation <http://www.apache.org/>."                              *
- *                                                                           *
- *    Alternately, this acknowlegement may appear in the software itself, if *
- *    and wherever such third-party acknowlegements normally appear.         *
- *                                                                           *
- * 4. The names  "The  Jakarta  Project",  "Tomcat",  and  "Apache  Software *
- *    Foundation"  must not be used  to endorse or promote  products derived *
- *    from this  software without  prior  written  permission.  For  written *
- *    permission, please contact <apache@apache.org>.                        *
- *                                                                           *
- * 5. Products derived from this software may not be called "Apache" nor may *
- *    "Apache" appear in their names without prior written permission of the *
- *    Apache Software Foundation.                                            *
- *                                                                           *
- * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES *
- * INCLUDING, BUT NOT LIMITED TO,  THE IMPLIED WARRANTIES OF MERCHANTABILITY *
- * AND FITNESS FOR  A PARTICULAR PURPOSE  ARE DISCLAIMED.  IN NO EVENT SHALL *
- * THE APACHE  SOFTWARE  FOUNDATION OR  ITS CONTRIBUTORS  BE LIABLE  FOR ANY *
- * DIRECT,  INDIRECT,   INCIDENTAL,  SPECIAL,  EXEMPLARY,  OR  CONSEQUENTIAL *
- * DAMAGES (INCLUDING,  BUT NOT LIMITED TO,  PROCUREMENT OF SUBSTITUTE GOODS *
- * OR SERVICES;  LOSS OF USE,  DATA,  OR PROFITS;  OR BUSINESS INTERRUPTION) *
- * HOWEVER CAUSED AND  ON ANY  THEORY  OF  LIABILITY,  WHETHER IN  CONTRACT, *
- * STRICT LIABILITY, OR TORT  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN *
- * ANY  WAY  OUT OF  THE  USE OF  THIS  SOFTWARE,  EVEN  IF  ADVISED  OF THE *
- * POSSIBILITY OF SUCH DAMAGE.                                               *
- *                                                                           *
- * ========================================================================= *
- *                                                                           *
- * This software  consists of voluntary  contributions made  by many indivi- *
- * duals on behalf of the  Apache Software Foundation.  For more information *
- * on the Apache Software Foundation, please see <http://www.apache.org/>.   *
- *                                                                           *
- * ========================================================================= */
-
-/* CVS information: $Revision: 1.2 $ $Date: 2003/12/24 19:53:47 $
- * $Source: /home/cvs/jakarta-tomcat-5/LICENSE,v $
- * $Author: markt $
- */

+ 0 - 458
lib/extracted/jboss/LICENSE.txt

@@ -1,458 +0,0 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS

+ 0 - 159
lib/extracted/jetty/LICENSE.html

@@ -1,159 +0,0 @@
-<HTML>
-<HEAD>
-   <TITLE>Jetty License</TITLE>
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<FONT FACE=ARIAL,HELVETICA>
-<CENTER><FONT SIZE=+3><B>Jetty License</B></FONT></CENTER>
-<CENTER><FONT SIZE=-1><B>$Revision$</B></FONT></CENTER>
-
-<B>Preamble:</B><p>
-
-The intent of this document is to state the conditions under which the
-Jetty Package may be copied, such that the Copyright Holder maintains some
-semblance of control over the development of the package, while giving the
-users of the package the right to use, distribute and make reasonable
-modifications to the Package in accordance with the goals and ideals of
-the Open Source concept as described at
-<A HREF="http://www.opensource.org">http://www.opensource.org</A>.
-<P>
-It is the intent of this license to allow commercial usage of the Jetty
-package, so long as the source code is distributed or suitable visible
-credit given or other arrangements made with the copyright holders.
-
-<P><B>Definitions:</B><P>
-
-<UL>
-  <LI> "Jetty" refers to the collection of Java classes that are
-       distributed as a HTTP server with servlet capabilities and
-       associated utilities.<p>
-
-  <LI>	"Package" refers to the collection of files distributed by the
-       Copyright Holder, and derivatives of that collection of files
-       created through textual modification.<P>
-       
-  <LI>	"Standard Version" refers to such a Package if it has not been
-       modified, or has been modified in accordance with the wishes
-       of the Copyright Holder.<P>
-       
-  <LI>	"Copyright Holder" is whoever is named in the copyright or
-       copyrights for the package. <BR>
-       Mort Bay Consulting Pty. Ltd. (Australia) is the "Copyright
-       Holder" for the Jetty package.<P>
-       
-  <LI>	"You" is you, if you're thinking about copying or distributing
-       this Package.<P>
-       
-  <LI>	"Reasonable copying fee" is whatever you can justify on the
-       basis of media cost, duplication charges, time of people involved,
-       and so on.  (You will not be required to justify it to the
-       Copyright Holder, but only to the computing community at large
-       as a market that must bear the fee.)<P>
-       
-  <LI>	"Freely Available" means that no fee is charged for the item
-       itself, though there may be fees involved in handling the item.
-       It also means that recipients of the item may redistribute it
-       under the same conditions they received it.<P>
-</UL>
-
-0. The Jetty Package is Copyright (c) Mort Bay Consulting Pty. Ltd.
-(Australia) and others. Individual files in this package may contain
-additional copyright notices. The javax.servlet packages are copyright
-Sun Microsystems Inc. <P>
-
-1. The Standard Version of the Jetty package is
-available from <A HREF=http://jetty.mortbay.org>http://jetty.mortbay.org</A>.<P>
-
-2. You may make and distribute verbatim copies of the source form 
-of the Standard Version of this Package without restriction, provided that 
-you include this license and all of the original copyright notices
-and associated disclaimers.<P>
-
-3. You may make and distribute verbatim copies of the compiled form of the 
-Standard Version of this Package without restriction, provided that you
-include this license.<P>
-
-4. You may apply bug fixes, portability fixes and other modifications
-derived from the Public Domain or from the Copyright Holder.  A Package
-modified in such a way shall still be considered the Standard Version.<P>
-
-5. You may otherwise modify your copy of this Package in any way, provided
-that you insert a prominent notice in each changed file stating how and
-when you changed that file, and provided that you do at least ONE of the
-following:<P>
-
-<BLOCKQUOTE>
-a) Place your modifications in the Public Domain or otherwise make them
-Freely Available, such as by posting said modifications to Usenet or
-an equivalent medium, or placing the modifications on a major archive
-site such as ftp.uu.net, or by allowing the Copyright Holder to include
-your modifications in the Standard Version of the Package.<P>
-
-b) Use the modified Package only within your corporation or organization.<P>
-
-c) Rename any non-standard classes so the names do not conflict
-with standard classes, which must also be provided, and provide
-a separate manual page for each non-standard class that clearly
-documents how it differs from the Standard Version.<P>
-
-d) Make other arrangements with the Copyright Holder.<P>
-</BLOCKQUOTE>
-
-6. You may distribute modifications or subsets of this Package in source 
-code or compiled form, provided that you do at least ONE of the following:<P>
-
-<BLOCKQUOTE>
-a) Distribute this license and all original copyright messages, together 
-with instructions (in the about dialog, manual page or equivalent) on where 
-to get the complete Standard Version.<P>
-
-b) Accompany the distribution with the machine-readable source of
-the Package with your modifications. The modified package must include
-this license and all of the original copyright notices and associated
-disclaimers, together with instructions on where to get the complete
-Standard Version.<P>
-
-c) Make other arrangements with the Copyright Holder.<P>
-</BLOCKQUOTE>
-
-7. You may charge a reasonable copying fee for any distribution of this
-Package.  You may charge any fee you choose for support of this Package.
-You may not charge a fee for this Package itself.  However,
-you may distribute this Package in aggregate with other (possibly
-commercial) programs as part of a larger (possibly commercial) software
-distribution provided that you meet the other distribution requirements
-of this license.<P>
-
-8. Input to or the output produced from the programs of this Package
-do not automatically fall under the copyright of this Package, but
-belong to whomever generated them, and may be sold commercially, and
-may be aggregated with this Package.<P>
-
-9. Any program subroutines supplied by you and linked into this Package
-shall not be considered part of this Package.<P>
-
-10. The name of the Copyright Holder may not be used to endorse or promote
-products derived from this software without specific prior written
-permission.<P>
-
-11. This license may change with each release of a Standard Version of
-the Package. You may choose to use the license associated with version
-you are using or the license of the latest Standard Version.<P>
-
-12. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.<P>
-
-13. If any superior law implies a warranty, the sole remedy under such shall
-be , at the Copyright Holders option either a) return of any price paid or 
-b) use or reasonable endeavours to repair or replace the software.<P>
-
-14. This license shall be read under the laws of Australia.  <P>
-
-<center>The End</center>
-
-<center><FONT size=-1>This license was derived from the <I>Artistic</I> license published 
-on <a href=http://www.opensource.org>http://www.opensource.com</a></font></center>
-</FONT>
-
-

+ 0 - 65
lib/extracted/resin/LICENSE

@@ -1,65 +0,0 @@
-		   Caucho Developer Source License
-			     version 1.1
-
-Caucho Technology, Inc. ("Caucho") permits use of the accompanying software
-and documentation ("the Software") provided that the conditions of the
-Caucho Developer Source License ("the License") are met:
-
-1. You must not alter or remove any copyright or trademark notices
-   in the Software.
-
-2. You may use the Software to develop, evaluate, and demonstrate
-   applications.
-
-3. Provided all the following conditions are met, you may use 
-   the Software to deploy an application:
-   a) You are not paid to use the Software.
-   b) You are not paying anyone else to use the Software.
-
-4. Caucho reserves all rights to the Software not explicitly
-   granted by the License.
-
-5. Each copy of the Software in source or binary form must include
-   an unmodified copy of the License in a plain ASCII text file
-   named LICENSE.
-
-6. Caucho reserves all rights to its names, trademarks and logos.
-   In particular, the names "Resin" and "Caucho" are trademarks of
-   Caucho and may not be used to endorse products derived from
-   this software.  "Resin" and "Caucho" may not appear in
-   the names of products derived from this software.
-
-7. If you transmit any improvement or modification of the Software to
-   Caucho, you agree to assign the copyright of the improvement or
-   modification to Caucho.
-
-8. The License will terminate immediately without notice from Caucho
-   if you fail to comply with any provision of the License.
-   Upon such termination, you must destroy all copies and
-   derived works of the Software.  You may terminate the License at
-   any time by destroying all copies and derived works of the Software.
-
-9. You acknowledge that you are solely responsible for the use you
-   make of the Software. Accordingly, you agrees to indemnify and
-   hold Caucho harmless for any demands, claims, or suits by a third party
-   for loss, damages or expenses (including attorneys' fees) arising out
-   of, or related to, use of the Software by you or any other
-   individuals or entities.
-
-10. The Software is provided "AS IS," without a warranty of any kind.
-    ALL EXPRESS OR IMPLIED REPRESENTATIONS AND WARRANTIES, INCLUDING ANY
-    IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE
-    OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
-
-11. CAUCHO AND ITS LICENSORS SHALL NOT BE LIABLE FOR ANY DAMAGES
-    SUFFERED BY YOU OR ANY THIRD PARTY AS A RESULT OF USING OR DISTRIBUTING
-    THE SOFTWARE. IN NO EVENT WILL CAUCHO TECHNOLOGY OR ITS LICENSORS BE
-    LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT,
-    SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED
-    AND REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF THE USE OF OR
-    INABILITY TO USE THE SOFTWARE, EVEN IF HE HAS BEEN ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGES.      
-
-12. Any action related to the License will be governed by California 
-    law and controlling U.S. federal law. No choice of law rules of 
-    any jurisdiction will apply.

+ 0 - 1
lib/hsqldb/version.txt

@@ -1 +0,0 @@
-HSQLDB 1.7.2 Release Candidate 6D

+ 0 - 56
lib/jakarta-commons/commons-codec-LICENSE.txt

@@ -1,56 +0,0 @@
-/*
- * ====================================================================
- * 
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *    if any, must include the following acknowledgement:  
- *       "This product includes software developed by the 
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowledgement may appear in the software itself,
- *    if and wherever such third-party acknowledgements normally appear.
- *
- * 4. The names "Apache", "The Jakarta Project", "Commons", and "Apache Software
- *    Foundation" must not be used to endorse or promote products derived
- *    from this software without prior written permission. For written 
- *    permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- *    "Apache" nor may "Apache" appear in their name without prior 
- *    written permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- */ 

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 4
lib/jalopy/license-antlr.html


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 4
lib/jalopy/license-apache.html


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 4
lib/jalopy/license-bsd.html


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 4
lib/jalopy/license-common-public.html


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 4
lib/jalopy/license-gnu-doc.html


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 4
lib/jalopy/license-gnu.html


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 4
lib/jalopy/license-sun-public.html


+ 8 - 2
project.xml

@@ -174,7 +174,7 @@
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.0</version>
+      <version>1.0.4</version>
       <type>jar</type>
       <url>http://jakarta.apache.org/commons</url>
       <properties>
@@ -209,7 +209,7 @@
     <dependency>
       <groupId>hsqldb</groupId>
       <artifactId>hsqldb</artifactId>
-      <version>1.7.2-rc6c</version>
+      <version>1.7.2.9</version>
       <type>jar</type>
       <url>http://hsqldb.sourceforge.net/</url>
       <properties>
@@ -222,6 +222,12 @@
       <version>1.2.8</version>
       <type>jar</type>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <type>jar</type>
+    </dependency>
     <dependency>
       <groupId>springframework</groupId>
       <artifactId>spring-core</artifactId>

+ 0 - 0
test/.cvsignore


Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно