SOLR-1301: Straighten out module names so that they match current convention

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1547819 13f79535-47bb-0310-9956-ffa450edef68

dev-tools/idea/.idea/ant.xml

@@ -45,9 +45,9 @@
     <buildFile url="file://$PROJECT_DIR$/solr/contrib/dataimporthandler/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/solr/contrib/extraction/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/solr/contrib/langid/build.xml" />
-    <buildFile url="file://$PROJECT_DIR$/solr/contrib/solr-morphlines-cell/build.xml" />
-    <buildFile url="file://$PROJECT_DIR$/solr/contrib/solr-morphlines-core/build.xml" />
-    <buildFile url="file://$PROJECT_DIR$/solr/contrib/solr-mr/build.xml" />
+    <buildFile url="file://$PROJECT_DIR$/solr/contrib/morphlines-cell/build.xml" />
+    <buildFile url="file://$PROJECT_DIR$/solr/contrib/morphlines-core/build.xml" />
+    <buildFile url="file://$PROJECT_DIR$/solr/contrib/map-reduce/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/solr/contrib/uima/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/solr/contrib/velocity/build.xml" />
     <buildFile url="file://$PROJECT_DIR$/solr/solrj/build.xml" />

dev-tools/idea/.idea/libraries/Solr_morphlines_cell_library.xml

@@ -1,10 +1,10 @@
 <component name="libraryTable">
   <library name="Solr morphlines cell library">
     <CLASSES>
-      <root url="file://$PROJECT_DIR$/solr/contrib/solr-morphlines-cell/lib" />
+      <root url="file://$PROJECT_DIR$/solr/contrib/morphlines-cell/lib" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
-    <jarDirectory url="file://$PROJECT_DIR$/solr/contrib/solr-morphlines-cell/lib" recursive="false" />
+    <jarDirectory url="file://$PROJECT_DIR$/solr/contrib/morphlines-cell/lib" recursive="false" />
   </library>
 </component>

dev-tools/idea/.idea/libraries/Solr_morphlines_core_library.xml

@@ -1,10 +1,10 @@
 <component name="libraryTable">
   <library name="Solr morphlines core library">
     <CLASSES>
-      <root url="file://$PROJECT_DIR$/solr/contrib/solr-morphlines-core/lib" />
+      <root url="file://$PROJECT_DIR$/solr/contrib/morphlines-core/lib" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
-    <jarDirectory url="file://$PROJECT_DIR$/solr/contrib/solr-morphlines-core/lib" recursive="false" />
+    <jarDirectory url="file://$PROJECT_DIR$/solr/contrib/morphlines-core/lib" recursive="false" />
   </library>
 </component>

dev-tools/idea/.idea/libraries/Solr_morphlines_core_test_library.xml

@@ -1,10 +1,10 @@
 <component name="libraryTable">
   <library name="Solr morphlines core test library">
     <CLASSES>
-      <root url="file://$PROJECT_DIR$/solr/contrib/solr-morphlines-core/test-lib" />
+      <root url="file://$PROJECT_DIR$/solr/contrib/morphlines-core/test-lib" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
-    <jarDirectory url="file://$PROJECT_DIR$/solr/contrib/solr-morphlines-core/test-lib" recursive="false" />
+    <jarDirectory url="file://$PROJECT_DIR$/solr/contrib/morphlines-core/test-lib" recursive="false" />
   </library>
 </component>

dev-tools/idea/.idea/modules.xml

@@ -49,9 +49,9 @@
       <module filepath="$PROJECT_DIR$/solr/contrib/dataimporthandler/dataimporthandler.iml" />
       <module filepath="$PROJECT_DIR$/solr/contrib/extraction/extraction.iml" />
       <module filepath="$PROJECT_DIR$/solr/contrib/langid/langid.iml" />
-      <module filepath="$PROJECT_DIR$/solr/contrib/solr-morphlines-cell/solr-morphlines-cell.iml" />
-      <module filepath="$PROJECT_DIR$/solr/contrib/solr-morphlines-core/solr-morphlines-core.iml" />
-      <module filepath="$PROJECT_DIR$/solr/contrib/solr-mr/solr-mr.iml" />
+      <module filepath="$PROJECT_DIR$/solr/contrib/morphlines-cell/morphlines-cell.iml" />
+      <module filepath="$PROJECT_DIR$/solr/contrib/morphlines-core/morphlines-core.iml" />
+      <module filepath="$PROJECT_DIR$/solr/contrib/map-reduce/map-reduce.iml" />
       <module filepath="$PROJECT_DIR$/solr/contrib/uima/uima.iml" />
       <module filepath="$PROJECT_DIR$/solr/contrib/velocity/velocity.iml" />
       <module filepath="$PROJECT_DIR$/solr/solrj/src/java/solrj.iml" />

