Author: scottbw
Date: Thu Feb 9 12:42:48 2012
New Revision: 1242301
URL: http://svn.apache.org/viewvc?rev=1242301&view=rev
Log:
Removed unnecessary entries for MIT and BSD licensed software with no special
NOTICE instructions (see WOOKIE-315)
Modified:
incubator/wookie/trunk/NOTICE
incubator/wookie/trunk/etc/release/standalone/NOTICE
incubator/wookie/trunk/etc/release/war/NOTICE
Modified: incubator/wookie/trunk/NOTICE
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/NOTICE?rev=1242301&r1=1242300&r2=1242301&view=diff
==============================================================================
--- incubator/wookie/trunk/NOTICE (original)
+++ incubator/wookie/trunk/NOTICE Thu Feb 9 12:42:48 2012
@@ -4,49 +4,15 @@ Copyright 2012 The Apache Software Found
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/)
-This product includes software (Bubbles.wgt) developed by
-Opera Software ASA. (http://widgets.opera.com/widget/10982/)
-
-This product includes software (CamCanvas) developed by
-Taboca Labs/Marcio dos Santos Galli Informatica
(http://www.taboca.com/p/camcanvas/).
-
-This product includes software (creole.js) developed
-by Ivan Fomichev.
(http://www.ivan.fomichev.name/2008/04/javascript-creole-10-wiki-markup-parser.html).
-
This product includes software (DWR) developed by
Getahead Ltd. (http://directwebremoting.org/).
-This product includes software (FlashCanvas) developed by the
-FlashCanvas Project, Ltd. (http://code.google.com/p/flashcanvas/).
-
-This product includes software (Flex iFrame) developed by
-Christophe Coenraets, Brian Deitte, and the Flex-iFrame community.
(http://code.google.com/p/flex-iframe/).
-
-This product includes software (JQuery, JQuery Mobile) developed by
-the JQUery Project, a member of the Software Freedom Conservancy.
(http://www.jquery.org/).
-
This product includes software (JSON) developed by
JSON.org. (http://json.org).
-This product includes software (Thickbox) developed by
-Cody Lindley. (http://www.codylindley.com).
-
This product includes software (UrlEncodedQueryString.java) developed by
Richard Kennard. (https://urlencodedquerystring.dev.java.net/).
-This product includes software (geo.js/geo_position_js_simulator.js) developed
by
-Stan Wiechers. (http://code.google.com/p/geo-location-javascript/).
-
This product includes software (S5) developed by Eric Meyer
(http://meyerweb.com/eric/tools/s5/)
-This product includes software (Yui-Library) developed by Yahoo! Inc.
(http://yuilibrary.com/)
-
-This product includes software (Walkthrough Widget) developed by OpenDirective
for the University of Oxford.
-
-This product includes software (jquery.timeago.js) developed by Ryan McGeary
(http://timeago.yarp.com/)
-
-This product includes software (jquery.tubeplayer.js) developed by Nirvana
Tikku (http://www.tikku.com/jquery-youtube-tubeplayer-plugin)
-
-This product includes software (NanoHTTPD) developed by Jarno Elonen and
Konstantinos Togias (http://iki.fi/elonen/code/nanohttpd/)
-
-This product includes software (Enyo) developed by Hewlett-Packard Development
Company, L.P. (http://enyojs.com)
\ No newline at end of file
+This product includes software (Walkthrough Widget) developed by OpenDirective
for the University of Oxford.
\ No newline at end of file
Modified: incubator/wookie/trunk/etc/release/standalone/NOTICE
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/etc/release/standalone/NOTICE?rev=1242301&r1=1242300&r2=1242301&view=diff
==============================================================================
--- incubator/wookie/trunk/etc/release/standalone/NOTICE (original)
+++ incubator/wookie/trunk/etc/release/standalone/NOTICE Thu Feb 9 12:42:48
2012
@@ -4,67 +4,24 @@ Copyright 2012 The Apache Software Found
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/)
-This product includes software (Bubbles.wgt) developed by
-Opera Software ASA. (http://widgets.opera.com/widget/10982/)
-
-This product includes software (CamCanvas) developed by
-Taboca Labs/Marcio dos Santos Galli Informatica
(http://www.taboca.com/p/camcanvas/).
-
-This product includes software (creole.js) developed
-by Ivan Fomichev.
(http://www.ivan.fomichev.name/2008/04/javascript-creole-10-wiki-markup-parser.html).
-
This product includes software (DWR) developed by
Getahead Ltd. (http://directwebremoting.org/).
-This product includes software (FlashCanvas) developed by the
-FlashCanvas Project, Ltd. (http://code.google.com/p/flashcanvas/).
-
-This product includes software (Flex iFrame) developed by
-Christophe Coenraets, Brian Deitte, and the Flex-iFrame community.
(http://code.google.com/p/flex-iframe/).
-
-This product includes software (JQuery, JQuery Mobile) developed by
-the JQUery Project, a member of the Software Freedom Conservancy.
(http://www.jquery.org/).
-
This product includes software (JSON) developed by
JSON.org. (http://json.org).
-This product includes software (Thickbox) developed by
-Cody Lindley. (http://www.codylindley.com).
-
This product includes software (UrlEncodedQueryString.java) developed by
Richard Kennard. (https://urlencodedquerystring.dev.java.net/).
-This product includes software (geo.js/geo_position_js_simulator.js) developed
by
-Stan Wiechers. (http://code.google.com/p/geo-location-javascript/).
-
This product includes software (S5) developed by Eric Meyer
(http://meyerweb.com/eric/tools/s5/)
-This product includes software (Yui-Library) developed by Yahoo! Inc.
(http://yuilibrary.com/)
-
This product includes software (Walkthrough Widget) developed by OpenDirective
for the University of Oxford.
-This product includes software (jquery.timeago.js) developed by Ryan McGeary
(http://timeago.yarp.com/)
-
-This product includes software (jquery.tubeplayer.js) developed by Nirvana
Tikku (http://www.tikku.com/jquery-youtube-tubeplayer-plugin)
-
-This product includes software (NanoHTTPD) developed by Jarno Elonen and
Konstantinos Togias (http://iki.fi/elonen/code/nanohttpd/)
-
-This product includes software (Enyo) developed by Hewlett-Packard Development
Company, L.P. (http://enyojs.com)
-
========
This product includes unmodified, binary redistributions of software (Google
Collections) developed by
Google.com (http://code.google.com/p/google-collections/)
-This product includes unmodified, binary redistributions of software (slf4j)
developed by
-QOS.ch (http://slf4j.org)
-
-This software contains unmodified binary redistributions of software (dom4j)
developed by
-Dom4J.(http://dom4j.org/)
-
-This software contains unmodified binary redistributions of software (Html
Cleaner) developed by
-Vladimir Nikic (http://htmlcleaner.sourceforge.net/)
-
This software contains unmodified binary redistributions of software
(javax.activation) developed by
Sun (http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp)
@@ -74,9 +31,6 @@ Sun (https://glassfish.dev.java.net/java
This product includes unmodified, binary redistributions of software
(org.json.*) developed by
JSON.org (http://json.org)
-This product includes unmodified, binary redistributions of software (JDOM)
developed by
-The JDOM Project (http://www.jdom.org).
-
This product includes unmodified, binary redistributions of software (ICU4J)
developed by
the ICU Project (http://site.icu-project.org).
Modified: incubator/wookie/trunk/etc/release/war/NOTICE
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/etc/release/war/NOTICE?rev=1242301&r1=1242300&r2=1242301&view=diff
==============================================================================
--- incubator/wookie/trunk/etc/release/war/NOTICE (original)
+++ incubator/wookie/trunk/etc/release/war/NOTICE Thu Feb 9 12:42:48 2012
@@ -4,67 +4,24 @@ Copyright 2012 The Apache Software Found
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/)
-This product includes software (Bubbles.wgt) developed by
-Opera Software ASA. (http://widgets.opera.com/widget/10982/)
-
-This product includes software (CamCanvas) developed by
-Taboca Labs/Marcio dos Santos Galli Informatica
(http://www.taboca.com/p/camcanvas/).
-
-This product includes software (creole.js) developed
-by Ivan Fomichev.
(http://www.ivan.fomichev.name/2008/04/javascript-creole-10-wiki-markup-parser.html).
-
This product includes software (DWR) developed by
Getahead Ltd. (http://directwebremoting.org/).
-This product includes software (FlashCanvas) developed by the
-FlashCanvas Project, Ltd. (http://code.google.com/p/flashcanvas/).
-
-This product includes software (Flex iFrame) developed by
-Christophe Coenraets, Brian Deitte, and the Flex-iFrame community.
(http://code.google.com/p/flex-iframe/).
-
-This product includes software (JQuery, JQuery Mobile) developed by
-the JQUery Project, a member of the Software Freedom Conservancy.
(http://www.jquery.org/).
-
This product includes software (JSON) developed by
JSON.org. (http://json.org).
-This product includes software (Thickbox) developed by
-Cody Lindley. (http://www.codylindley.com).
-
This product includes software (UrlEncodedQueryString.java) developed by
Richard Kennard. (https://urlencodedquerystring.dev.java.net/).
-This product includes software (geo.js/geo_position_js_simulator.js) developed
by
-Stan Wiechers. (http://code.google.com/p/geo-location-javascript/).
-
This product includes software (S5) developed by Eric Meyer
(http://meyerweb.com/eric/tools/s5/)
-This product includes software (Yui-Library) developed by Yahoo! Inc.
(http://yuilibrary.com/)
-
This product includes software (Walkthrough Widget) developed by OpenDirective
for the University of Oxford.
-This product includes software (jquery.timeago.js) developed by Ryan McGeary
(http://timeago.yarp.com/)
-
-This product includes software (jquery.tubeplayer.js) developed by Nirvana
Tikku (http://www.tikku.com/jquery-youtube-tubeplayer-plugin)
-
-This product includes software (NanoHTTPD) developed by Jarno Elonen and
Konstantinos Togias (http://iki.fi/elonen/code/nanohttpd/)
-
-This product includes software (Enyo) developed by Hewlett-Packard Development
Company, L.P. (http://enyojs.com)
-
========
This product includes unmodified, binary redistributions of software (Google
Collections) developed by
Google.com (http://code.google.com/p/google-collections/)
-This product includes unmodified, binary redistributions of software (slf4j)
developed by
-QOS.ch (http://slf4j.org)
-
-This software contains unmodified binary redistributions of software (dom4j)
developed by
-Dom4J.(http://dom4j.org/)
-
-This software contains unmodified binary redistributions of software (Html
Cleaner) developed by
-Vladimir Nikic (http://htmlcleaner.sourceforge.net/)
-
This software contains unmodified binary redistributions of software
(javax.activation) developed by
Sun (http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp)
@@ -74,9 +31,6 @@ Sun (https://glassfish.dev.java.net/java
This product includes unmodified, binary redistributions of software
(org.json.*) developed by
JSON.org (http://json.org)
-This product includes unmodified, binary redistributions of software (JDOM)
developed by
-The JDOM Project (http://www.jdom.org).
-
This product includes unmodified, binary redistributions of software (ICU4J)
developed by
the ICU Project (http://site.icu-project.org).
\ No newline at end of file
