Author: ecn
Date: Mon Jan 9 14:22:49 2012
New Revision: 1229167
URL: http://svn.apache.org/viewvc?rev=1229167&view=rev
Log:
ACCUMULO-285 update README with changes resulting from move; fix up svn ignores
Removed:
incubator/accumulo/branches/1.4/src/wikisearch/query-war/target/
incubator/accumulo/branches/1.4/src/wikisearch/query/target/
Modified:
incubator/accumulo/branches/1.4/src/wikisearch/ (props changed)
incubator/accumulo/branches/1.4/src/wikisearch/README
incubator/accumulo/branches/1.4/src/wikisearch/ingest/ (props changed)
incubator/accumulo/branches/1.4/src/wikisearch/ingest/conf/ (props
changed)
incubator/accumulo/branches/1.4/src/wikisearch/ingest/lib/ (props changed)
incubator/accumulo/branches/1.4/src/wikisearch/query/ (props changed)
incubator/accumulo/branches/1.4/src/wikisearch/query-war/ (props changed)
incubator/accumulo/branches/1.4/src/wikisearch/query-war/src/main/webapp/WEB-INF/jboss-web.xml
incubator/accumulo/branches/1.4/src/wikisearch/query-war/src/main/webapp/ui.jsp
incubator/accumulo/branches/1.4/src/wikisearch/query/lib/ (props changed)
Propchange: incubator/accumulo/branches/1.4/src/wikisearch/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jan 9 14:22:49 2012
@@ -1 +1,3 @@
+.settings
.project
+target
Modified: incubator/accumulo/branches/1.4/src/wikisearch/README
URL:
http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/wikisearch/README?rev=1229167&r1=1229166&r2=1229167&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/wikisearch/README (original)
+++ incubator/accumulo/branches/1.4/src/wikisearch/README Mon Jan 9 14:22:49
2012
@@ -7,41 +7,39 @@
Prerequisites
-------------
- 1. ACCUMULO, Hadoop, and ZooKeeper must be installed and running
- 2. ACCUMULO_HOME and ZOOKEEPER_HOME are defined in the environment
+ 1. Accumulo, Hadoop, and ZooKeeper must be installed and running
+ 2. ACCUMULO_HOME and ZOOKEEPER_HOME must be defined in the environment
3. One or more wikipedia dump files
(http://dumps.wikimedia.org/backup-index.html) placed in an HDFS directory.
You will want to grab the files with the link name of
pages-articles.xml.bz2
INSTRUCTIONS
------------
- 1. Build the ingest assembly by running 'mvn assembly:assembly' in the
ingest directory.
- 2. Untar the distribution in some directory.
- 3. Modify the conf/wikipedia.xml file to specify ACCUMULO information.
- 4. Copy the lib/accumulo-sample*.jar and lib/protobuf*.jar to
$ACCUMULO_HOME/lib/ext
- 5. Then run bin/ingest.sh with one argument (the name of the directory in
HDFS where the wikipedia XML files reside)
- and this will kick off a MapReduce job to ingest the data into
ACCUMULO.
+ 1. Copy the conf/wikipedia.xml.example to conf/wikipedia.xml and change
it to specify Accumulo information.
+ 2. Copy the lib/wikisearch-*.jar and lib/protobuf*.jar to
$ACCUMULO_HOME/lib/ext
+ 3. Then run bin/ingest.sh with one argument (the name of the directory
in HDFS where the wikipedia XML
+ files reside) and this will kick off a MapReduce job to ingest the
data into Accumulo.
Query
-----
Prerequisites
-------------
- 1. The query software was tested using JBoss AS 6. Install this unless
you feel like messing with the installation.
+ 1. The query software was tested using JBoss AS 6. Install this unless
you feel like messing with the installation.
- NOTE: Ran into a bug (https://issues.jboss.org/browse/RESTEASY-531)
that did not allow an EJB3.1 war file. I was able
- to workaround this by separating the RESTEasy servlet from the EJBs by
creating an EJB jar and a WAR file.
+ NOTE: Ran into a bug (https://issues.jboss.org/browse/RESTEASY-531)
that did not allow an EJB3.1 war file. The
+ workaround is to separate the RESTEasy servlet from the EJBs by
creating an EJB jar and a WAR file.
INSTRUCTIONS
-------------
1. Modify the query/src/main/resources/META-INF/ejb-jar.xml file with
the same information that you put into the wikipedia.xml
file from the Ingest step above.
- 2. Build the query distribution by running 'mvn assembly:assembly' in
the query directory.
- 3. Untar the resulting file from the $JBOSS_HOME/server/default
directory. This will place the dependent jars in the lib
- directory and the EJB jar into the deploy directory.
- 4. Next, run 'mvn clean package' in the query-war directory and copy
the war to $JBOSS_HOME/server/default/deploy.
+ 2. Re-build the query distribution by running 'mvn assembly:single' in
the top-level directory.
+ 3. Untar the resulting file in the $JBOSS_HOME/server/default
directory. This will place the dependent jars in the lib
+ directory and the EJB jar into the deploy directory.
+ 4. Next, copy the wikisearch*.war file in the query-war/target
directory to $JBOSS_HOME/server/default/deploy.
5. Start JBoss ($JBOSS_HOME/bin/run.sh)
- 6. Login to Accumulo and give the user permissions for the wikis that
you loaded, for example:
+ 6. Use the Accumulo shell and give the user permissions for the wikis
that you loaded, for example:
setauths -u <user> -s all,enwiki,eswiki,frwiki,fawiki
7. Copy the following jars to the $ACCUMULO_HOME/lib/ext directory from
the $JBOSS_HOME/server/default/lib directory:
@@ -53,13 +51,12 @@
commons-jexl*.jar
google-collections*.jar
- 8. Copy the
$JBOSS_HOME/server/default/deploy/accumulo-sample-query*.jar to
$ACCUMULO_HOME/lib/ext.
-
-
- 9. At this point you should be able to open a browser and view the
page: http://localhost:8080/accumulo-sample/ui/ui.jsp.
- You can issue the queries using this user interface or via the
following REST urls: <host>/accumulo-sample/rest/Query/xml,
- <host>/accumulo-sample/rest/Query/html,
<host>/accumulo-sample/rest/Query/yaml, or
<host>/accumulo-sample/rest/Query/json.
+ 8. Copy the $JBOSS_HOME/server/default/deploy/wikisearch-query*.jar to
$ACCUMULO_HOME/lib/ext.
+
+
+ 9. At this point you should be able to open a browser and view the
page: http://localhost:8080/accumulo-wikisearch/ui/ui.jsp.
+ You can issue the queries using this user interface or via the
following REST urls: <host>/accumulo-wikisearch/rest/Query/xml,
+ <host>/accumulo-wikisearch/rest/Query/html,
<host>/accumulo-sample/rest/Query/yaml, or
<host>/accumulo-wikisearch/rest/Query/json.
There are two parameters to the REST service, query and auths. The
query parameter is the same string that you would type
into the search box at ui.jsp, and the auths parameter is a
comma-separated list of wikis that you want to search (i.e.
enwiki,frwiki,dewiki, etc. Or you can use all)
-
Propchange: incubator/accumulo/branches/1.4/src/wikisearch/ingest/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jan 9 14:22:49 2012
@@ -1,5 +1,4 @@
target
-
.project
-
+.settings
.classpath
Propchange: incubator/accumulo/branches/1.4/src/wikisearch/ingest/conf/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jan 9 14:22:49 2012
@@ -0,0 +1 @@
+wikipedia.xml
Propchange: incubator/accumulo/branches/1.4/src/wikisearch/ingest/lib/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jan 9 14:22:49 2012
@@ -0,0 +1 @@
+*.jar
Propchange: incubator/accumulo/branches/1.4/src/wikisearch/query/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jan 9 14:22:49 2012
@@ -1 +1,3 @@
.settings
+.project
+.classpath
Propchange: incubator/accumulo/branches/1.4/src/wikisearch/query-war/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jan 9 14:22:49 2012
@@ -1,3 +1,3 @@
.project
-
.classpath
+.settings
Modified:
incubator/accumulo/branches/1.4/src/wikisearch/query-war/src/main/webapp/WEB-INF/jboss-web.xml
URL:
http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/wikisearch/query-war/src/main/webapp/WEB-INF/jboss-web.xml?rev=1229167&r1=1229166&r2=1229167&view=diff
==============================================================================
---
incubator/accumulo/branches/1.4/src/wikisearch/query-war/src/main/webapp/WEB-INF/jboss-web.xml
(original)
+++
incubator/accumulo/branches/1.4/src/wikisearch/query-war/src/main/webapp/WEB-INF/jboss-web.xml
Mon Jan 9 14:22:49 2012
@@ -16,5 +16,5 @@
limitations under the License.
-->
<jboss-web>
- <context-root>/accumulo-sample</context-root>
+ <context-root>/accumulo-wikisearch</context-root>
</jboss-web>
Modified:
incubator/accumulo/branches/1.4/src/wikisearch/query-war/src/main/webapp/ui.jsp
URL:
http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/wikisearch/query-war/src/main/webapp/ui.jsp?rev=1229167&r1=1229166&r2=1229167&view=diff
==============================================================================
---
incubator/accumulo/branches/1.4/src/wikisearch/query-war/src/main/webapp/ui.jsp
(original)
+++
incubator/accumulo/branches/1.4/src/wikisearch/query-war/src/main/webapp/ui.jsp
Mon Jan 9 14:22:49 2012
@@ -46,8 +46,8 @@
</head>
<body>
<div id="comments">
- <h1>Wiki Search using ACCUMULO</h1>
- <p>This sample application demonstrates the ability to use
search documents using ACCUMULO. The associated ingest software
+ <h1>Wiki Search using Apache Accumulo</h1>
+ <p>This sample application demonstrates the ability to use
search documents using Apache Accumulo. The associated ingest software
extracts the id, title, timestamp, and comments from each
wikipedia article. In addition, the wikipedia text has been tokenized
and is available for searching. You can enter a boolean
expression into the search box below and select the particular set of
wikipedia languages you want to search.</p>
Propchange: incubator/accumulo/branches/1.4/src/wikisearch/query/lib/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jan 9 14:22:49 2012
@@ -0,0 +1 @@
+*.jar
