Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 87501F187 for ; Thu, 4 Apr 2013 19:44:48 +0000 (UTC) Received: (qmail 99534 invoked by uid 500); 4 Apr 2013 19:44:48 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 99470 invoked by uid 500); 4 Apr 2013 19:44:48 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 99463 invoked by uid 99); 4 Apr 2013 19:44:48 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Apr 2013 19:44:48 +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; Thu, 04 Apr 2013 19:44:46 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id BAB3F23888E7; Thu, 4 Apr 2013 19:44:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1464707 - in /commons/proper/configuration/trunk/src: main/java/org/apache/commons/configuration/reloading/ test/java/org/apache/commons/configuration/reloading/ Date: Thu, 04 Apr 2013 19:44:26 -0000 To: commits@commons.apache.org From: oheger@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130404194426.BAB3F23888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: oheger Date: Thu Apr 4 19:44:26 2013 New Revision: 1464707 URL: http://svn.apache.org/r1464707 Log: Renamed VFSFileChangedReloadingStrategy to VFSFileHandlerReloadingDetector. Added: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/reloading/VFSFileHandlerReloadingDetector.java - copied, changed from r1464706, commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/reloading/VFSFileChangedReloadingStrategy.java commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/reloading/TestVFSFileHandlerReloadingDetector.java - copied, changed from r1464706, commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/reloading/TestVFSFileChangedReloadingStrategy.java Removed: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/reloading/VFSFileChangedReloadingStrategy.java commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/reloading/TestVFSFileChangedReloadingStrategy.java Copied: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/reloading/VFSFileHandlerReloadingDetector.java (from r1464706, commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/reloading/VFSFileChangedReloadingStrategy.java) URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/reloading/VFSFileHandlerReloadingDetector.java?p2=commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/reloading/VFSFileHandlerReloadingDetector.java&p1=commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/reloading/VFSFileChangedReloadingStrategy.java&r1=1464706&r2=1464707&rev=1464707&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/reloading/VFSFileChangedReloadingStrategy.java (original) +++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/reloading/VFSFileHandlerReloadingDetector.java Thu Apr 4 19:44:26 2013 @@ -48,41 +48,41 @@ import org.apache.commons.vfs2.VFS; * @version $Id$ * @since 1.7 */ -public class VFSFileChangedReloadingStrategy extends FileHandlerReloadingDetector +public class VFSFileHandlerReloadingDetector extends FileHandlerReloadingDetector { /** Stores the logger.*/ private Log log = LogFactory.getLog(getClass()); /** - * Creates a new instance of {@code VFSFileChangedReloadingStrategy} and + * Creates a new instance of {@code VFSFileHandlerReloadingDetector} and * initializes it with an empty {@code FileHandler} object. */ - public VFSFileChangedReloadingStrategy() + public VFSFileHandlerReloadingDetector() { super(); } /** - * Creates a new instance of {@code VFSFileChangedReloadingStrategy} and + * Creates a new instance of {@code VFSFileHandlerReloadingDetector} and * initializes it with the given {@code FileHandler} object and the given * refresh delay. * * @param handler the {@code FileHandler} * @param refreshDelay the refresh delay */ - public VFSFileChangedReloadingStrategy(FileHandler handler, + public VFSFileHandlerReloadingDetector(FileHandler handler, long refreshDelay) { super(handler, refreshDelay); } /** - * Creates a new instance of {@code VFSFileChangedReloadingStrategy} and + * Creates a new instance of {@code VFSFileHandlerReloadingDetector} and * initializes it with the given {@code FileHandler} object. * * @param handler the {@code FileHandler} */ - public VFSFileChangedReloadingStrategy(FileHandler handler) + public VFSFileHandlerReloadingDetector(FileHandler handler) { super(handler); } Copied: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/reloading/TestVFSFileHandlerReloadingDetector.java (from r1464706, commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/reloading/TestVFSFileChangedReloadingStrategy.java) URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/reloading/TestVFSFileHandlerReloadingDetector.java?p2=commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/reloading/TestVFSFileHandlerReloadingDetector.java&p1=commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/reloading/TestVFSFileChangedReloadingStrategy.java&r1=1464706&r2=1464707&rev=1464707&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/reloading/TestVFSFileChangedReloadingStrategy.java (original) +++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/reloading/TestVFSFileHandlerReloadingDetector.java Thu Apr 4 19:44:26 2013 @@ -39,12 +39,12 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; /** - * Test case for the VFSFileMonitorReloadingStrategy class. + * Test case for the VFSFileHandlerReloadingDetector class. * * @author Ralph Goers * @version $Id$ */ -public class TestVFSFileChangedReloadingStrategy +public class TestVFSFileHandlerReloadingDetector { /** Constant for the name of the test property. */ private static final String PROPERTY = "string"; @@ -92,8 +92,8 @@ public class TestVFSFileChangedReloading { File file = folder.newFile(); writeTestFile(file, "value1"); - VFSFileChangedReloadingStrategy strategy = - new VFSFileChangedReloadingStrategy(); + VFSFileHandlerReloadingDetector strategy = + new VFSFileHandlerReloadingDetector(); strategy.getFileHandler().setFile(file); long modificationDate = strategy.getLastModificationDate(); assertEquals("Wrong modification date", file.lastModified(), @@ -109,8 +109,8 @@ public class TestVFSFileChangedReloading File file = ConfigurationAssert.getOutFile("NonExistingFile.xml"); FileHandler handler = new FileHandler(); handler.setFile(file); - VFSFileChangedReloadingStrategy strategy = - new VFSFileChangedReloadingStrategy(handler); + VFSFileHandlerReloadingDetector strategy = + new VFSFileHandlerReloadingDetector(handler); assertEquals("Got a modification date", 0, strategy.getLastModificationDate()); } @@ -121,8 +121,8 @@ public class TestVFSFileChangedReloading @Test public void testLastModificationDateUndefinedHandler() { - VFSFileChangedReloadingStrategy strategy = - new VFSFileChangedReloadingStrategy(); + VFSFileHandlerReloadingDetector strategy = + new VFSFileHandlerReloadingDetector(); assertEquals("Got a modification date", 0, strategy.getLastModificationDate()); } @@ -143,8 +143,8 @@ public class TestVFSFileChangedReloading EasyMock.expect(fo.getName()).andReturn(name); EasyMock.expect(name.getURI()).andReturn("someURI"); EasyMock.replay(fo, name); - VFSFileChangedReloadingStrategy strategy = - new VFSFileChangedReloadingStrategy() + VFSFileHandlerReloadingDetector strategy = + new VFSFileHandlerReloadingDetector() { @Override protected FileObject getFileObject() @@ -163,8 +163,8 @@ public class TestVFSFileChangedReloading @Test(expected = ConfigurationRuntimeException.class) public void testLastModificationDateUnresolvableURI() { - VFSFileChangedReloadingStrategy strategy = - new VFSFileChangedReloadingStrategy() + VFSFileHandlerReloadingDetector strategy = + new VFSFileHandlerReloadingDetector() { @Override protected String resolveFileURI() @@ -183,8 +183,8 @@ public class TestVFSFileChangedReloading public void testGetRefreshDelay() throws Exception { final long delay = 20130325L; - VFSFileChangedReloadingStrategy strategy = - new VFSFileChangedReloadingStrategy(null, delay); + VFSFileHandlerReloadingDetector strategy = + new VFSFileHandlerReloadingDetector(null, delay); assertNotNull("No file handler was created", strategy.getFileHandler()); assertEquals("Wrong refresh delay", delay, strategy.getRefreshDelay()); }