felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r887878 - in /felix/trunk/scr/src/main: java/org/apache/felix/scr/impl/ScrCommand.java java/org/apache/felix/scr/impl/config/ScrConfiguration.java resources/OSGI-INF/metatype/metatype.properties
Date Mon, 07 Dec 2009 10:49:57 GMT
Author: fmeschbe
Date: Mon Dec  7 10:49:56 2009
New Revision: 887878

URL: http://svn.apache.org/viewvc?rev=887878&view=rev
Log:
FELIX-1893 Remove ds.rebind.enabled configuration (not needed anymore since we now have a
descriptor provided optional updated method)

Modified:
    felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/ScrCommand.java
    felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ScrConfiguration.java
    felix/trunk/scr/src/main/resources/OSGI-INF/metatype/metatype.properties

Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/ScrCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/ScrCommand.java?rev=887878&r1=887877&r2=887878&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/ScrCommand.java (original)
+++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/ScrCommand.java Mon Dec  7 10:49:56
2009
@@ -355,7 +355,6 @@
         out.print( "Component Factory with Factory Configuration: " );
         out.println( scrConfiguration.isFactoryEnabled() ? "Supported" : "Unsupported" );
         out.print( "Update bound Service Properties: " );
-        out.println( scrConfiguration.isRebindEnabled() ? "Yes" : "No" );
     }
 
 

Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ScrConfiguration.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ScrConfiguration.java?rev=887878&r1=887877&r2=887878&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ScrConfiguration.java (original)
+++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ScrConfiguration.java Mon
Dec  7 10:49:56 2009
@@ -45,8 +45,6 @@
 
     private static final String PROP_FACTORY_ENABLED = "ds.factory.enabled";
 
-    private static final String PROP_REBIND_ENABLED = "ds.rebind.enabled";
-
     private static final String PROP_LOGLEVEL = "ds.loglevel";
 
     private static final String LOG_LEVEL_DEBUG = "debug";
@@ -116,13 +114,11 @@
 
             logLevel = getLogLevel( bundleContext );
             factoryEnabled = VALUE_TRUE.equals( bundleContext.getProperty( PROP_FACTORY_ENABLED
) );
-            rebindEnabled = VALUE_TRUE.equals( bundleContext.getProperty( PROP_REBIND_ENABLED
) );
         }
         else
         {
             logLevel = ( ( Integer ) config.get( PROP_LOGLEVEL ) ).intValue();
             factoryEnabled = ( ( Boolean ) config.get( PROP_FACTORY_ENABLED ) ).booleanValue();
-            rebindEnabled = ( ( Boolean ) config.get( PROP_REBIND_ENABLED ) ).booleanValue();
         }
     }
 
@@ -139,12 +135,6 @@
     }
 
 
-    public boolean isRebindEnabled()
-    {
-        return rebindEnabled;
-    }
-
-
     private static int getLogLevel( BundleContext bundleContext )
     {
         String levelString = bundleContext.getProperty( PROP_LOGLEVEL );

Modified: felix/trunk/scr/src/main/resources/OSGI-INF/metatype/metatype.properties
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=887878&r1=887877&r2=887878&view=diff
==============================================================================
--- felix/trunk/scr/src/main/resources/OSGI-INF/metatype/metatype.properties (original)
+++ felix/trunk/scr/src/main/resources/OSGI-INF/metatype/metatype.properties Mon Dec  7 10:49:56
2009
@@ -40,10 +40,3 @@
  Declarative Services specification. Reliance on this feature prevent the \
  component from being used with other Declarative Services implementations. \
  The default value is false to disable this feature.
-
-ds.rebind.enabled.name = Rebind Support
-ds.rebind.enabled.description = Whether or not to enable support for rebinding \
- of bound services whose registration properties have been modified. This is \
- an Apache Felix SCR specific extension filling the gap of the specification \
- which does not desribe whether and how such property updates should be \
- propagated. The default value is false to disable this feature.



Mime
View raw message