accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mmil...@apache.org
Subject [1/3] accumulo-wikisearch git commit: Fixes to query for 1.8 Update
Date Fri, 17 Feb 2017 18:30:34 GMT
Repository: accumulo-wikisearch
Updated Branches:
  refs/heads/master 074fa7729 -> e51ad6a2f


Fixes to query for 1.8 Update


Project: http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/commit/eb573a51
Tree: http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/tree/eb573a51
Diff: http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/diff/eb573a51

Branch: refs/heads/master
Commit: eb573a5188c10fc82ddf911f4a0ab892860335d1
Parents: 074fa77
Author: Mike Miller <mmiller@apache.org>
Authored: Wed Jan 4 14:19:33 2017 -0500
Committer: Mike Miller <mmiller@apache.org>
Committed: Thu Feb 16 10:53:38 2017 -0500

----------------------------------------------------------------------
 .gitignore                                      |   3 +-
 INSTALL.md                                      |  14 +-
 pom.xml                                         |   3 +-
 query-war/src/main/webapp/WEB-INF/web.xml       |  10 --
 query-war/src/main/webapp/ui.html               | 131 +++++++++++++++++++
 query-war/src/main/webapp/ui.jsp                | 131 -------------------
 query/pom.xml                                   |  29 +++-
 .../iterator/DefaultIteratorEnvironment.java    |  57 ++------
 .../src/main/resources/META-INF/ejb-jar.xml.uno |  62 +++++++++
 9 files changed, 242 insertions(+), 198 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/blob/eb573a51/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 8a09ac0..9a97fb5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,5 @@
 .project
 .settings/
 .classpath
-
+wikipedia.xml
+ejb-jar.xml

http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/blob/eb573a51/INSTALL.md
----------------------------------------------------------------------
diff --git a/INSTALL.md b/INSTALL.md
index 9a85105..f7cc175 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -49,9 +49,12 @@ Instructions for installing and running the Accumulo Wikisearch example.
  
 ### Prerequisites
 
-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] 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.
+1. The query software was tested using JBoss AS 6. Install the JBoss distro and follow the
instructions below
+   to build the EJB jar and WAR file required.
+  * To stop the JBoss warnings about WSDescriptorDeployer and JMSDescriptorDeployer, these
deployers can be
+    removed from `$JBOSS_HOME/server/default/deployers/jbossws.deployer/META-INF/stack-agnostic-jboss-beans.xml`
+1. Ensure that you have successfully run `mvn clean install` at the Wikisearch top level
to install the jars
+   into your local maven repo before building the query package.
 	
 ### Instructions
 
@@ -85,7 +88,7 @@ Instructions for installing and running the Accumulo Wikisearch example.
 
 1. At this point you should be able to open a browser and view the page:
 
-        http://localhost:8080/accumulo-wikisearch/ui/ui.jsp
+        http://localhost:8080/accumulo-wikisearch/ui.html
 
   You can issue the queries using this user interface or via the following REST urls:
 
@@ -98,6 +101,9 @@ Instructions for installing and running the Accumulo Wikisearch example.
 	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) 
 	
+  - NOTE: Ran into a [bug] 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.
+
 [ejb-jar.xml.example]: query/src/main/resources/META-INF/ejb-jar.xml.example
 [dump-files]: http://dumps.wikimedia.org/backup-index.html
 [wikipedia.xml.example]: ingest/conf/wikipedia.xml.example

http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/blob/eb573a51/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index bebc1cf..08e9dbb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,6 +45,7 @@
     <version.ejb-spec-api>1.0.1.Final</version.ejb-spec-api>
     <version.guava>11.0.2</version.guava>
     <version.hadoop>2.6.4</version.hadoop>
+    <version.htrace>3.1.0-incubating</version.htrace>
     <version.jaxrs>2.1.0.GA</version.jaxrs>
     <version.junit>4.11</version.junit>
     <version.kryo>1.04</version.kryo>
@@ -67,7 +68,7 @@
    </dependency>
      <dependency>
       <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-client</artifactId>
+      <artifactId>hadoop-common</artifactId>
       <version>${version.hadoop}</version>
     </dependency>
     <dependency>

