svn commit: r703367 - in /incubator/qpid/trunk/qpid/java/resources: LICENSE NOTICE

[la...@apache.org]

Author: lahiru
Date: Fri Oct 10 02:37:29 2008
New Revision: 703367

URL: http://svn.apache.org/viewvc?rev=703367&view=rev
Log:
adding jline to NOTICE and LICENSE.

Modified:
    incubator/qpid/trunk/qpid/java/resources/LICENSE
    incubator/qpid/trunk/qpid/java/resources/NOTICE

Modified: incubator/qpid/trunk/qpid/java/resources/LICENSE
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/resources/LICENSE?rev=703367&r1=703366&r2=703367&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/resources/LICENSE (original)
+++ incubator/qpid/trunk/qpid/java/resources/LICENSE Fri Oct 10 02:37:29 2008
@@ -522,3 +522,17 @@
 	LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 	NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 	EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+=============================================================================
+== JLine (BSD) License
+=============================================================================
+Copyright (c) 2008, Apache Software Foundation
+All rights reserved.
+ 
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+    * Neither the name of the <ORGANIZATION> nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+

Modified: incubator/qpid/trunk/qpid/java/resources/NOTICE
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/resources/NOTICE?rev=703367&r1=703366&r2=703367&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/resources/NOTICE (original)
+++ incubator/qpid/trunk/qpid/java/resources/NOTICE Fri Oct 10 02:37:29 2008
@@ -35,3 +35,10 @@
 The OSGi Alliance (http://www.osgi.org/).
 Copyright 2006 The OSGi Alliance.
 Licensed under the Apache License 2.0.
+
+Handling console input is provided bye the Jline library package,
+JLine is a Java library for handling console input. It is similar 
+in functionality to BSD editline and GNU readline.Original software is
+available from 
+
+pphttp://jline.sourceforge.net/index.html