Author: ssmiweve
Date: 2008-01-21 08:22:32 +0100 (Mon, 21 Jan 2008)
New Revision: 5990
Modified:
trunk/core-api/src/main/java/no/sesat/search/http/servlet/FactoryReloads.java
trunk/core-api/src/main/java/no/sesat/search/run/RunningQueryImpl.java
trunk/core-api/src/main/java/no/sesat/search/view/output/SyndicationGenerator.java
trunk/core-api/src/main/java/no/sesat/search/view/velocity/VelocityEngineFactory.java
trunk/core-api/src/test/java/no/sesat/search/mode/SearchModeFactoryTest.java
trunk/core-api/src/test/java/no/sesat/search/mode/command/AbstractSearchCommandTest.java
trunk/core-api/src/test/java/no/sesat/search/mode/config/UrlResourcesSiteConfigurationtest.java
trunk/core-api/src/test/java/no/sesat/search/view/velocity/VelocityTemplateTest.java
trunk/data-model-api/src/main/java/no/sesat/search/datamodel/DataModelFactory.java
trunk/data-model-api/src/test/java/no/sesat/search/datamodel/DataModelTestCase.java
trunk/data-model-javabean-impl/src/test/java/no/sesat/search/datamodel/DataModelSerializeTest.java
trunk/generic.sesam/query-transform-control/src/main/java/no/sesat/search/query/transform/TokenMaskQueryTransformer.java
trunk/generic.sesam/search-command-control/default/src/test/java/no/sesat/search/mode/config/SearchModeTest.java
trunk/generic.sesam/search-command-control/fast/src/test/java/no/sesat/search/result/test/FastNavigatorsTest.java
trunk/generic.sesam/search-command-control/fast/src/test/java/no/sesat/search/result/test/MockupSearchCommand.java
trunk/query-api/src/main/java/no/sesat/search/query/analyser/AnalysisRuleFactory.java
trunk/query-api/src/main/java/no/sesat/search/query/token/RegExpEvaluatorFactory.java
trunk/query-api/src/main/java/no/sesat/search/query/token/TokenEvaluationEngineImpl.java
trunk/query-api/src/main/java/no/sesat/search/query/token/VeryFastTokenEvaluator.java
trunk/query-transform-control-spi/src/main/java/no/sesat/search/query/transform/QueryTransformerFactory.java
trunk/result-handler-control-spi/src/main/java/no/sesat/search/result/handler/DataModelResultHandler.java
trunk/result-handler-control-spi/src/main/java/no/sesat/search/result/handler/ResultHandlerFactory.java
trunk/run-handler-control-spi/src/main/java/no/sesat/search/run/handler/NavigationRunHandler.java
trunk/run-handler-control-spi/src/main/java/no/sesat/search/run/handler/RunHandlerFactory.java
trunk/run-handler-control-spi/src/test/java/no/sesat/search/run/handler/RunHandlerFactoryTest.java
trunk/run-transform-control-spi/src/main/java/no/sesat/search/run/transform/RunTransformerFactory.java
trunk/search-command-config-spi/src/main/java/no/sesat/search/mode/SearchModeFactory.java
trunk/search-command-control-spi/src/main/java/no/sesat/search/mode/SearchCommandFactory.java
trunk/site-spi/src/main/java/no/sesat/search/site/SiteKeyedFactory.java
trunk/site-spi/src/main/java/no/sesat/search/site/config/AbstractConfigFactory.java
trunk/site-spi/src/main/java/no/sesat/search/site/config/SiteClassLoaderFactory.java
trunk/site-spi/src/main/java/no/sesat/search/site/config/SiteConfiguration.java
trunk/site-spi/src/main/java/no/sesat/search/site/config/SpiClassLoader.java
trunk/site-spi/src/main/java/no/sesat/search/site/config/TextMessages.java
trunk/site-spi/src/test/java/no/sesat/search/site/config/FileResourcesSiteConfigurationTest.java
trunk/view-config-spi/src/main/java/no/sesat/search/view/SearchTabFactory.java
trunk/view-control-spi/src/main/java/no/sesat/search/view/FindResource.java
trunk/view-control-spi/src/main/java/no/sesat/search/view/NavigationControllerSpiFactory.java
trunk/view-control-spi/src/test/java/no/sesat/search/view/SearchTabFactoryTest.java
trunk/war/src/main/java/no/sesat/search/http/filters/DataModelFilter.java
trunk/war/src/main/java/no/sesat/search/http/filters/SiteLocatorFilter.java
trunk/war/src/main/java/no/sesat/search/http/filters/UrlRewriteFilter.java
trunk/war/src/main/java/no/sesat/search/http/servlet/SearchServlet.java
trunk/war/src/main/java/no/sesat/search/http/urlrewrite/UrlRewriterContainerFactory.java
trunk/war/src/main/java/no/sesat/search/view/taglib/AbstractVelocityTemplateTag.java
Log:
SEARCH-3601
Modified:
trunk/core-api/src/main/java/no/sesat/search/http/servlet/FactoryReloads.java
===================================================================
---
trunk/core-api/src/main/java/no/sesat/search/http/servlet/FactoryReloads.java
2008-01-18 20:15:24 UTC (rev 5989)
+++
trunk/core-api/src/main/java/no/sesat/search/http/servlet/FactoryReloads.java
2008-01-21 07:22:32 UTC (rev 5990)
@@ -83,36 +83,36 @@
case ALL:
case SITE_CONFIGURATION:
- performReload(site, SiteConfiguration.valueOf(
+ performReload(site, SiteConfiguration.instanceOf(
ContextWrapper.wrap(SiteConfiguration.Context.class,
genericCxt)));
if(ReloadArg.ALL != reload){ break;}
case SEARCH_TAB_FACTORY:
- performReload(site, SearchTabFactory.valueOf(
+ performReload(site, SearchTabFactory.instanceOf(
ContextWrapper.wrap(SearchTabFactory.Context.class,
genericCxt)));
if(ReloadArg.ALL != reload){ break;}
case SEARCH_MODE_FACTORY:
- performReload(site, SearchModeFactory.valueOf(
+ performReload(site, SearchModeFactory.instanceOf(
ContextWrapper.wrap(SearchModeFactory.Context.class,
genericCxt)));
if( ReloadArg.ALL != reload){ break;}
case ANALYSIS_RULES_FACTORY:
- performReload(site, AnalysisRuleFactory.valueOf(
+ performReload(site, AnalysisRuleFactory.instanceOf(
ContextWrapper.wrap(AnalysisRuleFactory.Context.class,
genericCxt)));
case REG_EXP_EVALUATOR_FACTORY:
- performReload(site, RegExpEvaluatorFactory.valueOf(
+ performReload(site, RegExpEvaluatorFactory.instanceOf(
ContextWrapper.wrap(RegExpEvaluatorFactory.Context.class, genericCxt)));
if(ReloadArg.ALL != reload){ break;}
case VELOCITY_ENGINE_FACTORY:
- performReload(site, VelocityEngineFactory.valueOf(
+ performReload(site, VelocityEngineFactory.instanceOf(
ContextWrapper.wrap(VelocityEngineFactory.Context.class, genericCxt)));
if(ReloadArg.ALL != reload){ break;}
Modified: trunk/core-api/src/main/java/no/sesat/search/run/RunningQueryImpl.java
===================================================================
--- trunk/core-api/src/main/java/no/sesat/search/run/RunningQueryImpl.java
2008-01-18 20:15:24 UTC (rev 5989)
+++ trunk/core-api/src/main/java/no/sesat/search/run/RunningQueryImpl.java
2008-01-21 07:22:32 UTC (rev 5990)
@@ -178,7 +178,7 @@
});
final DataModelFactory factory
- =
DataModelFactory.valueOf(ContextWrapper.wrap(DataModelFactory.Context.class,
cxt, siteCxt));
+ =
DataModelFactory.instanceOf(ContextWrapper.wrap(DataModelFactory.Context.class,
cxt, siteCxt));
final QueryDataObject queryDO = factory.instantiate(
QueryDataObject.class,
@@ -198,7 +198,7 @@
datamodel.setQuery(queryDO);
datamodel.setNavigation(navDO);
- rules =
AnalysisRuleFactory.valueOf(ContextWrapper.wrap(AnalysisRuleFactory.Context.class,
context, siteCxt));
+ rules =
AnalysisRuleFactory.instanceOf(ContextWrapper.wrap(AnalysisRuleFactory.Context.class,
context, siteCxt));
}
@@ -221,7 +221,7 @@
try {
final DataModelFactory dataModelFactory = DataModelFactory
-
.valueOf(ContextWrapper.wrap(DataModelFactory.Context.class, context, new
SiteContext(){
+
.instanceOf(ContextWrapper.wrap(DataModelFactory.Context.class, context, new
SiteContext(){
public Site getSite(){
return datamodel.getSite().getSite();
}
Modified:
trunk/core-api/src/main/java/no/sesat/search/view/output/SyndicationGenerator.java
===================================================================
---
trunk/core-api/src/main/java/no/sesat/search/view/output/SyndicationGenerator.java
2008-01-18 20:15:24 UTC (rev 5989)
+++
trunk/core-api/src/main/java/no/sesat/search/view/output/SyndicationGenerator.java
2008-01-21 07:22:32 UTC (rev 5990)
@@ -134,7 +134,7 @@
this.site = context.getSite();
this.text = TextMessages.valueOf(getTextMessagesContext());
- //this.channels = Channels.valueOf(getChannelContext());
+ //this.channels = Channels.instanceOf(getChannelContext());
this.uri = context.getURL();
Modified:
trunk/core-api/src/main/java/no/sesat/search/view/velocity/VelocityEngineFactory.java
===================================================================
---
trunk/core-api/src/main/java/no/sesat/search/view/velocity/VelocityEngineFactory.java
2008-01-18 20:15:24 UTC (rev 5989)
+++
trunk/core-api/src/main/java/no/sesat/search/view/velocity/VelocityEngineFactory.java
2008-01-21 07:22:32 UTC (rev 5990)
@@ -158,7 +158,7 @@
* @param cxt the contextual needs the VelocityEngine must use to operate.
* @return VelocityEngine for this site.
*/
- public static VelocityEngineFactory valueOf(final Context cxt) {
+ public static VelocityEngineFactory instanceOf(final Context cxt) {
final Site site = cxt.getSite();
@@ -183,7 +183,7 @@
}
/**
- * Utility wrapper to the valueOf(Context).
+ * Utility wrapper to the instanceOf(Context).
* <b>Makes the presumption we will be using the UrlResourceLoader to load
all resources.</b>
* @param site the site the VelocityEngine will work for.
* @return VelocityEngine for this site.
@@ -191,7 +191,7 @@
public static VelocityEngineFactory valueOf(final Site site) {
// RegExpEvaluatorFactory.Context for this site & UrlResourceLoader.
- final VelocityEngineFactory instance =
VelocityEngineFactory.valueOf(new VelocityEngineFactory.Context() {
+ final VelocityEngineFactory instance =
VelocityEngineFactory.instanceOf(new VelocityEngineFactory.Context() {
public Site getSite() {
return site;
}
@@ -229,7 +229,7 @@
final Site site = cxt.getSite();
- final SiteConfiguration siteConf =
SiteConfiguration.valueOf(ContextWrapper.wrap(
+ final SiteConfiguration siteConf =
SiteConfiguration.instanceOf(ContextWrapper.wrap(
SiteConfiguration.Context.class,
cxt));
@@ -316,7 +316,7 @@
},
cxt);
- final ClassLoader ctrlClassLoader =
SiteClassLoaderFactory.valueOf(classContext).getClassLoader();
+ final ClassLoader ctrlClassLoader =
SiteClassLoaderFactory.instanceOf(classContext).getClassLoader();
Thread.currentThread().setContextClassLoader(ctrlClassLoader);
engine.init();
Modified:
trunk/core-api/src/test/java/no/sesat/search/mode/SearchModeFactoryTest.java
===================================================================
---
trunk/core-api/src/test/java/no/sesat/search/mode/SearchModeFactoryTest.java
2008-01-18 20:15:24 UTC (rev 5989)
+++
trunk/core-api/src/test/java/no/sesat/search/mode/SearchModeFactoryTest.java
2008-01-21 07:22:32 UTC (rev 5990)
@@ -59,7 +59,7 @@
}
/**
- * Test of valueOf method, of class
no.sesat.search.configuration.SearchModeFactory.
+ * Test of instanceOf method, of class
no.sesat.search.configuration.SearchModeFactory.
*/
@Test
public void testGetModeFactory(){
@@ -98,7 +98,7 @@
}
};
- final SearchModeFactory result = SearchModeFactory.valueOf(cxt);
+ final SearchModeFactory result = SearchModeFactory.instanceOf(cxt);
assert null != result : "Mode cannot be null for mode " +
cxt.getSite();
return result;
@@ -153,7 +153,7 @@
return site;
}
};
- final SiteConfiguration siteConf =
SiteConfiguration.valueOf(siteConfCxt);
+ final SiteConfiguration siteConf =
SiteConfiguration.instanceOf(siteConfCxt);
if( siteConf.isSiteLocaleSupported(l) ){
final SearchModeFactory instance =
getModeFactory(siteConstructorContext, l);
Modified:
trunk/core-api/src/test/java/no/sesat/search/mode/command/AbstractSearchCommandTest.java
===================================================================
---
trunk/core-api/src/test/java/no/sesat/search/mode/command/AbstractSearchCommandTest.java
2008-01-18 20:15:24 UTC (rev 5989)
+++
trunk/core-api/src/test/java/no/sesat/search/mode/command/AbstractSearchCommandTest.java
2008-01-21 07:22:32 UTC (rev 5990)
@@ -88,12 +88,12 @@
return datamodel;
}
public SearchMode getSearchMode() {
- return SearchModeFactory.valueOf(
+ return SearchModeFactory.instanceOf(
ContextWrapper.wrap(SearchModeFactory.Context.class,
this, siteCxt))
.getMode(getSearchTab().getMode());
}
public SearchTab getSearchTab(){
- return SearchTabFactory.valueOf(
+ return SearchTabFactory.instanceOf(
ContextWrapper.wrap(SearchTabFactory.Context.class, this,
siteCxt))
.getTabByKey(key);
}
Modified:
trunk/core-api/src/test/java/no/sesat/search/mode/config/UrlResourcesSiteConfigurationtest.java
===================================================================
---
trunk/core-api/src/test/java/no/sesat/search/mode/config/UrlResourcesSiteConfigurationtest.java
2008-01-18 20:15:24 UTC (rev 5989)
+++
trunk/core-api/src/test/java/no/sesat/search/mode/config/UrlResourcesSiteConfigurationtest.java
2008-01-21 07:22:32 UTC (rev 5990)
@@ -53,14 +53,14 @@
}
/**
- * Test of valueOf method, of class
no.sesat.search.configuration.SiteConfiguration.
+ * Test of instanceOf method, of class
no.sesat.search.configuration.SiteConfiguration.
*/
@Test
public void testDefaultSite() {
final Site site = Site.DEFAULT;
- final SiteConfiguration result = SiteConfiguration.valueOf(site);
+ final SiteConfiguration result = SiteConfiguration.instanceOf(site);
assertNotNull(FAIL_CONFIG_NOT_RUNNING, result);
}
@@ -70,7 +70,7 @@
@Test
public void testDefaultSiteGetProperties() {
- final SiteConfiguration instance =
SiteConfiguration.valueOf(Site.DEFAULT);
+ final SiteConfiguration instance =
SiteConfiguration.instanceOf(Site.DEFAULT);
final Properties result = instance.getProperties();
assertNotNull(FAIL_CONFIG_NOT_RUNNING, result);
Modified:
trunk/core-api/src/test/java/no/sesat/search/view/velocity/VelocityTemplateTest.java
===================================================================
---
trunk/core-api/src/test/java/no/sesat/search/view/velocity/VelocityTemplateTest.java
2008-01-18 20:15:24 UTC (rev 5989)
+++
trunk/core-api/src/test/java/no/sesat/search/view/velocity/VelocityTemplateTest.java
2008-01-21 07:22:32 UTC (rev 5990)
@@ -102,7 +102,7 @@
final DataModel datamodel = getDataModel();
getDataModelFactory().assignControlLevel(datamodel,
ControlLevel.VIEW_CONSTRUCTION);
final Site site = datamodel.getSite().getSite();
- final VelocityEngine engine = VelocityEngineFactory.valueOf(
+ final VelocityEngine engine = VelocityEngineFactory.instanceOf(
new VelocityEngineFactory.Context(){
public Site getSite() {
return site;
Modified:
trunk/data-model-api/src/main/java/no/sesat/search/datamodel/DataModelFactory.java
===================================================================
---
trunk/data-model-api/src/main/java/no/sesat/search/datamodel/DataModelFactory.java
2008-01-18 20:15:24 UTC (rev 5989)
+++
trunk/data-model-api/src/main/java/no/sesat/search/datamodel/DataModelFactory.java
2008-01-21 07:22:32 UTC (rev 5990)
@@ -77,7 +77,7 @@
* @return
* @throws no.sesat.search.site.SiteKeyedFactoryInstantiationException
*/
- public static DataModelFactory valueOf(final Context cxt) throws
SiteKeyedFactoryInstantiationException {
+ public static DataModelFactory instanceOf(final Context cxt) throws
SiteKeyedFactoryInstantiationException {
final Site site = cxt.getSite();
assert null != site;
@@ -142,7 +142,7 @@
/**
* <pre>
* Example usage:
- * DataModelFactory dm = DataModelFactory.valueOf(null);
+ * DataModelFactory dm = DataModelFactory.instanceOf(null);
* BrowserDataObject bdo = dm.instantiate(
* BrowserDataObject.class,
* datamodel,
@@ -181,7 +181,7 @@
try{
- final SiteConfiguration siteConf = SiteConfiguration.valueOf(
+ final SiteConfiguration siteConf = SiteConfiguration.instanceOf(
ContextWrapper.wrap(SiteConfiguration.Context.class, cxt));
final String clsName =
siteConf.getProperty(DATA_MODEL_FACTORY_IMPL);
Modified:
trunk/data-model-api/src/test/java/no/sesat/search/datamodel/DataModelTestCase.java
===================================================================
---
trunk/data-model-api/src/test/java/no/sesat/search/datamodel/DataModelTestCase.java
2008-01-18 20:15:24 UTC (rev 5989)
+++
trunk/data-model-api/src/test/java/no/sesat/search/datamodel/DataModelTestCase.java
2008-01-21 07:22:32 UTC (rev 5990)
@@ -91,7 +91,7 @@
}
};
}
- factory =
DataModelFactory.valueOf(ContextWrapper.wrap(DataModelFactory.Context.class,
siteConfCxt));
+ factory =
DataModelFactory.instanceOf(ContextWrapper.wrap(DataModelFactory.Context.class,
siteConfCxt));
}catch(SiteKeyedFactoryInstantiationException skfie){
LOG.error(skfie.getMessage(), skfie);
@@ -107,7 +107,7 @@
final DataModel datamodel = factory.instantiate();
- final SiteConfiguration siteConfig =
SiteConfiguration.valueOf(siteConfCxt);
+ final SiteConfiguration siteConfig =
SiteConfiguration.instanceOf(siteConfCxt);
final SiteDataObject siteDO = factory.instantiate(
SiteDataObject.class,
Modified:
trunk/data-model-javabean-impl/src/test/java/no/sesat/search/datamodel/DataModelSerializeTest.java
===================================================================
---
trunk/data-model-javabean-impl/src/test/java/no/sesat/search/datamodel/DataModelSerializeTest.java
2008-01-18 20:15:24 UTC (rev 5989)
+++
trunk/data-model-javabean-impl/src/test/java/no/sesat/search/datamodel/DataModelSerializeTest.java
2008-01-21 07:22:32 UTC (rev 5990)
@@ -130,7 +130,7 @@
}
};
- final SiteConfiguration siteConfig = SiteConfiguration.valueOf(cxt);
+ final SiteConfiguration siteConfig = SiteConfiguration.instanceOf(cxt);
final SiteDataObject siteDO = factory.instantiate(
SiteDataObject.class,
Modified:
trunk/generic.sesam/query-transform-control/src/main/java/no/sesat/search/query/transform/TokenMaskQueryTransformer.java
===================================================================
---
trunk/generic.sesam/query-transform-control/src/main/java/no/sesat/search/query/transform/TokenMaskQueryTransformer.java
2008-01-18 20:15:24 UTC (rev 5989)
+++
trunk/generic.sesam/query-transform-control/src/main/java/no/sesat/search/query/transform/TokenMaskQueryTransformer.java
2008-01-21 07:22:32 UTC (rev 5990)
@@ -191,7 +191,7 @@
final RegExpEvaluatorFactory.Context regExpEvalFactory =
ContextWrapper.wrap(
RegExpEvaluatorFactory.Context.class, cxt);
- regExpFactory = RegExpEvaluatorFactory.valueOf(regExpEvalFactory);
+ regExpFactory = RegExpEvaluatorFactory.instanceOf(regExpEvalFactory);
}
Modified:
trunk/generic.sesam/search-command-control/default/src/test/java/no/sesat/search/mode/config/SearchModeTest.java
===================================================================
---
trunk/generic.sesam/search-command-control/default/src/test/java/no/sesat/search/mode/config/SearchModeTest.java
2008-01-18 20:15:24 UTC (rev 5989)
+++
trunk/generic.sesam/search-command-control/default/src/test/java/no/sesat/search/mode/config/SearchModeTest.java
2008-01-21 07:22:32 UTC (rev 5990)
@@ -77,7 +77,7 @@
return mode;
}
public SearchTab getSearchTab(){
- return SearchTabFactory.valueOf(
+ return SearchTabFactory.instanceOf(
ContextWrapper.wrap(SearchTabFactory.Context.class,
this,
new SiteContext(){
@@ -112,7 +112,7 @@
// DataModel's ControlLevel will be REQUEST_CONSTRUCTION
// Increment it onwards to RUNNING_QUERY_CONSTRUCTION.
DataModelFactory
- .valueOf(ContextWrapper.wrap(
+ .instanceOf(ContextWrapper.wrap(
DataModelFactory.Context.class,
rqCxt,
new SiteContext(){
@@ -155,7 +155,7 @@
return mode;
}
public SearchTab getSearchTab(){
- return SearchTabFactory.valueOf(
+ return SearchTabFactory.instanceOf(
ContextWrapper.wrap(SearchTabFactory.Context.class,
this,
new SiteContext(){
@@ -192,7 +192,7 @@
// DataModel's ControlLevel will be REQUEST_CONSTRUCTION
// Increment it onwards to RUNNING_QUERY_CONSTRUCTION.
DataModelFactory
- .valueOf(ContextWrapper.wrap(
+ .instanceOf(ContextWrapper.wrap(
DataModelFactory.Context.class,
rqCxt,
new SiteContext(){
Modified:
trunk/generic.sesam/search-command-control/fast/src/test/java/no/sesat/search/result/test/FastNavigatorsTest.java
===================================================================
---
trunk/generic.sesam/search-command-control/fast/src/test/java/no/sesat/search/result/test/FastNavigatorsTest.java
2008-01-18 20:15:24 UTC (rev 5989)
+++
trunk/generic.sesam/search-command-control/fast/src/test/java/no/sesat/search/result/test/FastNavigatorsTest.java
2008-01-21 07:22:32 UTC (rev 5990)
@@ -134,7 +134,7 @@
return mode;
}
public SearchTab getSearchTab(){
- return SearchTabFactory.valueOf(
+ return SearchTabFactory.instanceOf(
ContextWrapper.wrap(SearchTabFactory.Context.class, this))
.getTabByKey("d");
}
Modified:
trunk/generic.sesam/search-command-control/fast/src/test/java/no/sesat/search/result/test/MockupSearchCommand.java
===================================================================
---
trunk/generic.sesam/search-command-control/fast/src/test/java/no/sesat/search/result/test/MockupSearchCommand.java
2008-01-18 20:15:24 UTC (rev 5989)
+++
trunk/generic.sesam/search-command-control/fast/src/test/java/no/sesat/search/result/test/MockupSearchCommand.java
2008-01-21 07:22:32 UTC (rev 5990)
@@ -51,7 +51,7 @@
return mode;
}
public SearchTab getSearchTab(){
- return SearchTabFactory.valueOf(
+ return SearchTabFactory.instanceOf(
ContextWrapper.wrap(SearchTabFactory.Context.class, this))
.getTabByKey("d");
}
Modified:
trunk/query-api/src/main/java/no/sesat/search/query/analyser/AnalysisRuleFactory.java
===================================================================
---
trunk/query-api/src/main/java/no/sesat/search/query/analyser/AnalysisRuleFactory.java
2008-01-18 20:15:24 UTC (rev 5989)
+++
trunk/query-api/src/main/java/no/sesat/search/query/analyser/AnalysisRuleFactory.java
2008-01-21 07:22:32 UTC (rev 5990)
@@ -186,7 +186,7 @@
if (null != context.getSite().getParent()) {
- return valueOf(ContextWrapper.wrap(
+ return instanceOf(ContextWrapper.wrap(
Context.class,
new SiteContext() {
public Site getSite() {
@@ -364,7 +364,7 @@
if(null != context.getSite().getParent()) {
- result.putAll(valueOf(ContextWrapper.wrap(
+ result.putAll(instanceOf(ContextWrapper.wrap(
Context.class,
new SiteContext() {
public Site getSite() {
@@ -400,7 +400,7 @@
}
if(rule == null && null != context.getSite().getParent()) {
- rule = valueOf(ContextWrapper.wrap(
+ rule = instanceOf(ContextWrapper.wrap(
Context.class,
new SiteContext() {
public Site getSite() {
@@ -428,7 +428,7 @@
* @param cxt the contextual needs this factory must use to operate.
* @return AnalysisRuleFactory for this site.
*/
- public static AnalysisRuleFactory valueOf(final Context cxt) {
+ public static AnalysisRuleFactory instanceOf(final Context cxt) {
final Site site = cxt.getSite();
assert null != site : "valueOf(cxt) got null site";
Modified:
trunk/query-api/src/main/java/no/sesat/search/query/token/RegExpEvaluatorFactory.java
===================================================================
---
trunk/query-api/src/main/java/no/sesat/search/query/token/RegExpEvaluatorFactory.java
2008-01-18 20:15:24 UTC (rev 5989)
+++
trunk/query-api/src/main/java/no/sesat/search/query/token/RegExpEvaluatorFactory.java
2008-01-21 07:22:32 UTC (rev 5990)
@@ -175,7 +175,7 @@
* @param cxt the contextual needs this factory must use to operate.
* @return RegExpEvaluatorFactory for this site.
*/
- public static RegExpEvaluatorFactory valueOf(final Context cxt) {
+ public static RegExpEvaluatorFactory instanceOf(final Context cxt) {
final Site site = cxt.getSite();
RegExpEvaluatorFactory instance;
@@ -208,7 +208,7 @@
TokenEvaluator result = regExpEvaluators.get(token);
if(result == null && null != context.getSite().getParent()){
- result = valueOf(ContextWrapper.wrap(
+ result = instanceOf(ContextWrapper.wrap(
Context.class,
new SiteContext(){
public Site getSite(){
Modified:
trunk/query-api/src/main/java/no/sesat/search/query/token/TokenEvaluationEngineImpl.java
===================================================================
---
trunk/query-api/src/main/java/no/sesat/search/query/token/TokenEvaluationEngineImpl.java
2008-01-18 20:15:24 UTC (rev 5989)
+++
trunk/query-api/src/main/java/no/sesat/search/query/token/TokenEvaluationEngineImpl.java
2008-01-21 07:22:32 UTC (rev 5990)
@@ -119,7 +119,7 @@
case FAST:
return getFastEvaluator();
case REGEX:
- return RegExpEvaluatorFactory.valueOf(
+ return RegExpEvaluatorFactory.instanceOf(
ContextWrapper.wrap(RegExpEvaluatorFactory.Context.class,context)).getEvaluator(token);
case JEP:
return jedEvaluator;
Modified:
trunk/query-api/src/main/java/no/sesat/search/query/token/VeryFastTokenEvaluator.java
===================================================================
---
trunk/query-api/src/main/java/no/sesat/search/query/token/VeryFastTokenEvaluator.java
2008-01-18 20:15:24 UTC (rev 5989)
+++
trunk/query-api/src/main/java/no/sesat/search/query/token/VeryFastTokenEvaluator.java
2008-01-21 07:22:32 UTC (rev 5990)
@@ -130,7 +130,7 @@
context = cxt;
- final Properties props = SiteConfiguration.valueOf(
+ final Properties props = SiteConfiguration.instanceOf(
ContextWrapper.wrap(SiteConfiguration.Context.class,context)).getProperties();
final String host = props.getProperty(TOKEN_HOST_PROPERTY);
final int port =
Integer.parseInt(props.getProperty(TOKEN_PORT_PROPERTY));
Modified:
trunk/query-transform-control-spi/src/main/java/no/sesat/search/query/transform/QueryTransformerFactory.java
===================================================================
---
trunk/query-transform-control-spi/src/main/java/no/sesat/search/query/transform/QueryTransformerFactory.java
2008-01-18 20:15:24 UTC (rev 5989)
+++
trunk/query-transform-control-spi/src/main/java/no/sesat/search/query/transform/QueryTransformerFactory.java
2008-01-21 07:22:32 UTC (rev 5990)
@@ -84,7 +84,7 @@
}
};
- final ClassLoader ctrlClassLoader =
SiteClassLoaderFactory.valueOf(ctrlCxt).getClassLoader();
+ final ClassLoader ctrlClassLoader =
SiteClassLoaderFactory.instanceOf(ctrlCxt).getClassLoader();
@SuppressWarnings("unchecked")
final Class<? extends QueryTransformer> cls
Modified:
trunk/result-handler-control-spi/src/main/java/no/sesat/search/result/handler/DataModelResultHandler.java
===================================================================
---
trunk/result-handler-control-spi/src/main/java/no/sesat/search/result/handler/DataModelResultHandler.java
2008-01-18 20:15:24 UTC (rev 5989)
+++
trunk/result-handler-control-spi/src/main/java/no/sesat/search/result/handler/DataModelResultHandler.java
2008-01-21 07:22:32 UTC (rev 5990)
@@ -52,7 +52,7 @@
private static final int WEAK_CACHE_CONCURRENCY_LEVEL = 64;
/** !Concurrent-safe! weak cache of DataModelFactories
- * since hitting DataModelFactory.valueOf(..) hard becomes a bottleneck.
+ * since hitting DataModelFactory.instanceOf(..) hard becomes a
bottleneck.
* read https://jira.sesam.no/jira/browse/SEARCH-3541 for more.
*/
private static final ReferenceMap<Site,DataModelFactory> FACTORY_CACHE
@@ -143,11 +143,11 @@
try{
// application bottleneck
https://jira.sesam.no/jira/browse/SEARCH-3541
- // DataModelFactory.valueOf(cxt) uses a ReentrantReadWriteLock in
high-concurrency environment like here.
+ // DataModelFactory.instanceOf(cxt) uses a ReentrantReadWriteLock
in high-concurrency environment like here.
// this is why we keep a local weak cache of the factories.
// the alternative would be to pollute DataModelFactory will this
performance consideration and
// replace the ReentrantReadWriteLock that provides a
synchronised api with a ConcurrentHashMap.
- return
DataModelFactory.valueOf(ContextWrapper.wrap(DataModelFactory.Context.class,
cxt));
+ return
DataModelFactory.instanceOf(ContextWrapper.wrap(DataModelFactory.Context.class,
cxt));
}catch(SiteKeyedFactoryInstantiationException skfie){
LOG.error(skfie.getMessage(), skfie);
Modified:
trunk/result-handler-control-spi/src/main/java/no/sesat/search/result/handler/ResultHandlerFactory.java
===================================================================
---
trunk/result-handler-control-spi/src/main/java/no/sesat/search/result/handler/ResultHandlerFactory.java
2008-01-18 20:15:24 UTC (rev 5989)
+++
trunk/result-handler-control-spi/src/main/java/no/sesat/search/result/handler/ResultHandlerFactory.java
2008-01-21 07:22:32 UTC (rev 5990)
@@ -81,7 +81,7 @@
context
);
- final ClassLoader ctlLoader =
SiteClassLoaderFactory.valueOf(ctlContext).getClassLoader();
+ final ClassLoader ctlLoader =
SiteClassLoaderFactory.instanceOf(ctlContext).getClassLoader();
@SuppressWarnings("unchecked")
final Class<? extends ResultHandler> cls = (Class<? extends
ResultHandler>)ctlLoader.loadClass(name);
Modified:
trunk/run-handler-control-spi/src/main/java/no/sesat/search/run/handler/NavigationRunHandler.java
===================================================================
---
trunk/run-handler-control-spi/src/main/java/no/sesat/search/run/handler/NavigationRunHandler.java
2008-01-18 20:15:24 UTC (rev 5989)
+++
trunk/run-handler-control-spi/src/main/java/no/sesat/search/run/handler/NavigationRunHandler.java
2008-01-21 07:22:32 UTC (rev 5990)
@@ -172,7 +172,7 @@
private UrlGenerator
getUrlGeneratorInstance(SiteClassLoaderFactory.Context classLoadingContext,
NavigationConfig.Navigation navigation, Context context) {
try {
- final SiteClassLoaderFactory f =
SiteClassLoaderFactory.valueOf(classLoadingContext);
+ final SiteClassLoaderFactory f =
SiteClassLoaderFactory.instanceOf(classLoadingContext);
final Class clazz =
f.getClassLoader().loadClass(navigation.getUrlGenerator());
Modified:
trunk/run-handler-control-spi/src/main/java/no/sesat/search/run/handler/RunHandlerFactory.java
===================================================================
---
trunk/run-handler-control-spi/src/main/java/no/sesat/search/run/handler/RunHandlerFactory.java
2008-01-18 20:15:24 UTC (rev 5989)
+++
trunk/run-handler-control-spi/src/main/java/no/sesat/search/run/handler/RunHandlerFactory.java
2008-01-21 07:22:32 UTC (rev 5990)
@@ -77,7 +77,7 @@
context
);
- final ClassLoader ctlLoader =
SiteClassLoaderFactory.valueOf(ctlContext).getClassLoader();
+ final ClassLoader ctlLoader =
SiteClassLoaderFactory.instanceOf(ctlContext).getClassLoader();
@SuppressWarnings("unchecked")
final Class<? extends RunHandler> cls = (Class<? extends
RunHandler>)ctlLoader.loadClass(name);
Modified:
trunk/run-handler-control-spi/src/test/java/no/sesat/search/run/handler/RunHandlerFactoryTest.java
===================================================================
---
trunk/run-handler-control-spi/src/test/java/no/sesat/search/run/handler/RunHandlerFactoryTest.java
2008-01-18 20:15:24 UTC (rev 5989)
+++
trunk/run-handler-control-spi/src/test/java/no/sesat/search/run/handler/RunHandlerFactoryTest.java
2008-01-21 07:22:32 UTC (rev 5990)
@@ -44,7 +44,7 @@
public class RunHandlerFactoryTest {
@Test
final public void testGetController() throws Exception {
- final DataModelFactory factory = DataModelFactory.valueOf(new
DataModelFactory.Context() {
+ final DataModelFactory factory = DataModelFactory.instanceOf(new
DataModelFactory.Context() {
public Site getSite() {
return Site.DEFAULT;
}
@@ -73,7 +73,7 @@
}
};
- final SiteConfiguration siteConfig = SiteConfiguration.valueOf(cxt);
+ final SiteConfiguration siteConfig = SiteConfiguration.instanceOf(cxt);
final SiteDataObject siteDO = factory.instantiate(
SiteDataObject.class,
Modified:
trunk/run-transform-control-spi/src/main/java/no/sesat/search/run/transform/RunTransformerFactory.java
===================================================================
---
trunk/run-transform-control-spi/src/main/java/no/sesat/search/run/transform/RunTransformerFactory.java
2008-01-18 20:15:24 UTC (rev 5989)
+++
trunk/run-transform-control-spi/src/main/java/no/sesat/search/run/transform/RunTransformerFactory.java
2008-01-21 07:22:32 UTC (rev 5990)
@@ -76,7 +76,7 @@
context
);
- final ClassLoader ctlLoader =
SiteClassLoaderFactory.valueOf(ctlContext).getClassLoader();
+ final ClassLoader ctlLoader =
SiteClassLoaderFactory.instanceOf(ctlContext).getClassLoader();
@SuppressWarnings("unchecked")
final Class<? extends RunTransformer> cls = (Class<? extends
RunTransformer>)ctlLoader.loadClass(name);
Modified:
trunk/search-command-config-spi/src/main/java/no/sesat/search/mode/SearchModeFactory.java
===================================================================
---
trunk/search-command-config-spi/src/main/java/no/sesat/search/mode/SearchModeFactory.java
2008-01-18 20:15:24 UTC (rev 5989)
+++
trunk/search-command-config-spi/src/main/java/no/sesat/search/mode/SearchModeFactory.java
2008-01-21 07:22:32 UTC (rev 5990)
@@ -109,7 +109,7 @@
* @param cxt The context.
* @return the factory for the context.
*/
- public static SearchModeFactory valueOf(final Context cxt) {
+ public static SearchModeFactory instanceOf(final Context cxt) {
final Site site = cxt.getSite();
@@ -193,7 +193,7 @@
SearchMode mode = getModeImpl(id);
if (mode == null && id != null && id.length() > 0 &&
context.getSite().getParent() != null) {
// not found in this site's modes.xml. look in parent's site.
- final SearchModeFactory factory = valueOf(ContextWrapper.wrap(
+ final SearchModeFactory factory = instanceOf(ContextWrapper.wrap(
Context.class,
new SiteContext() {
public Site getSite() {
Modified:
trunk/search-command-control-spi/src/main/java/no/sesat/search/mode/SearchCommandFactory.java
===================================================================
---
trunk/search-command-control-spi/src/main/java/no/sesat/search/mode/SearchCommandFactory.java
2008-01-18 20:15:24 UTC (rev 5989)
+++
trunk/search-command-control-spi/src/main/java/no/sesat/search/mode/SearchCommandFactory.java
2008-01-21 07:22:32 UTC (rev 5990)
@@ -80,7 +80,7 @@
context
);
- final SiteClassLoaderFactory loaderFactory =
SiteClassLoaderFactory.valueOf(classContext);
+ final SiteClassLoaderFactory loaderFactory =
SiteClassLoaderFactory.instanceOf(classContext);
@SuppressWarnings("unchecked")
final Class<? extends SearchCommand> cls
Modified:
trunk/site-spi/src/main/java/no/sesat/search/site/SiteKeyedFactory.java
===================================================================
--- trunk/site-spi/src/main/java/no/sesat/search/site/SiteKeyedFactory.java
2008-01-18 20:15:24 UTC (rev 5989)
+++ trunk/site-spi/src/main/java/no/sesat/search/site/SiteKeyedFactory.java
2008-01-21 07:22:32 UTC (rev 5990)
@@ -32,7 +32,10 @@
*/
public interface SiteKeyedFactory {
- /** Remove the factory the maps to the given site. **/
+ /** Remove the factory the maps to the given site. *
+ * @param site remove factory corresponding to this site.
+ * @return true if a factory was successfully removed.
+ */
boolean remove(Site site);
}
Modified:
trunk/site-spi/src/main/java/no/sesat/search/site/config/AbstractConfigFactory.java
===================================================================
---
trunk/site-spi/src/main/java/no/sesat/search/site/config/AbstractConfigFactory.java
2008-01-18 20:15:24 UTC (rev 5989)
+++
trunk/site-spi/src/main/java/no/sesat/search/site/config/AbstractConfigFactory.java
2008-01-21 07:22:32 UTC (rev 5990)
@@ -100,7 +100,7 @@
context
);
- final ClassLoader classLoader =
SiteClassLoaderFactory.valueOf(c).getClassLoader();
+ final ClassLoader classLoader =
SiteClassLoaderFactory.instanceOf(c).getClassLoader();
return (Class<C>) classLoader.loadClass(classNameFQ);
}
Modified:
trunk/site-spi/src/main/java/no/sesat/search/site/config/SiteClassLoaderFactory.java
===================================================================
---
trunk/site-spi/src/main/java/no/sesat/search/site/config/SiteClassLoaderFactory.java
2008-01-18 20:15:24 UTC (rev 5989)
+++
trunk/site-spi/src/main/java/no/sesat/search/site/config/SiteClassLoaderFactory.java
2008-01-21 07:22:32 UTC (rev 5990)
@@ -76,7 +76,7 @@
* @param context The site and bytecode loader.
* @return a class loader factory for the site.
*/
- public static SiteClassLoaderFactory valueOf(final Context context) {
+ public static SiteClassLoaderFactory instanceOf(final Context context) {
final Site site = context.getSite();
Modified:
trunk/site-spi/src/main/java/no/sesat/search/site/config/SiteConfiguration.java
===================================================================
---
trunk/site-spi/src/main/java/no/sesat/search/site/config/SiteConfiguration.java
2008-01-18 20:15:24 UTC (rev 5989)
+++
trunk/site-spi/src/main/java/no/sesat/search/site/config/SiteConfiguration.java
2008-01-21 07:22:32 UTC (rev 5990)
@@ -118,7 +118,7 @@
* Find the correct instance handling this Site.
* We need to use a Context instead of the Site directly so we can handle
different styles of loading resources.
*/
- public static SiteConfiguration valueOf(final Context cxt) {
+ public static SiteConfiguration instanceOf(final Context cxt) {
final Site site = cxt.getSite();
assert null != site : "valueOf(cxt) got null site";
@@ -139,13 +139,14 @@
}
/**
- * Utility wrapper to the valueOf(Context).
+ * Utility wrapper to the instanceOf(Context).
* <b>Makes the presumption we will be using the UrlResourceLoader to load
the resource.</b>
+ * <b>Therefore can only be used within a running container, eg tomcat.</b>
*/
- public static SiteConfiguration valueOf(final Site site) {
+ public static SiteConfiguration instanceOf(final Site site) {
// SiteConfiguration.Context for this site & UrlResourceLoader.
- final SiteConfiguration stc = SiteConfiguration.valueOf(new
SiteConfiguration.Context() {
+ final SiteConfiguration stc = SiteConfiguration.instanceOf(new
SiteConfiguration.Context() {
public Site getSite() {
return site;
}
Modified:
trunk/site-spi/src/main/java/no/sesat/search/site/config/SpiClassLoader.java
===================================================================
---
trunk/site-spi/src/main/java/no/sesat/search/site/config/SpiClassLoader.java
2008-01-18 20:15:24 UTC (rev 5989)
+++
trunk/site-spi/src/main/java/no/sesat/search/site/config/SpiClassLoader.java
2008-01-21 07:22:32 UTC (rev 5990)
@@ -137,7 +137,7 @@
}
};
- return SiteClassLoaderFactory.valueOf(factoryContext).getClassLoader();
+ return
SiteClassLoaderFactory.instanceOf(factoryContext).getClassLoader();
}
private ClassLoader parentSiteClassLoader() {
@@ -157,7 +157,7 @@
}
};
- return SiteClassLoaderFactory.valueOf(parentContext).getClassLoader();
+ return
SiteClassLoaderFactory.instanceOf(parentContext).getClassLoader();
}
/**
Modified:
trunk/site-spi/src/main/java/no/sesat/search/site/config/TextMessages.java
===================================================================
--- trunk/site-spi/src/main/java/no/sesat/search/site/config/TextMessages.java
2008-01-18 20:15:24 UTC (rev 5989)
+++ trunk/site-spi/src/main/java/no/sesat/search/site/config/TextMessages.java
2008-01-21 07:22:32 UTC (rev 5990)
@@ -76,7 +76,7 @@
}
/**
- * Utility wrapper to the valueOf(Context).
+ * Utility wrapper to the instanceOf(Context).
*/
public static TextMessages valueOf(final Site site) {
@@ -113,7 +113,7 @@
// import messages from site's preferred locale [will not override
already loaded messages]
final SiteConfiguration siteConf
- =
SiteConfiguration.valueOf(ContextWrapper.wrap(SiteConfiguration.Context.class,
cxt));
+ =
SiteConfiguration.instanceOf(ContextWrapper.wrap(SiteConfiguration.Context.class,
cxt));
final String defaultLocale =
siteConf.getProperty(SiteConfiguration.SITE_LOCALE_DEFAULT);
assert null != defaultLocale
Modified:
trunk/site-spi/src/test/java/no/sesat/search/site/config/FileResourcesSiteConfigurationTest.java
===================================================================
---
trunk/site-spi/src/test/java/no/sesat/search/site/config/FileResourcesSiteConfigurationTest.java
2008-01-18 20:15:24 UTC (rev 5989)
+++
trunk/site-spi/src/test/java/no/sesat/search/site/config/FileResourcesSiteConfigurationTest.java
2008-01-21 07:22:32 UTC (rev 5990)
@@ -48,7 +48,7 @@
}
/**
- * Test of valueOf method, of class
no.sesat.search.configuration.SiteConfiguration.
+ * Test of instanceOf method, of class
no.sesat.search.configuration.SiteConfiguration.
*/
@Test
public void testDefaultSite() {
@@ -73,7 +73,7 @@
}
- /** Utility wrapper to the valueOf(Context).
+ /** Utility wrapper to the instanceOf(Context).
* <b>Makes the presumption we will be using the FileResourceLoader to
load all resources.</b>
*This is useful for tests that don't wont to rely on an application
server being up to serve the config files.
* @param site the site to obtain a SearchTabsCreator for
@@ -82,7 +82,7 @@
public static SiteConfiguration valueOf(final Site site) {
// SiteConfiguration.Context for this site & UrlResourceLoader.
- final SiteConfiguration stc = SiteConfiguration.valueOf(new
SiteConfiguration.Context() {
+ final SiteConfiguration stc = SiteConfiguration.instanceOf(new
SiteConfiguration.Context() {
public Site getSite() {
return site;
}
Modified:
trunk/view-config-spi/src/main/java/no/sesat/search/view/SearchTabFactory.java
===================================================================
---
trunk/view-config-spi/src/main/java/no/sesat/search/view/SearchTabFactory.java
2008-01-18 20:15:24 UTC (rev 5989)
+++
trunk/view-config-spi/src/main/java/no/sesat/search/view/SearchTabFactory.java
2008-01-21 07:22:32 UTC (rev 5990)
@@ -102,7 +102,7 @@
* @param cxt
* @return
*/
- public static SearchTabFactory valueOf(final Context cxt) {
+ public static SearchTabFactory instanceOf(final Context cxt) {
final Site site = cxt.getSite();
assert null != site;
@@ -181,7 +181,7 @@
SearchTab tab = getTabImpl(id);
if(null == tab && null != context.getSite().getParent()){
// not found in this site's views.xml. look in parent's site.
- final SearchTabFactory factory = valueOf(ContextWrapper.wrap(
+ final SearchTabFactory factory = instanceOf(ContextWrapper.wrap(
Context.class,
new SiteContext(){
public Site getSite(){
@@ -212,7 +212,7 @@
SearchTab tab = getTabByKeyImpl(key);
if(null == tab && null != context.getSite().getParent()){
// not found in this site's views.xml. look in parent's site.
- final SearchTabFactory factory = valueOf(ContextWrapper.wrap(
+ final SearchTabFactory factory = instanceOf(ContextWrapper.wrap(
Context.class,
new SiteContext(){
public Site getSite(){
Modified:
trunk/view-control-spi/src/main/java/no/sesat/search/view/FindResource.java
===================================================================
--- trunk/view-control-spi/src/main/java/no/sesat/search/view/FindResource.java
2008-01-18 20:15:24 UTC (rev 5989)
+++ trunk/view-control-spi/src/main/java/no/sesat/search/view/FindResource.java
2008-01-21 07:22:32 UTC (rev 5990)
@@ -58,7 +58,7 @@
if (resource.startsWith(PUBLISH_DIR)) { // publishing system
// the publishing system is responsible for this.
- final Properties props =
SiteConfiguration.valueOf(site).getProperties();
+ final Properties props =
SiteConfiguration.instanceOf(site).getProperties();
url = props.getProperty(SiteConfiguration.PUBLISH_SYSTEM_URL)
+ '/' + resource;
Modified:
trunk/view-control-spi/src/main/java/no/sesat/search/view/NavigationControllerSpiFactory.java
===================================================================
---
trunk/view-control-spi/src/main/java/no/sesat/search/view/NavigationControllerSpiFactory.java
2008-01-18 20:15:24 UTC (rev 5989)
+++
trunk/view-control-spi/src/main/java/no/sesat/search/view/NavigationControllerSpiFactory.java
2008-01-21 07:22:32 UTC (rev 5990)
@@ -67,7 +67,7 @@
}
};
- final SiteClassLoaderFactory loaderFactory =
SiteClassLoaderFactory.valueOf(classContext);
+ final SiteClassLoaderFactory loaderFactory =
SiteClassLoaderFactory.instanceOf(classContext);
@SuppressWarnings("unchecked")
final Class<? extends NavigationControllerFactory<T>> factory
Modified:
trunk/view-control-spi/src/test/java/no/sesat/search/view/SearchTabFactoryTest.java
===================================================================
---
trunk/view-control-spi/src/test/java/no/sesat/search/view/SearchTabFactoryTest.java
2008-01-18 20:15:24 UTC (rev 5989)
+++
trunk/view-control-spi/src/test/java/no/sesat/search/view/SearchTabFactoryTest.java
2008-01-21 07:22:32 UTC (rev 5990)
@@ -135,7 +135,7 @@
return site;
}
};//</editor-fold>
- final SiteConfiguration siteConf =
SiteConfiguration.valueOf(siteConfCxt);
+ final SiteConfiguration siteConf =
SiteConfiguration.instanceOf(siteConfCxt);
if( siteConf.isSiteLocaleSupported(l) ){
final SearchTabFactory instance =
getViewFactory(siteConstructorContext, l);
@@ -180,7 +180,7 @@
};
- final SearchTabFactory result = SearchTabFactory.valueOf(cxt);
+ final SearchTabFactory result = SearchTabFactory.instanceOf(cxt);
assertNotNull(result);
return result;
Modified:
trunk/war/src/main/java/no/sesat/search/http/filters/DataModelFilter.java
===================================================================
--- trunk/war/src/main/java/no/sesat/search/http/filters/DataModelFilter.java
2008-01-18 20:15:24 UTC (rev 5989)
+++ trunk/war/src/main/java/no/sesat/search/http/filters/DataModelFilter.java
2008-01-21 07:22:32 UTC (rev 5990)
@@ -111,7 +111,7 @@
final DataModelFactory factory;
try{
- factory = DataModelFactory.valueOf(new
DataModelFactory.Context(){
+ factory = DataModelFactory.instanceOf(new
DataModelFactory.Context(){
public Site getSite() {
return site;
}
Modified:
trunk/war/src/main/java/no/sesat/search/http/filters/SiteLocatorFilter.java
===================================================================
--- trunk/war/src/main/java/no/sesat/search/http/filters/SiteLocatorFilter.java
2008-01-18 20:15:24 UTC (rev 5989)
+++ trunk/war/src/main/java/no/sesat/search/http/filters/SiteLocatorFilter.java
2008-01-21 07:22:32 UTC (rev 5990)
@@ -322,7 +322,7 @@
return result;
}
};
- final SiteConfiguration siteConf =
SiteConfiguration.valueOf(siteConfCxt);
+ final SiteConfiguration siteConf =
SiteConfiguration.instanceOf(siteConfCxt);
servletRequest.setAttribute(SiteConfiguration.NAME_KEY, siteConf);
if(LOG.isTraceEnabled()){ // MessageFormat.format(..) is expensive
Modified:
trunk/war/src/main/java/no/sesat/search/http/filters/UrlRewriteFilter.java
===================================================================
--- trunk/war/src/main/java/no/sesat/search/http/filters/UrlRewriteFilter.java
2008-01-18 20:15:24 UTC (rev 5989)
+++ trunk/war/src/main/java/no/sesat/search/http/filters/UrlRewriteFilter.java
2008-01-21 07:22:32 UTC (rev 5990)
@@ -61,7 +61,7 @@
final HttpServletRequest httpRequest = (HttpServletRequest)request;
final Site site = (Site) httpRequest.getAttribute(Site.NAME_KEY);
- final UrlRewriterContainerFactory factory =
UrlRewriterContainerFactory.valueOf(
+ final UrlRewriterContainerFactory factory =
UrlRewriterContainerFactory.instanceOf(
new UrlRewriterContainerFactory.Context(){
public DocumentLoader newDocumentLoader(SiteContext
siteCxt,
String
resource,
Modified:
trunk/war/src/main/java/no/sesat/search/http/servlet/SearchServlet.java
===================================================================
--- trunk/war/src/main/java/no/sesat/search/http/servlet/SearchServlet.java
2008-01-18 20:15:24 UTC (rev 5989)
+++ trunk/war/src/main/java/no/sesat/search/http/servlet/SearchServlet.java
2008-01-21 07:22:32 UTC (rev 5990)
@@ -155,7 +155,7 @@
final DataModelFactory dmFactory;
try{
- dmFactory =
DataModelFactory.valueOf(ContextWrapper.wrap(DataModelFactory.Context.class,
genericCxt));
+ dmFactory =
DataModelFactory.instanceOf(ContextWrapper.wrap(DataModelFactory.Context.class,
genericCxt));
}catch(SiteKeyedFactoryInstantiationException skfe){
throw new ServletException(skfe);
@@ -413,7 +413,7 @@
SearchTab result = null;
try{
- final SearchTabFactory stFactory = SearchTabFactory.valueOf(
+ final SearchTabFactory stFactory = SearchTabFactory.instanceOf(
ContextWrapper.wrap(
SearchTabFactory.Context.class,
genericCxt));
@@ -453,7 +453,7 @@
final SearchTab searchTab,
final StopWatch stopWatch) throws IOException{
- final SearchMode mode = SearchModeFactory.valueOf(
+ final SearchMode mode = SearchModeFactory.instanceOf(
ContextWrapper.wrap(SearchModeFactory.Context.class,
genericCxt))
.getMode(searchTab.getMode());
@@ -490,7 +490,7 @@
// DataModel's ControlLevel will be REQUEST_CONSTRUCTION
// Increment it onwards to RUNNING_QUERY_CONSTRUCTION.
DataModelFactory
-
.valueOf(ContextWrapper.wrap(DataModelFactory.Context.class, genericCxt))
+
.instanceOf(ContextWrapper.wrap(DataModelFactory.Context.class, genericCxt))
.assignControlLevel(datamodel,
ControlLevel.RUNNING_QUERY_CONSTRUCTION);
final RunningQuery query =
QueryFactory.getInstance().createQuery(rqCxt, request, response);
Modified:
trunk/war/src/main/java/no/sesat/search/http/urlrewrite/UrlRewriterContainerFactory.java
===================================================================
---
trunk/war/src/main/java/no/sesat/search/http/urlrewrite/UrlRewriterContainerFactory.java
2008-01-18 20:15:24 UTC (rev 5989)
+++
trunk/war/src/main/java/no/sesat/search/http/urlrewrite/UrlRewriterContainerFactory.java
2008-01-21 07:22:32 UTC (rev 5990)
@@ -93,7 +93,7 @@
* @param cxt
* @return
*/
- public static UrlRewriterContainerFactory valueOf(final Context cxt) {
+ public static UrlRewriterContainerFactory instanceOf(final Context cxt) {
final Site site = cxt.getSite();
assert null != site;
Modified:
trunk/war/src/main/java/no/sesat/search/view/taglib/AbstractVelocityTemplateTag.java
===================================================================
---
trunk/war/src/main/java/no/sesat/search/view/taglib/AbstractVelocityTemplateTag.java
2008-01-18 20:15:24 UTC (rev 5989)
+++
trunk/war/src/main/java/no/sesat/search/view/taglib/AbstractVelocityTemplateTag.java
2008-01-21 07:22:32 UTC (rev 5990)
@@ -144,7 +144,7 @@
context.put("configuration", null != datamodel && null !=
datamodel.getSite()
?
datamodel.getSite().getSiteConfiguration().getProperties()
// we haven't gone through the SiteLocatorFilter so get
site manually
- : SiteConfiguration.valueOf(site).getProperties());
+ : SiteConfiguration.instanceOf(site).getProperties());
//context.put("channelCategories", Channel.Category.values());
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
