felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r786285 - in /felix/trunk/karaf: deployer/blueprint/src/test/resources/ gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/config/ gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/vfs/config/ gshell/gshell-featur...
Date Thu, 18 Jun 2009 21:11:51 GMT
Author: gnodet
Date: Thu Jun 18 21:11:51 2009
New Revision: 786285

URL: http://svn.apache.org/viewvc?rev=786285&view=rev
Log:
Upgrade to latest blueprint spec

Modified:
    felix/trunk/karaf/deployer/blueprint/src/test/resources/test.xml
    felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/config/NamespaceHandler.java
    felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/vfs/config/CacheStrategyConverter.java
    felix/trunk/karaf/gshell/gshell-features/src/main/resources/OSGI-INF/blueprint/gshell-features.xml
    felix/trunk/karaf/gshell/gshell-run/src/main/resources/OSGI-INF/blueprint/gshell-osgi.xml
    felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/NamespaceHandler.java
    felix/trunk/karaf/jaas/jaas-config/src/main/resources/OSGI-INF/blueprint/karaf-jaas.xml

Modified: felix/trunk/karaf/deployer/blueprint/src/test/resources/test.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/deployer/blueprint/src/test/resources/test.xml?rev=786285&r1=786284&r2=786285&view=diff
==============================================================================
--- felix/trunk/karaf/deployer/blueprint/src/test/resources/test.xml (original)
+++ felix/trunk/karaf/deployer/blueprint/src/test/resources/test.xml Thu Jun 18 21:11:51 2009
@@ -54,13 +54,13 @@
     </reference>
 
     <reference id="ref2" interface="org.apache.geronimo.blueprint.sample.InterfaceA" timeout="100">
-        <listener bind-method="bind" unbind-method="unbind" ref="bindingListener" />
+        <reference-listener bind-method="bind" unbind-method="unbind" ref="bindingListener"
/>
     </reference>
 
     <bean id="bindingListener" class="org.apache.geronimo.blueprint.sample.BindingListener"/>
 
     <ref-list id="ref-list" interface="org.apache.geronimo.blueprint.sample.InterfaceA">
-        <listener bind-method="bind" unbind-method="unbind" ref="listBindingListener"
/>
+        <reference-listener bind-method="bind" unbind-method="unbind" ref="listBindingListener"
/>
     </ref-list>
 
     <bean id="listBindingListener" class="org.apache.geronimo.blueprint.sample.BindingListener"/>

Modified: felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/config/NamespaceHandler.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/config/NamespaceHandler.java?rev=786285&r1=786284&r2=786285&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/config/NamespaceHandler.java
(original)
+++ felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/config/NamespaceHandler.java
Thu Jun 18 21:11:51 2009
@@ -182,7 +182,7 @@
 
         MutableServiceMetadata commandService = context.createMetadata(MutableServiceMetadata.class);
         commandService.setId(getName());
-        commandService.addInterfaceName(Command.class.getName());
+        commandService.addInterface(Command.class.getName());
         commandService.setServiceComponent(command);
         context.getComponentDefinitionRegistry().registerComponentDefinition(commandService);
     }
@@ -239,7 +239,7 @@
 
         MutableServiceMetadata linkService = context.createMetadata(MutableServiceMetadata.class);
         linkService.setId(getName());
-        linkService.addInterfaceName(Link.class.getName());
+        linkService.addInterface(Link.class.getName());
         linkService.setServiceComponent(link);
         context.getComponentDefinitionRegistry().registerComponentDefinition(linkService);
     }
@@ -252,7 +252,7 @@
 
         MutableServiceMetadata aliasService = context.createMetadata(MutableServiceMetadata.class);
         aliasService.setId(getName());
-        aliasService.addInterfaceName(Alias.class.getName());
+        aliasService.addInterface(Alias.class.getName());
         aliasService.setServiceComponent(alias);
         context.getComponentDefinitionRegistry().registerComponentDefinition(aliasService);
     }

