You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by eh...@apache.org on 2012/07/29 00:20:39 UTC
svn commit: r1366775 - in /lucene/dev/trunk/solr: ./
contrib/velocity/src/java/org/apache/solr/response/
core/src/java/org/apache/solr/handler/admin/
Author: ehatcher
Date: Sat Jul 28 22:20:38 2012
New Revision: 1366775
URL: http://svn.apache.org/viewvc?rev=1366775&view=rev
Log:
SOLR-3648: Fix Velocity template loading in SolrCloud mode
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/contrib/velocity/src/java/org/apache/solr/response/SolrVelocityResourceLoader.java
lucene/dev/trunk/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1366775&r1=1366774&r2=1366775&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Sat Jul 28 22:20:38 2012
@@ -153,6 +153,10 @@ Bug Fixes
when 'gap' is zero -- or effectively zero due to floating point arithmetic
underflow. (hossman)
+* SOLR-3648: Fixed VelocityResponseWriter template loading in SolrCloud mode.
+ For the example configuration, this means /browse now works with SolrCloud.
+ (janhoy, ehatcher)
+
Other Changes
----------------------
Modified: lucene/dev/trunk/solr/contrib/velocity/src/java/org/apache/solr/response/SolrVelocityResourceLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/velocity/src/java/org/apache/solr/response/SolrVelocityResourceLoader.java?rev=1366775&r1=1366774&r2=1366775&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/velocity/src/java/org/apache/solr/response/SolrVelocityResourceLoader.java (original)
+++ lucene/dev/trunk/solr/contrib/velocity/src/java/org/apache/solr/response/SolrVelocityResourceLoader.java Sat Jul 28 22:20:38 2012
@@ -25,7 +25,9 @@ import org.apache.solr.core.SolrResource
import java.io.IOException;
import java.io.InputStream;
-// TODO: the name of this class seems ridiculous
+/**
+ * Velocity resource loader wrapper around Solr resource loader
+ */
public class SolrVelocityResourceLoader extends ResourceLoader {
private SolrResourceLoader loader;
@@ -41,7 +43,7 @@ public class SolrVelocityResourceLoader
@Override
public InputStream getResourceStream(String template_name) throws ResourceNotFoundException {
try {
- return loader.openResource(template_name);
+ return loader.openResource("velocity/" + template_name);
} catch (IOException ioe) {
throw new ResourceNotFoundException(ioe);
}
Modified: lucene/dev/trunk/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java?rev=1366775&r1=1366774&r2=1366775&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java (original)
+++ lucene/dev/trunk/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java Sat Jul 28 22:20:38 2012
@@ -20,6 +20,7 @@ package org.apache.solr.response;
import org.apache.solr.client.solrj.SolrResponse;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.client.solrj.response.SolrResponseBase;
+import org.apache.solr.common.SolrException;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.velocity.Template;
@@ -113,19 +114,32 @@ 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());
engine.setProperty("solr.resource.loader.instance", resourceLoader);
+ File fileResourceLoaderBaseDir = null;
+ try {
+ String template_root = request.getParams().get("v.base_dir");
+ fileResourceLoaderBaseDir = new File(request.getCore().getResourceLoader().getConfigDir(), "velocity");
+ if (template_root != null) {
+ fileResourceLoaderBaseDir = new File(template_root);
+ }
+ } catch (SolrException e) {
+ // no worries... probably in ZooKeeper mode and getConfigDir() isn't available, so we'll just ignore omit
+ // the file system resource loader
+ }
+
+ if (fileResourceLoaderBaseDir != null) {
+ engine.setProperty(RuntimeConstants.FILE_RESOURCE_LOADER_PATH, fileResourceLoaderBaseDir.getAbsolutePath());
+ engine.setProperty(RuntimeConstants.RESOURCE_LOADER, "params,file,solr");
+ } else {
+ 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)
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java?rev=1366775&r1=1366774&r2=1366775&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java Sat Jul 28 22:20:38 2012
@@ -144,6 +144,9 @@ public class ShowFileRequestHandler exte
if (fname.indexOf("..") >= 0) {
throw new SolrException(ErrorCode.FORBIDDEN, "Invalid path: " + fname);
}
+ if (fname.startsWith("/")) { // Only files relative to conf are valid
+ fname = fname.substring(1);
+ }
adminFile = confPath + "/" + fname;
}