openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject svn commit: r1790876 - in /openwebbeans/meecrowave/trunk: meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Configurer.java pom.xml
Date Mon, 10 Apr 2017 16:53:42 GMT
Author: rmannibucau
Date: Mon Apr 10 16:53:41 2017
New Revision: 1790876

URL: http://svn.apache.org/viewvc?rev=1790876&view=rev
Log:
MEECROWAVE-25 cxf 3.1.11

Modified:
    openwebbeans/meecrowave/trunk/meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Configurer.java
    openwebbeans/meecrowave/trunk/pom.xml

Modified: openwebbeans/meecrowave/trunk/meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Configurer.java
URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Configurer.java?rev=1790876&r1=1790875&r2=1790876&view=diff
==============================================================================
--- openwebbeans/meecrowave/trunk/meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Configurer.java
(original)
+++ openwebbeans/meecrowave/trunk/meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Configurer.java
Mon Apr 10 16:53:41 2017
@@ -161,15 +161,14 @@ public class OAuth2Configurer {
         refreshTokenGrantHandler.setUseAllClientScopes(configuration.isUseAllClientScopes());
         refreshTokenGrantHandler.setPartialMatchScopeValidation(configuration.isPartialMatchScopeValidation());
 
-        final ResourceOwnerLoginHandler loginHandler = configuration.isJaas() ? new JAASResourceOwnerLoginHandler()
: (name, password) -> {
+        final ResourceOwnerLoginHandler loginHandler = configuration.isJaas() ? new JAASResourceOwnerLoginHandler()
: (client, name, password) -> {
             try {
                 request.login(name, password);
                 try {
                     final Principal pcp = request.getUserPrincipal();
-                    final UserSubject userSubject = new UserSubject(
-                            name,
-                            GenericPrincipal.class.isInstance(pcp) ?
-                                    new ArrayList<>(asList(GenericPrincipal.class.cast(pcp).getRoles()))
: Collections.emptyList());
+                    final List<String> roles = GenericPrincipal.class.isInstance(pcp)
?
+                            new ArrayList<String>(asList(GenericPrincipal.class.cast(pcp).getRoles()))
: Collections.<String>emptyList();
+                    final UserSubject userSubject = new UserSubject(name, roles);
                     userSubject.setAuthenticationMethod(PASSWORD);
                     return userSubject;
                 } finally {

Modified: openwebbeans/meecrowave/trunk/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/pom.xml?rev=1790876&r1=1790875&r2=1790876&view=diff
==============================================================================
--- openwebbeans/meecrowave/trunk/pom.xml (original)
+++ openwebbeans/meecrowave/trunk/pom.xml Mon Apr 10 16:53:41 2017
@@ -51,7 +51,7 @@
     <junit.version>4.12</junit.version>
     <tomcat.version>9.0.0.M19</tomcat.version>
     <openwebbeans.version>1.7.2</openwebbeans.version>
-    <cxf.version>3.1.10</cxf.version>
+    <cxf.version>3.1.11</cxf.version>
     <johnzon.version>1.0.0</johnzon.version>
     <log4j2.version>2.8</log4j2.version>
     <deltaspike.version>1.7.2</deltaspike.version>



Mime
View raw message