You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2010/05/06 12:10:08 UTC
svn commit: r941639 - in /lucene/dev/branches/branch_3x: ./ lucene/
lucene/backwards/src/ lucene/backwards/src/java/org/apache/lucene/search/
lucene/backwards/src/test/org/apache/lucene/analysis/
lucene/backwards/src/test/org/apache/lucene/document/ lu...
Author: rmuir
Date: Thu May 6 10:10:07 2010
New Revision: 941639
URL: http://svn.apache.org/viewvc?rev=941639&view=rev
Log:
LUCENE-2388: backport to 3.x
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/lucene/ (props changed)
lucene/dev/branches/branch_3x/lucene/CHANGES.txt (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/ (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/document/TestDateTools.java (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/document/TestNumberTools.java (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/util/TestAttributeSource.java (props changed)
lucene/dev/branches/branch_3x/lucene/build.xml (props changed)
lucene/dev/branches/branch_3x/lucene/contrib/ (props changed)
lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt (props changed)
lucene/dev/branches/branch_3x/lucene/contrib/highlighter/src/test/ (props changed)
lucene/dev/branches/branch_3x/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java (props changed)
lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/Tokenizer.java (props changed)
lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java (props changed)
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java (props changed)
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/document/TestDateTools.java (props changed)
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/document/TestNumberTools.java (props changed)
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (props changed)
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/util/TestAttributeSource.java (props changed)
lucene/dev/branches/branch_3x/solr/ (props changed)
lucene/dev/branches/branch_3x/solr/lib/commons-httpclient-3.1.jar (props changed)
lucene/dev/branches/branch_3x/solr/lib/jcl-over-slf4j-1.5.5.jar (props changed)
lucene/dev/branches/branch_3x/solr/site/tutorial.html
lucene/dev/branches/branch_3x/solr/site/version_control.html
lucene/dev/branches/branch_3x/solr/site/version_control.pdf
lucene/dev/branches/branch_3x/solr/src/common/org/apache/solr/common/ (props changed)
lucene/dev/branches/branch_3x/solr/src/maven/solr-core-pom.xml.template (props changed)
lucene/dev/branches/branch_3x/solr/src/maven/solr-solrj-pom.xml.template (props changed)
lucene/dev/branches/branch_3x/solr/src/site/src/documentation/content/xdocs/version_control.xml
lucene/dev/branches/branch_3x/solr/src/solrj/org/ (props changed)
lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/ (props changed)
lucene/dev/branches/branch_3x/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/ (props changed)
Propchange: lucene/dev/branches/branch_3x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 10:10:07 2010
@@ -1 +1 @@
-/lucene/dev/trunk:931337,931502,932129-932131,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk:931337,931502,932129-932131,932163,932304,932369,932374,932417,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
Propchange: lucene/dev/branches/branch_3x/lucene/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 10:10:07 2010
@@ -1,5 +1,5 @@
/lucene/dev/trunk:932749
-/lucene/dev/trunk/lucene:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458:924791,924850,930201
/lucene/java/branches/lucene_2_4:748824
/lucene/java/branches/lucene_2_9:817269-818600,825998,829134,829881,831036,896850,909334
Propchange: lucene/dev/branches/branch_3x/lucene/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 10:10:07 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/CHANGES.txt:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/CHANGES.txt:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/CHANGES.txt:924791,924850,930201
/lucene/java/branches/lucene_2_9/CHANGES.txt:896850,909334
/lucene/java/trunk/CHANGES.txt:924483-925561
Propchange: lucene/dev/branches/branch_3x/lucene/backwards/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 10:10:07 2010
@@ -1,3 +1,3 @@
-/lucene/dev/trunk/lucene/backwards/src:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/backwards/src:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/backwards/src:924850,930201
/lucene/java/trunk/backwards/src:924781
Propchange: lucene/dev/branches/branch_3x/lucene/backwards/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 10:10:07 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/backwards/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/backwards/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/backwards/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:924791,924850,930201
/lucene/java/branches/lucene_2_4/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:748824
/lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:817269-818600,825998,829134,829881,831036
Propchange: lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 10:10:07 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:924791,924850,930201
/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:748824
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:825998,829134,829881,831036
Propchange: lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/document/TestDateTools.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 10:10:07 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/document/TestDateTools.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/document/TestDateTools.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/document/TestDateTools.java:924791,924850,930201
/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/document/TestDateTools.java:748824
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/document/TestDateTools.java:825998,829134,829881,831036
Propchange: lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/document/TestNumberTools.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 10:10:07 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/document/TestNumberTools.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/document/TestNumberTools.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/document/TestNumberTools.java:924791,924850,930201
/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/document/TestNumberTools.java:748824
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/document/TestNumberTools.java:825998,829134,829881,831036
Propchange: lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 10:10:07 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:924791,924850,930201
/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:748824
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:825998,829134,829881,831036
Propchange: lucene/dev/branches/branch_3x/lucene/backwards/src/test/org/apache/lucene/util/TestAttributeSource.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 10:10:07 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/util/TestAttributeSource.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/util/TestAttributeSource.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/backwards/src/test/org/apache/lucene/util/TestAttributeSource.java:924791,924850,930201
/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/util/TestAttributeSource.java:748824
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/util/TestAttributeSource.java:817269-818600,825998,829134,829881,831036
Propchange: lucene/dev/branches/branch_3x/lucene/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 10:10:07 2010
@@ -1,5 +1,5 @@
/lucene/dev/trunk/build.xml:932749
-/lucene/dev/trunk/lucene/build.xml:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/build.xml:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/build.xml:924791,924850,930201
/lucene/java/branches/lucene_2_9/build.xml:896850,909334
/lucene/java/trunk/build.xml:924483-925561
Propchange: lucene/dev/branches/branch_3x/lucene/contrib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 10:10:07 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/contrib:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/contrib:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/contrib:924791,924850,930201
/lucene/java/branches/lucene_2_4/contrib:748824
/lucene/java/branches/lucene_2_9/contrib:817269-818600,825998,829134,829816,829881,831036,896850,909334
Propchange: lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 10:10:07 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/contrib/CHANGES.txt:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/contrib/CHANGES.txt:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/contrib/CHANGES.txt:924791,924850,930201
/lucene/java/branches/lucene_2_4/contrib/CHANGES.txt:748824
/lucene/java/branches/lucene_2_9/contrib/CHANGES.txt:817269-818600,825998,826775,829134,829816,829881,831036,896850,909334
Propchange: lucene/dev/branches/branch_3x/lucene/contrib/highlighter/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 10:10:07 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/contrib/highlighter/src/test:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/contrib/highlighter/src/test:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/contrib/highlighter/src/test:924791,924850,930201
/lucene/java/branches/lucene_2_4/contrib/highlighter/src/test:748824
/lucene/java/branches/lucene_2_9/contrib/highlighter/src/test:817269-818600,825998,826775,829134,829816,829881,831036,896850,909334
Propchange: lucene/dev/branches/branch_3x/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 10:10:07 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:924791,924850,930201
/lucene/java/branches/lucene_2_9/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:896850,909334
/lucene/java/trunk/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestIndicesEquals.java:924483-925561
Propchange: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/Tokenizer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 10:10:07 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/Tokenizer.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/Tokenizer.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/src/java/org/apache/lucene/analysis/Tokenizer.java:924791,924850,930201
/lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/analysis/Tokenizer.java:896850,909334
/lucene/java/trunk/src/java/org/apache/lucene/analysis/Tokenizer.java:924483-925561
Propchange: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 10:10:07 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:924791,924850,930201
/lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:896850,909334
/lucene/java/trunk/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:924483-925561
Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 10:10:07 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:924791,924850,930201
/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:748824
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:825998,829134,829881,831036,896850,909334
Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/document/TestDateTools.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 10:10:07 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestDateTools.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestDateTools.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/src/test/org/apache/lucene/document/TestDateTools.java:924791,924850,930201
/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/document/TestDateTools.java:748824
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/document/TestDateTools.java:825998,829134,829881,831036,896850,909334
Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/document/TestNumberTools.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 10:10:07 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestNumberTools.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/src/test/org/apache/lucene/document/TestNumberTools.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/src/test/org/apache/lucene/document/TestNumberTools.java:924791,924850,930201
/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/document/TestNumberTools.java:748824
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/document/TestNumberTools.java:825998,829134,829881,831036,896850,909334
Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 10:10:07 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:924791,924850,930201
/lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:748824
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:825998,829134,829881,831036,896850,909334
Propchange: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/util/TestAttributeSource.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 10:10:07 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/TestAttributeSource.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/TestAttributeSource.java:931298,931337,931502,932129-932131,932163,932304,932369,932374,932398,932417,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/java/branches/flex_1458/src/test/org/apache/lucene/util/TestAttributeSource.java:924791,924850,930201
/lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/util/TestAttributeSource.java:896850,909334
/lucene/java/trunk/src/test/org/apache/lucene/util/TestAttributeSource.java:924483-925561
Propchange: lucene/dev/branches/branch_3x/solr/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 10:10:07 2010
@@ -1,4 +1,4 @@
-/lucene/dev/trunk/solr:931337,931502,932129-932131,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/solr:931337,931502,932129-932131,932163,932304,932369,932374,932417,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/java/branches/lucene_2_4/solr:748824
/lucene/java/branches/lucene_2_9/solr:817269-818600,825998,829134,829881,831036,896850,909334
/lucene/java/branches/lucene_2_9_back_compat_tests/solr:818601-821336
Propchange: lucene/dev/branches/branch_3x/solr/lib/commons-httpclient-3.1.jar
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 10:10:07 2010
@@ -1,2 +1,2 @@
-/lucene/dev/trunk/solr/lib/commons-httpclient-3.1.jar:931337,931502,932129-932131,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/solr/lib/commons-httpclient-3.1.jar:931337,931502,932129-932131,932163,932304,932369,932374,932417,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/solr/trunk/lib/commons-httpclient-3.1.jar:922950-923910,923912-925091
Propchange: lucene/dev/branches/branch_3x/solr/lib/jcl-over-slf4j-1.5.5.jar
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 10:10:07 2010
@@ -1,2 +1,2 @@
-/lucene/dev/trunk/solr/lib/jcl-over-slf4j-1.5.5.jar:931337,931502,932129-932131,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/solr/lib/jcl-over-slf4j-1.5.5.jar:931337,931502,932129-932131,932163,932304,932369,932374,932417,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/solr/trunk/lib/jcl-over-slf4j-1.5.5.jar:922950-923910,923912-925091
Modified: lucene/dev/branches/branch_3x/solr/site/tutorial.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/site/tutorial.html?rev=941639&r1=941638&r2=941639&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/site/tutorial.html (original)
+++ lucene/dev/branches/branch_3x/solr/site/tutorial.html Thu May 6 10:10:07 2010
@@ -5,7 +5,7 @@
<meta content="Apache Forrest" name="Generator">
<meta name="Forrest-version" content="0.8">
<meta name="Forrest-skin-name" content="lucene">
-<title>Solr tutorial (version 3.0.0.2010.03.26.09.09.44)</title>
+<title>Solr tutorial (version 3.0.0.2010.04.09.09.38.55)</title>
<link type="text/css" href="skin/basic.css" rel="stylesheet">
<link media="screen" type="text/css" href="skin/screen.css" rel="stylesheet">
<link media="print" type="text/css" href="skin/print.css" rel="stylesheet">
@@ -157,7 +157,7 @@ document.write("Last Published: " + docu
</div>
<div id="credit">
<hr>
- This document is for Apache Solr version 3.0.0.2010.03.26.09.09.44. If you are using a different version of Solr, please consult the documentation that was distributed with the version you are using.
+ This document is for Apache Solr version 3.0.0.2010.04.09.09.38.55. If you are using a different version of Solr, please consult the documentation that was distributed with the version you are using.
</div>
<div id="roundbottom">
<img style="display: none" class="corner" height="15" width="15" alt="" src="skin/images/rc-b-l-15-1body-2menu-3menu.png"></div>
@@ -181,7 +181,7 @@ document.write("Last Published: " + docu
</div>
<h1>Solr tutorial</h1>
<div id="motd-area">
- This document is for Apache Solr version 3.0.0.2010.03.26.09.09.44. If you are using a different version of Solr, please consult the documentation that was distributed with the version you are using.
+ This document is for Apache Solr version 3.0.0.2010.04.09.09.38.55. If you are using a different version of Solr, please consult the documentation that was distributed with the version you are using.
</div>
<div id="minitoc-area">
<ul class="minitoc">
Modified: lucene/dev/branches/branch_3x/solr/site/version_control.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/site/version_control.html?rev=941639&r1=941638&r2=941639&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/site/version_control.html (original)
+++ lucene/dev/branches/branch_3x/solr/site/version_control.html Thu May 6 10:10:07 2010
@@ -213,7 +213,7 @@ document.write("Last Published: " + docu
<div class="section">
<p>
The source code can be browsed via the Web at
- <a href="http://svn.apache.org/viewcvs.cgi/lucene/solr/">http://svn.apache.org/viewcvs.cgi/lucene/solr/</a>.
+ <a href="http://svn.apache.org/viewcvs.cgi/lucene/dev/">http://svn.apache.org/viewcvs.cgi/lucene/dev/</a>.
No SVN client software is required.
</p>
</div>
@@ -224,7 +224,7 @@ document.write("Last Published: " + docu
<div class="section">
<p>
The SVN URL for anonymous users is
- <a href="http://svn.apache.org/repos/asf/lucene/solr/">http://svn.apache.org/repos/asf/lucene/solr/</a>.
+ <a href="http://svn.apache.org/repos/asf/lucene/dev/">http://svn.apache.org/repos/asf/lucene/dev/</a>.
Instructions for anonymous SVN access are
<a href="http://www.apache.org/dev/version-control.html#anon-svn">here</a>.
</p>
@@ -236,7 +236,7 @@ document.write("Last Published: " + docu
<div class="section">
<p>
The SVN URL for committers is
- <a href="https://svn.apache.org/repos/asf/lucene/solr/">https://svn.apache.org/repos/asf/lucene/solr/</a>.
+ <a href="https://svn.apache.org/repos/asf/lucene/dev/">https://svn.apache.org/repos/asf/lucene/dev/</a>.
Instructions for committer SVN access are
<a href="http://www.apache.org/dev/version-control.html#https-svn">here</a>.
</p>
Modified: lucene/dev/branches/branch_3x/solr/site/version_control.pdf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/site/version_control.pdf?rev=941639&r1=941638&r2=941639&view=diff
==============================================================================
Binary files - no diff available.
Propchange: lucene/dev/branches/branch_3x/solr/src/common/org/apache/solr/common/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 10:10:07 2010
@@ -1,2 +1,2 @@
-/lucene/dev/trunk/solr/src/common/org/apache/solr/common:931337,931502,932129-932131,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/solr/src/common/org/apache/solr/common:931337,931502,932129-932131,932163,932304,932369,932374,932417,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/solr/trunk/src/common/org/apache/solr/common:922950-923910,923912-925091
Propchange: lucene/dev/branches/branch_3x/solr/src/maven/solr-core-pom.xml.template
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 10:10:07 2010
@@ -1,2 +1,2 @@
-/lucene/dev/trunk/solr/src/maven/solr-core-pom.xml.template:931337,931502,932129-932131,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/solr/src/maven/solr-core-pom.xml.template:931337,931502,932129-932131,932163,932304,932369,932374,932417,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/solr/trunk/src/maven/solr-core-pom.xml.template:922950-923910,923912-925091
Propchange: lucene/dev/branches/branch_3x/solr/src/maven/solr-solrj-pom.xml.template
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 10:10:07 2010
@@ -1,2 +1,2 @@
-/lucene/dev/trunk/solr/src/maven/solr-solrj-pom.xml.template:931337,931502,932129-932131,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/solr/src/maven/solr-solrj-pom.xml.template:931337,931502,932129-932131,932163,932304,932369,932374,932417,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/solr/trunk/src/maven/solr-solrj-pom.xml.template:922950-923910,923912-925091
Modified: lucene/dev/branches/branch_3x/solr/src/site/src/documentation/content/xdocs/version_control.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/site/src/documentation/content/xdocs/version_control.xml?rev=941639&r1=941638&r2=941639&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/site/src/documentation/content/xdocs/version_control.xml (original)
+++ lucene/dev/branches/branch_3x/solr/src/site/src/documentation/content/xdocs/version_control.xml Thu May 6 10:10:07 2010
@@ -40,7 +40,7 @@
<title>Web Access (read-only)</title>
<p>
The source code can be browsed via the Web at
- <a href="http://svn.apache.org/viewcvs.cgi/lucene/solr/">http://svn.apache.org/viewcvs.cgi/lucene/solr/</a>.
+ <a href="http://svn.apache.org/viewcvs.cgi/lucene/dev/">http://svn.apache.org/viewcvs.cgi/lucene/dev/</a>.
No SVN client software is required.
</p>
</section>
@@ -49,7 +49,7 @@
<title>Anonymous Access (read-only)</title>
<p>
The SVN URL for anonymous users is
- <a href="http://svn.apache.org/repos/asf/lucene/solr/">http://svn.apache.org/repos/asf/lucene/solr/</a>.
+ <a href="http://svn.apache.org/repos/asf/lucene/dev/">http://svn.apache.org/repos/asf/lucene/dev/</a>.
Instructions for anonymous SVN access are
<a href="http://www.apache.org/dev/version-control.html#anon-svn">here</a>.
</p>
@@ -59,7 +59,7 @@
<title>Committer Access (read-write)</title>
<p>
The SVN URL for committers is
- <a href="https://svn.apache.org/repos/asf/lucene/solr/">https://svn.apache.org/repos/asf/lucene/solr/</a>.
+ <a href="https://svn.apache.org/repos/asf/lucene/dev/">https://svn.apache.org/repos/asf/lucene/dev/</a>.
Instructions for committer SVN access are
<a href="http://www.apache.org/dev/version-control.html#https-svn">here</a>.
</p>
Propchange: lucene/dev/branches/branch_3x/solr/src/solrj/org/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 10:10:07 2010
@@ -1,2 +1,2 @@
-/lucene/dev/trunk/solr/src/solrj/org:931337,931502,932129-932131,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/solr/src/solrj/org:931337,931502,932129-932131,932163,932304,932369,932374,932417,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/solr/trunk/src/solrj/org:922950-923910,923912-925091
Propchange: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/client/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 10:10:07 2010
@@ -1,2 +1,2 @@
-/lucene/dev/trunk/solr/src/test/org/apache/solr/client:931337,931502,932129-932131,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/solr/src/test/org/apache/solr/client:931337,931502,932129-932131,932163,932304,932369,932374,932417,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/solr/trunk/src/test/org/apache/solr/client:922950-923910,923912-925091
Propchange: lucene/dev/branches/branch_3x/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 10:10:07 2010
@@ -1,2 +1,2 @@
-/lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/client/solrj/embedded:931337,931502,932129-932131,932163,932304,932369,932374,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
+/lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/client/solrj/embedded:931337,931502,932129-932131,932163,932304,932369,932374,932417,932587,932698,932747,932749,932773,932856,932862,932864,933613,933879,935521-935522,935734,935739,935771,936522,936544,936605,937360,938582-938646,938989,939649,940451-940452,940730,940878-940892,940994
/lucene/solr/trunk/src/webapp/src/org/apache/solr/client/solrj/embedded:922950-923910,923912-925091