svn commit: r481276 - in /incubator/solr/trunk: LICENSE.txt NOTICE.txt

[yo...@apache.org]

Author: yonik
Date: Fri Dec  1 08:25:54 2006
New Revision: 481276

URL: http://svn.apache.org/viewvc?view=rev&rev=481276
Log:
notice/license updates

Modified:
    incubator/solr/trunk/LICENSE.txt
    incubator/solr/trunk/NOTICE.txt

Modified: incubator/solr/trunk/LICENSE.txt
URL: http://svn.apache.org/viewvc/incubator/solr/trunk/LICENSE.txt?view=diff&rev=481276&r1=481275&r2=481276
==============================================================================
--- incubator/solr/trunk/LICENSE.txt (original)
+++ incubator/solr/trunk/LICENSE.txt Fri Dec  1 08:25:54 2006
@@ -200,7 +200,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
---------------------------------------------------------------------------
+==========================================================================
 The following license applies only to the xpp3 jar included with Solr
 --------------------------------------------------------------------------
 Indiana University Extreme! Lab Software License
@@ -249,4 +249,12 @@
 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.
+
+==========================================================================
+Portions of Jetty 5.1 are bundled in the Solr example server.
+The following licenses are part of the Jetty 5.1 distribution, which
+as a whole is licensed under The Apache License version 2.0. 
+ - example/etc/LICENSE.javax.servlet.txt
+ - example/etc/LICENSE.javax.xml.html
+ - example/etc/LICENSE.jsse.txt
 

Modified: incubator/solr/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/incubator/solr/trunk/NOTICE.txt?view=diff&rev=481276&r1=481275&r2=481276
==============================================================================
--- incubator/solr/trunk/NOTICE.txt (original)
+++ incubator/solr/trunk/NOTICE.txt Fri Dec  1 08:25:54 2006
@@ -4,6 +4,15 @@
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 
+Includes software from other Apache Software Foundation projects,
+including, but not limited to:
+  - Apache Lucene Java
+  - Apache Tomcat (lib/servlet-api-2.4.jar)
+
 This product includes software developed by the Indiana University
 Extreme! Lab (http://www.extreme.indiana.edu/).
 (specifically, the XPP3 XML pull parser)
+
+This product includes software developed by Mort Bay Consulting
+(specifically, Jetty 5.1, the bundled servlet container in example)
+