You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2013/12/03 00:30:55 UTC

svn commit: r1547239 - in /lucene/dev/trunk/solr/contrib: solr-morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineTestBase.java solr-mr/src/test-files/test-morphlines/solrCellDocumentTypes.conf

Author: uschindler
Date: Mon Dec  2 23:30:54 2013
New Revision: 1547239

URL: http://svn.apache.org/r1547239
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/trunk/solr/contrib/solr-morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineTestBase.java
    lucene/dev/trunk/solr/contrib/solr-mr/src/test-files/test-morphlines/solrCellDocumentTypes.conf

Modified: lucene/dev/trunk/solr/contrib/solr-morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/solr-morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineTestBase.java?rev=1547239&r1=1547238&r2=1547239&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/solr-morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineTestBase.java (original)
+++ lucene/dev/trunk/solr/contrib/solr-morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineTestBase.java Mon Dec  2 23:30:54 2013
@@ -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/trunk/solr/contrib/solr-mr/src/test-files/test-morphlines/solrCellDocumentTypes.conf
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/solr-mr/src/test-files/test-morphlines/solrCellDocumentTypes.conf?rev=1547239&r1=1547238&r2=1547239&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/solr-mr/src/test-files/test-morphlines/solrCellDocumentTypes.conf (original)
+++ lucene/dev/trunk/solr/contrib/solr-mr/src/test-files/test-morphlines/solrCellDocumentTypes.conf Mon Dec  2 23:30:54 2013
@@ -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"]
         }
       }