HQLPARSER-9 Renaming "jpql" to "hql"

Author: gunnarmorling

build-tools/pom.xml

@@ -26,13 +26,13 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.hibernate.jpql</groupId>
-        <artifactId>hibernate-jpql-parent</artifactId>
+        <groupId>org.hibernate.hql</groupId>
+        <artifactId>hibernate-hql-parent</artifactId>
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
-    <artifactId>hibernate-jpql-build-tools</artifactId>
+    <artifactId>hibernate-hql-build-tools</artifactId>
     <packaging>jar</packaging>
 
     <name>Hibernate HQL/JP-QL Build Configuration</name>

build-tools/src/main/resources/build-config/checkstyle.xml

@@ -39,7 +39,9 @@
             <property name="ignoreComments" value="true" />
         </module>
 
-        <module name="UnusedImports" />
+        <module name="UnusedImports">
+            <property name="processJavadoc" value="true"/>
+        </module>
         <module name="AvoidStarImport" />
         <module name="RedundantImport" />
         <module name="EqualsHashCode" />

lucene/pom.xml

@@ -26,13 +26,13 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.hibernate.jpql</groupId>
-        <artifactId>hibernate-jpql-parent</artifactId>
+        <groupId>org.hibernate.hql</groupId>
+        <artifactId>hibernate-hql-parent</artifactId>
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
-    <artifactId>hibernate-jpql-lucene</artifactId>
+    <artifactId>hibernate-hql-lucene</artifactId>
     <packaging>jar</packaging>
 
     <name>Hibernate HQL/JP-QL Walker for Lucene</name>
@@ -41,8 +41,8 @@
 
         <!-- Compile -->
         <dependency>
-            <groupId>org.hibernate.jpql</groupId>
-            <artifactId>hibernate-jpql-parser</artifactId>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>hibernate-hql-parser</artifactId>
         </dependency>
         <dependency>
             <groupId>org.jboss.logging</groupId>

lucene/src/main/java/org/hibernate/query/lucene/LuceneQueryParserDelegate.java renamed to lucene/src/main/java/org/hibernate/hql/lucene/LuceneQueryParserDelegate.java

@@ -18,20 +18,20 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.hibernate.query.lucene;
+package org.hibernate.hql.lucene;
 
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
 import org.antlr.runtime.tree.Tree;
