Return-Path: 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 E2CCF9F9B for ; Tue, 12 Jun 2012 15:58:30 +0000 (UTC) Received: (qmail 68585 invoked by uid 500); 12 Jun 2012 15:58:30 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 68549 invoked by uid 500); 12 Jun 2012 15:58:30 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 68542 invoked by uid 99); 12 Jun 2012 15:58:30 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Jun 2012 15:58:30 +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; Tue, 12 Jun 2012 15:58:29 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B43CB2388980; Tue, 12 Jun 2012 15:58:09 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1349406 - in /cxf/trunk/rt/ws/security/src/main: java/org/apache/cxf/ws/security/cache/EHCacheManagerHolder.java resources/cxf-ehcache.xml Date: Tue, 12 Jun 2012 15:58:09 -0000 To: commits@cxf.apache.org From: coheigea@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120612155809.B43CB2388980@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: coheigea Date: Tue Jun 12 15:58:09 2012 New Revision: 1349406 URL: http://svn.apache.org/viewvc?rev=1349406&view=rev Log: Enabling per-bus cache behaviour. Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/EHCacheManagerHolder.java cxf/trunk/rt/ws/security/src/main/resources/cxf-ehcache.xml Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/EHCacheManagerHolder.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/EHCacheManagerHolder.java?rev=1349406&r1=1349405&r2=1349406&view=diff ============================================================================== --- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/EHCacheManagerHolder.java (original) +++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/EHCacheManagerHolder.java Tue Jun 12 15:58:09 2012 @@ -19,6 +19,7 @@ package org.apache.cxf.ws.security.cache; +import java.io.File; import java.io.IOException; import java.net.URL; import java.util.concurrent.ConcurrentHashMap; @@ -114,15 +115,13 @@ public final class EHCacheManagerHolder perBus = "true"; } if (Boolean.parseBoolean(perBus)) { - conf.setName(bus.getId()); - if ("java.io.tmpdir".equals(conf.getDiskStoreConfiguration().getOriginalPath())) { - - String path = conf.getDiskStoreConfiguration().getPath() + File.separator - + bus.getId(); - conf.getDiskStoreConfiguration().setPath(path); - } - } */ + conf.setName(bus.getId()); + if ("java.io.tmpdir".equals(conf.getDiskStoreConfiguration().getOriginalPath())) { + String path = conf.getDiskStoreConfiguration().getPath() + File.separator + + bus.getId(); + conf.getDiskStoreConfiguration().setPath(path); + } return CacheManager.create(conf); } catch (Throwable t) { return null; Modified: cxf/trunk/rt/ws/security/src/main/resources/cxf-ehcache.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/resources/cxf-ehcache.xml?rev=1349406&r1=1349405&r2=1349406&view=diff ============================================================================== --- cxf/trunk/rt/ws/security/src/main/resources/cxf-ehcache.xml (original) +++ cxf/trunk/rt/ws/security/src/main/resources/cxf-ehcache.xml Tue Jun 12 15:58:09 2012 @@ -15,7 +15,7 @@ />