Return-Path: 
 <commits-return-41660-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org>
X-Original-To: apmail-cxf-commits-archive@www.apache.org
Delivered-To: apmail-cxf-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 4C3F318643
	for <apmail-cxf-commits-archive@www.apache.org>;
 Fri, 29 Apr 2016 09:43:19 +0000 (UTC)
Received: (qmail 17720 invoked by uid 500); 29 Apr 2016 09:43:19 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 17659 invoked by uid 500); 29 Apr 2016 09:43:19 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 17650 invoked by uid 99); 29 Apr 2016 09:43:19 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 Apr 2016 09:43:19 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id D1FEFDFCE0; Fri, 29 Apr 2016 09:43:18 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: sergeyb@apache.org
To: commits@cxf.apache.org
Message-Id: <5ab4555376994fafa1f9bc3f0978cd56@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: cxf-fediz git commit: Minor update to the oidc config
Date: Fri, 29 Apr 2016 09:43:18 +0000 (UTC)

Repository: cxf-fediz
Updated Branches:
  refs/heads/master 88d176a57 -> e353e52bc


Minor update to the oidc config


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

Branch: refs/heads/master
Commit: e353e52bc24787a065607e9d386770102d895955
Parents: 88d176a
Author: Sergey Beryozkin <sberyozkin@gmail.com>
Authored: Fri Apr 29 10:42:58 2016 +0100
Committer: Sergey Beryozkin <sberyozkin@gmail.com>
Committed: Fri Apr 29 10:42:58 2016 +0100

----------------------------------------------------------------------
 .../oidc/src/main/resources/META-INF/persistence.xml   |  7 ++++++-
 services/oidc/src/main/webapp/WEB-INF/data-manager.xml | 13 +++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/e353e52b/services/oidc/src/main/resources/META-INF/persistence.xml
----------------------------------------------------------------------
diff --git a/services/oidc/src/main/resources/META-INF/persistence.xml b/services/oidc/src/main/resources/META-INF/persistence.xml
index e5a96c5..a4ca5b2 100644
--- a/services/oidc/src/main/resources/META-INF/persistence.xml
+++ b/services/oidc/src/main/resources/META-INF/persistence.xml
@@ -2,7 +2,7 @@
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
              version="2.0">
-   <persistence-unit name="testUnitOpenJPA" transaction-type="RESOURCE_LOCAL">
+   <persistence-unit name="oidcOpenJPA" transaction-type="RESOURCE_LOCAL">
      <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
      <class>org.apache.cxf.rs.security.oidc.idp.OidcUserSubject</class>
      <class>org.apache.cxf.rs.security.oauth2.common.Client</class>
@@ -25,6 +25,11 @@
         <property name="openjpa.ConnectionPassword" value=""/>
         <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema"/>
         <property name="openjpa.MetaDataRepository" value="Preload=true"/>
+        <!--
+        <property name="openjpa.Log" value="SQL=TRACE"/>
+<property name="openjpa.ConnectionFactoryProperties"
+    value="PrettyPrint=true, PrettyPrintLineLength=72"/>
+        --> 
      </properties>
     </persistence-unit>
 </persistence>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/e353e52b/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 6b43e7a..622f3be 100644
--- a/services/oidc/src/main/webapp/WEB-INF/data-manager.xml
+++ b/services/oidc/src/main/webapp/WEB-INF/data-manager.xml
@@ -26,7 +26,11 @@
         http://www.springframework.org/schema/util 
         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">
@@ -39,6 +43,15 @@
     <util:list id="invisibleToClientScopes">
         <value>refreshToken</value>
     </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"
           init-method="init" destroy-method="close">