Fixing rules
This commit is contained in:
parent
d17a98cbaa
commit
9505d86d81
|
@ -216,8 +216,8 @@ public class TestRules extends ContextTest {
|
||||||
public void testSingleRule() throws Exception {
|
public void testSingleRule() throws Exception {
|
||||||
allRules();
|
allRules();
|
||||||
File rulesDirectory = getRulesDirectory();
|
File rulesDirectory = getRulesDirectory();
|
||||||
File rulesDirFile = new File(rulesDirectory, "FullTextIndexNode");
|
File rulesDirFile = new File(rulesDirectory, "Thredds");
|
||||||
File rulesFile = new File(rulesDirFile, "FullTextIndexNode-OTHER.json");
|
File rulesFile = new File(rulesDirFile, "Thredds_OTHER.json");
|
||||||
testRule(rulesFile);
|
testRule(rulesFile);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"match": {
|
"match": {
|
||||||
"serviceClassRegex": "DataPublishing",
|
"serviceClassRegex": "DataPublishing",
|
||||||
"serviceNameRegex": "SDMXDataSource",
|
"serviceNameRegex": "SDMXDataSource.*",
|
||||||
"calledMethodRegex": ".*"
|
"calledMethodRegex": ".*"
|
||||||
},
|
},
|
||||||
"replace": {
|
"replace": {
|
||||||
|
|
|
@ -0,0 +1,21 @@
|
||||||
|
SDI,Thredds,METADATA::MyCatalog
|
||||||
|
SDI,Thredds,METADATA::FabioPreTest
|
||||||
|
SDI,Thredds,METADATA::Oscar
|
||||||
|
SDI,Thredds,METADATA::myCatalog
|
||||||
|
SDI,Thredds,METADATA::another_catalog
|
||||||
|
SDI,Thredds,METADATA::TestFabioWS
|
||||||
|
SDI,Thredds,METADATA::newCatalog
|
||||||
|
SDI,Thredds,METADATA::OTHER
|
||||||
|
SDI,Thredds,dodsC::newCatalog
|
||||||
|
SDI,Thredds,dodsC::TestFabioWS
|
||||||
|
SDI,Thredds,dodsC::FabioPreTest
|
||||||
|
SDI,Thredds,dodsC::MyCatalog
|
||||||
|
SDI,Thredds,dodsC::Oscar
|
||||||
|
SDI,Thredds,wms::Oscar
|
||||||
|
SDI,Thredds,wms::MyCatalog
|
||||||
|
SDI,Thredds,wms::myCatalog
|
||||||
|
SDI,Thredds,wms::newCatalog
|
||||||
|
SDI,Thredds,wms::FabioPreTest
|
||||||
|
SDI,Thredds,wms::another_catalog
|
||||||
|
SDI,Thredds,wms::OTHER
|
||||||
|
SDI,Thredds,dodsC::OTHER
|
|
@ -14,3 +14,4 @@ SDI,Thredds,/godiva2/theme/default/style.css
|
||||||
SDI,Thredds,/js/lib/OpenLayers-2.12/theme/default/style.css
|
SDI,Thredds,/js/lib/OpenLayers-2.12/theme/default/style.css
|
||||||
SDI,Thredds,/style/ncss/form.css
|
SDI,Thredds,/style/ncss/form.css
|
||||||
SDI,Thredds,/threddsIcon.gif
|
SDI,Thredds,/threddsIcon.gif
|
||||||
|
SDI,Thredds,OTHER
|
|
|
@ -399,7 +399,7 @@
|
||||||
},{
|
},{
|
||||||
"match": {
|
"match": {
|
||||||
"serviceClassRegex": "DataPublishing",
|
"serviceClassRegex": "DataPublishing",
|
||||||
"serviceNameRegex": "SDMXDataSource",
|
"serviceNameRegex": "SDMXDataSource.*",
|
||||||
"calledMethodRegex": ".*"
|
"calledMethodRegex": ".*"
|
||||||
},
|
},
|
||||||
"replace": {
|
"replace": {
|
||||||
|
@ -532,7 +532,7 @@
|
||||||
"match": {
|
"match": {
|
||||||
"serviceClassRegex": "SDI",
|
"serviceClassRegex": "SDI",
|
||||||
"serviceNameRegex": "Thredds",
|
"serviceNameRegex": "Thredds",
|
||||||
"calledMethodRegex": "^(\/){1}(?<Protocol>[a-zA-Z0-9]*){1}(\/public\/netcdf\/){1}(?<Collection>[a-zA-Z0-9_-]*(?<!(..\\.nc)))(\/){1}.*(?<!(..\\.nc|.\\.asc|\\.tiff))$"
|
"calledMethodRegex": "^(\/){1}(?<Protocol>[a-zA-Z0-9]*){1}(\/public\/netcdf\/){1}(?<Collection>[a-zA-Z0-9_\\-%]*(?<!(..\\.nc)))(\/){1}.*(?<!(..\\.nc|.\\.asc|\\.tiff))$"
|
||||||
},
|
},
|
||||||
"replace": {
|
"replace": {
|
||||||
"serviceClass": "SDI",
|
"serviceClass": "SDI",
|
||||||
|
@ -565,7 +565,7 @@
|
||||||
"match": {
|
"match": {
|
||||||
"serviceClassRegex": "SDI",
|
"serviceClassRegex": "SDI",
|
||||||
"serviceNameRegex": "Thredds",
|
"serviceNameRegex": "Thredds",
|
||||||
"calledMethodRegex": "^(\/){1}(?<Protocol>[a-zA-Z0-9]*){1}(\/public\/netcdf\/){1}(?<Collection>[a-zA-Z0-9_-]*)(\/){1}(.*\\.(nc|asc|tiff))$"
|
"calledMethodRegex": "^(\/){1}(?<Protocol>[a-zA-Z0-9]*){1}(\/public\/netcdf\/){1}(?<Collection>[a-zA-Z0-9_\\-%]*)(\/){1}(.*\\.(nc|asc|tiff))$"
|
||||||
},
|
},
|
||||||
"replace": {
|
"replace": {
|
||||||
"serviceClass": "SDI",
|
"serviceClass": "SDI",
|
||||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue