cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject cxf-fediz git commit: Removing deprecated interface
Date Fri, 04 Sep 2015 10:14:15 GMT
Repository: cxf-fediz
Updated Branches:
  refs/heads/master 51c25b002 -> a0bc9f6bc


Removing deprecated interface


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

Branch: refs/heads/master
Commit: a0bc9f6bcc40681e8a22ada52932290d19cd3169
Parents: 51c25b0
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Fri Sep 4 11:14:02 2015 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Fri Sep 4 11:14:02 2015 +0100

----------------------------------------------------------------------
 examples/simpleWebapp/README.txt                |  2 +-
 examples/simpleWebapp/pom.xml                   |  2 +-
 .../cxf/fediz/example/FederationServlet.java    |  8 +++----
 examples/spring2Webapp/README.txt               |  2 +-
 examples/springPreauthWebapp/README.txt         |  2 +-
 examples/springPreauthWebapp/pom.xml            |  2 +-
 .../cxf/fediz/example/FederationServlet.java    |  8 +++----
 examples/springWebapp/README.txt                |  2 +-
 examples/websphereWebapp/README.txt             |  2 +-
 examples/websphereWebapp/pom.xml                |  2 +-
 examples/wsclientWebapp/webapp/pom.xml          |  2 +-
 .../cxf/fediz/example/FederationServlet.java    | 14 +++++------
 .../cxf/fediz/core/FederationPrincipal.java     | 25 --------------------
 .../fediz/jetty8/FederationUserPrincipal.java   |  5 ++--
 .../FederationAuthenticationToken.java          |  5 ++--
 .../FederationAuthenticationToken.java          |  5 ++--
 .../fediz/tomcat7/FederationPrincipalImpl.java  |  5 ++--
 .../fediz/tomcat8/FederationPrincipalImpl.java  |  5 ++--
 systests/webapps/simpleWebapp/pom.xml           |  2 +-
 systests/webapps/springPreauthWebapp/pom.xml    |  2 +-
 20 files changed, 36 insertions(+), 66 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/a0bc9f6b/examples/simpleWebapp/README.txt
----------------------------------------------------------------------
diff --git a/examples/simpleWebapp/README.txt b/examples/simpleWebapp/README.txt
index 12ac9d9..9679c3d 100644
--- a/examples/simpleWebapp/README.txt
+++ b/examples/simpleWebapp/README.txt
@@ -47,7 +47,7 @@ and can be accessed only if the browser user is authenticated. The purpose
of
 the FederationServlet is to illustrate the usage of the Java Servlet Security
 API to get the authenticated user and to check the roles he has. Further, 
 the FederationServlet shows how to access claims data (user data) which were 
-stored in the SAML token by using the Fediz interface FederationPrincipal.
+stored in the SAML token by using the Fediz interface FedizPrincipal.
 Beyond that, the FederationServlet illustrates how to access the SAML token
 if required. The classes SecurityTokenThreadLocal.java and FederationFilter.java
 can be used to achieve that. You could get this information directly from the

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/a0bc9f6b/examples/simpleWebapp/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simpleWebapp/pom.xml b/examples/simpleWebapp/pom.xml
index a3f8bb5..06eb684 100644
--- a/examples/simpleWebapp/pom.xml
+++ b/examples/simpleWebapp/pom.xml
@@ -42,7 +42,7 @@
             <version>${servlet.version}</version>
             <scope>provided</scope>
         </dependency>
-        <!-- Required to cast Principal to FederationPrincipal -->
+        <!-- Required to cast Principal to FedizPrincipal -->
         <dependency>
             <groupId>org.apache.cxf.fediz</groupId>
             <artifactId>fediz-core</artifactId>

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/a0bc9f6b/examples/simpleWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
----------------------------------------------------------------------
diff --git a/examples/simpleWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
b/examples/simpleWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
index 3a9dd78..3c456c9 100644
--- a/examples/simpleWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
+++ b/examples/simpleWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
@@ -41,7 +41,7 @@ import org.w3c.dom.Element;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.cxf.fediz.core.Claim;
 import org.apache.cxf.fediz.core.ClaimCollection;
