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 2012/02/01 03:47:35 UTC
svn commit: r1238911 - in
/incubator/rave/trunk/rave-portal/src/main/appended-resources/META-INF:
LICENSE NOTICE
Author: mfranklin
Date: Wed Feb 1 02:47:34 2012
New Revision: 1238911
URL: http://svn.apache.org/viewvc?rev=1238911&view=rev
Log:
RAVE-437: Check and cleanup of NOTICE files to only include 3rd party usages which require a (separate) notice.
- Added Joda license & notice
Modified:
incubator/rave/trunk/rave-portal/src/main/appended-resources/META-INF/LICENSE
incubator/rave/trunk/rave-portal/src/main/appended-resources/META-INF/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=1238911&r1=1238910&r2=1238911&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 Wed Feb 1 02:47:34 2012
@@ -1243,7 +1243,6 @@ Copyright (c) 2004-2008 QOS.ch
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 Bouncy Castle:
@@ -1261,4 +1260,60 @@ Copyright (c) 2004-2008 QOS.ch
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
+ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+ ===============================================================================
+
+ Joda Software License, Version 1.0
+ *
+ *
+ * Copyright (c) 2001-2004 Stephen Colebourne.
+ * 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
+ * Joda project (http://www.joda.org/)."
+ * Alternately, this acknowledgment may appear in the software itself,
+ * if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The name "Joda" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
+ * written permission, please contact licence@joda.org.
+ *
+ * 5. Products derived from this software may not be called "Joda",
+ * nor may "Joda" appear in their name, without prior written
+ * permission of the Joda project.
+ *
+ * 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 JODA 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 Joda project and was originally
+ * created by Stephen Colebourne <sc...@joda.org>. For more
+ * information on the Joda project, please see <http://www.joda.org/>.
+
+ ===============================================================================
\ No newline at end of file
Modified: incubator/rave/trunk/rave-portal/src/main/appended-resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/appended-resources/META-INF/NOTICE?rev=1238911&r1=1238910&r2=1238911&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/appended-resources/META-INF/NOTICE (original)
+++ incubator/rave/trunk/rave-portal/src/main/appended-resources/META-INF/NOTICE Wed Feb 1 02:47:34 2012
@@ -12,6 +12,9 @@ Eclipse Foundation (http://www.eclipse.o
Source code for this project can be found at http://dev.eclipse.org/viewcvs/viewvc.cgi/org.aspectj/?root=Tools_Project
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 (Joda Time) developed by
+The Joda project (http://joda.org), which is licensed under the Joda Software License.
+
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.