Return-Path: 
 <commits-return-34048-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 48E881779F
	for <apmail-cxf-commits-archive@www.apache.org>;
 Thu,  2 Oct 2014 17:19:22 +0000 (UTC)
Received: (qmail 79895 invoked by uid 500); 2 Oct 2014 17:19:22 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 79832 invoked by uid 500); 2 Oct 2014 17:19:22 -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 79823 invoked by uid 99); 2 Oct 2014 17:19:22 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Oct 2014 17:19:22 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id A272BA12E40; Thu,  2 Oct 2014 17:19:20 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: owulff@apache.org
To: commits@cxf.apache.org
Message-Id: <5ff8c8e0328a4d4282af71999c019806@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: git commit: Add JNDI Datasource definition but disabled
Date: Thu,  2 Oct 2014 17:19:20 +0000 (UTC)

Repository: cxf-fediz
Updated Branches:
  refs/heads/master 3b9d837b8 -> 308c39f5a


Add JNDI Datasource definition but disabled


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

Branch: refs/heads/master
Commit: 308c39f5a2a1d3a2b385dfff0a3c1d32bbd1393b
Parents: 3b9d837
Author: Oliver Wulff <owulff@talend.com>
Authored: Thu Oct 2 19:19:04 2014 +0200
Committer: Oliver Wulff <owulff@talend.com>
Committed: Thu Oct 2 19:19:04 2014 +0200

----------------------------------------------------------------------
 services/idp/src/main/webapp/WEB-INF/web.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/308c39f5/services/idp/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/services/idp/src/main/webapp/WEB-INF/web.xml b/services/idp/src/main/webapp/WEB-INF/web.xml
index d0163ac..2849a6b 100644
--- a/services/idp/src/main/webapp/WEB-INF/web.xml
+++ b/services/idp/src/main/webapp/WEB-INF/web.xml
@@ -89,4 +89,14 @@ under the License.
         <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
     </listener>
 
+    <!-- Uncomment this when using JNDI DataSource -->
+    <!-- The property jpa.platform must be updated in persistence.properties even you use JNDI Datasource -->
+    <!-- 
+    <resource-ref>
+        <res-ref-name>jdbc/fedizDataSource</res-ref-name>
+        <res-type>javax.sql.DataSource</res-type>
+        <res-auth>Container</res-auth>
+    </resource-ref>
+    -->
+
 </web-app>