Author: mickw
Date: 2006-05-05 13:50:59 +0200 (Fri, 05 May 2006)
New Revision: 2861
Modified:
trunk/src/java/no/schibstedsok/front/searchportal/output/VelocityResultHandler.java
trunk/src/test/java/no/schibstedsok/front/searchportal/servlet/FactoryReloadsTest.java
Log:
SEARCH-263 the last of it
Modified:
trunk/src/java/no/schibstedsok/front/searchportal/output/VelocityResultHandler.java
===================================================================
---
trunk/src/java/no/schibstedsok/front/searchportal/output/VelocityResultHandler.java
2006-05-05 10:20:53 UTC (rev 2860)
+++
trunk/src/java/no/schibstedsok/front/searchportal/output/VelocityResultHandler.java
2006-05-05 11:50:59 UTC (rev 2861)
@@ -7,7 +7,6 @@
import no.schibstedsok.front.searchportal.InfrastructureException;
import no.schibstedsok.front.searchportal.configuration.SearchConfiguration;
import no.schibstedsok.front.searchportal.configuration.SiteConfiguration;
-import no.schibstedsok.front.searchportal.site.SiteContext;
import no.schibstedsok.front.searchportal.view.i18n.TextMessages;
import no.schibstedsok.front.searchportal.query.run.RunningQuery;
import no.schibstedsok.front.searchportal.result.Decoder;
@@ -36,6 +35,11 @@
import java.io.UnsupportedEncodingException;
import java.util.Map;
import java.net.URLEncoder;
+import java.util.Properties;
+import javax.xml.parsers.DocumentBuilder;
+import no.schibstedsok.front.searchportal.configuration.loader.DocumentLoader;
+import
no.schibstedsok.front.searchportal.configuration.loader.PropertiesLoader;
+import
no.schibstedsok.front.searchportal.configuration.loader.UrlResourceLoader;
/** Handles the populating the velocity contexts.
* Strictly view domain.
@@ -59,7 +63,23 @@
return
VelocityEngineFactory.valueOf(ContextWrapper.wrap(VelocityEngineFactory.Context.class,cxt)).getEngine();
}
+
+ /** Utility wrapper to getEngine(Context) defaulting to UrlResourceLoader
resource loading. **/
+ public static VelocityEngine getEngine(final Site site){
+ return VelocityEngineFactory.valueOf(new
VelocityEngineFactory.Context(){
+ public PropertiesLoader newPropertiesLoader(final String resource,
final Properties properties) {
+ return UrlResourceLoader.newPropertiesLoader(this, resource,
properties);
+ }
+ public DocumentLoader newDocumentLoader(final String resource,
final DocumentBuilder builder) {
+ return UrlResourceLoader.newDocumentLoader(this, resource,
builder);
+ }
+ public Site getSite() {
+ return Site.DEFAULT;
+ }
+ }).getEngine();
+ }
+
public static Template getTemplate(
final VelocityEngine engine,
final Site site,
Modified:
trunk/src/test/java/no/schibstedsok/front/searchportal/servlet/FactoryReloadsTest.java
===================================================================
---
trunk/src/test/java/no/schibstedsok/front/searchportal/servlet/FactoryReloadsTest.java
2006-05-05 10:20:53 UTC (rev 2860)
+++
trunk/src/test/java/no/schibstedsok/front/searchportal/servlet/FactoryReloadsTest.java
2006-05-05 11:50:59 UTC (rev 2861)
@@ -54,7 +54,7 @@
// BaseContext providing SiteContext and ResourceContext.
// We need it casted as a SiteContext for the ResourceContext code to
be happy.
- return new SiteContext(){// <editor-fold defaultstate="collapsed"
desc=" genericCxt ">
+ return new SiteContext(){
public PropertiesLoader newPropertiesLoader(final String resource,
final Properties properties) {
return FileResourceLoader.newPropertiesLoader(this, resource,
properties);
}
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
