xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #828: Ensure all baseline PurgeRules files live in only COMMON_STATIC, modify

Browse source 
PluginDao.getPurgeRulesForPlugin to search just COMMON_STATIC.

Change-Id: If0e9b37d423a5cdfe317194f952bbfb9697b9581

Former-commit-id: 7cd8ebbf86bd1b6725e990fc2c36317e15cc1fc0
This commit is contained in:
David Gillingham 2012-06-29 13:01:42 -05:00
parent 151515b52d
commit 3fffc47ba5
5 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
View file

@ -51,6 +51,11 @@ import com.raytheon.uf.common.datastorage.Request;
import com.raytheon.uf.common.datastorage.StorageException;
import com.raytheon.uf.common.datastorage.StorageStatus;
import com.raytheon.uf.common.datastorage.records.IDataRecord;
import com.raytheon.uf.common.localization.IPathManager;
import com.raytheon.uf.common.localization.LocalizationContext;
import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
import com.raytheon.uf.common.localization.LocalizationFile;
import com.raytheon.uf.common.localization.PathManagerFactory;
import com.raytheon.uf.common.serialization.SerializationException;
import com.raytheon.uf.common.serialization.SerializationUtil;
@ -79,6 +84,8 @@ import com.raytheon.uf.edex.database.query.DatabaseQuery;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* 2/6/09 1990 bphillip Initial creation
* 6/29/12 #828 dgilling Force getPurgeRulesForPlugin()
* to search only COMMON_STATIC.
* </pre>
*
* @author bphillip
@ -1228,8 +1235,21 @@ public abstract class PluginDao extends CoreDao {
}
public static List<PurgeRule> getPurgeRulesForPlugin(String pluginName) {
File rulesFile = PathManagerFactory.getPathManager().getStaticFile(
"purge/" + pluginName + "PurgeRules.xml");
IPathManager pathMgr = PathManagerFactory.getPathManager();
Map<LocalizationLevel, LocalizationFile> tieredFile = pathMgr
.getTieredLocalizationFile(LocalizationType.COMMON_STATIC,
"purge/" + pluginName + "PurgeRules.xml");
LocalizationContext[] levelHierarchy = pathMgr
.getLocalSearchHierarchy(LocalizationType.COMMON_STATIC);
File rulesFile = null;
for (LocalizationContext ctx : levelHierarchy) {
LocalizationFile lFile = tieredFile.get(ctx.getLocalizationLevel());
if (lFile != null) {
rulesFile = lFile.getFile();
break;
}
}
if (rulesFile != null) {
try {
PurgeRuleSet purgeRules = (PurgeRuleSet) SerializationUtil

0
edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/utility/edex_static/base/purge/regionalsatPurgeRules.xml → edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/utility/common_static/base/purge/regionalsatPurgeRules.xml
View file

0
edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/utility/edex_static/site/AFC/purge/regionalsatPurgeRules.xml → edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/utility/common_static/site/AFC/purge/regionalsatPurgeRules.xml
View file

10
ncep/gov.noaa.nws.ncep.edex.plugin.airmet/utility/edex_static/base/purge/airmetPurgeRules.xml
View file

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<purgeRuleSet xmlns:ns2="group">
<rule>
<id>
<pluginName>airmet</pluginName>
<key>default</key>
</id>
<period>02-00:00:00</period>
</rule>
</purgeRuleSet>

10
ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/utility/edex_static/base/purge/convsigmetPurgeRules.xml
View file

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<purgeRuleSet xmlns:ns2="group">
<rule>
<id>
<pluginName>convsigmet</pluginName>
<key>default</key>
</id>
<period>02-00:00:00</period>
</rule>
</purgeRuleSet>