Return-Path: 
 <commits-return-27022-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 67A7FC2D8
	for <apmail-cxf-commits-archive@www.apache.org>;
 Fri,  7 Jun 2013 13:24:28 +0000 (UTC)
Received: (qmail 21657 invoked by uid 500); 7 Jun 2013 13:24:27 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 21533 invoked by uid 500); 7 Jun 2013 13:24:27 -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 21526 invoked by uid 99); 7 Jun 2013 13:24:27 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Jun 2013 13:24:27 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Jun 2013 13:24:26 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id F1ED82388900;
	Fri,  7 Jun 2013 13:24:06 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1490635 -
 /cxf/branches/2.6.x-fixes/rt/ws/security/src/main/resources/cxf-ehcache.xml
Date: Fri, 07 Jun 2013 13:24:06 -0000
To: commits@cxf.apache.org
From: coheigea@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20130607132406.F1ED82388900@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: coheigea
Date: Fri Jun  7 13:24:06 2013
New Revision: 1490635

URL: http://svn.apache.org/r1490635
Log:
Merged revisions 1490631 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

........
  r1490631 | coheigea | 2013-06-07 14:20:22 +0100 (Fri, 07 Jun 2013) | 10 lines

  Merged revisions 1490629 via  git cherry-pick from
  https://svn.apache.org/repos/asf/cxf/trunk

  ........
    r1490629 | coheigea | 2013-06-07 14:14:16 +0100 (Fri, 07 Jun 2013) | 2 lines

    Adding a name for the security cache

  ........

........

Modified:
    cxf/branches/2.6.x-fixes/rt/ws/security/src/main/resources/cxf-ehcache.xml

Modified: cxf/branches/2.6.x-fixes/rt/ws/security/src/main/resources/cxf-ehcache.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/security/src/main/resources/cxf-ehcache.xml?rev=1490635&r1=1490634&r2=1490635&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/ws/security/src/main/resources/cxf-ehcache.xml (original)
+++ cxf/branches/2.6.x-fixes/rt/ws/security/src/main/resources/cxf-ehcache.xml Fri Jun  7 13:24:06 2013
@@ -1,4 +1,4 @@
-<ehcache xsi:noNamespaceSchemaLocation="ehcache.xsd" updateCheck="false" monitoring="autodetect" dynamicConfig="true">
+<ehcache xsi:noNamespaceSchemaLocation="ehcache.xsd" updateCheck="false" monitoring="autodetect" dynamicConfig="true" name="cxfSecurityCache">
 
     <diskStore path="java.io.tmpdir"/>