Author: reto
Date: Thu Jan 26 17:18:25 2012
New Revision: 1236297
URL: http://svn.apache.org/viewvc?rev=1236297&view=rev
Log:
CLEREZZA-646: added licenses of included projects to LICENSE
Removed:
incubator/clerezza/trunk/parent/web.resources.jquery/LICENSE.MIT.txt
incubator/clerezza/trunk/parent/web.resources.yui/LICENSE.bsd.yahoo.txt
Modified:
incubator/clerezza/trunk/parent/web.resources.jquery/LICENSE
incubator/clerezza/trunk/parent/web.resources.yui/LICENSE
Modified: incubator/clerezza/trunk/parent/web.resources.jquery/LICENSE
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/web.resources.jquery/LICENSE?rev=1236297&r1=1236296&r2=1236297&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/web.resources.jquery/LICENSE (original)
+++ incubator/clerezza/trunk/parent/web.resources.jquery/LICENSE Thu Jan 26
17:18:25 2012
@@ -199,3 +199,34 @@
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 CLEREZZA - jQuery bundlized SUBCOMPONENTS:
+
+The Apache Clerezza Clerezza - jQuery bundlized includes a subcomponent 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 jQuery:
+
+Copyright (c) 2011 John Resig, http://jquery.com/
+
+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/clerezza/trunk/parent/web.resources.yui/LICENSE
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/web.resources.yui/LICENSE?rev=1236297&r1=1236296&r2=1236297&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/web.resources.yui/LICENSE (original)
+++ incubator/clerezza/trunk/parent/web.resources.yui/LICENSE Thu Jan 26
17:18:25 2012
@@ -199,3 +199,26 @@
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 Clerezza Ext - Yui JS SUBCOMPONENTS:
+
+The Apache Clerezza Ext - Yui JS includes a subcomponent 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 yui:
+
+Copyright (c) 2009, Yahoo! Inc.
+All rights reserved.
+
+Redistribution and use of this software in source and binary forms, with or
without modification, are permitted provided that the following conditions are
met:
+
+ * Redistributions of source code must retain the above copyright notice,
this list of conditions and the
+ following disclaimer.
+ * 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.
+ * Neither the name of Yahoo! Inc. nor the names of its contributors may
be used to endorse or promote products derived from this software without
specific prior written permission of Yahoo! Inc.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS 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 COPYRIGHT OWNER OR 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.
+
+