http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/blob/eb573a51/query-war/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/query-war/src/main/webapp/WEB-INF/web.xml b/query-war/src/main/webapp/WEB-INF/web.xml
index a4ff03a..ffde45a 100644
--- a/query-war/src/main/webapp/WEB-INF/web.xml
+++ b/query-war/src/main/webapp/WEB-INF/web.xml
@@ -44,14 +44,4 @@
     <param-value>/rest</param-value>
   </context-param>
 
-  <servlet>
-    <servlet-name>UserInterface</servlet-name>
-    <jsp-file>/ui.jsp</jsp-file>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>UserInterface</servlet-name>
-    <url-pattern>/ui/*</url-pattern>
-  </servlet-mapping>
-
 </web-app>

http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/blob/eb573a51/query-war/src/main/webapp/ui.html
----------------------------------------------------------------------
diff --git a/query-war/src/main/webapp/ui.html b/query-war/src/main/webapp/ui.html
new file mode 100644
index 0000000..6719e10
--- /dev/null
+++ b/query-war/src/main/webapp/ui.html
@@ -0,0 +1,131 @@
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<%@page contentType="text/html" pageEncoding="UTF-8"%>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+   "http://www.w3.org/TR/html4/loose.dtd">
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <title>Wiki Search Page</title>
+        <style type="text/css">
+        	#comments {
+				width: 90%;
+				margin: auto;
+        	}
+        	h1 {
+        		text-align: center;
+        	}
+			#d {
+				width: 80%;
+				margin: auto;
+			}
+			.center_box {
+				width: 70%;
+				margin: auto;
+			}
+			.center_input {
+				width: 30%;
+				margin: auto;
+			}
+        </style>
+    </head>
+    <body>
+    	<div id="comments">
+    		<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>
+    		<p> Fields available for searching:
+    		<ol>
+    			<li>TEXT</li>
+    			<li>ID</li>
+    			<li>TITLE</li>
+    			<li>TIMESTAMP</li>
+    			<li>COMMENTS</li>
+    		</ol>
+    		<p>The search syntax is boolean logic, for example: TEXT == 'boy' and TITLE =~
'Autism'. The supported operators are:
+    		==, !=, &lt;, &gt;, &le;, &ge;, =~, and !~. Likewise grouping can be
performed using parentheses and predicates can be
+    		joined using and, or, and not.
+    		<p>To highlight the cell-level access control of Apache Accumulo, the "authorization"
required for a particular cell is the language 
+    		of the associated wikipedia article.
+    	</div>
+    	<div id="d">
+	    	<form id="FORM" name="queryForm" method="get" target="results" onsubmit="return
setAction()">
+	    		<br />
+	    		<br />
+	    		<div class="center_box">
+	    		<label>Query: </label>
+	    		<input id="QUERY" type="text" name="query" size="100" maxlength="300"/>
+	    		</div>
+	    		<br />
+	    		<div class="center_input">
+	    		<label>Authorizations: </label>
+	    		<br />
+	    		<label>All</label><input type="checkbox" name="auths" value="all" />
+				</div>
+	    		<div class="center_input">
+				<label>Arabic</label> <input type="checkbox" name="auths" value="arwiki"
/>
+				<label>Brazilian</label> <input type="checkbox" name="auths" value="brwiki"
/>
+				<label>Chinese</label> <input type="checkbox" name="auths" value="zhwiki"
/>
+				</div>
+				<div class="center_input">
+				<label>Dutch</label> <input type="checkbox" name="auths" value="nlwiki"
/>
+	    		<label>English</label> <input type="checkbox" name="auths" value="enwiki"
/>
+				<label>Farsi</label> <input type="checkbox" name="auths" value="fawiki"
/>
+				</div>
+	    		<div class="center_input">				
+				<label>French</label> <input type="checkbox" name="auths" value="frwiki"
/>
+				<label>German</label> <input type="checkbox" name="auths" value="dewiki"
/>
+				<label>Greek</label> <input type="checkbox" name="auths" value="elwiki"
/>
+				</div>
+	    		<div class="center_input">				
+				<label>Italian</label> <input type="checkbox" name="auths" value="itwiki"
/>
+				<label>Spanish</label> <input type="checkbox" name="auths" value="eswiki"
/>
+				<label>Russia</label>n <input type="checkbox" name="auths" value="ruwiki"
/><br />
+				</div>
+	    		<div class="center_input">				
+				<input type="submit" name="Submit Query" />
+				</div>
+	    	</form>
+	   		<br />
+	   		<br />
+	    	<iframe name="results" width="90%" height="400" scrolling="yes" >
+	    	</iframe>
+    	</div>
+    	<script type="text/javascript">
+    		function setAction() {
+	    		var f = document.forms[0];
+	    		var authString = "";
+	    		var sep = "";
+	    		for (var i=0; i<f.auths.length; i++) {
+	    			if (f.auths[i].checked) {
+	    				authString = authString + sep + f.auths[i].value;
+	    				sep = ",";
+	    			}
+	    		}
+	    		//Build the new query
+				var existingAction = "/accumulo-wikisearch/rest/Query/html";
+	    		var query = f.query.value;
+	    		
+	    		var newAction = existingAction + "?query=" + query + "&auths=" + authString;
+	    		document.forms[0].action = newAction;
+    		}
+    	</script>    	
+    </body>
+</html>

http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/blob/eb573a51/query-war/src/main/webapp/ui.jsp
----------------------------------------------------------------------
diff --git a/query-war/src/main/webapp/ui.jsp b/query-war/src/main/webapp/ui.jsp
deleted file mode 100644
index 6719e10..0000000
--- a/query-war/src/main/webapp/ui.jsp
+++ /dev/null
@@ -1,131 +0,0 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<%@page contentType="text/html" pageEncoding="UTF-8"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-   "http://www.w3.org/TR/html4/loose.dtd">
-
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <title>Wiki Search Page</title>
-        <style type="text/css">
-        	#comments {
-				width: 90%;
-				margin: auto;
-        	}
-        	h1 {
-        		text-align: center;
-        	}
-			#d {
-				width: 80%;
-				margin: auto;
-			}
-			.center_box {
-				width: 70%;
-				margin: auto;
-			}
-			.center_input {
-				width: 30%;
-				margin: auto;
-			}
-        </style>
-    </head>
-    <body>
-    	<div id="comments">
-    		<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>
-    		<p> Fields available for searching:
-    		<ol>
-    			<li>TEXT</li>
-    			<li>ID</li>
-    			<li>TITLE</li>
-    			<li>TIMESTAMP</li>
-    			<li>COMMENTS</li>
-    		</ol>
-    		<p>The search syntax is boolean logic, for example: TEXT == 'boy' and TITLE =~
'Autism'. The supported operators are:
-    		==, !=, &lt;, &gt;, &le;, &ge;, =~, and !~. Likewise grouping can be
performed using parentheses and predicates can be
-    		joined using and, or, and not.
-    		<p>To highlight the cell-level access control of Apache Accumulo, the "authorization"
required for a particular cell is the language 
-    		of the associated wikipedia article.
-    	</div>
-    	<div id="d">
-	    	<form id="FORM" name="queryForm" method="get" target="results" onsubmit="return
setAction()">
-	    		<br />
-	    		<br />
-	    		<div class="center_box">
-	    		<label>Query: </label>
-	    		<input id="QUERY" type="text" name="query" size="100" maxlength="300"/>
-	    		</div>
-	    		<br />
-	    		<div class="center_input">
-	    		<label>Authorizations: </label>
-	    		<br />
-	    		<label>All</label><input type="checkbox" name="auths" value="all" />
-				</div>
-	    		<div class="center_input">
-				<label>Arabic</label> <input type="checkbox" name="auths" value="arwiki"
/>
-				<label>Brazilian</label> <input type="checkbox" name="auths" value="brwiki"
/>
-				<label>Chinese</label> <input type="checkbox" name="auths" value="zhwiki"
/>
-				</div>
-				<div class="center_input">
-				<label>Dutch</label> <input type="checkbox" name="auths" value="nlwiki"
/>
-	    		<label>English</label> <input type="checkbox" name="auths" value="enwiki"
/>
-				<label>Farsi</label> <input type="checkbox" name="auths" value="fawiki"
/>
-				</div>
-	    		<div class="center_input">				
-				<label>French</label> <input type="checkbox" name="auths" value="frwiki"
/>
-				<label>German</label> <input type="checkbox" name="auths" value="dewiki"
/>
-				<label>Greek</label> <input type="checkbox" name="auths" value="elwiki"
/>
-				</div>
-	    		<div class="center_input">				
-				<label>Italian</label> <input type="checkbox" name="auths" value="itwiki"
/>
-				<label>Spanish</label> <input type="checkbox" name="auths" value="eswiki"
/>
-				<label>Russia</label>n <input type="checkbox" name="auths" value="ruwiki"
/><br />
-				</div>
-	    		<div class="center_input">				
-				<input type="submit" name="Submit Query" />
-				</div>
-	    	</form>
-	   		<br />
-	   		<br />
-	    	<iframe name="results" width="90%" height="400" scrolling="yes" >
-	    	</iframe>
-    	</div>
-    	<script type="text/javascript">
-    		function setAction() {
-	    		var f = document.forms[0];
-	    		var authString = "";
-	    		var sep = "";
-	    		for (var i=0; i<f.auths.length; i++) {
-	    			if (f.auths[i].checked) {
-	    				authString = authString + sep + f.auths[i].value;
-	    				sep = ",";
-	    			}
-	    		}
-	    		//Build the new query
-				var existingAction = "/accumulo-wikisearch/rest/Query/html";
-	    		var query = f.query.value;
-	    		
-	    		var newAction = existingAction + "?query=" + query + "&auths=" + authString;
-	    		document.forms[0].action = newAction;
-    		}
-    	</script>    	
-    </body>
-</html>

http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/blob/eb573a51/query/pom.xml
----------------------------------------------------------------------
diff --git a/query/pom.xml b/query/pom.xml
index eeb2337..76494eb 100644
--- a/query/pom.xml
+++ b/query/pom.xml
@@ -74,7 +74,17 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-client</artifactId>
+      <artifactId>hadoop-common</artifactId>
+         <exclusions>
+            <exclusion>
+                <groupId>com.sun.jersey</groupId>
+                <artifactId>jersey-json</artifactId>
+            </exclusion>
+            <exclusion>
+                <groupId>javax.servlet</groupId>
+                <artifactId>servlet-api</artifactId>
+            </exclusion>
+        </exclusions>
     </dependency>
     <dependency>
       <groupId>javaee</groupId>
@@ -104,9 +114,21 @@
       <scope>runtime</scope>
     </dependency>
     <dependency>
+      <groupId>org.apache.htrace</groupId>
+      <artifactId>htrace-core</artifactId>
+      <version>${version.htrace}</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
       <groupId>org.apache.thrift</groupId>
       <artifactId>libthrift</artifactId>
       <scope>runtime</scope>
+         <exclusions>
+            <exclusion>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpclient</artifactId>
+            </exclusion>
+        </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.zookeeper</groupId>
@@ -134,8 +156,7 @@
             <configuration>
               <outputDirectory>lib</outputDirectory>
               <!-- just grab the non-provided runtime dependencies -->
-              <!-- XXX we include guava at the same version as hadoop 2 provides so that
we have it on hadoop 1 -->
-              <includeArtifactIds>commons-io,commons-configuration,commons-lang,commons-codec,protobuf-java,libthrift,zookeeper,hadoop-client,commons-jexl,guava,kryo,asm,minlog,reflectasm,wikisearch-ingest,accumulo-core,accumulo-fate,accumulo-trace</includeArtifactIds>
+              <includeArtifactIds>commons-io,commons-configuration,commons-lang,commons-codec,protobuf-java,libthrift,zookeeper,hadoop-common,commons-jexl,guava,kryo,asm,minlog,reflectasm,wikisearch-ingest,accumulo-core,accumulo-fate,accumulo-trace,htrace-core</includeArtifactIds>
               <excludeTransitive>true</excludeTransitive>
             </configuration>
           </execution>
@@ -144,7 +165,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.4.</version>
+        <version>2.4</version>
         <configuration>
           <descriptors>
             <descriptor>src/assembly/dist.xml</descriptor>

http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/blob/eb573a51/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/DefaultIteratorEnvironment.java
----------------------------------------------------------------------
diff --git a/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/DefaultIteratorEnvironment.java
b/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/DefaultIteratorEnvironment.java
index f05304a..d37751e 100644
--- a/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/DefaultIteratorEnvironment.java
+++ b/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/DefaultIteratorEnvironment.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
@@ -18,30 +18,24 @@ package org.apache.accumulo.examples.wikisearch.iterator;
 
 import java.io.IOException;
 
-import org.apache.accumulo.core.client.sample.SamplerConfiguration;
+import org.apache.accumulo.core.client.impl.BaseIteratorEnvironment;
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Value;
-import org.apache.accumulo.core.iterators.IteratorEnvironment;
-import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
 import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 import org.apache.accumulo.core.iterators.system.MapFileIterator;
-import org.apache.accumulo.core.security.Authorizations;
 import org.apache.accumulo.core.util.CachedConfiguration;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 
-/**
- * 
- */
-public class DefaultIteratorEnvironment implements IteratorEnvironment {
-  
+public class DefaultIteratorEnvironment extends BaseIteratorEnvironment {
+
   AccumuloConfiguration conf;
-  
+
   public DefaultIteratorEnvironment(AccumuloConfiguration conf) {
     this.conf = conf;
   }
-  
+
   public DefaultIteratorEnvironment() {
     this.conf = AccumuloConfiguration.getDefaultConfiguration();
   }
@@ -52,45 +46,14 @@ public class DefaultIteratorEnvironment implements IteratorEnvironment
{
     FileSystem fs = FileSystem.get(conf);
     return new MapFileIterator(this.conf, fs, mapFileName, conf);
   }
-  
+
   @Override
   public AccumuloConfiguration getConfig() {
     return conf;
   }
-  
-  @Override
-  public IteratorScope getIteratorScope() {
-    throw new UnsupportedOperationException();
-  }
-  
-  @Override
-  public boolean isFullMajorCompaction() {
-    throw new UnsupportedOperationException();
-  }
-  
+
   @Override
-  public void registerSideChannel(SortedKeyValueIterator<Key,Value> iter) {
-    throw new UnsupportedOperationException();
+  public boolean isSamplingEnabled() {
+    return false;
   }
-
-@Override
-public Authorizations getAuthorizations() {
-	throw new UnsupportedOperationException();
-}
-
-@Override
-public IteratorEnvironment cloneWithSamplingEnabled() {
-	throw new UnsupportedOperationException();
-}
-
-@Override
-public boolean isSamplingEnabled() {
-	throw new UnsupportedOperationException();
-}
-
-@Override
-public SamplerConfiguration getSamplerConfiguration() {
-	throw new UnsupportedOperationException();
-}
-  
 }

http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/blob/eb573a51/query/src/main/resources/META-INF/ejb-jar.xml.uno
----------------------------------------------------------------------
diff --git a/query/src/main/resources/META-INF/ejb-jar.xml.uno b/query/src/main/resources/META-INF/ejb-jar.xml.uno
new file mode 100644
index 0000000..f17f296
--- /dev/null
+++ b/query/src/main/resources/META-INF/ejb-jar.xml.uno
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<ejb-jar xmlns="http://java.sun.com/xml/ns/javaee"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+          http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd" version="3.1">
+  <enterprise-beans>
+    <session>
+      <ejb-name>Query</ejb-name>
+      <env-entry>
+        <env-entry-name>instanceName</env-entry-name>
+        <env-entry-type>java.lang.String</env-entry-type>
+        <env-entry-value>uno</env-entry-value>
+      </env-entry>
+      <env-entry>
+        <env-entry-name>zooKeepers</env-entry-name>
+        <env-entry-type>java.lang.String</env-entry-type>
+        <env-entry-value>localhost:2181</env-entry-value>
+      </env-entry>
+      <env-entry>
+        <env-entry-name>username</env-entry-name>
+        <env-entry-type>java.lang.String</env-entry-type>
+        <env-entry-value>root</env-entry-value>
+      </env-entry>
+      <env-entry>
+        <env-entry-name>password</env-entry-name>
+        <env-entry-type>java.lang.String</env-entry-type>
+        <env-entry-value>secret</env-entry-value>
+      </env-entry>
+      <env-entry>
+        <env-entry-name>tableName</env-entry-name>
+        <env-entry-type>java.lang.String</env-entry-type>
+        <env-entry-value>wikipedia</env-entry-value>
+      </env-entry>
+      <env-entry>
+        <env-entry-name>partitions</env-entry-name>
+        <env-entry-type>java.lang.Integer</env-entry-type>
+        <env-entry-value>100</env-entry-value>
+      </env-entry>
+      <env-entry>
+        <env-entry-name>threads</env-entry-name>
+        <env-entry-type>java.lang.Integer</env-entry-type>
+        <env-entry-value>8</env-entry-value>
+      </env-entry>
+    </session>
+  </enterprise-beans>
+</ejb-jar>


Mime
View raw message