Author: manik.surtani(a)jboss.com Date: 2008-05-09 07:21:17 -0400 (Fri, 09 May 2008) New Revision: 5814 Modified: core/trunk/src/main/java/org/jboss/cache/DefaultCacheFactory.java core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.java core/trunk/src/test/java/org/jboss/cache/api/pfer/PutForExternalReadTestBase.java Log: Fixed breakages Modified: core/trunk/src/main/java/org/jboss/cache/DefaultCacheFactory.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/DefaultCacheFactory.java 2008-05-08 16:36:55 UTC (rev 5813) +++ core/trunk/src/main/java/org/jboss/cache/DefaultCacheFactory.java 2008-05-09 11:21:17 UTC (rev 5814) @@ -21,9 +21,6 @@ * This is a special instance of a {@link ComponentFactory} which contains bootstrap information for the * {@link org.jboss.cache.factories.ComponentRegistry}. * <p/> - * E.g., {@link #bootstrap(LifecycleManager , CacheSPI, org.jboss.cache.config.Configuration)} is used to create a cache, a - * {@link org.jboss.cache.factories.ComponentRegistry}, and then wire dependencies as needed. - * <p/> * In JBoss Cache 2.0.x, this was a singleton and you had to use {@link #getInstance()} to obtain an instance. From * JBoss Cache 2.1.x onwards, this is no longer a singleton and you can use the default no-arg constructor to obtain * a reference. {@link #getInstance()} has been deprecated and modified to return a new instance of this class. @@ -130,7 +127,6 @@ this.configuration = configuration; componentRegistry.registerComponent(spi, CacheSPI.class); - componentRegistry.wire(); } /** Modified: core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.java 2008-05-08 16:36:55 UTC (rev 5813) +++ core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.java 2008-05-09 11:21:17 UTC (rev 5814) @@ -460,14 +460,6 @@ } /** - * Marks state as wired. Used by the DefaultCacheFactory after it has added the BootstrapFactory and CacheSPI components. - */ - public void wire() - { - state = CacheStatus.CREATED; - } - - /** * Rewires components. Can only be called if the current state is WIRED or STARTED. */ public void rewire() Modified: core/trunk/src/test/java/org/jboss/cache/api/pfer/PutForExternalReadTestBase.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/pfer/PutForExternalReadTestBase.java 2008-05-08 16:36:55 UTC (rev 5813) +++ core/trunk/src/test/java/org/jboss/cache/api/pfer/PutForExternalReadTestBase.java 2008-05-09 11:21:17 UTC (rev 5814) @@ -250,6 +250,7 @@ TestingUtil.extractComponentRegistry(cache1).registerComponent(barfingRpcManager, RPCManager.class); cache1.getConfiguration().getRuntimeConfig().setRPCManager(barfingRpcManager); + TestingUtil.extractComponentRegistry(cache1).rewire(); try {