Modified: servicemix/smx4/kernel/trunk/gshell/gshell-packages/src/main/resources/META-INF/spring/gshell-packages.xml URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-packages/src/main/resources/META-INF/spring/gshell-packages.xml?rev=707428&r1=707427&r2=707428&view=diff ============================================================================== --- servicemix/smx4/kernel/trunk/gshell/gshell-packages/src/main/resources/META-INF/spring/gshell-packages.xml (original) +++ servicemix/smx4/kernel/trunk/gshell/gshell-packages/src/main/resources/META-INF/spring/gshell-packages.xml Thu Oct 23 10:54:10 2008 @@ -21,31 +21,26 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:osgi="http://www.springframework.org/schema/osgi"; xmlns:util="http://www.springframework.org/schema/util"; + xmlns:gshell="http://servicemix.apache.org/schema/servicemix-gshell"; xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd http://www.springframework.org/schema/osgi - http://www.springframework.org/schema/osgi/spring-osgi.xsd";> + http://www.springframework.org/schema/osgi/spring-osgi.xsd + http://servicemix.apache.org/schema/servicemix-gshell + http://servicemix.apache.org/schema/servicemix-gshell/servicemix-gshell.xsd";> - <!-- osgi commands --> - <bean id="exports" class="org.apache.servicemix.kernel.gshell.packages.ExportsCommand" /> + <import resource="classpath:org/apache/servicemix/kernel/gshell/core/commands.xml" /> - <bean id="imports" class="org.apache.servicemix.kernel.gshell.packages.ImportsCommand" /> - - <osgi:service ref="exports" interface="org.apache.geronimo.gshell.command.Command"> - <osgi:service-properties> - <entry key="shell" value="packages"/> - <entry key="name" value="exports"/> - </osgi:service-properties> - </osgi:service> - - <osgi:service ref="imports" interface="org.apache.geronimo.gshell.command.Command"> - <osgi:service-properties> - <entry key="shell" value="packages"/> - <entry key="name" value="imports"/> - </osgi:service-properties> - </osgi:service> + <gshell:command-bundle> + <gshell:command name="packages/exports"> + <gshell:action class="org.apache.servicemix.kernel.gshell.packages.ExportsCommand" /> + </gshell:command> + <gshell:command name="packages/imports"> + <gshell:action class="org.apache.servicemix.kernel.gshell.packages.ImportsCommand" /> + </gshell:command> + </gshell:command-bundle> </beans>
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-wrapper/src/main/java/org/apache/servicemix/kernel/gshell/wrapper/InstallCommand.java URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-wrapper/src/main/java/org/apache/servicemix/kernel/gshell/wrapper/InstallCommand.java?rev=707428&r1=707427&r2=707428&view=diff ============================================================================== --- servicemix/smx4/kernel/trunk/gshell/gshell-wrapper/src/main/java/org/apache/servicemix/kernel/gshell/wrapper/InstallCommand.java (original) +++ servicemix/smx4/kernel/trunk/gshell/gshell-wrapper/src/main/java/org/apache/servicemix/kernel/gshell/wrapper/InstallCommand.java Thu Oct 23 10:54:10 2008 @@ -27,18 +27,15 @@ import java.util.Scanner; import org.apache.geronimo.gshell.clp.Option; -import org.apache.geronimo.gshell.command.annotation.CommandComponent; -import org.apache.geronimo.gshell.common.io.PumpStreamHandler; -import org.apache.geronimo.gshell.support.OsgiCommandSupport; +import org.apache.geronimo.gshell.io.PumpStreamHandler; +import org.apache.servicemix.kernel.gshell.core.OsgiCommandSupport; /** * Installs this ServiceMix instance as a service in your operating systems. * * @version $Rev: 603634 $ $Date: 2007-12-12 16:07:16 +0100 (Wed, 12 Dec 2007) $ */ [EMAIL PROTECTED](id="wrapper:install", description="Installs this ServiceMix instance as a service in your operating systems.") -public class InstallCommand - extends OsgiCommandSupport +public class InstallCommand extends OsgiCommandSupport { @Option(name="-n", aliases={"--name"}, description="The service name that will be used when installing the service.") Copied: servicemix/smx4/kernel/trunk/gshell/gshell-wrapper/src/main/resources/META-INF/spring/gshell-wrapper.xml (from r707425, servicemix/smx4/kernel/trunk/gshell/gshell-wrapper/src/main/resources/META-INF/spring/gshell-osgi.xml) URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-wrapper/src/main/resources/META-INF/spring/gshell-wrapper.xml?p2=servicemix/smx4/kernel/trunk/gshell/gshell-wrapper/src/main/resources/META-INF/spring/gshell-wrapper.xml&p1=servicemix/smx4/kernel/trunk/gshell/gshell-wrapper/src/main/resources/META-INF/spring/gshell-osgi.xml&r1=707425&r2=707428&rev=707428&view=diff ============================================================================== --- servicemix/smx4/kernel/trunk/gshell/gshell-wrapper/src/main/resources/META-INF/spring/gshell-osgi.xml (original) +++ servicemix/smx4/kernel/trunk/gshell/gshell-wrapper/src/main/resources/META-INF/spring/gshell-wrapper.xml Thu Oct 23 10:54:10 2008 @@ -21,22 +21,23 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:osgi="http://www.springframework.org/schema/osgi"; xmlns:util="http://www.springframework.org/schema/util"; + xmlns:gshell="http://servicemix.apache.org/schema/servicemix-gshell"; xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd http://www.springframework.org/schema/osgi - http://www.springframework.org/schema/osgi/spring-osgi.xsd";> + http://www.springframework.org/schema/osgi/spring-osgi.xsd + http://servicemix.apache.org/schema/servicemix-gshell + http://servicemix.apache.org/schema/servicemix-gshell/servicemix-gshell.xsd";> - <!-- wrapper commands --> - <bean id="install" class="org.apache.servicemix.kernel.gshell.wrapper.InstallCommand" /> - - <osgi:service ref="install" interface="org.apache.geronimo.gshell.command.Command"> - <osgi:service-properties> - <entry key="shell" value="wrapper"/> - <entry key="name" value="install"/> - </osgi:service-properties> - </osgi:service> + <import resource="classpath:org/apache/servicemix/kernel/gshell/core/commands.xml" /> -</beans> \ No newline at end of file + <gshell:command-bundle> + <gshell:command name="wrapper/install"> + <gshell:action class="org.apache.servicemix.kernel.gshell.wrapper.InstallCommand" /> + </gshell:command> + </gshell:command-bundle> + +</beans> Modified: servicemix/smx4/kernel/trunk/gshell/pom.xml URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/pom.xml?rev=707428&r1=707427&r2=707428&view=diff ============================================================================== --- servicemix/smx4/kernel/trunk/gshell/pom.xml (original) +++ servicemix/smx4/kernel/trunk/gshell/pom.xml Thu Oct 23 10:54:10 2008 @@ -36,15 +36,13 @@ <modules> <module>gshell-core</module> <module>gshell-osgi</module> - <!-- <module>gshell-admin</module> + <module>gshell-features</module> <module>gshell-obr</module> <module>gshell-wrapper</module> - <module>gshell-features</module> <module>gshell-log</module> <module>gshell-config</module> <module>gshell-packages</module> - --> </modules> </project> \ No newline at end of file Modified: servicemix/smx4/kernel/trunk/pom.xml URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/pom.xml?rev=707428&r1=707427&r2=707428&view=diff ============================================================================== --- servicemix/smx4/kernel/trunk/pom.xml (original) +++ servicemix/smx4/kernel/trunk/pom.xml Thu Oct 23 10:54:10 2008 @@ -41,9 +41,7 @@ <module>spring</module> <module>testing</module> <module>jaas</module> - <!-- <module>client</module> - --> <module>assembly</module> </modules>
