geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r777641 - in /geronimo/sandbox/blueprint: blueprint-api/src/main/java/org/osgi/service/blueprint/container/BlueprintContainer.java blueprint-cm/src/main/java/org/apache/geronimo/blueprint/compendium/cm/CmManagedServiceFactory.java
Date Fri, 22 May 2009 18:14:14 GMT
Author: gnodet
Date: Fri May 22 18:14:14 2009
New Revision: 777641

URL: http://svn.apache.org/viewvc?rev=777641&view=rev
Log:
Remove the constants that do not belong to the BlueprintContainer interface

Modified:
    geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/BlueprintContainer.java
    geronimo/sandbox/blueprint/blueprint-cm/src/main/java/org/apache/geronimo/blueprint/compendium/cm/CmManagedServiceFactory.java

Modified: geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/BlueprintContainer.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/BlueprintContainer.java?rev=777641&r1=777640&r2=777641&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/BlueprintContainer.java
(original)
+++ geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/container/BlueprintContainer.java
Fri May 22 18:14:14 2009
@@ -24,10 +24,6 @@
 
 public interface BlueprintContainer {
     
-    static final int CONFIGURATION_ADMIN_OBJECT_DELETED = 1;
-   
-    static final int BUNDLE_STOPPING = 2;
-
     Set<String> getComponentIds();
 
     Object getComponentInstance(String id) throws NoSuchComponentException;

Modified: geronimo/sandbox/blueprint/blueprint-cm/src/main/java/org/apache/geronimo/blueprint/compendium/cm/CmManagedServiceFactory.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-cm/src/main/java/org/apache/geronimo/blueprint/compendium/cm/CmManagedServiceFactory.java?rev=777641&r1=777640&r2=777641&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-cm/src/main/java/org/apache/geronimo/blueprint/compendium/cm/CmManagedServiceFactory.java
(original)
+++ geronimo/sandbox/blueprint/blueprint-cm/src/main/java/org/apache/geronimo/blueprint/compendium/cm/CmManagedServiceFactory.java
Fri May 22 18:14:14 2009
@@ -53,6 +53,10 @@
  */
 public class CmManagedServiceFactory {
 
+    static final int CONFIGURATION_ADMIN_OBJECT_DELETED = 1;
+
+    static final int BUNDLE_STOPPING = 2;
+
     private static final Logger LOGGER = LoggerFactory.getLogger(CmManagedServiceFactory.class);
     
     private BlueprintContainerImpl blueprintContainer;
@@ -99,7 +103,7 @@
             registration.unregister();
         }
         for (Map.Entry<ServiceRegistration, Object> entry : services.entrySet()) {
-            destroyComponent(entry.getValue(), BlueprintContainer.BUNDLE_STOPPING);
+            destroyComponent(entry.getValue(), BUNDLE_STOPPING);
             entry.getKey().unregister();
         }
         services.clear();
@@ -213,7 +217,7 @@
         if (reg != null) {
             // TODO: destroy instance, etc...
             Object component = services.remove(reg);
-            destroyComponent(component, BlueprintContainer.CONFIGURATION_ADMIN_OBJECT_DELETED);
+            destroyComponent(component, CONFIGURATION_ADMIN_OBJECT_DELETED);
             reg.unregister();
         }
     }



Mime
View raw message