Author: ssanthor
Date: 2007-01-17 17:04:22 +0100 (Wed, 17 Jan 2007)
New Revision: 4345
Modified:
trunk/site-spi/src/main/java/no/schibstedsok/searchportal/site/Site.java
trunk/site-spi/src/main/java/no/schibstedsok/searchportal/site/config/SiteConfiguration.java
trunk/war/src/main/java/no/schibstedsok/searchportal/http/servlet/SearchServlet.java
Log:
reorganization for SEARCH-1482
Modified:
trunk/site-spi/src/main/java/no/schibstedsok/searchportal/site/Site.java
===================================================================
--- trunk/site-spi/src/main/java/no/schibstedsok/searchportal/site/Site.java
2007-01-17 12:20:09 UTC (rev 4344)
+++ trunk/site-spi/src/main/java/no/schibstedsok/searchportal/site/Site.java
2007-01-17 16:04:22 UTC (rev 4345)
@@ -54,8 +54,6 @@
/** Name of the resource to find the PARENT_SITE_KEY property. **/
public static final String CONFIGURATION_FILE = "configuration.properties";
private static final String CORE_CONF_FILE = "core.properties";
- /** Property key to find out if this Site is a sitesearch**/
- public static final String IS_SITESEARCH_KEY = "site.issitesearch";
private static final Map<String,Site> INSTANCES = new
HashMap<String,Site>();
private static final ReentrantReadWriteLock INSTANCES_LOCK = new
ReentrantReadWriteLock();
Modified:
trunk/site-spi/src/main/java/no/schibstedsok/searchportal/site/config/SiteConfiguration.java
===================================================================
---
trunk/site-spi/src/main/java/no/schibstedsok/searchportal/site/config/SiteConfiguration.java
2007-01-17 12:20:09 UTC (rev 4344)
+++
trunk/site-spi/src/main/java/no/schibstedsok/searchportal/site/config/SiteConfiguration.java
2007-01-17 16:04:22 UTC (rev 4345)
@@ -30,6 +30,8 @@
public static final String PUBLISH_SYSTEM_HOST =
"publishing.system.host-header";
private static final String SITE_LOCALE_SUPPORTED =
"site.locale.supported";
+ /** Property key to find out if this Site is a sitesearch**/
+ public static final String IS_SITESEARCH_KEY = "site.issitesearch";
public interface Context extends BaseContext, PropertiesContext,
SiteContext {
}
Modified:
trunk/war/src/main/java/no/schibstedsok/searchportal/http/servlet/SearchServlet.java
===================================================================
---
trunk/war/src/main/java/no/schibstedsok/searchportal/http/servlet/SearchServlet.java
2007-01-17 12:20:09 UTC (rev 4344)
+++
trunk/war/src/main/java/no/schibstedsok/searchportal/http/servlet/SearchServlet.java
2007-01-17 16:04:22 UTC (rev 4345)
@@ -210,7 +210,7 @@
// check if this is a sitesearch
final Properties props = SiteConfiguration.valueOf(
ContextWrapper.wrap(SiteConfiguration.Context.class,
ctx)).getProperties();
- final boolean isSitesearch =
Boolean.valueOf(props.getProperty(Site.IS_SITESEARCH_KEY)).booleanValue();
+ final boolean isSitesearch =
Boolean.valueOf(props.getProperty(SiteConfiguration.IS_SITESEARCH_KEY)).booleanValue();
if (qParam == null) {
redirect = null != request.getContextPath()
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
