Permalink
Browse files

license/notice updates and some repository cleanup

git-svn-id: https://svn.apache.org/repos/asf/geronimo/server/trunk@1050006 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
Richard McGuire
Richard McGuire committed Dec 16, 2010
1 parent 334ac25 commit c3794da0d8290745331c93773eb7db4e94adc0f8
View
148 LICENSE

Large diffs are not rendered by default.

Oops, something went wrong.
View
16 NOTICE
@@ -1,5 +1,5 @@
Apache Geronimo
-Copyright 2003-2010 The Apache Software Foundation
+Copyright 2003-2011 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
@@ -224,3 +224,17 @@ The Apache Geronimo project elects to distribute this software under the terms o
the Mozilla Public License.
===============================================================================
+
+The product contains the software developed in json.org which released under the following license.
+
+http://www.json.org/license.html
+
+Copyright (c) 2002 JSON.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+The Software shall be used for Good, not Evil.
+
+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.
Oops, something went wrong.

0 comments on commit c3794da

Please sign in to comment.