svn commit: r1558524 - in /lucene/dev/branches/branch_4x: ./ solr/ solr/contrib/ solr/contrib/solr-morphlines-core/src/test/org/apache/solr/morphlines/solr/ solr/contrib/solr-mr/src/test-files/test-morphlines/

[ma...@apache.org]

Author: markrmiller
Date: Wed Jan 15 19:13:23 2014
New Revision: 1558524

URL: http://svn.apache.org/r1558524
Log:
SOLR-1301: Fix windows problem with escaping of folder name (see crazy https://github.com/typesafehub/config/blob/master/HOCON.md for correct format: string must be quoted and escaped like javascript)

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/solr/   (props changed)
    lucene/dev/branches/branch_4x/solr/contrib/   (props changed)
    lucene/dev/branches/branch_4x/solr/contrib/solr-morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineTestBase.java
    lucene/dev/branches/branch_4x/solr/contrib/solr-mr/src/test-files/test-morphlines/solrCellDocumentTypes.conf

Modified: lucene/dev/branches/branch_4x/solr/contrib/solr-morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/solr-morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineTestBase.java?rev=1558524&r1=1558523&r2=1558524&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/solr-morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineTestBase.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/solr-morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineTestBase.java Wed Jan 15 19:13:23 2014
@@ -28,6 +28,7 @@ import java.util.Map.Entry;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.client.solrj.SolrQuery;
 import org.apache.solr.client.solrj.SolrServer;
@@ -182,7 +183,7 @@ public class AbstractSolrMorphlineTestBa
   
   public static void setupMorphline(String tempDir, String file) throws IOException {
     String morphlineText = FileUtils.readFileToString(new File(RESOURCES_DIR + "/" + file + ".conf"), "UTF-8");
-    morphlineText = morphlineText.replaceAll("RESOURCES_DIR", new File(tempDir).getAbsolutePath());
+    morphlineText = morphlineText.replace("RESOURCES_DIR", StringEscapeUtils.escapeJavaScript(new File(tempDir).getAbsolutePath()));
     
     FileUtils.writeStringToFile(new File(tempDir + "/" + file + ".conf"), morphlineText, "UTF-8");
   }

Modified: lucene/dev/branches/branch_4x/solr/contrib/solr-mr/src/test-files/test-morphlines/solrCellDocumentTypes.conf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/solr-mr/src/test-files/test-morphlines/solrCellDocumentTypes.conf?rev=1558524&r1=1558523&r2=1558524&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/solr-mr/src/test-files/test-morphlines/solrCellDocumentTypes.conf (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/solr-mr/src/test-files/test-morphlines/solrCellDocumentTypes.conf Wed Jan 15 19:13:23 2014
@@ -52,7 +52,7 @@ morphlines : [
         # used for auto-detection if MIME type isn't explicitly supplied
         detectMimeType { 
           includeDefaultMimeTypes : true
-          mimeTypesFiles : [RESOURCES_DIR/custom-mimetypes.xml]
+          mimeTypesFiles : ["RESOURCES_DIR/custom-mimetypes.xml"]
         }
       }