Author: mickw
Date: 2006-05-05 12:20:53 +0200 (Fri, 05 May 2006)
New Revision: 2860
Modified:
trunk/src/java/no/schibstedsok/front/searchportal/output/VelocityResultHandler.java
trunk/src/java/no/schibstedsok/front/searchportal/velocity/VelocityEngineFactory.java
Log:
junit fixes to SiteConfiguration reloads
Modified:
trunk/src/java/no/schibstedsok/front/searchportal/output/VelocityResultHandler.java
===================================================================
---
trunk/src/java/no/schibstedsok/front/searchportal/output/VelocityResultHandler.java
2006-05-05 08:25:20 UTC (rev 2859)
+++
trunk/src/java/no/schibstedsok/front/searchportal/output/VelocityResultHandler.java
2006-05-05 10:20:53 UTC (rev 2860)
@@ -55,13 +55,9 @@
private static final String ERR_GETTING_TEMPLATE = "Error getting template
";
private static final String ERR_NP_WRITING_TO_STREAM = "Possible client
cancelled request. (NullPointerException writing to response's stream).";
- public static VelocityEngine getEngine(final Site site){
+ public static VelocityEngine getEngine(final Context cxt){
- return VelocityEngineFactory.valueOf(new
VelocityEngineFactory.Context() {
- public Site getSite() {
- return site;
- }
- }).getEngine();
+ return
VelocityEngineFactory.valueOf(ContextWrapper.wrap(VelocityEngineFactory.Context.class,cxt)).getEngine();
}
public static Template getTemplate(
@@ -139,7 +135,7 @@
}
final Site site = cxt.getSite();
- final VelocityEngine engine = getEngine(site);
+ final VelocityEngine engine = getEngine(cxt);
final Template template = getTemplate(engine, site,
searchConfiguration.getName());
if (LOG.isDebugEnabled()) {
Modified:
trunk/src/java/no/schibstedsok/front/searchportal/velocity/VelocityEngineFactory.java
===================================================================
---
trunk/src/java/no/schibstedsok/front/searchportal/velocity/VelocityEngineFactory.java
2006-05-05 08:25:20 UTC (rev 2859)
+++
trunk/src/java/no/schibstedsok/front/searchportal/velocity/VelocityEngineFactory.java
2006-05-05 10:20:53 UTC (rev 2860)
@@ -10,9 +10,16 @@
import java.util.HashMap;
import java.util.Map;
+import java.util.Properties;
import java.util.concurrent.locks.ReentrantReadWriteLock;
+import javax.xml.parsers.DocumentBuilder;
+import no.schibstedsok.common.ioc.ContextWrapper;
import no.schibstedsok.front.searchportal.InfrastructureException;
import no.schibstedsok.front.searchportal.configuration.SiteConfiguration;
+import no.schibstedsok.front.searchportal.configuration.loader.DocumentLoader;
+import
no.schibstedsok.front.searchportal.configuration.loader.PropertiesLoader;
+import no.schibstedsok.front.searchportal.configuration.loader.ResourceContext;
+import
no.schibstedsok.front.searchportal.configuration.loader.UrlResourceLoader;
import no.schibstedsok.front.searchportal.site.Site;
import no.schibstedsok.front.searchportal.site.SiteContext;
import no.schibstedsok.front.searchportal.site.SiteKeyedFactory;
@@ -44,7 +51,7 @@
/**
* The context the AnalysisRules must work against. *
*/
- public interface Context extends SiteContext {
+ public interface Context extends SiteContext, ResourceContext {
}
private final Context context;
@@ -73,7 +80,8 @@
try {
final Logger logger = Logger.getLogger(VELOCITY_LOGGER);
- final java.util.Properties props =
SiteConfiguration.valueOf(site).getProperties();
+ final java.util.Properties props = SiteConfiguration.valueOf(
+ ContextWrapper.wrap(SiteConfiguration.Context.class,
cxt)).getProperties();
//
engine.setProperty(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM_CLASS,
"org.apache.velocity.runtime.log.Log4JLogChute"); // velocity 1.5
engine.setProperty(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM_CLASS,
"org.apache.velocity.runtime.log.SimpleLog4JLogSystem");
// engine.setProperty("runtime.log.logsystem.log4j.logger",
logger.getName()); // velocity 1.5
@@ -137,6 +145,12 @@
public Site getSite() {
return site;
}
+ 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);
+ }
});
return instance;
}
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
