From: <sp...@us...> - 2011-10-30 12:35:06
|
Revision: 8378 http://geonetwork.svn.sourceforge.net/geonetwork/?rev=8378&view=rev Author: sppigot Date: 2011-10-30 12:34:59 +0000 (Sun, 30 Oct 2011) Log Message: ----------- Add ConfigurationOverrides to config-summary.xml Modified Paths: -------------- trunk/web/src/main/java/org/fao/geonet/Geonetwork.java trunk/web/src/main/java/org/fao/geonet/kernel/search/SearchManager.java Modified: trunk/web/src/main/java/org/fao/geonet/Geonetwork.java =================================================================== --- trunk/web/src/main/java/org/fao/geonet/Geonetwork.java 2011-10-30 12:09:29 UTC (rev 8377) +++ trunk/web/src/main/java/org/fao/geonet/Geonetwork.java 2011-10-30 12:34:59 UTC (rev 8378) @@ -324,7 +324,7 @@ searchMan = new SearchManager(path, luceneDir, htmlCacheDir, dataDir, summaryConfigXmlFile, lc, logAsynch, logSpatialObject, luceneTermsToExclude, dataStore, maxWritesInTransaction, - new SettingInfo(settingMan), schemaMan); + new SettingInfo(settingMan), schemaMan, context.getServlet()); //------------------------------------------------------------------------ //--- extract intranet ip/mask and initialize AccessManager Modified: trunk/web/src/main/java/org/fao/geonet/kernel/search/SearchManager.java =================================================================== --- trunk/web/src/main/java/org/fao/geonet/kernel/search/SearchManager.java 2011-10-30 12:09:29 UTC (rev 8377) +++ trunk/web/src/main/java/org/fao/geonet/kernel/search/SearchManager.java 2011-10-30 12:34:59 UTC (rev 8378) @@ -26,7 +26,9 @@ import com.vividsolutions.jts.index.SpatialIndex; import jeeves.exceptions.JeevesException; import jeeves.resources.dbms.Dbms; +import jeeves.server.ConfigurationOverrides; import jeeves.server.context.ServiceContext; +import jeeves.server.sources.http.JeevesServlet; import jeeves.utils.Log; import jeeves.utils.Util; import jeeves.utils.Xml; @@ -324,16 +326,21 @@ * @param luceneTermsToExclude * @param dataStore * @param si + * @param scm + * @param servlet * @throws Exception */ public SearchManager(String appPath, String luceneDir, String htmlCacheDir, String dataDir, String summaryConfigXmlFile, LuceneConfig lc, boolean logAsynch, boolean logSpatialObject, String luceneTermsToExclude, - DataStore dataStore, int maxWritesInTransaction, SettingInfo si, SchemaManager scm) throws Exception + DataStore dataStore, int maxWritesInTransaction, SettingInfo si, SchemaManager scm, JeevesServlet servlet) throws Exception { _scm = scm; _dataDir = dataDir; _summaryConfig = Xml.loadStream(new FileInputStream(new File(appPath,summaryConfigXmlFile))); + if (servlet != null) { + ConfigurationOverrides.updateWithOverrides(summaryConfigXmlFile, servlet, appPath, _summaryConfig); + } _luceneConfig = lc; _settingInfo = si; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |