Mailing-List: contact accumulo-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: accumulo-dev@incubator.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1213365 - in /incubator/accumulo/trunk: ./
 contrib/accumulo_sample/query/src/main/java/iterator/
 contrib/accumulo_sample/query/src/main/java/logic/
 contrib/accumulo_sample/query/src/main/java/sample/query/
Date: Mon, 12 Dec 2011 18:58:24 -0000
To: accumulo-commits@incubator.apache.org
From: ecn@apache.org
Message-Id: <20111212185824.D974F238899C@eris.apache.org>

Author: ecn
Date: Mon Dec 12 18:58:24 2011
New Revision: 1213365

URL: http://svn.apache.org/viewvc?rev=1213365&view=rev
Log:
ACCUMULO-208: bring up-to-date with accumulo interface changes

Modified:
    incubator/accumulo/trunk/   (props changed)
    incubator/accumulo/trunk/contrib/accumulo_sample/query/src/main/java/iterator/BooleanLogicTreeNode.java
    incubator/accumulo/trunk/contrib/accumulo_sample/query/src/main/java/logic/AbstractQueryLogic.java
    incubator/accumulo/trunk/contrib/accumulo_sample/query/src/main/java/sample/query/Query.java

Propchange: incubator/accumulo/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 12 18:58:24 2011
@@ -1,2 +1,2 @@
-/incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210571,1210596,1210598
-/incubator/accumulo/branches/1.4:1201902-1212534
+/incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598
+/incubator/accumulo/branches/1.4:1201902-1212534,1213231,1213235

Modified: incubator/accumulo/trunk/contrib/accumulo_sample/query/src/main/java/iterator/BooleanLogicTreeNode.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/contrib/accumulo_sample/query/src/main/java/iterator/BooleanLogicTreeNode.java?rev=1213365&r1=1213364&r2=1213365&view=diff
==============================================================================
--- incubator/accumulo/trunk/contrib/accumulo_sample/query/src/main/java/iterator/BooleanLogicTreeNode.java (original)
+++ incubator/accumulo/trunk/contrib/accumulo_sample/query/src/main/java/iterator/BooleanLogicTreeNode.java Mon Dec 12 18:58:24 2011
@@ -25,15 +25,15 @@ import java.util.Iterator;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.TreeNode;
 
+import org.apache.accumulo.core.data.ByteSequence;
+import org.apache.accumulo.core.data.Key;
+import org.apache.accumulo.core.data.Range;
+import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 import org.apache.commons.jexl2.parser.ParserTreeConstants;
 import org.apache.hadoop.io.Text;
 import org.apache.log4j.Logger;
 
 import parser.JexlOperatorConstants;
-import org.apache.accumulo.core.data.ByteSequence;
-import org.apache.accumulo.core.data.Key;
-import org.apache.accumulo.core.data.Range;
-import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 
 /**
  *

Modified: incubator/accumulo/trunk/contrib/accumulo_sample/query/src/main/java/logic/AbstractQueryLogic.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/contrib/accumulo_sample/query/src/main/java/logic/AbstractQueryLogic.java?rev=1213365&r1=1213364&r2=1213365&view=diff
==============================================================================
--- incubator/accumulo/trunk/contrib/accumulo_sample/query/src/main/java/logic/AbstractQueryLogic.java (original)
+++ incubator/accumulo/trunk/contrib/accumulo_sample/query/src/main/java/logic/AbstractQueryLogic.java Mon Dec 12 18:58:24 2011
@@ -58,6 +58,7 @@ import parser.EventFields;
 import parser.EventFields.FieldValue;
 import parser.FieldIndexQueryReWriter;
 import parser.JexlOperatorConstants;
+import parser.JexlOperatorConstants;
 import parser.QueryParser;
 import parser.QueryParser.QueryTerm;
 import parser.RangeCalculator;

Modified: incubator/accumulo/trunk/contrib/accumulo_sample/query/src/main/java/sample/query/Query.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/contrib/accumulo_sample/query/src/main/java/sample/query/Query.java?rev=1213365&r1=1213364&r2=1213365&view=diff
==============================================================================
--- incubator/accumulo/trunk/contrib/accumulo_sample/query/src/main/java/sample/query/Query.java (original)
+++ incubator/accumulo/trunk/contrib/accumulo_sample/query/src/main/java/sample/query/Query.java Mon Dec 12 18:58:24 2011
@@ -43,12 +43,12 @@ import javax.xml.transform.stream.Stream
 import logic.ContentLogic;
 import logic.QueryLogic;
 
-import org.apache.log4j.Logger;
-
-import sample.Results;
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.Instance;
 import org.apache.accumulo.core.client.ZooKeeperInstance;
+import org.apache.log4j.Logger;
+
+import sample.Results;
 
 @Stateless
 @Local(IQuery.class)
@@ -78,7 +78,7 @@ public class Query implements IQuery {
   @Resource(name = "threads")
   private int threads;
   
-  private static final String XSL = "http://localhost:8080/accumulo-sample/style.xsl";
+  private static final String XSL = "/accumulo-sample/style.xsl";
   
   @PostConstruct
   public void init() {
@@ -99,7 +99,7 @@ public class Query implements IQuery {
     log.info("HTML query: " + query);
     URL u;
     try {
-      u = new URL(XSL);
+      u = new URL("http://" + System.getProperty("jboss.bind.address") + ":" + System.getProperty("jboss.web.http.port") + XSL);
     } catch (MalformedURLException e1) {
       throw new EJBException("Unable to load XSL stylesheet", e1);
     }