incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bdelacre...@apache.org
Subject svn commit: r662694 - in /incubator/sling/trunk/etc/notice: ./ notices/
Date Tue, 03 Jun 2008 08:30:26 GMT
Author: bdelacretaz
Date: Tue Jun  3 01:30:25 2008
New Revision: 662694

URL: http://svn.apache.org/viewvc?rev=662694&view=rev
Log:
SLING-493 - cleanup whitespace and other noise in generated NOTICE

Modified:
    incubator/sling/trunk/etc/notice/mknotice
    incubator/sling/trunk/etc/notice/notices/asm.txt
    incubator/sling/trunk/etc/notice/notices/cglib.txt
    incubator/sling/trunk/etc/notice/notices/codehaus.txt
    incubator/sling/trunk/etc/notice/notices/concurrent.txt
    incubator/sling/trunk/etc/notice/notices/equinox.txt
    incubator/sling/trunk/etc/notice/notices/jetty.txt
    incubator/sling/trunk/etc/notice/notices/jruby-codehaus.txt
    incubator/sling/trunk/etc/notice/notices/json.txt
    incubator/sling/trunk/etc/notice/notices/junit.txt
    incubator/sling/trunk/etc/notice/notices/kxml2.txt
    incubator/sling/trunk/etc/notice/notices/nekohtml.txt
    incubator/sling/trunk/etc/notice/notices/pax.txt
    incubator/sling/trunk/etc/notice/notices/pdfbox.txt
    incubator/sling/trunk/etc/notice/notices/prefix.txt
    incubator/sling/trunk/etc/notice/notices/rhino.txt
    incubator/sling/trunk/etc/notice/notices/slf4j.txt
    incubator/sling/trunk/etc/notice/notices/textmining.txt

Modified: incubator/sling/trunk/etc/notice/mknotice
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/etc/notice/mknotice?rev=662694&r1=662693&r2=662694&view=diff
==============================================================================
--- incubator/sling/trunk/etc/notice/mknotice (original)
+++ incubator/sling/trunk/etc/notice/mknotice Tue Jun  3 01:30:25 2008
@@ -25,6 +25,7 @@
 NOTICEMAP=$MYDIR/noticemap.txt
 GLOBAL_PREFIX=$NOTICES/prefix.txt
 PROJECT_NAME=""
