diff --git a/cactus/LICENSE.txt b/cactus/LICENSE.txt deleted file mode 100644 index 5a4aec31..00000000 --- a/cactus/LICENSE.txt +++ /dev/null @@ -1,57 +0,0 @@ - - -/* ==================================================================== - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2001 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 acknowledgment: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowledgment may appear in the software itself, - * if and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Apache" and "Apache Software Foundation" and - * "Apache Maven" 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 Maven", 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 - * . - * - * ==================================================================== - */ diff --git a/cactus/plugin.jelly b/cactus/plugin.jelly index 9fa1b11f..0bdc4fd9 100644 --- a/cactus/plugin.jelly +++ b/cactus/plugin.jelly @@ -164,7 +164,16 @@ the CactifyWarTask only adds the pure Cactus jars but not related jars such as HttpUnit jars --> - + + + + + + + + diff --git a/cactus/xdocs/changes.xml b/cactus/xdocs/changes.xml index b53674e6..e4d68d37 100644 --- a/cactus/xdocs/changes.xml +++ b/cactus/xdocs/changes.xml @@ -8,6 +8,13 @@ + + Add all user jars that have been marked to be included in the cactus + test (with the + <cactus.bundle>true</cactus.bundle> property + in dependencies). For example, DBUnit would be a jar you would + include in a Cactus test but not in a runtime war. + Updated to Cactus/Ant of 19th of June 2003 which fixes a bug preventing JBoss to start correctly on unix machines (caused by