Author: ecn
Date: Tue Jan 10 19:18:46 2012
New Revision: 1229694
URL: http://svn.apache.org/viewvc?rev=1229694&view=rev
Log:
ACCUMULO-285 finishing up instructions for the wikisearch
Modified:
incubator/accumulo/branches/1.4/src/wikisearch/README
incubator/accumulo/branches/1.4/src/wikisearch/query/pom.xml
incubator/accumulo/branches/1.4/src/wikisearch/query/src/assembly/dist.xml
incubator/accumulo/branches/1.4/src/wikisearch/query/src/main/java/org/apache/accumulo/wikisearch/query/Query.java
Modified: incubator/accumulo/branches/1.4/src/wikisearch/README
URL:
http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/wikisearch/README?rev=1229694&r1=1229693&r2=1229694&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/wikisearch/README (original)
+++ incubator/accumulo/branches/1.4/src/wikisearch/README Tue Jan 10 19:18:46
2012
@@ -35,8 +35,12 @@
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. 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.
+ 3. Untar the resulting file in the $JBOSS_HOME/server/default
directory.
+
+ $ cd $JBOSS_HOME/server/default
+ $ tar -xzf
$ACCUMULO_HOME/src/wikisearch/query/target/wikisearch-query*.tar.gz
+
+ 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. Use the Accumulo shell and give the user permissions for the wikis
that you loaded, for example:
@@ -46,8 +50,6 @@
commons-lang*.jar
kryo*.jar
minlog*.jar
- reflectasm*.jar
- asm*.jar
commons-jexl*.jar
google-collections*.jar
@@ -56,7 +58,7 @@
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.
+ <host>/accumulo-wikisearch/rest/Query/html,
<host>/accumulo-wikisearch/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)
Modified: incubator/accumulo/branches/1.4/src/wikisearch/query/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/wikisearch/query/pom.xml?rev=1229694&r1=1229693&r2=1229694&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/wikisearch/query/pom.xml (original)
+++ incubator/accumulo/branches/1.4/src/wikisearch/query/pom.xml Tue Jan 10
19:18:46 2012
@@ -110,7 +110,7 @@
<configuration>
<outputDirectory>lib</outputDirectory>
<!-- just grab the non-provided runtime dependencies -->
-
<includeArtifactIds>commons-lang,protobuf-java,libthrift,zookeeper,hadoop-core,commons-jexl,google-collections,kryo,asm,minlog,reflectasm</includeArtifactIds>
+
<includeArtifactIds>commons-lang,protobuf-java,libthrift,zookeeper,hadoop-core,commons-jexl,google-collections,kryo,asm,minlog,reflectasm,wikisearch-ingest</includeArtifactIds>
<excludeTransitive>true</excludeTransitive>
</configuration>
</execution>
Modified:
incubator/accumulo/branches/1.4/src/wikisearch/query/src/assembly/dist.xml
URL:
http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/wikisearch/query/src/assembly/dist.xml?rev=1229694&r1=1229693&r2=1229694&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/wikisearch/query/src/assembly/dist.xml
(original)
+++ incubator/accumulo/branches/1.4/src/wikisearch/query/src/assembly/dist.xml
Tue Jan 10 19:18:46 2012
@@ -31,4 +31,10 @@
<fileMode>0644</fileMode>
</fileSet>
</fileSets>
+ <files>
+ <file>
+ <source>target/${project.name}-${project.version}.jar</source>
+ <outputDirectory>deploy</outputDirectory>
+ </file>
+ </files>
</assembly>
Modified:
incubator/accumulo/branches/1.4/src/wikisearch/query/src/main/java/org/apache/accumulo/wikisearch/query/Query.java
URL:
http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/wikisearch/query/src/main/java/org/apache/accumulo/wikisearch/query/Query.java?rev=1229694&r1=1229693&r2=1229694&view=diff
==============================================================================
---
incubator/accumulo/branches/1.4/src/wikisearch/query/src/main/java/org/apache/accumulo/wikisearch/query/Query.java
(original)
+++
incubator/accumulo/branches/1.4/src/wikisearch/query/src/main/java/org/apache/accumulo/wikisearch/query/Query.java
Tue Jan 10 19:18:46 2012
@@ -78,7 +78,7 @@ public class Query implements IQuery {
@Resource(name = "threads")
private int threads;
- private static final String XSL = "/accumulo-sample/style.xsl";
+ private static final String XSL = "/accumulo-wikisearch/style.xsl";
@PostConstruct
public void init() {