+MVN_OPT="-o"
 
 fatal() {
   echo ""
@@ -34,7 +35,7 @@
 
 set_project_name() {
   PROJECT_NAME=$( \
-	  mvn -o validate \
+	  mvn $MVN_OPT validate \
 	  | grep "INFO.*Building" | head -1 \
 	  | sed 's/.*INFO.*Building//' \
 	  | sed 's/Sling/Apache Sling/g'
@@ -50,8 +51,9 @@
 # so that they can be used as input to map_deps
 collect_deps() {
   NO_NOTICE_FILTER="org.apache|commons-|javax."
+  GOAL="dependency:resolve"
   
-  mvn -o dependency:resolve \
+  ( mvn $MVN_OPT $GOAL || fatal "mvn $MVN_OPT $GOAL failed" ) \
   | grep '\[INFO\].*:.*:.*:.*' \
   | grep -v 'Finished at:' \
   | egrep -v "$NO_NOTICE_FILTER" | awk -F' ' '{ print $2 }' \
@@ -94,9 +96,14 @@
 	  fi
 	  notice=$NOTICES/$notice
 	  [[ -f $notice ]] || fatal "Notice file $notice not found"
+	  if [[ "$MKNOTICE_DEBUG" -eq 1 ]]
+	  then
+	    echo "[DEBUG] $ME: including notice file $notice"
+	  fi
 	  cat $notice
 	  echo ""
-	done
+	  echo ""
+	done | cat -s
 }
 
 generate_notice
\ No newline at end of file

Modified: incubator/sling/trunk/etc/notice/notices/asm.txt
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/etc/notice/notices/asm.txt?rev=662694&r1=662693&r2=662694&view=diff
==============================================================================
--- incubator/sling/trunk/etc/notice/notices/asm.txt (original)
+++ incubator/sling/trunk/etc/notice/notices/asm.txt Tue Jun  3 01:30:25 2008
@@ -1,6 +1,3 @@
-------------------------------------------------------------------------------
-ASM notice
-------------------------------------------------------------------------------
 This product includes ASM software developed at asm.objectweb.org, distributed
 under ObjectWeb Apache-like license (http://asm.objectweb.org/license.html). 
 

Modified: incubator/sling/trunk/etc/notice/notices/cglib.txt
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/etc/notice/notices/cglib.txt?rev=662694&r1=662693&r2=662694&view=diff
==============================================================================
--- incubator/sling/trunk/etc/notice/notices/cglib.txt (original)
+++ incubator/sling/trunk/etc/notice/notices/cglib.txt Tue Jun  3 01:30:25 2008
@@ -1,6 +1,3 @@
-------------------------------------------------------------------------------
-CGLIB notice
-------------------------------------------------------------------------------
 This product includes CGLIB software developed at cglib.sourceforge.net,
 distributed under the Apache Software License 
 (http://sourceforge.net/projects/cglib).

Modified: incubator/sling/trunk/etc/notice/notices/codehaus.txt
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/etc/notice/notices/codehaus.txt?rev=662694&r1=662693&r2=662694&view=diff
==============================================================================
--- incubator/sling/trunk/etc/notice/notices/codehaus.txt (original)
+++ incubator/sling/trunk/etc/notice/notices/codehaus.txt Tue Jun  3 01:30:25 2008
@@ -1,5 +1,2 @@
-------------------------------------------------------------------------------
-Codehaus notice
-------------------------------------------------------------------------------
 This product includes software developed at codehaus.org, under BSD-like 
 license.
\ No newline at end of file

Modified: incubator/sling/trunk/etc/notice/notices/concurrent.txt
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/etc/notice/notices/concurrent.txt?rev=662694&r1=662693&r2=662694&view=diff
==============================================================================
--- incubator/sling/trunk/etc/notice/notices/concurrent.txt (original)
+++ incubator/sling/trunk/etc/notice/notices/concurrent.txt Tue Jun  3 01:30:25 2008
@@ -1,9 +1,5 @@
-------------------------------------------------------------------------------
-Concurrent library notice
-------------------------------------------------------------------------------
 This product includes concurrent library software developed by Doug Lea, 
 http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html
-
 That code is public domain and includes classes adapted from Sun JDK source
-code, used with permission see
+code which is used with permission, see
 http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/sun-u.c.license.pdf

Modified: incubator/sling/trunk/etc/notice/notices/equinox.txt
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/etc/notice/notices/equinox.txt?rev=662694&r1=662693&r2=662694&view=diff
==============================================================================
--- incubator/sling/trunk/etc/notice/notices/equinox.txt (original)
+++ incubator/sling/trunk/etc/notice/notices/equinox.txt Tue Jun  3 01:30:25 2008
@@ -1,9 +1,3 @@
-------------------------------------------------------------------------------
-Equinox notice
-------------------------------------------------------------------------------
 This product includes Equinox software developed by the Eclipse foundation, 
-distributed under EPL license.
-
-EPL (http://www.eclipse.org/legal/epl-v10.html) is a reciprocal license, but 
-this product uses that software in binary form only, without modifications.
+distributed under EPL license (http://www.eclipse.org/legal/epl-v10.html).
 

Modified: incubator/sling/trunk/etc/notice/notices/jetty.txt
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/etc/notice/notices/jetty.txt?rev=662694&r1=662693&r2=662694&view=diff
==============================================================================
--- incubator/sling/trunk/etc/notice/notices/jetty.txt (original)
+++ incubator/sling/trunk/etc/notice/notices/jetty.txt Tue Jun  3 01:30:25 2008
@@ -1,5 +1,2 @@
-------------------------------------------------------------------------------
-Jetty notice
-------------------------------------------------------------------------------
 This product includes Jetty software developed at mortbay.org, under Apache
 License.
\ No newline at end of file

Modified: 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=662694&r1=662693&r2=662694&view=diff
==============================================================================
--- incubator/sling/trunk/etc/notice/notices/jruby-codehaus.txt (original)
+++ incubator/sling/trunk/etc/notice/notices/jruby-codehaus.txt Tue Jun  3 01:30:25 2008
@@ -1,8 +1,3 @@
-------------------------------------------------------------------------------
-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
+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

Modified: incubator/sling/trunk/etc/notice/notices/json.txt
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/etc/notice/notices/json.txt?rev=662694&r1=662693&r2=662694&view=diff
==============================================================================
--- incubator/sling/trunk/etc/notice/notices/json.txt (original)
+++ incubator/sling/trunk/etc/notice/notices/json.txt Tue Jun  3 01:30:25 2008
@@ -1,5 +1,2 @@
-------------------------------------------------------------------------------
-JSON notice
-------------------------------------------------------------------------------
 This product includes software developed at json.org, under BSD-like json.org
 license, see http://www.json.org/license.html .
\ No newline at end of file

Modified: incubator/sling/trunk/etc/notice/notices/junit.txt
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/etc/notice/notices/junit.txt?rev=662694&r1=662693&r2=662694&view=diff
==============================================================================
--- incubator/sling/trunk/etc/notice/notices/junit.txt (original)
+++ incubator/sling/trunk/etc/notice/notices/junit.txt Tue Jun  3 01:30:25 2008
@@ -1,9 +1,3 @@
-------------------------------------------------------------------------------
-JUnit notice
-------------------------------------------------------------------------------
 This product includes software developed at junit.org, distributed under CPL 
 license (http://sourceforge.net/projects/junit/).
 
-CPL is a reciprocal license, but this product uses that software in binary 
-form only, without modifications.
-

Modified: incubator/sling/trunk/etc/notice/notices/kxml2.txt
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/etc/notice/notices/kxml2.txt?rev=662694&r1=662693&r2=662694&view=diff
==============================================================================
--- incubator/sling/trunk/etc/notice/notices/kxml2.txt (original)
+++ incubator/sling/trunk/etc/notice/notices/kxml2.txt Tue Jun  3 01:30:25 2008
@@ -1,5 +1,2 @@
-------------------------------------------------------------------------------
-kXML2 notice
-------------------------------------------------------------------------------
-This product includes kXML2 software developed at http://kxml.sourceforge.net/, 
-under BSD license.
\ No newline at end of file
+This product includes kXML2 software developed at 
+http://kxml.sourceforge.net/, under BSD license.
\ No newline at end of file

Modified: incubator/sling/trunk/etc/notice/notices/nekohtml.txt
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/etc/notice/notices/nekohtml.txt?rev=662694&r1=662693&r2=662694&view=diff
==============================================================================
--- incubator/sling/trunk/etc/notice/notices/nekohtml.txt (original)
+++ incubator/sling/trunk/etc/notice/notices/nekohtml.txt Tue Jun  3 01:30:25 2008
@@ -1,5 +1,2 @@
-------------------------------------------------------------------------------
-CyberNeko notice
-------------------------------------------------------------------------------
 This product includes CyberNeko software developed at
 http://sourceforge.net/projects/nekohtml, under Apache License. 
\ No newline at end of file

Modified: incubator/sling/trunk/etc/notice/notices/pax.txt
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/etc/notice/notices/pax.txt?rev=662694&r1=662693&r2=662694&view=diff
==============================================================================
--- incubator/sling/trunk/etc/notice/notices/pax.txt (original)
+++ incubator/sling/trunk/etc/notice/notices/pax.txt Tue Jun  3 01:30:25 2008
@@ -1,5 +1,2 @@
-------------------------------------------------------------------------------
-Pax notice
-------------------------------------------------------------------------------
 This product includes Pax software developed at ops4j.org, under Apache
 License (http://wiki.ops4j.org/confluence/display/ops4j/Licensing).
\ No newline at end of file

Modified: incubator/sling/trunk/etc/notice/notices/pdfbox.txt
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/etc/notice/notices/pdfbox.txt?rev=662694&r1=662693&r2=662694&view=diff
==============================================================================
--- incubator/sling/trunk/etc/notice/notices/pdfbox.txt (original)
+++ incubator/sling/trunk/etc/notice/notices/pdfbox.txt Tue Jun  3 01:30:25 2008
@@ -1,5 +1,2 @@
-------------------------------------------------------------------------------
-PDFBox notice
-------------------------------------------------------------------------------
 This product includes software developed at pdfbox.org, www.pdfbox.org, under 
 Apache License.
\ No newline at end of file

Modified: incubator/sling/trunk/etc/notice/notices/prefix.txt
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/etc/notice/notices/prefix.txt?rev=662694&r1=662693&r2=662694&view=diff
==============================================================================
--- incubator/sling/trunk/etc/notice/notices/prefix.txt (original)
+++ incubator/sling/trunk/etc/notice/notices/prefix.txt Tue Jun  3 01:30:25 2008
@@ -1,8 +1,4 @@
 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/).

Modified: incubator/sling/trunk/etc/notice/notices/rhino.txt
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/etc/notice/notices/rhino.txt?rev=662694&r1=662693&r2=662694&view=diff
==============================================================================
--- incubator/sling/trunk/etc/notice/notices/rhino.txt (original)
+++ incubator/sling/trunk/etc/notice/notices/rhino.txt Tue Jun  3 01:30:25 2008
@@ -1,10 +1,6 @@
-------------------------------------------------------------------------------
-Rhino notice
-------------------------------------------------------------------------------
 This product includes Rhino software developed at mozilla.org 
 (http://www.mozilla.org/), dual-licensed under both an MPL and a GPL license, 
-see http://developer.mozilla.org/en/docs/Rhino_License .
-
-MPL (http://www.mozilla.org/MPL/) is a reciprocal license, but this product 
+see http://developer.mozilla.org/en/docs/Rhino_License . MPL 
+(http://www.mozilla.org/MPL/) is a reciprocal license, but this product 
 uses that software in binary form only, without modifications.
 

Modified: incubator/sling/trunk/etc/notice/notices/slf4j.txt
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/etc/notice/notices/slf4j.txt?rev=662694&r1=662693&r2=662694&view=diff
==============================================================================
--- incubator/sling/trunk/etc/notice/notices/slf4j.txt (original)
+++ incubator/sling/trunk/etc/notice/notices/slf4j.txt Tue Jun  3 01:30:25 2008
@@ -1,6 +1,3 @@
-------------------------------------------------------------------------------
-slf4j notice
-------------------------------------------------------------------------------
 This product includes software developed at http://slf4j.org, distributed
 under the slf4j MIT-like license (http://slf4j.org/license.html). 
 

Modified: incubator/sling/trunk/etc/notice/notices/textmining.txt
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/etc/notice/notices/textmining.txt?rev=662694&r1=662693&r2=662694&view=diff
==============================================================================
--- incubator/sling/trunk/etc/notice/notices/textmining.txt (original)
+++ incubator/sling/trunk/etc/notice/notices/textmining.txt Tue Jun  3 01:30:25 2008
@@ -1,6 +1,3 @@
-------------------------------------------------------------------------------
-Textmining notice
-------------------------------------------------------------------------------
 Although the latest tm-extractors software is under LGPL license, it 
 seems like the version 0.4 that we're using is under the BSD-like license
 found at http://www.searchblox.com/TEXT_MINING_license.html.



Mime
View raw message