Author: markt
Date: Sun Sep 2 13:49:38 2007
New Revision: 572148
URL: http://svn.apache.org/viewvc?rev=572148&view=rev
Log:
Move the mx4j license file to the Tomcat LICENSE file as all applicable license
texts should be in the one license file.
Removed:
tomcat/container/tc5.5.x/etc/
Modified:
tomcat/build/tc5.5.x/LICENSE
Modified: tomcat/build/tc5.5.x/LICENSE
URL:
http://svn.apache.org/viewvc/tomcat/build/tc5.5.x/LICENSE?rev=572148&r1=572147&r2=572148&view=diff
==============================================================================
--- tomcat/build/tc5.5.x/LICENSE (original)
+++ tomcat/build/tc5.5.x/LICENSE Sun Sep 2 13:49:38 2007
@@ -199,3 +199,64 @@
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.
+
+
+APACHE TOMCAT SUBCOMPONENTS:
+
+Apache Tomcat includes a number of subcomponents with separate copyright
notices
+and license terms. Your use of the source code for the these subcomponents is
+subject to the terms and conditions of the following licenses.
+
+
+For the jmx.jar component:
+/* ====================================================================
+ * The MX4J License, Version 1.0
+ *
+ * Copyright (c) 2001 MX4J. 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
+ * MX4J project (http://mx4j.sourceforge.net)."
+ * Alternately, this acknowledgment may appear in the software itself,
+ * if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "MX4J" and "mx4j" must not be used to endorse or promote
+ * products derived from this software without prior written
+ * permission. For written permission, please contact [EMAIL PROTECTED]
+ *
+ * 5. Products derived from this software may not be called "MX4J",
+ * nor may "MX4J" appear in their name, without prior written
+ * permission of Simone Bordet.
+ *
+ * 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 CARLOS QUIROZ 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 MX4J. For more information on
+ * MX4J, please see
+ * <http://mx4j.sourceforge.net>.
+ */
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
