http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/BridgeServerCreation.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/BridgeServerCreation.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/BridgeServerCreation.java deleted file mode 100644 index 3a40574..0000000 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/BridgeServerCreation.java +++ /dev/null @@ -1,249 +0,0 @@ -/*========================================================================= - * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved. - * This product is protected by U.S. and international copyright - * and intellectual property laws. Pivotal products are covered by - * one or more patents listed at http://www.pivotal.io/patents. - *========================================================================= - */ -package com.gemstone.gemfire.internal.cache.xmlcache; - -import java.io.IOException; -import java.util.Arrays; -import java.util.Set; - -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.ClientSession; -import com.gemstone.gemfire.cache.InterestRegistrationListener; -import com.gemstone.gemfire.cache.server.CacheServer; -import com.gemstone.gemfire.cache.server.ClientSubscriptionConfig; -import com.gemstone.gemfire.distributed.DistributedMember; -import com.gemstone.gemfire.internal.cache.AbstractBridgeServer; -import com.gemstone.gemfire.internal.cache.InternalCache; -import com.gemstone.gemfire.internal.i18n.LocalizedStrings; - -/** - * Represents a {@link CacheServer} that is created declaratively. - * - * @author David Whitlock - * @since 4.0 - */ -public class BridgeServerCreation extends AbstractBridgeServer { - - // moved to AbstractBridgeServer - - ////////////////////// Constructors ////////////////////// - - /** - * Creates a new <code>BridgeServerCreation</code> with the default - * configuration. - * - * @param cache - * The cache being served - */ - BridgeServerCreation(InternalCache cache) { - super(cache); - } - - BridgeServerCreation(InternalCache cache, boolean attachListener) { - super(cache, attachListener); - } - - /** - * Constructor for retaining bridge server information during auto-reconnect - * @param cache - * @param other - */ - public BridgeServerCreation(InternalCache cache, CacheServer other) { - super(cache); - setPort(other.getPort()); - setBindAddress(other.getBindAddress()); - setHostnameForClients(other.getHostnameForClients()); - setMaxConnections(other.getMaxConnections()); - setMaxThreads(other.getMaxThreads()); - setNotifyBySubscription(other.getNotifyBySubscription()); - setSocketBufferSize(other.getSocketBufferSize()); - setTcpNoDelay(other.getTcpNoDelay()); - setMaximumTimeBetweenPings(other.getMaximumTimeBetweenPings()); - setMaximumMessageCount(other.getMaximumMessageCount()); - setMessageTimeToLive(other.getMessageTimeToLive()); - // setTransactionTimeToLive(other.getTransactionTimeToLive()); not implemented in CacheServer for v6.6 - setGroups(other.getGroups()); - setLoadProbe(other.getLoadProbe()); - setLoadPollInterval(other.getLoadPollInterval()); - ClientSubscriptionConfig cscOther = other.getClientSubscriptionConfig(); - ClientSubscriptionConfig cscThis = this.getClientSubscriptionConfig(); - // added for configuration of ha overflow - cscThis.setEvictionPolicy(cscOther.getEvictionPolicy()); - cscThis.setCapacity(cscOther.getCapacity()); - String diskStoreName = cscOther.getDiskStoreName(); - if (diskStoreName != null) { - cscThis.setDiskStoreName(diskStoreName); - } else { - cscThis.setOverflowDirectory(cscOther.getOverflowDirectory()); - } - // this.cache = null; we should null out the cache since we no longer need it - } - - ///////////////////// Instance Methods ///////////////////// - - @Override - public void start() throws IOException { - // This method is invoked during testing, but it is not necessary - // to do anything. - } - - @Override - public void setNotifyBySubscription(boolean b) { - this.notifyBySubscription = b; - } - - @Override - public boolean getNotifyBySubscription() { - return this.notifyBySubscription; - } - - @Override - public void setSocketBufferSize(int socketBufferSize) { - this.socketBufferSize = socketBufferSize; - } - - @Override - public int getSocketBufferSize() { - return this.socketBufferSize; - } - - @Override - public void setTcpNoDelay(boolean setting) { - this.tcpNoDelay = setting; - } - - @Override - public boolean getTcpNoDelay() { - return this.tcpNoDelay; - } - - @Override - public void setMaximumTimeBetweenPings(int maximumTimeBetweenPings) { - this.maximumTimeBetweenPings = maximumTimeBetweenPings; - } - - @Override - public int getMaximumTimeBetweenPings() { - return this.maximumTimeBetweenPings; - } - - @Override - public int getMaximumMessageCount() { - return this.maximumMessageCount; - } - - @Override - public void setMaximumMessageCount(int maximumMessageCount) { - this.maximumMessageCount = maximumMessageCount; - } - - @Override - public int getMessageTimeToLive() { - return this.messageTimeToLive; - } - - @Override - public void setMessageTimeToLive(int messageTimeToLive) { - this.messageTimeToLive = messageTimeToLive; - } - - public boolean isRunning() { - throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString()); - } - - public void stop() { - throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString()); - } - - /** - * Returns whether or not this bridge server has the same - * configuration as another bridge server. - */ - @Override - public boolean sameAs(CacheServer other) { - ClientSubscriptionConfig cscThis = this.getClientSubscriptionConfig(); - ClientSubscriptionConfig cscOther = other.getClientSubscriptionConfig(); - boolean result = - this.getPort() == other.getPort() && - this.getSocketBufferSize() == other.getSocketBufferSize() && - this.getMaximumTimeBetweenPings() == other.getMaximumTimeBetweenPings() && - this.getNotifyBySubscription() == other.getNotifyBySubscription() && - this.getMaxConnections() == other.getMaxConnections() && - this.getMaxThreads() == other.getMaxThreads() && - this.getMaximumMessageCount() == other.getMaximumMessageCount() && - this.getMessageTimeToLive() == other.getMessageTimeToLive() && - this.getTcpNoDelay() == other.getTcpNoDelay() && - cscThis.getCapacity() == cscOther.getCapacity() && - cscThis.getEvictionPolicy().equals(cscOther.getEvictionPolicy()); - String diskStoreName = cscThis.getDiskStoreName(); - if (diskStoreName != null) { - result = result && diskStoreName.equals(cscOther.getDiskStoreName()); - } else { - result = result && cscThis.getOverflowDirectory().equals(cscOther.getOverflowDirectory()); - } - return result; - } - - @Override - public String toString() - { - return "BridgeServerCreation on port " + this.getPort() + - " notify by subscription " + this.getNotifyBySubscription() + - " maximum time between pings " + this.getMaximumTimeBetweenPings() + - " socket buffer size " + this.getSocketBufferSize() + - " maximum connections " + this.getMaxConnections() + - " maximum threads " + this.getMaxThreads() + - " maximum message count " + this.getMaximumMessageCount() + - " message time to live " + this.getMessageTimeToLive() + - " groups " + Arrays.asList(getGroups()) + - " loadProbe " + loadProbe + - " loadPollInterval " + loadPollInterval + - this.getClientSubscriptionConfig().toString(); - } - - public ClientSubscriptionConfig getClientSubscriptionConfig(){ - return this.clientSubscriptionConfig; - } - - public Set getInterestRegistrationListeners() { - //TODO Yogesh : implement me - return null; - } - - public void registerInterestRegistrationListener( - InterestRegistrationListener listener) { - //TODO Yogesh : implement me - } - - public void unregisterInterestRegistrationListener( - InterestRegistrationListener listener) { - //TODO Yogesh : implement me - } - - /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.util.BridgeServer#getAllClientSessions() - */ - public Set getAllClientSessions() { - throw new UnsupportedOperationException("Shouldn't be invoked"); - } - - /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.util.BridgeServer#getClientSession(com.gemstone.gemfire.distributed.DistributedMember) - */ - public ClientSession getClientSession(DistributedMember member) { - throw new UnsupportedOperationException("Shouldn't be invoked"); - } - - /* (non-Javadoc) - * @see com.gemstone.gemfire.cache.util.BridgeServer#getClientSession(java.lang.String) - */ - public ClientSession getClientSession(String durableClientId) { - throw new UnsupportedOperationException("Shouldn't be invoked"); - } - -}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheCreation.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheCreation.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheCreation.java index 6505fb3..08543d2 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheCreation.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheCreation.java @@ -89,7 +89,7 @@ import com.gemstone.gemfire.cache.hdfs.internal.HDFSIntegrationUtil; import com.gemstone.gemfire.cache.hdfs.internal.HDFSStoreCreation; import com.gemstone.gemfire.cache.hdfs.internal.HDFSStoreFactoryImpl; import com.gemstone.gemfire.cache.hdfs.internal.HDFSStoreImpl; -import com.gemstone.gemfire.internal.cache.BridgeServerImpl; +import com.gemstone.gemfire.internal.cache.CacheServerImpl; import com.gemstone.gemfire.internal.cache.CacheConfig; import com.gemstone.gemfire.internal.cache.CacheServerLauncher; import com.gemstone.gemfire.internal.cache.DiskStoreFactoryImpl; @@ -578,14 +578,14 @@ public class CacheCreation implements InternalCache, Extensible<Cache> { } if (!existingCacheServer) { - this.getCacheServers().add(new BridgeServerCreation(cache, false)); + this.getCacheServers().add(new CacheServerCreation(cache, false)); } } for (Iterator iter = this.getCacheServers().iterator(); iter.hasNext();) { - BridgeServerCreation bridge = (BridgeServerCreation)iter.next(); + CacheServerCreation bridge = (CacheServerCreation)iter.next(); - BridgeServerImpl impl = (BridgeServerImpl)cache.addCacheServer(); + CacheServerImpl impl = (CacheServerImpl)cache.addCacheServer(); impl.configureFrom(bridge); if (serverPort != null && serverPort != CacheServer.DEFAULT_PORT) { @@ -702,8 +702,8 @@ public class CacheCreation implements InternalCache, Extensible<Cache> { } for (Iterator myIter = myBridges.iterator(); myIter.hasNext(); ) { - BridgeServerCreation myBridge = - (BridgeServerCreation) myIter.next(); + CacheServerCreation myBridge = + (CacheServerCreation) myIter.next(); boolean found = false; for (Iterator otherIter = otherBridges.iterator(); otherIter.hasNext(); ) { @@ -985,7 +985,7 @@ public class CacheCreation implements InternalCache, Extensible<Cache> { } public CacheServer addCacheServer(boolean isGatewayReceiver) { - CacheServer bridge = new BridgeServerCreation(this, false); + CacheServer bridge = new CacheServerCreation(this, false); this.bridgeServers.add(bridge); return bridge; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheServerCreation.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheServerCreation.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheServerCreation.java new file mode 100644 index 0000000..55984a9 --- /dev/null +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheServerCreation.java @@ -0,0 +1,247 @@ +/*========================================================================= + * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved. + * This product is protected by U.S. and international copyright + * and intellectual property laws. Pivotal products are covered by + * one or more patents listed at http://www.pivotal.io/patents. + *========================================================================= + */ +package com.gemstone.gemfire.internal.cache.xmlcache; + +import java.io.IOException; +import java.util.Arrays; +import java.util.Set; + +import com.gemstone.gemfire.cache.Cache; +import com.gemstone.gemfire.cache.ClientSession; +import com.gemstone.gemfire.cache.InterestRegistrationListener; +import com.gemstone.gemfire.cache.server.CacheServer; +import com.gemstone.gemfire.cache.server.ClientSubscriptionConfig; +import com.gemstone.gemfire.distributed.DistributedMember; +import com.gemstone.gemfire.internal.cache.AbstractCacheServer; +import com.gemstone.gemfire.internal.cache.InternalCache; +import com.gemstone.gemfire.internal.i18n.LocalizedStrings; + +/** + * Represents a {@link CacheServer} that is created declaratively. + * + * @author David Whitlock + * @since 4.0 + */ +public class CacheServerCreation extends AbstractCacheServer { + + ////////////////////// Constructors ////////////////////// + + /** + * Creates a new <code>BridgeServerCreation</code> with the default + * configuration. + * + * @param cache + * The cache being served + */ + CacheServerCreation(InternalCache cache) { + super(cache); + } + + CacheServerCreation(InternalCache cache, boolean attachListener) { + super(cache, attachListener); + } + + /** + * Constructor for retaining bridge server information during auto-reconnect + * @param cache + * @param other + */ + public CacheServerCreation(InternalCache cache, CacheServer other) { + super(cache); + setPort(other.getPort()); + setBindAddress(other.getBindAddress()); + setHostnameForClients(other.getHostnameForClients()); + setMaxConnections(other.getMaxConnections()); + setMaxThreads(other.getMaxThreads()); + setNotifyBySubscription(other.getNotifyBySubscription()); + setSocketBufferSize(other.getSocketBufferSize()); + setTcpNoDelay(other.getTcpNoDelay()); + setMaximumTimeBetweenPings(other.getMaximumTimeBetweenPings()); + setMaximumMessageCount(other.getMaximumMessageCount()); + setMessageTimeToLive(other.getMessageTimeToLive()); + // setTransactionTimeToLive(other.getTransactionTimeToLive()); not implemented in CacheServer for v6.6 + setGroups(other.getGroups()); + setLoadProbe(other.getLoadProbe()); + setLoadPollInterval(other.getLoadPollInterval()); + ClientSubscriptionConfig cscOther = other.getClientSubscriptionConfig(); + ClientSubscriptionConfig cscThis = this.getClientSubscriptionConfig(); + // added for configuration of ha overflow + cscThis.setEvictionPolicy(cscOther.getEvictionPolicy()); + cscThis.setCapacity(cscOther.getCapacity()); + String diskStoreName = cscOther.getDiskStoreName(); + if (diskStoreName != null) { + cscThis.setDiskStoreName(diskStoreName); + } else { + cscThis.setOverflowDirectory(cscOther.getOverflowDirectory()); + } + // this.cache = null; we should null out the cache since we no longer need it + } + + ///////////////////// Instance Methods ///////////////////// + + @Override + public void start() throws IOException { + // This method is invoked during testing, but it is not necessary + // to do anything. + } + + @Override + public void setNotifyBySubscription(boolean b) { + this.notifyBySubscription = b; + } + + @Override + public boolean getNotifyBySubscription() { + return this.notifyBySubscription; + } + + @Override + public void setSocketBufferSize(int socketBufferSize) { + this.socketBufferSize = socketBufferSize; + } + + @Override + public int getSocketBufferSize() { + return this.socketBufferSize; + } + + @Override + public void setTcpNoDelay(boolean setting) { + this.tcpNoDelay = setting; + } + + @Override + public boolean getTcpNoDelay() { + return this.tcpNoDelay; + } + + @Override + public void setMaximumTimeBetweenPings(int maximumTimeBetweenPings) { + this.maximumTimeBetweenPings = maximumTimeBetweenPings; + } + + @Override + public int getMaximumTimeBetweenPings() { + return this.maximumTimeBetweenPings; + } + + @Override + public int getMaximumMessageCount() { + return this.maximumMessageCount; + } + + @Override + public void setMaximumMessageCount(int maximumMessageCount) { + this.maximumMessageCount = maximumMessageCount; + } + + @Override + public int getMessageTimeToLive() { + return this.messageTimeToLive; + } + + @Override + public void setMessageTimeToLive(int messageTimeToLive) { + this.messageTimeToLive = messageTimeToLive; + } + + public boolean isRunning() { + throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString()); + } + + public void stop() { + throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString()); + } + + /** + * Returns whether or not this bridge server has the same + * configuration as another bridge server. + */ + @Override + public boolean sameAs(CacheServer other) { + ClientSubscriptionConfig cscThis = this.getClientSubscriptionConfig(); + ClientSubscriptionConfig cscOther = other.getClientSubscriptionConfig(); + boolean result = + this.getPort() == other.getPort() && + this.getSocketBufferSize() == other.getSocketBufferSize() && + this.getMaximumTimeBetweenPings() == other.getMaximumTimeBetweenPings() && + this.getNotifyBySubscription() == other.getNotifyBySubscription() && + this.getMaxConnections() == other.getMaxConnections() && + this.getMaxThreads() == other.getMaxThreads() && + this.getMaximumMessageCount() == other.getMaximumMessageCount() && + this.getMessageTimeToLive() == other.getMessageTimeToLive() && + this.getTcpNoDelay() == other.getTcpNoDelay() && + cscThis.getCapacity() == cscOther.getCapacity() && + cscThis.getEvictionPolicy().equals(cscOther.getEvictionPolicy()); + String diskStoreName = cscThis.getDiskStoreName(); + if (diskStoreName != null) { + result = result && diskStoreName.equals(cscOther.getDiskStoreName()); + } else { + result = result && cscThis.getOverflowDirectory().equals(cscOther.getOverflowDirectory()); + } + return result; + } + + @Override + public String toString() + { + return "BridgeServerCreation on port " + this.getPort() + + " notify by subscription " + this.getNotifyBySubscription() + + " maximum time between pings " + this.getMaximumTimeBetweenPings() + + " socket buffer size " + this.getSocketBufferSize() + + " maximum connections " + this.getMaxConnections() + + " maximum threads " + this.getMaxThreads() + + " maximum message count " + this.getMaximumMessageCount() + + " message time to live " + this.getMessageTimeToLive() + + " groups " + Arrays.asList(getGroups()) + + " loadProbe " + loadProbe + + " loadPollInterval " + loadPollInterval + + this.getClientSubscriptionConfig().toString(); + } + + public ClientSubscriptionConfig getClientSubscriptionConfig(){ + return this.clientSubscriptionConfig; + } + + public Set getInterestRegistrationListeners() { + //TODO Yogesh : implement me + return null; + } + + public void registerInterestRegistrationListener( + InterestRegistrationListener listener) { + //TODO Yogesh : implement me + } + + public void unregisterInterestRegistrationListener( + InterestRegistrationListener listener) { + //TODO Yogesh : implement me + } + + /* (non-Javadoc) + * @see com.gemstone.gemfire.cache.util.BridgeServer#getAllClientSessions() + */ + public Set getAllClientSessions() { + throw new UnsupportedOperationException("Shouldn't be invoked"); + } + + /* (non-Javadoc) + * @see com.gemstone.gemfire.cache.util.BridgeServer#getClientSession(com.gemstone.gemfire.distributed.DistributedMember) + */ + public ClientSession getClientSession(DistributedMember member) { + throw new UnsupportedOperationException("Shouldn't be invoked"); + } + + /* (non-Javadoc) + * @see com.gemstone.gemfire.cache.util.BridgeServer#getClientSession(java.lang.String) + */ + public ClientSession getClientSession(String durableClientId) { + throw new UnsupportedOperationException("Shouldn't be invoked"); + } + +} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/beans/CacheServerBridge.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/beans/CacheServerBridge.java b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/beans/CacheServerBridge.java index 65e2c5a..a40d5d5 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/beans/CacheServerBridge.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/beans/CacheServerBridge.java @@ -39,7 +39,7 @@ import com.gemstone.gemfire.cache.util.BridgeMembershipListener; import com.gemstone.gemfire.internal.Version; import com.gemstone.gemfire.internal.admin.ClientHealthMonitoringRegion; import com.gemstone.gemfire.internal.admin.remote.ClientHealthStats; -import com.gemstone.gemfire.internal.cache.BridgeServerImpl; +import com.gemstone.gemfire.internal.cache.CacheServerImpl; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.internal.cache.ha.HARegionQueue; import com.gemstone.gemfire.internal.cache.tier.InternalBridgeMembership; @@ -404,7 +404,7 @@ public class CacheServerBridge extends ServerBridge{ return null; } - BridgeServerImpl server = (BridgeServerImpl)cache.getCacheServers().iterator().next(); + CacheServerImpl server = (CacheServerImpl)cache.getCacheServers().iterator().next(); if(server == null){ return null; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/beans/GatewayReceiverMBeanBridge.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/beans/GatewayReceiverMBeanBridge.java b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/beans/GatewayReceiverMBeanBridge.java index 6358752..935d5d1 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/beans/GatewayReceiverMBeanBridge.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/beans/GatewayReceiverMBeanBridge.java @@ -15,7 +15,7 @@ import java.util.Set; import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.cache.wan.GatewayReceiver; import com.gemstone.gemfire.cache.wan.GatewayTransportFilter; -import com.gemstone.gemfire.internal.cache.BridgeServerImpl; +import com.gemstone.gemfire.internal.cache.CacheServerImpl; import com.gemstone.gemfire.internal.cache.tier.sockets.AcceptorImpl; import com.gemstone.gemfire.internal.cache.tier.sockets.ServerConnection; import com.gemstone.gemfire.internal.cache.wan.GatewayReceiverStats; @@ -187,7 +187,7 @@ public class GatewayReceiverMBeanBridge extends ServerBridge{ public String[] getConnectedGatewaySenders() { Set<String> uniqueIds = null; - AcceptorImpl acceptor = ((BridgeServerImpl)rcv.getServer()).getAcceptor(); + AcceptorImpl acceptor = ((CacheServerImpl)rcv.getServer()).getAcceptor(); Set<ServerConnection> serverConnections = acceptor.getAllServerConnections(); if(serverConnections !=null && serverConnections.size() >0){ uniqueIds = new HashSet<String>(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/beans/ServerBridge.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/beans/ServerBridge.java b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/beans/ServerBridge.java index 81cc34c..4fbc245 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/beans/ServerBridge.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/beans/ServerBridge.java @@ -8,7 +8,7 @@ package com.gemstone.gemfire.management.internal.beans; import com.gemstone.gemfire.cache.server.CacheServer; -import com.gemstone.gemfire.internal.cache.BridgeServerImpl; +import com.gemstone.gemfire.internal.cache.CacheServerImpl; import com.gemstone.gemfire.internal.cache.tier.sockets.AcceptorImpl; import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerStats; import com.gemstone.gemfire.management.internal.ManagementStrings; @@ -38,7 +38,7 @@ public class ServerBridge { public ServerBridge(CacheServer cacheServer){ this.monitor = new MBeanStatsMonitor(ManagementStrings.SERVER_MONITOR .toLocalizedString()); - this.acceptor = ((BridgeServerImpl) cacheServer).getAcceptor(); + this.acceptor = ((CacheServerImpl) cacheServer).getAcceptor(); initializeStats(); startMonitor(); } @@ -48,7 +48,7 @@ public class ServerBridge { } protected void addServer(CacheServer cacheServer){ - this.acceptor = ((BridgeServerImpl) cacheServer).getAcceptor(); + this.acceptor = ((CacheServerImpl) cacheServer).getAcceptor(); startMonitor(); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ContunuousQueryFunction.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ContunuousQueryFunction.java b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ContunuousQueryFunction.java index acdbc0c..7139263 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ContunuousQueryFunction.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ContunuousQueryFunction.java @@ -16,7 +16,7 @@ import com.gemstone.gemfire.cache.CacheFactory; import com.gemstone.gemfire.cache.execute.Function; import com.gemstone.gemfire.cache.execute.FunctionContext; import com.gemstone.gemfire.internal.InternalEntity; -import com.gemstone.gemfire.internal.cache.BridgeServerImpl; +import com.gemstone.gemfire.internal.cache.CacheServerImpl; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.internal.cache.tier.sockets.AcceptorImpl; import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientNotifier; @@ -42,7 +42,7 @@ public class ContunuousQueryFunction implements Function, InternalEntity { String clientID = (String) context.getArguments(); GemFireCacheImpl cache = (GemFireCacheImpl)CacheFactory.getAnyInstance(); if (cache.getCacheServers().size() > 0) { - BridgeServerImpl server = (BridgeServerImpl)cache.getCacheServers().iterator().next(); + CacheServerImpl server = (CacheServerImpl)cache.getCacheServers().iterator().next(); if(server != null){ AcceptorImpl acceptorImpl = server.getAcceptor(); if(acceptorImpl != null){ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorLoadBalancingDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorLoadBalancingDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorLoadBalancingDUnitTest.java index 31c63dc..ac6f695 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorLoadBalancingDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorLoadBalancingDUnitTest.java @@ -34,7 +34,7 @@ import com.gemstone.gemfire.distributed.internal.ServerLocation; import com.gemstone.gemfire.distributed.internal.ServerLocator; import com.gemstone.gemfire.distributed.internal.tcpserver.TcpClient; import com.gemstone.gemfire.internal.AvailablePort; -import com.gemstone.gemfire.internal.cache.BridgeServerImpl; +import com.gemstone.gemfire.internal.cache.CacheServerImpl; import com.gemstone.gemfire.internal.cache.PoolFactoryImpl; import com.gemstone.gemfire.internal.logging.InternalLogWriter; import com.gemstone.gemfire.internal.logging.LocalLogWriter; @@ -241,7 +241,7 @@ public class LocatorLoadBalancingDUnitTest extends LocatorTestBase { Runnable checkConnectionCount = new SerializableRunnable("checkConnectionCount") { public void run() { Cache cache = (Cache) remoteObjects.get(CACHE_KEY); - final BridgeServerImpl server = (BridgeServerImpl) + final CacheServerImpl server = (CacheServerImpl) cache.getCacheServers().get(0); WaitCriterion wc = new WaitCriterion() { String excuse; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/Bug38741DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/Bug38741DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/Bug38741DUnitTest.java index 977e4e2..d614b10 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/Bug38741DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/Bug38741DUnitTest.java @@ -27,7 +27,7 @@ import com.gemstone.gemfire.cache.RegionAttributes; import com.gemstone.gemfire.cache.Scope; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.NanoTimer; -import com.gemstone.gemfire.internal.cache.BridgeServerImpl; +import com.gemstone.gemfire.internal.cache.CacheServerImpl; import com.gemstone.gemfire.internal.cache.BucketRegion; import com.gemstone.gemfire.internal.cache.BucketRegion.RawValue; import com.gemstone.gemfire.internal.cache.CachedDeserializable; @@ -177,7 +177,7 @@ public class Bug38741DUnitTest extends BridgeTestCase { server.invoke(new CacheSerializableRunnable("Assert copy behavior after client is setup") { public void run2() throws CacheException { Region r = getRootRegion(rName); - BridgeServerImpl bsi = (BridgeServerImpl) + CacheServerImpl bsi = (CacheServerImpl) getCache().getCacheServers().iterator().next(); Collection cp = bsi.getAcceptor().getCacheClientNotifier().getClientProxies(); // Should only be one because only one client is connected http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/AbstractServerLauncherJUnitTestCase.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/AbstractServerLauncherJUnitTestCase.java b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/AbstractServerLauncherJUnitTestCase.java index dc506ad..ca676a5 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/AbstractServerLauncherJUnitTestCase.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/AbstractServerLauncherJUnitTestCase.java @@ -14,7 +14,7 @@ import com.gemstone.gemfire.distributed.AbstractLauncher.Status; import com.gemstone.gemfire.distributed.ServerLauncher.ServerState; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.AvailablePortHelper; -import com.gemstone.gemfire.internal.cache.AbstractBridgeServer; +import com.gemstone.gemfire.internal.cache.AbstractCacheServer; /** * @author Kirk Lund @@ -35,7 +35,7 @@ public abstract class AbstractServerLauncherJUnitTestCase extends AbstractLaunch public final void setUpServerLauncherTest() throws Exception { System.setProperty("gemfire." + DistributionConfig.MCAST_PORT_NAME, Integer.toString(0)); final int port = AvailablePortHelper.getRandomAvailableTCPPort(); - System.setProperty(AbstractBridgeServer.TEST_OVERRIDE_DEFAULT_PORT_PROPERTY, String.valueOf(port)); + System.setProperty(AbstractCacheServer.TEST_OVERRIDE_DEFAULT_PORT_PROPERTY, String.valueOf(port)); this.serverPort = port; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalJUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalJUnitTest.java index 44849f8..e83c8ac 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalJUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalJUnitTest.java @@ -21,7 +21,7 @@ import com.gemstone.gemfire.internal.AvailablePort; import com.gemstone.gemfire.internal.AvailablePortHelper; import com.gemstone.gemfire.internal.GemFireVersion; import com.gemstone.gemfire.internal.SocketCreator; -import com.gemstone.gemfire.internal.cache.AbstractBridgeServer; +import com.gemstone.gemfire.internal.cache.AbstractCacheServer; import com.gemstone.gemfire.internal.cache.xmlcache.CacheCreation; import com.gemstone.gemfire.internal.cache.xmlcache.CacheXmlGenerator; import com.gemstone.gemfire.internal.cache.xmlcache.RegionAttributesCreation; @@ -605,7 +605,7 @@ public class ServerLauncherLocalJUnitTest extends AbstractServerLauncherJUnitTes this.launcher.start(); // why did it not fail like it's supposed to? - final String property = System.getProperty(AbstractBridgeServer.TEST_OVERRIDE_DEFAULT_PORT_PROPERTY); + final String property = System.getProperty(AbstractCacheServer.TEST_OVERRIDE_DEFAULT_PORT_PROPERTY); assertNotNull(property); assertEquals(this.serverPort, Integer.valueOf(property).intValue()); assertFalse(AvailablePort.isPortAvailable(this.serverPort, AvailablePort.SOCKET)); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherRemoteJUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherRemoteJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherRemoteJUnitTest.java index 1ba1189..d43ad0a 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherRemoteJUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherRemoteJUnitTest.java @@ -40,7 +40,7 @@ import com.gemstone.gemfire.internal.AvailablePort; import com.gemstone.gemfire.internal.AvailablePortHelper; import com.gemstone.gemfire.internal.GemFireVersion; import com.gemstone.gemfire.internal.SocketCreator; -import com.gemstone.gemfire.internal.cache.AbstractBridgeServer; +import com.gemstone.gemfire.internal.cache.AbstractCacheServer; import com.gemstone.gemfire.internal.cache.xmlcache.CacheCreation; import com.gemstone.gemfire.internal.cache.xmlcache.CacheXmlGenerator; import com.gemstone.gemfire.internal.cache.xmlcache.RegionAttributesCreation; @@ -397,7 +397,7 @@ public class ServerLauncherRemoteJUnitTest extends AbstractServerLauncherJUnitTe // build and start the server final List<String> jvmArguments = getJvmArguments(); - jvmArguments.add("-D" + AbstractBridgeServer.TEST_OVERRIDE_DEFAULT_PORT_PROPERTY + "=" + this.serverPort); + jvmArguments.add("-D" + AbstractCacheServer.TEST_OVERRIDE_DEFAULT_PORT_PROPERTY + "=" + this.serverPort); final List<String> command = new ArrayList<String>(); command.add(new File(new File(System.getProperty("java.home"), "bin"), "java").getCanonicalPath()); @@ -463,7 +463,7 @@ public class ServerLauncherRemoteJUnitTest extends AbstractServerLauncherJUnitTe // build and start the server final List<String> jvmArguments = getJvmArguments(); - jvmArguments.add("-D" + AbstractBridgeServer.TEST_OVERRIDE_DEFAULT_PORT_PROPERTY + "=" + this.serverPort); + jvmArguments.add("-D" + AbstractCacheServer.TEST_OVERRIDE_DEFAULT_PORT_PROPERTY + "=" + this.serverPort); final List<String> command = new ArrayList<String>(); command.add(new File(new File(System.getProperty("java.home"), "bin"), "java").getCanonicalPath()); @@ -832,7 +832,7 @@ public class ServerLauncherRemoteJUnitTest extends AbstractServerLauncherJUnitTe // launch server final List<String> jvmArguments = getJvmArguments(); - jvmArguments.add("-D" + AbstractBridgeServer.TEST_OVERRIDE_DEFAULT_PORT_PROPERTY + "=" + this.serverPort); + jvmArguments.add("-D" + AbstractCacheServer.TEST_OVERRIDE_DEFAULT_PORT_PROPERTY + "=" + this.serverPort); final List<String> command = new ArrayList<String>(); command.add(new File(new File(System.getProperty("java.home"), "bin"), "java").getCanonicalPath()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/ProductUseLogDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/ProductUseLogDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/ProductUseLogDUnitTest.java index 6a20f15..d4eab5d 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/ProductUseLogDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/ProductUseLogDUnitTest.java @@ -18,7 +18,7 @@ import com.gemstone.gemfire.cache.CacheFactory; import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.distributed.Locator; import com.gemstone.gemfire.internal.AvailablePort; -import com.gemstone.gemfire.internal.cache.BridgeServerImpl; +import com.gemstone.gemfire.internal.cache.CacheServerImpl; import dunit.DistributedTestCase; import dunit.Host; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java index 79d6f64..447b32e 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java @@ -25,7 +25,7 @@ import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.ReplyException; import com.gemstone.gemfire.i18n.LogWriterI18n; import com.gemstone.gemfire.internal.AvailablePort; -import com.gemstone.gemfire.internal.cache.BridgeServerImpl; +import com.gemstone.gemfire.internal.cache.CacheServerImpl; import com.gemstone.gemfire.internal.cache.BucketRegion; import com.gemstone.gemfire.internal.cache.DistTXState; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; @@ -130,7 +130,7 @@ public class DistributedTransactionDUnitTest extends CacheTestCase { int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); CacheServer s = getCache().addCacheServer(); s.setPort(port); - ((BridgeServerImpl) s).setTransactionTimeToLive(10); + ((CacheServerImpl) s).setTransactionTimeToLive(10); s.start(); return port; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientMessagesRegionCreationAndDestroyJUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientMessagesRegionCreationAndDestroyJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientMessagesRegionCreationAndDestroyJUnitTest.java index 6eda611..196f3ee 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientMessagesRegionCreationAndDestroyJUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientMessagesRegionCreationAndDestroyJUnitTest.java @@ -67,7 +67,7 @@ public class ClientMessagesRegionCreationAndDestroyJUnitTest { */ private void attachBridgeServer() throws IOException { - BridgeServerImpl server = (BridgeServerImpl)cache.addCacheServer(); + CacheServerImpl server = (CacheServerImpl)cache.addCacheServer(); assertNotNull(server); int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); server.setPort(port); @@ -123,7 +123,7 @@ public class ClientMessagesRegionCreationAndDestroyJUnitTest { private void dettachmentOfBridgeServer() { // detach all bridge server to test destroy of client_messages_region for (Iterator itr = cache.getCacheServers().iterator(); itr.hasNext();) { - BridgeServerImpl server = (BridgeServerImpl)itr.next(); + CacheServerImpl server = (CacheServerImpl)itr.next(); String rName = ((HAContainerWrapper)server.getAcceptor().getCacheClientNotifier().getHaContainer()).getName(); assertNotNull("client messages region is null ", cache.getRegion(Region.SEPARATOR + rName)); server.stop(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionDUnitTest.java index 51a8dea..1a5f59f 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionDUnitTest.java @@ -123,7 +123,7 @@ public class ClientServerTransactionDUnitTest extends RemoteTransactionDUnitTest int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); CacheServer s = getCache().addCacheServer(); s.setPort(port); - ((BridgeServerImpl)s).setTransactionTimeToLive(10); + ((CacheServerImpl)s).setTransactionTimeToLive(10); s.start(); return port; } @@ -148,7 +148,7 @@ public class ClientServerTransactionDUnitTest extends RemoteTransactionDUnitTest int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); CacheServer s = cache.addCacheServer(); s.setPort(port); - ((BridgeServerImpl)s).setTransactionTimeToLive(10); + ((CacheServerImpl)s).setTransactionTimeToLive(10); s.start(); return port; } @@ -216,7 +216,7 @@ public class ClientServerTransactionDUnitTest extends RemoteTransactionDUnitTest int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); CacheServer s = getCache().addCacheServer(); s.setPort(port); - ((BridgeServerImpl)s).setTransactionTimeToLive(10); + ((CacheServerImpl)s).setTransactionTimeToLive(10); s.start(); return port; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java index f599687..10ab959 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java @@ -877,7 +877,7 @@ public class DeltaPropagationDUnitTest extends DistributedTestCase { public static void confirmEviction(Integer port) { final EnableLRU cc = ((VMLRURegionMap)((LocalRegion)cache .getRegion(Region.SEPARATOR - + BridgeServerImpl.generateNameForClientMsgsRegion(port))).entries) + + CacheServerImpl.generateNameForClientMsgsRegion(port))).entries) ._getCCHelper(); WaitCriterion wc = new WaitCriterion() { @@ -1423,7 +1423,7 @@ public class DeltaPropagationDUnitTest extends DistributedTestCase { try { // Get the clientMessagesRegion and check the size. Region region = (Region)cache.getRegion("/" + regionName); - Region msgsRegion = (Region)cache.getRegion(BridgeServerImpl + Region msgsRegion = (Region)cache.getRegion(CacheServerImpl .generateNameForClientMsgsRegion(port.intValue())); logger.fine("size<serverRegion, clientMsgsRegion>: " + region.size() + ", " + msgsRegion.size()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationStatsDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationStatsDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationStatsDUnitTest.java index e060b0d..968e3e8 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationStatsDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationStatsDUnitTest.java @@ -463,7 +463,7 @@ public class DeltaPropagationStatsDUnitTest extends DistributedTestCase { numOfDeltasSent = region.getCachePerfStats().getDeltasSent(); deltaTime = region.getCachePerfStats().getDeltasPreparedTime(); } else if (path == SERVER_TO_CLIENT) { - CacheClientNotifier ccn = ((BridgeServerImpl)cache.getCacheServers() + CacheClientNotifier ccn = ((CacheServerImpl)cache.getCacheServers() .toArray()[0]).getAcceptor().getCacheClientNotifier(); numOfDeltasSent = ((CacheClientProxy)ccn.getClientProxies().toArray()[0]) http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/GridAdvisorDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/GridAdvisorDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/GridAdvisorDUnitTest.java index e7bd229..693fe48 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/GridAdvisorDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/GridAdvisorDUnitTest.java @@ -198,8 +198,8 @@ public class GridAdvisorDUnitTest extends DistributedTestCase { others = ca.fetchBridgeServers(); assertEquals(4, others.size()); for (int j=0; j < others.size(); j++) { - BridgeServerAdvisor.BridgeServerProfile bsp = - (BridgeServerAdvisor.BridgeServerProfile)others.get(j); + CacheServerAdvisor.CacheServerProfile bsp = + (CacheServerAdvisor.CacheServerProfile)others.get(j); if (bsp.getPort() == bsPort1) { assertEquals(Arrays.asList(new String[] {"bs1Group1", "bs1Group2"}), Arrays.asList(bsp.getGroups())); @@ -234,8 +234,8 @@ public class GridAdvisorDUnitTest extends DistributedTestCase { others = ca.fetchBridgeServers(); assertEquals(4, others.size()); for (int j=0; j < others.size(); j++) { - BridgeServerAdvisor.BridgeServerProfile bsp = - (BridgeServerAdvisor.BridgeServerProfile)others.get(j); + CacheServerAdvisor.CacheServerProfile bsp = + (CacheServerAdvisor.CacheServerProfile)others.get(j); if (bsp.getPort() == bsPort1) { assertEquals(Arrays.asList(new String[] {"bs1Group1", "bs1Group2"}), Arrays.asList(bsp.getGroups())); @@ -261,7 +261,7 @@ public class GridAdvisorDUnitTest extends DistributedTestCase { assertEquals(2, bslist.size()); for (int i=0; i < bslist.size(); i++) { DistributionAdvisee advisee = (DistributionAdvisee)bslist.get(i); - BridgeServerAdvisor bsa = (BridgeServerAdvisor)advisee.getDistributionAdvisor(); + CacheServerAdvisor bsa = (CacheServerAdvisor)advisee.getDistributionAdvisor(); List others = bsa.fetchBridgeServers(); getLogWriter().info("found these bridgeservers in " + advisee + ": " + others); assertEquals(3, others.size()); @@ -289,7 +289,7 @@ public class GridAdvisorDUnitTest extends DistributedTestCase { assertEquals(2, bslist.size()); for (int i=0; i < bslist.size(); i++) { DistributionAdvisee advisee = (DistributionAdvisee)bslist.get(i); - BridgeServerAdvisor bsa = (BridgeServerAdvisor)advisee.getDistributionAdvisor(); + CacheServerAdvisor bsa = (CacheServerAdvisor)advisee.getDistributionAdvisor(); List others = bsa.fetchBridgeServers(); getLogWriter().info("found these bridgeservers in " + advisee + ": " + others); assertEquals(3, others.size()); @@ -342,8 +342,8 @@ public class GridAdvisorDUnitTest extends DistributedTestCase { others = ca.fetchBridgeServers(); assertEquals(3, others.size()); for (int j=0; j < others.size(); j++) { - BridgeServerAdvisor.BridgeServerProfile bsp = - (BridgeServerAdvisor.BridgeServerProfile)others.get(j); + CacheServerAdvisor.CacheServerProfile bsp = + (CacheServerAdvisor.CacheServerProfile)others.get(j); if (bsp.getPort() == bsPort2) { assertEquals(Arrays.asList(new String[] {"bs2Group1", "bs2Group2"}), Arrays.asList(bsp.getGroups())); @@ -375,8 +375,8 @@ public class GridAdvisorDUnitTest extends DistributedTestCase { others = ca.fetchBridgeServers(); assertEquals(3, others.size()); for (int j=0; j < others.size(); j++) { - BridgeServerAdvisor.BridgeServerProfile bsp = - (BridgeServerAdvisor.BridgeServerProfile)others.get(j); + CacheServerAdvisor.CacheServerProfile bsp = + (CacheServerAdvisor.CacheServerProfile)others.get(j); if (bsp.getPort() == bsPort2) { assertEquals(Arrays.asList(new String[] {"bs2Group1", "bs2Group2"}), Arrays.asList(bsp.getGroups())); @@ -431,7 +431,7 @@ public class GridAdvisorDUnitTest extends DistributedTestCase { assertEquals(2, bslist.size()); for (int i=0; i < bslist.size(); i++) { DistributionAdvisee advisee = (DistributionAdvisee)bslist.get(i); - BridgeServerAdvisor bsa = (BridgeServerAdvisor)advisee.getDistributionAdvisor(); + CacheServerAdvisor bsa = (CacheServerAdvisor)advisee.getDistributionAdvisor(); List others = bsa.fetchControllers(); assertEquals(1, others.size()); for (int j=0; j < others.size(); j++) { @@ -458,7 +458,7 @@ public class GridAdvisorDUnitTest extends DistributedTestCase { // skip this one since it is stopped continue; } - BridgeServerAdvisor bsa = (BridgeServerAdvisor)advisee.getDistributionAdvisor(); + CacheServerAdvisor bsa = (CacheServerAdvisor)advisee.getDistributionAdvisor(); List others = bsa.fetchControllers(); assertEquals(1, others.size()); for (int j=0; j < others.size(); j++) { @@ -505,8 +505,8 @@ public class GridAdvisorDUnitTest extends DistributedTestCase { List others = ca.fetchBridgeServers(); assertEquals(4, others.size()); for (int j=0; j < others.size(); j++) { - BridgeServerAdvisor.BridgeServerProfile bsp = - (BridgeServerAdvisor.BridgeServerProfile)others.get(j); + CacheServerAdvisor.CacheServerProfile bsp = + (CacheServerAdvisor.CacheServerProfile)others.get(j); if (bsp.getPort() == bsPort1) { assertEquals(Arrays.asList(new String[] {"bs1Group1", "bs1Group2"}), Arrays.asList(bsp.getGroups())); @@ -712,8 +712,8 @@ public class GridAdvisorDUnitTest extends DistributedTestCase { others = ca.fetchBridgeServers(); assertEquals(4, others.size()); for (int j=0; j < others.size(); j++) { - BridgeServerAdvisor.BridgeServerProfile bsp = - (BridgeServerAdvisor.BridgeServerProfile)others.get(j); + CacheServerAdvisor.CacheServerProfile bsp = + (CacheServerAdvisor.CacheServerProfile)others.get(j); if (bsp.getPort() == bsPort1) { assertEquals(Arrays.asList(new String[] {"bs1Group1", "bs1Group2"}), Arrays.asList(bsp.getGroups())); @@ -748,8 +748,8 @@ public class GridAdvisorDUnitTest extends DistributedTestCase { others = ca.fetchBridgeServers(); assertEquals(4, others.size()); for (int j=0; j < others.size(); j++) { - BridgeServerAdvisor.BridgeServerProfile bsp = - (BridgeServerAdvisor.BridgeServerProfile)others.get(j); + CacheServerAdvisor.CacheServerProfile bsp = + (CacheServerAdvisor.CacheServerProfile)others.get(j); if (bsp.getPort() == bsPort1) { assertEquals(Arrays.asList(new String[] {"bs1Group1", "bs1Group2"}), Arrays.asList(bsp.getGroups())); @@ -775,7 +775,7 @@ public class GridAdvisorDUnitTest extends DistributedTestCase { assertEquals(2, bslist.size()); for (int i=0; i < bslist.size(); i++) { DistributionAdvisee advisee = (DistributionAdvisee)bslist.get(i); - BridgeServerAdvisor bsa = (BridgeServerAdvisor)advisee.getDistributionAdvisor(); + CacheServerAdvisor bsa = (CacheServerAdvisor)advisee.getDistributionAdvisor(); List others = bsa.fetchBridgeServers(); getLogWriter().info("found these bridgeservers in " + advisee + ": " + others); assertEquals(3, others.size()); @@ -803,7 +803,7 @@ public class GridAdvisorDUnitTest extends DistributedTestCase { assertEquals(2, bslist.size()); for (int i=0; i < bslist.size(); i++) { DistributionAdvisee advisee = (DistributionAdvisee)bslist.get(i); - BridgeServerAdvisor bsa = (BridgeServerAdvisor)advisee.getDistributionAdvisor(); + CacheServerAdvisor bsa = (CacheServerAdvisor)advisee.getDistributionAdvisor(); List others = bsa.fetchBridgeServers(); getLogWriter().info("found these bridgeservers in " + advisee + ": " + others); assertEquals(3, others.size()); @@ -856,8 +856,8 @@ public class GridAdvisorDUnitTest extends DistributedTestCase { others = ca.fetchBridgeServers(); assertEquals(3, others.size()); for (int j=0; j < others.size(); j++) { - BridgeServerAdvisor.BridgeServerProfile bsp = - (BridgeServerAdvisor.BridgeServerProfile)others.get(j); + CacheServerAdvisor.CacheServerProfile bsp = + (CacheServerAdvisor.CacheServerProfile)others.get(j); if (bsp.getPort() == bsPort2) { assertEquals(Arrays.asList(new String[] {"bs2Group1", "bs2Group2"}), Arrays.asList(bsp.getGroups())); @@ -889,8 +889,8 @@ public class GridAdvisorDUnitTest extends DistributedTestCase { others = ca.fetchBridgeServers(); assertEquals(3, others.size()); for (int j=0; j < others.size(); j++) { - BridgeServerAdvisor.BridgeServerProfile bsp = - (BridgeServerAdvisor.BridgeServerProfile)others.get(j); + CacheServerAdvisor.CacheServerProfile bsp = + (CacheServerAdvisor.CacheServerProfile)others.get(j); if (bsp.getPort() == bsPort2) { assertEquals(Arrays.asList(new String[] {"bs2Group1", "bs2Group2"}), Arrays.asList(bsp.getGroups())); @@ -942,7 +942,7 @@ public class GridAdvisorDUnitTest extends DistributedTestCase { assertEquals(2, bslist.size()); for (int i=0; i < bslist.size(); i++) { DistributionAdvisee advisee = (DistributionAdvisee)bslist.get(i); - BridgeServerAdvisor bsa = (BridgeServerAdvisor)advisee.getDistributionAdvisor(); + CacheServerAdvisor bsa = (CacheServerAdvisor)advisee.getDistributionAdvisor(); List others = bsa.fetchControllers(); assertEquals(1, others.size()); for (int j=0; j < others.size(); j++) { @@ -969,7 +969,7 @@ public class GridAdvisorDUnitTest extends DistributedTestCase { // skip this one since it is stopped continue; } - BridgeServerAdvisor bsa = (BridgeServerAdvisor)advisee.getDistributionAdvisor(); + CacheServerAdvisor bsa = (CacheServerAdvisor)advisee.getDistributionAdvisor(); List others = bsa.fetchControllers(); assertEquals(1, others.size()); for (int j=0; j < others.size(); j++) { @@ -1016,8 +1016,8 @@ public class GridAdvisorDUnitTest extends DistributedTestCase { List others = ca.fetchBridgeServers(); assertEquals(4, others.size()); for (int j=0; j < others.size(); j++) { - BridgeServerAdvisor.BridgeServerProfile bsp = - (BridgeServerAdvisor.BridgeServerProfile)others.get(j); + CacheServerAdvisor.CacheServerProfile bsp = + (CacheServerAdvisor.CacheServerProfile)others.get(j); if (bsp.getPort() == bsPort1) { assertEquals(Arrays.asList(new String[] {"bs1Group1", "bs1Group2"}), Arrays.asList(bsp.getGroups())); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java index 1669102..65ddf4b 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java @@ -140,7 +140,7 @@ public class HAOverflowMemObjectSizerDUnitTest extends DistributedTestCase { * storing capacity controller reference */ cc = ((VMLRURegionMap)((LocalRegion)cache.getRegion(Region.SEPARATOR - + BridgeServerImpl.generateNameForClientMsgsRegion(port))).entries) + + CacheServerImpl.generateNameForClientMsgsRegion(port))).entries) ._getCCHelper(); return new Integer(server1.getPort()); } @@ -227,7 +227,7 @@ public class HAOverflowMemObjectSizerDUnitTest extends DistributedTestCase { */ public static void sizerTestForMemCapacityController(Integer port) { region = cache.getRegion(Region.SEPARATOR - + BridgeServerImpl.generateNameForClientMsgsRegion(port.intValue())); + + CacheServerImpl.generateNameForClientMsgsRegion(port.intValue())); assertNotNull(region); Set entries = region.entrySet(); assertTrue(entries.size() > 0); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java index 12f817f..6fab13c 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java @@ -20,7 +20,7 @@ import com.gemstone.gemfire.cache.execute.ResultCollector; import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.internal.AvailablePort; -import com.gemstone.gemfire.internal.cache.BridgeServerImpl; +import com.gemstone.gemfire.internal.cache.CacheServerImpl; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.internal.cache.tier.ClientHandShake; import com.gemstone.gemfire.internal.cache.tier.sockets.AcceptorImpl; @@ -206,7 +206,7 @@ public class Bug51193DUnitTest extends DistributedTestCase { public void execute(FunctionContext context) { boolean timeoutMatches = false; int expected = (Integer)context.getArguments(); - AcceptorImpl acceptor = ((BridgeServerImpl) cache.getCacheServers() + AcceptorImpl acceptor = ((CacheServerImpl) cache.getCacheServers() .get(0)).getAcceptor(); ServerConnection[] scs = acceptor.getAllServerConnectionList(); for (int i = 0; i < scs.length; ++i) { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/functions/TestFunction.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/functions/TestFunction.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/functions/TestFunction.java index 445ccd0..3ce15b2 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/functions/TestFunction.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/functions/TestFunction.java @@ -24,7 +24,7 @@ import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; import com.gemstone.gemfire.internal.Assert; -import com.gemstone.gemfire.internal.cache.BridgeServerImpl; +import com.gemstone.gemfire.internal.cache.CacheServerImpl; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.internal.cache.PartitionedRegion; import com.gemstone.gemfire.internal.cache.PartitionedRegionDataStore; @@ -927,7 +927,7 @@ public class TestFunction extends FunctionAdapter implements Declarable2 { } else { r.put("stopped", ++numTimesStopped); for (CacheServer s : servers) { - if (((BridgeServerImpl)s).getSystem().getDistributedMember().equals( + if (((CacheServerImpl)s).getSystem().getDistributedMember().equals( ((GemFireCacheImpl)CacheFactory.getAnyInstance()).getMyId())) { s.stop(); DistributedSystem ds = InternalDistributedSystem.getAnyInstance(); @@ -954,7 +954,7 @@ public class TestFunction extends FunctionAdapter implements Declarable2 { } for (CacheServer s : servers) { - if (((BridgeServerImpl)s).getSystem().getDistributedMember().equals( + if (((CacheServerImpl)s).getSystem().getDistributedMember().equals( ((GemFireCacheImpl)CacheFactory.getAnyInstance()).getMyId())) { s.stop(); DistributedSystem ds = InternalDistributedSystem.getAnyInstance(); @@ -990,7 +990,7 @@ public class TestFunction extends FunctionAdapter implements Declarable2 { } else { r.put("stopped", ++numTimesStopped); for (CacheServer s : servers) { - if (((BridgeServerImpl)s).getSystem().getDistributedMember().equals( + if (((CacheServerImpl)s).getSystem().getDistributedMember().equals( ((GemFireCacheImpl)CacheFactory.getAnyInstance()).getMyId())) { s.stop(); DistributedSystem ds = InternalDistributedSystem.getAnyInstance(); @@ -1016,7 +1016,7 @@ public class TestFunction extends FunctionAdapter implements Declarable2 { } for (CacheServer s : servers) { - if (((BridgeServerImpl)s).getSystem().getDistributedMember().equals( + if (((CacheServerImpl)s).getSystem().getDistributedMember().equals( ((GemFireCacheImpl)CacheFactory.getAnyInstance()).getMyId())) { s.stop(); DistributedSystem ds = InternalDistributedSystem.getAnyInstance(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java index 0805d52..580e009 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java @@ -24,7 +24,7 @@ import com.gemstone.gemfire.cache30.CacheSerializableRunnable; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.AvailablePort; -import com.gemstone.gemfire.internal.cache.BridgeServerImpl; +import com.gemstone.gemfire.internal.cache.CacheServerImpl; import dunit.DistributedTestCase; import dunit.Host; @@ -132,7 +132,7 @@ public class HABugInPutDUnitTest extends DistributedTestCase factory.setDataPolicy(DataPolicy.REPLICATE); RegionAttributes attrs = factory.create(); cache.createRegion(REGION_NAME, attrs); - BridgeServerImpl server = (BridgeServerImpl)cache.addCacheServer(); + CacheServerImpl server = (CacheServerImpl)cache.addCacheServer(); assertNotNull(server); int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); server.setPort(port); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java index d683a12..5f3fca4 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java @@ -23,7 +23,7 @@ import com.gemstone.gemfire.cache30.BridgeTestCase; import com.gemstone.gemfire.cache30.CacheSerializableRunnable; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.internal.AvailablePort; -import com.gemstone.gemfire.internal.cache.BridgeServerImpl; +import com.gemstone.gemfire.internal.cache.CacheServerImpl; import com.gemstone.gemfire.internal.cache.CacheObserverAdapter; import com.gemstone.gemfire.internal.cache.CacheObserverHolder; import com.gemstone.gemfire.internal.cache.LocalRegion; @@ -61,7 +61,7 @@ public class HAClearDUnitTest extends DistributedTestCase protected static Cache cache = null; - static BridgeServerImpl server = null; + static CacheServerImpl server = null; static final int NO_OF_PUTS = 100; @@ -572,7 +572,7 @@ public class HAClearDUnitTest extends DistributedTestCase factory.setDataPolicy(DataPolicy.REPLICATE); RegionAttributes attrs = factory.create(); cache.createRegion(REGION_NAME, attrs); - server = (BridgeServerImpl)cache.addCacheServer(); + server = (CacheServerImpl)cache.addCacheServer(); assertNotNull(server); int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); server.setPort(port); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java index 049840d..2eaef5d 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java @@ -27,7 +27,7 @@ import com.gemstone.gemfire.cache30.CacheTestCase; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.AvailablePort; -import com.gemstone.gemfire.internal.cache.BridgeServerImpl; +import com.gemstone.gemfire.internal.cache.CacheServerImpl; import com.gemstone.gemfire.internal.cache.tier.sockets.ConflationDUnitTest; import dunit.Host; @@ -346,7 +346,7 @@ public class HAConflationDUnitTest extends CacheTestCase } RegionAttributes attrs = factory.create(); cache.createRegion(regionName, attrs); - BridgeServerImpl server = (BridgeServerImpl)cache.addCacheServer(); + CacheServerImpl server = (CacheServerImpl)cache.addCacheServer(); assertNotNull(server); int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); server.setPort(port); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java index 24263ac..03e17ff 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java @@ -28,7 +28,7 @@ import com.gemstone.gemfire.cache30.BridgeTestCase; import com.gemstone.gemfire.cache30.CacheSerializableRunnable; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.internal.AvailablePort; -import com.gemstone.gemfire.internal.cache.BridgeServerImpl; +import com.gemstone.gemfire.internal.cache.CacheServerImpl; import dunit.DistributedTestCase; import dunit.Host; @@ -67,7 +67,7 @@ public class HADuplicateDUnitTest extends DistributedTestCase static boolean isEventDuplicate = true; - static BridgeServerImpl server = null; + static CacheServerImpl server = null; static final int NO_OF_PUTS = 100; @@ -240,7 +240,7 @@ public class HADuplicateDUnitTest extends DistributedTestCase factory.setDataPolicy(DataPolicy.REPLICATE); RegionAttributes attrs = factory.create(); cache.createRegion(REGION_NAME, attrs); - server = (BridgeServerImpl)cache.addCacheServer(); + server = (CacheServerImpl)cache.addCacheServer(); assertNotNull(server); int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); server.setPort(port); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java index 1ee8d46..b87b2e6 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java @@ -32,7 +32,7 @@ import com.gemstone.gemfire.cache30.BridgeTestCase; import com.gemstone.gemfire.cache30.CacheSerializableRunnable; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.internal.AvailablePort; -import com.gemstone.gemfire.internal.cache.BridgeServerImpl; +import com.gemstone.gemfire.internal.cache.CacheServerImpl; import com.gemstone.gemfire.internal.cache.EntryEventImpl; import com.gemstone.gemfire.internal.cache.EventID; import com.gemstone.gemfire.internal.cache.RegionEventImpl; @@ -66,7 +66,7 @@ public class HAEventIdPropagationDUnitTest extends DistributedTestCase private static Cache cache = null; /** server * */ - static BridgeServerImpl server = null; + static CacheServerImpl server = null; /** test constructor * */ public HAEventIdPropagationDUnitTest(String name) { @@ -129,7 +129,7 @@ public class HAEventIdPropagationDUnitTest extends DistributedTestCase factory.setCacheListener(clientListener); RegionAttributes attrs = factory.create(); cache.createRegion(REGION_NAME, attrs); - server = (BridgeServerImpl)cache.addCacheServer(); + server = (CacheServerImpl)cache.addCacheServer(); assertNotNull(server); int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); server.setPort(port); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java index 2cb4ab1..3f887f5 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java @@ -34,7 +34,7 @@ import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; import com.gemstone.gemfire.internal.AvailablePort; -import com.gemstone.gemfire.internal.cache.BridgeServerImpl; +import com.gemstone.gemfire.internal.cache.CacheServerImpl; import com.gemstone.gemfire.internal.cache.LocalRegion; import com.gemstone.gemfire.internal.cache.ha.HAContainerMap; import com.gemstone.gemfire.internal.cache.ha.HAContainerRegion; @@ -893,7 +893,7 @@ public class HARQueueNewImplDUnitTest extends DistributedTestCase { private static void verifyNullCUMReference(Integer port) { Region r = cache.getRegion("/" - + BridgeServerImpl.generateNameForClientMsgsRegion(port.intValue())); + + CacheServerImpl.generateNameForClientMsgsRegion(port.intValue())); assertNotNull(r); Object[] arr = r.keySet().toArray(); @@ -905,7 +905,7 @@ public class HARQueueNewImplDUnitTest extends DistributedTestCase { private static void verifyHaContainerDestroyed(Boolean isRegion, Integer port) { Map r = cache.getRegion("/" - + BridgeServerImpl.generateNameForClientMsgsRegion(port.intValue())); + + CacheServerImpl.generateNameForClientMsgsRegion(port.intValue())); if (isRegion.booleanValue()) { if (r != null) { @@ -913,7 +913,7 @@ public class HARQueueNewImplDUnitTest extends DistributedTestCase { } } else { - r = ((BridgeServerImpl)cache.getCacheServers().toArray()[0]) + r = ((CacheServerImpl)cache.getCacheServers().toArray()[0]) .getAcceptor().getCacheClientNotifier().getHaContainer(); if (r != null) { assertTrue(r.isEmpty()); @@ -1053,7 +1053,7 @@ public class HARQueueNewImplDUnitTest extends DistributedTestCase { public static void verifyNullValuesInCMR(final Integer numOfEntries, final Integer port, String[] keys) { - final Region msgsRegion = cache.getRegion(BridgeServerImpl + final Region msgsRegion = cache.getRegion(CacheServerImpl .generateNameForClientMsgsRegion(port.intValue())); WaitCriterion wc = new WaitCriterion() { String excuse; @@ -1082,7 +1082,7 @@ public class HARQueueNewImplDUnitTest extends DistributedTestCase { public static void makeValuesOfSomeKeysNullInClientMsgsRegion(Integer port, String[] keys) { - Region msgsRegion = cache.getRegion(BridgeServerImpl + Region msgsRegion = cache.getRegion(CacheServerImpl .generateNameForClientMsgsRegion(port.intValue())); assertNotNull(msgsRegion); @@ -1104,7 +1104,7 @@ public class HARQueueNewImplDUnitTest extends DistributedTestCase { public static void populateValuesOfSomeKeysInClientMsgsRegion(Integer port, String[] keys) { - Region msgsRegion = cache.getRegion(BridgeServerImpl + Region msgsRegion = cache.getRegion(CacheServerImpl .generateNameForClientMsgsRegion(port.intValue())); assertNotNull(msgsRegion); @@ -1132,7 +1132,7 @@ public class HARQueueNewImplDUnitTest extends DistributedTestCase { Integer msgsRegionsize, Integer port) { try { // Get the clientMessagesRegion and check the size. - Region msgsRegion = cache.getRegion(BridgeServerImpl + Region msgsRegion = cache.getRegion(CacheServerImpl .generateNameForClientMsgsRegion(port.intValue())); Region region = cache.getRegion("/" + regionName); logger.fine("size<serverRegion, clientMsgsRegion>: " + region.size() @@ -1175,7 +1175,7 @@ public class HARQueueNewImplDUnitTest extends DistributedTestCase { Iterator iter = cache.getCacheServers().iterator(); if (iter.hasNext()) { - BridgeServerImpl server = (BridgeServerImpl)iter.next(); + CacheServerImpl server = (CacheServerImpl)iter.next(); Map msgsRegion = server.getAcceptor().getCacheClientNotifier() .getHaContainer(); //Region msgsRegion = cache.getRegion(BridgeServerImpl @@ -1219,7 +1219,7 @@ public class HARQueueNewImplDUnitTest extends DistributedTestCase { if (!iter.hasNext()) { return true; } - BridgeServerImpl server = (BridgeServerImpl)iter.next(); + CacheServerImpl server = (CacheServerImpl)iter.next(); sz = server.getAcceptor().getCacheClientNotifier().getHaContainer().size(); if (sz != msgsRegionsize.intValue()) { excuse = "Expected msgsRegionsize = " + msgsRegionsize.intValue() + @@ -1241,19 +1241,19 @@ public class HARQueueNewImplDUnitTest extends DistributedTestCase { public static void verifyHaContainerType(Boolean isRegion, Integer port) { try { - Map haMap = cache.getRegion(BridgeServerImpl + Map haMap = cache.getRegion(CacheServerImpl .generateNameForClientMsgsRegion(port.intValue())); if (isRegion.booleanValue()) { assertNotNull(haMap); assertTrue(haMap instanceof LocalRegion); - haMap = ((BridgeServerImpl)cache.getCacheServers().toArray()[0]) + haMap = ((CacheServerImpl)cache.getCacheServers().toArray()[0]) .getAcceptor().getCacheClientNotifier().getHaContainer(); assertNotNull(haMap); assertTrue(haMap instanceof HAContainerRegion); } else { assertNull(haMap); - haMap = ((BridgeServerImpl)cache.getCacheServers().toArray()[0]) + haMap = ((CacheServerImpl)cache.getCacheServers().toArray()[0]) .getAcceptor().getCacheClientNotifier().getHaContainer(); assertNotNull(haMap); assertTrue(haMap instanceof HAContainerMap); @@ -1267,7 +1267,7 @@ public class HARQueueNewImplDUnitTest extends DistributedTestCase { public static void verifyRootRegionsDoesNotReturnCMR(Integer port) { try { - String cmrName = BridgeServerImpl.generateNameForClientMsgsRegion(port + String cmrName = CacheServerImpl.generateNameForClientMsgsRegion(port .intValue()); Map haMap = cache.getRegion(cmrName); assertNotNull(haMap); @@ -1323,12 +1323,12 @@ public class HARQueueNewImplDUnitTest extends DistributedTestCase { try { Map haContainer = null; haContainer = cache.getRegion(Region.SEPARATOR - + BridgeServerImpl.generateNameForClientMsgsRegion(port.intValue())); + + CacheServerImpl.generateNameForClientMsgsRegion(port.intValue())); if (haContainer == null) { Object[] servers = cache.getCacheServers().toArray(); for (int i = 0; i < servers.length; i++) { - if (port.intValue() == ((BridgeServerImpl)servers[i]).getPort()) { - haContainer = ((BridgeServerImpl)servers[i]).getAcceptor() + if (port.intValue() == ((CacheServerImpl)servers[i]).getPort()) { + haContainer = ((CacheServerImpl)servers[i]).getAcceptor() .getCacheClientNotifier().getHaContainer(); break; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java index 873a343..ba53570 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java @@ -23,7 +23,7 @@ import com.gemstone.gemfire.cache30.BridgeTestCase; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.AvailablePort; -import com.gemstone.gemfire.internal.cache.BridgeServerImpl; +import com.gemstone.gemfire.internal.cache.CacheServerImpl; import dunit.DistributedTestCase; import dunit.Host; @@ -170,7 +170,7 @@ public class OperationsPropagationDUnitTest extends DistributedTestCase RegionAttributes attrs = factory.create(); region = cache.createRegion(REGION_NAME, attrs); - BridgeServerImpl server = (BridgeServerImpl)cache.addCacheServer(); + CacheServerImpl server = (CacheServerImpl)cache.addCacheServer(); assertNotNull(server); int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); server.setPort(port); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java index 80e8804..ea7008d 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java @@ -30,7 +30,7 @@ import com.gemstone.gemfire.cache30.BridgeTestCase; import com.gemstone.gemfire.cache30.CacheSerializableRunnable; import com.gemstone.gemfire.distributed.DistributedSystem; import com.gemstone.gemfire.internal.AvailablePort; -import com.gemstone.gemfire.internal.cache.BridgeServerImpl; +import com.gemstone.gemfire.internal.cache.CacheServerImpl; import com.gemstone.gemfire.internal.cache.EntryEventImpl; import com.gemstone.gemfire.internal.cache.EventID; @@ -73,7 +73,7 @@ public class PutAllDUnitTest extends DistributedTestCase /** cache **/ private static Cache cache = null; /** server **/ - static BridgeServerImpl server = null; + static CacheServerImpl server = null; /** test constructor **/ public PutAllDUnitTest(String name) { @@ -148,7 +148,7 @@ public class PutAllDUnitTest extends DistributedTestCase factory.setCacheListener(clientListener); RegionAttributes attrs = factory.create(); cache.createRegion(REGION_NAME, attrs); - server = (BridgeServerImpl)cache.addCacheServer(); + server = (CacheServerImpl)cache.addCacheServer(); assertNotNull(server); int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); server.setPort(port); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/51bddd70/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java index 999c63b..b2c8256 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java @@ -21,7 +21,7 @@ import com.gemstone.gemfire.cache.client.ClientRegionFactory; import com.gemstone.gemfire.cache.client.ClientRegionShortcut; import com.gemstone.gemfire.internal.AvailablePort; import com.gemstone.gemfire.internal.OSProcess; -import com.gemstone.gemfire.internal.cache.BridgeServerImpl; +import com.gemstone.gemfire.internal.cache.CacheServerImpl; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.internal.cache.LocalRegion; import com.gemstone.gemfire.internal.cache.RegionEntry; @@ -248,7 +248,7 @@ public class Bug43684DUnitTest extends DistributedTestCase { rf.setPartitionAttributes(new PartitionAttributesFactory().setTotalNumBuckets(numBuckets).create()); } rf.create(REGION_NAME); - BridgeServerImpl server = (BridgeServerImpl)cache.addCacheServer(); + CacheServerImpl server = (CacheServerImpl)cache.addCacheServer(); server.setPort(AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET)); server.start(); return server.getPort();