Modified: felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/vfs/config/CacheStrategyConverter.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/vfs/config/CacheStrategyConverter.java?rev=786285&r1=786284&r2=786285&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/vfs/config/CacheStrategyConverter.java
(original)
+++ felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/vfs/config/CacheStrategyConverter.java
Thu Jun 18 21:11:51 2009
@@ -23,12 +23,12 @@
 
 public class CacheStrategyConverter implements Converter {
 
-    public boolean canConvert(Object o, Class aClass) {
-        return o instanceof String && aClass == CacheStrategy.class;
+    public boolean canConvert(Object o, Object type) {
+        return o instanceof String && type == CacheStrategy.class;
     }
 
-    public Object convert(Object o, Class aClass) throws Exception {
-        if (canConvert(o, aClass)) {
+    public Object convert(Object o, Object type) throws Exception {
+        if (canConvert(o, type)) {
             String text = o.toString();
             if (text.equalsIgnoreCase("MANUAL")) {
                 return CacheStrategy.MANUAL;

Modified: felix/trunk/karaf/gshell/gshell-features/src/main/resources/OSGI-INF/blueprint/gshell-features.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-features/src/main/resources/OSGI-INF/blueprint/gshell-features.xml?rev=786285&r1=786284&r2=786285&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-features/src/main/resources/OSGI-INF/blueprint/gshell-features.xml
(original)
+++ felix/trunk/karaf/gshell/gshell-features/src/main/resources/OSGI-INF/blueprint/gshell-features.xml
Thu Jun 18 21:11:51 2009
@@ -120,7 +120,7 @@
     </bean>
 
     <reference id="mbeanServer" interface="javax.management.MBeanServer" availability="optional">
-        <listener ref="featureServiceRegistry" bind-method="registerMBeanServer" unbind-method="unregisterMBeanServer"/>
+        <reference-listener ref="featureServiceRegistry" bind-method="registerMBeanServer"
unbind-method="unregisterMBeanServer"/>
     </reference>
 
 </blueprint>

Modified: felix/trunk/karaf/gshell/gshell-run/src/main/resources/OSGI-INF/blueprint/gshell-osgi.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-run/src/main/resources/OSGI-INF/blueprint/gshell-osgi.xml?rev=786285&r1=786284&r2=786285&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-run/src/main/resources/OSGI-INF/blueprint/gshell-osgi.xml
(original)
+++ felix/trunk/karaf/gshell/gshell-run/src/main/resources/OSGI-INF/blueprint/gshell-osgi.xml
Thu Jun 18 21:11:51 2009
@@ -38,15 +38,15 @@
     </bean>
 
     <ref-list id="osgiCommands" interface="org.apache.geronimo.gshell.command.Command">
-        <listener ref="osgiCommandRegistry" bind-method="register" unbind-method="unregister"/>
+        <reference-listener ref="osgiCommandRegistry" bind-method="register" unbind-method="unregister"/>
     </ref-list>
 
     <ref-list id="osgiLinkCommands" interface="org.apache.geronimo.gshell.command.Link">
-        <listener ref="osgiCommandRegistry" bind-method="register" unbind-method="unregister"/>
+        <reference-listener ref="osgiCommandRegistry" bind-method="register" unbind-method="unregister"/>
     </ref-list>
 
     <ref-list id="osgiAliases" interface="org.apache.geronimo.gshell.command.Alias">
-        <listener ref="osgiAliasRegistry" bind-method="register" unbind-method="unregister"/>
+        <reference-listener ref="osgiAliasRegistry" bind-method="register" unbind-method="unregister"/>
     </ref-list>
 
     <service ref="localShell" interface="org.apache.geronimo.gshell.shell.Shell"/>

Modified: felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/NamespaceHandler.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/NamespaceHandler.java?rev=786285&r1=786284&r2=786285&view=diff
==============================================================================
--- felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/NamespaceHandler.java
(original)
+++ felix/trunk/karaf/jaas/jaas-config/src/main/java/org/apache/felix/karaf/jaas/config/impl/NamespaceHandler.java
Thu Jun 18 21:11:51 2009
@@ -93,7 +93,7 @@
         MutableServiceMetadata service = context.createMetadata(MutableServiceMetadata.class);
 		service.setId(name);
         service.setServiceComponent(bean);
-        service.addInterfaceName(JaasRealm.class.getName());
+        service.addInterface(JaasRealm.class.getName());
         service.addServiceProperty(createValue(context, ProxyLoginModule.PROPERTY_MODULE),
createValue(context, name));
         return service;
     }
@@ -128,7 +128,7 @@
         MutableServiceMetadata service = context.createMetadata(MutableServiceMetadata.class);
 		service.setId(name);
         service.setServiceComponent(bean);
-        service.addInterfaceName(KeystoreInstance.class.getName());
+        service.addInterface(KeystoreInstance.class.getName());
         return service;
     }
 

Modified: felix/trunk/karaf/jaas/jaas-config/src/main/resources/OSGI-INF/blueprint/karaf-jaas.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/jaas-config/src/main/resources/OSGI-INF/blueprint/karaf-jaas.xml?rev=786285&r1=786284&r2=786285&view=diff
==============================================================================
--- felix/trunk/karaf/jaas/jaas-config/src/main/resources/OSGI-INF/blueprint/karaf-jaas.xml
(original)
+++ felix/trunk/karaf/jaas/jaas-config/src/main/resources/OSGI-INF/blueprint/karaf-jaas.xml
Thu Jun 18 21:11:51 2009
@@ -27,7 +27,7 @@
     <ref-list id="realms"
               interface="org.apache.felix.karaf.jaas.config.JaasRealm"
               availability="optional">
-        <listener ref="config" bind-method="register" unbind-method="unregister" />
+        <reference-listener ref="config" bind-method="register" unbind-method="unregister"
/>
     </ref-list>
 
     <bean id="proxyLoginModuleInitializer" class="org.apache.felix.karaf.jaas.config.impl.ProxyLoginModuleInitializer"
init-method="init">
@@ -41,7 +41,7 @@
     <ref-list id="keystores"
               interface="org.apache.felix.karaf.jaas.config.KeystoreInstance"
               availability="optional">
-        <listener ref="keystoreManager" bind-method="register" unbind-method="unregister"
/>
+        <reference-listener ref="keystoreManager" bind-method="register" unbind-method="unregister"
/>
     </ref-list>
 
     <service interface="org.apache.geronimo.blueprint.NamespaceHandler">



Mime
View raw message