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/10 21:15:15 UTC

svn commit: r1549956 - in /lucene/dev/branches/lucene_solr_3_6/solr/contrib/velocity/src/java/org/apache/solr/response: SolrVelocityResourceLoader.java VelocityResponseWriter.java

Author: uschindler
Date: Tue Dec 10 20:15:14 2013
New Revision: 1549956

URL: http://svn.apache.org/r1549956
Log:
SOLR-5520: Backport one more issue, to fix velocity to only use resource loading.

Modified:
    lucene/dev/branches/lucene_solr_3_6/solr/contrib/velocity/src/java/org/apache/solr/response/SolrVelocityResourceLoader.java
    lucene/dev/branches/lucene_solr_3_6/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java

Modified: lucene/dev/branches/lucene_solr_3_6/solr/contrib/velocity/src/java/org/apache/solr/response/SolrVelocityResourceLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_6/solr/contrib/velocity/src/java/org/apache/solr/response/SolrVelocityResourceLoader.java?rev=1549956&r1=1549955&r2=1549956&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_6/solr/contrib/velocity/src/java/org/apache/solr/response/SolrVelocityResourceLoader.java (original)
+++ lucene/dev/branches/lucene_solr_3_6/solr/contrib/velocity/src/java/org/apache/solr/response/SolrVelocityResourceLoader.java Tue Dec 10 20:15:14 2013
@@ -39,7 +39,7 @@ public class SolrVelocityResourceLoader 
 
   @Override
   public InputStream getResourceStream(String template_name) throws ResourceNotFoundException {
-    return loader.openResource(template_name);
+    return loader.openResource("velocity/" + template_name);
   }
 
   @Override

Modified: lucene/dev/branches/lucene_solr_3_6/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_6/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java?rev=1549956&r1=1549955&r2=1549956&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_6/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java (original)
+++ lucene/dev/branches/lucene_solr_3_6/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java Tue Dec 10 20:15:14 2013
@@ -112,12 +112,6 @@ public class VelocityResponseWriter impl
 
   private VelocityEngine getEngine(SolrQueryRequest request) {
     VelocityEngine engine = new VelocityEngine();
-    String template_root = request.getParams().get("v.base_dir");
-    File baseDir = new File(request.getCore().getResourceLoader().getConfigDir(), "velocity");
-    if (template_root != null) {
-      baseDir = new File(template_root);
-    }
-    engine.setProperty(RuntimeConstants.FILE_RESOURCE_LOADER_PATH, baseDir.getAbsolutePath());
     engine.setProperty("params.resource.loader.instance", new SolrParamResourceLoader(request));
     SolrVelocityResourceLoader resourceLoader =
         new SolrVelocityResourceLoader(request.getCore().getSolrConfig().getResourceLoader());
@@ -125,7 +119,6 @@ public class VelocityResponseWriter impl
     engine.setProperty(RuntimeConstants.RESOURCE_LOADER, "params,solr");
 
     // TODO: Externalize Velocity properties
-    engine.setProperty(RuntimeConstants.RESOURCE_LOADER, "params,file,solr");
     String propFile = request.getParams().get("v.properties");
     try {
       if (propFile == null)