cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject git commit: [FEDIZ-70] Missing support for Web Services Policy 1.2
Date Tue, 27 May 2014 16:29:54 GMT
Repository: cxf-fediz
Updated Branches:
  refs/heads/1.1.x-fixes 4fa62cf44 -> b6fc8ee74


[FEDIZ-70] Missing support for Web Services Policy 1.2

git-svn-id: https://svn.apache.org/repos/asf/cxf/fediz/trunk@1570351 13f79535-47bb-0310-9956-ffa450edef68

Conflicts:
	services/idp/src/main/java/org/apache/cxf/fediz/service/idp/domain/Application.java
	services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/ApplicationDAOJPAImpl.java
	services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/ApplicationEntity.java
	services/idp/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/DBLoaderImpl.java
	services/idp/src/test/java/org/apache/cxf/fediz/service/idp/service/jpa/ApplicationDAOJPATest.java


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

Branch: refs/heads/1.1.x-fixes
Commit: b6fc8ee74fb8c7dc8f8d35aa65412fd89240907c
Parents: 4fa62cf
Author: owulff <owulff@unknown>
Authored: Thu Feb 20 20:56:19 2014 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Tue May 27 17:29:48 2014 +0100

----------------------------------------------------------------------
 .../apache/cxf/fediz/service/idp/beans/STSClientAction.java | 5 +++++
 .../apache/cxf/fediz/service/idp/model/ServiceConfig.java   | 9 +++++++++
 2 files changed, 14 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/b6fc8ee7/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/STSClientAction.java
----------------------------------------------------------------------
diff --git a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/STSClientAction.java
b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/STSClientAction.java
index 9e52449..8b039e0 100644
--- a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/STSClientAction.java
+++ b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/STSClientAction.java
@@ -177,6 +177,11 @@ public class STSClientAction {
         } else {
             sts.setTokenType(getTokenType());
         }
+        
+        if (serviceConfig.getPolicyNamespace() != null && serviceConfig.getPolicyNamespace().length()
> 0) {
+            sts.setWspNamespace(serviceConfig.getPolicyNamespace());
+        }
+        
         if (LOG.isDebugEnabled()) {
             LOG.debug("TokenType " + sts.getTokenType() + " set for " + wtrealm);
         }

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/b6fc8ee7/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/model/ServiceConfig.java
----------------------------------------------------------------------
diff --git a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/model/ServiceConfig.java
b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/model/ServiceConfig.java
index 08cf07a..7f94007 100644
--- a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/model/ServiceConfig.java
+++ b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/model/ServiceConfig.java
@@ -74,6 +74,9 @@ public class ServiceConfig implements Serializable {
     // Not in Metadata, configured in IDP or passed in wreq parameter
     private String lifeTime;
 
+    // WS-Policy Namespace for AppliesTo element
+    private String policyNamespace;
+
     public String getRealm() {
         return realm;
     }
@@ -146,5 +149,11 @@ public class ServiceConfig implements Serializable {
         this.lifeTime = lifeTime;
     }
         
+    public String getPolicyNamespace() {
+        return policyNamespace;
+    }
 
+    public void setPolicyNamespace(String policyNamespace) {
+        this.policyNamespace = policyNamespace;
+    }
 }


Mime
View raw message