SOLR-1369 -- Add HSQLDB Jar to example-DIH, unzip database and update instructions

git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@807919 13f79535-47bb-0310-9956-ffa450edef68

NOTICE.txt

@@ -181,5 +181,71 @@ This product includes software developed by the Jackson project.
 
 See ????
 
+=========================================================================
+==     HSQLDB Notice                                                   ==
+=========================================================================
 
+For content, code, and products originally developed by Thomas Mueller and the Hypersonic SQL Group:
 
+Copyright (c) 1995-2000 by the Hypersonic SQL Group.
+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 Hypersonic SQL Group 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 HYPERSONIC SQL GROUP,
+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.
+
+This software consists of voluntary contributions made by many individuals on behalf of the
+Hypersonic SQL Group.
+
+For work added by the HSQL Development Group (a.k.a. hsqldb_lic.txt):
+
+Copyright (c) 2001-2005, The HSQL Development Group
+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 HSQL Development Group 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 HSQL DEVELOPMENT GROUP, HSQLDB.ORG,
+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.

contrib/dataimporthandler/CHANGES.txt

@@ -257,6 +257,7 @@ Bug Fixes
 
 Documentation
 ----------------------
+1. SOLR-1369: Add HSQLDB Jar to example-DIH, unzip database and update instructions.
 
 Other
 ----------------------

example/example-DIH/README.txt

@@ -16,13 +16,7 @@
 Solr DataImportHandler example configuration
 --------------------------------------------
 
-To run this example configuration, unzip the hsqldb.zip to the current directory.
-
-> gunzip hsqldb.zip
-
-Download the hsqldb jar from http://hsqldb.org/ and place it in solr/db/lib directory.
-
-Change to the parent folder. Start solr by executing the following command 
+Change to the parent (example) directory. Start solr by executing the following command 
 
 > cd ..
 > java -Dsolr.solr.home="./example-DIH/solr/" -jar start.jar

example/example-DIH/hsqldb/ex.log

@@ -0,0 +1,2 @@
+/*C1*/SET SCHEMA PUBLIC
+CONNECT USER SA

example/example-DIH/hsqldb/ex.properties

@@ -0,0 +1,17 @@
+#HSQL Database Engine 1.8.0.5
+#Fri Aug 29 10:24:33 IST 2008
+hsqldb.script_format=0
+runtime.gc_interval=0
+sql.enforce_strict_size=false
+hsqldb.cache_size_scale=8
+readonly=false
+hsqldb.nio_data_file=true
+hsqldb.cache_scale=14
+version=1.8.0
+hsqldb.default_table_type=memory
+hsqldb.cache_file_scale=1
+hsqldb.log_size=200
+modified=yes
+hsqldb.cache_version=1.7.0
+hsqldb.original_version=1.8.0
+hsqldb.compatible_version=1.8.0

example/example-DIH/hsqldb/ex.script

@@ -0,0 +1,12 @@
+CREATE SCHEMA PUBLIC AUTHORIZATION DBA
+CREATE CACHED TABLE ITEM(ID CHAR(8),NAME VARCHAR(100),MANU VARCHAR(50),WEIGHT REAL,PRICE REAL,POPULARITY INTEGER,INCLUDES VARCHAR(200),LAST_MODIFIED TIMESTAMP DEFAULT NOW)
+CREATE CACHED TABLE FEATURE(ITEM_ID CHAR(8),DESCRIPTION VARCHAR(200),LAST_MODIFIED TIMESTAMP DEFAULT NOW)
+CREATE CACHED TABLE CATEGORY(ID INTEGER,DESCRIPTION VARCHAR(30),LAST_MODIFIED TIMESTAMP DEFAULT NOW)
+CREATE CACHED TABLE ITEM_CATEGORY(ITEM_ID CHAR(8),CATEGORY_ID INTEGER,LAST_MODIFIED TIMESTAMP DEFAULT NOW)
+SET TABLE ITEM INDEX'15056 0'
+SET TABLE FEATURE INDEX'22424 0'
+SET TABLE CATEGORY INDEX'18856 0'
+SET TABLE ITEM_CATEGORY INDEX'17328 0'
+CREATE USER SA PASSWORD ""
+GRANT DBA TO SA
+SET WRITE_DELAY 20

example/example-DIH/solr/db/lib/hsqldb-1.8.0.10.jar

@@ -0,0 +1,2 @@
+AnyObjectId[e010269ddf6d6b7740cb5e7cd7cb53abf24a0add] was removed in git history.
+Apache SVN contains full history.