-import org.apache.cxf.fediz.core.FederationPrincipal;
+import org.apache.cxf.fediz.core.FedizPrincipal;
 import org.apache.cxf.fediz.core.SecurityTokenThreadLocal;
 
 
@@ -78,8 +78,8 @@ public class FederationServlet extends HttpServlet {
             out.println("Has role '" + item + "': " + ((request.isUserInRole(item)) ? "<b>yes</b>"
: "no") + "<p>");
         }
 
-        if (p instanceof FederationPrincipal) {
-            FederationPrincipal fp = (FederationPrincipal)p;
+        if (p instanceof FedizPrincipal) {
+            FedizPrincipal fp = (FedizPrincipal)p;
 
             out.println("<br><b>Claims</b><p>");
             ClaimCollection claims = fp.getClaims();
@@ -87,7 +87,7 @@ public class FederationServlet extends HttpServlet {
                 out.println(c.getClaimType().toString() + ": " + c.getValue() + "<p>");
             }
         } else {
-            out.println("Principal is not instance of FederationPrincipal");
+            out.println("Principal is not instance of FedizPrincipal");
         }
 
         Element el = SecurityTokenThreadLocal.getToken();

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/a0bc9f6b/examples/spring2Webapp/README.txt
----------------------------------------------------------------------
diff --git a/examples/spring2Webapp/README.txt b/examples/spring2Webapp/README.txt
index 296a0c9..5b25fc0 100644
--- a/examples/spring2Webapp/README.txt
+++ b/examples/spring2Webapp/README.txt
@@ -40,7 +40,7 @@ and can be accessed only if the browser user is authenticated. The purpose
of
 the FederationServlet is to illustrate the usage of the Spring Security 2 API and
 Configuration to get the authenticated user and to check the roles he has. Further, 
 the FederationServlet shows how to access claims data (user data) which were 
-stored in the SAML token by using the Fediz interface FederationPrincipal.
+stored in the SAML token by using the Fediz interface FedizPrincipal.
 Beyond that, the FederationServlet illustrates how to access the SAML token
 if required. The classes SecurityTokenThreadLocal.java and FederationFilter.java
 can be used to achieve that. You could get this information directly from the

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/a0bc9f6b/examples/springPreauthWebapp/README.txt
----------------------------------------------------------------------
diff --git a/examples/springPreauthWebapp/README.txt b/examples/springPreauthWebapp/README.txt
index dc39f5b..bb7956e 100644
--- a/examples/springPreauthWebapp/README.txt
+++ b/examples/springPreauthWebapp/README.txt
@@ -57,7 +57,7 @@ and can be accessed only if the browser user is authenticated. The purpose
of
 the FederationServlet is to illustrate the usage of the Java Servlet Security
 API to get the authenticated user and to check the roles he has. Further, 
 the FederationServlet shows how to access claims data (user data) which were 
-stored in the SAML token by using the Fediz interface FederationPrincipal.
+stored in the SAML token by using the Fediz interface FedizPrincipal.
 Beyond that, the FederationServlet illustrates how to access the SAML token
 if required. The classes SecurityTokenThreadLocal.java and FederationFilter.java
 can be used to achieve that. You could get this information directly from the

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/a0bc9f6b/examples/springPreauthWebapp/pom.xml
----------------------------------------------------------------------
diff --git a/examples/springPreauthWebapp/pom.xml b/examples/springPreauthWebapp/pom.xml
index f0139d7..8bd6f23 100644
--- a/examples/springPreauthWebapp/pom.xml
+++ b/examples/springPreauthWebapp/pom.xml
@@ -44,7 +44,7 @@
             <version>${servlet.version}</version>
             <scope>provided</scope>
         </dependency>
-        <!-- Required to cast Principal to FederationPrincipal -->
+        <!-- Required to cast Principal to FedizPrincipal -->
         <dependency>
             <groupId>org.apache.cxf.fediz</groupId>
             <artifactId>fediz-core</artifactId>

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/a0bc9f6b/examples/springPreauthWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
----------------------------------------------------------------------
diff --git a/examples/springPreauthWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
b/examples/springPreauthWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
index c8e303a..9e4a042 100644
--- a/examples/springPreauthWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
+++ b/examples/springPreauthWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
@@ -41,7 +41,7 @@ import org.w3c.dom.Element;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.cxf.fediz.core.Claim;
 import org.apache.cxf.fediz.core.ClaimCollection;
-import org.apache.cxf.fediz.core.FederationPrincipal;
+import org.apache.cxf.fediz.core.FedizPrincipal;
 import org.apache.cxf.fediz.core.SecurityTokenThreadLocal;
 
 import org.springframework.security.core.Authentication;
@@ -81,8 +81,8 @@ public class FederationServlet extends HttpServlet {
             out.println("Has role '" + item + "': " + ((request.isUserInRole(item)) ? "<b>yes</b>"
: "no") + "<p>");
         }
 
-        if (p instanceof FederationPrincipal) {
-            FederationPrincipal fp = (FederationPrincipal)p;
+        if (p instanceof FedizPrincipal) {
+            FedizPrincipal fp = (FedizPrincipal)p;
 
             out.println("<br><b>Claims</b><p>");
             ClaimCollection claims = fp.getClaims();
@@ -90,7 +90,7 @@ public class FederationServlet extends HttpServlet {
                 out.println(c.getClaimType().toString() + ": " + c.getValue() + "<p>");
             }
         } else {
-            out.println("Principal is not instance of FederationPrincipal");
+            out.println("Principal is not instance of FedizPrincipal");
         }
 
         // Access Spring security context

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/a0bc9f6b/examples/springWebapp/README.txt
----------------------------------------------------------------------
diff --git a/examples/springWebapp/README.txt b/examples/springWebapp/README.txt
index 016a7c8..5c58f8e 100644
--- a/examples/springWebapp/README.txt
+++ b/examples/springWebapp/README.txt
@@ -40,7 +40,7 @@ and can be accessed only if the browser user is authenticated. The purpose
of
 the FederationServlet is to illustrate the usage of the Spring Security API and
 Configuration to get the authenticated user and to check the roles he has. Further, 
 the FederationServlet shows how to access claims data (user data) which were 
-stored in the SAML token by using the Fediz interface FederationPrincipal.
+stored in the SAML token by using the Fediz interface FedizPrincipal.
 Beyond that, the FederationServlet illustrates how to access the SAML token
 if required. The classes SecurityTokenThreadLocal.java and FederationFilter.java
 can be used to achieve that. You could get this information directly from the

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/a0bc9f6b/examples/websphereWebapp/README.txt
----------------------------------------------------------------------
diff --git a/examples/websphereWebapp/README.txt b/examples/websphereWebapp/README.txt
index 12ac9d9..9679c3d 100644
--- a/examples/websphereWebapp/README.txt
+++ b/examples/websphereWebapp/README.txt
@@ -47,7 +47,7 @@ and can be accessed only if the browser user is authenticated. The purpose
of
 the FederationServlet is to illustrate the usage of the Java Servlet Security
 API to get the authenticated user and to check the roles he has. Further, 
 the FederationServlet shows how to access claims data (user data) which were 
-stored in the SAML token by using the Fediz interface FederationPrincipal.
+stored in the SAML token by using the Fediz interface FedizPrincipal.
 Beyond that, the FederationServlet illustrates how to access the SAML token
 if required. The classes SecurityTokenThreadLocal.java and FederationFilter.java
 can be used to achieve that. You could get this information directly from the

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/a0bc9f6b/examples/websphereWebapp/pom.xml
----------------------------------------------------------------------
diff --git a/examples/websphereWebapp/pom.xml b/examples/websphereWebapp/pom.xml
index da695b0..85f0af5 100644
--- a/examples/websphereWebapp/pom.xml
+++ b/examples/websphereWebapp/pom.xml
@@ -42,7 +42,7 @@
             <version>${servlet.version}</version>
             <scope>provided</scope>
         </dependency>
-        <!-- Required to cast Principal to FederationPrincipal -->
+        <!-- Required to cast Principal to FedizPrincipal -->
         <dependency>
             <groupId>org.apache.cxf.fediz</groupId>
             <artifactId>fediz-core</artifactId>

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/a0bc9f6b/examples/wsclientWebapp/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/examples/wsclientWebapp/webapp/pom.xml b/examples/wsclientWebapp/webapp/pom.xml
index 469212c..3f2bad5 100644
--- a/examples/wsclientWebapp/webapp/pom.xml
+++ b/examples/wsclientWebapp/webapp/pom.xml
@@ -51,7 +51,7 @@
             <version>${tomcat7.version}</version>
             <scope>provided</scope>
         </dependency>
-        <!-- Required to cast Principal to FederationPrincipal -->
+        <!-- Required to cast Principal to FedizPrincipal -->
         <dependency>
             <groupId>org.apache.cxf.fediz</groupId>
             <artifactId>fediz-core</artifactId>

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/a0bc9f6b/examples/wsclientWebapp/webapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
----------------------------------------------------------------------
diff --git a/examples/wsclientWebapp/webapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
b/examples/wsclientWebapp/webapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
index cfcc2cd..1fcb751 100644
--- a/examples/wsclientWebapp/webapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
+++ b/examples/wsclientWebapp/webapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
@@ -41,7 +41,7 @@ import org.w3c.dom.Element;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.cxf.fediz.core.Claim;
 import org.apache.cxf.fediz.core.ClaimCollection;
-import org.apache.cxf.fediz.core.FederationPrincipal;
+import org.apache.cxf.fediz.core.FedizPrincipal;
 import org.apache.cxf.fediz.core.SecurityTokenThreadLocal;
 import org.apache.hello_world_soap_http.Greeter;
 
@@ -79,8 +79,8 @@ public class FederationServlet extends HttpServlet {
             out.println("Has role '" + item + "': " + ((request.isUserInRole(item)) ? "<b>yes</b>"
: "no") + "<p>");
         }
 
-        if (p instanceof FederationPrincipal) {
-            FederationPrincipal fp = (FederationPrincipal)p;
+        if (p instanceof FedizPrincipal) {
+            FedizPrincipal fp = (FedizPrincipal)p;
 
             out.println("<br><b>Claims</b><p>");
             ClaimCollection claims = fp.getClaims();
@@ -88,7 +88,7 @@ public class FederationServlet extends HttpServlet {
                 out.println(c.getClaimType().toString() + ": " + c.getValue() + "<p>");
             }
         } else {
-            out.println("Principal is not instance of FederationPrincipal");
+            out.println("Principal is not instance of FedizPrincipal");
         }
 
         Element el = SecurityTokenThreadLocal.getToken();
@@ -142,8 +142,8 @@ public class FederationServlet extends HttpServlet {
             out.println("Has role '" + item + "': " + ((request.isUserInRole(item)) ? "<b>yes</b>"
: "no") + "<p>");
         }
 
-        if (p instanceof FederationPrincipal) {
-            FederationPrincipal fp = (FederationPrincipal)p;
+        if (p instanceof FedizPrincipal) {
+            FedizPrincipal fp = (FedizPrincipal)p;
 
             out.println("<br><b>Claims</b><p>");
             ClaimCollection claims = fp.getClaims();
@@ -151,7 +151,7 @@ public class FederationServlet extends HttpServlet {
                 out.println(c.getClaimType().toString() + ": " + c.getValue() + "<p>");
             }
         } else {
-            out.println("Principal is not instance of FederationPrincipalImpl");
+            out.println("Principal is not instance of FedizPrincipalImpl");
         }
 
         Greeter service = (Greeter)ApplicationContextProvider.getContext().getBean("HelloServiceClient");

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/a0bc9f6b/plugins/core/src/main/java/org/apache/cxf/fediz/core/FederationPrincipal.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/FederationPrincipal.java
b/plugins/core/src/main/java/org/apache/cxf/fediz/core/FederationPrincipal.java
deleted file mode 100644
index e996bc5..0000000
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/FederationPrincipal.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.cxf.fediz.core;
-
-@Deprecated
-public interface FederationPrincipal extends FedizPrincipal {
-
-}

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/a0bc9f6b/plugins/jetty8/src/main/java/org/apache/cxf/fediz/jetty8/FederationUserPrincipal.java
----------------------------------------------------------------------
diff --git a/plugins/jetty8/src/main/java/org/apache/cxf/fediz/jetty8/FederationUserPrincipal.java
b/plugins/jetty8/src/main/java/org/apache/cxf/fediz/jetty8/FederationUserPrincipal.java
index 04cf061..b209605 100644
--- a/plugins/jetty8/src/main/java/org/apache/cxf/fediz/jetty8/FederationUserPrincipal.java
+++ b/plugins/jetty8/src/main/java/org/apache/cxf/fediz/jetty8/FederationUserPrincipal.java
@@ -21,11 +21,10 @@ package org.apache.cxf.fediz.jetty8;
 
 import org.w3c.dom.Element;
 import org.apache.cxf.fediz.core.ClaimCollection;
-import org.apache.cxf.fediz.core.FederationPrincipal;
+import org.apache.cxf.fediz.core.FedizPrincipal;
 import org.apache.cxf.fediz.core.processor.FedizResponse;
 
-@SuppressWarnings("deprecation")
-public class FederationUserPrincipal implements FederationPrincipal {
+public class FederationUserPrincipal implements FedizPrincipal {
     private String name;
     private ClaimCollection claims;
     private FedizResponse response;

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/a0bc9f6b/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/authentication/FederationAuthenticationToken.java
----------------------------------------------------------------------
diff --git a/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/authentication/FederationAuthenticationToken.java
b/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/authentication/FederationAuthenticationToken.java
index 77983ea..4c2aea1 100644
--- a/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/authentication/FederationAuthenticationToken.java
+++ b/plugins/spring/src/main/java/org/apache/cxf/fediz/spring/authentication/FederationAuthenticationToken.java
@@ -24,7 +24,7 @@ import java.util.Collection;
 
 import org.w3c.dom.Element;
 import org.apache.cxf.fediz.core.ClaimCollection;
-import org.apache.cxf.fediz.core.FederationPrincipal;
+import org.apache.cxf.fediz.core.FedizPrincipal;
 import org.apache.cxf.fediz.core.processor.FedizResponse;
 import org.springframework.security.authentication.AbstractAuthenticationToken;
 import org.springframework.security.core.GrantedAuthority;
@@ -34,9 +34,8 @@ import org.springframework.security.core.userdetails.UserDetails;
 /**
  * Represents a successful WS-Federation based authentication.
  */
-@SuppressWarnings("deprecation")
 public class FederationAuthenticationToken extends AbstractAuthenticationToken
-    implements Serializable, FederationPrincipal {
+    implements Serializable, FedizPrincipal {
 
     private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
 

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/a0bc9f6b/plugins/spring2/src/main/java/org/apache/cxf/fediz/spring/authentication/FederationAuthenticationToken.java
----------------------------------------------------------------------
diff --git a/plugins/spring2/src/main/java/org/apache/cxf/fediz/spring/authentication/FederationAuthenticationToken.java
b/plugins/spring2/src/main/java/org/apache/cxf/fediz/spring/authentication/FederationAuthenticationToken.java
index 8179167..284b910 100644
--- a/plugins/spring2/src/main/java/org/apache/cxf/fediz/spring/authentication/FederationAuthenticationToken.java
+++ b/plugins/spring2/src/main/java/org/apache/cxf/fediz/spring/authentication/FederationAuthenticationToken.java
@@ -23,7 +23,7 @@ import java.io.Serializable;
 
 import org.w3c.dom.Element;
 import org.apache.cxf.fediz.core.ClaimCollection;
-import org.apache.cxf.fediz.core.FederationPrincipal;
+import org.apache.cxf.fediz.core.FedizPrincipal;
 import org.apache.cxf.fediz.core.processor.FedizResponse;
 import org.springframework.security.GrantedAuthority;
 import org.springframework.security.providers.AbstractAuthenticationToken;
@@ -32,9 +32,8 @@ import org.springframework.security.userdetails.UserDetails;
 /**
  * Represents a successful WS-Federation based authentication.
  */
-@SuppressWarnings("deprecation")
 public class FederationAuthenticationToken extends AbstractAuthenticationToken
-    implements Serializable, FederationPrincipal {
+    implements Serializable, FedizPrincipal {
 
     private static final long serialVersionUID = 1L;
 

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/a0bc9f6b/plugins/tomcat7/src/main/java/org/apache/cxf/fediz/tomcat7/FederationPrincipalImpl.java
----------------------------------------------------------------------
diff --git a/plugins/tomcat7/src/main/java/org/apache/cxf/fediz/tomcat7/FederationPrincipalImpl.java
b/plugins/tomcat7/src/main/java/org/apache/cxf/fediz/tomcat7/FederationPrincipalImpl.java
index 70dac97..453879f 100644
--- a/plugins/tomcat7/src/main/java/org/apache/cxf/fediz/tomcat7/FederationPrincipalImpl.java
+++ b/plugins/tomcat7/src/main/java/org/apache/cxf/fediz/tomcat7/FederationPrincipalImpl.java
@@ -25,10 +25,9 @@ import org.w3c.dom.Element;
 import org.apache.catalina.realm.GenericPrincipal;
 import org.apache.cxf.fediz.core.Claim;
 import org.apache.cxf.fediz.core.ClaimCollection;
-import org.apache.cxf.fediz.core.FederationPrincipal;
+import org.apache.cxf.fediz.core.FedizPrincipal;
 
-@SuppressWarnings("deprecation")
-public class FederationPrincipalImpl extends GenericPrincipal implements FederationPrincipal
{
+public class FederationPrincipalImpl extends GenericPrincipal implements FedizPrincipal {
 
     protected ClaimCollection claims;
     protected Element loginToken;

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/a0bc9f6b/plugins/tomcat8/src/main/java/org/apache/cxf/fediz/tomcat8/FederationPrincipalImpl.java
----------------------------------------------------------------------
diff --git a/plugins/tomcat8/src/main/java/org/apache/cxf/fediz/tomcat8/FederationPrincipalImpl.java
b/plugins/tomcat8/src/main/java/org/apache/cxf/fediz/tomcat8/FederationPrincipalImpl.java
index 3bc613b..aa1d316 100644
--- a/plugins/tomcat8/src/main/java/org/apache/cxf/fediz/tomcat8/FederationPrincipalImpl.java
+++ b/plugins/tomcat8/src/main/java/org/apache/cxf/fediz/tomcat8/FederationPrincipalImpl.java
@@ -25,10 +25,9 @@ import org.w3c.dom.Element;
 import org.apache.catalina.realm.GenericPrincipal;
 import org.apache.cxf.fediz.core.Claim;
 import org.apache.cxf.fediz.core.ClaimCollection;
-import org.apache.cxf.fediz.core.FederationPrincipal;
+import org.apache.cxf.fediz.core.FedizPrincipal;
 
-@SuppressWarnings("deprecation")
-public class FederationPrincipalImpl extends GenericPrincipal implements FederationPrincipal
{
+public class FederationPrincipalImpl extends GenericPrincipal implements FedizPrincipal {
 
     protected ClaimCollection claims;
     protected Element loginToken;

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/a0bc9f6b/systests/webapps/simpleWebapp/pom.xml
----------------------------------------------------------------------
diff --git a/systests/webapps/simpleWebapp/pom.xml b/systests/webapps/simpleWebapp/pom.xml
index 09ad827..f2bfd6b 100644
--- a/systests/webapps/simpleWebapp/pom.xml
+++ b/systests/webapps/simpleWebapp/pom.xml
@@ -39,7 +39,7 @@
             <version>${servlet.version}</version>
             <scope>provided</scope>
         </dependency>
-        <!-- Required to cast Principal to FederationPrincipal -->
+        <!-- Required to cast Principal to FedizPrincipal -->
         <dependency>
             <groupId>org.apache.cxf.fediz</groupId>
             <artifactId>fediz-core</artifactId>

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/a0bc9f6b/systests/webapps/springPreauthWebapp/pom.xml
----------------------------------------------------------------------
diff --git a/systests/webapps/springPreauthWebapp/pom.xml b/systests/webapps/springPreauthWebapp/pom.xml
index dccf6da..54717f3 100644
--- a/systests/webapps/springPreauthWebapp/pom.xml
+++ b/systests/webapps/springPreauthWebapp/pom.xml
@@ -48,7 +48,7 @@
             <version>${servlet.version}</version>
             <scope>provided</scope>
         </dependency>
-        <!-- Required to cast Principal to FederationPrincipal -->
+        <!-- Required to cast Principal to FedizPrincipal -->
         <dependency>
             <groupId>org.apache.cxf.fediz</groupId>
             <artifactId>fediz-core</artifactId>


Mime
View raw message