You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by mf...@apache.org on 2011/06/27 22:07:32 UTC

svn commit: r1140295 - in /incubator/rave/trunk/rave-portal/src/main: appended-resources/META-INF/LICENSE dist/LICENSE dist/NOTICE

Author: mfranklin
Date: Mon Jun 27 20:07:32 2011
New Revision: 1140295

URL: http://svn.apache.org/viewvc?rev=1140295&view=rev
Log:
Updated demo combined NOTICE & LICENSE with additional attributions. (Supports RAVE-63)

Modified:
    incubator/rave/trunk/rave-portal/src/main/appended-resources/META-INF/LICENSE
    incubator/rave/trunk/rave-portal/src/main/dist/LICENSE
    incubator/rave/trunk/rave-portal/src/main/dist/NOTICE

Modified: incubator/rave/trunk/rave-portal/src/main/appended-resources/META-INF/LICENSE
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/appended-resources/META-INF/LICENSE?rev=1140295&r1=1140294&r2=1140295&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/appended-resources/META-INF/LICENSE (original)
+++ incubator/rave/trunk/rave-portal/src/main/appended-resources/META-INF/LICENSE Mon Jun 27 20:07:32 2011
@@ -222,3 +222,49 @@ for this software is http://www.jcip.net
 Any republication or derived work distributed in source code form
 must include the copyright and license notice.
 
+ ===============================================================================
+
+For the Serp component:
+
+Copyright (c) 2002-2007, A. Abram White
+All rights reserved.
+
+Redistribution and use 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 'serp' nor the names of its contributors may
+  be used to endorse or promote products derived from this software without
+  specific prior written permission.
+
+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.
+
+=================================================================================
+
+For org.json.* components:
+
+Copyright (c) 2002 JSON.org
+
+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 shall be used for Good, not Evil.
+
+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

Modified: incubator/rave/trunk/rave-portal/src/main/dist/LICENSE
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/dist/LICENSE?rev=1140295&r1=1140294&r2=1140295&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/dist/LICENSE (original)
+++ incubator/rave/trunk/rave-portal/src/main/dist/LICENSE Mon Jun 27 20:07:32 2011
@@ -469,4 +469,158 @@ The Software shall be used for Good, not
 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