dev-tools/idea/.idea/workspace.xml

@@ -236,23 +236,23 @@
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
     <configuration default="false" name="Solr morphlines-cell contrib" type="JUnit" factoryName="JUnit">
-      <module name="solr-morphlines-cell" />
+      <module name="morphlines-cell" />
       <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/solr/contrib/solr-morphlines-cell" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/solr/contrib/morphlines-cell" />
       <option name="VM_PARAMETERS" value="-ea -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
     <configuration default="false" name="Solr morphlines-core contrib" type="JUnit" factoryName="JUnit">
-      <module name="solr-morphlines-core" />
+      <module name="morphlines-core" />
       <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/solr/contrib/solr-morphlines-core" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/solr/contrib/morphlines-core" />
       <option name="VM_PARAMETERS" value="-ea -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>
     <configuration default="false" name="Solr mr (map-reduce) contrib" type="JUnit" factoryName="JUnit">
-      <module name="solr-mr" />
+      <module name="map-reduce" />
       <option name="TEST_OBJECT" value="package" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/solr/contrib/solr-mr" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/idea-build/solr/contrib/map-reduce" />
       <option name="VM_PARAMETERS" value="-ea -DtempDir=temp -Djetty.testMode=1 -Djetty.insecurerandom=1 -Dsolr.directoryFactory=org.apache.solr.core.MockDirectoryFactory" />
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
     </configuration>

dev-tools/idea/solr/contrib/map-reduce/map-reduce.iml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/solr-mr/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/solr-mr/classes/test" />
+    <output url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/map-reduce/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/map-reduce/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
@@ -25,7 +25,7 @@
     <orderEntry type="module" module-name="misc" />
     <orderEntry type="module" module-name="extraction" />
     <orderEntry type="module" module-name="lucene-core" />
-    <orderEntry type="module" module-name="solr-morphlines-core" />
+    <orderEntry type="module" module-name="morphlines-core" />
     <orderEntry type="module-library">
       <library>
         <CLASSES>

dev-tools/idea/solr/contrib/morphlines-cell/morphlines-cell.iml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/solr-morphlines-cell/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/solr-morphlines-cell/classes/test" />
+    <output url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/morphlines-cell/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/morphlines-cell/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
@@ -23,6 +23,6 @@
     <orderEntry type="module" module-name="solr-core" />
     <orderEntry type="module" module-name="solrj" />
     <orderEntry type="module" module-name="extraction" />
-    <orderEntry type="module" module-name="solr-morphlines-core" />
+    <orderEntry type="module" module-name="morphlines-core" />
   </component>
 </module>

dev-tools/idea/solr/contrib/morphlines-core/morphlines-core.iml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/solr-morphlines-core/classes/java" />
-    <output-test url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/solr-morphlines-core/classes/test" />
+    <output url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/morphlines-core/classes/java" />
+    <output-test url="file://$MODULE_DIR$/../../../idea-build/solr/contrib/morphlines-core/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />

dev-tools/maven/solr/contrib/map-reduce/pom.xml.template

@@ -27,12 +27,12 @@
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.solr</groupId>
-  <artifactId>solr-mr</artifactId>
+  <artifactId>solr-map-reduce</artifactId>
   <packaging>jar</packaging>
   <name>Apache Solr map-reduce index construction</name>
   <description>Apache Solr - map-reduce index construction</description>
   <properties>
-    <module-directory>solr/contrib/solr-mr</module-directory>
+    <module-directory>solr/contrib/map-reduce</module-directory>
     <relative-top-level>../../../..</relative-top-level>
     <module-path>${relative-top-level}/${module-directory}</module-path>
   </properties>
@@ -55,10 +55,10 @@
       <artifactId>solr-test-framework</artifactId>
       <scope>test</scope>
     </dependency>
-@solr-mr.internal.dependencies@
-@solr-mr.external.dependencies@
-@solr-mr.internal.test.dependencies@
-@solr-mr.external.test.dependencies@
+@solr-map-reduce.internal.dependencies@
+@solr-map-reduce.external.dependencies@
+@solr-map-reduce.internal.test.dependencies@
+@solr-map-reduce.external.test.dependencies@
   </dependencies>
   <build>
     <sourceDirectory>${module-path}/src/java</sourceDirectory>

dev-tools/maven/solr/contrib/morphlines-cell/pom.xml.template