-import org.hibernate.query.ast.common.JoinType;
-import org.hibernate.query.ast.origin.hql.resolve.path.PathedPropertyReference;
-import org.hibernate.query.ast.origin.hql.resolve.path.PathedPropertyReferenceSource;
-import org.hibernate.query.ast.spi.EntityNamesResolver;
-import org.hibernate.query.ast.spi.QueryParserDelegate;
-import org.hibernate.query.lucene.internal.builder.LuceneQueryBuilder;
-import org.hibernate.query.lucene.internal.builder.PropertyHelper;
+import org.hibernate.hql.ast.common.JoinType;
+import org.hibernate.hql.ast.origin.hql.resolve.path.PathedPropertyReference;
+import org.hibernate.hql.ast.origin.hql.resolve.path.PathedPropertyReferenceSource;
+import org.hibernate.hql.ast.spi.EntityNamesResolver;
+import org.hibernate.hql.ast.spi.QueryParserDelegate;
+import org.hibernate.hql.lucene.internal.builder.LuceneQueryBuilder;
+import org.hibernate.hql.lucene.internal.builder.PropertyHelper;
 import org.hibernate.search.spi.SearchFactoryIntegrator;
 
 /**

lucene/src/main/java/org/hibernate/query/lucene/LuceneQueryParsingResult.java renamed to lucene/src/main/java/org/hibernate/hql/lucene/LuceneQueryParsingResult.java

@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.hibernate.query.lucene;
+package org.hibernate.hql.lucene;
 
 import org.apache.lucene.search.Query;
 

lucene/src/main/java/org/hibernate/query/lucene/internal/builder/LuceneQueryBuilder.java renamed to lucene/src/main/java/org/hibernate/hql/lucene/internal/builder/LuceneQueryBuilder.java

@@ -18,21 +18,21 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.hibernate.query.lucene.internal.builder;
+package org.hibernate.hql.lucene.internal.builder;
 
 import java.util.Stack;
 
 import org.apache.lucene.search.Query;
-import org.hibernate.query.lucene.internal.builder.predicate.ConjunctionPredicate;
-import org.hibernate.query.lucene.internal.builder.predicate.DisjunctionPredicate;
-import org.hibernate.query.lucene.internal.builder.predicate.EqualsPredicate;
-import org.hibernate.query.lucene.internal.builder.predicate.NegationPredicate;
-import org.hibernate.query.lucene.internal.builder.predicate.ParentPredicate;
-import org.hibernate.query.lucene.internal.builder.predicate.Predicate;
-import org.hibernate.query.lucene.internal.builder.predicate.RangePredicate;
-import org.hibernate.query.lucene.internal.builder.predicate.RootPredicate;
-import org.hibernate.query.lucene.internal.logging.Log;
-import org.hibernate.query.lucene.internal.logging.LoggerFactory;
+import org.hibernate.hql.lucene.internal.builder.predicate.ConjunctionPredicate;
+import org.hibernate.hql.lucene.internal.builder.predicate.DisjunctionPredicate;
+import org.hibernate.hql.lucene.internal.builder.predicate.EqualsPredicate;
+import org.hibernate.hql.lucene.internal.builder.predicate.NegationPredicate;
+import org.hibernate.hql.lucene.internal.builder.predicate.ParentPredicate;
+import org.hibernate.hql.lucene.internal.builder.predicate.Predicate;
+import org.hibernate.hql.lucene.internal.builder.predicate.RangePredicate;
+import org.hibernate.hql.lucene.internal.builder.predicate.RootPredicate;
+import org.hibernate.hql.lucene.internal.logging.Log;
+import org.hibernate.hql.lucene.internal.logging.LoggerFactory;
 import org.hibernate.search.query.dsl.QueryBuilder;
 import org.hibernate.search.query.dsl.QueryContextBuilder;
 

lucene/src/main/java/org/hibernate/query/lucene/internal/builder/PropertyHelper.java renamed to lucene/src/main/java/org/hibernate/hql/lucene/internal/builder/PropertyHelper.java

@@ -18,13 +18,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.hibernate.query.lucene.internal.builder;
+package org.hibernate.hql.lucene.internal.builder;
 
 import java.util.EnumSet;
 
 import org.apache.lucene.document.Field;
-import org.hibernate.query.lucene.internal.logging.Log;
-import org.hibernate.query.lucene.internal.logging.LoggerFactory;
+import org.hibernate.hql.lucene.internal.logging.Log;
+import org.hibernate.hql.lucene.internal.logging.LoggerFactory;
 import org.hibernate.search.bridge.FieldBridge;
 import org.hibernate.search.bridge.builtin.DoubleNumericFieldBridge;
 import org.hibernate.search.bridge.builtin.FloatNumericFieldBridge;

lucene/src/main/java/org/hibernate/query/lucene/internal/builder/predicate/AbstractPredicate.java renamed to lucene/src/main/java/org/hibernate/hql/lucene/internal/builder/predicate/AbstractPredicate.java

@@ -18,10 +18,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.hibernate.query.lucene.internal.builder.predicate;
+package org.hibernate.hql.lucene.internal.builder.predicate;
 
-import org.hibernate.query.lucene.internal.logging.Log;
-import org.hibernate.query.lucene.internal.logging.LoggerFactory;
+import org.hibernate.hql.lucene.internal.logging.Log;
+import org.hibernate.hql.lucene.internal.logging.LoggerFactory;
 
 /**
  * Base class for predicate implementations.

lucene/src/main/java/org/hibernate/query/lucene/internal/builder/predicate/ConjunctionPredicate.java renamed to lucene/src/main/java/org/hibernate/hql/lucene/internal/builder/predicate/ConjunctionPredicate.java

@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.hibernate.query.lucene.internal.builder.predicate;
+package org.hibernate.hql.lucene.internal.builder.predicate;
 
 import java.util.ArrayList;
 import java.util.List;

lucene/src/main/java/org/hibernate/query/lucene/internal/builder/predicate/DisjunctionPredicate.java renamed to lucene/src/main/java/org/hibernate/hql/lucene/internal/builder/predicate/DisjunctionPredicate.java

@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-package org.hibernate.query.lucene.internal.builder.predicate;
+package org.hibernate.hql.lucene.internal.builder.predicate;
 
 import java.util.ArrayList;
 import java.util.List;