You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2016/02/04 16:33:08 UTC
[1/2] cxf-fediz git commit: Updating CXF version
Repository: cxf-fediz
Updated Branches:
refs/heads/master fb1b3f3b7 -> 48f12d233
Updating CXF version
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/25467484
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/25467484
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/25467484
Branch: refs/heads/master
Commit: 254674844f219186a64d84bd79a7c1cf937687d3
Parents: fb1b3f3
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Feb 4 15:07:53 2016 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Feb 4 15:07:53 2016 +0000
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/25467484/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 40aaed2..3daeb4b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
<commons.lang.version>3.4</commons.lang.version>
<commons.logging.version>1.2</commons.logging.version>
<commons.validator.version>1.5.0</commons.validator.version>
- <cxf.version>3.1.5-SNAPSHOT</cxf.version>
+ <cxf.version>3.1.6-SNAPSHOT</cxf.version>
<cxf.build-utils.version>3.1.0</cxf.build-utils.version>
<easymock.version>3.4</easymock.version>
<ecj.version>4.4.2</ecj.version>
[2/2] cxf-fediz git commit: Fixing the RealmParser following CXF
changes
Posted by co...@apache.org.
Fixing the RealmParser following CXF changes
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/48f12d23
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/48f12d23
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/48f12d23
Branch: refs/heads/master
Commit: 48f12d2339f3269f5c2202127a0dc4e7144bfe40
Parents: 2546748
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Feb 4 15:32:48 2016 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Feb 4 15:32:48 2016 +0000
----------------------------------------------------------------------
.../apache/cxf/fediz/service/sts/realms/UriRealmParser.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/48f12d23/services/sts/src/main/java/org/apache/cxf/fediz/service/sts/realms/UriRealmParser.java
----------------------------------------------------------------------
diff --git a/services/sts/src/main/java/org/apache/cxf/fediz/service/sts/realms/UriRealmParser.java b/services/sts/src/main/java/org/apache/cxf/fediz/service/sts/realms/UriRealmParser.java
index feebc7d..c39dcd8 100644
--- a/services/sts/src/main/java/org/apache/cxf/fediz/service/sts/realms/UriRealmParser.java
+++ b/services/sts/src/main/java/org/apache/cxf/fediz/service/sts/realms/UriRealmParser.java
@@ -22,8 +22,6 @@ package org.apache.cxf.fediz.service.sts.realms;
import java.util.Map;
import java.util.StringTokenizer;
-import javax.xml.ws.WebServiceContext;
-
import org.apache.cxf.sts.RealmParser;
import org.apache.cxf.ws.security.sts.provider.STSException;
import org.slf4j.Logger;
@@ -36,8 +34,8 @@ public class UriRealmParser implements RealmParser {
private Map<String, Object> realmMap;
@Override
- public String parseRealm(WebServiceContext context) throws STSException {
- String url = (String)context.getMessageContext().get("org.apache.cxf.request.url");
+ public String parseRealm(Map<String, Object> messageContext) throws STSException {
+ String url = (String)messageContext.get("org.apache.cxf.request.url");
// Get the realm of the request url
// Example: https://localhost:9443/fediz-idp-sts/REALMA/STSServiceTransport