[jbosscache-commits] JBoss Cache SVN: r6207 - in core/trunk/src: test/java/org/jboss/cache/marshall and 1 other directory.

[jbosscache-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2008-07-08 06:55:12 -0400 (Tue, 08 Jul 2008)
New Revision: 6207

Modified:
   core/trunk/src/main/java/org/jboss/cache/RegionManagerImpl.java
   core/trunk/src/test/java/org/jboss/cache/marshall/CacheMarshaller200Test.java
Log:
test dependency wiring

Modified: core/trunk/src/main/java/org/jboss/cache/RegionManagerImpl.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/RegionManagerImpl.java	2008-07-08 10:46:19 UTC (rev 6206)
+++ core/trunk/src/main/java/org/jboss/cache/RegionManagerImpl.java	2008-07-08 10:55:12 UTC (rev 6207)
@@ -58,8 +58,8 @@
    private boolean isUsingBR;
 
    @Inject
-   void injectDependencies(CacheSPI cache, Configuration configuration, RPCManager rpcManager, LockManager lockManager,
-                           BuddyFqnTransformer transformer, RegionRegistry regionsRegistry)
+   public void injectDependencies(CacheSPI cache, Configuration configuration, RPCManager rpcManager, LockManager lockManager,
+                                  BuddyFqnTransformer transformer, RegionRegistry regionsRegistry)
    {
       this.cache = cache;
       this.rpcManager = rpcManager;
@@ -70,7 +70,7 @@
    }
 
    @Start
-   protected void start()
+   public void start()
    {
       log.trace("Starting region manager");
       isUsingBR = configuration.getBuddyReplicationConfig() != null && configuration.getBuddyReplicationConfig().isEnabled();

Modified: core/trunk/src/test/java/org/jboss/cache/marshall/CacheMarshaller200Test.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/marshall/CacheMarshaller200Test.java	2008-07-08 10:46:19 UTC (rev 6206)
+++ core/trunk/src/test/java/org/jboss/cache/marshall/CacheMarshaller200Test.java	2008-07-08 10:55:12 UTC (rev 6207)
@@ -10,6 +10,7 @@
 import org.jboss.cache.Region;
 import org.jboss.cache.RegionManager;
 import org.jboss.cache.RegionManagerImpl;
+import org.jboss.cache.RegionRegistry;
 import org.jboss.cache.commands.remote.ClusteredGetCommand;
 import org.testng.annotations.Test;
 
@@ -35,10 +36,11 @@
 
    public void testRegionalisedStream() throws Exception
    {
-      // need to test what's going on with 
       CacheMarshaller200 cm200 = new CacheMarshaller200();
       c.setUseRegionBasedMarshalling(true);
-      cm200.injectDependencies(new RegionManagerImpl(), c, getClass().getClassLoader());
+      RegionManagerImpl rmi = new RegionManagerImpl();
+      rmi.injectDependencies(null, c, null, null, null, new RegionRegistry());
+      cm200.injectDependencies(rmi, c, getClass().getClassLoader());
       cm200.init();
       ByteArrayOutputStream baos = new ByteArrayOutputStream();
       ObjectOutputStream oos = new ObjectOutputStream(baos);