Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

Commit

Permalink
RAVE-437: Check and cleanup of NOTICE files to only include 3rd party…
Browse files Browse the repository at this point in the history
… usages which require a (separate) notice.

   - Added Joda license & notice

git-svn-id: https://svn.apache.org/repos/asf/incubator/rave/trunk@1238911 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
mfranklin committed Feb 1, 2012
1 parent a981d17 commit a008962
Show file tree
Hide file tree
Showing 2 changed files with 60 additions and 2 deletions.
59 changes: 57 additions & 2 deletions rave-portal/src/main/appended-resources/META-INF/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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.
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 <scolebourne@joda.org>. For more
* information on the Joda project, please see <http://www.joda.org/>.

===============================================================================
3 changes: 3 additions & 0 deletions rave-portal/src/main/appended-resources/META-INF/NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ Eclipse Foundation (http://www.eclipse.org/aspectj), which is licensed under the
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.

Expand Down

0 comments on commit a008962

Please sign in to comment.