Mailing-List: contact deltacloud-commits-help@incubator.apache.org;
 run by ezmlm
Precedence: bulk
Reply-To: deltacloud-dev@incubator.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1159444 - in /incubator/deltacloud/trunk: client/
 client/bin/
 client/lib/ server/
Date: Thu, 18 Aug 2011 23:30:03 -0000
To: deltacloud-commits@incubator.apache.org
From: lutter@apache.org
Message-Id: <20110818233004.6E7122388A33@eris.apache.org>

Author: lutter
Date: Thu Aug 18 23:30:03 2011
New Revision: 1159444

URL: http://svn.apache.org/viewvc?rev=1159444&view=rev
Log:
Update/correct copyright and licensing info

  * Collect licenses from various files we incorporated from other projects
    in the LICENSE file
  * Add 2011 to copyright year in NOTICE files
  * Correct license headers in client/

Modified:
    incubator/deltacloud/trunk/client/NOTICE
    incubator/deltacloud/trunk/client/bin/deltacloudc
    incubator/deltacloud/trunk/client/lib/base_object.rb
    incubator/deltacloud/trunk/client/lib/client_bucket_methods.rb
    incubator/deltacloud/trunk/client/lib/deltacloud.rb
    incubator/deltacloud/trunk/client/lib/documentation.rb
    incubator/deltacloud/trunk/client/lib/hwp_properties.rb
    incubator/deltacloud/trunk/client/lib/instance_state.rb
    incubator/deltacloud/trunk/client/lib/plain_formatter.rb
    incubator/deltacloud/trunk/client/lib/string.rb
    incubator/deltacloud/trunk/server/LICENSE
    incubator/deltacloud/trunk/server/NOTICE

Modified: incubator/deltacloud/trunk/client/NOTICE
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/client/NOTICE?rev=1159444&r1=1159443&r2=1159444&view=diff
==============================================================================
--- incubator/deltacloud/trunk/client/NOTICE (original)
+++ incubator/deltacloud/trunk/client/NOTICE Thu Aug 18 23:30:03 2011
@@ -1,5 +1,5 @@
 Apache Deltacloud
