cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1358304 - in /cxf/branches/2.6.x-fixes: ./ rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/
Date Fri, 06 Jul 2012 17:14:38 GMT
Author: sergeyb
Date: Fri Jul  6 17:14:38 2012
New Revision: 1358304

URL: http://svn.apache.org/viewvc?rev=1358304&view=rev
Log:
Merged revisions 1358270,1358302 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1358270 | sergeyb | 2012-07-06 16:34:01 +0100 (Fri, 06 Jul 2012) | 1 line
  
  Checking if bus is null earlier
........
  r1358302 | sergeyb | 2012-07-06 18:05:41 +0100 (Fri, 06 Jul 2012) | 1 line
  
  Adding an HTTP-based SP state provider to make it really easy to set up a distributed cache
for the purpose of POC
........

Added:
    cxf/branches/2.6.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/HTTPSPStateManager.java
      - copied unchanged from r1358302, cxf/trunk/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/HTTPSPStateManager.java
Modified:
    cxf/branches/2.6.x-fixes/   (props changed)
    cxf/branches/2.6.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/EHCacheSPStateManager.java
    cxf/branches/2.6.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/RequestState.java
    cxf/branches/2.6.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/ResponseState.java

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/trunk:r1358270-1358302

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.6.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/EHCacheSPStateManager.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/EHCacheSPStateManager.java?rev=1358304&r1=1358303&r2=1358304&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/EHCacheSPStateManager.java
(original)
+++ cxf/branches/2.6.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/EHCacheSPStateManager.java
Fri Jul  6 17:14:38 2012
@@ -69,6 +69,10 @@ public class EHCacheSPStateManager imple
     }
     
     private void createCaches(String configFile, Bus bus) {
+        if (bus == null) {
+            bus = BusFactory.getThreadDefaultBus(true);
+        }
+        
         URL configFileURL = null;
         try {
             configFileURL = 
@@ -76,9 +80,6 @@ public class EHCacheSPStateManager imple
         } catch (Exception ex) {
             // ignore
         }
-        if (bus == null) {
-            bus = BusFactory.getThreadDefaultBus(true);
-        }
         if (configFileURL == null) {
             cacheManager = CacheManager.create();
         } else {

Modified: cxf/branches/2.6.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/RequestState.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/RequestState.java?rev=1358304&r1=1358303&r2=1358304&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/RequestState.java
(original)
+++ cxf/branches/2.6.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/RequestState.java
Fri Jul  6 17:14:38 2012
@@ -20,11 +20,14 @@ package org.apache.cxf.rs.security.saml.
 
 import java.io.Serializable;
 
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
+@XmlAccessorType(XmlAccessType.FIELD)
 public class RequestState implements Serializable {
 
-    /**
-     * 
-     */
     private static final long serialVersionUID = 869323136115571943L;
     
     private String targetAddress;
@@ -35,6 +38,10 @@ public class RequestState implements Ser
     private String webAppDomain;
     private long createdAt;
  
+    public RequestState() {
+        
+    }
+    
     public RequestState(String targetAddress,
                         String idpServiceAddress,
                         String samlRequestId,

Modified: cxf/branches/2.6.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/ResponseState.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/ResponseState.java?rev=1358304&r1=1358303&r2=1358304&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/ResponseState.java
(original)
+++ cxf/branches/2.6.x-fixes/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/ResponseState.java
Fri Jul  6 17:14:38 2012
@@ -20,12 +20,14 @@ package org.apache.cxf.rs.security.saml.
 
 import java.io.Serializable;
 
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
 
+@XmlRootElement
+@XmlAccessorType(XmlAccessType.FIELD)
 public class ResponseState implements Serializable {
 
-    /**
-     * 
-     */
     private static final long serialVersionUID = -3247188797004342462L;
     
     private String assertion;
@@ -35,6 +37,10 @@ public class ResponseState implements Se
     private long createdAt;
     private long expiresAt;
     
+    public ResponseState() {
+        
+    }
+    
     public ResponseState(String assertion,
                          String relayState,
                          String webAppContext,



Mime
View raw message