incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bdelacre...@apache.org
Subject svn commit: r662457 - in /incubator/sling/trunk: etc/notice/noticemap.txt etc/notice/notices/jruby-codehaus.txt scripting/ruby/NOTICE
Date Mon, 02 Jun 2008 15:08:08 GMT
Author: bdelacretaz
Date: Mon Jun  2 08:08:08 2008
New Revision: 662457

URL: http://svn.apache.org/viewvc?rev=662457&view=rev
Log:
SLING-495, scripting/ruby NOTICE

Added:
    incubator/sling/trunk/etc/notice/notices/jruby-codehaus.txt   (with props)
Modified:
    incubator/sling/trunk/etc/notice/noticemap.txt
    incubator/sling/trunk/scripting/ruby/NOTICE

Modified: incubator/sling/trunk/etc/notice/noticemap.txt
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/etc/notice/noticemap.txt?rev=662457&r1=662456&r2=662457&view=diff
==============================================================================
--- incubator/sling/trunk/etc/notice/noticemap.txt (original)
+++ incubator/sling/trunk/etc/notice/noticemap.txt Mon Jun  2 08:08:08 2008
@@ -30,6 +30,7 @@
 org.codehaus.plexus:plexus-classworlds=codehaus.txt
 org.codehaus.plexus:plexus-container-default=codehaus.txt
 org.codehaus.plexus:plexus-utils=codehaus.txt
+org.jruby:jruby-complete=jruby-codehaus.txt
 org.json:json=json.txt
 org.mortbay.jetty:jetty=jetty.txt
 org.mortbay.jetty:jetty-util=jetty.txt

Added: incubator/sling/trunk/etc/notice/notices/jruby-codehaus.txt
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/etc/notice/notices/jruby-codehaus.txt?rev=662457&view=auto
==============================================================================
--- incubator/sling/trunk/etc/notice/notices/jruby-codehaus.txt (added)
+++ incubator/sling/trunk/etc/notice/notices/jruby-codehaus.txt Mon Jun  2 08:08:08 2008
@@ -0,0 +1,8 @@
+------------------------------------------------------------------------------
+Codehaus JRuby notice
+------------------------------------------------------------------------------
+This product includes software developed at jruby.codehaus.org, distributed 
+under a tri-license (CPL/GPL/LGPL).
+
+CPL is a reciprocal license, but this product uses it in binary form only,
+with no modifications.
\ No newline at end of file

Propchange: incubator/sling/trunk/etc/notice/notices/jruby-codehaus.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/sling/trunk/scripting/ruby/NOTICE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/ruby/NOTICE?rev=662457&r1=662456&r2=662457&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/ruby/NOTICE (original)
+++ incubator/sling/trunk/scripting/ruby/NOTICE Mon Jun  2 08:08:08 2008
@@ -1,9 +1,26 @@
-Apache Sling JRuby Scripting Support
+------------------------------------------------------------------------------
+Apache Sling - Scripting - Ruby Support
 Copyright 2007-2008 The Apache Software Foundation
+------------------------------------------------------------------------------
+Do not edit this NOTICE file directly, it is generated from the scripts
+found under etc/notice - see the scripts there for more info.
+------------------------------------------------------------------------------
+
+Based on source code originally developed by
+Day Software (http://www.day.com/).
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 Licensed under the Apache License 2.0.
 
-This product includes software developed at
-JRuby project in The Codehaus (http://jruby.codehaus.org/).
+See http://www.apache.org/legal/3party.html for the ASF policy on 
+third-party licenses.
+
+------------------------------------------------------------------------------
+Codehaus JRuby notice
+------------------------------------------------------------------------------
+This product includes software developed at jruby.codehaus.org, distributed 
+under a tri-license (CPL/GPL/LGPL).
+
+CPL is a reciprocal license, but this product uses it in binary form only,
+with no modifications.



Mime
View raw message