Author: ssmiweve
Date: 2008-04-15 14:31:19 +0200 (Tue, 15 Apr 2008)
New Revision: 6445
Modified:
branches/2.17/data-model-api/src/main/java/no/sesat/search/datamodel/DataModelFactory.java
branches/2.17/site-spi/src/main/java/no/sesat/search/site/Site.java
branches/2.17/site-spi/src/main/java/no/sesat/search/site/config/SiteConfiguration.java
branches/2.17/war/src/main/java/no/sesat/search/http/filters/SiteLocatorFilter.java
Log:
better exception handling related to work going on in OPS-209
Modified:
branches/2.17/data-model-api/src/main/java/no/sesat/search/datamodel/DataModelFactory.java
===================================================================
---
branches/2.17/data-model-api/src/main/java/no/sesat/search/datamodel/DataModelFactory.java
2008-04-15 12:17:20 UTC (rev 6444)
+++
branches/2.17/data-model-api/src/main/java/no/sesat/search/datamodel/DataModelFactory.java
2008-04-15 12:31:19 UTC (rev 6445)
@@ -186,7 +186,7 @@
final String clsName =
siteConf.getProperty(DATA_MODEL_FACTORY_IMPL);
LOG.info("constructing for " + cxt.getSite() + " instance of " +
clsName);
-
+
@SuppressWarnings("unchecked")
final Class<DataModelFactory> cls = (Class<DataModelFactory>)
Class.forName(clsName);
Modified: branches/2.17/site-spi/src/main/java/no/sesat/search/site/Site.java
===================================================================
--- branches/2.17/site-spi/src/main/java/no/sesat/search/site/Site.java
2008-04-15 12:17:20 UTC (rev 6444)
+++ branches/2.17/site-spi/src/main/java/no/sesat/search/site/Site.java
2008-04-15 12:31:19 UTC (rev 6445)
@@ -31,6 +31,7 @@
import java.util.Properties;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import no.schibstedsok.commons.ioc.BaseContext;
+import org.apache.log4j.Level;
import org.apache.log4j.Logger;
/** A Site object idenetifies an unique SiteSearch implementation.
@@ -274,6 +275,9 @@
LOG.fatal(FATAL_CANT_FIND_DEFAULT_SITE, ex);
}
+ final Level oLevel = LOG.getLevel();
+ LOG.setLevel(Level.ALL);
+
final String defaultSiteName = props.getProperty(DEFAULT_SITE_KEY,
System.getProperty(DEFAULT_SITE_KEY));
LOG.info("defaultSiteName: " + defaultSiteName);
@@ -285,6 +289,7 @@
= props.getProperty(DEFAULT_SERVER_PORT_KEY,
System.getProperty(DEFAULT_SERVER_PORT_KEY));
LOG.info("defaultSitePort: " + defaultSitePort);
+ LOG.setLevel(oLevel);
SERVER_PORT = Integer.parseInt(defaultSitePort);
Modified:
branches/2.17/site-spi/src/main/java/no/sesat/search/site/config/SiteConfiguration.java
===================================================================
---
branches/2.17/site-spi/src/main/java/no/sesat/search/site/config/SiteConfiguration.java
2008-04-15 12:17:20 UTC (rev 6444)
+++
branches/2.17/site-spi/src/main/java/no/sesat/search/site/config/SiteConfiguration.java
2008-04-15 12:31:19 UTC (rev 6445)
@@ -90,6 +90,11 @@
cxt.newPropertiesLoader(cxt, Site.CONFIGURATION_FILE,
properties).abut();
INSTANCES.put(cxt.getSite(), this);
+
+ }catch(ResourceLoadException rle){
+ LOG.fatal("BROKEN SITE HIERARCHY." + rle.getMessage());
+ throw new VirtualMachineError(rle.getMessage()){};
+
} finally {
INSTANCES_LOCK.writeLock().unlock();
}
Modified:
branches/2.17/war/src/main/java/no/sesat/search/http/filters/SiteLocatorFilter.java
===================================================================
---
branches/2.17/war/src/main/java/no/sesat/search/http/filters/SiteLocatorFilter.java
2008-04-15 12:17:20 UTC (rev 6444)
+++
branches/2.17/war/src/main/java/no/sesat/search/http/filters/SiteLocatorFilter.java
2008-04-15 12:31:19 UTC (rev 6445)
@@ -35,6 +35,8 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
+import javax.enterprise.deploy.model.J2eeApplicationObject;
+import javax.enterprise.deploy.model.J2eeApplicationObject;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
@@ -53,6 +55,7 @@
import no.sesat.search.site.config.UrlResourceLoader;
import no.sesat.search.site.Site;
import no.sesat.search.datamodel.DataModel;
+import no.sesat.search.site.config.ResourceLoadException;
import no.sesat.search.view.FindResource;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang.time.StopWatch;
@@ -105,8 +108,14 @@
final Properties props = new Properties();
final PropertiesLoader loader
= UrlResourceLoader.newPropertiesLoader(siteContext,
Site.CONFIGURATION_FILE, props);
- loader.abut();
- return props.getProperty(Site.PARENT_SITE_KEY);
+ try{
+ loader.abut();
+ return props.getProperty(Site.PARENT_SITE_KEY);
+
+ }catch(ResourceLoadException rle){
+ LOG.fatal("BROKEN SITE HIERARCHY." + rle.getMessage());
+ throw new VirtualMachineError(rle.getMessage()){};
+ }
}
};
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
