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"/>
