You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2013/01/03 16:38:32 UTC
svn commit: r1428404 - in /jena/trunk/jena-fuseki: LICENSE NOTICE

Author: andy
Date: Thu Jan  3 15:38:32 2013
New Revision: 1428404

URL: http://svn.apache.org/viewvc?rev=1428404&view=rev
Log:
Fuseki includes source code taken from Jetty.
Make NOTICE and LICENSE reflect this.

Modified:
    jena/trunk/jena-fuseki/LICENSE
    jena/trunk/jena-fuseki/NOTICE

Modified: jena/trunk/jena-fuseki/LICENSE
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/LICENSE?rev=1428404&r1=1428403&r2=1428404&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/LICENSE (original)
+++ jena/trunk/jena-fuseki/LICENSE Thu Jan  3 15:38:32 2013
@@ -200,3 +200,25 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
+
+- - - - - - - - - - - - - - - - - - - - - - - 
+
+==============================================================
+ Jetty Web Container
+ Copyright 1995-2012 Mort Bay Consulting Pty Ltd.
+==============================================================
+
+The Jetty Web Container is Copyright Mort Bay Consulting Pty Ltd
+unless otherwise noted.
+
+Jetty is dual licensed under both
+
+  * The Apache 2.0 License
+    http://www.apache.org/licenses/LICENSE-2.0.html
+
+      and
+
+  * The Eclipse Public 1.0 License
+    http://www.eclipse.org/legal/epl-v10.html
+
+Jetty may be distributed under either license.

Modified: jena/trunk/jena-fuseki/NOTICE
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/NOTICE?rev=1428404&r1=1428403&r2=1428404&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/NOTICE (original)
+++ jena/trunk/jena-fuseki/NOTICE Thu Jan  3 15:38:32 2013
@@ -10,3 +10,7 @@ Portions of this software were originall
   - Copyright 2010, 2011 Talis Systems Ltd.
 These have been licensed to the Apache Software Foundation under a software grant.
 
+- - - - - - - - - - - - - - - - - - - - - - - 
+
+Portions of this software include software from  Mort Bay Consulting Pty. Ltd.
+ - Copyright (c) 2004-2009 Mort Bay Consulting Pty. Ltd.