You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2014/01/15 20:31:15 UTC
svn commit: r1558540 - in /lucene/dev/branches/branch_4x: ./ dev-tools/ dev-tools/idea/.idea/ dev-tools/idea/.idea/libraries/ dev-tools/idea/solr/contrib/map-reduce/ dev-tools/idea/solr/contrib/morphlines-cell/ dev-tools/idea/solr/contrib/morphlines-co...

Author: markrmiller
Date: Wed Jan 15 19:31:15 2014
New Revision: 1558540

URL: http://svn.apache.org/r1558540
Log:
SOLR-1301: Straighten out module names so that they match current convention

Added:
    lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/map-reduce/
      - copied from r1547819, lucene/dev/trunk/dev-tools/idea/solr/contrib/map-reduce/
    lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/morphlines-cell/
      - copied from r1547819, lucene/dev/trunk/dev-tools/idea/solr/contrib/morphlines-cell/
    lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/morphlines-core/
      - copied from r1547819, lucene/dev/trunk/dev-tools/idea/solr/contrib/morphlines-core/
    lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/map-reduce/
      - copied from r1547819, lucene/dev/trunk/dev-tools/maven/solr/contrib/map-reduce/
    lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/morphlines-cell/
      - copied from r1547819, lucene/dev/trunk/dev-tools/maven/solr/contrib/morphlines-cell/
    lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/morphlines-core/
      - copied from r1547819, lucene/dev/trunk/dev-tools/maven/solr/contrib/morphlines-core/
    lucene/dev/branches/branch_4x/solr/contrib/map-reduce/   (props changed)
      - copied from r1547819, lucene/dev/trunk/solr/contrib/map-reduce/
    lucene/dev/branches/branch_4x/solr/contrib/morphlines-cell/   (props changed)
      - copied from r1547819, lucene/dev/trunk/solr/contrib/morphlines-cell/
    lucene/dev/branches/branch_4x/solr/contrib/morphlines-core/   (props changed)
      - copied from r1547819, lucene/dev/trunk/solr/contrib/morphlines-core/
    lucene/dev/branches/branch_4x/solr/example/scripts/map-reduce/
      - copied from r1547819, lucene/dev/trunk/solr/example/scripts/map-reduce/
Removed:
    lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/solr-morphlines-cell/
    lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/solr-morphlines-core/
    lucene/dev/branches/branch_4x/dev-tools/idea/solr/contrib/solr-mr/
    lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/solr-morphlines-cell/
    lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/solr-morphlines-core/
    lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/solr-mr/
    lucene/dev/branches/branch_4x/solr/contrib/solr-morphlines-cell/
    lucene/dev/branches/branch_4x/solr/contrib/solr-morphlines-core/
    lucene/dev/branches/branch_4x/solr/contrib/solr-mr/
    lucene/dev/branches/branch_4x/solr/example/scripts/solr-mr/
Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/dev-tools/   (props changed)
    lucene/dev/branches/branch_4x/dev-tools/idea/.idea/ant.xml
    lucene/dev/branches/branch_4x/dev-tools/idea/.idea/libraries/Solr_morphlines_cell_library.xml
    lucene/dev/branches/branch_4x/dev-tools/idea/.idea/libraries/Solr_morphlines_core_library.xml
    lucene/dev/branches/branch_4x/dev-tools/idea/.idea/libraries/Solr_morphlines_core_test_library.xml
    lucene/dev/branches/branch_4x/dev-tools/idea/.idea/modules.xml
    lucene/dev/branches/branch_4x/dev-tools/idea/.idea/workspace.xml
    lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/pom.xml.template
    lucene/dev/branches/branch_4x/solr/   (props changed)
    lucene/dev/branches/branch_4x/solr/contrib/   (props changed)
    lucene/dev/branches/branch_4x/solr/example/   (props changed)

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/.idea/ant.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/.idea/ant.xml?rev=1558540&r1=1558539&r2=1558540&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/.idea/ant.xml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/.idea/ant.xml Wed Jan 15 19:31:15 2014
@@ -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" />

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/.idea/libraries/Solr_morphlines_cell_library.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/.idea/libraries/Solr_morphlines_cell_library.xml?rev=1558540&r1=1558539&r2=1558540&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/.idea/libraries/Solr_morphlines_cell_library.xml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/.idea/libraries/Solr_morphlines_cell_library.xml Wed Jan 15 19:31:15 2014
@@ -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>
\ No newline at end of file

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/.idea/libraries/Solr_morphlines_core_library.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/.idea/libraries/Solr_morphlines_core_library.xml?rev=1558540&r1=1558539&r2=1558540&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/.idea/libraries/Solr_morphlines_core_library.xml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/.idea/libraries/Solr_morphlines_core_library.xml Wed Jan 15 19:31:15 2014
@@ -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>
\ No newline at end of file

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/.idea/libraries/Solr_morphlines_core_test_library.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/.idea/libraries/Solr_morphlines_core_test_library.xml?rev=1558540&r1=1558539&r2=1558540&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/.idea/libraries/Solr_morphlines_core_test_library.xml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/.idea/libraries/Solr_morphlines_core_test_library.xml Wed Jan 15 19:31:15 2014
@@ -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>
\ No newline at end of file

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/.idea/modules.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/.idea/modules.xml?rev=1558540&r1=1558539&r2=1558540&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/.idea/modules.xml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/.idea/modules.xml Wed Jan 15 19:31:15 2014
@@ -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" />

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/.idea/workspace.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/.idea/workspace.xml?rev=1558540&r1=1558539&r2=1558540&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/.idea/workspace.xml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/.idea/workspace.xml Wed Jan 15 19:31:15 2014
@@ -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>

Modified: lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/pom.xml.template?rev=1558540&r1=1558539&r2=1558540&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/solr/contrib/pom.xml.template Wed Jan 15 19:31:15 2014
@@ -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>