Index: 3rdParty_sources/jsp-api/javax/servlet/jsp/JspException.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r188531e2b734df509672788d897e1030e4b1a24a --- 3rdParty_sources/jsp-api/javax/servlet/jsp/JspException.java (.../JspException.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ 3rdParty_sources/jsp-api/javax/servlet/jsp/JspException.java (.../JspException.java) (revision 188531e2b734df509672788d897e1030e4b1a24a) @@ -1,130 +1,125 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can - * obtain a copy of the License at - * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html - * or packager/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at packager/legal/LICENSE.txt. - * - * GPL Classpath Exception: - * Oracle designates this particular file as subject to the "Classpath" - * exception as provided by Oracle in the GPL Version 2 section of the License - * file that accompanied this code. - * - * Modifications: - * If applicable, add the following below the License Header, with the fields - * enclosed by brackets [] replaced by your own identifying information: - * "Portions Copyright [year] [name of copyright owner]" - * - * Contributor(s): - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - * - * - * This file incorporates work covered by the following copyright and - * permission notice: - * - * Copyright 2004 The Apache Software Foundation - * - * 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 javax.servlet.jsp; - -/** - * A generic exception known to the JSP engine; uncaught - * JspExceptions will result in an invocation of the errorpage - * machinery. - */ - -public class JspException extends Exception { - - /** - * Construct a JspException. - */ - public JspException() { - } - - - /** - * Constructs a new JSP exception with the - * specified message. The message can be written - * to the server log and/or displayed for the user. - * - * @param msg a String - * specifying the text of - * the exception message - * - */ - public JspException(String msg) { - super(msg); - } - - - /** - * Constructs a new JspException with the specified detail - * message and cause. - * - * The cause is saved for later retrieval by the - * {@link #getCause()} and {@link #getRootCause()} methods. - * - * @see java.lang.Exception#Exception(String, Throwable) - */ - public JspException(String message, Throwable cause) { - super(message, cause); - } - - - /** - * Constructs a new JspException with the specified cause. - * - * The cause is saved for later retrieval by the - * {@link #getCause()} and {@link #getRootCause()} methods. - * - * @see java.lang.Exception#Exception(Throwable) - */ - public JspException(Throwable cause) { - super(cause); - } - - - /** - * Returns the exception that caused this JSP exception. - * - * @return the Throwable - * that caused this JSP exception - * - * @deprecated As of JSP 2.1, replaced by {@link #getCause()} - */ - - public Throwable getRootCause() { - return getCause(); - } -} +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common Development + * and Distribution License("CDDL") (collectively, the "License"). You + * may not use this file except in compliance with the License. You can obtain + * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html + * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific + * language governing permissions and limitations under the License. + * + * When distributing the software, include this License Header Notice in each + * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. + * Sun designates this particular file as subject to the "Classpath" exception + * as provided by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the License + * Header, with the fields enclosed by brackets [] replaced by your own + * identifying information: "Portions Copyrighted [year] + * [name of copyright owner]" + * + * Contributor(s): + * + * If you wish your version of this file to be governed by only the CDDL or + * only the GPL Version 2, indicate your decision by adding "[Contributor] + * elects to include this software in this distribution under the [CDDL or GPL + * Version 2] license." If you don't indicate a single choice of license, a + * recipient has the option to distribute your version of this file under + * either the CDDL, the GPL Version 2 or to extend the choice of license to + * its licensees as provided above. However, if you add GPL Version 2 code + * and therefore, elected the GPL Version 2 license, then the option applies + * only if the new code is made subject to such option by the copyright + * holder. + * + * + * This file incorporates work covered by the following copyright and + * permission notice: + * + * Copyright 2004 The Apache Software Foundation + * + * 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 javax.servlet.jsp; + +/** + * A generic exception known to the JSP engine; uncaught + * JspExceptions will result in an invocation of the errorpage + * machinery. + */ + +public class JspException extends Exception { + + /** + * Construct a JspException. + */ + public JspException() { + } + + + /** + * Constructs a new JSP exception with the + * specified message. The message can be written + * to the server log and/or displayed for the user. + * + * @param msg a String + * specifying the text of + * the exception message + * + */ + public JspException(String msg) { + super(msg); + } + + + /** + * Constructs a new JspException with the specified detail + * message and cause. + * + * The cause is saved for later retrieval by the + * {@link #getCause()} and {@link #getRootCause()} methods. + * + * @see java.lang.Exception#Exception(String, Throwable) + */ + public JspException(String message, Throwable cause) { + super(message, cause); + } + + + /** + * Constructs a new JspException with the specified cause. + * + * The cause is saved for later retrieval by the + * {@link #getCause()} and {@link #getRootCause()} methods. + * + * @see java.lang.Exception#Exception(Throwable) + */ + public JspException(Throwable cause) { + super(cause); + } + + + /** + * Returns the exception that caused this JSP exception. + * + * @return the Throwable + * that caused this JSP exception + * + * @deprecated As of JSP 2.1, replaced by {@link #getCause()} + */ + + public Throwable getRootCause() { + return getCause(); + } +}