You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2009/04/28 02:08:57 UTC
svn commit: r769209 - in /geronimo/sandbox/blueprint/blueprint-core/src: main/java/org/apache/geronimo/blueprint/context/ test/java/org/apache/geronimo/blueprint/

Author: gawor
Date: Tue Apr 28 00:08:56 2009
New Revision: 769209

URL: http://svn.apache.org/viewvc?rev=769209&view=rev
Log:
rename ScopedRepository to BlueprintObjectRepository

Added:
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/BlueprintObjectRepository.java   (contents, props changed)
      - copied, changed from r769170, geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/ScopedRepository.java
Removed:
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/ScopedRepository.java
Modified:
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/BlueprintContextImpl.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/BundleScopeServiceFactory.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/Instanciator.java
    geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/WiringTest.java

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/BlueprintContextImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/BlueprintContextImpl.java?rev=769209&r1=769208&r2=769209&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/BlueprintContextImpl.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/BlueprintContextImpl.java Tue Apr 28 00:08:56 2009
@@ -357,7 +357,7 @@
     }
 
     private void destroyComponents() {
-        ((ScopedRepository)objectGraph.getRepository()).destroy();
+        ((BlueprintObjectRepository)objectGraph.getRepository()).destroy();
         
         Map<String, Destroyable> destroyables = new HashMap<String, Destroyable>(this.destroyables);
         this.destroyables.clear();

Copied: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/BlueprintObjectRepository.java (from r769170, geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/ScopedRepository.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/BlueprintObjectRepository.java?p2=geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/BlueprintObjectRepository.java&p1=geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/ScopedRepository.java&r1=769170&r2=769209&rev=769209&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/ScopedRepository.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/BlueprintObjectRepository.java Tue Apr 28 00:08:56 2009
@@ -35,17 +35,17 @@
  * be replaced with resulting objects in the repository. That ensures that a new instance of a object is created
  * for such Recipes during graph instantiation.
  */
-public class ScopedRepository implements Repository {
+public class BlueprintObjectRepository implements Repository {
 
     private SortedMap<String, Object> instances;
     private List<DestroyCallback> destroyList;
 
-    public ScopedRepository() {
+    public BlueprintObjectRepository() {
         instances = new TreeMap<String, Object>();
         destroyList = new ArrayList<DestroyCallback>();
     }
     
-    public ScopedRepository(ScopedRepository source) {
+    public BlueprintObjectRepository(BlueprintObjectRepository source) {
         instances = new TreeMap<String, Object>(source.instances);       
         destroyList = new ArrayList<DestroyCallback>();
     }

Propchange: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/BlueprintObjectRepository.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/BlueprintObjectRepository.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/BlueprintObjectRepository.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/BlueprintObjectRepository.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/BundleScopeServiceFactory.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/BundleScopeServiceFactory.java?rev=769209&r1=769208&r2=769209&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/BundleScopeServiceFactory.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/BundleScopeServiceFactory.java Tue Apr 28 00:08:56 2009
@@ -74,7 +74,7 @@
   
     private Object createInstance() {
         Repository objectRepository = blueprintContext.getObjectGraph().getRepository();
-        ScopedRepository repository = new ScopedRepository((ScopedRepository)objectRepository);
+        BlueprintObjectRepository repository = new BlueprintObjectRepository((BlueprintObjectRepository)objectRepository);
         repository.set(serviceRecipe.getName(), serviceRecipe);
         ObjectGraph graph = new ObjectGraph(repository);
         return graph.create(serviceRecipe.getName());

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/Instanciator.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/Instanciator.java?rev=769209&r1=769208&r2=769209&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/Instanciator.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/Instanciator.java Tue Apr 28 00:08:56 2009
@@ -100,10 +100,10 @@
         }
     }
     
-    public ScopedRepository createRepository(ExtendedComponentDefinitionRegistry registry) throws Exception {
+    public BlueprintObjectRepository createRepository(ExtendedComponentDefinitionRegistry registry) throws Exception {
         this.registry = registry;
 
-        ScopedRepository repository = new ScopedRepository();
+        BlueprintObjectRepository repository = new BlueprintObjectRepository();
         addBuiltinComponents(repository);
         
         // Create component recipes

Modified: geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/WiringTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/WiringTest.java?rev=769209&r1=769208&r2=769209&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/WiringTest.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/WiringTest.java Tue Apr 28 00:08:56 2009
@@ -22,8 +22,8 @@
 import java.net.URI;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import org.apache.geronimo.blueprint.context.BlueprintObjectRepository;
 import org.apache.geronimo.blueprint.context.Instanciator;
-import org.apache.geronimo.blueprint.context.ScopedRepository;
 import org.apache.geronimo.blueprint.namespace.ComponentDefinitionRegistryImpl;
 import org.apache.geronimo.blueprint.pojos.BeanC;
 import org.apache.geronimo.blueprint.pojos.BeanD;
@@ -39,7 +39,7 @@
     public void testWiring() throws Exception {
         ComponentDefinitionRegistryImpl registry = parse("/test-wiring.xml");
         Instanciator i = new Instanciator(new TestBlueprintContext(registry));
-        ScopedRepository repository = i.createRepository(registry);
+        BlueprintObjectRepository repository = i.createRepository(registry);
         ObjectGraph graph = new ObjectGraph(repository);
         
         Object obj1 = graph.create("pojoA");