-Copyright 2010 The Apache Software Foundation
+Copyright 2010, 2011 The Apache Software Foundation
 
 This product includes software developed at The Apache Software Foundation
 (http://www.apache.org/).

Modified: incubator/deltacloud/trunk/client/bin/deltacloudc
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/client/bin/deltacloudc?rev=1159444&r1=1159443&r2=1159444&view=diff
==============================================================================
--- incubator/deltacloud/trunk/client/bin/deltacloudc (original)
+++ incubator/deltacloud/trunk/client/bin/deltacloudc Thu Aug 18 23:30:03 2011
@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 #
-# Copyright (C) 2009  Red Hat, Inc.
-#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The

Modified: incubator/deltacloud/trunk/client/lib/base_object.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/client/lib/base_object.rb?rev=1159444&r1=1159443&r2=1159444&view=diff
==============================================================================
--- incubator/deltacloud/trunk/client/lib/base_object.rb (original)
+++ incubator/deltacloud/trunk/client/lib/base_object.rb Thu Aug 18 23:30:03 2011
@@ -1,6 +1,3 @@
-#
-# Copyright (C) 2010  Red Hat, Inc.
-#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The

Modified: incubator/deltacloud/trunk/client/lib/client_bucket_methods.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/client/lib/client_bucket_methods.rb?rev=1159444&r1=1159443&r2=1159444&view=diff
==============================================================================
--- incubator/deltacloud/trunk/client/lib/client_bucket_methods.rb (original)
+++ incubator/deltacloud/trunk/client/lib/client_bucket_methods.rb Thu Aug 18 23:30:03 2011
@@ -1,3 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you 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.
+
 module ClientBucketMethods
 
   def create_bucket(params)

Modified: incubator/deltacloud/trunk/client/lib/deltacloud.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/client/lib/deltacloud.rb?rev=1159444&r1=1159443&r2=1159444&view=diff
==============================================================================
--- incubator/deltacloud/trunk/client/lib/deltacloud.rb (original)
+++ incubator/deltacloud/trunk/client/lib/deltacloud.rb Thu Aug 18 23:30:03 2011
@@ -1,6 +1,3 @@
-#
-# Copyright (C) 2009  Red Hat, Inc.
-#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The

Modified: incubator/deltacloud/trunk/client/lib/documentation.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/client/lib/documentation.rb?rev=1159444&r1=1159443&r2=1159444&view=diff
==============================================================================
--- incubator/deltacloud/trunk/client/lib/documentation.rb (original)
+++ incubator/deltacloud/trunk/client/lib/documentation.rb Thu Aug 18 23:30:03 2011
@@ -1,6 +1,3 @@
-#
-# Copyright (C) 2010  Red Hat, Inc.
-#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The

Modified: incubator/deltacloud/trunk/client/lib/hwp_properties.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/client/lib/hwp_properties.rb?rev=1159444&r1=1159443&r2=1159444&view=diff
==============================================================================
--- incubator/deltacloud/trunk/client/lib/hwp_properties.rb (original)
+++ incubator/deltacloud/trunk/client/lib/hwp_properties.rb Thu Aug 18 23:30:03 2011
@@ -1,6 +1,3 @@
-#
-# Copyright (C) 2009  Red Hat, Inc.
-#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The

Modified: incubator/deltacloud/trunk/client/lib/instance_state.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/client/lib/instance_state.rb?rev=1159444&r1=1159443&r2=1159444&view=diff
==============================================================================
--- incubator/deltacloud/trunk/client/lib/instance_state.rb (original)
+++ incubator/deltacloud/trunk/client/lib/instance_state.rb Thu Aug 18 23:30:03 2011
@@ -1,5 +1,3 @@
-# Copyright (C) 2009, 2010  Red Hat, Inc.
-#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The

Modified: incubator/deltacloud/trunk/client/lib/plain_formatter.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/client/lib/plain_formatter.rb?rev=1159444&r1=1159443&r2=1159444&view=diff
==============================================================================
--- incubator/deltacloud/trunk/client/lib/plain_formatter.rb (original)
+++ incubator/deltacloud/trunk/client/lib/plain_formatter.rb Thu Aug 18 23:30:03 2011
@@ -1,5 +1,3 @@
-# Copyright (C) 2009, 2010  Red Hat, Inc.
-#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The

Modified: incubator/deltacloud/trunk/client/lib/string.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/client/lib/string.rb?rev=1159444&r1=1159443&r2=1159444&view=diff
==============================================================================
--- incubator/deltacloud/trunk/client/lib/string.rb (original)
+++ incubator/deltacloud/trunk/client/lib/string.rb Thu Aug 18 23:30:03 2011
@@ -1,6 +1,3 @@
-#
-# Copyright (C) 2010  Red Hat, Inc.
-#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The

Modified: incubator/deltacloud/trunk/server/LICENSE
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/LICENSE?rev=1159444&r1=1159443&r2=1159444&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/LICENSE (original)
+++ incubator/deltacloud/trunk/server/LICENSE Thu Aug 18 23:30:03 2011
@@ -174,3 +174,148 @@
       of your accepting any such warranty or additional liability.
 
    END OF TERMS AND CONDITIONS
+
+DELTACLOUD SERVER SUBCOMPONENTS
+
+The Deltacloud Server includes a number of subcomponents with separate
+copyrights 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 jQuery and jQuery mobile components in
+public/javascripts/jquery.*.js:
+
+  /*!
+   * jQuery JavaScript Library v1.6.2
+   * http://jquery.com/
+   *
+   * Copyright 2011, John Resig
+   * Dual licensed under the MIT or GPL Version 2 licenses.
+   * http://jquery.org/license
+   *
+   * Includes Sizzle.js
+   * http://sizzlejs.com/
+   * Copyright 2011, The Dojo Foundation
+   * Released under the MIT, BSD, and GPL Licenses.
+   *
+   * Date: Thu Jun 30 14:16:56 2011 -0400
+   */
+
+Deltacloud uses jQuery and jQuery mobile under the MIT license.
+
+For the lib/sinatra/accept_media_types.rb component:
+
+  # Copyright (C) 2009 Martin Aumont (mynyml)
+  #
+  # 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:
+  #
+  # The above copyright notice and this permission notice shall be included
+  # in all copies or substantial portions of the Software.
+  #
+  # 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.
+
+For the lib/sinatra/body_proxy.rb and lib/sinatra/rack_syslog.rb components:
+
+  Copyright (c) 2007, 2008, 2009, 2010 Christian Neukirchen
+  <purl.org/net/chneukirchen>
+
+  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:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  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 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.
+
+For the lib/sinatra/rack_accept.rb component:
+
+  (The MIT License)
+
+  Copyright (c) 2009-2010 Chris Hoffman
+
+  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:
+
+  The above copyright notice and this permission notice shall be included
+  in all copies or substantial portions of the Software.
+
+  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.
+
+For the lib/sinatra/rack_date.rb, lib/sinatra/rack_etag.rb, and
+lib/sinatra/rack_runtime.rb components:
+
+  Copyright (c) 2008 The Committers
+
+  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:
+
+  The above copyright notice and this permission notice shall be included
+  in all copies or substantial portions of the Software.
+
+  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 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.
+
+For the lib/sinatra/url_for.rb component:
+
+  Copyright (C) 2009 Eric Kidd
+
+  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:
+
+  The above copyright notice and this permission notice shall be included
+  in all copies or substantial portions of the Software.
+
+  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.

Modified: incubator/deltacloud/trunk/server/NOTICE
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/NOTICE?rev=1159444&r1=1159443&r2=1159444&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/NOTICE (original)
+++ incubator/deltacloud/trunk/server/NOTICE Thu Aug 18 23:30:03 2011
@@ -1,5 +1,5 @@
 Apache Deltacloud
-Copyright 2010 The Apache Software Foundation
+Copyright 2010, 2011 The Apache Software Foundation
 
 This product includes software developed at The Apache Software Foundation
 (http://www.apache.org/).