svn commit: r801934 [2/3] - in /lucene/java/trunk/contrib/queryparser: ./ src/java/ src/java/org/apache/lucene/queryParser/ src/java/org/apache/lucene/queryParser/core/builders/ src/java/org/apache/lucene/queryParser/core/config/ src/java/org/apache/lu...

[mi...@apache.org]

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/DateResolutionAttributeImpl.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/DateResolutionAttributeImpl.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/DateResolutionAttributeImpl.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/DateResolutionAttributeImpl.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.config;
+package org.apache.lucene.queryParser.standard.config;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,7 +20,7 @@
 import org.apache.lucene.document.DateTools;
 import org.apache.lucene.document.DateTools.Resolution;
 import org.apache.lucene.queryParser.core.config.QueryConfigHandler;
-import org.apache.lucene.queryParser.original.processors.ParametricRangeQueryNodeProcessor;
+import org.apache.lucene.queryParser.standard.processors.ParametricRangeQueryNodeProcessor;
 import org.apache.lucene.util.AttributeImpl;
 
 /**
@@ -28,7 +28,7 @@
  * and must be defined in the {@link QueryConfigHandler}. This attribute tells
  * the processor which {@link Resolution} to use when parsing the date. <br/>
  * 
- * @see org.apache.lucene.queryParser.original.config.DateResolutionAttribute
+ * @see org.apache.lucene.queryParser.standard.config.DateResolutionAttribute
  */
 public class DateResolutionAttributeImpl extends AttributeImpl 
 				implements DateResolutionAttribute {

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/DefaultOperatorAttribute.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/DefaultOperatorAttribute.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/DefaultOperatorAttribute.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/DefaultOperatorAttribute.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.config;
+package org.apache.lucene.queryParser.standard.config;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,7 +18,7 @@
  */
 
 import org.apache.lucene.queryParser.core.config.QueryConfigHandler;
-import org.apache.lucene.queryParser.original.processors.GroupQueryNodeProcessor;
+import org.apache.lucene.queryParser.standard.processors.GroupQueryNodeProcessor;
 import org.apache.lucene.util.Attribute;
 
 /**

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/DefaultOperatorAttributeImpl.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/DefaultOperatorAttributeImpl.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/DefaultOperatorAttributeImpl.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/DefaultOperatorAttributeImpl.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.config;
+package org.apache.lucene.queryParser.standard.config;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,7 +18,7 @@
  */
 
 import org.apache.lucene.queryParser.core.config.QueryConfigHandler;
-import org.apache.lucene.queryParser.original.processors.GroupQueryNodeProcessor;
+import org.apache.lucene.queryParser.standard.processors.GroupQueryNodeProcessor;
 import org.apache.lucene.util.AttributeImpl;
 
 /**
@@ -27,7 +27,7 @@
  * processor which is the default boolean operator when no operator is defined
  * between terms. <br/>
  * 
- * @see org.apache.lucene.queryParser.original.config.DefaultOperatorAttribute
+ * @see org.apache.lucene.queryParser.standard.config.DefaultOperatorAttribute
  */
 public class DefaultOperatorAttributeImpl extends AttributeImpl
 				implements DefaultOperatorAttribute {

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/DefaultPhraseSlopAttribute.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/DefaultPhraseSlopAttribute.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/DefaultPhraseSlopAttribute.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/DefaultPhraseSlopAttribute.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.config;
+package org.apache.lucene.queryParser.standard.config;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,7 +18,7 @@
  */
 
 import org.apache.lucene.queryParser.core.config.QueryConfigHandler;
-import org.apache.lucene.queryParser.original.processors.PhraseSlopQueryNodeProcessor;
+import org.apache.lucene.queryParser.standard.processors.PhraseSlopQueryNodeProcessor;
 import org.apache.lucene.util.Attribute;
 
 /**

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/DefaultPhraseSlopAttributeImpl.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/DefaultPhraseSlopAttributeImpl.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/DefaultPhraseSlopAttributeImpl.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/DefaultPhraseSlopAttributeImpl.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.config;
+package org.apache.lucene.queryParser.standard.config;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,7 +18,7 @@
  */
 
 import org.apache.lucene.queryParser.core.config.QueryConfigHandler;
-import org.apache.lucene.queryParser.original.processors.PhraseSlopQueryNodeProcessor;
+import org.apache.lucene.queryParser.standard.processors.PhraseSlopQueryNodeProcessor;
 import org.apache.lucene.util.AttributeImpl;
 
 /**
@@ -27,7 +27,7 @@
  * processor what is the default phrase slop when no slop is defined in a
  * phrase. <br/>
  * 
- * @see org.apache.lucene.queryParser.original.config.DefaultOperatorAttribute
+ * @see org.apache.lucene.queryParser.standard.config.DefaultOperatorAttribute
  */
 public class DefaultPhraseSlopAttributeImpl extends AttributeImpl 
 				implements DefaultPhraseSlopAttribute {

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldBoostMapAttribute.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldBoostMapAttribute.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldBoostMapAttribute.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldBoostMapAttribute.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.config;
+package org.apache.lucene.queryParser.standard.config;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldBoostMapAttributeImpl.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldBoostMapAttributeImpl.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldBoostMapAttributeImpl.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldBoostMapAttributeImpl.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.config;
+package org.apache.lucene.queryParser.standard.config;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -21,7 +21,7 @@
 import java.util.Map;
 
 import org.apache.lucene.queryParser.core.config.FieldConfig;
-import org.apache.lucene.queryParser.original.processors.MultiFieldQueryNodeProcessor;
+import org.apache.lucene.queryParser.standard.processors.MultiFieldQueryNodeProcessor;
 import org.apache.lucene.util.AttributeImpl;
 
 /**
@@ -31,7 +31,7 @@
  * defined to it. <br/>
  * <br/>
  * 
- * @see org.apache.lucene.queryParser.original.config.BoostAttribute
+ * @see org.apache.lucene.queryParser.standard.config.BoostAttribute
  */
 public class FieldBoostMapAttributeImpl extends AttributeImpl 
 				implements FieldBoostMapAttribute {

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldBoostMapFCListener.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldBoostMapFCListener.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldBoostMapFCListener.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldBoostMapFCListener.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.config;
+package org.apache.lucene.queryParser.standard.config;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldDateResolutionFCListener.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldDateResolutionFCListener.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldDateResolutionFCListener.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldDateResolutionFCListener.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.config;
+package org.apache.lucene.queryParser.standard.config;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldDateResolutionMapAttribute.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldDateResolutionMapAttribute.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldDateResolutionMapAttribute.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldDateResolutionMapAttribute.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.config;
+package org.apache.lucene.queryParser.standard.config;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldDateResolutionMapAttributeImpl.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldDateResolutionMapAttributeImpl.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldDateResolutionMapAttributeImpl.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FieldDateResolutionMapAttributeImpl.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.config;
+package org.apache.lucene.queryParser.standard.config;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FuzzyAttribute.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FuzzyAttribute.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FuzzyAttribute.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FuzzyAttribute.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.config;
+package org.apache.lucene.queryParser.standard.config;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,7 +18,7 @@
  */
 
 import org.apache.lucene.queryParser.core.config.QueryConfigHandler;
-import org.apache.lucene.queryParser.original.processors.PhraseSlopQueryNodeProcessor;
+import org.apache.lucene.queryParser.standard.processors.PhraseSlopQueryNodeProcessor;
 import org.apache.lucene.util.Attribute;
 
 /**

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FuzzyAttributeImpl.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FuzzyAttributeImpl.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FuzzyAttributeImpl.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/FuzzyAttributeImpl.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.config;
+package org.apache.lucene.queryParser.standard.config;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,7 +18,7 @@
  */
 
 import org.apache.lucene.queryParser.core.config.QueryConfigHandler;
-import org.apache.lucene.queryParser.original.processors.PhraseSlopQueryNodeProcessor;
+import org.apache.lucene.queryParser.standard.processors.PhraseSlopQueryNodeProcessor;
 import org.apache.lucene.search.FuzzyQuery;
 import org.apache.lucene.util.AttributeImpl;
 
@@ -28,7 +28,7 @@
  * processor what is the default phrase slop when no slop is defined in a
  * phrase. <br/>
  * 
- * @see org.apache.lucene.queryParser.original.config.FuzzyAttribute
+ * @see org.apache.lucene.queryParser.standard.config.FuzzyAttribute
  */
 public class FuzzyAttributeImpl extends AttributeImpl 
 				implements FuzzyAttribute {

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/LocaleAttribute.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/LocaleAttribute.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/LocaleAttribute.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/LocaleAttribute.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.config;
+package org.apache.lucene.queryParser.standard.config;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,7 +20,7 @@
 import java.util.Locale;
 
 import org.apache.lucene.queryParser.core.config.QueryConfigHandler;
-import org.apache.lucene.queryParser.original.processors.ParametricRangeQueryNodeProcessor;
+import org.apache.lucene.queryParser.standard.processors.ParametricRangeQueryNodeProcessor;
 import org.apache.lucene.util.Attribute;
 
 /**

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/LocaleAttributeImpl.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/LocaleAttributeImpl.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/LocaleAttributeImpl.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/LocaleAttributeImpl.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.config;
+package org.apache.lucene.queryParser.standard.config;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,7 +20,7 @@
 import java.util.Locale;
 
 import org.apache.lucene.queryParser.core.config.QueryConfigHandler;
-import org.apache.lucene.queryParser.original.processors.ParametricRangeQueryNodeProcessor;
+import org.apache.lucene.queryParser.standard.processors.ParametricRangeQueryNodeProcessor;
 import org.apache.lucene.util.AttributeImpl;
 
 /**
@@ -28,7 +28,7 @@
  * and must be defined in the {@link QueryConfigHandler}. This attribute tells
  * the processor what is the default {@link Locale} used to parse a date. <br/>
  * 
- * @see org.apache.lucene.queryParser.original.config.LocaleAttribute
+ * @see org.apache.lucene.queryParser.standard.config.LocaleAttribute
  */
 public class LocaleAttributeImpl extends AttributeImpl
 				implements LocaleAttribute {

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/LowercaseExpandedTermsAttribute.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/LowercaseExpandedTermsAttribute.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/LowercaseExpandedTermsAttribute.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/LowercaseExpandedTermsAttribute.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.config;
+package org.apache.lucene.queryParser.standard.config;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,7 +20,7 @@
 import java.util.Locale;
 
 import org.apache.lucene.queryParser.core.config.QueryConfigHandler;
-import org.apache.lucene.queryParser.original.processors.ParametricRangeQueryNodeProcessor;
+import org.apache.lucene.queryParser.standard.processors.ParametricRangeQueryNodeProcessor;
 import org.apache.lucene.util.Attribute;
 
 /**

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/LowercaseExpandedTermsAttributeImpl.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/LowercaseExpandedTermsAttributeImpl.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/LowercaseExpandedTermsAttributeImpl.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/LowercaseExpandedTermsAttributeImpl.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.config;
+package org.apache.lucene.queryParser.standard.config;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,7 +20,7 @@
 import java.util.Locale;
 
 import org.apache.lucene.queryParser.core.config.QueryConfigHandler;
-import org.apache.lucene.queryParser.original.processors.ParametricRangeQueryNodeProcessor;
+import org.apache.lucene.queryParser.standard.processors.ParametricRangeQueryNodeProcessor;
 import org.apache.lucene.util.AttributeImpl;
 
 /**
@@ -28,7 +28,7 @@
  * and must be defined in the {@link QueryConfigHandler}. This attribute tells
  * the processor what is the default {@link Locale} used to parse a date. <br/>
  * 
- * @see org.apache.lucene.queryParser.original.config.LowercaseExpandedTermsAttribute
+ * @see org.apache.lucene.queryParser.standard.config.LowercaseExpandedTermsAttribute
  */
 public class LowercaseExpandedTermsAttributeImpl extends AttributeImpl
 				implements LowercaseExpandedTermsAttribute {

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/MultiFieldAttribute.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/MultiFieldAttribute.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/MultiFieldAttribute.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/MultiFieldAttribute.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.config;
+package org.apache.lucene.queryParser.standard.config;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,7 +18,7 @@
  */
 
 import org.apache.lucene.queryParser.core.config.QueryConfigHandler;
-import org.apache.lucene.queryParser.original.processors.MultiFieldQueryNodeProcessor;
+import org.apache.lucene.queryParser.standard.processors.MultiFieldQueryNodeProcessor;
 import org.apache.lucene.util.Attribute;
 
 /**

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/MultiFieldAttributeImpl.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/MultiFieldAttributeImpl.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/MultiFieldAttributeImpl.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/MultiFieldAttributeImpl.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.config;
+package org.apache.lucene.queryParser.standard.config;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,7 +20,7 @@
 import java.util.Arrays;
 
 import org.apache.lucene.queryParser.core.config.QueryConfigHandler;
-import org.apache.lucene.queryParser.original.processors.MultiFieldQueryNodeProcessor;
+import org.apache.lucene.queryParser.standard.processors.MultiFieldQueryNodeProcessor;
 import org.apache.lucene.util.AttributeImpl;
 
 /**
@@ -28,7 +28,7 @@
  * must be defined in the {@link QueryConfigHandler}. This attribute tells the
  * processor to which fields the terms in the query should be expanded. <br/>
  * 
- * @see org.apache.lucene.queryParser.original.config.MultiFieldAttribute
+ * @see org.apache.lucene.queryParser.standard.config.MultiFieldAttribute
  */
 public class MultiFieldAttributeImpl extends AttributeImpl
 				implements MultiFieldAttribute {

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/MultiTermRewriteMethodAttribute.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/MultiTermRewriteMethodAttribute.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/MultiTermRewriteMethodAttribute.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/MultiTermRewriteMethodAttribute.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.config;
+package org.apache.lucene.queryParser.standard.config;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,7 +18,7 @@
  */
 
 import org.apache.lucene.queryParser.core.config.QueryConfigHandler;
-import org.apache.lucene.queryParser.original.processors.ParametricRangeQueryNodeProcessor;
+import org.apache.lucene.queryParser.standard.processors.ParametricRangeQueryNodeProcessor;
 import org.apache.lucene.search.MultiTermQuery;
 import org.apache.lucene.search.MultiTermQuery.RewriteMethod;
 import org.apache.lucene.util.Attribute;

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/MultiTermRewriteMethodAttributeImpl.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/MultiTermRewriteMethodAttributeImpl.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/MultiTermRewriteMethodAttributeImpl.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/MultiTermRewriteMethodAttributeImpl.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.config;
+package org.apache.lucene.queryParser.standard.config;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,7 +18,7 @@
  */
 
 import org.apache.lucene.queryParser.core.config.QueryConfigHandler;
-import org.apache.lucene.queryParser.original.processors.ParametricRangeQueryNodeProcessor;
+import org.apache.lucene.queryParser.standard.processors.ParametricRangeQueryNodeProcessor;
 import org.apache.lucene.search.MultiTermQuery;
 import org.apache.lucene.search.MultiTermQuery.RewriteMethod;
 import org.apache.lucene.util.AttributeImpl;

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/PositionIncrementsAttribute.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/PositionIncrementsAttribute.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/PositionIncrementsAttribute.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/PositionIncrementsAttribute.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.config;
+package org.apache.lucene.queryParser.standard.config;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,7 +18,7 @@
  */
 
 import org.apache.lucene.queryParser.core.config.QueryConfigHandler;
-import org.apache.lucene.queryParser.original.processors.AnalyzerQueryNodeProcessor;
+import org.apache.lucene.queryParser.standard.processors.AnalyzerQueryNodeProcessor;
 import org.apache.lucene.util.Attribute;
 
 /**

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/PositionIncrementsAttributeImpl.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/PositionIncrementsAttributeImpl.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/PositionIncrementsAttributeImpl.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/PositionIncrementsAttributeImpl.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.config;
+package org.apache.lucene.queryParser.standard.config;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,7 +18,7 @@
  */
 
 import org.apache.lucene.queryParser.core.config.QueryConfigHandler;
-import org.apache.lucene.queryParser.original.processors.AnalyzerQueryNodeProcessor;
+import org.apache.lucene.queryParser.standard.processors.AnalyzerQueryNodeProcessor;
 import org.apache.lucene.util.AttributeImpl;
 
 /**
@@ -26,7 +26,7 @@
  * must be defined in the {@link QueryConfigHandler}. This attribute tells the
  * processor if the position increment is enabled. <br/>
  * 
- * @see org.apache.lucene.queryParser.original.config.PositionIncrementsAttribute
+ * @see org.apache.lucene.queryParser.standard.config.PositionIncrementsAttribute
  */
 public class PositionIncrementsAttributeImpl extends AttributeImpl
 				implements PositionIncrementsAttribute {

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/RangeCollatorAttribute.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/RangeCollatorAttribute.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/RangeCollatorAttribute.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/RangeCollatorAttribute.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.config;
+package org.apache.lucene.queryParser.standard.config;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,7 +20,7 @@
 import java.text.Collator;
 
 import org.apache.lucene.queryParser.core.config.QueryConfigHandler;
-import org.apache.lucene.queryParser.original.processors.ParametricRangeQueryNodeProcessor;
+import org.apache.lucene.queryParser.standard.processors.ParametricRangeQueryNodeProcessor;
 import org.apache.lucene.search.TermRangeQuery;
 import org.apache.lucene.util.Attribute;
 

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/RangeCollatorAttributeImpl.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/RangeCollatorAttributeImpl.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/RangeCollatorAttributeImpl.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/RangeCollatorAttributeImpl.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.config;
+package org.apache.lucene.queryParser.standard.config;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,7 +20,7 @@
 import java.text.Collator;
 
 import org.apache.lucene.queryParser.core.config.QueryConfigHandler;
-import org.apache.lucene.queryParser.original.processors.ParametricRangeQueryNodeProcessor;
+import org.apache.lucene.queryParser.standard.processors.ParametricRangeQueryNodeProcessor;
 import org.apache.lucene.search.TermRangeQuery;
 import org.apache.lucene.util.AttributeImpl;
 
@@ -30,7 +30,7 @@
  * the processor which {@link Collator} should be used for a
  * {@link TermRangeQuery} <br/>
  * 
- * @see org.apache.lucene.queryParser.original.config.RangeCollatorAttribute
+ * @see org.apache.lucene.queryParser.standard.config.RangeCollatorAttribute
  */
 public class RangeCollatorAttributeImpl extends AttributeImpl
 				implements RangeCollatorAttribute {

Copied: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/StandardQueryConfigHandler.java (from r801557, lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/original/config/OriginalQueryConfigHandler.java)
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/StandardQueryConfigHandler.java?p2=lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/StandardQueryConfigHandler.java&p1=lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/original/config/OriginalQueryConfigHandler.java&r1=801557&r2=801934&rev=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/original/config/OriginalQueryConfigHandler.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/StandardQueryConfigHandler.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.config;
+package org.apache.lucene.queryParser.standard.config;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,21 +18,21 @@
  */
 
 import org.apache.lucene.queryParser.core.config.QueryConfigHandler;
-import org.apache.lucene.queryParser.original.processors.OriginalQueryNodeProcessorPipeline;
+import org.apache.lucene.queryParser.standard.processors.StandardQueryNodeProcessorPipeline;
 
 /**
  * This query configuration handler is used for almost every processor defined
- * in the {@link OriginalQueryNodeProcessorPipeline} processor pipeline. It holds
+ * in the {@link StandardQueryNodeProcessorPipeline} processor pipeline. It holds
  * attributes that reproduces the configuration that could be set on the old
  * lucene 2.4 QueryParser class. <br/>
  * 
- * @see OriginalQueryNodeProcessorPipeline
+ * @see StandardQueryNodeProcessorPipeline
  */
-public class OriginalQueryConfigHandler extends QueryConfigHandler {
+public class StandardQueryConfigHandler extends QueryConfigHandler {
 
 
 
-  public OriginalQueryConfigHandler() {
+  public StandardQueryConfigHandler() {
     // Add listener that will build the FieldConfig attributes.
     addFieldConfigListener(new FieldBoostMapFCListener(this));
     addFieldConfigListener(new FieldDateResolutionFCListener(this));

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/package.html
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/package.html?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/package.html (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/config/package.html Fri Aug  7 10:24:28 2009
@@ -21,14 +21,14 @@
 </head>
 <body>
 
-<h2>Original Lucene Query Configuration</h2>
+<h2>Standard Lucene Query Configuration</h2>
 <p>
-The package org.apache.lucene.queryParser.original.config contains the Lucene
+The package org.apache.lucene.queryParser.standard.config contains the Lucene
 query configuration handler and all the attributes used by it. This configuration
 handler reproduces almost everything that could be set on the old query parser.
 </p>
 <p>
-OriginalQueryConfigHandler is the class that should be used to configure the OriginalQueryNodeProcessorPipeline.
+StandardQueryConfigHandler is the class that should be used to configure the StandardQueryNodeProcessorPipeline.
 </p>
 </body>
 </html>

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/BooleanModifierNode.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/BooleanModifierNode.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/BooleanModifierNode.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/BooleanModifierNode.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.nodes;
+package org.apache.lucene.queryParser.standard.nodes;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -19,7 +19,7 @@
 
 import org.apache.lucene.queryParser.core.nodes.ModifierQueryNode;
 import org.apache.lucene.queryParser.core.nodes.QueryNode;
-import org.apache.lucene.queryParser.original.processors.GroupQueryNodeProcessor;
+import org.apache.lucene.queryParser.standard.processors.GroupQueryNodeProcessor;
 
 /**
  * A {@link BooleanModifierNode} has the same behaviour as

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/MultiPhraseQueryNode.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/MultiPhraseQueryNode.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/MultiPhraseQueryNode.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/MultiPhraseQueryNode.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.nodes;
+package org.apache.lucene.queryParser.standard.nodes;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/RangeQueryNode.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/RangeQueryNode.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/RangeQueryNode.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/RangeQueryNode.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.nodes;
+package org.apache.lucene.queryParser.standard.nodes;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -21,8 +21,8 @@
 
 import org.apache.lucene.queryParser.core.nodes.ParametricQueryNode;
 import org.apache.lucene.queryParser.core.nodes.ParametricRangeQueryNode;
-import org.apache.lucene.queryParser.original.config.RangeCollatorAttribute;
-import org.apache.lucene.queryParser.original.processors.ParametricRangeQueryNodeProcessor;
+import org.apache.lucene.queryParser.standard.config.RangeCollatorAttribute;
+import org.apache.lucene.queryParser.standard.processors.ParametricRangeQueryNodeProcessor;
 import org.apache.lucene.search.MultiTermQuery;
 
 /**

Copied: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/StandardBooleanQueryNode.java (from r801557, lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/original/nodes/OriginalBooleanQueryNode.java)
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/StandardBooleanQueryNode.java?p2=lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/StandardBooleanQueryNode.java&p1=lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/original/nodes/OriginalBooleanQueryNode.java&r1=801557&r2=801934&rev=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/original/nodes/OriginalBooleanQueryNode.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/StandardBooleanQueryNode.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.nodes;
+package org.apache.lucene.queryParser.standard.nodes;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -25,14 +25,14 @@
 import org.apache.lucene.search.Similarity;
 
 /**
- * A {@link OriginalBooleanQueryNode} has the same behavior as
+ * A {@link StandardBooleanQueryNode} has the same behavior as
  * {@link BooleanQueryNode}. It only indicates if the coord should be enabled or
  * not for this boolean query. <br/>
  * 
  * @see Similarity#coord(int, int)
  * @see BooleanQuery
  */
-public class OriginalBooleanQueryNode extends BooleanQueryNode {
+public class StandardBooleanQueryNode extends BooleanQueryNode {
 
   private static final long serialVersionUID = 1938287817191138787L;
 
@@ -41,7 +41,7 @@
   /**
    * @param clauses
    */
-  public OriginalBooleanQueryNode(List<QueryNode> clauses, boolean disableCoord) {
+  public StandardBooleanQueryNode(List<QueryNode> clauses, boolean disableCoord) {
     super(clauses);
 
     this.disableCoord = disableCoord;

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/package.html
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/package.html?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/package.html (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/nodes/package.html Fri Aug  7 10:24:28 2009
@@ -21,9 +21,9 @@
 </head>
 <body>
 
-<h2>Original Lucene Query Nodes</h2>
+<h2>Standard Lucene Query Nodes</h2>
 <p>
-The package org.apache.lucene.queryParser.original.nodes contains QueryNode classes
+The package org.apache.lucene.queryParser.standard.nodes contains QueryNode classes
 that are used specifically for Lucene query node tree. Any other generic QueryNode is
 defined under org.apache.lucene.queryParser.nodes.
 </p>

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/package.html
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/package.html?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/package.html (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/package.html Fri Aug  7 10:24:28 2009
@@ -31,12 +31,12 @@
 and building.
 </p>
 <p>
-The classes contained in the package org.apache.lucene.queryParser.original
+The classes contained in the package org.apache.lucene.queryParser.standard
 are used to reproduce the same behavior as the old query parser.
 </p>
 
 <p>
-Check <tt>org.apache.lucene.queryParser.original.OriginalQueryParserHelper</tt> to quick start using the Lucene query parser. 
+Check <tt>org.apache.lucene.queryParser.standard.StandardQueryParser</tt> to quick start using the Lucene query parser. 
 </p>
 
 <p>

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/EscapeQuerySyntaxImpl.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/EscapeQuerySyntaxImpl.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/EscapeQuerySyntaxImpl.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/EscapeQuerySyntaxImpl.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.parser;
+package org.apache.lucene.queryParser.standard.parser;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/JavaCharStream.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/JavaCharStream.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/JavaCharStream.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/JavaCharStream.java Fri Aug  7 10:24:28 2009
@@ -1,6 +1,6 @@
 /* Generated By:JavaCC: Do not edit this line. JavaCharStream.java Version 4.1 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
-package org.apache.lucene.queryParser.original.parser;
+package org.apache.lucene.queryParser.standard.parser;
 
 /**
  * An implementation of interface CharStream, where the stream is assumed to
@@ -614,4 +614,4 @@
   }
 
 }
-/* JavaCC - OriginalChecksum=065d79d49fcd02f542903038e37bd9d9 (do not edit this line) */
+/* JavaCC - StandardChecksum=065d79d49fcd02f542903038e37bd9d9 (do not edit this line) */

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/ParseException.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/ParseException.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/ParseException.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/ParseException.java Fri Aug  7 10:24:28 2009
@@ -1,6 +1,6 @@
 /* Generated By:JavaCC: Do not edit this line. ParseException.java Version 4.1 */
 /* JavaCCOptions:KEEP_LINE_COL=null */
-package org.apache.lucene.queryParser.original.parser;
+package org.apache.lucene.queryParser.standard.parser;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -192,6 +192,6 @@
 
 }
 /*
- * JavaCC - OriginalChecksum=c04ac45b94787832e67e6d1b49d8774c (do not edit this
+ * JavaCC - StandardChecksum=c04ac45b94787832e67e6d1b49d8774c (do not edit this
  * line)
  */

Copied: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/StandardSyntaxParser.java (from r801557, lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/original/parser/OriginalSyntaxParser.java)
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/StandardSyntaxParser.java?p2=lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/StandardSyntaxParser.java&p1=lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/original/parser/OriginalSyntaxParser.java&r1=801557&r2=801934&rev=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/original/parser/OriginalSyntaxParser.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/StandardSyntaxParser.java Fri Aug  7 10:24:28 2009
@@ -1,5 +1,5 @@
-/* Generated By:JavaCC: Do not edit this line. OriginalSyntaxParser.java */
-package org.apache.lucene.queryParser.original.parser;
+/* Generated By:JavaCC: Do not edit this line. StandardSyntaxParser.java */
+package org.apache.lucene.queryParser.standard.parser;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -50,7 +50,7 @@
 import org.apache.lucene.queryParser.core.parser.SyntaxParser;
 
 @SuppressWarnings("all")
-public class OriginalSyntaxParser implements SyntaxParser, OriginalSyntaxParserConstants {
+public class StandardSyntaxParser implements SyntaxParser, StandardSyntaxParserConstants {
 
         private static final int CONJ_NONE =0;
         private static final int CONJ_AND =2;
@@ -58,7 +58,7 @@
 
 
    // syntax parser constructor
-   public OriginalSyntaxParser() {
+   public StandardSyntaxParser() {
         this(new StringReader(""));
   }
      /** Parses a query string, returning a {@link org.apache.lucene.queryParser.core.nodes.QueryNode}.
@@ -668,7 +668,7 @@
   }
 
   /** Generated Token Manager. */
-  public OriginalSyntaxParserTokenManager token_source;
+  public StandardSyntaxParserTokenManager token_source;
   JavaCharStream jj_input_stream;
   /** Current token. */
   public Token token;
@@ -696,13 +696,13 @@
   private int jj_gc = 0;
 
   /** Constructor with InputStream. */
-  public OriginalSyntaxParser(java.io.InputStream stream) {
+  public StandardSyntaxParser(java.io.InputStream stream) {
      this(stream, null);
   }
   /** Constructor with InputStream and supplied encoding */
-  public OriginalSyntaxParser(java.io.InputStream stream, String encoding) {
+  public StandardSyntaxParser(java.io.InputStream stream, String encoding) {
     try { jj_input_stream = new JavaCharStream(stream, encoding, 1, 1); } catch(java.io.UnsupportedEncodingException e) { throw new RuntimeException(e); }
-    token_source = new OriginalSyntaxParserTokenManager(jj_input_stream);
+    token_source = new StandardSyntaxParserTokenManager(jj_input_stream);
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
@@ -726,9 +726,9 @@
   }
 
   /** Constructor. */
-  public OriginalSyntaxParser(java.io.Reader stream) {
+  public StandardSyntaxParser(java.io.Reader stream) {
     jj_input_stream = new JavaCharStream(stream, 1, 1);
-    token_source = new OriginalSyntaxParserTokenManager(jj_input_stream);
+    token_source = new StandardSyntaxParserTokenManager(jj_input_stream);
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
@@ -748,7 +748,7 @@
   }
 
   /** Constructor with generated Token Manager. */
-  public OriginalSyntaxParser(OriginalSyntaxParserTokenManager tm) {
+  public StandardSyntaxParser(StandardSyntaxParserTokenManager tm) {
     token_source = tm;
     token = new Token();
     jj_ntk = -1;
@@ -758,7 +758,7 @@
   }
 
   /** Reinitialise. */
-  public void ReInit(OriginalSyntaxParserTokenManager tm) {
+  public void ReInit(StandardSyntaxParserTokenManager tm) {
     token_source = tm;
     token = new Token();
     jj_ntk = -1;

Copied: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/StandardSyntaxParser.jj (from r801557, lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/original/parser/OriginalSyntaxParser.jj)
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/StandardSyntaxParser.jj?p2=lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/StandardSyntaxParser.jj&p1=lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/original/parser/OriginalSyntaxParser.jj&r1=801557&r2=801934&rev=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/original/parser/OriginalSyntaxParser.jj (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/StandardSyntaxParser.jj Fri Aug  7 10:24:28 2009
@@ -1,5 +1,5 @@
 /**
- * Original file is based on the TextParser.jj from lucene 2.3
+ * Standard file is based on the TextParser.jj from lucene 2.3
  */
 
 options {
@@ -10,8 +10,8 @@
   JDK_VERSION="1.5";
 }
 
-PARSER_BEGIN(OriginalSyntaxParser)
-package org.apache.lucene.queryParser.original.parser;
+PARSER_BEGIN(StandardSyntaxParser)
+package org.apache.lucene.queryParser.standard.parser;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -62,7 +62,7 @@
 import org.apache.lucene.queryParser.core.parser.SyntaxParser;
 
 @SuppressWarnings("all")
-public class OriginalSyntaxParser implements SyntaxParser {
+public class StandardSyntaxParser implements SyntaxParser {
 
 	private static final int CONJ_NONE =0;
 	private static final int CONJ_AND =2;
@@ -70,7 +70,7 @@
 
  
    // syntax parser constructor
-   public OriginalSyntaxParser() {
+   public StandardSyntaxParser() {
    	this(new StringReader(""));
   }
      /** Parses a query string, returning a {@link org.apache.lucene.queryParser.core.nodes.QueryNode}.
@@ -99,7 +99,7 @@
    
 }
 
-PARSER_END(OriginalSyntaxParser)
+PARSER_END(StandardSyntaxParser)
 
 /* ***************** */
 /* Token Definitions */

Copied: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/StandardSyntaxParserConstants.java (from r801557, lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/original/parser/OriginalSyntaxParserConstants.java)
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/StandardSyntaxParserConstants.java?p2=lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/StandardSyntaxParserConstants.java&p1=lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/original/parser/OriginalSyntaxParserConstants.java&r1=801557&r2=801934&rev=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/original/parser/OriginalSyntaxParserConstants.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/StandardSyntaxParserConstants.java Fri Aug  7 10:24:28 2009
@@ -1,12 +1,12 @@
-/* Generated By:JavaCC: Do not edit this line. OriginalSyntaxParserConstants.java */
-package org.apache.lucene.queryParser.original.parser;
+/* Generated By:JavaCC: Do not edit this line. StandardSyntaxParserConstants.java */
+package org.apache.lucene.queryParser.standard.parser;
 
 
 /**
  * Token literal values and constants.
  * Generated by org.javacc.parser.OtherFilesGen#start()
  */
-public interface OriginalSyntaxParserConstants {
+public interface StandardSyntaxParserConstants {
 
   /** End of File. */
   int EOF = 0;

Copied: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/StandardSyntaxParserTokenManager.java (from r801557, lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/original/parser/OriginalSyntaxParserTokenManager.java)
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/StandardSyntaxParserTokenManager.java?p2=lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/StandardSyntaxParserTokenManager.java&p1=lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/original/parser/OriginalSyntaxParserTokenManager.java&r1=801557&r2=801934&rev=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/original/parser/OriginalSyntaxParserTokenManager.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/StandardSyntaxParserTokenManager.java Fri Aug  7 10:24:28 2009
@@ -1,5 +1,5 @@
-/* Generated By:JavaCC: Do not edit this line. OriginalSyntaxParserTokenManager.java */
-package org.apache.lucene.queryParser.original.parser;
+/* Generated By:JavaCC: Do not edit this line. StandardSyntaxParserTokenManager.java */
+package org.apache.lucene.queryParser.standard.parser;
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -17,10 +17,38 @@
  * limitations under the License.
  */
 
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Vector;
+import org.apache.lucene.messages.Message;
+import org.apache.lucene.messages.MessageImpl;
+import org.apache.lucene.queryParser.core.QueryNodeError;
+import org.apache.lucene.queryParser.core.QueryNodeException;
+import org.apache.lucene.queryParser.core.QueryNodeParseException;
+import org.apache.lucene.queryParser.core.messages.QueryParserMessages;
+import org.apache.lucene.queryParser.core.nodes.AndQueryNode;
+import org.apache.lucene.queryParser.core.nodes.BooleanQueryNode;
+import org.apache.lucene.queryParser.core.nodes.BoostQueryNode;
+import org.apache.lucene.queryParser.core.nodes.FieldQueryNode;
+import org.apache.lucene.queryParser.core.nodes.FuzzyQueryNode;
+import org.apache.lucene.queryParser.core.nodes.ModifierQueryNode;
+import org.apache.lucene.queryParser.core.nodes.GroupQueryNode;
+import org.apache.lucene.queryParser.core.nodes.OpaqueQueryNode;
+import org.apache.lucene.queryParser.core.nodes.OrQueryNode;
+import org.apache.lucene.queryParser.core.nodes.ParametricQueryNode;
+import org.apache.lucene.queryParser.core.nodes.ParametricRangeQueryNode;
+import org.apache.lucene.queryParser.core.nodes.PrefixWildcardQueryNode;
+import org.apache.lucene.queryParser.core.nodes.SlopQueryNode;
+import org.apache.lucene.queryParser.core.nodes.ProximityQueryNode;
+import org.apache.lucene.queryParser.core.nodes.QueryNode;
+import org.apache.lucene.queryParser.core.nodes.QueryNodeImpl;
+import org.apache.lucene.queryParser.core.nodes.QuotedFieldQueryNode;
+import org.apache.lucene.queryParser.core.nodes.WildcardQueryNode;
+import org.apache.lucene.queryParser.core.parser.SyntaxParser;
 
 /** Token Manager. */
-@SuppressWarnings("unused")
-public class OriginalSyntaxParserTokenManager implements OriginalSyntaxParserConstants
+public class StandardSyntaxParserTokenManager implements StandardSyntaxParserConstants
 {
 
   /** Debug output. */
@@ -768,7 +796,7 @@
       {
          int hiByte = (int)(curChar >> 8);
          int i1 = hiByte >> 6;
-        long l1 = 1L << (hiByte & 077);
+         long l1 = 1L << (hiByte & 077);
          int i2 = (curChar & 0xff) >> 6;
          long l2 = 1L << (curChar & 077);
          do
@@ -1058,14 +1086,14 @@
 private final int[] jjstateSet = new int[72];
 protected char curChar;
 /** Constructor. */
-public OriginalSyntaxParserTokenManager(JavaCharStream stream){
+public StandardSyntaxParserTokenManager(JavaCharStream stream){
    if (JavaCharStream.staticFlag)
       throw new Error("ERROR: Cannot use a static CharStream class with a non-static lexical analyzer.");
    input_stream = stream;
 }
 
 /** Constructor. */
-public OriginalSyntaxParserTokenManager(JavaCharStream stream, int lexState){
+public StandardSyntaxParserTokenManager(JavaCharStream stream, int lexState){
    this(stream);
    SwitchTo(lexState);
 }

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/Token.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/Token.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/Token.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/Token.java Fri Aug  7 10:24:28 2009
@@ -1,6 +1,6 @@
 /* Generated By:JavaCC: Do not edit this line. Token.java Version 4.1 */
 /* JavaCCOptions:TOKEN_EXTENDS=,KEEP_LINE_COL=null,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
-package org.apache.lucene.queryParser.original.parser;
+package org.apache.lucene.queryParser.standard.parser;
 
 /**
  * Describes the input token stream.
@@ -128,4 +128,4 @@
   }
 
 }
-/* JavaCC - OriginalChecksum=f9eb36a076cde62bf39ccbf828bc2117 (do not edit this line) */
+/* JavaCC - StandardChecksum=f9eb36a076cde62bf39ccbf828bc2117 (do not edit this line) */

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/TokenMgrError.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/TokenMgrError.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/TokenMgrError.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/TokenMgrError.java Fri Aug  7 10:24:28 2009
@@ -1,6 +1,6 @@
 /* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 4.1 */
 /* JavaCCOptions: */
-package org.apache.lucene.queryParser.original.parser;
+package org.apache.lucene.queryParser.standard.parser;
 
 /** Token Manager Error. */
 public class TokenMgrError extends Error
@@ -144,4 +144,4 @@
     this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
   }
 }
-/* JavaCC - OriginalChecksum=91ba9c9f5e0e552a815530d639ce15ed (do not edit this line) */
+/* JavaCC - StandardChecksum=91ba9c9f5e0e552a815530d639ce15ed (do not edit this line) */

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/package.html
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/package.html?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/package.html (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/package.html Fri Aug  7 10:24:28 2009
@@ -23,7 +23,7 @@
 
 <h2>Lucene Query Parser</h2>
 <p>
-The package org.apache.lucene.queryParser.original.parser contains the query parser.
+The package org.apache.lucene.queryParser.standard.parser contains the query parser.
 </p>
 <p>
 This text parser only performs the syntax validation and creates an QueryNode tree

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/AllowLeadingWildcardProcessor.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/AllowLeadingWildcardProcessor.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/AllowLeadingWildcardProcessor.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/AllowLeadingWildcardProcessor.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.processors;
+package org.apache.lucene.queryParser.standard.processors;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -26,8 +26,8 @@
 import org.apache.lucene.queryParser.core.nodes.QueryNode;
 import org.apache.lucene.queryParser.core.nodes.WildcardQueryNode;
 import org.apache.lucene.queryParser.core.processors.QueryNodeProcessorImpl;
-import org.apache.lucene.queryParser.original.config.AllowLeadingWildcardAttribute;
-import org.apache.lucene.queryParser.original.parser.EscapeQuerySyntaxImpl;
+import org.apache.lucene.queryParser.standard.config.AllowLeadingWildcardAttribute;
+import org.apache.lucene.queryParser.standard.parser.EscapeQuerySyntaxImpl;
 
 /**
  * This processor verifies if the attribute

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/AnalyzerQueryNodeProcessor.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/AnalyzerQueryNodeProcessor.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/AnalyzerQueryNodeProcessor.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/AnalyzerQueryNodeProcessor.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.processors;
+package org.apache.lucene.queryParser.standard.processors;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -40,10 +40,10 @@
 import org.apache.lucene.queryParser.core.nodes.TokenizedPhraseQueryNode;
 import org.apache.lucene.queryParser.core.nodes.WildcardQueryNode;
 import org.apache.lucene.queryParser.core.processors.QueryNodeProcessorImpl;
-import org.apache.lucene.queryParser.original.config.AnalyzerAttribute;
-import org.apache.lucene.queryParser.original.config.PositionIncrementsAttribute;
-import org.apache.lucene.queryParser.original.nodes.OriginalBooleanQueryNode;
-import org.apache.lucene.queryParser.original.nodes.MultiPhraseQueryNode;
+import org.apache.lucene.queryParser.standard.config.AnalyzerAttribute;
+import org.apache.lucene.queryParser.standard.config.PositionIncrementsAttribute;
+import org.apache.lucene.queryParser.standard.nodes.StandardBooleanQueryNode;
+import org.apache.lucene.queryParser.standard.nodes.MultiPhraseQueryNode;
 
 /**
  * This processor verifies if the attribute {@link AnalyzerQueryNodeProcessor}
@@ -209,7 +209,7 @@
 
           }
 
-          return new GroupQueryNode(new OriginalBooleanQueryNode(children, true));
+          return new GroupQueryNode(new StandardBooleanQueryNode(children, true));
 
         } else {
           // phrase query:

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/BooleanSingleChildOptimizationQueryNodeProcessor.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/BooleanSingleChildOptimizationQueryNodeProcessor.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/BooleanSingleChildOptimizationQueryNodeProcessor.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/BooleanSingleChildOptimizationQueryNodeProcessor.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.processors;
+package org.apache.lucene.queryParser.standard.processors;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -25,7 +25,7 @@
 import org.apache.lucene.queryParser.core.nodes.QueryNode;
 import org.apache.lucene.queryParser.core.nodes.ModifierQueryNode.Modifier;
 import org.apache.lucene.queryParser.core.processors.QueryNodeProcessorImpl;
-import org.apache.lucene.queryParser.original.nodes.BooleanModifierNode;
+import org.apache.lucene.queryParser.standard.nodes.BooleanModifierNode;
 
 /**
  * This processor removes every {@link BooleanQueryNode} that contains only one

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/BoostQueryNodeProcessor.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/BoostQueryNodeProcessor.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/BoostQueryNodeProcessor.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/BoostQueryNodeProcessor.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.processors;
+package org.apache.lucene.queryParser.standard.processors;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -26,7 +26,7 @@
 import org.apache.lucene.queryParser.core.nodes.FieldableNode;
 import org.apache.lucene.queryParser.core.nodes.QueryNode;
 import org.apache.lucene.queryParser.core.processors.QueryNodeProcessorImpl;
-import org.apache.lucene.queryParser.original.config.BoostAttribute;
+import org.apache.lucene.queryParser.standard.config.BoostAttribute;
 
 /**
  * This processor iterates the query node tree looking for every

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/DefaultPhraseSlopQueryNodeProcessor.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/DefaultPhraseSlopQueryNodeProcessor.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/DefaultPhraseSlopQueryNodeProcessor.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/DefaultPhraseSlopQueryNodeProcessor.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.processors;
+package org.apache.lucene.queryParser.standard.processors;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -25,8 +25,8 @@
 import org.apache.lucene.queryParser.core.nodes.SlopQueryNode;
 import org.apache.lucene.queryParser.core.nodes.TokenizedPhraseQueryNode;
 import org.apache.lucene.queryParser.core.processors.QueryNodeProcessorImpl;
-import org.apache.lucene.queryParser.original.config.DefaultPhraseSlopAttribute;
-import org.apache.lucene.queryParser.original.nodes.MultiPhraseQueryNode;
+import org.apache.lucene.queryParser.standard.config.DefaultPhraseSlopAttribute;
+import org.apache.lucene.queryParser.standard.nodes.MultiPhraseQueryNode;
 
 /**
  * This processor verifies if the attribute {@link DefaultPhraseSlopAttribute}

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/FuzzyQueryNodeProcessor.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/FuzzyQueryNodeProcessor.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/FuzzyQueryNodeProcessor.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/FuzzyQueryNodeProcessor.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.processors;
+package org.apache.lucene.queryParser.standard.processors;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -24,7 +24,7 @@
 import org.apache.lucene.queryParser.core.nodes.FuzzyQueryNode;
 import org.apache.lucene.queryParser.core.nodes.QueryNode;
 import org.apache.lucene.queryParser.core.processors.QueryNodeProcessorImpl;
-import org.apache.lucene.queryParser.original.config.FuzzyAttribute;
+import org.apache.lucene.queryParser.standard.config.FuzzyAttribute;
 import org.apache.lucene.search.FuzzyQuery;
 
 /**

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/GroupQueryNodeProcessor.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/GroupQueryNodeProcessor.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/GroupQueryNodeProcessor.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/GroupQueryNodeProcessor.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.processors;
+package org.apache.lucene.queryParser.standard.processors;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,9 +31,9 @@
 import org.apache.lucene.queryParser.core.nodes.ModifierQueryNode.Modifier;
 import org.apache.lucene.queryParser.core.parser.SyntaxParser;
 import org.apache.lucene.queryParser.core.processors.QueryNodeProcessor;
-import org.apache.lucene.queryParser.original.config.DefaultOperatorAttribute;
-import org.apache.lucene.queryParser.original.config.DefaultOperatorAttribute.Operator;
-import org.apache.lucene.queryParser.original.nodes.BooleanModifierNode;
+import org.apache.lucene.queryParser.standard.config.DefaultOperatorAttribute;
+import org.apache.lucene.queryParser.standard.config.DefaultOperatorAttribute.Operator;
+import org.apache.lucene.queryParser.standard.nodes.BooleanModifierNode;
 
 /**
  * The {@link SyntaxParser}
@@ -47,7 +47,7 @@
  * 
  * Example: TODO: describe a good example to show how this processor works
  * 
- * @see org.apache.lucene.queryParser.original.config.OriginalQueryConfigHandler
+ * @see org.apache.lucene.queryParser.standard.config.StandardQueryConfigHandler
  */
 public class GroupQueryNodeProcessor implements QueryNodeProcessor {
 

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/LowercaseExpandedTermsQueryNodeProcessor.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/LowercaseExpandedTermsQueryNodeProcessor.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/LowercaseExpandedTermsQueryNodeProcessor.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/LowercaseExpandedTermsQueryNodeProcessor.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.processors;
+package org.apache.lucene.queryParser.standard.processors;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -27,7 +27,7 @@
 import org.apache.lucene.queryParser.core.nodes.QueryNode;
 import org.apache.lucene.queryParser.core.nodes.WildcardQueryNode;
 import org.apache.lucene.queryParser.core.processors.QueryNodeProcessorImpl;
-import org.apache.lucene.queryParser.original.config.LowercaseExpandedTermsAttribute;
+import org.apache.lucene.queryParser.standard.config.LowercaseExpandedTermsAttribute;
 
 /**
  * This processor verifies if the attribute

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/MatchAllDocsQueryNodeProcessor.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/MatchAllDocsQueryNodeProcessor.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/MatchAllDocsQueryNodeProcessor.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/MatchAllDocsQueryNodeProcessor.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.processors;
+package org.apache.lucene.queryParser.standard.processors;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/MultiFieldQueryNodeProcessor.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/MultiFieldQueryNodeProcessor.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/MultiFieldQueryNodeProcessor.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/MultiFieldQueryNodeProcessor.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.processors;
+package org.apache.lucene.queryParser.standard.processors;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -27,7 +27,7 @@
 import org.apache.lucene.queryParser.core.nodes.GroupQueryNode;
 import org.apache.lucene.queryParser.core.nodes.QueryNode;
 import org.apache.lucene.queryParser.core.processors.QueryNodeProcessorImpl;
-import org.apache.lucene.queryParser.original.config.MultiFieldAttribute;
+import org.apache.lucene.queryParser.standard.config.MultiFieldAttribute;
 
 /**
  * This processor is used to expand terms so the query looks for the same term

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/ParametricRangeQueryNodeProcessor.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/ParametricRangeQueryNodeProcessor.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/ParametricRangeQueryNodeProcessor.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/ParametricRangeQueryNodeProcessor.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.processors;
+package org.apache.lucene.queryParser.standard.processors;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -35,11 +35,11 @@
 import org.apache.lucene.queryParser.core.nodes.QueryNode;
 import org.apache.lucene.queryParser.core.nodes.ParametricQueryNode.CompareOperator;
 import org.apache.lucene.queryParser.core.processors.QueryNodeProcessorImpl;
-import org.apache.lucene.queryParser.original.config.MultiTermRewriteMethodAttribute;
-import org.apache.lucene.queryParser.original.config.DateResolutionAttribute;
-import org.apache.lucene.queryParser.original.config.LocaleAttribute;
-import org.apache.lucene.queryParser.original.config.RangeCollatorAttribute;
-import org.apache.lucene.queryParser.original.nodes.RangeQueryNode;
+import org.apache.lucene.queryParser.standard.config.MultiTermRewriteMethodAttribute;
+import org.apache.lucene.queryParser.standard.config.DateResolutionAttribute;
+import org.apache.lucene.queryParser.standard.config.LocaleAttribute;
+import org.apache.lucene.queryParser.standard.config.RangeCollatorAttribute;
+import org.apache.lucene.queryParser.standard.nodes.RangeQueryNode;
 import org.apache.lucene.search.MultiTermQuery;
 
 /**

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/PhraseSlopQueryNodeProcessor.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/PhraseSlopQueryNodeProcessor.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/PhraseSlopQueryNodeProcessor.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/PhraseSlopQueryNodeProcessor.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.processors;
+package org.apache.lucene.queryParser.standard.processors;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -24,7 +24,7 @@
 import org.apache.lucene.queryParser.core.nodes.SlopQueryNode;
 import org.apache.lucene.queryParser.core.nodes.TokenizedPhraseQueryNode;
 import org.apache.lucene.queryParser.core.processors.QueryNodeProcessorImpl;
-import org.apache.lucene.queryParser.original.nodes.MultiPhraseQueryNode;
+import org.apache.lucene.queryParser.standard.nodes.MultiPhraseQueryNode;
 
 /**
  * This processor removes invalid {@link SlopQueryNode} objects in the query

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/PrefixWildcardQueryNodeProcessor.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/PrefixWildcardQueryNodeProcessor.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/PrefixWildcardQueryNodeProcessor.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/PrefixWildcardQueryNodeProcessor.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.processors;
+package org.apache.lucene.queryParser.standard.processors;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -23,11 +23,11 @@
 import org.apache.lucene.queryParser.core.nodes.PrefixWildcardQueryNode;
 import org.apache.lucene.queryParser.core.nodes.QueryNode;
 import org.apache.lucene.queryParser.core.processors.QueryNodeProcessorImpl;
-import org.apache.lucene.queryParser.original.parser.OriginalSyntaxParser;
+import org.apache.lucene.queryParser.standard.parser.StandardSyntaxParser;
 import org.apache.lucene.search.PrefixQuery;
 
 /**
- * The {@link OriginalSyntaxParser} creates {@link PrefixWildcardQueryNode} nodes which
+ * The {@link StandardSyntaxParser} creates {@link PrefixWildcardQueryNode} nodes which
  * have values containing the prefixed wildcard. However, Lucene
  * {@link PrefixQuery} cannot contain the prefixed wildcard. So, this processor
  * basically removed the prefixed wildcard from the

Modified: lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/RemoveEmptyNonLeafQueryNodeProcessor.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/RemoveEmptyNonLeafQueryNodeProcessor.java?rev=801934&r1=801557&r2=801934&view=diff
==============================================================================
--- lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/RemoveEmptyNonLeafQueryNodeProcessor.java (original)
+++ lucene/java/trunk/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/RemoveEmptyNonLeafQueryNodeProcessor.java Fri Aug  7 10:24:28 2009
@@ -1,4 +1,4 @@
-package org.apache.lucene.queryParser.original.processors;
+package org.apache.lucene.queryParser.standard.processors;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more