You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/03/05 21:26:29 UTC

[3/5] git commit: re-enable ANTLR plugin.

re-enable ANTLR plugin.


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/5cae5cfa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/5cae5cfa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/5cae5cfa

Branch: refs/heads/two-dot-o
Commit: 5cae5cfa2acbf202be157cd20e25e7e58ed45edc
Parents: 5dbfdf3
Author: Dave Johnson <dm...@apigee.com>
Authored: Wed Mar 5 15:07:46 2014 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Wed Mar 5 15:07:46 2014 -0500

----------------------------------------------------------------------
 stack/corepersistence/queryindex/pom.xml        | 17 ++++-
 .../persistence/query/tree/QueryFilter.g        |  4 +-
 .../persistence/query/QueryParseException.java  | 65 --------------------
 .../persistence/query/QueryTokenException.java  | 54 ----------------
 4 files changed, 18 insertions(+), 122 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5cae5cfa/stack/corepersistence/queryindex/pom.xml
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/pom.xml b/stack/corepersistence/queryindex/pom.xml
index 28d236f..9b9e67a 100644
--- a/stack/corepersistence/queryindex/pom.xml
+++ b/stack/corepersistence/queryindex/pom.xml
@@ -30,6 +30,21 @@
         <plugins>
 
             <plugin>
+                <groupId>org.antlr</groupId>
+                <artifactId>antlr3-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <configuration>
+                            <outputDirectory>src/main/java</outputDirectory>
+                        </configuration>
+                        <goals>
+                            <goal>antlr</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
                 <groupId>org.safehaus.chop</groupId>
                 <artifactId>chop-maven-plugin</artifactId>
                 <version>${chop.version}</version>
@@ -98,7 +113,7 @@
 
         <!-- Cassandra wants ANTLR 3.2 -->
 
-       <dependency>
+        <dependency>
             <groupId>org.antlr</groupId>
             <artifactId>antlr-runtime</artifactId>
             <version>3.2</version>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5cae5cfa/stack/corepersistence/queryindex/src/main/antlr3/org/apache/usergrid/persistence/query/tree/QueryFilter.g
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/antlr3/org/apache/usergrid/persistence/query/tree/QueryFilter.g b/stack/corepersistence/queryindex/src/main/antlr3/org/apache/usergrid/persistence/query/tree/QueryFilter.g
index c566ef9..d39069b 100644
--- a/stack/corepersistence/queryindex/src/main/antlr3/org/apache/usergrid/persistence/query/tree/QueryFilter.g
+++ b/stack/corepersistence/queryindex/src/main/antlr3/org/apache/usergrid/persistence/query/tree/QueryFilter.g
@@ -14,8 +14,8 @@ package org.apache.usergrid.persistence.query.tree;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.usergrid.persistence.Query;
-import org.apache.usergrid.persistence.Query.SortPredicate;
+import org.apache.usergrid.persistence.query.Query;
+import org.apache.usergrid.persistence.query.Query.SortPredicate;
 
 }
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5cae5cfa/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/query/QueryParseException.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/query/QueryParseException.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/query/QueryParseException.java
deleted file mode 100644
index 0afe799..0000000
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/query/QueryParseException.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  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.  For additional information regarding
- * copyright in this work, please see the NOTICE file in the top level
- * directory of this distribution.
- */
-package org.apache.usergrid.persistence.query;
-
-
-/**
- * An exception thrown when a query cannot be parsed
- *
- * @author tnine
- */
-public class QueryParseException extends RuntimeException {
-
-    /**
-     *
-     */
-    private static final long serialVersionUID = 1L;
-
-
-    /**
-     *
-     */
-    public QueryParseException() {
-        super();
-    }
-
-
-    /**
-     * @param arg0
-     * @param arg1
-     */
-    public QueryParseException( String arg0, Throwable arg1 ) {
-        super( arg0, arg1 );
-    }
-
-
-    /**
-     * @param arg0
-     */
-    public QueryParseException( String arg0 ) {
-        super( arg0 );
-    }
-
-
-    /**
-     * @param arg0
-     */
-    public QueryParseException( Throwable arg0 ) {
-        super( arg0 );
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5cae5cfa/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/query/QueryTokenException.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/query/QueryTokenException.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/query/QueryTokenException.java
deleted file mode 100644
index 3b751da..0000000
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/query/QueryTokenException.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  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.  For additional information regarding
- * copyright in this work, please see the NOTICE file in the top level
- * directory of this distribution.
- */
-package org.apache.usergrid.persistence.query;
-
-
-/**
- * An exception thrown when a query encounters a token it doesn't recognize
- * @author tnine
- */
-public class QueryTokenException extends RuntimeException {
-
-    /**
-     *
-     */
-    private static final long serialVersionUID = 1L;
-
-
-
-
-    /**
-     * @param arg0
-     */
-    public QueryTokenException( Throwable arg0 ) {
-        super( arg0 );
-    }
-
-
-    @Override
-    public String getMessage() {
-        //antlr errors or strange.  We have to do this, there's no message
-        return getCause().toString();
-    }
-
-
-    @Override
-    public String getLocalizedMessage() {
-        return getMessage();
-    }
-}