Return-Path: 
 <solr-commits-return-3836-apmail-lucene-solr-commits-archive=lucene.apache.org@lucene.apache.org>
Delivered-To: apmail-lucene-solr-commits-archive@locus.apache.org
Received: (qmail 97218 invoked from network); 1 Nov 2008 04:50:18 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 1 Nov 2008 04:50:18 -0000
Received: (qmail 94864 invoked by uid 500); 1 Nov 2008 04:50:23 -0000
Delivered-To: apmail-lucene-solr-commits-archive@lucene.apache.org
Received: (qmail 94827 invoked by uid 500); 1 Nov 2008 04:50:23 -0000
Mailing-List: contact solr-commits-help@lucene.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:solr-commits-help@lucene.apache.org>
List-Unsubscribe: <mailto:solr-commits-unsubscribe@lucene.apache.org>
List-Post: <mailto:solr-commits@lucene.apache.org>
List-Id: <solr-commits.lucene.apache.org>
Reply-To: solr-dev@lucene.apache.org
Delivered-To: mailing list solr-commits@lucene.apache.org
Received: (qmail 94818 invoked by uid 99); 1 Nov 2008 04:50:23 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 31 Oct 2008 21:50:23 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Nov 2008 04:49:16 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 0DFA0238889E; Fri, 31 Oct 2008 21:49:57 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r709649 - in /lucene/solr/trunk/contrib/velocity: ./
 src/main/java/ src/main/java/org/apache/solr/request/
 src/main/solr/conf/velocity/
Date: Sat, 01 Nov 2008 04:49:56 -0000
To: solr-commits@lucene.apache.org
From: ehatcher@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20081101044957.0DFA0238889E@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: ehatcher
Date: Fri Oct 31 21:49:56 2008
New Revision: 709649

URL: http://svn.apache.org/viewvc?rev=709649&view=rev
Log:
Wire in a SolrResourceLoader bridge for Velocity templates, allowing a JAR of templates to live in conf/lib.  Refactored the footer.vm template to use this mechanism as an example.

Added:
    lucene/solr/trunk/contrib/velocity/src/main/java/footer.vm
    lucene/solr/trunk/contrib/velocity/src/main/java/org/apache/solr/request/SolrVelocityResourceLoader.java
Removed:
    lucene/solr/trunk/contrib/velocity/src/main/solr/conf/velocity/footer.vm
Modified:
    lucene/solr/trunk/contrib/velocity/build.xml
    lucene/solr/trunk/contrib/velocity/src/main/java/org/apache/solr/request/SolrParamResourceLoader.java
    lucene/solr/trunk/contrib/velocity/src/main/java/org/apache/solr/request/VelocityResponseWriter.java
    lucene/solr/trunk/contrib/velocity/src/main/solr/conf/velocity/browse.vm

Modified: lucene/solr/trunk/contrib/velocity/build.xml
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/velocity/build.xml?rev=709649&r1=709648&r2=709649&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/velocity/build.xml (original)
+++ lucene/solr/trunk/contrib/velocity/build.xml Fri Oct 31 21:49:56 2008
@@ -61,7 +61,9 @@
 
   <target name="build" depends="compile">
     <solr-jar destfile="src/main/solr/lib/${fullnamever}.jar" basedir="target/classes"
-              manifest="${common.dir}/${dest}/META-INF/MANIFEST.MF" />
+              manifest="${common.dir}/${dest}/META-INF/MANIFEST.MF">
+      <fileset dir="src/main/java" excludes="**/*.java"/>
+    </solr-jar>
   </target>
 
   <target name="compileTests" depends="compile">

Added: lucene/solr/trunk/contrib/velocity/src/main/java/footer.vm
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/velocity/src/main/java/footer.vm?rev=709649&view=auto
==============================================================================
--- lucene/solr/trunk/contrib/velocity/src/main/java/footer.vm (added)
+++ lucene/solr/trunk/contrib/velocity/src/main/java/footer.vm Fri Oct 31 21:49:56 2008
@@ -0,0 +1,9 @@
+#if($params.getBool("debugQuery",false))
+<pre>
+  request = $request
+
+  response = $response.values
+</pre>
+#end
+
+Generated by <a href="http://wiki.apache.org/solr/VelocityResponseWriter">VelocityResponseWriter</a>
\ No newline at end of file

Modified: lucene/solr/trunk/contrib/velocity/src/main/java/org/apache/solr/request/SolrParamResourceLoader.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/velocity/src/main/java/org/apache/solr/request/SolrParamResourceLoader.java?rev=709649&r1=709648&r2=709649&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/velocity/src/main/java/org/apache/solr/request/SolrParamResourceLoader.java (original)
+++ lucene/solr/trunk/contrib/velocity/src/main/java/org/apache/solr/request/SolrParamResourceLoader.java Fri Oct 31 21:49:56 2008
@@ -30,6 +30,7 @@
 public class SolrParamResourceLoader extends ResourceLoader {
   private HashMap<String,String> templates = new HashMap();
   public SolrParamResourceLoader(SolrQueryRequest request) {
+    super();
 
     // TODO: Consider using content streams, but need a template name associated with each stream
     // for now, a custom param convention of template.<name>=<template body> is a nice example
@@ -44,7 +45,6 @@
         templates.put(name.substring(9) + ".vm",params.get(name));
       }
     }
