cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [2/2] git commit: Removing deprecated method
Date Fri, 11 Apr 2014 22:02:02 GMT
Removing deprecated method


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

Branch: refs/heads/master
Commit: 0a34954aef0f90ac704a2d0305dd5b7f361e8d2e
Parents: ec5b090
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Fri Apr 11 22:36:48 2014 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Fri Apr 11 23:01:09 2014 +0100

----------------------------------------------------------------------
 .../org/apache/cxf/sts/token/provider/ConditionsProvider.java  | 6 ------
 .../cxf/sts/token/provider/DefaultConditionsProvider.java      | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/0a34954a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/ConditionsProvider.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/ConditionsProvider.java
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/ConditionsProvider.java
index fb59527..3173bac 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/ConditionsProvider.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/ConditionsProvider.java
@@ -18,7 +18,6 @@
  */
 package org.apache.cxf.sts.token.provider;
 
-import org.apache.cxf.sts.request.Lifetime;
 import org.apache.wss4j.common.saml.bean.ConditionsBean;
 
 /**
@@ -33,11 +32,6 @@ public interface ConditionsProvider {
     ConditionsBean getConditions(TokenProviderParameters providerParameters);
     
     /**
-     * Get a ConditionsBean object.
-     */
-    ConditionsBean getConditions(String appliesToAddress, Lifetime tokenLifetime);
-    
-    /**
      * Get the lifetime to use (in seconds)
      */
     long getLifetime();

http://git-wip-us.apache.org/repos/asf/cxf/blob/0a34954a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/DefaultConditionsProvider.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/DefaultConditionsProvider.java
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/DefaultConditionsProvider.java
index 60957261..dc10315 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/DefaultConditionsProvider.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/DefaultConditionsProvider.java
@@ -141,7 +141,7 @@ public class DefaultConditionsProvider implements ConditionsProvider {
     /**
      * Get a ConditionsBean object.
      */
-    public ConditionsBean getConditions(String appliesToAddress, Lifetime tokenLifetime)
{
+    private ConditionsBean getConditions(String appliesToAddress, Lifetime tokenLifetime)
{
         ConditionsBean conditions = new ConditionsBean();
         if (lifetime > 0) {
             if (acceptClientLifetime && tokenLifetime != null


Mime
View raw message