cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [1/2] git commit: Adding back in relative path
Date Fri, 01 Aug 2014 13:40:18 GMT
Repository: cxf-fediz
Updated Branches:
  refs/heads/master 863f99bd0 -> e17038b53


Adding back in relative path


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/3f8504b9
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/3f8504b9
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/3f8504b9

Branch: refs/heads/master
Commit: 3f8504b95cddb0325948ab4be20cb42a35fd9c26
Parents: 863f99b
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Fri Aug 1 12:07:28 2014 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Fri Aug 1 12:07:28 2014 +0100

----------------------------------------------------------------------
 .../cxf/fediz/cxf/plugin/AbstractServiceProviderFilter.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/3f8504b9/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/plugin/AbstractServiceProviderFilter.java
----------------------------------------------------------------------
diff --git a/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/plugin/AbstractServiceProviderFilter.java
b/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/plugin/AbstractServiceProviderFilter.java
index 853f916..b37a4d1 100644
--- a/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/plugin/AbstractServiceProviderFilter.java
+++ b/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/plugin/AbstractServiceProviderFilter.java
@@ -235,7 +235,11 @@ public abstract class AbstractServiceProviderFilter implements ContainerRequestF
         }
         FedizContext config = configurator.getFedizContext(contextName);
         if (config == null) {
-            throw new IllegalStateException("No Fediz configuration for context: " + contextName);
+            throw new IllegalStateException("No Fediz configuration for context :" + contextName);
+        }
+        String catalinaBase = System.getProperty("catalina.base");
+        if (catalinaBase != null && catalinaBase.length() > 0) {
+            config.setRelativePath(catalinaBase);
         }
 
         return config;


Mime
View raw message