Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 94349 invoked from network); 24 Apr 2009 09:33:27 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 24 Apr 2009 09:33:27 -0000 Received: (qmail 20291 invoked by uid 500); 24 Apr 2009 09:33:27 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 20211 invoked by uid 500); 24 Apr 2009 09:33:27 -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 20202 invoked by uid 99); 24 Apr 2009 09:33:27 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Apr 2009 09:33:27 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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, 24 Apr 2009 09:33:26 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id EE0B72388A16; Fri, 24 Apr 2009 09:33:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r768235 - in /cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src: main/java/org/apache/cxf/dosgi/discovery/zookeeper/ test/java/org/apache/cxf/dosgi/discovery/zookeeper/ Date: Fri, 24 Apr 2009 09:33:05 -0000 To: commits@cxf.apache.org From: davidb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090424093305.EE0B72388A16@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: davidb Date: Fri Apr 24 09:33:04 2009 New Revision: 768235 URL: http://svn.apache.org/viewvc?rev=768235&view=rev Log: [Discovery] Renamed DataMonitorListenerImpl to InterfaceDataMonitorListenerImpl Added: cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceDataMonitorListenerImpl.java (contents, props changed) - copied, changed from r768230, cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/DataMonitorListenerImpl.java cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceDataMonitorListenerImplTest.java (contents, props changed) - copied, changed from r768230, cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/DataMonitorListenerImplTest.java Removed: cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/DataMonitorListenerImpl.java cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/DataMonitorListenerImplTest.java Modified: cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceMonitor.java cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceMonitorTest.java Copied: cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceDataMonitorListenerImpl.java (from r768230, cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/DataMonitorListenerImpl.java) URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceDataMonitorListenerImpl.java?p2=cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceDataMonitorListenerImpl.java&p1=cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/DataMonitorListenerImpl.java&r1=768230&r2=768235&rev=768235&view=diff ============================================================================== --- cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/DataMonitorListenerImpl.java (original) +++ cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceDataMonitorListenerImpl.java Fri Apr 24 09:33:04 2009 @@ -32,15 +32,15 @@ import org.osgi.service.discovery.DiscoveredServiceNotification; import org.osgi.service.discovery.DiscoveredServiceTracker; -public class DataMonitorListenerImpl implements DataMonitorListener { - private static final Logger LOG = Logger.getLogger(DataMonitorListenerImpl.class.getName()); +public class InterfaceDataMonitorListenerImpl implements DataMonitorListener { + private static final Logger LOG = Logger.getLogger(InterfaceDataMonitorListenerImpl.class.getName()); final ZooKeeper zookeeper; final String znode; final String interFace; final DiscoveredServiceTracker discoveredServiceTracker; - public DataMonitorListenerImpl(ZooKeeper zk, String intf, DiscoveredServiceTracker dst) { + public InterfaceDataMonitorListenerImpl(ZooKeeper zk, String intf, DiscoveredServiceTracker dst) { zookeeper = zk; znode = Util.getZooKeeperPath(intf); interFace = intf; Propchange: cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceDataMonitorListenerImpl.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceDataMonitorListenerImpl.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceDataMonitorListenerImpl.java ------------------------------------------------------------------------------ svn:mergeinfo = Modified: cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceMonitor.java URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceMonitor.java?rev=768235&r1=768234&r2=768235&view=diff ============================================================================== --- cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceMonitor.java (original) +++ cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceMonitor.java Fri Apr 24 09:33:04 2009 @@ -37,7 +37,7 @@ final ZooKeeper zookeeper; public InterfaceMonitor(ZooKeeper zk, String intf, DiscoveredServiceTracker dst) { - listener = new DataMonitorListenerImpl(zk, intf, dst); + listener = new InterfaceDataMonitorListenerImpl(zk, intf, dst); zookeeper = zk; znode = Util.getZooKeeperPath(intf); } Copied: cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceDataMonitorListenerImplTest.java (from r768230, cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/DataMonitorListenerImplTest.java) URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceDataMonitorListenerImplTest.java?p2=cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceDataMonitorListenerImplTest.java&p1=cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/DataMonitorListenerImplTest.java&r1=768230&r2=768235&rev=768235&view=diff ============================================================================== --- cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/DataMonitorListenerImplTest.java (original) +++ cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceDataMonitorListenerImplTest.java Fri Apr 24 09:33:04 2009 @@ -33,7 +33,7 @@ import org.osgi.service.discovery.DiscoveredServiceTracker; import org.osgi.service.discovery.ServiceEndpointDescription; -public class DataMonitorListenerImplTest extends TestCase { +public class InterfaceDataMonitorListenerImplTest extends TestCase { public void testChange() throws Exception { final List dsnCallbacks = new ArrayList(); DiscoveredServiceTracker dst = new DiscoveredServiceTracker() { @@ -54,7 +54,7 @@ andReturn(propBytes.toByteArray()); EasyMock.replay(zk); - DataMonitorListenerImpl dml = new DataMonitorListenerImpl(zk, String.class.getName(), dst); + InterfaceDataMonitorListenerImpl dml = new InterfaceDataMonitorListenerImpl(zk, String.class.getName(), dst); assertEquals("Precondition failed", 0, dsnCallbacks.size()); dml.change(); Propchange: cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceDataMonitorListenerImplTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceDataMonitorListenerImplTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceDataMonitorListenerImplTest.java ------------------------------------------------------------------------------ svn:mergeinfo = Modified: cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceMonitorTest.java URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceMonitorTest.java?rev=768235&r1=768234&r2=768235&view=diff ============================================================================== --- cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceMonitorTest.java (original) +++ cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceMonitorTest.java Fri Apr 24 09:33:04 2009 @@ -47,7 +47,7 @@ DiscoveredServiceTracker dst = EasyMock.createMock(DiscoveredServiceTracker.class); InterfaceMonitor dm = new InterfaceMonitor(zk, String.class.getName(), dst); - DataMonitorListenerImpl listener = (DataMonitorListenerImpl) dm.listener; + InterfaceDataMonitorListenerImpl listener = (InterfaceDataMonitorListenerImpl) dm.listener; assertSame(zk, listener.zookeeper); assertEquals(Util.getZooKeeperPath(String.class.getName()), listener.znode); assertEquals(String.class.getName(), listener.interFace);