@@ -1,31 +1,23 @@ -JRuby-Rack uses the same license as JRuby -- CPL/GPL/LGPL. The license text is below. - #-- -# **** BEGIN LICENSE BLOCK ***** -# Version: CPL 1.0/GPL 2.0/LGPL 2.1 +# The MIT License # -# The contents of this file are subject to the Common Public -# License Version 1.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.eclipse.org/legal/cpl-v10.html +# Copyright (c) 2007-2008 Sun Microsystems, Inc. # -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: # -# Copyright (C) 2007-2008 Sun Microsystems, Inc. +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. # -# Alternatively, the contents of this file may be used under the terms of -# either of the GNU General Public License Version 2 or later (the "GPL"), -# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -# in which case the provisions of the GPL or the LGPL are applicable instead -# of those above. If you wish to allow use of your version of this file only -# under the terms of either the GPL or the LGPL, and not to allow others to -# use your version of this file under the terms of the CPL, indicate your -# decision by deleting the provisions above and replace them with the notice -# and other provisions required by the GPL or the LGPL. If you do not delete -# the provisions above, a recipient may use your version of this file under -# the terms of any one of the CPL, the GPL or the LGPL. -# **** END LICENSE BLOCK ***** +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. #++ \ No newline at end of file LICENSE.txt @@ -1,6 +1,6 @@ #-- # Copyright 2007-2008 Sun Microsystems, Inc. -# This source code is available under a CPL 1.0/GPL 2.0/LGPL 2.1 tri-license. +# This source code is available under the MIT license. # See the file LICENSE.txt for details. #++ buildfile @@ -1,6 +1,6 @@ #-- # Copyright 2007-2008 Sun Microsystems, Inc. -# This source code is available under a CPL 1.0/GPL 2.0/LGPL 2.1 tri-license. +# This source code is available under the MIT license. # See the file LICENSE.txt for details. #++ lib/jruby/rack.rb @@ -1,6 +1,6 @@ #-- # Copyright 2007-2008 Sun Microsystems, Inc. -# This source code is available under a CPL 1.0/GPL 2.0/LGPL 2.1 tri-license. +# This source code is available under the MIT license. # See the file LICENSE.txt for details. #++ lib/jruby/rack/rails.rb @@ -1,6 +1,6 @@ #-- # Copyright 2007-2008 Sun Microsystems, Inc. -# This source code is available under a CPL 1.0/GPL 2.0/LGPL 2.1 tri-license. +# This source code is available under the MIT license. # See the file LICENSE.txt for details. #++ lib/jruby/rack/rails_boot.rb @@ -1,6 +1,6 @@ #-- # Copyright 2007-2008 Sun Microsystems, Inc. -# This source code is available under a CPL 1.0/GPL 2.0/LGPL 2.1 tri-license. +# This source code is available under the MIT license. # See the file LICENSE.txt for details. #++ lib/jruby/rack/rails_ext.rb @@ -1,6 +1,6 @@ #-- # Copyright 2007-2008 Sun Microsystems, Inc. -# This source code is available under a CPL 1.0/GPL 2.0/LGPL 2.1 tri-license. +# This source code is available under the MIT license. # See the file LICENSE.txt for details. #++ lib/jruby/rack/servlet_ext.rb @@ -1,6 +1,6 @@ #-- # Copyright 2007-2008 Sun Microsystems, Inc. -# This source code is available under a CPL 1.0/GPL 2.0/LGPL 2.1 tri-license. +# This source code is available under the MIT license. # See the file LICENSE.txt for details. #++ lib/jruby/rack/servlet_helper.rb @@ -1,6 +1,6 @@ #-- # Copyright 2007-2008 Sun Microsystems, Inc. -# This source code is available under a CPL 1.0/GPL 2.0/LGPL 2.1 tri-license. +# This source code is available under the MIT license. # See the file LICENSE.txt for details. #++ lib/rack/handler/servlet.rb @@ -1,6 +1,6 @@ #-- # Copyright 2007-2008 Sun Microsystems, Inc. -# This source code is available under a CPL 1.0/GPL 2.0/LGPL 2.1 tri-license. +# This source code is available under the MIT license. # See the file LICENSE.txt for details. #++ spec/cgi/session/java_servlet_store_spec.rb @@ -1,6 +1,6 @@ #-- # Copyright 2007-2008 Sun Microsystems, Inc. -# This source code is available under a CPL 1.0/GPL 2.0/LGPL 2.1 tri-license. +# This source code is available under the MIT license. # See the file LICENSE.txt for details. #++ spec/jruby/rack/rails_spec.rb @@ -1,6 +1,6 @@ #-- # Copyright 2007-2008 Sun Microsystems, Inc. -# This source code is available under a CPL 1.0/GPL 2.0/LGPL 2.1 tri-license. +# This source code is available under the MIT license. # See the file LICENSE.txt for details. #++ spec/jruby/rack/servlet_ext_spec.rb @@ -1,6 +1,6 @@ #-- # Copyright 2007-2008 Sun Microsystems, Inc. -# This source code is available under a CPL 1.0/GPL 2.0/LGPL 2.1 tri-license. +# This source code is available under the MIT license. # See the file LICENSE.txt for details. #++ spec/jruby/rack/servlet_helper_spec.rb @@ -1,6 +1,6 @@ #-- # Copyright 2007-2008 Sun Microsystems, Inc. -# This source code is available under a CPL 1.0/GPL 2.0/LGPL 2.1 tri-license. +# This source code is available under the MIT license. # See the file LICENSE.txt for details. #++ spec/rack/adapter/rails_spec.rb @@ -1,6 +1,6 @@ #-- # Copyright 2007-2008 Sun Microsystems, Inc. -# This source code is available under a CPL 1.0/GPL 2.0/LGPL 2.1 tri-license. +# This source code is available under the MIT license. # See the file LICENSE.txt for details. #++ spec/rack/application_spec.rb @@ -1,6 +1,6 @@ #-- # Copyright 2007-2008 Sun Microsystems, Inc. -# This source code is available under a CPL 1.0/GPL 2.0/LGPL 2.1 tri-license. +# This source code is available under the MIT license. # See the file LICENSE.txt for details. #++ spec/rack/dispatcher_spec.rb @@ -1,6 +1,6 @@ #-- # Copyright 2007-2008 Sun Microsystems, Inc. -# This source code is available under a CPL 1.0/GPL 2.0/LGPL 2.1 tri-license. +# This source code is available under the MIT license. # See the file LICENSE.txt for details. #++ spec/rack/filter_spec.rb @@ -1,6 +1,6 @@ #-- # Copyright 2007-2008 Sun Microsystems, Inc. -# This source code is available under a CPL 1.0/GPL 2.0/LGPL 2.1 tri-license. +# This source code is available under the MIT license. # See the file LICENSE.txt for details. #++ spec/rack/handler/servlet_spec.rb @@ -1,6 +1,6 @@ #-- # Copyright 2007-2008 Sun Microsystems, Inc. -# This source code is available under a CPL 1.0/GPL 2.0/LGPL 2.1 tri-license. +# This source code is available under the MIT license. # See the file LICENSE.txt for details. #++ spec/rack/rails/rails_application_spec.rb @@ -1,6 +1,6 @@ #-- # Copyright 2007-2008 Sun Microsystems, Inc. -# This source code is available under a CPL 1.0/GPL 2.0/LGPL 2.1 tri-license. +# This source code is available under the MIT license. # See the file LICENSE.txt for details. #++ spec/rack/servlet_context_listener_spec.rb @@ -1,6 +1,6 @@ #-- # Copyright 2007-2008 Sun Microsystems, Inc. -# This source code is available under a CPL 1.0/GPL 2.0/LGPL 2.1 tri-license. +# This source code is available under the MIT license. # See the file LICENSE.txt for details. #++ spec/rack/servlet_spec.rb @@ -1,6 +1,6 @@ #-- # Copyright 2007-2008 Sun Microsystems, Inc. -# This source code is available under a CPL 1.0/GPL 2.0/LGPL 2.1 tri-license. +# This source code is available under the MIT license. # See the file LICENSE.txt for details. #++ spec/spec_helper.rb @@ -1,6 +1,6 @@ /* * Copyright 2007-2008 Sun Microsystems, Inc. - * This source code is available under a CPL 1.0/GPL 2.0/LGPL 2.1 tri-license. + * This source code is available under the MIT license. * See the file LICENSE.txt for details. */ src/main/java/org/jruby/rack/DefaultRackApplication.java @@ -1,6 +1,6 @@ /* * Copyright 2007-2008 Sun Microsystems, Inc. - * This source code is available under a CPL 1.0/GPL 2.0/LGPL 2.1 tri-license. + * This source code is available under the MIT license. * See the file LICENSE.txt for details. */ src/main/java/org/jruby/rack/DefaultRackApplicationFactory.java @@ -1,6 +1,6 @@ /* * Copyright 2007-2008 Sun Microsystems, Inc. - * This source code is available under a CPL 1.0/GPL 2.0/LGPL 2.1 tri-license. + * This source code is available under the MIT license. * See the file LICENSE.txt for details. */ src/main/java/org/jruby/rack/PoolingRackApplicationFactory.java @@ -1,6 +1,6 @@ /* * Copyright 2007-2008 Sun Microsystems, Inc. - * This source code is available under a CPL 1.0/GPL 2.0/LGPL 2.1 tri-license. + * This source code is available under the MIT license. * See the file LICENSE.txt for details. */ src/main/java/org/jruby/rack/RackApplication.java @@ -1,6 +1,6 @@ /* * Copyright 2007-2008 Sun Microsystems, Inc. - * This source code is available under a CPL 1.0/GPL 2.0/LGPL 2.1 tri-license. + * This source code is available under the MIT license. * See the file LICENSE.txt for details. */ src/main/java/org/jruby/rack/RackApplicationFactory.java @@ -1,6 +1,6 @@ /* * Copyright 2007-2008 Sun Microsystems, Inc. - * This source code is available under a CPL 1.0/GPL 2.0/LGPL 2.1 tri-license. + * This source code is available under the MIT license. * See the file LICENSE.txt for details. */ src/main/java/org/jruby/rack/RackInitializationException.java @@ -1,6 +1,6 @@ /* * Copyright 2007-2008 Sun Microsystems, Inc. - * This source code is available under a CPL 1.0/GPL 2.0/LGPL 2.1 tri-license. + * This source code is available under the MIT license. * See the file LICENSE.txt for details. */ src/main/java/org/jruby/rack/RackResponse.java @@ -1,6 +1,6 @@ /* * Copyright 2007-2008 Sun Microsystems, Inc. - * This source code is available under a CPL 1.0/GPL 2.0/LGPL 2.1 tri-license. + * This source code is available under the MIT license. * See the file LICENSE.txt for details. */ src/main/java/org/jruby/rack/RackServletContextListener.java @@ -1,6 +1,6 @@ /* * Copyright 2007-2008 Sun Microsystems, Inc. - * This source code is available under a CPL 1.0/GPL 2.0/LGPL 2.1 tri-license. + * This source code is available under the MIT license. * See the file LICENSE.txt for details. */ src/main/java/org/jruby/rack/SharedRackApplicationFactory.java @@ -1,6 +1,6 @@ /* * Copyright 2007-2008 Sun Microsystems, Inc. - * This source code is available under a CPL 1.0/GPL 2.0/LGPL 2.1 tri-license. + * This source code is available under the MIT license. * See the file LICENSE.txt for details. */ src/main/java/org/jruby/rack/rails/RailsRackApplicationFactory.java @@ -1,6 +1,6 @@ /* * Copyright 2007-2008 Sun Microsystems, Inc. - * This source code is available under a CPL 1.0/GPL 2.0/LGPL 2.1 tri-license. + * This source code is available under the MIT license. * See the file LICENSE.txt for details. */ src/main/java/org/jruby/rack/rails/RailsServletContextListener.java @@ -1,6 +1,6 @@ /* * Copyright 2007-2008 Sun Microsystems, Inc. - * This source code is available under a CPL 1.0/GPL 2.0/LGPL 2.1 tri-license. + * This source code is available under the MIT license. * See the file LICENSE.txt for details. */ src/main/java/org/jruby/webapp/FileServlet.java @@ -1,6 +1,6 @@ /* * Copyright 2007-2008 Sun Microsystems, Inc. - * This source code is available under a CPL 1.0/GPL 2.0/LGPL 2.1 tri-license. + * This source code is available under the MIT license. * See the file LICENSE.txt for details. */ src/main/java/org/jruby/webapp/RailsContextListener.java @@ -1,6 +1,6 @@ /* * Copyright 2007-2008 Sun Microsystems, Inc. - * This source code is available under a CPL 1.0/GPL 2.0/LGPL 2.1 tri-license. + * This source code is available under the MIT license. * See the file LICENSE.txt for details. */ src/main/java/org/jruby/webapp/RailsServlet.java @@ -1,6 +1,6 @@ #-- # Copyright 2007-2008 Sun Microsystems, Inc. -# This source code is available under a CPL 1.0/GPL 2.0/LGPL 2.1 tri-license. +# This source code is available under the MIT license. # See the file LICENSE.txt for details. #++ src/test/resources/rails/action_controller.rb a974ff95f6cd566d720cbf0ce3ba7f0e660326e9 nsieger nsieger@97a6c6ee-731e-0410-87e5-e5612b5efbfe http://github.com/nicksieger/jruby-rack/commit/c0b6ee8f1bdd61c602cfda27e4edce00441d2e73 c0b6ee8f1bdd61c602cfda27e4edce00441d2e73 2008-04-15T11:22:21-07:00 2008-04-15T11:22:21-07:00 Change license to MIT git-svn-id: https://svn.codehaus.org/jruby-contrib/trunk/rack@138 97a6c6ee-731e-0410-87e5-e5612b5efbfe 59660f4e422fea3188d780af6e19ce7e744ebb85 nsieger nsieger@97a6c6ee-731e-0410-87e5-e5612b5efbfe