You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2007/12/07 14:24:26 UTC
svn commit: r602092 - in /servicemix/branches/servicemix-4.0/runtime/gshell:
gshell-core/src/main/resources/META-INF/spring/
gshell-obr/src/main/resources/META-INF/spring/
gshell-osgi/src/main/resources/META-INF/spring/
Author: gnodet
Date: Fri Dec 7 05:24:24 2007
New Revision: 602092
URL: http://svn.apache.org/viewvc?rev=602092&view=rev
Log:
Improve subshells a bit
Modified:
servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-osgi.xml
servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/resources/META-INF/spring/gshell.xml
servicemix/branches/servicemix-4.0/runtime/gshell/gshell-obr/src/main/resources/META-INF/spring/gshell-obr.xml
servicemix/branches/servicemix-4.0/runtime/gshell/gshell-osgi/src/main/resources/META-INF/spring/gshell-osgi.xml
Modified: servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-osgi.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-osgi.xml?rev=602092&r1=602091&r2=602092&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-osgi.xml (original)
+++ servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-osgi.xml Fri Dec 7 05:24:24 2007
@@ -36,47 +36,54 @@
<osgi:listener ref="commandRegistry" bind-method="register" unbind-method="unregister" />
</osgi:list>
- <osgi:list id="smxCommands" interface="org.apache.geronimo.gshell.command.Command">
- <osgi:listener ref="layoutManager" bind-method="register" unbind-method="unregister" />
- </osgi:list>
-
- <osgi:service ref="subShell" interface="org.apache.geronimo.gshell.osgi.SubShell"/>
-
<osgi:service ref="clear" interface="org.apache.geronimo.gshell.command.Command">
- <osgi:service-properties><entry key="shell" value="smx"/></osgi:service-properties>
+ <osgi:service-properties>
+ <entry key="alias" value="clear"/>
+ </osgi:service-properties>
</osgi:service>
<osgi:service ref="help" interface="org.apache.geronimo.gshell.command.Command">
<osgi:service-properties>
- <entry key="shell" value="smx"/>
<entry key="alias" value="help,?"/>
</osgi:service-properties>
</osgi:service>
<osgi:service ref="exit" interface="org.apache.geronimo.gshell.command.Command">
- <osgi:service-properties><entry key="shell" value="smx"/></osgi:service-properties>
+ <osgi:service-properties>
+ <entry key="alias" value="exit"/>
+ </osgi:service-properties>
</osgi:service>
<osgi:service ref="set" interface="org.apache.geronimo.gshell.command.Command">
- <osgi:service-properties><entry key="shell" value="smx"/></osgi:service-properties>
+ <osgi:service-properties>
+ <entry key="alias" value="set"/>
+ </osgi:service-properties>
</osgi:service>
<osgi:service ref="unset" interface="org.apache.geronimo.gshell.command.Command">
- <osgi:service-properties><entry key="shell" value="smx"/></osgi:service-properties>
+ <osgi:service-properties>
+ <entry key="alias" value="unset"/>
+ </osgi:service-properties>
</osgi:service>
<osgi:service ref="source" interface="org.apache.geronimo.gshell.command.Command">
<osgi:service-properties>
- <entry key="shell" value="smx"/>
<entry key="alias" value="source,."/>
</osgi:service-properties>
</osgi:service>
<osgi:service ref="echo" interface="org.apache.geronimo.gshell.command.Command">
- <osgi:service-properties><entry key="shell" value="smx"/></osgi:service-properties>
+ <osgi:service-properties>
+ <entry key="alias" value="echo"/>
+ </osgi:service-properties>
</osgi:service>
- <osgi:service ref="rsh" interface="org.apache.geronimo.gshell.command.Command" />
+ <osgi:service ref="rsh" interface="org.apache.geronimo.gshell.command.Command">
+ <osgi:service-properties>
+ <entry key="shell" value="remote"/>
+ <entry key="alias" value="rsh"/>
+ </osgi:service-properties>
+ </osgi:service>
<osgix:property-placeholder persistent-id="org.apache.servicemix.shell">
<osgix:default-properties>
Modified: servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/resources/META-INF/spring/gshell.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/resources/META-INF/spring/gshell.xml?rev=602092&r1=602091&r2=602092&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/resources/META-INF/spring/gshell.xml (original)
+++ servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/resources/META-INF/spring/gshell.xml Fri Dec 7 05:24:24 2007
@@ -62,17 +62,8 @@
<constructor-arg ref="branding" />
</bean>
- <bean id="layoutManager" class="org.apache.geronimo.gshell.spring.OsgiLayoutManager">
- <property name="shell" value="smx" />
- </bean>
-
<bean id="commandRegistry" class="org.apache.geronimo.gshell.spring.SpringCommandRegistry">
<constructor-arg ref="environment" />
- <property name="groupAliases">
- <map>
- <entry key="gshell-builtins" value="" />
- </map>
- </property>
</bean>
<bean id="commandLineBuilder" class="org.apache.geronimo.gshell.spring.SpringCommandLineBuilder">
@@ -93,10 +84,4 @@
</property>
</bean>
- <bean id="subShell" class="org.apache.geronimo.gshell.spring.OsgiSubShell">
- <property name="commandRegistry" ref="commandRegistry"/>
- <property name="osgiLayoutManager" ref="layoutManager"/>
- <property name="terminal" ref="terminal"/>
- </bean>
-
</beans>
Modified: servicemix/branches/servicemix-4.0/runtime/gshell/gshell-obr/src/main/resources/META-INF/spring/gshell-obr.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/gshell/gshell-obr/src/main/resources/META-INF/spring/gshell-obr.xml?rev=602092&r1=602091&r2=602092&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/runtime/gshell/gshell-obr/src/main/resources/META-INF/spring/gshell-obr.xml (original)
+++ servicemix/branches/servicemix-4.0/runtime/gshell/gshell-obr/src/main/resources/META-INF/spring/gshell-obr.xml Fri Dec 7 05:24:24 2007
@@ -45,20 +45,60 @@
<bean id="start" class="org.apache.geronimo.gshell.obr.StartCommand" />
- <osgi:service ref="addUrl" interface="org.apache.geronimo.gshell.command.Command" />
-
- <osgi:service ref="deploy" interface="org.apache.geronimo.gshell.command.Command" />
-
- <osgi:service ref="info" interface="org.apache.geronimo.gshell.command.Command" />
-
- <osgi:service ref="list" interface="org.apache.geronimo.gshell.command.Command" />
-
- <osgi:service ref="listUrl" interface="org.apache.geronimo.gshell.command.Command" />
-
- <osgi:service ref="removeUrl" interface="org.apache.geronimo.gshell.command.Command" />
-
- <osgi:service ref="source" interface="org.apache.geronimo.gshell.command.Command" />
-
- <osgi:service ref="start" interface="org.apache.geronimo.gshell.command.Command" />
+ <osgi:service ref="addUrl" interface="org.apache.geronimo.gshell.command.Command">
+ <osgi:service-properties>
+ <entry key="shell" value="obr"/>
+ <entry key="alias" value="addUrl"/>
+ </osgi:service-properties>
+ </osgi:service>
+
+ <osgi:service ref="deploy" interface="org.apache.geronimo.gshell.command.Command">
+ <osgi:service-properties>
+ <entry key="shell" value="obr"/>
+ <entry key="alias" value="deploy"/>
+ </osgi:service-properties>
+ </osgi:service>
+
+ <osgi:service ref="info" interface="org.apache.geronimo.gshell.command.Command">
+ <osgi:service-properties>
+ <entry key="shell" value="obr"/>
+ <entry key="alias" value="info"/>
+ </osgi:service-properties>
+ </osgi:service>
+
+ <osgi:service ref="list" interface="org.apache.geronimo.gshell.command.Command">
+ <osgi:service-properties>
+ <entry key="shell" value="obr"/>
+ <entry key="alias" value="list"/>
+ </osgi:service-properties>
+ </osgi:service>
+
+ <osgi:service ref="listUrl" interface="org.apache.geronimo.gshell.command.Command">
+ <osgi:service-properties>
+ <entry key="shell" value="obr"/>
+ <entry key="alias" value="listUrl"/>
+ </osgi:service-properties>
+ </osgi:service>
+
+ <osgi:service ref="removeUrl" interface="org.apache.geronimo.gshell.command.Command">
+ <osgi:service-properties>
+ <entry key="shell" value="obr"/>
+ <entry key="alias" value="removeUrl"/>
+ </osgi:service-properties>
+ </osgi:service>
+
+ <osgi:service ref="source" interface="org.apache.geronimo.gshell.command.Command">
+ <osgi:service-properties>
+ <entry key="shell" value="obr"/>
+ <entry key="alias" value="source"/>
+ </osgi:service-properties>
+ </osgi:service>
+
+ <osgi:service ref="start" interface="org.apache.geronimo.gshell.command.Command">
+ <osgi:service-properties>
+ <entry key="shell" value="obr"/>
+ <entry key="alias" value="start"/>
+ </osgi:service-properties>
+ </osgi:service>
</beans>
Modified: servicemix/branches/servicemix-4.0/runtime/gshell/gshell-osgi/src/main/resources/META-INF/spring/gshell-osgi.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/gshell/gshell-osgi/src/main/resources/META-INF/spring/gshell-osgi.xml?rev=602092&r1=602091&r2=602092&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/runtime/gshell/gshell-osgi/src/main/resources/META-INF/spring/gshell-osgi.xml (original)
+++ servicemix/branches/servicemix-4.0/runtime/gshell/gshell-osgi/src/main/resources/META-INF/spring/gshell-osgi.xml Fri Dec 7 05:24:24 2007
@@ -29,15 +29,6 @@
http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi.xsd">
- <!-- osgi sub shell -->
- <osgi:reference id="subShell" interface="org.apache.geronimo.gshell.osgi.SubShell"/>
- <bean id="osgi" class="org.apache.geronimo.gshell.osgi.OsgiShell">
- <property name="subShell" ref="subShell"/>
- </bean>
- <osgi:service ref="osgi" interface="org.apache.geronimo.gshell.command.Command">
- <osgi:service-properties><entry key="shell" value="smx"/></osgi:service-properties>
- </osgi:service>
-
<!-- osgi commands -->
<bean id="bundle-level" class="org.apache.geronimo.gshell.osgi.BundleLevel" />
<bean id="headers" class="org.apache.geronimo.gshell.osgi.Headers" />
@@ -52,126 +43,87 @@
<bean id="stop-bundle" class="org.apache.geronimo.gshell.osgi.StopBundle" />
<bean id="uninstall-bundle" class="org.apache.geronimo.gshell.osgi.UninstallBundle" />
- <!-- general commands -->
- <bean id="clear" class="org.apache.geronimo.gshell.commands.builtins.ClearCommand" />
- <bean id="echo" class="org.apache.geronimo.gshell.commands.builtins.EchoCommand" />
- <bean id="exit" class="org.apache.geronimo.gshell.commands.builtins.ExitCommand" />
- <bean id="help" class="org.apache.geronimo.gshell.spring.SubShellHelpCommand"/>
- <bean id="set" class="org.apache.geronimo.gshell.commands.builtins.SetCommand" />
- <bean id="source" class="org.apache.geronimo.gshell.commands.builtins.SourceCommand" />
- <bean id="unset" class="org.apache.geronimo.gshell.commands.builtins.UnsetCommand" />
-
<osgi:service ref="bundle-level" interface="org.apache.geronimo.gshell.command.Command">
<osgi:service-properties>
<entry key="shell" value="osgi"/>
- <entry key="alias" value="bundle-level"/>
+ <entry key="name" value="bundle-level"/>
</osgi:service-properties>
</osgi:service>
<osgi:service ref="headers" interface="org.apache.geronimo.gshell.command.Command">
- <osgi:service-properties><entry key="shell" value="osgi"/></osgi:service-properties>
+ <osgi:service-properties>
+ <entry key="shell" value="osgi"/>
+ </osgi:service-properties>
</osgi:service>
<osgi:service ref="install-bundle" interface="org.apache.geronimo.gshell.command.Command">
<osgi:service-properties>
<entry key="shell" value="osgi"/>
- <entry key="alias" value="install"/>
+ <entry key="name" value="install"/>
</osgi:service-properties>
</osgi:service>
<osgi:service ref="list-bundles" interface="org.apache.geronimo.gshell.command.Command">
<osgi:service-properties>
<entry key="shell" value="osgi"/>
- <entry key="alias" value="list"/>
+ <entry key="name" value="list"/>
</osgi:service-properties>
</osgi:service>
<osgi:service ref="list-services" interface="org.apache.geronimo.gshell.command.Command">
<osgi:service-properties>
- <entry key="shell" value="osgi"/>
- <entry key="alias" value="list-services,ls"/>
+ <entry key="shell" value="osgi"/>
+ <entry key="name" value="list-services"/>
+ <entry key="alias" value="ls"/>
</osgi:service-properties>
</osgi:service>
<osgi:service ref="refresh-bundle" interface="org.apache.geronimo.gshell.command.Command">
<osgi:service-properties>
<entry key="shell" value="osgi"/>
- <entry key="alias" value="refresh"/>
+ <entry key="name" value="refresh"/>
</osgi:service-properties>
</osgi:service>
<osgi:service ref="resolve-bundle" interface="org.apache.geronimo.gshell.command.Command">
<osgi:service-properties>
<entry key="shell" value="osgi"/>
- <entry key="alias" value="resolve"/>
+ <entry key="name" value="resolve"/>
</osgi:service-properties>
</osgi:service>
<osgi:service ref="shutdown" interface="org.apache.geronimo.gshell.command.Command">
- <osgi:service-properties><entry key="shell" value="osgi"/></osgi:service-properties>
+ <osgi:service-properties>
+ <entry key="shell" value="osgi"/>
+ </osgi:service-properties>
</osgi:service>
<osgi:service ref="start-bundle" interface="org.apache.geronimo.gshell.command.Command">
<osgi:service-properties>
<entry key="shell" value="osgi"/>
- <entry key="alias" value="start"/>
+ <entry key="name" value="start"/>
</osgi:service-properties>
</osgi:service>
<osgi:service ref="start-level" interface="org.apache.geronimo.gshell.command.Command">
<osgi:service-properties>
<entry key="shell" value="osgi"/>
- <entry key="alias" value="start-level"/>
+ <entry key="name" value="start-level"/>
</osgi:service-properties>
</osgi:service>
<osgi:service ref="stop-bundle" interface="org.apache.geronimo.gshell.command.Command">
<osgi:service-properties>
<entry key="shell" value="osgi"/>
- <entry key="alias" value="stop"/>
+ <entry key="name" value="stop"/>
</osgi:service-properties>
</osgi:service>
<osgi:service ref="uninstall-bundle" interface="org.apache.geronimo.gshell.command.Command">
<osgi:service-properties>
<entry key="shell" value="osgi"/>
- <entry key="alias" value="uninstall"/>
- </osgi:service-properties>
- </osgi:service>
-
- <osgi:service ref="clear" interface="org.apache.geronimo.gshell.command.Command">
- <osgi:service-properties><entry key="shell" value="osgi"/></osgi:service-properties>
- </osgi:service>
-
- <osgi:service ref="help" interface="org.apache.geronimo.gshell.command.Command">
- <osgi:service-properties>
- <entry key="shell" value="osgi"/>
- <entry key="alias" value="help,?"/>
+ <entry key="name" value="uninstall"/>
</osgi:service-properties>
</osgi:service>
- <osgi:service ref="exit" interface="org.apache.geronimo.gshell.command.Command">
- <osgi:service-properties><entry key="shell" value="osgi"/></osgi:service-properties>
- </osgi:service>
-
- <osgi:service ref="set" interface="org.apache.geronimo.gshell.command.Command">
- <osgi:service-properties><entry key="shell" value="osgi"/></osgi:service-properties>
- </osgi:service>
-
- <osgi:service ref="unset" interface="org.apache.geronimo.gshell.command.Command">
- <osgi:service-properties><entry key="shell" value="osgi"/></osgi:service-properties>
- </osgi:service>
-
- <osgi:service ref="source" interface="org.apache.geronimo.gshell.command.Command">
- <osgi:service-properties>
- <entry key="shell" value="osgi"/>
- <entry key="alias" value="source,."/>
- </osgi:service-properties>
- </osgi:service>
-
- <osgi:service ref="echo" interface="org.apache.geronimo.gshell.command.Command">
- <osgi:service-properties><entry key="shell" value="osgi"/></osgi:service-properties>
- </osgi:service>
-
-
</beans>