You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2011/05/22 23:45:45 UTC
svn commit: r1126234 [2/28] - in /lucene/dev/branches/solr2452: ./
dev-tools/eclipse/ dev-tools/idea/ dev-tools/idea/.idea/
dev-tools/idea/lucene/ dev-tools/idea/lucene/contrib/ant/
dev-tools/idea/lucene/contrib/db/bdb-je/ dev-tools/idea/lucene/contrib...
Modified: lucene/dev/branches/solr2452/README.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/README.txt?rev=1126234&r1=1126233&r2=1126234&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/README.txt (original)
+++ lucene/dev/branches/solr2452/README.txt Sun May 22 21:45:19 2011
@@ -7,6 +7,7 @@ modules/ is shared code
To compile the sources run 'ant compile'
To run all the tests run 'ant test'
To setup your ide run 'ant idea' or 'ant eclipse'
+For Maven info, see dev-tools/maven/README.maven.
For more information on how to contribute see:
http://wiki.apache.org/lucene-java/HowToContribute
Modified: lucene/dev/branches/solr2452/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/build.xml?rev=1126234&r1=1126233&r2=1126234&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/build.xml (original)
+++ lucene/dev/branches/solr2452/build.xml Sun May 22 21:45:19 2011
@@ -19,7 +19,7 @@
<project name="lucene-solr" default="test" basedir=".">
<import file="common-build.xml"/>
- <target name="test" description="Test both Lucene and Solr">
+ <target name="test" description="Test both Lucene and Solr" depends="validate">
<sequential>
<subant target="test" inheritall="false" failonerror="true">
<fileset dir="lucene" includes="build.xml" />
@@ -35,7 +35,7 @@
<fileset dir="solr" includes="build.xml" />
</subant></sequential>
</target>
- <target name="compile" depends="validate" description="Compile Lucene and Solr">
+ <target name="compile" description="Compile Lucene and Solr">
<sequential>
<subant target="compile" inheritall="false" failonerror="true">
Modified: lucene/dev/branches/solr2452/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/eclipse/dot.classpath?rev=1126234&r1=1126233&r2=1126234&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/branches/solr2452/dev-tools/eclipse/dot.classpath Sun May 22 21:45:19 2011
@@ -53,6 +53,8 @@
<classpathentry kind="src" path="modules/analysis/stempel/src/test"/>
<classpathentry kind="src" path="modules/benchmark/src/java"/>
<classpathentry kind="src" path="modules/benchmark/src/test"/>
+ <classpathentry kind="src" path="modules/grouping/src/java"/>
+ <classpathentry kind="src" path="modules/grouping/src/test"/>
<classpathentry kind="src" path="solr/src/java"/>
<classpathentry kind="src" path="solr/src/webapp/src"/>
<classpathentry kind="src" path="solr/src/common"/>
@@ -95,7 +97,7 @@
<classpathentry kind="lib" path="modules/benchmark/lib/commons-digester-1.7.jar"/>
<classpathentry kind="lib" path="modules/benchmark/lib/commons-logging-1.0.4.jar"/>
<classpathentry kind="lib" path="modules/benchmark/lib/xercesImpl-2.9.1-patched-XERCESJ-1257.jar"/>
- <classpathentry kind="lib" path="solr/lib/apache-solr-noggit-r944541.jar"/>
+ <classpathentry kind="lib" path="solr/lib/apache-solr-noggit-r1099557.jar"/>
<classpathentry kind="lib" path="solr/lib/commons-beanutils-1.7.0.jar"/>
<classpathentry kind="lib" path="solr/lib/commons-codec-1.4.jar"/>
<classpathentry kind="lib" path="solr/lib/commons-collections-3.2.1.jar"/>
@@ -105,7 +107,6 @@
<classpathentry kind="lib" path="solr/lib/commons-io-1.4.jar"/>
<classpathentry kind="lib" path="solr/lib/commons-lang-2.4.jar"/>
<classpathentry kind="lib" path="solr/lib/easymock-2.2.jar"/>
- <classpathentry kind="lib" path="solr/lib/geronimo-stax-api_1.0_spec-1.0.1.jar"/>
<classpathentry kind="lib" path="solr/lib/guava-r05.jar"/>
<classpathentry kind="lib" path="solr/lib/jcl-over-slf4j-1.6.1.jar"/>
<classpathentry kind="lib" path="solr/lib/junit-4.7.jar"/>
@@ -124,13 +125,13 @@
<classpathentry kind="lib" path="solr/example/lib/jsp-2.1/jsp-2.1-glassfish-2.1.v20091210.jar"/>
<classpathentry kind="lib" path="solr/example/lib/jsp-2.1/jsp-2.1-jetty-6.1.26.jar"/>
<classpathentry kind="lib" path="solr/example/lib/jsp-2.1/jsp-api-2.1-glassfish-2.1.v20091210.jar"/>
- <classpathentry kind="lib" path="solr/contrib/clustering/lib/carrot2-core-3.4.2.jar"/>
- <classpathentry kind="lib" path="solr/contrib/clustering/lib/hppc-0.3.1.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/clustering/lib/carrot2-core-3.5.0.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/clustering/lib/hppc-0.3.3.jar"/>
<classpathentry kind="lib" path="solr/contrib/clustering/lib/jackson-core-asl-1.5.2.jar"/>
<classpathentry kind="lib" path="solr/contrib/clustering/lib/jackson-mapper-asl-1.5.2.jar"/>
<classpathentry kind="lib" path="solr/contrib/clustering/lib/mahout-collections-0.3.jar"/>
<classpathentry kind="lib" path="solr/contrib/clustering/lib/mahout-math-0.3.jar"/>
- <classpathentry kind="lib" path="solr/contrib/clustering/lib/simple-xml-2.3.5.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/clustering/lib/simple-xml-2.4.1.jar"/>
<classpathentry kind="lib" path="solr/contrib/dataimporthandler/lib/activation-1.1.jar"/>
<classpathentry kind="lib" path="solr/contrib/dataimporthandler/lib/mail-1.4.1.jar"/>
<classpathentry kind="lib" path="solr/contrib/extraction/lib/asm-3.1.jar"/>
Modified: lucene/dev/branches/solr2452/dev-tools/idea/.idea/ant.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/idea/.idea/ant.xml?rev=1126234&r1=1126233&r2=1126234&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/idea/.idea/ant.xml (original)
+++ lucene/dev/branches/solr2452/dev-tools/idea/.idea/ant.xml Sun May 22 21:45:19 2011
@@ -26,10 +26,12 @@
<buildFile url="file://$PROJECT_DIR$/modules/analysis/smartcn/build.xml" />
<buildFile url="file://$PROJECT_DIR$/modules/analysis/stempel/build.xml" />
<buildFile url="file://$PROJECT_DIR$/modules/benchmark/build.xml" />
+ <buildFile url="file://$PROJECT_DIR$/modules/grouping/build.xml" />
<buildFile url="file://$PROJECT_DIR$/solr/build.xml" />
<buildFile url="file://$PROJECT_DIR$/solr/contrib/analysis-extras/build.xml" />
<buildFile url="file://$PROJECT_DIR$/solr/contrib/clustering/build.xml" />
<buildFile url="file://$PROJECT_DIR$/solr/contrib/dataimporthandler/build.xml" />
+ <buildFile url="file://$PROJECT_DIR$/solr/contrib/dataimporthandler-extras/build.xml" />
<buildFile url="file://$PROJECT_DIR$/solr/contrib/extraction/build.xml" />
<buildFile url="file://$PROJECT_DIR$/solr/contrib/uima/build.xml" />
</component>
Modified: lucene/dev/branches/solr2452/dev-tools/idea/.idea/compiler.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/idea/.idea/compiler.xml?rev=1126234&r1=1126233&r2=1126234&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/idea/.idea/compiler.xml (original)
+++ lucene/dev/branches/solr2452/dev-tools/idea/.idea/compiler.xml Sun May 22 21:45:19 2011
@@ -27,6 +27,7 @@
<entry name="?*.tbl" />
<entry name="?*.tld" />
<entry name="?*.txt" />
+ <entry name="?*.utf8"/>
<entry name="?*.xml" />
<entry name="?*.xsl" />
<entry name="?*.vm" />
Modified: lucene/dev/branches/solr2452/dev-tools/idea/.idea/modules.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/idea/.idea/modules.xml?rev=1126234&r1=1126233&r2=1126234&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/idea/.idea/modules.xml (original)
+++ lucene/dev/branches/solr2452/dev-tools/idea/.idea/modules.xml Sun May 22 21:45:19 2011
@@ -26,11 +26,12 @@
<module filepath="$PROJECT_DIR$/modules/analysis/smartcn/smartcn.iml" />
<module filepath="$PROJECT_DIR$/modules/analysis/stempel/stempel.iml" />
<module filepath="$PROJECT_DIR$/modules/benchmark/benchmark.iml" />
+ <module filepath="$PROJECT_DIR$/modules/grouping/grouping.iml" />
<module filepath="$PROJECT_DIR$/solr/solr.iml" />
<module filepath="$PROJECT_DIR$/solr/contrib/analysis-extras/analysis-extras.iml" />
<module filepath="$PROJECT_DIR$/solr/contrib/clustering/clustering.iml" />
<module filepath="$PROJECT_DIR$/solr/contrib/dataimporthandler/dataimporthandler.iml" />
- <module filepath="$PROJECT_DIR$/solr/contrib/dataimporthandler/src/extras/extras.iml" />
+ <module filepath="$PROJECT_DIR$/solr/contrib/dataimporthandler-extras/dataimporthandler-extras.iml" />
<module filepath="$PROJECT_DIR$/solr/contrib/extraction/extraction.iml" />
<module filepath="$PROJECT_DIR$/solr/contrib/uima/uima.iml" />
</modules>
Modified: lucene/dev/branches/solr2452/dev-tools/idea/.idea/workspace.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/idea/.idea/workspace.xml?rev=1126234&r1=1126233&r2=1126234&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/idea/.idea/workspace.xml (original)
+++ lucene/dev/branches/solr2452/dev-tools/idea/.idea/workspace.xml Sun May 22 21:45:19 2011
@@ -4,7 +4,7 @@
<configuration default="false" name="analysis-extras contrib" type="JUnit" factoryName="JUnit">
<module name="analysis-extras" />
<option name="TEST_OBJECT" value="package" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/contrib/analysis-extras/build" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/build/contrib/analysis-extras" />
<option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=4.0 -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
@@ -39,7 +39,7 @@
<configuration default="false" name="clustering contrib" type="JUnit" factoryName="JUnit">
<module name="clustering" />
<option name="TEST_OBJECT" value="package" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/contrib/clustering/build" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/build/contrib/clustering" />
<option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=4.0 -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
@@ -53,21 +53,28 @@
<configuration default="false" name="dataimporthandler contrib" type="JUnit" factoryName="JUnit">
<module name="dataimporthandler" />
<option name="TEST_OBJECT" value="package" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/contrib/dataimporthandler/target" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/build/contrib/dataimporthandler" />
+ <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
+ <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
+ </configuration>
+ <configuration default="false" name="dataimporthandler-extras contrib" type="JUnit" factoryName="JUnit">
+ <module name="dataimporthandler-extras" />
+ <option name="TEST_OBJECT" value="package" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/build/contrib/dataimporthandler-extras" />
<option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
<configuration default="false" name="extraction contrib" type="JUnit" factoryName="JUnit">
<module name="extraction" />
<option name="TEST_OBJECT" value="package" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/contrib/extraction/build" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/build/contrib/extraction" />
<option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
- <configuration default="false" name="extras from dataimporthandler contrib" type="JUnit" factoryName="JUnit">
- <module name="extras" />
+ <configuration default="false" name="grouping module" type="JUnit" factoryName="JUnit">
+ <module name="grouping" />
<option name="TEST_OBJECT" value="package" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/contrib/dataimporthandler/target/extras" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/modules/grouping/build" />
<option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
@@ -186,7 +193,7 @@
<configuration default="false" name="uima contrib" type="JUnit" factoryName="JUnit">
<module name="uima" />
<option name="TEST_OBJECT" value="package" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/contrib/uima/build" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/build/contrib/uima" />
<option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=4.0 -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
@@ -204,7 +211,7 @@
<option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
- <list size="29">
+ <list size="30">
<item index="0" class="java.lang.String" itemvalue="JUnit.analysis-extras contrib" />
<item index="1" class="java.lang.String" itemvalue="JUnit.ant contrib" />
<item index="2" class="java.lang.String" itemvalue="JUnit.bdb contrib" />
@@ -213,27 +220,28 @@
<item index="5" class="java.lang.String" itemvalue="JUnit.clustering contrib" />
<item index="6" class="java.lang.String" itemvalue="JUnit.common analysis module" />
<item index="7" class="java.lang.String" itemvalue="JUnit.dataimporthandler contrib" />
- <item index="8" class="java.lang.String" itemvalue="JUnit.extraction contrib" />
- <item index="9" class="java.lang.String" itemvalue="JUnit.extras from dataimporthandler contrib" />
- <item index="10" class="java.lang.String" itemvalue="JUnit.highlighter contrib" />
- <item index="11" class="java.lang.String" itemvalue="JUnit.icu analysis module" />
- <item index="12" class="java.lang.String" itemvalue="JUnit.instantiated contrib" />
- <item index="13" class="java.lang.String" itemvalue="JUnit.lucene" />
- <item index="14" class="java.lang.String" itemvalue="JUnit.lucli contrib" />
- <item index="15" class="java.lang.String" itemvalue="JUnit.memory contrib" />
- <item index="16" class="java.lang.String" itemvalue="JUnit.misc contrib" />
- <item index="17" class="java.lang.String" itemvalue="JUnit.phonetic analysis module" />
- <item index="18" class="java.lang.String" itemvalue="JUnit.queries contrib" />
- <item index="19" class="java.lang.String" itemvalue="JUnit.queryparser contrib" />
- <item index="20" class="java.lang.String" itemvalue="JUnit.smartcn analysis module" />
- <item index="21" class="java.lang.String" itemvalue="JUnit.solr" />
- <item index="22" class="java.lang.String" itemvalue="JUnit.spatial contrib" />
- <item index="23" class="java.lang.String" itemvalue="JUnit.spellchecker contrib" />
- <item index="24" class="java.lang.String" itemvalue="JUnit.stempel analysis module" />
- <item index="25" class="java.lang.String" itemvalue="JUnit.swing contrib" />
- <item index="26" class="java.lang.String" itemvalue="JUnit.uima contrib" />
- <item index="27" class="java.lang.String" itemvalue="JUnit.wordnet contrib" />
- <item index="28" class="java.lang.String" itemvalue="JUnit.xml-query-parser contrib" />
+ <item index="8" class="java.lang.String" itemvalue="JUnit.dataimporthandler-extras contrib" />
+ <item index="9" class="java.lang.String" itemvalue="JUnit.extraction contrib" />
+ <item index="10" class="java.lang.String" itemvalue="JUnit.grouping module" />
+ <item index="11" class="java.lang.String" itemvalue="JUnit.highlighter contrib" />
+ <item index="12" class="java.lang.String" itemvalue="JUnit.icu analysis module" />
+ <item index="13" class="java.lang.String" itemvalue="JUnit.instantiated contrib" />
+ <item index="14" class="java.lang.String" itemvalue="JUnit.lucene" />
+ <item index="15" class="java.lang.String" itemvalue="JUnit.lucli contrib" />
+ <item index="16" class="java.lang.String" itemvalue="JUnit.memory contrib" />
+ <item index="17" class="java.lang.String" itemvalue="JUnit.misc contrib" />
+ <item index="18" class="java.lang.String" itemvalue="JUnit.phonetic analysis module" />
+ <item index="19" class="java.lang.String" itemvalue="JUnit.queries contrib" />
+ <item index="20" class="java.lang.String" itemvalue="JUnit.queryparser contrib" />
+ <item index="21" class="java.lang.String" itemvalue="JUnit.smartcn analysis module" />
+ <item index="22" class="java.lang.String" itemvalue="JUnit.solr" />
+ <item index="23" class="java.lang.String" itemvalue="JUnit.spatial contrib" />
+ <item index="24" class="java.lang.String" itemvalue="JUnit.spellchecker contrib" />
+ <item index="25" class="java.lang.String" itemvalue="JUnit.stempel analysis module" />
+ <item index="26" class="java.lang.String" itemvalue="JUnit.swing contrib" />
+ <item index="27" class="java.lang.String" itemvalue="JUnit.uima contrib" />
+ <item index="28" class="java.lang.String" itemvalue="JUnit.wordnet contrib" />
+ <item index="29" class="java.lang.String" itemvalue="JUnit.xml-query-parser contrib" />
</list>
</component>
</project>
Modified: lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/ant/ant.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/ant/ant.iml?rev=1126234&r1=1126233&r2=1126234&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/ant/ant.iml (original)
+++ lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/ant/ant.iml Sun May 22 21:45:19 2011
@@ -9,10 +9,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/resources" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
</content>
- <orderEntry type="module" module-name="common" />
- <orderEntry type="module" module-name="lucene" />
- <orderEntry type="module" module-name="queries" />
- <orderEntry type="module" module-name="misc" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
@@ -27,5 +23,9 @@
</orderEntry>
<orderEntry type="library" name="Ant" level="project" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+ <orderEntry type="module" module-name="queries" />
+ <orderEntry type="module" module-name="misc" />
+ <orderEntry type="module" module-name="common" />
+ <orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/db/bdb-je/bdb-je.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/db/bdb-je/bdb-je.iml?rev=1126234&r1=1126233&r2=1126234&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/db/bdb-je/bdb-je.iml (original)
+++ lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/db/bdb-je/bdb-je.iml Sun May 22 21:45:19 2011
@@ -8,8 +8,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
</content>
- <orderEntry type="module" module-name="lucene" />
- <orderEntry type="module" module-name="misc" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
@@ -23,5 +21,7 @@
</library>
</orderEntry>
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+ <orderEntry type="module" module-name="misc" />
+ <orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/db/bdb/bdb.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/db/bdb/bdb.iml?rev=1126234&r1=1126233&r2=1126234&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/db/bdb/bdb.iml (original)
+++ lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/db/bdb/bdb.iml Sun May 22 21:45:19 2011
@@ -8,8 +8,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
</content>
- <orderEntry type="module" module-name="lucene" />
- <orderEntry type="module" module-name="misc" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
@@ -23,5 +21,7 @@
</library>
</orderEntry>
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+ <orderEntry type="module" module-name="misc" />
+ <orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/demo/demo.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/demo/demo.iml?rev=1126234&r1=1126233&r2=1126234&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/demo/demo.iml (original)
+++ lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/demo/demo.iml Sun May 22 21:45:19 2011
@@ -8,20 +8,10 @@
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
</content>
- <orderEntry type="module" module-name="common" />
- <orderEntry type="module" module-name="lucene" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="file://$MODULE_DIR$/lib" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- <jarDirectory url="file://$MODULE_DIR$/lib" recursive="false" />
- </library>
- </orderEntry>
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+ <orderEntry type="module" module-name="common" />
+ <orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/highlighter/highlighter.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/highlighter/highlighter.iml?rev=1126234&r1=1126233&r2=1126234&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/highlighter/highlighter.iml (original)
+++ lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/highlighter/highlighter.iml Sun May 22 21:45:19 2011
@@ -8,12 +8,12 @@
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
</content>
- <orderEntry type="module" module-name="lucene" />
- <orderEntry type="module" module-name="memory" />
- <orderEntry type="module" module-name="queries" />
- <orderEntry type="module" module-name="misc" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+ <orderEntry type="module" module-name="memory" />
+ <orderEntry type="module" module-name="queries" />
+ <orderEntry type="module" module-name="misc" />
+ <orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/instantiated/instantiated.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/instantiated/instantiated.iml?rev=1126234&r1=1126233&r2=1126234&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/instantiated/instantiated.iml (original)
+++ lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/instantiated/instantiated.iml Sun May 22 21:45:19 2011
@@ -8,11 +8,11 @@
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
</content>
- <orderEntry type="module" module-name="lucene" />
- <orderEntry type="module" module-name="queries" />
- <orderEntry type="module" module-name="misc" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+ <orderEntry type="module" module-name="queries" />
+ <orderEntry type="module" module-name="misc" />
+ <orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/lucli/lucli.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/lucli/lucli.iml?rev=1126234&r1=1126233&r2=1126234&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/lucli/lucli.iml (original)
+++ lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/lucli/lucli.iml Sun May 22 21:45:19 2011
@@ -8,10 +8,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
</content>
- <orderEntry type="module" module-name="common" />
- <orderEntry type="module" module-name="lucene" />
- <orderEntry type="module" module-name="queries" />
- <orderEntry type="module" module-name="misc" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
@@ -24,5 +20,9 @@
<jarDirectory url="file://$MODULE_DIR$/lib" recursive="false" />
</library>
</orderEntry>
+ <orderEntry type="module" module-name="queries" />
+ <orderEntry type="module" module-name="misc" />
+ <orderEntry type="module" module-name="common" />
+ <orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/memory/memory.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/memory/memory.iml?rev=1126234&r1=1126233&r2=1126234&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/memory/memory.iml (original)
+++ lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/memory/memory.iml Sun May 22 21:45:19 2011
@@ -8,11 +8,11 @@
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
</content>
- <orderEntry type="module" module-name="lucene" />
- <orderEntry type="module" module-name="queries" />
- <orderEntry type="module" module-name="misc" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+ <orderEntry type="module" module-name="queries" />
+ <orderEntry type="module" module-name="misc" />
+ <orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/misc/misc.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/misc/misc.iml?rev=1126234&r1=1126233&r2=1126234&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/misc/misc.iml (original)
+++ lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/misc/misc.iml Sun May 22 21:45:19 2011
@@ -8,10 +8,10 @@
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
</content>
- <orderEntry type="module" module-name="common" />
- <orderEntry type="module" module-name="lucene" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+ <orderEntry type="module" module-name="common" />
+ <orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/queries/queries.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/queries/queries.iml?rev=1126234&r1=1126233&r2=1126234&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/queries/queries.iml (original)
+++ lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/queries/queries.iml Sun May 22 21:45:19 2011
@@ -8,8 +8,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
</content>
- <orderEntry type="module" module-name="lucene" />
- <orderEntry type="module" module-name="misc" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
@@ -22,5 +20,7 @@
</library>
</orderEntry>
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+ <orderEntry type="module" module-name="misc" />
+ <orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/queryparser/queryparser.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/queryparser/queryparser.iml?rev=1126234&r1=1126233&r2=1126234&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/queryparser/queryparser.iml (original)
+++ lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/queryparser/queryparser.iml Sun May 22 21:45:19 2011
@@ -9,11 +9,11 @@
<sourceFolder url="file://$MODULE_DIR$/src/resources" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
</content>
- <orderEntry type="module" module-name="lucene" />
- <orderEntry type="module" module-name="queries" />
- <orderEntry type="module" module-name="misc" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+ <orderEntry type="module" module-name="queries" />
+ <orderEntry type="module" module-name="misc" />
+ <orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/spatial/spatial.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/spatial/spatial.iml?rev=1126234&r1=1126233&r2=1126234&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/spatial/spatial.iml (original)
+++ lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/spatial/spatial.iml Sun May 22 21:45:19 2011
@@ -8,12 +8,12 @@
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
</content>
- <orderEntry type="module" module-name="lucene" />
- <orderEntry type="module" module-name="queries" />
- <orderEntry type="module" module-name="misc" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+ <orderEntry type="module" module-name="queries" />
+ <orderEntry type="module" module-name="misc" />
+ <orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/spellchecker/spellchecker.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/spellchecker/spellchecker.iml?rev=1126234&r1=1126233&r2=1126234&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/spellchecker/spellchecker.iml (original)
+++ lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/spellchecker/spellchecker.iml Sun May 22 21:45:19 2011
@@ -8,12 +8,12 @@
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
</content>
- <orderEntry type="module" module-name="common" />
- <orderEntry type="module" module-name="lucene" />
- <orderEntry type="module" module-name="queries" />
- <orderEntry type="module" module-name="misc" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+ <orderEntry type="module" module-name="queries" />
+ <orderEntry type="module" module-name="misc" />
+ <orderEntry type="module" module-name="common" />
+ <orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/swing/swing.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/swing/swing.iml?rev=1126234&r1=1126233&r2=1126234&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/swing/swing.iml (original)
+++ lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/swing/swing.iml Sun May 22 21:45:19 2011
@@ -8,12 +8,12 @@
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
</content>
- <orderEntry type="module" module-name="common" />
- <orderEntry type="module" module-name="lucene" />
- <orderEntry type="module" module-name="queries" />
- <orderEntry type="module" module-name="misc" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+ <orderEntry type="module" module-name="queries" />
+ <orderEntry type="module" module-name="misc" />
+ <orderEntry type="module" module-name="common" />
+ <orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/wordnet/wordnet.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/wordnet/wordnet.iml?rev=1126234&r1=1126233&r2=1126234&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/wordnet/wordnet.iml (original)
+++ lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/wordnet/wordnet.iml Sun May 22 21:45:19 2011
@@ -8,12 +8,12 @@
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
</content>
- <orderEntry type="module" module-name="common" />
- <orderEntry type="module" module-name="lucene" />
- <orderEntry type="module" module-name="queries" />
- <orderEntry type="module" module-name="misc" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+ <orderEntry type="module" module-name="queries" />
+ <orderEntry type="module" module-name="misc" />
+ <orderEntry type="module" module-name="common" />
+ <orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/xml-query-parser/xml-query-parser.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/xml-query-parser/xml-query-parser.iml?rev=1126234&r1=1126233&r2=1126234&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/xml-query-parser/xml-query-parser.iml (original)
+++ lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/xml-query-parser/xml-query-parser.iml Sun May 22 21:45:19 2011
@@ -10,13 +10,13 @@
<sourceFolder url="file://$MODULE_DIR$/src/demo/WebContent" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
</content>
- <orderEntry type="module" module-name="common" />
- <orderEntry type="module" module-name="lucene" />
- <orderEntry type="module" module-name="queries" />
- <orderEntry type="module" module-name="misc" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
<orderEntry type="library" name="Servlet API 2.4" level="project" />
+ <orderEntry type="module" module-name="queries" />
+ <orderEntry type="module" module-name="misc" />
+ <orderEntry type="module" module-name="common" />
+ <orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/solr2452/dev-tools/idea/modules/analysis/common/common.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/idea/modules/analysis/common/common.iml?rev=1126234&r1=1126233&r2=1126234&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/idea/modules/analysis/common/common.iml (original)
+++ lucene/dev/branches/solr2452/dev-tools/idea/modules/analysis/common/common.iml Sun May 22 21:45:19 2011
@@ -10,9 +10,9 @@
<sourceFolder url="file://$MODULE_DIR$/src/java/tools" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
</content>
- <orderEntry type="module" module-name="lucene" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+ <orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/solr2452/dev-tools/idea/modules/analysis/icu/icu.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/idea/modules/analysis/icu/icu.iml?rev=1126234&r1=1126233&r2=1126234&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/idea/modules/analysis/icu/icu.iml (original)
+++ lucene/dev/branches/solr2452/dev-tools/idea/modules/analysis/icu/icu.iml Sun May 22 21:45:19 2011
@@ -10,8 +10,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/resources" isTestSource="false" />
</content>
- <orderEntry type="module" module-name="common" />
- <orderEntry type="module" module-name="lucene" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
@@ -25,5 +23,7 @@
</library>
</orderEntry>
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+ <orderEntry type="module" module-name="common" />
+ <orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/solr2452/dev-tools/idea/modules/analysis/phonetic/phonetic.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/idea/modules/analysis/phonetic/phonetic.iml?rev=1126234&r1=1126233&r2=1126234&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/idea/modules/analysis/phonetic/phonetic.iml (original)
+++ lucene/dev/branches/solr2452/dev-tools/idea/modules/analysis/phonetic/phonetic.iml Sun May 22 21:45:19 2011
@@ -8,8 +8,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
</content>
- <orderEntry type="module" module-name="common" />
- <orderEntry type="module" module-name="lucene" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
@@ -23,5 +21,7 @@
</library>
</orderEntry>
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+ <orderEntry type="module" module-name="common" />
+ <orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/solr2452/dev-tools/idea/modules/analysis/smartcn/smartcn.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/idea/modules/analysis/smartcn/smartcn.iml?rev=1126234&r1=1126233&r2=1126234&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/idea/modules/analysis/smartcn/smartcn.iml (original)
+++ lucene/dev/branches/solr2452/dev-tools/idea/modules/analysis/smartcn/smartcn.iml Sun May 22 21:45:19 2011
@@ -9,10 +9,10 @@
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/resources" isTestSource="false" />
</content>
- <orderEntry type="module" module-name="common" />
- <orderEntry type="module" module-name="lucene" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+ <orderEntry type="module" module-name="common" />
+ <orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/solr2452/dev-tools/idea/modules/analysis/stempel/stempel.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/idea/modules/analysis/stempel/stempel.iml?rev=1126234&r1=1126233&r2=1126234&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/idea/modules/analysis/stempel/stempel.iml (original)
+++ lucene/dev/branches/solr2452/dev-tools/idea/modules/analysis/stempel/stempel.iml Sun May 22 21:45:19 2011
@@ -9,10 +9,10 @@
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/resources" isTestSource="false" />
</content>
- <orderEntry type="module" module-name="common" />
- <orderEntry type="module" module-name="lucene" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+ <orderEntry type="module" module-name="common" />
+ <orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/solr2452/dev-tools/idea/modules/benchmark/benchmark.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/idea/modules/benchmark/benchmark.iml?rev=1126234&r1=1126233&r2=1126234&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/idea/modules/benchmark/benchmark.iml (original)
+++ lucene/dev/branches/solr2452/dev-tools/idea/modules/benchmark/benchmark.iml Sun May 22 21:45:19 2011
@@ -10,13 +10,6 @@
<excludeFolder url="file://$MODULE_DIR$/temp" />
<excludeFolder url="file://$MODULE_DIR$/work" />
</content>
- <orderEntry type="module" module-name="highlighter" />
- <orderEntry type="module" module-name="common" />
- <orderEntry type="module" module-name="lucene" />
- <orderEntry type="module" module-name="icu" />
- <orderEntry type="module" module-name="queries" />
- <orderEntry type="module" module-name="misc" />
- <orderEntry type="module" module-name="memory" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
@@ -30,5 +23,12 @@
</library>
</orderEntry>
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+ <orderEntry type="module" module-name="highlighter" />
+ <orderEntry type="module" module-name="icu" />
+ <orderEntry type="module" module-name="queries" />
+ <orderEntry type="module" module-name="misc" />
+ <orderEntry type="module" module-name="memory" />
+ <orderEntry type="module" module-name="common" />
+ <orderEntry type="module" module-name="lucene" />
</component>
</module>
Copied: lucene/dev/branches/solr2452/dev-tools/idea/modules/grouping/grouping.iml (from r1125822, lucene/dev/trunk/dev-tools/idea/modules/grouping/grouping.iml)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/idea/modules/grouping/grouping.iml?p2=lucene/dev/branches/solr2452/dev-tools/idea/modules/grouping/grouping.iml&p1=lucene/dev/trunk/dev-tools/idea/modules/grouping/grouping.iml&r1=1125822&r2=1126234&rev=1126234&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/modules/grouping/grouping.iml (original)
+++ lucene/dev/branches/solr2452/dev-tools/idea/modules/grouping/grouping.iml Sun May 22 21:45:19 2011
@@ -7,7 +7,6 @@
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
- <excludeFolder url="file://$MODULE_DIR$/work" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
Modified: lucene/dev/branches/solr2452/dev-tools/idea/solr/contrib/analysis-extras/analysis-extras.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/idea/solr/contrib/analysis-extras/analysis-extras.iml?rev=1126234&r1=1126233&r2=1126234&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/idea/solr/contrib/analysis-extras/analysis-extras.iml (original)
+++ lucene/dev/branches/solr2452/dev-tools/idea/solr/contrib/analysis-extras/analysis-extras.iml Sun May 22 21:45:19 2011
@@ -1,21 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/build/classes" />
- <output-test url="file://$MODULE_DIR$/build/test-classes" />
+ <output url="file://$MODULE_DIR$/../../build/contrib/analysis-extras/classes" />
+ <output-test url="file://$MODULE_DIR$/../../build/contrib/analysis-extras/test-classes" />
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
- <excludeFolder url="file://$MODULE_DIR$/build" />
- <excludeFolder url="file://$MODULE_DIR$/lucene-libs" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
</content>
- <orderEntry type="module" module-name="common" />
- <orderEntry type="module" module-name="icu" />
- <orderEntry type="module" module-name="lucene" />
- <orderEntry type="module" module-name="smartcn" />
- <orderEntry type="module" module-name="solr" />
- <orderEntry type="module" module-name="stempel" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
@@ -30,5 +22,11 @@
</orderEntry>
<orderEntry type="library" name="Solr library" level="project" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+ <orderEntry type="module" module-name="icu" />
+ <orderEntry type="module" module-name="smartcn" />
+ <orderEntry type="module" module-name="solr" />
+ <orderEntry type="module" module-name="stempel" />
+ <orderEntry type="module" module-name="common" />
+ <orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/solr2452/dev-tools/idea/solr/contrib/clustering/clustering.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/idea/solr/contrib/clustering/clustering.iml?rev=1126234&r1=1126233&r2=1126234&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/idea/solr/contrib/clustering/clustering.iml (original)
+++ lucene/dev/branches/solr2452/dev-tools/idea/solr/contrib/clustering/clustering.iml Sun May 22 21:45:19 2011
@@ -1,25 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/build/classes" />
- <output-test url="file://$MODULE_DIR$/build/test-classes" />
+ <output url="file://$MODULE_DIR$/../../build/contrib/clustering/classes" />
+ <output-test url="file://$MODULE_DIR$/../../build/contrib/clustering/test-classes" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
- <excludeFolder url="file://$MODULE_DIR$/build" />
</content>
- <orderEntry type="module" module-name="common" />
- <orderEntry type="module" module-name="highlighter" />
- <orderEntry type="module" module-name="lucene" />
- <orderEntry type="module" module-name="memory" />
- <orderEntry type="module" module-name="misc" />
- <orderEntry type="module" module-name="phonetic" />
- <orderEntry type="module" module-name="queries" />
- <orderEntry type="module" module-name="solr" />
- <orderEntry type="module" module-name="spatial" />
- <orderEntry type="module" module-name="spellchecker" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
@@ -35,5 +24,15 @@
<orderEntry type="library" name="Solr library" level="project" />
<orderEntry type="library" name="Solr DIH library" level="project" />
<orderEntry type="library" scope="TEST" name="JUnit" level="project" />
+ <orderEntry type="module" module-name="highlighter" />
+ <orderEntry type="module" module-name="memory" />
+ <orderEntry type="module" module-name="misc" />
+ <orderEntry type="module" module-name="phonetic" />
+ <orderEntry type="module" module-name="queries" />
+ <orderEntry type="module" module-name="solr" />
+ <orderEntry type="module" module-name="spatial" />
+ <orderEntry type="module" module-name="spellchecker" />
+ <orderEntry type="module" module-name="lucene" />
+ <orderEntry type="module" module-name="common" />
</component>
</module>
Copied: lucene/dev/branches/solr2452/dev-tools/idea/solr/contrib/dataimporthandler-extras/dataimporthandler-extras.iml (from r1125818, lucene/dev/branches/solr2452/dev-tools/idea/solr/contrib/dataimporthandler/src/extras/extras.iml)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/idea/solr/contrib/dataimporthandler-extras/dataimporthandler-extras.iml?p2=lucene/dev/branches/solr2452/dev-tools/idea/solr/contrib/dataimporthandler-extras/dataimporthandler-extras.iml&p1=lucene/dev/branches/solr2452/dev-tools/idea/solr/contrib/dataimporthandler/src/extras/extras.iml&r1=1125818&r2=1126234&rev=1126234&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/idea/solr/contrib/dataimporthandler/src/extras/extras.iml (original)
+++ lucene/dev/branches/solr2452/dev-tools/idea/solr/contrib/dataimporthandler-extras/dataimporthandler-extras.iml Sun May 22 21:45:19 2011
@@ -1,22 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/../../target/extras/classes" />
- <output-test url="file://$MODULE_DIR$/../../target/extras/test-classes" />
+ <output url="file://$MODULE_DIR$/../../build/contrib/dataimporthandler-extras/classes" />
+ <output-test url="file://$MODULE_DIR$/../../build/contrib/dataimporthandler-extras/test-classes" />
<exclude-output />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/main/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/test/java" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/test/resources" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
</content>
- <orderEntry type="module" module-name="solr" />
- <orderEntry type="module" module-name="dataimporthandler" />
- <orderEntry type="module" module-name="lucene" scope="TEST" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Solr library" level="project" />
<orderEntry type="library" name="Solr DIH library" level="project" />
<orderEntry type="library" name="Solr extraction library" level="project" />
+ <orderEntry type="module" module-name="solr" />
+ <orderEntry type="module" module-name="dataimporthandler" />
+ <orderEntry type="module" module-name="lucene" scope="TEST" />
</component>
</module>
Modified: lucene/dev/branches/solr2452/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml?rev=1126234&r1=1126233&r2=1126234&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml (original)
+++ lucene/dev/branches/solr2452/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml Sun May 22 21:45:19 2011
@@ -1,22 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/target/classes" />
- <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <output url="file://$MODULE_DIR$/../../build/contrib/dataimporthandler/classes" />
+ <output-test url="file://$MODULE_DIR$/../../build/contrib/dataimporthandler/test-classes" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/webapp" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
- <excludeFolder url="file://$MODULE_DIR$/target" />
</content>
- <orderEntry type="module" module-name="common" />
- <orderEntry type="module" module-name="lucene" />
- <orderEntry type="module" module-name="solr" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Solr library" level="project" />
<orderEntry type="library" name="Solr DIH library" level="project" />
+ <orderEntry type="module" module-name="solr" />
+ <orderEntry type="module" module-name="common" />
+ <orderEntry type="module" module-name="lucene" />
</component>
</module>
Modified: lucene/dev/branches/solr2452/dev-tools/idea/solr/contrib/extraction/extraction.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/idea/solr/contrib/extraction/extraction.iml?rev=1126234&r1=1126233&r2=1126234&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/idea/solr/contrib/extraction/extraction.iml (original)
+++ lucene/dev/branches/solr2452/dev-tools/idea/solr/contrib/extraction/extraction.iml Sun May 22 21:45:19 2011
@@ -1,20 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/build/classes" />
- <output-test url="file://$MODULE_DIR$/build/test-classes" />
+ <output url="file://$MODULE_DIR$/../../build/contrib/extraction/classes" />
+ <output-test url="file://$MODULE_DIR$/../../build/contrib/extraction/test-classes" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
- <excludeFolder url="file://$MODULE_DIR$/build" />
</content>
- <orderEntry type="module" module-name="solr" />
- <orderEntry type="module" module-name="lucene" scope="TEST" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Solr library" level="project" />
<orderEntry type="library" name="Solr extraction library" level="project" />
+ <orderEntry type="module" module-name="solr" />
+ <orderEntry type="module" module-name="lucene" scope="TEST" />
</component>
</module>
Modified: lucene/dev/branches/solr2452/dev-tools/idea/solr/contrib/uima/uima.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/idea/solr/contrib/uima/uima.iml?rev=1126234&r1=1126233&r2=1126234&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/idea/solr/contrib/uima/uima.iml (original)
+++ lucene/dev/branches/solr2452/dev-tools/idea/solr/contrib/uima/uima.iml Sun May 22 21:45:19 2011
@@ -1,18 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/build/classes" />
- <output-test url="file://$MODULE_DIR$/build/test-classes" />
+ <output url="file://$MODULE_DIR$/../../build/contrib/uima/classes" />
+ <output-test url="file://$MODULE_DIR$/../../build/contrib/uima/test-classes" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
- <excludeFolder url="file://$MODULE_DIR$/build" />
</content>
- <orderEntry type="module" module-name="solr" />
- <orderEntry type="module" module-name="lucene" scope="TEST" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Solr library" level="project" />
@@ -26,5 +23,7 @@
<jarDirectory url="file://$MODULE_DIR$/lib" recursive="false" />
</library>
</orderEntry>
+ <orderEntry type="module" module-name="solr" />
+ <orderEntry type="module" module-name="lucene" scope="TEST" />
</component>
</module>
Modified: lucene/dev/branches/solr2452/dev-tools/idea/solr/solr.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/idea/solr/solr.iml?rev=1126234&r1=1126233&r2=1126234&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/idea/solr/solr.iml (original)
+++ lucene/dev/branches/solr2452/dev-tools/idea/solr/solr.iml Sun May 22 21:45:19 2011
@@ -12,23 +12,23 @@
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test-files" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test-framework" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build" />
<excludeFolder url="file://$MODULE_DIR$/dist" />
- <excludeFolder url="file://$MODULE_DIR$/lucene-libs" />
<excludeFolder url="file://$MODULE_DIR$/package" />
</content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" name="Solr library" level="project" />
+ <orderEntry type="library" name="Solr example library" level="project" />
<orderEntry type="module" module-name="spatial" />
<orderEntry type="module" module-name="highlighter" />
- <orderEntry type="module" module-name="common" />
<orderEntry type="module" module-name="icu" />
<orderEntry type="module" module-name="queries" />
<orderEntry type="module" module-name="misc" />
<orderEntry type="module" module-name="phonetic" />
<orderEntry type="module" module-name="spellchecker" />
+ <orderEntry type="module" module-name="common" />
<orderEntry type="module" module-name="lucene" />
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Solr library" level="project" />
- <orderEntry type="library" name="Solr example library" level="project" />
</component>
</module>
Modified: lucene/dev/branches/solr2452/dev-tools/maven/modules/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/maven/modules/pom.xml.template?rev=1126234&r1=1126233&r2=1126234&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/maven/modules/pom.xml.template (original)
+++ lucene/dev/branches/solr2452/dev-tools/maven/modules/pom.xml.template Sun May 22 21:45:19 2011
@@ -33,6 +33,7 @@
<modules>
<module>analysis</module>
<module>benchmark</module>
+ <module>grouping</module>
</modules>
<build>
<directory>build/lucene-modules-aggregator</directory>
Modified: lucene/dev/branches/solr2452/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/maven/pom.xml.template?rev=1126234&r1=1126233&r2=1126234&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/solr2452/dev-tools/maven/pom.xml.template Sun May 22 21:45:19 2011
@@ -24,6 +24,7 @@
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>8</version>
+ <relativePath/>
</parent>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-solr-grandparent</artifactId>
@@ -106,14 +107,6 @@
</licenses>
<repositories>
<repository>
- <id>carrot2.org</id>
- <name>Carrot2 Maven2 repository</name>
- <url>http://download.carrot2.org/maven2/</url>
- <snapshots>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- </repository>
- <repository>
<id>apache.snapshots</id>
<name>Apache Snapshot Repository</name>
<url>http://repository.apache.org/snapshots</url>
@@ -133,6 +126,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>r05</version>
+ </dependency>
+ <dependency>
<groupId>com.sleepycat</groupId>
<artifactId>berkeleydb</artifactId>
<version>4.7.25</version>
@@ -233,11 +231,6 @@
<version>1.1</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
- <version>1.0.1</version>
- </dependency>
- <dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-commons-csv</artifactId>
<version>${project.version}</version>
@@ -300,7 +293,7 @@
<dependency>
<groupId>org.carrot2</groupId>
<artifactId>carrot2-core</artifactId>
- <version>3.4.2</version>
+ <version>3.5.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
@@ -694,7 +687,7 @@
<artifactId>solr-noggit</artifactId>
<version>${project.version}</version>
<packaging>jar</packaging>
- <file>solr/lib/apache-solr-noggit-r944541.jar</file>
+ <file>solr/lib/apache-solr-noggit-r1099557.jar</file>
</configuration>
</execution>
<execution>
Modified: lucene/dev/branches/solr2452/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template?rev=1126234&r1=1126233&r2=1126234&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template (original)
+++ lucene/dev/branches/solr2452/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template Sun May 22 21:45:19 2011
@@ -33,7 +33,7 @@
<description>Apache Solr Analysis Extras</description>
<properties>
<module-directory>solr/contrib/analysis-extras</module-directory>
- <build-directory>build</build-directory>
+ <build-directory>../../build/contrib/analysis-extras</build-directory>
<tests.luceneMatchVersion>4.0</tests.luceneMatchVersion>
</properties>
<dependencies>
@@ -44,9 +44,8 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>solr-core</artifactId>
+ <artifactId>solr-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
@@ -95,8 +94,8 @@
<directory>${build-directory}</directory>
<outputDirectory>${build-directory}/classes</outputDirectory>
<testOutputDirectory>${build-directory}/test-classes</testOutputDirectory>
- <sourceDirectory>src/java</sourceDirectory>
- <testSourceDirectory>src/test</testSourceDirectory>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ <testSourceDirectory>src/test/java</testSourceDirectory>
<testResources>
<testResource>
<directory>src/test-files</directory>
Modified: lucene/dev/branches/solr2452/dev-tools/maven/solr/contrib/clustering/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/maven/solr/contrib/clustering/pom.xml.template?rev=1126234&r1=1126233&r2=1126234&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/maven/solr/contrib/clustering/pom.xml.template (original)
+++ lucene/dev/branches/solr2452/dev-tools/maven/solr/contrib/clustering/pom.xml.template Sun May 22 21:45:19 2011
@@ -33,7 +33,7 @@
<description>Apache Solr Clustering</description>
<properties>
<module-directory>solr/contrib/clustering</module-directory>
- <build-directory>build</build-directory>
+ <build-directory>../../build/contrib/clustering</build-directory>
<tests.luceneMatchVersion>4.0</tests.luceneMatchVersion>
</properties>
<dependencies>
@@ -44,9 +44,8 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>solr-core</artifactId>
+ <artifactId>solr-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Copied: lucene/dev/branches/solr2452/dev-tools/maven/solr/contrib/dataimporthandler-extras/pom.xml.template (from r1125818, lucene/dev/branches/solr2452/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/maven/solr/contrib/dataimporthandler-extras/pom.xml.template?p2=lucene/dev/branches/solr2452/dev-tools/maven/solr/contrib/dataimporthandler-extras/pom.xml.template&p1=lucene/dev/branches/solr2452/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template&r1=1125818&r2=1126234&rev=1126234&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template (original)
+++ lucene/dev/branches/solr2452/dev-tools/maven/solr/contrib/dataimporthandler-extras/pom.xml.template Sun May 22 21:45:19 2011
@@ -24,7 +24,7 @@
<groupId>org.apache.solr</groupId>
<artifactId>solr-parent</artifactId>
<version>@version@</version>
- <relativePath>../../../../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.apache.solr</groupId>
<artifactId>solr-dataimporthandler-extras</artifactId>
@@ -32,8 +32,8 @@
<name>Apache Solr DataImportHandler Extras</name>
<description>Apache Solr DataImportHandler Extras</description>
<properties>
- <module-directory>solr/contrib/dataimporthandler/src/extras</module-directory>
- <build-directory>../../target/extras</build-directory>
+ <module-directory>solr/contrib/dataimporthandler-extras</module-directory>
+ <build-directory>../../build/contrib/dataimporthandler-extras</build-directory>
<tests.luceneMatchVersion>4.0</tests.luceneMatchVersion>
</properties>
<dependencies>
@@ -44,9 +44,8 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>solr-core</artifactId>
+ <artifactId>solr-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
@@ -104,16 +103,16 @@
</dependencies>
<build>
<directory>${build-directory}</directory>
- <outputDirectory>${build-directory}/extras/classes</outputDirectory>
- <testOutputDirectory>${build-directory}/extras/test-classes</testOutputDirectory>
- <sourceDirectory>main/java</sourceDirectory>
- <testSourceDirectory>test/java</testSourceDirectory>
+ <outputDirectory>${build-directory}/classes</outputDirectory>
+ <testOutputDirectory>${build-directory}/test-classes</testOutputDirectory>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ <testSourceDirectory>src/test/java</testSourceDirectory>
<testResources>
<testResource>
- <directory>test/resources</directory>
+ <directory>src/test/resources</directory>
</testResource>
<testResource>
- <directory>../../../../src/test-files</directory>
+ <directory>../../src/test-files</directory>
</testResource>
</testResources>
<plugins>
@@ -122,7 +121,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemPropertyVariables>
- <java.util.logging.config.file>../../../../../../testlogging.properties</java.util.logging.config.file>
+ <java.util.logging.config.file>../../../../testlogging.properties</java.util.logging.config.file>
</systemPropertyVariables>
</configuration>
</plugin>
Copied: lucene/dev/branches/solr2452/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template (from r1125818, lucene/dev/branches/solr2452/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template?p2=lucene/dev/branches/solr2452/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template&p1=lucene/dev/branches/solr2452/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template&r1=1125818&r2=1126234&rev=1126234&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template (original)
+++ lucene/dev/branches/solr2452/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template Sun May 22 21:45:19 2011
@@ -24,7 +24,7 @@
<groupId>org.apache.solr</groupId>
<artifactId>solr-parent</artifactId>
<version>@version@</version>
- <relativePath>../../../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.apache.solr</groupId>
<artifactId>solr-dataimporthandler</artifactId>
@@ -33,7 +33,7 @@
<description>Apache Solr DataImportHandler</description>
<properties>
<module-directory>solr/contrib/dataimporthandler</module-directory>
- <build-directory>../target</build-directory>
+ <build-directory>../../build/contrib/dataimporthandler</build-directory>
<tests.luceneMatchVersion>4.0</tests.luceneMatchVersion>
</properties>
<dependencies>
@@ -43,10 +43,9 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>solr-core</artifactId>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
@@ -71,10 +70,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
- </dependency>
- <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
@@ -107,14 +102,14 @@
<directory>${build-directory}</directory>
<outputDirectory>${build-directory}/classes</outputDirectory>
<testOutputDirectory>${build-directory}/test-classes</testOutputDirectory>
- <sourceDirectory>main/java</sourceDirectory>
- <testSourceDirectory>test/java</testSourceDirectory>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ <testSourceDirectory>src/test/java</testSourceDirectory>
<testResources>
<testResource>
- <directory>test/resources</directory>
+ <directory>src/test/resources</directory>
</testResource>
<testResource>
- <directory>../../../src/test-files</directory>
+ <directory>../../src/test-files</directory>
</testResource>
</testResources>
<plugins>
@@ -134,7 +129,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemPropertyVariables>
- <java.util.logging.config.file>../../../../../testlogging.properties</java.util.logging.config.file>
+ <java.util.logging.config.file>../../../../testlogging.properties</java.util.logging.config.file>
</systemPropertyVariables>
</configuration>
</plugin>
Modified: lucene/dev/branches/solr2452/dev-tools/maven/solr/contrib/extraction/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/maven/solr/contrib/extraction/pom.xml.template?rev=1126234&r1=1126233&r2=1126234&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/maven/solr/contrib/extraction/pom.xml.template (original)
+++ lucene/dev/branches/solr2452/dev-tools/maven/solr/contrib/extraction/pom.xml.template Sun May 22 21:45:19 2011
@@ -36,7 +36,7 @@
</description>
<properties>
<module-directory>solr/contrib/extraction</module-directory>
- <build-directory>build</build-directory>
+ <build-directory>../../build/contrib/extraction</build-directory>
<tests.luceneMatchVersion>4.0</tests.luceneMatchVersion>
</properties>
<dependencies>
@@ -47,9 +47,8 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>solr-core</artifactId>
+ <artifactId>solr-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/branches/solr2452/dev-tools/maven/solr/contrib/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/maven/solr/contrib/pom.xml.template?rev=1126234&r1=1126233&r2=1126234&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/maven/solr/contrib/pom.xml.template (original)
+++ lucene/dev/branches/solr2452/dev-tools/maven/solr/contrib/pom.xml.template Sun May 22 21:45:19 2011
@@ -34,6 +34,7 @@
<module>analysis-extras</module>
<module>clustering</module>
<module>dataimporthandler</module>
+ <module>dataimporthandler-extras</module>
<module>extraction</module>
<module>uima</module>
</modules>
Modified: lucene/dev/branches/solr2452/dev-tools/maven/solr/contrib/uima/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/maven/solr/contrib/uima/pom.xml.template?rev=1126234&r1=1126233&r2=1126234&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/maven/solr/contrib/uima/pom.xml.template (original)
+++ lucene/dev/branches/solr2452/dev-tools/maven/solr/contrib/uima/pom.xml.template Sun May 22 21:45:19 2011
@@ -33,7 +33,7 @@
<description>Apache Solr - UIMA integration</description>
<properties>
<module-directory>solr/contrib/uima</module-directory>
- <build-directory>build</build-directory>
+ <build-directory>../../build/contrib/uima</build-directory>
<tests.luceneMatchVersion>4.0</tests.luceneMatchVersion>
</properties>
<dependencies>
@@ -44,9 +44,8 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>solr-core</artifactId>
+ <artifactId>solr-test-framework</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified: lucene/dev/branches/solr2452/dev-tools/maven/solr/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/maven/solr/pom.xml.template?rev=1126234&r1=1126233&r2=1126234&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/maven/solr/pom.xml.template (original)
+++ lucene/dev/branches/solr2452/dev-tools/maven/solr/pom.xml.template Sun May 22 21:45:19 2011
@@ -35,6 +35,7 @@
<module>src</module>
<module>src/solrj</module>
<module>src/webapp</module>
+ <module>src/test-framework</module>
<module>contrib</module>
</modules>
<properties>
Modified: lucene/dev/branches/solr2452/dev-tools/maven/solr/src/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/maven/solr/src/pom.xml.template?rev=1126234&r1=1126233&r2=1126234&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/maven/solr/src/pom.xml.template (original)
+++ lucene/dev/branches/solr2452/dev-tools/maven/solr/src/pom.xml.template Sun May 22 21:45:19 2011
@@ -97,10 +97,6 @@
<artifactId>solr-commons-csv</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
- </dependency>
- <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
@@ -157,6 +153,10 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
@@ -199,17 +199,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemPropertyVariables>
@@ -248,6 +237,24 @@
</programs>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-test-source</id>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>add-test-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>test-framework</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
Modified: lucene/dev/branches/solr2452/dev-tools/maven/solr/src/solrj/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/maven/solr/src/solrj/pom.xml.template?rev=1126234&r1=1126233&r2=1126234&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/maven/solr/src/solrj/pom.xml.template (original)
+++ lucene/dev/branches/solr2452/dev-tools/maven/solr/src/solrj/pom.xml.template Sun May 22 21:45:19 2011
@@ -44,21 +44,11 @@
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
- <artifactId>lucene-test-framework</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
<artifactId>lucene-analyzers-common</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<exclusions>
@@ -88,15 +78,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
- <outputDirectory>${build-directory}</outputDirectory>
+ <outputDirectory>${build-directory}/classes</outputDirectory>
<sourceDirectory>.</sourceDirectory>
<testResources/>
<plugins>