You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by gm...@apache.org on 2012/10/10 23:36:57 UTC
svn commit: r1396811 -
/cxf/fediz/trunk/plugins/tomcat/src/main/java/org/apache/cxf/fediz/tomcat/FederationAuthenticator.java
Author: gmazza
Date: Wed Oct 10 21:36:56 2012
New Revision: 1396811
URL: http://svn.apache.org/viewvc?rev=1396811&view=rev
Log:
FEDIZ-25 Search from CATALINA_BASE instead of CATALINA_HOME (former defaults to latter if former not defined) for Fediz config file. Patch from Juan Manuel Cabrera
Modified:
cxf/fediz/trunk/plugins/tomcat/src/main/java/org/apache/cxf/fediz/tomcat/FederationAuthenticator.java
Modified: cxf/fediz/trunk/plugins/tomcat/src/main/java/org/apache/cxf/fediz/tomcat/FederationAuthenticator.java
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/tomcat/src/main/java/org/apache/cxf/fediz/tomcat/FederationAuthenticator.java?rev=1396811&r1=1396810&r2=1396811&view=diff
==============================================================================
--- cxf/fediz/trunk/plugins/tomcat/src/main/java/org/apache/cxf/fediz/tomcat/FederationAuthenticator.java (original)
+++ cxf/fediz/trunk/plugins/tomcat/src/main/java/org/apache/cxf/fediz/tomcat/FederationAuthenticator.java Wed Oct 10 21:36:56 2012
@@ -100,9 +100,9 @@ public class FederationAuthenticator ext
try {
File f = new File(getConfigFile());
if (!f.exists()) {
- String catalinaHome = System.getProperty("catalina.home");
- if (catalinaHome != null && catalinaHome.length() > 0) {
- f = new File(catalinaHome.concat(File.separator + getConfigFile()));
+ String catalinaBase = System.getProperty("catalina.base");
+ if (catalinaBase != null && catalinaBase.length() > 0) {
+ f = new File(catalinaBase.concat(File.separator + getConfigFile()));
}
}
configurator = new FederationConfigurator();
@@ -141,9 +141,9 @@ public class FederationAuthenticator ext
if (config == null) {
throw new IllegalStateException("No Fediz configuration for context :" + contextName);
}
- String catalinaHome = System.getProperty("catalina.home");
- if (catalinaHome != null && catalinaHome.length() > 0) {
- config.setRelativePath(catalinaHome);
+ String catalinaBase = System.getProperty("catalina.base");
+ if (catalinaBase != null && catalinaBase.length() > 0) {
+ config.setRelativePath(catalinaBase);
}
return config;
}