Author: gnodet
Date: Thu Oct 25 02:13:54 2007
New Revision: 588173
URL: http://svn.apache.org/viewvc?rev=588173&view=rev
Log:
Fix xml and add the headers command
Modified:
incubator/servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/resources/META-INF/spring/gshell-commands.xml
incubator/servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/resources/META-INF/spring/gshell-osgi.xml
incubator/servicemix/branches/servicemix-4.0/nmr/src/main/resources/META-INF/spring/servicemix-nmr.xml
Modified:
incubator/servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/resources/META-INF/spring/gshell-commands.xml
URL:
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/resources/META-INF/spring/gshell-commands.xml?rev=588173&r1=588172&r2=588173&view=diff
==============================================================================
---
incubator/servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/resources/META-INF/spring/gshell-commands.xml
(original)
+++
incubator/servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/resources/META-INF/spring/gshell-commands.xml
Thu Oct 25 02:13:54 2007
@@ -28,6 +28,8 @@
<bean id="bundle-level"
class="org.apache.geronimo.gshell.osgi.BundleLevel" />
+ <bean id="headers" class="org.apache.geronimo.gshell.osgi.Headers" />
+
<bean id="list-bundles"
class="org.apache.geronimo.gshell.osgi.ListBundles" />
<bean id="list-services"
class="org.apache.geronimo.gshell.osgi.ListServices" />
Modified:
incubator/servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/resources/META-INF/spring/gshell-osgi.xml
URL:
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/resources/META-INF/spring/gshell-osgi.xml?rev=588173&r1=588172&r2=588173&view=diff
==============================================================================
---
incubator/servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/resources/META-INF/spring/gshell-osgi.xml
(original)
+++
incubator/servicemix/branches/servicemix-4.0/gshell/gshell-osgi/src/main/resources/META-INF/spring/gshell-osgi.xml
Thu Oct 25 02:13:54 2007
@@ -29,6 +29,8 @@
http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi.xsd";>
+ <osgi:service ref="headers"
interface="org.apache.geronimo.gshell.command.Command" />
+
<osgi:service ref="list-bundles"
interface="org.apache.geronimo.gshell.command.Command" />
<osgi:service ref="list-services"
interface="org.apache.geronimo.gshell.command.Command" />
Modified:
incubator/servicemix/branches/servicemix-4.0/nmr/src/main/resources/META-INF/spring/servicemix-nmr.xml
URL:
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/src/main/resources/META-INF/spring/servicemix-nmr.xml?rev=588173&r1=588172&r2=588173&view=diff
==============================================================================
---
incubator/servicemix/branches/servicemix-4.0/nmr/src/main/resources/META-INF/spring/servicemix-nmr.xml
(original)
+++
incubator/servicemix/branches/servicemix-4.0/nmr/src/main/resources/META-INF/spring/servicemix-nmr.xml
Thu Oct 25 02:13:54 2007
@@ -45,7 +45,7 @@
<bean id="flowRegistry"
class="org.apache.servicemix.core.FlowRegistryImpl" />
<osgi:list id="flows"
interface="org.apache.servicemix.api.internal.Flow"
- mandatory="false">
+ cardinality="0..N">
<osgi:listener ref="flowRegistry" bind-method="register"
unbind-method="unregister" />
</osgi:list>
@@ -53,7 +53,7 @@
<bean id="listenerRegistry"
class="org.apache.servicemix.core.ListenerRegistryImpl" />
<osgi:list id="listeners"
interface="org.apache.servicemix.api.event.Listener"
- mandatory="false">
+ cardinality="0..N">
<osgi:listener ref="listenerRegistry" bind-method="register"
unbind-method="unregister" />
</osgi:list>
@@ -63,7 +63,7 @@
</bean>
<osgi:list id="endpoints"
interface="org.apache.servicemix.api.Endpoint"
- mandatory="false">
+ cardinality="0..N">
<osgi:listener ref="endpointRegistry" bind-method="register"
unbind-method="unregister" />
</osgi:list>
