You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by gn...@apache.org on 2009/07/02 09:04:21 UTC
svn commit: r790473 - in /felix/trunk/karaf:
deployer/blueprint/src/test/resources/
deployer/features/src/main/resources/OSGI-INF/blueprint/
gshell/gshell-run/src/main/resources/OSGI-INF/blueprint/
jaas/jaas-config/src/main/resources/OSGI-INF/blueprint/
Author: gnodet
Date: Thu Jul 2 07:04:21 2009
New Revision: 790473
URL: http://svn.apache.org/viewvc?rev=790473&view=rev
Log:
Fix karaf wrt latest blueprint schema
Modified:
felix/trunk/karaf/deployer/blueprint/src/test/resources/test.xml
felix/trunk/karaf/deployer/features/src/main/resources/OSGI-INF/blueprint/features-deployer.xml
felix/trunk/karaf/gshell/gshell-run/src/main/resources/OSGI-INF/blueprint/gshell-osgi.xml
felix/trunk/karaf/gshell/gshell-run/src/main/resources/OSGI-INF/blueprint/gshell.xml
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=790473&r1=790472&r2=790473&view=diff
==============================================================================
--- felix/trunk/karaf/deployer/blueprint/src/test/resources/test.xml (original)
+++ felix/trunk/karaf/deployer/blueprint/src/test/resources/test.xml Thu Jul 2 07:04:21 2009
@@ -59,9 +59,9 @@
<bean id="bindingListener" class="org.apache.geronimo.blueprint.sample.BindingListener"/>
- <ref-list id="ref-list" interface="org.apache.geronimo.blueprint.sample.InterfaceA">
+ <reference-list id="ref-list" interface="org.apache.geronimo.blueprint.sample.InterfaceA">
<reference-listener bind-method="bind" unbind-method="unbind" ref="listBindingListener" />
- </ref-list>
+ </reference-list>
<bean id="listBindingListener" class="org.apache.geronimo.blueprint.sample.BindingListener"/>
Modified: felix/trunk/karaf/deployer/features/src/main/resources/OSGI-INF/blueprint/features-deployer.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/deployer/features/src/main/resources/OSGI-INF/blueprint/features-deployer.xml?rev=790473&r1=790472&r2=790473&view=diff
==============================================================================
--- felix/trunk/karaf/deployer/features/src/main/resources/OSGI-INF/blueprint/features-deployer.xml (original)
+++ felix/trunk/karaf/deployer/features/src/main/resources/OSGI-INF/blueprint/features-deployer.xml Thu Jul 2 07:04:21 2009
@@ -24,7 +24,7 @@
ref="featureDeploymentListener"/>
<bean id="featureDeploymentListener" class="org.apache.felix.karaf.deployer.features.FeatureDeploymentListener"
- init-method="init" destroy-method="destroy" initialization="lazy">
+ init-method="init" destroy-method="destroy" activation="lazy">
<property name="bundleContext" ref="blueprintBundleContext"/>
<property name="featuresService">
<reference interface="org.apache.felix.karaf.gshell.features.FeaturesService"/>
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=790473&r1=790472&r2=790473&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 Jul 2 07:04:21 2009
@@ -37,17 +37,17 @@
<argument ref="aliasRegistry"/>
</bean>
- <ref-list id="osgiCommands" interface="org.apache.geronimo.gshell.command.Command">
+ <reference-list id="osgiCommands" interface="org.apache.geronimo.gshell.command.Command">
<reference-listener ref="osgiCommandRegistry" bind-method="register" unbind-method="unregister"/>
- </ref-list>
+ </reference-list>
- <ref-list id="osgiLinkCommands" interface="org.apache.geronimo.gshell.command.Link">
+ <reference-list id="osgiLinkCommands" interface="org.apache.geronimo.gshell.command.Link">
<reference-listener ref="osgiCommandRegistry" bind-method="register" unbind-method="unregister"/>
- </ref-list>
+ </reference-list>
- <ref-list id="osgiAliases" interface="org.apache.geronimo.gshell.command.Alias">
+ <reference-list id="osgiAliases" interface="org.apache.geronimo.gshell.command.Alias">
<reference-listener ref="osgiAliasRegistry" bind-method="register" unbind-method="unregister"/>
- </ref-list>
+ </reference-list>
<service ref="localShell" interface="org.apache.geronimo.gshell.shell.Shell"/>
Modified: felix/trunk/karaf/gshell/gshell-run/src/main/resources/OSGI-INF/blueprint/gshell.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-run/src/main/resources/OSGI-INF/blueprint/gshell.xml?rev=790473&r1=790472&r2=790473&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-run/src/main/resources/OSGI-INF/blueprint/gshell.xml (original)
+++ felix/trunk/karaf/gshell/gshell-run/src/main/resources/OSGI-INF/blueprint/gshell.xml Thu Jul 2 07:04:21 2009
@@ -19,15 +19,19 @@
-->
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
- <bean id="io" class="org.apache.geronimo.gshell.io.IO">
+ <bean id="io"
+ class="org.apache.geronimo.gshell.io.IO">
<property name="verbosity" value="DEBUG"/>
</bean>
- <bean id="branding" class="org.apache.felix.karaf.gshell.core.DefaultBranding">
+ <bean id="branding"
+ class="org.apache.felix.karaf.gshell.core.DefaultBranding">
<property name="prompt" value="@|bold %{gshell.username}|@%{application.id}:@|bold %{gshell.group}|> " />
</bean>
- <bean id="application" class="org.apache.felix.karaf.gshell.core.ApplicationImpl" init-method="init">
+ <bean id="application"
+ class="org.apache.felix.karaf.gshell.core.ApplicationImpl"
+ init-method="init">
<property name="id" value="$[karaf.name]"/>
<property name="io" ref="io"/>
<property name="model">
@@ -40,45 +44,59 @@
</property>
</bean>
- <bean id="beanContainer" class="org.apache.felix.karaf.gshell.core.BeanContainerWrapper">
+ <bean id="beanContainer"
+ class="org.apache.felix.karaf.gshell.core.BeanContainerWrapper">
<argument ref="blueprintContainer"/>
</bean>
- <bean id="eventManager" class="org.apache.geronimo.gshell.event.EventManagerImpl"/>
+ <bean id="eventManager"
+ class="org.apache.geronimo.gshell.event.EventManagerImpl"/>
- <bean id="applicationManager" class="org.apache.felix.karaf.gshell.core.ApplicationManagerImpl" init-method="init" destroy-method="destroy">
+ <bean id="applicationManager"
+ class="org.apache.felix.karaf.gshell.core.ApplicationManagerImpl"
+ init-method="init"
+ destroy-method="destroy">
<argument ref="eventManager" />
<argument ref="application" />
<argument ref="blueprintContainer"/>
</bean>
- <bean id="commandLineParser" class="org.apache.geronimo.gshell.parser.CommandLineParser"/>
+ <bean id="commandLineParser"
+ class="org.apache.geronimo.gshell.parser.CommandLineParser"/>
- <bean id="aliasRegistry" class="org.apache.geronimo.gshell.wisdom.registry.AliasRegistryImpl">
+ <bean id="aliasRegistry"
+ class="org.apache.geronimo.gshell.wisdom.registry.AliasRegistryImpl">
<argument ref="eventManager"/>
</bean>
- <bean id="aliasMetaMapper" class="org.apache.geronimo.gshell.wisdom.registry.AliasMetaMapper" init-method="init">
+ <bean id="aliasMetaMapper"
+ class="org.apache.geronimo.gshell.wisdom.registry.AliasMetaMapper"
+ init-method="init">
<argument ref="eventManager"/>
<argument ref="metaDataRegistry"/>
<argument ref="aliasRegistry"/>
</bean>
- <bean id="commandRegistry" class="org.apache.geronimo.gshell.wisdom.registry.CommandRegistryImpl">
+ <bean id="commandRegistry"
+ class="org.apache.geronimo.gshell.wisdom.registry.CommandRegistryImpl">
<argument ref="eventManager"/>
</bean>
- <bean id="commandMetaMapper" class="org.apache.geronimo.gshell.wisdom.registry.CommandMetaMapper" init-method="init">
+ <bean id="commandMetaMapper"
+ class="org.apache.geronimo.gshell.wisdom.registry.CommandMetaMapper"
+ init-method="init">
<argument ref="eventManager"/>
<argument ref="metaDataRegistry"/>
<argument ref="commandRegistry"/>
</bean>
- <bean id="groupDirResolver" class="org.apache.geronimo.gshell.wisdom.registry.GroupDirectoryResolver">
+ <bean id="groupDirResolver"
+ class="org.apache.geronimo.gshell.wisdom.registry.GroupDirectoryResolver">
<argument ref="fileSystemAccess"/>
</bean>
- <bean id="commandResolver" class="org.apache.felix.karaf.gshell.core.CommandResolverImpl">
+ <bean id="commandResolver"
+ class="org.apache.felix.karaf.gshell.core.CommandResolverImpl">
<argument ref="fileSystemAccess"/>
<argument ref="groupDirResolver"/>
<property name="beanContainer" ref="beanContainer"/>
@@ -90,12 +108,16 @@
</property>
</bean>
- <bean id="aliasCommandPrototype" class="org.apache.felix.karaf.gshell.core.WorkAroundAliasCommand" scope="prototype">
+ <bean id="aliasCommandPrototype"
+ class="org.apache.felix.karaf.gshell.core.WorkAroundAliasCommand"
+ scope="prototype">
<argument ref="commandLineExecutor"/>
<property name="beanContainer" ref="beanContainer"/>
</bean>
- <bean id="groupCommandPrototype" class="org.apache.geronimo.gshell.wisdom.command.GroupCommand" scope="prototype">
+ <bean id="groupCommandPrototype"
+ class="org.apache.geronimo.gshell.wisdom.command.GroupCommand"
+ scope="prototype">
<property name="beanContainer" ref="beanContainer"/>
</bean>
@@ -103,12 +125,16 @@
<argument ref="commandLineParser"/>
</bean>
- <bean id="commandLineExecutor" class="org.apache.geronimo.gshell.wisdom.shell.CommandLineExecutorImpl">
+ <bean id="commandLineExecutor"
+ class="org.apache.geronimo.gshell.wisdom.shell.CommandLineExecutorImpl">
<argument ref="commandResolver"/>
<argument ref="commandLineBuilder"/>
</bean>
- <bean id="shell" class="org.apache.geronimo.gshell.wisdom.shell.ShellImpl" scope="prototype" init-method="init" destroy-method="close">
+ <bean id="shell"
+ class="org.apache.geronimo.gshell.wisdom.shell.ShellImpl"
+ scope="prototype"
+ init-method="init">
<argument ref="application"/>
<argument ref="commandLineExecutor"/>
@@ -133,24 +159,33 @@
</property>
</bean>
- <bean id="commandNameCompleter" class="org.apache.geronimo.gshell.wisdom.completer.CommandNameCompleter"
- initialization="lazy" init-method="init">
+ <bean id="commandNameCompleter"
+ class="org.apache.geronimo.gshell.wisdom.completer.CommandNameCompleter"
+ activation="lazy"
+ init-method="init">
<argument ref="eventManager"/>
<argument ref="commandRegistry"/>
</bean>
- <bean id="aliasNameCompleter" class="org.apache.geronimo.gshell.wisdom.completer.AliasNameCompleter"
- initialization="lazy" init-method="init">
+ <bean id="aliasNameCompleter"
+ class="org.apache.geronimo.gshell.wisdom.completer.AliasNameCompleter"
+ activation="lazy"
+ init-method="init">
<argument ref="eventManager"/>
<argument ref="aliasRegistry"/>
</bean>
- <bean id="commandsCompleter" class="org.apache.geronimo.gshell.wisdom.completer.CommandsCompleter" initialization="lazy" init-method="init">
+ <bean id="commandsCompleter"
+ class="org.apache.geronimo.gshell.wisdom.completer.CommandsCompleter"
+ activation="lazy"
+ init-method="init">
<argument ref="eventManager"/>
<argument ref="commandRegistry"/>
</bean>
- <bean id="variableNameCompleter" class="org.apache.geronimo.gshell.wisdom.completer.VariableNameCompleter" initialization="lazy">
+ <bean id="variableNameCompleter"
+ class="org.apache.geronimo.gshell.wisdom.completer.VariableNameCompleter"
+ activation="lazy">
</bean>
</blueprint>
\ No newline at end of file
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=790473&r1=790472&r2=790473&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 Jul 2 07:04:21 2009
@@ -24,11 +24,11 @@
init-method="init"
destroy-method="close"/>
- <ref-list id="realms"
- interface="org.apache.felix.karaf.jaas.config.JaasRealm"
- availability="optional">
+ <reference-list id="realms"
+ interface="org.apache.felix.karaf.jaas.config.JaasRealm"
+ availability="optional">
<reference-listener ref="config" bind-method="register" unbind-method="unregister" />
- </ref-list>
+ </reference-list>
<bean id="proxyLoginModuleInitializer" class="org.apache.felix.karaf.jaas.config.impl.ProxyLoginModuleInitializer" init-method="init">
<property name="bundleContext" ref="blueprintBundleContext"/>
@@ -38,11 +38,11 @@
<bean id="keystoreManager" class="org.apache.felix.karaf.jaas.config.impl.OsgiKeystoreManager" />
<service ref="keystoreManager" interface="org.apache.felix.karaf.jaas.config.KeystoreManager" />
- <ref-list id="keystores"
- interface="org.apache.felix.karaf.jaas.config.KeystoreInstance"
- availability="optional">
+ <reference-list id="keystores"
+ interface="org.apache.felix.karaf.jaas.config.KeystoreInstance"
+ availability="optional">
<reference-listener ref="keystoreManager" bind-method="register" unbind-method="unregister" />
- </ref-list>
+ </reference-list>
<service interface="org.apache.geronimo.blueprint.NamespaceHandler">
<service-properties>