cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject cxf-fediz git commit: Reverting to OIDC Ehcache persistence OOB for 1.3.1-SNAPSHOT
Date Tue, 21 Jun 2016 16:01:36 GMT
Repository: cxf-fediz
Updated Branches:
  refs/heads/master 1c78f2957 -> 6b9b3810e


Reverting to OIDC Ehcache persistence OOB for 1.3.1-SNAPSHOT


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

Branch: refs/heads/master
Commit: 6b9b3810ede98f2d318118d05cb81714c3afd644
Parents: 1c78f29
Author: Sergey Beryozkin <sberyozkin@gmail.com>
Authored: Tue Jun 21 17:01:16 2016 +0100
Committer: Sergey Beryozkin <sberyozkin@gmail.com>
Committed: Tue Jun 21 17:01:16 2016 +0100

----------------------------------------------------------------------
 services/oidc/pom.xml                           | 22 +++++++++++---------
 .../src/main/webapp/WEB-INF/data-manager.xml    | 10 +--------
 .../cxf/fediz/systests/oidc/OIDCTest.java       |  2 --
 3 files changed, 13 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6b9b3810/services/oidc/pom.xml
----------------------------------------------------------------------
diff --git a/services/oidc/pom.xml b/services/oidc/pom.xml
index a0f9cca..3d56f97 100644
--- a/services/oidc/pom.xml
+++ b/services/oidc/pom.xml
@@ -63,16 +63,6 @@
             <version>${spring.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_2.0_spec</artifactId>
-            <version>1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-orm</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
             <version>${slf4j.version}</version>
@@ -82,11 +72,23 @@
             <artifactId>commons-validator</artifactId>
             <version>${commons.validator.version}</version>
         </dependency>
+        <!--
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jpa_2.0_spec</artifactId>
+            <version>1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-orm</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa</artifactId>
             <version>${openjpa.version}</version>
         </dependency>
+        -->
     </dependencies>
     <build>
         <plugins>

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6b9b3810/services/oidc/src/main/webapp/WEB-INF/data-manager.xml
----------------------------------------------------------------------
diff --git a/services/oidc/src/main/webapp/WEB-INF/data-manager.xml b/services/oidc/src/main/webapp/WEB-INF/data-manager.xml
index fa1d596..9f663e1 100644
--- a/services/oidc/src/main/webapp/WEB-INF/data-manager.xml
+++ b/services/oidc/src/main/webapp/WEB-INF/data-manager.xml
@@ -27,9 +27,6 @@
         http://www.springframework.org/schema/util/spring-util.xsd
         ">
     
-    <!-- Remove this import if no JPA2 is used --> 
-    <import resource="entity-manager.xml" /> 
-    
     <bean id="applicationContextProvider" class="org.apache.cxf.fediz.service.oidc.handler.hrd.ApplicationContextProvider"/>
 
     <util:map id="supportedScopes">
@@ -44,17 +41,12 @@
     </util:list>
     
     <!-- 
-        If working with Ehcache:
-        - replace the class attribute with org.apache.cxf.rs.security.oauth2.grants.code.DefaultEHCacheCodeDataProvider
-        - remove 'entityManager' property
-        
         To support the alternative data persistence strategies: either register a custom
         AbstractCodeDataProvider extension or implement AuthorizationCodeDataProvider directly
     -->     
     <bean id="oauthProvider" 
-          class="org.apache.cxf.rs.security.oauth2.grants.code.JPACodeDataProvider"
+          class="org.apache.cxf.rs.security.oauth2.grants.code.DefaultEHCacheCodeDataProvider"
           init-method="init" destroy-method="close">
-        <property name="entityManager" ref="entityManager"/>
         <property name="supportedScopes" ref="supportedScopes"/>
         <property name="requiredScopes" ref="coreScopes"/>
         <property name="defaultScopes" ref="coreScopes"/>

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6b9b3810/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java
----------------------------------------------------------------------
diff --git a/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java
b/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java
index 0ef10a1..2abb3c8 100644
--- a/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java
+++ b/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java
@@ -410,7 +410,6 @@ public class OIDCTest {
     
     // TODO @Ignoring failing test for now
     @org.junit.Test
-    @org.junit.Ignore
     public void testOIDCLoginForClient2() throws Exception {
         
         String url = "https://localhost:" + getRpHttpsPort() + "/fediz-oidc/idp/authorize?";
@@ -449,7 +448,6 @@ public class OIDCTest {
     
     // TODO @Ignoring failing test for now
     @org.junit.Test
-    @org.junit.Ignore
     public void testUsingCodeForOtherClient() throws Exception {
         // Get the code for the first client
         String url = "https://localhost:" + getRpHttpsPort() + "/fediz-oidc/idp/authorize?";


Mime
View raw message