geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r777968 - in /geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint: BlueprintConstants.java container/BlueprintContainerImpl.java
Date Sat, 23 May 2009 17:26:01 GMT
Author: gnodet
Date: Sat May 23 17:26:01 2009
New Revision: 777968

URL: http://svn.apache.org/viewvc?rev=777968&view=rev
Log:
Rename two internal constants, remove an unused one

Modified:
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/BlueprintConstants.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintContainerImpl.java

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/BlueprintConstants.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/BlueprintConstants.java?rev=777968&r1=777967&r2=777968&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/BlueprintConstants.java
(original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/BlueprintConstants.java
Sat May 23 17:26:01 2009
@@ -28,12 +28,10 @@
     
     public static final String BUNDLE_VERSION = "bundle.version";
     
-    public static final String SERVICE_FILTER = "service.Filter";
-    
     public static final String COMPONENT_NAME_PROPERTY = "osgi.service.blueprint.compname";
     
-    public static final String CONTEXT_SYMBOLIC_NAME_PROPERTY = "osgi.blueprint.container.symbolicname";
-    
-    public static final String CONTEXT_VERSION_PROPERTY = "osgi.blueprint.container.version";
+    public static final String CONTAINER_SYMBOLIC_NAME_PROPERTY = "osgi.blueprint.container.symbolicname";
     
+    public static final String CONTAINER_VERSION_PROPERTY = "osgi.blueprint.container.version";
+
 }

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintContainerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintContainerImpl.java?rev=777968&r1=777967&r2=777968&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintContainerImpl.java
(original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintContainerImpl.java
Sat May 23 17:26:01 2009
@@ -290,9 +290,9 @@
                         // Register the BlueprintContainer in the OSGi registry
                         if (registration == null) {
                             Properties props = new Properties();
-                            props.put(BlueprintConstants.CONTEXT_SYMBOLIC_NAME_PROPERTY,
+                            props.put(BlueprintConstants.CONTAINER_SYMBOLIC_NAME_PROPERTY,
                                       bundleContext.getBundle().getSymbolicName());
-                            props.put(BlueprintConstants.CONTEXT_VERSION_PROPERTY,
+                            props.put(BlueprintConstants.CONTAINER_VERSION_PROPERTY,
                                       bundleContext.getBundle().getHeaders().get(Constants.BUNDLE_VERSION));
                             registration = bundleContext.registerService(BlueprintContainer.class.getName(),
this, props);
                             sender.sendCreated(getBundleContext().getBundle());



Mime
View raw message