projects
/
shibboleth
/
cpp-sp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7a8806e
)
https://issues.shibboleth.net/jira/browse/SSPCPP-589
author
Scott Cantor
<cantor.2@osu.edu>
Thu, 21 Nov 2013 19:08:36 +0000
(19:08 +0000)
committer
Scott Cantor
<cantor.2@osu.edu>
Thu, 21 Nov 2013 19:08:36 +0000
(19:08 +0000)
shibsp/SPConfig.cpp
patch
|
blob
|
history
diff --git
a/shibsp/SPConfig.cpp
b/shibsp/SPConfig.cpp
index
0e42344
..
695763a
100644
(file)
--- a/
shibsp/SPConfig.cpp
+++ b/
shibsp/SPConfig.cpp
@@
-233,13
+233,6
@@
bool SPConfig::init(const char* catalog_path, const char* inst_prefix)
return false;
}
#endif
return false;
}
#endif
- if (!catalog_path)
- catalog_path = getenv("SHIBSP_SCHEMAS");
- if (!catalog_path || !*catalog_path)
- catalog_path = SHIBSP_SCHEMAS;
- if (!XMLToolingConfig::getConfig().getValidatingParser().loadCatalogs(catalog_path)) {
- log.warn("failed to load schema catalogs into validating parser");
- }
PathResolver* pr = XMLToolingConfig::getConfig().getPathResolver();
pr->setDefaultPackageName(PACKAGE_NAME);
PathResolver* pr = XMLToolingConfig::getConfig().getPathResolver();
pr->setDefaultPackageName(PACKAGE_NAME);
@@
-266,6
+259,14
@@
bool SPConfig::init(const char* catalog_path, const char* inst_prefix)
inst_prefix = SHIBSP_XMLDIR;
pr->setXMLDir(inst_prefix);
inst_prefix = SHIBSP_XMLDIR;
pr->setXMLDir(inst_prefix);
+ if (!catalog_path)
+ catalog_path = getenv("SHIBSP_SCHEMAS");
+ if (!catalog_path || !*catalog_path)
+ catalog_path = SHIBSP_SCHEMAS;
+ if (!XMLToolingConfig::getConfig().getValidatingParser().loadCatalogs(catalog_path)) {
+ log.warn("failed to load schema catalogs into validating parser");
+ }
+
XMLToolingConfig::getConfig().setTemplateEngine(new TemplateEngine());
XMLToolingConfig::getConfig().getTemplateEngine()->setTagPrefix("shibmlp");
XMLToolingConfig::getConfig().setTemplateEngine(new TemplateEngine());
XMLToolingConfig::getConfig().getTemplateEngine()->setTagPrefix("shibmlp");