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 4B9B7FCEC for ; Mon, 29 Apr 2013 12:04:30 +0000 (UTC) Received: (qmail 45202 invoked by uid 500); 29 Apr 2013 12:04:29 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 45127 invoked by uid 500); 29 Apr 2013 12:04:28 -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 45101 invoked by uid 99); 29 Apr 2013 12:04:28 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Apr 2013 12:04:28 +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; Mon, 29 Apr 2013 12:04:26 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D19F923888E3; Mon, 29 Apr 2013 12:04:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1476980 - in /cxf/branches/2.6.x-fixes: ./ rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/ReplayCacheFactory.java rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/TokenStoreFactory.java Date: Mon, 29 Apr 2013 12:04:06 -0000 To: commits@cxf.apache.org From: asoldano@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130429120406.D19F923888E3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: asoldano Date: Mon Apr 29 12:04:06 2013 New Revision: 1476980 URL: http://svn.apache.org/r1476980 Log: Merged revisions 1476975 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes ................ r1476975 | asoldano | 2013-04-29 13:45:15 +0200 (Mon, 29 Apr 2013) | 9 lines Merged revisions 1476946 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1476946 | asoldano | 2013-04-29 11:47:22 +0200 (Mon, 29 Apr 2013) | 2 lines [CXF-4991] EH-Cache availability checks in ReplayCacheFactory and TokenStoreFactory now performed using the defining classloader ........ ................ Modified: cxf/branches/2.6.x-fixes/ (props changed) cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/ReplayCacheFactory.java cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/TokenStoreFactory.java Propchange: cxf/branches/2.6.x-fixes/ ------------------------------------------------------------------------------ Merged /cxf/branches/2.7.x-fixes:r1476975 Merged /cxf/trunk:r1476946 Propchange: cxf/branches/2.6.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/ReplayCacheFactory.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/ReplayCacheFactory.java?rev=1476980&r1=1476979&r2=1476980&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/ReplayCacheFactory.java (original) +++ cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/cache/ReplayCacheFactory.java Mon Apr 29 12:04:06 2013 @@ -39,8 +39,7 @@ public abstract class ReplayCacheFactory static { try { - Class cacheManagerClass = - ClassLoaderUtils.loadClass("net.sf.ehcache.CacheManager", ReplayCacheFactory.class); + Class cacheManagerClass = Class.forName("net.sf.ehcache.CacheManager"); if (cacheManagerClass != null) { ehCacheInstalled = true; } Modified: cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/TokenStoreFactory.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/TokenStoreFactory.java?rev=1476980&r1=1476979&r2=1476980&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/TokenStoreFactory.java (original) +++ cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/TokenStoreFactory.java Mon Apr 29 12:04:06 2013 @@ -38,8 +38,7 @@ public abstract class TokenStoreFactory static { try { - Class cacheManagerClass = - ClassLoaderUtils.loadClass("net.sf.ehcache.CacheManager", TokenStoreFactory.class); + Class cacheManagerClass = Class.forName("net.sf.ehcache.CacheManager"); if (cacheManagerClass != null) { ehCacheInstalled = true; }