@@ -32,7 +32,7 @@
   <name>Apache Solr Cell Morphlines</name>
   <description>Apache Solr - Cell Morphlines</description>
   <properties>
-    <module-directory>solr/contrib/solr-morphlines-cell</module-directory>
+    <module-directory>solr/contrib/morphlines-cell</module-directory>
     <relative-top-level>../../../..</relative-top-level>
     <module-path>${relative-top-level}/${module-directory}</module-path>
   </properties>

dev-tools/maven/solr/contrib/morphlines-core/pom.xml.template

@@ -32,7 +32,7 @@
   <name>Apache Solr Morphlines Core</name>
   <description>Apache Solr - Morphlines Core</description>
   <properties>
-    <module-directory>solr/contrib/solr-morphlines-core</module-directory>
+    <module-directory>solr/contrib/morphlines-core</module-directory>
     <relative-top-level>../../../..</relative-top-level>
     <module-path>${relative-top-level}/${module-directory}</module-path>
   </properties>

dev-tools/maven/solr/contrib/pom.xml.template

@@ -37,9 +37,9 @@
     <module>dataimporthandler-extras</module>
     <module>extraction</module>
     <module>langid</module>
-    <module>solr-morphlines-cell</module>
-    <module>solr-morphlines-core</module>
-    <module>solr-mr</module>
+    <module>morphlines-cell</module>
+    <module>morphlines-core</module>
+    <module>map-reduce</module>
     <module>uima</module>
     <module>velocity</module>
   </modules>

solr/contrib/map-reduce/build.xml

@@ -17,7 +17,7 @@
     limitations under the License.
  -->
 
-<project name="solr-mr" default="default">
+<project name="solr-map-reduce" default="default">
 
   <description>
     Solr map-reduce index construction.
@@ -29,7 +29,7 @@
   
   <property name="main.class" value="org.apache.solr.hadoop.MapReduceIndexerTool" />
   
-  <solr-contrib-uptodate name="solr-extraction" 
+  <solr-contrib-uptodate name="extraction" 
                          property="solr-extraction.uptodate" 
                          classpath.property="solr-cell.jar"/>
   
@@ -39,20 +39,20 @@
     </ant>
   </target>
   
-  <solr-contrib-uptodate name="solr-morphlines-core" 
+  <solr-contrib-uptodate name="morphlines-core" 
                          property="solr-morphlines-core.uptodate"/>
   
-  <target name="compile-solr-morphlines-core" unless="solr-morphlines-core.uptodate">
-   <ant dir="${common-solr.dir}/contrib/solr-morphlines-core" target="compile-core" inheritAll="false">
+  <target name="compile-morphlines-core" unless="solr-morphlines-core.uptodate">
+   <ant dir="${common-solr.dir}/contrib/morphlines-core" target="compile-core" inheritAll="false">
       <propertyset refid="uptodate.and.compiled.properties"/>
     </ant>
   </target>
   
-  <solr-contrib-uptodate name="solr-morphlines-cell" 
+  <solr-contrib-uptodate name="morphlines-cell" 
                          property="solr-morphlines-cell.uptodate"/>
   
-  <target name="compile-solr-morphlines-cell" unless="solr-morphlines-cell.uptodate">
-   <ant dir="${common-solr.dir}/contrib/solr-morphlines-cell" target="compile-core" inheritAll="false">
+  <target name="compile-morphlines-cell" unless="solr-morphlines-cell.uptodate">
+   <ant dir="${common-solr.dir}/contrib/morphlines-cell" target="compile-core" inheritAll="false">
       <propertyset refid="uptodate.and.compiled.properties"/>
     </ant>
   </target>
@@ -63,14 +63,14 @@
     </ant>
   </target>
 
-  <target name="resolve-solr-morphlines-core-libs">
-    <ant dir="${common-solr.dir}/contrib/solr-morphlines-core" target="resolve" inheritAll="false">
+  <target name="resolve-morphlines-core-libs">
+    <ant dir="${common-solr.dir}/contrib/morphlines-core" target="resolve" inheritAll="false">
       <propertyset refid="uptodate.and.compiled.properties"/>
     </ant>
   </target>
   
-  <target name="resolve-solr-morphlines-cell-libs">
-    <ant dir="${common-solr.dir}/contrib/solr-morphlines-cell" target="resolve" inheritAll="false">
+  <target name="resolve-morphlines-cell-libs">
+    <ant dir="${common-solr.dir}/contrib/morphlines-cell" target="resolve" inheritAll="false">
       <propertyset refid="uptodate.and.compiled.properties"/>
     </ant>
   </target>
