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/24 22:44:03 UTC
svn commit: r1139432 - in /incubator/rave/trunk: pom.xml rave-portal/pom.xml
rave-shindig/src/main/appended-resources/META-INF/LICENSE
rave-shindig/src/main/appended-resources/META-INF/NOTICE
Author: mfranklin
Date: Fri Jun 24 20:44:02 2011
New Revision: 1139432
URL: http://svn.apache.org/viewvc?rev=1139432&view=rev
Log:
Updated NOTICE & LICENSE files for rave-shindig (Supports RAVE-63)
Modified:
incubator/rave/trunk/pom.xml
incubator/rave/trunk/rave-portal/pom.xml
incubator/rave/trunk/rave-shindig/src/main/appended-resources/META-INF/LICENSE
incubator/rave/trunk/rave-shindig/src/main/appended-resources/META-INF/NOTICE
Modified: incubator/rave/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/pom.xml?rev=1139432&r1=1139431&r2=1139432&view=diff
==============================================================================
--- incubator/rave/trunk/pom.xml (original)
+++ incubator/rave/trunk/pom.xml Fri Jun 24 20:44:02 2011
@@ -234,6 +234,25 @@
<type>war</type>
</dependency>
+ <!-- Test -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>${easymock.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>${org.springframework.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -267,7 +286,7 @@
<scope>provided</scope>
</dependency>
- <!-- Test -->
+ <!-- Test
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -285,7 +304,7 @@
<artifactId>spring-test</artifactId>
<version>${org.springframework.version}</version>
<scope>test</scope>
- </dependency>
+ </dependency> -->
</dependencies>
<build>
Modified: incubator/rave/trunk/rave-portal/pom.xml
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/pom.xml?rev=1139432&r1=1139431&r2=1139432&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/pom.xml (original)
+++ incubator/rave/trunk/rave-portal/pom.xml Fri Jun 24 20:44:02 2011
@@ -164,6 +164,20 @@ if needed you can specify it on the comm
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
+
+ <!-- Test -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ </dependency>
</dependencies>
<build>
Modified: incubator/rave/trunk/rave-shindig/src/main/appended-resources/META-INF/LICENSE
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-shindig/src/main/appended-resources/META-INF/LICENSE?rev=1139432&r1=1139431&r2=1139432&view=diff
==============================================================================
--- incubator/rave/trunk/rave-shindig/src/main/appended-resources/META-INF/LICENSE (original)
+++ incubator/rave/trunk/rave-shindig/src/main/appended-resources/META-INF/LICENSE Fri Jun 24 20:44:02 2011
@@ -0,0 +1,126 @@
+===============================================================================
+
+The Apache Rave (inclubating) distribution includes a number of subcomponents
+with separate copyright notices and license terms. Your use of the
+code for the these subcomponents is subject to the terms and
+conditions of the following licenses.
+
+===============================================================================
+
+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.
+
+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.
\ No newline at end of file
Modified: incubator/rave/trunk/rave-shindig/src/main/appended-resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-shindig/src/main/appended-resources/META-INF/NOTICE?rev=1139432&r1=1139431&r2=1139432&view=diff
==============================================================================
--- incubator/rave/trunk/rave-shindig/src/main/appended-resources/META-INF/NOTICE (original)
+++ incubator/rave/trunk/rave-shindig/src/main/appended-resources/META-INF/NOTICE Fri Jun 24 20:44:02 2011
@@ -3,3 +3,40 @@ which is dual licensed and available und
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 product includes unmodified, binary redisributions of software (org.json.*) developed by
+JSON.org (http://json.org)
+
+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.
+An original copy of the license agreement can be found at: http://code.google.com/p/google-guice/source/browse/trunk/COPYING
+
+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 (Guava) developed by
+Google Inc (http://code.google.com/p/guava-libraries), which is licensed under the Apache 2 license.
+An original copy of the license agreement can be found at: http://code.google.com/p/guava-libraries/source/browse/trunk/COPYING
+
+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.
+An original copy of the license agreement can be found at: http://oauth.googlecode.com/svn/code/java/LICENSE.txt
+
+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/).
+
+
+
+
+
+
+
+
+
+