-
   }
 
   public void init(ExtendedProperties extendedProperties) {

Added: lucene/solr/trunk/contrib/velocity/src/main/java/org/apache/solr/request/SolrVelocityResourceLoader.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/velocity/src/main/java/org/apache/solr/request/SolrVelocityResourceLoader.java?rev=709649&view=auto
==============================================================================
--- lucene/solr/trunk/contrib/velocity/src/main/java/org/apache/solr/request/SolrVelocityResourceLoader.java (added)
+++ lucene/solr/trunk/contrib/velocity/src/main/java/org/apache/solr/request/SolrVelocityResourceLoader.java Fri Oct 31 21:49:56 2008
@@ -0,0 +1,34 @@
+package org.apache.solr.request;
+
+import org.apache.velocity.runtime.resource.loader.ResourceLoader;
+import org.apache.velocity.runtime.resource.Resource;
+import org.apache.velocity.exception.ResourceNotFoundException;
+import org.apache.commons.collections.ExtendedProperties;
+import org.apache.solr.core.SolrResourceLoader;
+
+import java.io.InputStream;
+
+// TODO: the name of this class seems ridiculous
+public class SolrVelocityResourceLoader extends ResourceLoader {
+  private SolrResourceLoader loader;
+
+  public SolrVelocityResourceLoader(SolrResourceLoader loader) {
+    super();
+    this.loader = loader;
+  }
+
+  public void init(ExtendedProperties extendedProperties) {
+  }
+
+  public InputStream getResourceStream(String template_name) throws ResourceNotFoundException {
+    return loader.openResource(template_name);
+  }
+
+  public boolean isSourceModified(Resource resource) {
+    return false;
+  }
+
+  public long getLastModified(Resource resource) {
+    return 0;
+  }
+}

Modified: lucene/solr/trunk/contrib/velocity/src/main/java/org/apache/solr/request/VelocityResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/velocity/src/main/java/org/apache/solr/request/VelocityResponseWriter.java?rev=709649&r1=709648&r2=709649&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/velocity/src/main/java/org/apache/solr/request/VelocityResponseWriter.java (original)
+++ lucene/solr/trunk/contrib/velocity/src/main/java/org/apache/solr/request/VelocityResponseWriter.java Fri Oct 31 21:49:56 2008
@@ -49,8 +49,10 @@
       baseDir = new File(template_root);
     }
     engine.setProperty(VelocityEngine.FILE_RESOURCE_LOADER_PATH, baseDir.getAbsolutePath());
-    engine.setProperty("params.resource.loader.instance",new SolrParamResourceLoader(request));
-    engine.setProperty(VelocityEngine.RESOURCE_LOADER, "params,file");
+    engine.setProperty("params.resource.loader.instance", new SolrParamResourceLoader(request));
+    engine.setProperty("solr.resource.loader.instance",
+        new SolrVelocityResourceLoader(request.getCore().getSolrConfig().getResourceLoader()));
+    engine.setProperty(VelocityEngine.RESOURCE_LOADER, "params,file,solr");
 
     return engine;
   }

Modified: lucene/solr/trunk/contrib/velocity/src/main/solr/conf/velocity/browse.vm
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/velocity/src/main/solr/conf/velocity/browse.vm?rev=709649&r1=709648&r2=709649&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/velocity/src/main/solr/conf/velocity/browse.vm (original)
+++ lucene/solr/trunk/contrib/velocity/src/main/solr/conf/velocity/browse.vm Fri Oct 31 21:49:56 2008
@@ -44,19 +44,7 @@
 <div class="pagination">
   <span><span class="results-found">$page.results_found</span> results found in ${response.responseHeader.QTime} ms</span>
 </div>
-#if (${nlResponse.suggestions.size()} > 0)
-<div class="spelling">
-  <span>Did you mean?</span>
-  #foreach ($suggestion in ${nlResponse.suggestions})
-  <a href="${request.requestURL}?q=${suggestion}">${suggestion}</a>#if ($velocityCount < $nlResponse.suggestions.size()),#end
-  #end
-</div>
-#end
-#if (${nlResponse.autoSpell} == true)
-<div class="autoSpell">There were no results for your original query, so we automatically searched a few spelling
-  variants: ${nlResponse.autoSpellQuery}
-</div>
-#end
+
 <div class="results">
   #foreach($id in $doclist.iterator())
     #set($doc = $searcher.doc($id,$response.returnFields))