You are viewing a plain text version of this content. The canonical link for it is here.
Posted to taglibs-dev@jakarta.apache.org by na...@locus.apache.org on 2000/08/24 03:01:37 UTC
cvs commit: jakarta-taglibs/sql/src/org/apache/taglibs/sql ConnectionTag.java
nacho 00/08/23 18:01:36
Modified: sql/src/org/apache/taglibs/sql ConnectionTag.java
Log:
Changing licenses with prior writen consent of the original author
Boyd Waters, NRAO bwaters@aoc.nrao.edu
Revision Changes Path
1.2 +61 -25 jakarta-taglibs/sql/src/org/apache/taglibs/sql/ConnectionTag.java
Index: ConnectionTag.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs/sql/src/org/apache/taglibs/sql/ConnectionTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ConnectionTag.java 2000/05/10 13:00:27 1.1
+++ ConnectionTag.java 2000/08/24 01:01:34 1.2
@@ -1,27 +1,65 @@
-//$Id: ConnectionTag.java,v 1.1 2000/05/10 13:00:27 nacho Exp $
-//# Copyright (C) 2000 Associated Universities, Inc. Washington DC, USA.
-
-//#
-//# This program is free software; you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation; either version 2 of the License, or
-//# (at your option) any later version.
-//#
-//# This program is distributed in the hope that it will be useful, but
-//# WITHOUT ANY WARRANTY; without even the implied warranty of
-//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-//# General Public License for more details.
-//#
-//# You should have received a copy of the GNU General Public License
-//# along with this program; if not, write to the Free Software
-//# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-//#
-//# Correspondence concerning OMS software should be addressed as follows:
-//# Array Support Group - VLBA Operations
-//# National Radio Astronomy Observatory
-//# P. O. Box 0
-//# Socorro, NM 87801 USA
+/*
+ * $Header: /home/cvs/jakarta-taglibs/sql/src/org/apache/taglibs/sql/ConnectionTag.java,v 1.2 2000/08/24 01:01:34 nacho Exp $
+ * $Revision: 1.2 $
+ * $Date: 2000/08/24 01:01:34 $
+ *
+ * ====================================================================
+ *
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 1999 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", "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 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/>.
+ *
+ */
+//# Copyright (C) 2000 Associated Universities, Inc. Washington DC, USA.
// JSP SQL TagLib EXAMPLES
// Boyd Waters, NRAO bwaters@aoc.nrao.edu
// May 3 2000
@@ -33,8 +71,6 @@
// This document should be available at
// http://java.sun.com/products/jsp/download.html
//
-// THIS IS EXAMPLE CODE INTENDED FOR EDUCATIONAL PURPOSES ONLY!!!
-// DO NOT USE IN PRODUCTION SYSTEMS!
package org.apache.taglibs.sql;