@@ -79,9 +79,9 @@
     <pathelement location="${common-solr.dir}/build/contrib/solr-cell/classes/java"/>
     <fileset dir="${common-solr.dir}/contrib/extraction/lib" excludes="${common.classpath.excludes}"/>
     <pathelement location="${common-solr.dir}/build/contrib/solr-morphlines-core/classes/java"/>
-    <fileset dir="${common-solr.dir}/contrib/solr-morphlines-core/lib" excludes="${common.classpath.excludes}"/>
+    <fileset dir="${common-solr.dir}/contrib/morphlines-core/lib" excludes="${common.classpath.excludes}"/>
     <pathelement location="${common-solr.dir}/build/contrib/solr-morphlines-cell/classes/java"/>
-    <fileset dir="${common-solr.dir}/contrib/solr-morphlines-cell/lib" excludes="${common.classpath.excludes}"/>
+    <fileset dir="${common-solr.dir}/contrib/morphlines-cell/lib" excludes="${common.classpath.excludes}"/>
   </path>
 
   <path id="classpath">
@@ -92,7 +92,7 @@
   <path id="test.classpath">
     <path refid="solr.test.base.classpath"/>
     <path refid="classpath.additions"/>
-    <fileset dir="${common-solr.dir}/contrib/solr-morphlines-core/test-lib" excludes="${common.classpath.excludes}"/>
+    <fileset dir="${common-solr.dir}/contrib/morphlines-core/test-lib" excludes="${common.classpath.excludes}"/>
   </path>
 
   <path id="javadoc.classpath">
@@ -106,7 +106,7 @@
   </path>
   
   <!-- TODO: make this nicer like lucene? -->
-  <target name="javadocs" depends="compile-core,define-lucene-javadoc-url,lucene-javadocs,javadocs-solr-core,javadocs-extraction,javadocs-solr-morphlines-core,javadocs-solr-morphlines-cell">
+  <target name="javadocs" depends="compile-core,define-lucene-javadoc-url,lucene-javadocs,javadocs-solr-core,javadocs-extraction,javadocs-morphlines-core,javadocs-morphlines-cell">
         <sequential>
       <mkdir dir="${javadoc.dir}/${name}"/>
       <solr-invoke-javadoc>
@@ -129,19 +129,19 @@
     </ant>
   </target>
   
-  <target name="javadocs-solr-morphlines-core">
-    <ant dir="${common-solr.dir}/contrib/solr-morphlines-core" target="javadocs" inheritAll="false">
+  <target name="javadocs-morphlines-core">
+    <ant dir="${common-solr.dir}/contrib/morphlines-core" target="javadocs" inheritAll="false">
       <propertyset refid="uptodate.and.compiled.properties"/>
     </ant>
   </target>
   
-  <target name="javadocs-solr-morphlines-cell">
-    <ant dir="${common-solr.dir}/contrib/solr-morphlines-cell" target="javadocs" inheritAll="false">
+  <target name="javadocs-morphlines-cell">
+    <ant dir="${common-solr.dir}/contrib/morphlines-cell" target="javadocs" inheritAll="false">
      <propertyset refid="uptodate.and.compiled.properties"/>
     </ant>
   </target>
   
-  <target name="compile-core" depends="resolve-extraction-libs, resolve-solr-morphlines-core-libs, resolve-solr-morphlines-cell-libs, compile-solr-extraction, compile-solr-morphlines-core, compile-solr-morphlines-cell, solr-contrib-build.compile-core"/>
+  <target name="compile-core" depends="resolve-extraction-libs, resolve-morphlines-core-libs, resolve-morphlines-cell-libs, compile-solr-extraction, compile-morphlines-core, compile-morphlines-cell, solr-contrib-build.compile-core"/>
   <target name="dist" depends="common-solr.dist"/>
 
 </project>

solr/contrib/map-reduce/ivy.xml

@@ -17,7 +17,7 @@
    under the License.    
 -->
 <ivy-module version="2.0" xmlns:maven="http://ant.apache.org/ivy/maven">
-  <info organisation="org.apache.solr" module="solr-mr" />
+  <info organisation="org.apache.solr" module="map-reduce" />
   <configurations>
     <conf name="compile" transitive="false" />
     <conf name="test" transitive="false" />

solr/contrib/map-reduce/src/java/overview.html

@@ -16,6 +16,6 @@
 -->
 <html>
 <body>
-Apache Solr Search Server: Solr MapReduce index building contrib
+Apache Solr Search Server: Solr MapReduce contrib
 </body>
 </html>