+=================================================================================
+
+For XStream Components:
+
+Copyright (c) 2003-2006, Joe Walnes
+Copyright (c) 2006-2007, XStream Committers
+All rights reserved.
+
+Redistribution and use 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 XStream nor the names of its contributors may be used to endorse
+or promote products derived from this software without specific prior written
+permission.
+
+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.
+
+For XPP3:
+
+Indiana University Extreme! Lab Software License
+
+Version 1.1.1
+
+Copyright (c) 2002 Extreme! Lab, Indiana University. 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 acknowledgment:
+
+  "This product includes software developed by the Indiana University
+  Extreme! Lab (http://www.extreme.indiana.edu/)."
+
+Alternately, this acknowledgment may appear in the software itself,
+if and wherever such third-party acknowledgments normally appear.
+
+4. The names "Indiana Univeristy" and "Indiana Univeristy Extreme! Lab"
+must not be used to endorse or promote products derived from this
+software without prior written permission. For written permission,
+please contact http://www.extreme.indiana.edu/.
+
+5. Products derived from this software may not use "Indiana Univeristy"
+name nor may "Indiana Univeristy" appear in their name, without prior
+written permission of the Indiana University.
+
+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 AUTHORS, COPYRIGHT HOLDERS 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.
+
+For Code Mirror:
+ Copyright (c) 2007-2010 Marijn Haverbeke
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any
+ damages arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any
+ purpose, including commercial applications, and to alter it and
+ redistribute it freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must
+    not claim that you wrote the original software. If you use this
+    software in a product, an acknowledgment in the product
+    documentation would be appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must
+    not be misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source
+    distribution.
+
+ Marijn Haverbeke
+ marijnh@gmail.com
+
+For JDOM
+ Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin.
+ 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 disclaimer that follows
+    these conditions in the documentation and/or other materials
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact <request_AT_jdom_DOT_org>.
+
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management <request_AT_jdom_DOT_org>.
+
+ In addition, we request (but do not require) that you include in the
+ end-user documentation provided with the redistribution and/or in the
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos
+ available at http://www.jdom.org/images/logos.
+
+ 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 JDOM AUTHORS OR THE PROJECT
+ 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 JDOM Project and was originally
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
\ No newline at end of file

Modified: incubator/rave/trunk/rave-portal/src/main/dist/NOTICE
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/dist/NOTICE?rev=1140295&r1=1140294&r2=1140295&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/dist/NOTICE (original)
+++ incubator/rave/trunk/rave-portal/src/main/dist/NOTICE Mon Jun 27 20:07:32 2011
@@ -9,7 +9,120 @@ which is open source software.  The orig
 related information is available at
 http://www.eclipse.org.
 
+This product includes unmodified, binary redistributions of software (Spring Framework) developed by
+SpringSource, a division of VMware (http://www.springsource.org), which is licensed under the Apache 2 license.
+
+This product includes unmodified, binary redistributions of software (AOP Alliance) developed by
+AOP Alliance (http://aopalliance.sourceforge.net/), which was developed in the Public Domain.
+
+This product includes unmodified, binary redistributions of software (AspectJ) developed for the
+Eclipse Foundation (http://www.eclipse.org/aspectj), which is licensed under the Eclipse Public License.
+An original copy of the license can be found at http://eclipse.org/legal/epl-v10.html
+
+This product includes unmodified, binary redistributions of software (OpenId4Java) developed by
+Sxip Identity Corporation (http://code.google.com/p/openid4java), which is licensed under the Apache 2 license.
+
+This product includes unmodified, binary redistributions of software (Guice) developed by
+Google Inc (http://code.google.com/p/google-guice), which is licensed under the Apache 2 license.
+
+This product includes unmodified, binary redistributions of software (Java Concurrency in Practice) developed by
+Brian Goetz and Tim Peierls (http://jcip.net), which is licensed under the Apache 2 license.
+
+This product includes unmodified, binary redisributions of software (org.json.*) developed by
+JSON.org (http://json.org)
+
 This software contains unmodified binary redistributions for H2 database engine (http://www.h2database.com/),
 which is dual licensed and available under a modified version of the MPL 1.1 (Mozilla Public License)
 or under the (unmodified) EPL 1.0 (Eclipse Public License).
 An original copy of the license agreement can be found at: http://www.h2database.com/html/license.html
+
+This software contains unmodified, binary redistributions for Serp (http://serp.sourceforge.net), which is licensed under
+the BSD license.
+
+This software contains unmodified, binary redistributions for Jackson (http://jackson.codehaus.org), which is licensed under
+the Apache 2 License.
+
+This software contains unmodified, binary redistributions of software (Glassfish) developed by
+The Oracle Corporation (http://glassfish.java.net), which is licensed under the CDDL.
+An original copy of the license can be found at http://glassfish.java.net/public/CDDL+GPL_1_1.html
+
+This product includes unmodified, binary redistributions of software (Guava) developed by
+Google Inc (http://code.google.com/p/guava-libraries), which is licensed under the Apache 2 license.
+
+This product includes unmodified, binary redistributions of software (OAuth core) developed by
+John Kristian, Praveen Alavilli and Dirk Balfanz (http://oauth.googlecode.com/svn/code/java/core/), which is licensed under the Apache 2 license.
+
+This product includes unmodified, binary redistributions of software (XStream) developed by
+Joe Walnes and XStream Committers (http://xstream.codehaus.org/), which is licensed under the BSD license.
+An original copy of the license agreement can be found at: http://xstream.codehaus.org/license.html
+
+This product includes unmodified, binary redistributions of software (XPP3) developed by
+Indiana University (http://www.extreme.indiana.edu/).
+
+This product includes unmodified code source (CodeMirror) developed by
+Marijn Haverbeke (http://www.codemirror.net/).
+
+This product includes unmodified, (Args4J) developed at http://args4j.java.net, which is licensed under the MIT License.
+An original copy of the license agreement can be found at: http://opensource.org/licenses/mit-license.php
+
+This product includes unmodified, binary redistributions of software (Caja) developed by
+Google Inc (http://code.google.com/p/google-caja), which is licensed under the Apache 2 license.
+
+This product includes unmodified, binary redistributions of software (Closure Compiler) developed by
+Google Inc (http://code.google.com/p/closure-compiler), which is licensed under the Apache 2 license.
+
+This product includes unmodified, binary redistributions of software (EHCache) developed by
+Terracotta  Inc(http://ehcache.org), which is licensed under the Apache 2 license.
+
+This product includes unmodified, binary redistributions of software (HTML Parser) developed by
+the HTML Parser community (http://htmlparser.sourceforge,net), which is licensed under the Common Public License.
+An original copy of the license can be found at http://htmlparser.sourceforge.net/license.html
+
+This product includes unmodified, binary redistributions of software (ICU4J) developed by
+the ICU Project (http://site.icu-project.org), which is licensed under the X License.
+An original copy of the license can be found at http://source.icu-project.org/repos/icu/icu4j/tags/release-4-8/main/shared/licenses/license.html
+
+This product includes unmodified, binary redistributions of software (javax.inject) developed by
+The JSR-330 Expert Group (http://code.google.com/p/atinject), which is licensed under the Apache 2 license.
+
+This product includes unmodified, binary redistributions of software (JDOM) developed by
+The JDOM Project (http://www.jdom.org), which is licensed under the license noted in LICENSE.txt.
+
+This product includes unmodified, binary redistributions of software (Joda Time) developed by
+The Joda project (http://joda.org), which is licensed under the Joda Software License.
+An original copy of the license agreement can be found at http://joda.sourceforge.net/license.html
+
+This product includes unmodified, binary redistributions of software (JUEL) developed by
+Odysseus Software GmbH (http://juel.sourceforge.net), which is licensed under the Apache 2 license.
+
+This product includes unmodified, binary redistributions of software (Rome) developed by
+Sun Microsystems, Inc. (http://java.net/projects/rome), which is licensed under the Apache 2.0 license.
+
+This product includes unmodified, binary redistributions of software (neko) developed by
+Andy Clark, Marc Guillemo (http://nekohtml.sourceforge.net), which is licensed under the Apache 2.0 license.
+
+This product includes unmodified, binary redistributions of software (Protocol Buffers) developed by
+Google Inc. (http://code.google.com/p/protobuf), which is licensed under the New BSD license.
+An original copy of the license can be found at http://code.google.com/p/protobuf/source/browse/trunk/COPYING.txt
+
+This product includes unmodified, binary redistributions of software (slf4j) developed by
+QOS.ch (http://slf4j.org), which is licensed under the MIT license.
+An original copy of the license can be found at http://code.google.com/p/protobuf/source/browse/trunk/COPYING.txt
+
+This product includes software (JSUnit) developed by
+Joerg Schaible (http://jsunit.berlios.de/).
+
+This product includes software (swfobject) developed by
+Geoff Stearns, Michael Williams, and Bobby van der Sluis (http://code.google.com/p/swfobject/)
+
+This product includes software (opensocial-resources) developed by
+The OpenSocial Foundation (http://opensocial-resources.googlecode.com/svn/spec/0.8/)
+
+This product includes software (Zend) developed by
+Zend Technologies Ltd (http://framework.zend.com/).
+
+This product includes software (JSMin) developed by
+Douglas Crockford  (http://www.crockford.com/).
+
+This product includs software (OpenAjax Hub) developed by
+OpenAjax Alliance (http://www.openajax.org/)