You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by at...@apache.org on 2011/06/24 13:05:08 UTC

svn commit: r1139242 - in /incubator/rave/trunk: rave-portal/src/main/appended-resources/ rave-portal/src/main/appended-resources/META-INF/ rave-portal/src/main/dist/ rave-shindig/src/main/appended-resources/ rave-shindig/src/main/appended-resources/ME...

Author: ate
Date: Fri Jun 24 11:05:08 2011
New Revision: 1139242

URL: http://svn.apache.org/viewvc?rev=1139242&view=rev
Log:
RAVE-63: maven-remote-resources-plugin (m-r-r-p) will automatically merge/append matching resources when put under src/main/appended-resources
For the LICENSE and NOTICE files, which are automatically/default added as configured through the Apache master pom, we therefore only have to specify
required additional LICENSE and NOTICE snippets within there.

As example I'm adding a first required NOTICE addition for the H2 database bundled with rave-shindig.
And, as we regrettably also manually need to maintain the (complete) LICENSE and NOTICE files for the assembled distributions, e.g. convering *all* bundled usages,
I've also added the H2 license notification to the dist/NOTICE file.

There is still plenty more required attribution to do, this is just a first next step... 

Added:
    incubator/rave/trunk/rave-portal/src/main/appended-resources/
    incubator/rave/trunk/rave-portal/src/main/appended-resources/META-INF/
    incubator/rave/trunk/rave-portal/src/main/appended-resources/META-INF/LICENSE
    incubator/rave/trunk/rave-portal/src/main/appended-resources/META-INF/NOTICE
    incubator/rave/trunk/rave-shindig/src/main/appended-resources/
    incubator/rave/trunk/rave-shindig/src/main/appended-resources/META-INF/
    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/rave-portal/src/main/dist/NOTICE

Added: 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=1139242&view=auto
==============================================================================
    (empty)

Added: 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=1139242&view=auto
==============================================================================
    (empty)

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=1139242&r1=1139241&r2=1139242&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/dist/NOTICE (original)
+++ incubator/rave/trunk/rave-portal/src/main/dist/NOTICE Fri Jun 24 11:05:08 2011
@@ -7,4 +7,9 @@ The Apache Software Foundation (http://w
 Java compilation software for JSP pages is provided by Eclipse, 
 which is open source software.  The original software and
 related information is available at
-http://www.eclipse.org.
\ No newline at end of file
+http://www.eclipse.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

Added: 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=1139242&view=auto
==============================================================================
    (empty)

Added: 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=1139242&view=auto
==============================================================================
--- incubator/rave/trunk/rave-shindig/src/main/appended-resources/META-INF/NOTICE (added)
+++ incubator/rave/trunk/rave-shindig/src/main/appended-resources/META-INF/NOTICE Fri Jun 24 11:05:08 2011
@@ -0,0 +1,5 @@
+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
+