[jbosscache-commits] JBoss Cache SVN: r7621 - in core/branches/flat/src: main/java/org/horizon/interceptors and 3 other directories.

Author: manik.surtani(a)jboss.com Date: 2009-01-31 04:44:26 -0500 (Sat, 31 Jan 2009) New Revision: 7621 Modified: core/branches/flat/src/main/java/org/horizon/factories/EmptyConstructorFactory.java core/branches/flat/src/main/java/org/horizon/factories/EmptyConstructorNamedCacheFactory.java core/branches/flat/src/main/java/org/horizon/factories/EntryFactoryImpl.java core/branches/flat/src/main/java/org/horizon/interceptors/CacheLoaderInterceptor.java core/branches/flat/src/main/java/org/horizon/interceptors/NotificationInterceptor.java core/branches/flat/src/main/java/org/horizon/interceptors/TxInterceptor.java core/branches/flat/src/main/java/org/horizon/remoting/transport/Transport.java core/branches/flat/src/main/java/org/horizon/remoting/transport/jgroups/JGroupsTransport.java core/branches/flat/src/test/java/org/horizon/notifications/cachemanagerlistener/CacheManagerNotifierTest.java Log: Modified: core/branches/flat/src/main/java/org/horizon/factories/EmptyConstructorFactory.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/factories/EmptyConstructorFactory.java 2009-01-31 00:36:37 UTC (rev 7620) +++ core/branches/flat/src/main/java/org/horizon/factories/EmptyConstructorFactory.java 2009-01-31 09:44:26 UTC (rev 7621) @@ -7,7 +7,7 @@ import org.horizon.factories.scopes.Scopes; import org.horizon.marshall.Marshaller; import org.horizon.marshall.VersionAwareMarshaller; -import org.horizon.notifications.CacheManagerNotifier; +import org.horizon.notifications.cachemanagerlistener.CacheManagerNotifier; import org.horizon.remoting.InboundInvocationHandler; /** Modified: core/branches/flat/src/main/java/org/horizon/factories/EmptyConstructorNamedCacheFactory.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/factories/EmptyConstructorNamedCacheFactory.java 2009-01-31 00:36:37 UTC (rev 7620) +++ core/branches/flat/src/main/java/org/horizon/factories/EmptyConstructorNamedCacheFactory.java 2009-01-31 09:44:26 UTC (rev 7621) @@ -31,7 +31,7 @@ import org.horizon.loader.CacheLoaderManager; import org.horizon.marshall.Marshaller; import org.horizon.marshall.VersionAwareMarshaller; -import org.horizon.notifications.CacheNotifier; +import org.horizon.notifications.cachelistener.CacheNotifier; import org.horizon.transaction.TransactionTable; /** Modified: core/branches/flat/src/main/java/org/horizon/factories/EntryFactoryImpl.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/factories/EntryFactoryImpl.java 2009-01-31 00:36:37 UTC (rev 7620) +++ core/branches/flat/src/main/java/org/horizon/factories/EntryFactoryImpl.java 2009-01-31 09:44:26 UTC (rev 7621) @@ -35,7 +35,7 @@ import org.horizon.lock.TimeoutException; import org.horizon.logging.Log; import org.horizon.logging.LogFactory; -import org.horizon.notifications.CacheNotifier; +import org.horizon.notifications.cachelistener.CacheNotifier; /** * // TODO: MANIK: Document this Modified: core/branches/flat/src/main/java/org/horizon/interceptors/CacheLoaderInterceptor.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/interceptors/CacheLoaderInterceptor.java 2009-01-31 00:36:37 UTC (rev 7620) +++ core/branches/flat/src/main/java/org/horizon/interceptors/CacheLoaderInterceptor.java 2009-01-31 09:44:26 UTC (rev 7621) @@ -37,7 +37,7 @@ import org.horizon.interceptors.base.JmxStatsCommandInterceptor; import org.horizon.loader.CacheLoader; import org.horizon.loader.CacheLoaderManager; -import org.horizon.notifications.CacheNotifier; +import org.horizon.notifications.cachelistener.CacheNotifier; import org.horizon.transaction.TransactionTable; import java.util.HashMap; Modified: core/branches/flat/src/main/java/org/horizon/interceptors/NotificationInterceptor.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/interceptors/NotificationInterceptor.java 2009-01-31 00:36:37 UTC (rev 7620) +++ core/branches/flat/src/main/java/org/horizon/interceptors/NotificationInterceptor.java 2009-01-31 09:44:26 UTC (rev 7621) @@ -26,7 +26,7 @@ import org.horizon.commands.tx.RollbackCommand; import org.horizon.context.InvocationContext; import org.horizon.factories.annotations.Inject; -import org.horizon.notifications.CacheNotifier; +import org.horizon.notifications.cachelistener.CacheNotifier; /** * The interceptor in charge of firing off notifications to cache listeners Modified: core/branches/flat/src/main/java/org/horizon/interceptors/TxInterceptor.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/interceptors/TxInterceptor.java 2009-01-31 00:36:37 UTC (rev 7620) +++ core/branches/flat/src/main/java/org/horizon/interceptors/TxInterceptor.java 2009-01-31 09:44:26 UTC (rev 7621) @@ -39,7 +39,7 @@ import org.horizon.invocation.InvocationContextContainer; import org.horizon.lock.LockManager; import org.horizon.manager.CacheManager; -import org.horizon.notifications.CacheNotifier; +import org.horizon.notifications.cachelistener.CacheNotifier; import org.horizon.remoting.ReplicationException; import org.horizon.transaction.GlobalTransaction; import org.horizon.transaction.TransactionTable; Modified: core/branches/flat/src/main/java/org/horizon/remoting/transport/Transport.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/remoting/transport/Transport.java 2009-01-31 00:36:37 UTC (rev 7620) +++ core/branches/flat/src/main/java/org/horizon/remoting/transport/Transport.java 2009-01-31 09:44:26 UTC (rev 7621) @@ -7,7 +7,7 @@ import org.horizon.factories.scopes.Scopes; import org.horizon.lifecycle.Lifecycle; import org.horizon.marshall.Marshaller; -import org.horizon.notifications.CacheManagerNotifier; +import org.horizon.notifications.cachemanagerlistener.CacheManagerNotifier; import org.horizon.remoting.InboundInvocationHandler; import org.horizon.remoting.ResponseFilter; import org.horizon.remoting.ResponseMode; Modified: core/branches/flat/src/main/java/org/horizon/remoting/transport/jgroups/JGroupsTransport.java =================================================================== --- core/branches/flat/src/main/java/org/horizon/remoting/transport/jgroups/JGroupsTransport.java 2009-01-31 00:36:37 UTC (rev 7620) +++ core/branches/flat/src/main/java/org/horizon/remoting/transport/jgroups/JGroupsTransport.java 2009-01-31 09:44:26 UTC (rev 7621) @@ -8,7 +8,7 @@ import org.horizon.logging.Log; import org.horizon.logging.LogFactory; import org.horizon.marshall.Marshaller; -import org.horizon.notifications.CacheManagerNotifier; +import org.horizon.notifications.cachemanagerlistener.CacheManagerNotifier; import org.horizon.remoting.InboundInvocationHandler; import org.horizon.remoting.ReplicationException; import org.horizon.remoting.ResponseFilter; @@ -297,7 +297,6 @@ // List<org.jgroups.Address> removed = toJGroupsAddressList(members); // removed.removeAll(newMembers); // spi.getInvocationContext().getOptionOverrides().setSkipCacheStatusCheck(true); -// NodeSPI root = null; // spi.getRoot(); // if (root != null) // { //removeLocksForDeadMembers(root.getDelegationTarget(), removed); Modified: core/branches/flat/src/test/java/org/horizon/notifications/cachemanagerlistener/CacheManagerNotifierTest.java =================================================================== --- core/branches/flat/src/test/java/org/horizon/notifications/cachemanagerlistener/CacheManagerNotifierTest.java 2009-01-31 00:36:37 UTC (rev 7620) +++ core/branches/flat/src/test/java/org/horizon/notifications/cachemanagerlistener/CacheManagerNotifierTest.java 2009-01-31 09:44:26 UTC (rev 7621) @@ -6,7 +6,6 @@ import org.horizon.config.Configuration; import org.horizon.config.GlobalConfiguration; import org.horizon.manager.CacheManager; -import org.horizon.notifications.cachemanagerlistener.CacheManagerNotifier; import org.horizon.remoting.transport.Address; import org.horizon.util.TestingUtil; import org.testng.annotations.Test;