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 2008/10/23 20:04:55 UTC
svn commit: r707430 [1/2] - in /servicemix/smx4/kernel/trunk: ./ assembly/
assembly/src/main/descriptors/ assembly/src/main/filtered-resources/etc/
gshell/gshell-admin/
gshell/gshell-admin/src/main/filtered-resources/org/apache/servicemix/kernel/gshell...
Author: gnodet
Date: Thu Oct 23 11:04:50 2008
New Revision: 707430
URL: http://svn.apache.org/viewvc?rev=707430&view=rev
Log:
Fix lots of things
Added:
servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/
servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/
servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/ChangePortCommand.properties
servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/ConnectCommand.properties
servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/CreateCommand.properties
servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/DestroyCommand.properties
servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/ListCommand.properties
servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/StartCommand.properties
servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/StopCommand.properties
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/remote/OpenShellHandler.java
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/vfs/
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/vfs/mvn/
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/vfs/mvn/MvnFileObject.java
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/vfs/mvn/MvnFileProvider.java
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/vfs/mvn/MvnFileSystem.java
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/components.xml
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/AddUrlCommand.java
- copied, changed from r707428, servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/AddUrlCommand.java
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/FeaturesCommandSupport.java
- copied, changed from r707428, servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/FeaturesCommandSupport.java
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/InstallFeatureCommand.java
- copied, changed from r707428, servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/InstallFeatureCommand.java
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/ListFeaturesCommand.java
- copied, changed from r707428, servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/ListFeaturesCommand.java
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/ListUrlCommand.java
- copied, changed from r707428, servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/ListUrlCommand.java
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/RefreshUrlCommand.java
- copied, changed from r707428, servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/RefreshUrlCommand.java
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/RemoveUrlCommand.java
- copied, changed from r707428, servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/RemoveUrlCommand.java
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/UninstallFeatureCommand.java
- copied, changed from r707428, servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/UninstallFeatureCommand.java
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/resources/org/
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/resources/org/apache/
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/resources/org/apache/servicemix/
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/resources/org/apache/servicemix/kernel/
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/resources/org/apache/servicemix/kernel/gshell/
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/resources/org/apache/servicemix/kernel/gshell/features/
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/resources/org/apache/servicemix/kernel/gshell/features/commands/
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/resources/org/apache/servicemix/kernel/gshell/features/commands/AddUrlCommand.properties
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/resources/org/apache/servicemix/kernel/gshell/features/commands/InstallFeatureCommand.properties
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/resources/org/apache/servicemix/kernel/gshell/features/commands/ListFeaturesCommand.properties
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/resources/org/apache/servicemix/kernel/gshell/features/commands/ListUrlCommand.properties
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/resources/org/apache/servicemix/kernel/gshell/features/commands/RefreshUrlCommand.properties
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/resources/org/apache/servicemix/kernel/gshell/features/commands/RemoveUrlCommand.properties
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/resources/org/apache/servicemix/kernel/gshell/features/commands/UninstallFeatureCommand.properties
Removed:
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/remote/client/proxy/SpringRemoteShellInfoProxy.java
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/AddUrlCommand.java
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/FeaturesCommandSupport.java
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/InstallFeatureCommand.java
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/ListFeaturesCommand.java
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/ListUrlCommand.java
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/RefreshUrlCommand.java
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/RemoveUrlCommand.java
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/UninstallFeatureCommand.java
Modified:
servicemix/smx4/kernel/trunk/assembly/pom.xml
servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml
servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml
servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties
servicemix/smx4/kernel/trunk/gshell/gshell-admin/pom.xml
servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/filtered-resources/org/apache/servicemix/kernel/gshell/admin/etc/startup.properties
servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/AdminCommandSupport.java
servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/META-INF/spring/gshell-admin.xml
servicemix/smx4/kernel/trunk/gshell/gshell-config/pom.xml
servicemix/smx4/kernel/trunk/gshell/gshell-core/pom.xml
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/CommandBundle.java
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/LocalConsole.java
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/OsgiCommandRegistry.java
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/config/CommandParser.java
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-commands.xml
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-remote.xml
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-vfs.xml
servicemix/smx4/kernel/trunk/gshell/gshell-features/pom.xml
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/resources/META-INF/spring/gshell-features.xml
servicemix/smx4/kernel/trunk/gshell/gshell-log/pom.xml
servicemix/smx4/kernel/trunk/gshell/gshell-obr/pom.xml
servicemix/smx4/kernel/trunk/gshell/gshell-osgi/pom.xml
servicemix/smx4/kernel/trunk/gshell/gshell-osgi/src/main/resources/META-INF/spring/gshell-osgi.xml
servicemix/smx4/kernel/trunk/gshell/gshell-packages/pom.xml
servicemix/smx4/kernel/trunk/gshell/gshell-wrapper/pom.xml
servicemix/smx4/kernel/trunk/pom.xml
Modified: servicemix/smx4/kernel/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/pom.xml?rev=707430&r1=707429&r2=707430&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/assembly/pom.xml Thu Oct 23 11:04:50 2008
@@ -163,6 +163,18 @@
<artifactId>org.apache.servicemix.bundles.commons-vfs</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.oro</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.commons-codec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.commons-httpclient</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.compendium</artifactId>
</dependency>
Modified: servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=707430&r1=707429&r2=707430&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml Thu Oct 23 11:04:50 2008
@@ -173,8 +173,11 @@
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.cglib</include>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.mina</include>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxp-ri</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.oro</include>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-jexl</include>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-vfs</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-codec</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-httpclient</include>
</includes>
</dependencySet>
<dependencySet>
Modified: servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=707430&r1=707429&r2=707430&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml Thu Oct 23 11:04:50 2008
@@ -165,8 +165,11 @@
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.cglib</include>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.mina</include>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxp-ri</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.oro</include>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-jexl</include>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-vfs</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-codec</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.commons-httpclient</include>
</includes>
</dependencySet>
<dependencySet>
Modified: servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties?rev=707430&r1=707429&r2=707430&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties (original)
+++ servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties Thu Oct 23 11:04:50 2008
@@ -42,6 +42,9 @@
org/apache/servicemix/bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.version}/org.apache.servicemix.bundles.aopalliance-${aopalliance.version}.jar=50
org/apache/servicemix/bundles/org.apache.servicemix.bundles.cglib/${cglib.version}/org.apache.servicemix.bundles.cglib-${cglib.version}.jar=50
org/apache/servicemix/bundles/org.apache.servicemix.bundles.mina/${mina.version}/org.apache.servicemix.bundles.mina-${mina.version}.jar=50
+org/apache/servicemix/bundles/org.apache.servicemix.bundles.oro/${oro.version}/org.apache.servicemix.bundles.oro-${oro.version}.jar=50
+org/apache/servicemix/bundles/org.apache.servicemix.bundles.commons-codec/${commons.codec.version}/org.apache.servicemix.bundles.commons-codec-${commons.codec.version}.jar=50
+org/apache/servicemix/bundles/org.apache.servicemix.bundles.commons-httpclient/${commons.httpclient.version}/org.apache.servicemix.bundles.commons-httpclient-${commons.httpclient.version}.jar=50
org/apache/servicemix/bundles/org.apache.servicemix.bundles.commons-jexl/${commons.jexl.version}/org.apache.servicemix.bundles.commons-jexl-${commons.jexl.version}.jar=50
org/apache/servicemix/bundles/org.apache.servicemix.bundles.commons-vfs/${commons.vfs.version}/org.apache.servicemix.bundles.commons-vfs-${commons.vfs.version}.jar=50
org/springframework/spring-aop/${spring.version}/spring-aop-${spring.version}.jar=50
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-admin/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-admin/pom.xml?rev=707430&r1=707429&r2=707430&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-admin/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-admin/pom.xml Thu Oct 23 11:04:50 2008
@@ -115,6 +115,7 @@
</Export-Package>
<Import-Package>
org.apache.geronimo.gshell.wisdom.command,
+ org.apache.geronimo.gshell.wisdom.registry,
org.apache.servicemix.kernel.gshell.core,
*
</Import-Package>
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/filtered-resources/org/apache/servicemix/kernel/gshell/admin/etc/startup.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/filtered-resources/org/apache/servicemix/kernel/gshell/admin/etc/startup.properties?rev=707430&r1=707429&r2=707430&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/filtered-resources/org/apache/servicemix/kernel/gshell/admin/etc/startup.properties (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/filtered-resources/org/apache/servicemix/kernel/gshell/admin/etc/startup.properties Thu Oct 23 11:04:50 2008
@@ -35,9 +35,15 @@
#
# The rest of the services..
#
+org/apache/geronimo/specs/geronimo-annotation_1.0_spec/${geronimo.annotation.version}/geronimo-annotation_1.0_spec-${geronimo.annotation.version}.jar=10
org/apache/servicemix/bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.version}/org.apache.servicemix.bundles.aopalliance-${aopalliance.version}.jar=50
org/apache/servicemix/bundles/org.apache.servicemix.bundles.cglib/${cglib.version}/org.apache.servicemix.bundles.cglib-${cglib.version}.jar=50
org/apache/servicemix/bundles/org.apache.servicemix.bundles.mina/${mina.version}/org.apache.servicemix.bundles.mina-${mina.version}.jar=50
+org/apache/servicemix/bundles/org.apache.servicemix.bundles.oro/${oro.version}/org.apache.servicemix.bundles.oro-${oro.version}.jar=50
+org/apache/servicemix/bundles/org.apache.servicemix.bundles.commons-codec/${commons.codec.version}/org.apache.servicemix.bundles.commons-codec-${commons.codec.version}.jar=50
+org/apache/servicemix/bundles/org.apache.servicemix.bundles.commons-httpclient/${commons.httpclient.version}/org.apache.servicemix.bundles.commons-httpclient-${commons.httpclient.version}.jar=50
+org/apache/servicemix/bundles/org.apache.servicemix.bundles.commons-jexl/${commons.jexl.version}/org.apache.servicemix.bundles.commons-jexl-${commons.jexl.version}.jar=50
+org/apache/servicemix/bundles/org.apache.servicemix.bundles.commons-vfs/${commons.vfs.version}/org.apache.servicemix.bundles.commons-vfs-${commons.vfs.version}.jar=50
org/springframework/spring-aop/${spring.version}/spring-aop-${spring.version}.jar=50
org/springframework/spring-beans/${spring.version}/spring-beans-${spring.version}.jar=50
org/springframework/spring-context/${spring.version}/spring-context-${spring.version}.jar=50
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/AdminCommandSupport.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/AdminCommandSupport.java?rev=707430&r1=707429&r2=707430&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/AdminCommandSupport.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/AdminCommandSupport.java Thu Oct 23 11:04:50 2008
@@ -19,17 +19,21 @@
import org.apache.servicemix.kernel.gshell.admin.AdminService;
import org.apache.servicemix.kernel.gshell.admin.Instance;
import org.apache.servicemix.kernel.gshell.core.OsgiCommandSupport;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.apache.geronimo.gshell.command.CommandContext;
+import org.osgi.framework.ServiceReference;
public abstract class AdminCommandSupport extends OsgiCommandSupport {
- @Autowired
private AdminService adminService;
- protected AdminService getAdminService() {
+ public AdminService getAdminService() {
return adminService;
}
+ public void setAdminService(AdminService adminService) {
+ this.adminService = adminService;
+ }
+
protected Instance getExistingInstance(String name) {
Instance i = adminService.getInstance(name);
if (i == null) {
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/META-INF/spring/gshell-admin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/META-INF/spring/gshell-admin.xml?rev=707430&r1=707429&r2=707430&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/META-INF/spring/gshell-admin.xml (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/META-INF/spring/gshell-admin.xml Thu Oct 23 11:04:50 2008
@@ -37,27 +37,38 @@
<import resource="classpath:org/apache/servicemix/kernel/gshell/core/commands.xml" />
+ <bean id="adminCommandBundleSupport" scope="prototype">
+ <property name="adminService" ref="adminService" />
+ </bean>
+
<gshell:command-bundle>
<gshell:command name="admin/create">
- <gshell:action class="org.apache.servicemix.kernel.gshell.admin.internal.commands.CreateCommand" />
+ <gshell:action class="org.apache.servicemix.kernel.gshell.admin.internal.commands.CreateCommand"
+ parent="adminCommandBundleSupport" />
</gshell:command>
<gshell:command name="admin/connect">
- <gshell:action class="org.apache.servicemix.kernel.gshell.admin.internal.commands.ConnectCommand" />
+ <gshell:action class="org.apache.servicemix.kernel.gshell.admin.internal.commands.ConnectCommand"
+ parent="adminCommandBundleSupport" />
</gshell:command>
<gshell:command name="admin/list">
- <gshell:action class="org.apache.servicemix.kernel.gshell.admin.internal.commands.ListCommand" />
+ <gshell:action class="org.apache.servicemix.kernel.gshell.admin.internal.commands.ListCommand"
+ parent="adminCommandBundleSupport" />
</gshell:command>
<gshell:command name="admin/start">
- <gshell:action class="org.apache.servicemix.kernel.gshell.admin.internal.commands.StartCommand" />
+ <gshell:action class="org.apache.servicemix.kernel.gshell.admin.internal.commands.StartCommand"
+ parent="adminCommandBundleSupport" />
</gshell:command>
<gshell:command name="admin/stop">
- <gshell:action class="org.apache.servicemix.kernel.gshell.admin.internal.commands.StopCommand" />
+ <gshell:action class="org.apache.servicemix.kernel.gshell.admin.internal.commands.StopCommand"
+ parent="adminCommandBundleSupport" />
</gshell:command>
<gshell:command name="admin/destroy">
- <gshell:action class="org.apache.servicemix.kernel.gshell.admin.internal.commands.DestroyCommand" />
+ <gshell:action class="org.apache.servicemix.kernel.gshell.admin.internal.commands.DestroyCommand"
+ parent="adminCommandBundleSupport" />
</gshell:command>
<gshell:command name="admin/change-port">
- <gshell:action class="org.apache.servicemix.kernel.gshell.admin.internal.commands.ChangePortCommand" />
+ <gshell:action class="org.apache.servicemix.kernel.gshell.admin.internal.commands.ChangePortCommand"
+ parent="adminCommandBundleSupport" />
</gshell:command>
</gshell:command-bundle>
Added: servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/ChangePortCommand.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/ChangePortCommand.properties?rev=707430&view=auto
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/ChangePortCommand.properties (added)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/ChangePortCommand.properties Thu Oct 23 11:04:50 2008
@@ -0,0 +1,27 @@
+##
+## Licensed to the Apache Software Foundation (ASF) under one
+## or more contributor license agreements. See the NOTICE file
+## distributed with this work for additional information
+## regarding copyright ownership. The ASF licenses this file
+## to you under the Apache License, Version 2.0 (the
+## "License"); you may not use this file except in compliance
+## with the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing,
+## software distributed under the License is distributed on an
+## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+## KIND, either express or implied. See the License for the
+## specific language governing permissions and limitations
+## under the License.
+##
+
+##
+## $Rev: 703511 $ $Date: 2008-10-10 18:07:36 +0200 (Fri, 10 Oct 2008) $
+##
+
+command.description=Change the port of an existing instance.
+
+command.manual=\
+ TODO: date manual
\ No newline at end of file
Added: servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/ConnectCommand.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/ConnectCommand.properties?rev=707430&view=auto
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/ConnectCommand.properties (added)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/ConnectCommand.properties Thu Oct 23 11:04:50 2008
@@ -0,0 +1,27 @@
+##
+## Licensed to the Apache Software Foundation (ASF) under one
+## or more contributor license agreements. See the NOTICE file
+## distributed with this work for additional information
+## regarding copyright ownership. The ASF licenses this file
+## to you under the Apache License, Version 2.0 (the
+## "License"); you may not use this file except in compliance
+## with the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing,
+## software distributed under the License is distributed on an
+## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+## KIND, either express or implied. See the License for the
+## specific language governing permissions and limitations
+## under the License.
+##
+
+##
+## $Rev: 703511 $ $Date: 2008-10-10 18:07:36 +0200 (Fri, 10 Oct 2008) $
+##
+
+command.description=Connect to an existing instance.
+
+command.manual=\
+ TODO: date manual
\ No newline at end of file
Added: servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/CreateCommand.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/CreateCommand.properties?rev=707430&view=auto
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/CreateCommand.properties (added)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/CreateCommand.properties Thu Oct 23 11:04:50 2008
@@ -0,0 +1,27 @@
+##
+## Licensed to the Apache Software Foundation (ASF) under one
+## or more contributor license agreements. See the NOTICE file
+## distributed with this work for additional information
+## regarding copyright ownership. The ASF licenses this file
+## to you under the Apache License, Version 2.0 (the
+## "License"); you may not use this file except in compliance
+## with the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing,
+## software distributed under the License is distributed on an
+## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+## KIND, either express or implied. See the License for the
+## specific language governing permissions and limitations
+## under the License.
+##
+
+##
+## $Rev: 703511 $ $Date: 2008-10-10 18:07:36 +0200 (Fri, 10 Oct 2008) $
+##
+
+command.description=Create a new instance.
+
+command.manual=\
+ TODO: date manual
\ No newline at end of file
Added: servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/DestroyCommand.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/DestroyCommand.properties?rev=707430&view=auto
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/DestroyCommand.properties (added)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/DestroyCommand.properties Thu Oct 23 11:04:50 2008
@@ -0,0 +1,27 @@
+##
+## Licensed to the Apache Software Foundation (ASF) under one
+## or more contributor license agreements. See the NOTICE file
+## distributed with this work for additional information
+## regarding copyright ownership. The ASF licenses this file
+## to you under the Apache License, Version 2.0 (the
+## "License"); you may not use this file except in compliance
+## with the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing,
+## software distributed under the License is distributed on an
+## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+## KIND, either express or implied. See the License for the
+## specific language governing permissions and limitations
+## under the License.
+##
+
+##
+## $Rev: 703511 $ $Date: 2008-10-10 18:07:36 +0200 (Fri, 10 Oct 2008) $
+##
+
+command.description=Destroy an existing instance.
+
+command.manual=\
+ TODO: date manual
\ No newline at end of file
Added: servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/ListCommand.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/ListCommand.properties?rev=707430&view=auto
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/ListCommand.properties (added)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/ListCommand.properties Thu Oct 23 11:04:50 2008
@@ -0,0 +1,27 @@
+##
+## Licensed to the Apache Software Foundation (ASF) under one
+## or more contributor license agreements. See the NOTICE file
+## distributed with this work for additional information
+## regarding copyright ownership. The ASF licenses this file
+## to you under the Apache License, Version 2.0 (the
+## "License"); you may not use this file except in compliance
+## with the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing,
+## software distributed under the License is distributed on an
+## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+## KIND, either express or implied. See the License for the
+## specific language governing permissions and limitations
+## under the License.
+##
+
+##
+## $Rev: 703511 $ $Date: 2008-10-10 18:07:36 +0200 (Fri, 10 Oct 2008) $
+##
+
+command.description=List existing instances.
+
+command.manual=\
+ TODO: date manual
\ No newline at end of file
Added: servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/StartCommand.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/StartCommand.properties?rev=707430&view=auto
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/StartCommand.properties (added)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/StartCommand.properties Thu Oct 23 11:04:50 2008
@@ -0,0 +1,27 @@
+##
+## Licensed to the Apache Software Foundation (ASF) under one
+## or more contributor license agreements. See the NOTICE file
+## distributed with this work for additional information
+## regarding copyright ownership. The ASF licenses this file
+## to you under the Apache License, Version 2.0 (the
+## "License"); you may not use this file except in compliance
+## with the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing,
+## software distributed under the License is distributed on an
+## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+## KIND, either express or implied. See the License for the
+## specific language governing permissions and limitations
+## under the License.
+##
+
+##
+## $Rev: 703511 $ $Date: 2008-10-10 18:07:36 +0200 (Fri, 10 Oct 2008) $
+##
+
+command.description=Start an existing instance.
+
+command.manual=\
+ TODO: date manual
\ No newline at end of file
Added: servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/StopCommand.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/StopCommand.properties?rev=707430&view=auto
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/StopCommand.properties (added)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/internal/commands/StopCommand.properties Thu Oct 23 11:04:50 2008
@@ -0,0 +1,27 @@
+##
+## Licensed to the Apache Software Foundation (ASF) under one
+## or more contributor license agreements. See the NOTICE file
+## distributed with this work for additional information
+## regarding copyright ownership. The ASF licenses this file
+## to you under the Apache License, Version 2.0 (the
+## "License"); you may not use this file except in compliance
+## with the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing,
+## software distributed under the License is distributed on an
+## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+## KIND, either express or implied. See the License for the
+## specific language governing permissions and limitations
+## under the License.
+##
+
+##
+## $Rev: 703511 $ $Date: 2008-10-10 18:07:36 +0200 (Fri, 10 Oct 2008) $
+##
+
+command.description=Stop an existing instance.
+
+command.manual=\
+ TODO: date manual
\ No newline at end of file
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-config/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-config/pom.xml?rev=707430&r1=707429&r2=707430&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-config/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-config/pom.xml Thu Oct 23 11:04:50 2008
@@ -75,6 +75,7 @@
</Export-Package>
<Import-Package>
org.apache.geronimo.gshell.wisdom.command,
+ org.apache.geronimo.gshell.wisdom.registry,
org.apache.servicemix.kernel.gshell.core,
*
</Import-Package>
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-core/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/pom.xml?rev=707430&r1=707429&r2=707430&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/pom.xml Thu Oct 23 11:04:50 2008
@@ -90,6 +90,16 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.gshell.commands</groupId>
+ <artifactId>gshell-optional</artifactId>
+ <version>${gshell.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.gshell.commands</groupId>
+ <artifactId>gshell-vfs</artifactId>
+ <version>${gshell.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.gshell.commands</groupId>
<artifactId>gshell-remote</artifactId>
<version>${gshell.version}</version>
</dependency>
@@ -131,6 +141,10 @@
<artifactId>org.apache.servicemix.bundles.mina</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.commons-httpclient</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
</dependency>
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/CommandBundle.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/CommandBundle.java?rev=707430&r1=707429&r2=707430&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/CommandBundle.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/CommandBundle.java Thu Oct 23 11:04:50 2008
@@ -31,7 +31,7 @@
private BundleContext bundleContext;
- private Map<String,Command> commands;
+ private List<Command> commands;
private Map<String,String> aliases;
@@ -40,11 +40,11 @@
public CommandBundle() {
}
- public Map<String, Command> getCommands() {
+ public List<Command> getCommands() {
return commands;
}
- public void setCommands(final Map<String, Command> commands) {
+ public void setCommands(final List<Command> commands) {
assert commands != null;
this.commands = commands;
@@ -68,9 +68,9 @@
log.debug("Initializing command bundle");
if (commandRegistry != null && aliasRegistry != null) {
log.debug("Command bundle is using the auto wired command/alias registry");
- for (String name : commands.keySet()) {
- log.debug("Registering command: {}", name);
- commandRegistry.registerCommand(name, commands.get(name));
+ for (Command command : commands) {
+ log.debug("Registering command: {}", command.getLocation());
+ commandRegistry.registerCommand(command);
}
for (String name : aliases.keySet()) {
log.debug("Registering alias: {}", name);
@@ -81,11 +81,11 @@
throw new Exception("Aliases are not supported in OSGi");
}
log.debug("Command bundle is using the OSGi registry");
- for (String name : commands.keySet()) {
- log.debug("Registering command: {}", name);
+ for (Command command : commands) {
+ log.debug("Registering command: {}", command.getLocation());
Dictionary props = new Properties();
- props.put(OsgiCommandRegistry.NAME, name);
- registrations.add(bundleContext.registerService(Command.class.getName(), commands.get(name), props));
+ props.put(OsgiCommandRegistry.NAME, command.getLocation().getFullPath());
+ registrations.add(bundleContext.registerService(Command.class.getName(), command, props));
}
} else {
throw new Exception("Command bundle should be wired to the command/alias registry or be used in an OSGi context");
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/LocalConsole.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/LocalConsole.java?rev=707430&r1=707429&r2=707430&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/LocalConsole.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/LocalConsole.java Thu Oct 23 11:04:50 2008
@@ -4,11 +4,15 @@
import javax.annotation.PostConstruct;
import org.apache.geronimo.gshell.shell.Shell;
+import org.apache.geronimo.gshell.notification.ExitNotification;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.osgi.context.BundleContextAware;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
-public class LocalConsole implements Runnable {
+public class LocalConsole implements Runnable, BundleContextAware {
private final Logger log = LoggerFactory.getLogger(getClass());
@@ -16,6 +20,16 @@
private boolean createLocalShell;
+ private BundleContext bundleContext;
+
+ public BundleContext getBundleContext() {
+ return bundleContext;
+ }
+
+ public void setBundleContext(BundleContext bundleContext) {
+ this.bundleContext = bundleContext;
+ }
+
public Shell getShell() {
return shell;
}
@@ -49,8 +63,19 @@
public void run() {
try {
shell.run();
- } catch (Exception e2) {
- log.error("Error running shell", e2);
+ } catch (ExitNotification e) {
+ new Thread() {
+ public void run() {
+ try {
+ Bundle bundle = getBundleContext().getBundle(0);
+ bundle.stop();
+ } catch (Exception e) {
+ log.error("Error when shutting down ServiceMix Kernel", e);
+ }
+ }
+ }.start();
+ } catch (Throwable e) {
+ log.error("Error running shell", e);
} finally {
shell.close();
}
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/OsgiCommandRegistry.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/OsgiCommandRegistry.java?rev=707430&r1=707429&r2=707430&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/OsgiCommandRegistry.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/OsgiCommandRegistry.java Thu Oct 23 11:04:50 2008
@@ -14,13 +14,11 @@
private CommandRegistry commandRegistry;
public void register(final Command command, Map<String, ?> properties) throws Exception {
- String name = (String) properties.get(NAME);
- commandRegistry.registerCommand(name, command);
+ commandRegistry.registerCommand(command);
}
public void unregister(final Command command, Map<String, ?> properties) throws Exception {
- String name = (String) properties.get(NAME);
- commandRegistry.removeCommand(name);
+ commandRegistry.removeCommand(command);
}
}
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/config/CommandParser.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/config/CommandParser.java?rev=707430&r1=707429&r2=707430&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/config/CommandParser.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/config/CommandParser.java Thu Oct 23 11:04:50 2008
@@ -3,6 +3,7 @@
import java.util.List;
import java.util.Map;
import java.util.LinkedHashMap;
+import java.util.ArrayList;
import org.w3c.dom.Element;
@@ -13,6 +14,7 @@
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.support.ManagedList;
import org.springframework.beans.factory.support.ManagedMap;
+import org.springframework.beans.factory.support.GenericBeanDefinition;
import org.springframework.beans.factory.config.BeanDefinitionHolder;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.RuntimeBeanReference;
@@ -23,6 +25,7 @@
import org.slf4j.LoggerFactory;
import org.apache.geronimo.gshell.wisdom.command.ConfigurableCommandCompleter;
import org.apache.geronimo.gshell.wisdom.command.LinkCommand;
+import org.apache.geronimo.gshell.wisdom.registry.CommandLocationImpl;
import org.apache.servicemix.kernel.gshell.core.CommandBundle;
public class CommandParser extends AbstractBeanDefinitionParser {
@@ -43,6 +46,8 @@
public static final String NAME = "name";
+ public static final String LOCATION = "location";
+
public static final String COMMANDS = "commands";
public static final String COMMAND = "command";
@@ -253,11 +258,11 @@
// TODO: Figure out how we can save the order of <gshell:command> and <gshell:link> so that 'help' displays them in the order they are defined
//
- ManagedMap commands = new ManagedMap();
+ ManagedList commands = new ManagedList();
// noinspection unchecked
- commands.putAll(parseCommands(element));
+ commands.addAll(parseCommands(element));
// noinspection unchecked
- commands.putAll(parseLinks(element));
+ commands.addAll(parseLinks(element));
bundle.addPropertyValue(COMMANDS, commands);
ManagedMap aliases = new ManagedMap();
@@ -272,19 +277,18 @@
// <gshell:command>
//
- private Map<String,BeanDefinition> parseCommands(final Element element) {
+ private List<BeanDefinition> parseCommands(final Element element) {
assert element != null;
log.trace("Parse commands; element; {}", element);
- Map<String,BeanDefinition> commands = new LinkedHashMap<String,BeanDefinition>();
+ List<BeanDefinition> commands = new ArrayList<BeanDefinition>();
List<Element> children = getChildElements(element, COMMAND);
for (Element child : children) {
- String name = child.getAttribute(NAME);
BeanDefinitionBuilder command = parseCommand(child);
- commands.put(name, command.getBeanDefinition());
+ commands.add(command.getBeanDefinition());
}
return commands;
@@ -303,6 +307,12 @@
// Required children elements
+ String name = element.getAttribute(NAME);
+ BeanDefinition def = new GenericBeanDefinition();
+ def.setBeanClassName(CommandLocationImpl.class.getName());
+ def.getConstructorArgumentValues().addGenericArgumentValue(name);
+ command.addPropertyValue(LOCATION, def);
+
child = getChildElement(element, ACTION);
BeanDefinitionHolder action = parseCommandAction(child);
type.wire(command, action);
@@ -399,12 +409,12 @@
// <gshell:link>
//
- private Map<String,BeanDefinition> parseLinks(final Element element) {
+ private List<BeanDefinition> parseLinks(final Element element) {
assert element != null;
log.trace("Parse links; element; {}", element);
- Map<String,BeanDefinition> links = new LinkedHashMap<String,BeanDefinition>();
+ List<BeanDefinition> links = new ArrayList<BeanDefinition>();
List<Element> children = getChildElements(element, LINK);
@@ -413,7 +423,12 @@
link.addConstructorArgValue(child.getAttribute(TARGET));
String name = child.getAttribute(NAME);
- links.put(name, link.getBeanDefinition());
+ BeanDefinition def = new GenericBeanDefinition();
+ def.setBeanClassName(CommandLocationImpl.class.getName());
+ def.getConstructorArgumentValues().addGenericArgumentValue(name);
+ link.addPropertyValue(LOCATION, def);
+
+ links.add(link.getBeanDefinition());
}
return links;
Added: servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/remote/OpenShellHandler.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/remote/OpenShellHandler.java?rev=707430&view=auto
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/remote/OpenShellHandler.java (added)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/remote/OpenShellHandler.java Thu Oct 23 11:04:50 2008
@@ -0,0 +1,94 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.servicemix.kernel.gshell.core.remote;
+
+import org.apache.geronimo.gshell.command.Variables;
+import org.apache.geronimo.gshell.io.IO;
+import org.apache.geronimo.gshell.remote.message.OpenShellMessage;
+import org.apache.geronimo.gshell.remote.server.RemoteIO;
+import org.apache.geronimo.gshell.remote.server.RemoteShellContextHolder;
+import org.apache.geronimo.gshell.remote.server.handler.ServerMessageHandlerSupport;
+import org.apache.geronimo.gshell.remote.server.handler.ServerSessionContext;
+import org.apache.geronimo.gshell.shell.ShellContext;
+import org.apache.geronimo.gshell.shell.Shell;
+import org.apache.geronimo.gshell.spring.BeanContainer;
+import org.apache.geronimo.gshell.spring.BeanContainerAware;
+import org.apache.geronimo.gshell.spring.BeanContainerImpl;
+import org.apache.geronimo.gshell.whisper.transport.Session;
+
+import java.util.UUID;
+
+/**
+ * Server handler for {@link OpenShellMessage} messages.
+ *
+ * @version $Rev: 701226 $ $Date: 2008-10-02 21:51:51 +0200 (Thu, 02 Oct 2008) $
+ */
+public class OpenShellHandler
+ extends ServerMessageHandlerSupport<OpenShellMessage>
+ implements BeanContainerAware
+{
+ private BeanContainer container;
+
+ public OpenShellHandler() {
+ super(OpenShellMessage.class);
+ }
+
+ public void setBeanContainer(final BeanContainer container) {
+ this.container = container;
+ }
+
+ public void handle(final Session session, final ServerSessionContext context, final OpenShellMessage message) throws Exception {
+ assert session != null;
+ assert context != null;
+ assert message != null;
+
+ // Create a new container which will be the parent for our remote shells
+ context.container = container;
+
+ // Setup the shell context and related components
+ context.io = new RemoteIO(session);
+ context.variables = new Variables();
+
+ // HACK: Need a shell context, but currently that muck is not exposed, so make a new one
+ ShellContext shellContext = new ShellContext() {
+ public IO getIo() {
+ return context.io;
+ }
+
+ public Variables getVariables() {
+ return context.variables;
+ }
+ };
+
+ RemoteShellContextHolder.setContext(shellContext);
+
+ try {
+ // Create a new shell instance
+ context.shell = context.container.getBean("remoteShell", Shell.class);
+ }
+ finally {
+ RemoteShellContextHolder.clearContext();
+ }
+
+ OpenShellMessage.Result reply = new OpenShellMessage.Result();
+ reply.setCorrelationId(message.getId());
+ session.send(reply);
+ }
+}
Added: servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/vfs/mvn/MvnFileObject.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/vfs/mvn/MvnFileObject.java?rev=707430&view=auto
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/vfs/mvn/MvnFileObject.java (added)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/vfs/mvn/MvnFileObject.java Thu Oct 23 11:04:50 2008
@@ -0,0 +1,38 @@
+package org.apache.servicemix.kernel.gshell.core.vfs.mvn;
+
+import java.net.URL;
+import java.net.MalformedURLException;
+
+import org.apache.commons.httpclient.URIException;
+import org.apache.commons.vfs.FileName;
+import org.apache.commons.vfs.FileSystemException;
+import org.apache.commons.vfs.provider.url.UrlFileObject;
+import org.apache.commons.vfs.provider.URLFileName;
+
+public class MvnFileObject extends UrlFileObject {
+
+ public MvnFileObject(MvnFileSystem fs, FileName fileName) {
+ super(fs, fileName);
+ }
+
+ protected URL createURL(final FileName name) throws MalformedURLException, FileSystemException, URIException
+ {
+ String url;
+ if (name instanceof URLFileName)
+ {
+ URLFileName urlName = (URLFileName) getName();
+
+ // TODO: charset
+ url = urlName.getURIEncoded(null);
+ }
+ else
+ {
+ url = getName().getURI();
+ }
+ if (url.startsWith("mvn:///")) {
+ url = "mvn:" + url.substring("mvn:///".length());
+ }
+ return new URL(url);
+ }
+
+}
Added: servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/vfs/mvn/MvnFileProvider.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/vfs/mvn/MvnFileProvider.java?rev=707430&view=auto
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/vfs/mvn/MvnFileProvider.java (added)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/vfs/mvn/MvnFileProvider.java Thu Oct 23 11:04:50 2008
@@ -0,0 +1,48 @@
+package org.apache.servicemix.kernel.gshell.core.vfs.mvn;
+
+import java.net.URL;
+import java.net.MalformedURLException;
+
+import org.apache.commons.vfs.FileObject;
+import org.apache.commons.vfs.FileSystemException;
+import org.apache.commons.vfs.FileSystemOptions;
+import org.apache.commons.vfs.FileSystem;
+import org.apache.commons.vfs.FileName;
+import org.apache.commons.vfs.provider.url.UrlFileProvider;
+
+public class MvnFileProvider extends UrlFileProvider {
+
+ /**
+ * Locates a file object, by absolute URI.
+ */
+ public synchronized FileObject findFile(final FileObject baseFile,
+ final String uri,
+ final FileSystemOptions fileSystemOptions)
+ throws FileSystemException
+ {
+ try
+ {
+ final URL url = new URL(uri);
+
+ URL rootUrl = new URL(url, "/");
+ final String key = this.getClass().getName() + rootUrl.toString();
+ FileSystem fs = findFileSystem(key, fileSystemOptions);
+ if (fs == null)
+ {
+ String extForm = rootUrl.toExternalForm();
+ final FileName rootName = getContext().parseURI(extForm);
+ // final FileName rootName =
+ // new BasicFileName(rootUrl, FileName.ROOT_PATH);
+ fs = new MvnFileSystem(rootName, fileSystemOptions);
+ addFileSystem(key, fs);
+ }
+ return fs.resolveFile(url.getPath());
+ }
+ catch (final MalformedURLException e)
+ {
+ throw new FileSystemException("vfs.provider.url/badly-formed-uri.error", uri, e);
+ }
+ }
+
+
+}
Added: servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/vfs/mvn/MvnFileSystem.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/vfs/mvn/MvnFileSystem.java?rev=707430&view=auto
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/vfs/mvn/MvnFileSystem.java (added)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/vfs/mvn/MvnFileSystem.java Thu Oct 23 11:04:50 2008
@@ -0,0 +1,17 @@
+package org.apache.servicemix.kernel.gshell.core.vfs.mvn;
+
+import org.apache.commons.vfs.FileName;
+import org.apache.commons.vfs.FileSystemOptions;
+import org.apache.commons.vfs.FileObject;
+import org.apache.commons.vfs.provider.url.UrlFileSystem;
+
+public class MvnFileSystem extends UrlFileSystem {
+
+ protected MvnFileSystem(FileName fileName, FileSystemOptions fileSystemOptions) {
+ super(fileName, fileSystemOptions);
+ }
+
+ protected FileObject createFile(FileName fileName) {
+ return new MvnFileObject(this, fileName);
+ }
+}
Added: servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/components.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/components.xml?rev=707430&view=auto
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/components.xml (added)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/components.xml Thu Oct 23 11:04:50 2008
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xmlns:osgi="http://www.springframework.org/schema/osgi"
+ 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">
+
+
+ <!--
+
+ This file is used to make sure the one from GShell jars are not included.
+
+ -->
+
+</beans>
\ No newline at end of file
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-commands.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-commands.xml?rev=707430&r1=707429&r2=707430&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-commands.xml (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-commands.xml Thu Oct 23 11:04:50 2008
@@ -124,44 +124,115 @@
<gshell:link name="remote/rshd" target="remote/rsh-server"/>
</gshell:command-bundle>
- <!--
- <bean id="clear" class="org.apache.geronimo.gshell.commands.builtins.ClearCommand">
- <constructor-arg ref="terminal" />
- </bean>
-
- <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.commands.builtins.HelpCommand">
- <constructor-arg ref="commandRegistry" />
- <constructor-arg ref="commandRegistry" />
- <constructor-arg ref="branding" />
- </bean>
-
- <bean id="history-cmd" class="org.apache.geronimo.gshell.commands.builtins.HistoryCommand">
- <constructor-arg ref="history" />
- </bean>
-
- <bean id="info" class="org.apache.geronimo.gshell.commands.builtins.InfoCommand">
- <constructor-arg ref="branding" />
- </bean>
-
- <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" />
-
- <bean id="grep" class="org.apache.geronimo.gshell.commands.utils.GrepCommand" />
-
- <bean id="cat" class="org.apache.geronimo.gshell.commands.utils.CatCommand" />
-
- <bean id="exec" class="org.apache.geronimo.gshell.commands.utils.ExecuteCommand" />
-
- <bean id="java" class="org.apache.geronimo.gshell.commands.utils.JavaCommand" />
+ <gshell:command-bundle>
+ <gshell:command name="optional/exec">
+ <gshell:action class="org.apache.geronimo.gshell.commands.optional.ExecuteAction"/>
+ </gshell:command>
+
+ <gshell:command name="optional/java">
+ <gshell:action class="org.apache.geronimo.gshell.commands.optional.JavaAction"/>
+ </gshell:command>
+
+ <gshell:command name="optional/sleep">
+ <gshell:action class="org.apache.geronimo.gshell.commands.optional.SleepAction"/>
+ </gshell:command>
+
+ <gshell:command name="optional/date">
+ <gshell:action class="org.apache.geronimo.gshell.commands.optional.DateAction"/>
+ </gshell:command>
+
+ <gshell:command name="optional/hostname">
+ <gshell:action class="org.apache.geronimo.gshell.commands.optional.HostnameAction"/>
+ </gshell:command>
+ </gshell:command-bundle>
- <bean id="sleep" class="org.apache.geronimo.gshell.commands.utils.SleepCommand" />
- -->
+ <gshell:command-bundle>
+ <gshell:command name="vfs/cd">
+ <gshell:action class="org.apache.geronimo.gshell.commands.vfs.ChangeDirectoryAction"/>
+ <gshell:completers>
+ <ref bean="fileObjectNameCompleter"/>
+ <null/>
+ </gshell:completers>
+ </gshell:command>
+
+ <gshell:command name="vfs/pwd" type="stateless">
+ <gshell:action class="org.apache.geronimo.gshell.commands.vfs.CurrentDirectoryAction"/>
+ </gshell:command>
+
+ <gshell:command name="vfs/ls">
+ <gshell:action class="org.apache.geronimo.gshell.commands.vfs.ListDirectoryAction"/>
+ <gshell:completers>
+ <ref bean="fileObjectNameCompleter"/>
+ <null/>
+ </gshell:completers>
+ </gshell:command>
+
+ <gshell:link name="vfs/dir" target="vfs/ls"/>
+
+ <gshell:command name="vfs/cp">
+ <gshell:action class="org.apache.geronimo.gshell.commands.vfs.CopyAction"/>
+ <gshell:completers>
+ <ref bean="fileObjectNameCompleter"/>
+ <ref bean="fileObjectNameCompleter"/>
+ <null/>
+ </gshell:completers>
+ </gshell:command>
+
+ <gshell:link name="vfs/copy" target="vfs/cp"/>
+
+ <gshell:command name="vfs/rm">
+ <gshell:action class="org.apache.geronimo.gshell.commands.vfs.RemoveAction"/>
+ <gshell:completers>
+ <ref bean="fileObjectNameCompleter"/>
+ <null/>
+ </gshell:completers>
+ </gshell:command>
+
+ <gshell:link name="vfs/del" target="vfs/rm"/>
+
+ <gshell:command name="vfs/cat">
+ <gshell:action class="org.apache.geronimo.gshell.commands.vfs.CatAction"/>
+ <gshell:completers>
+ <ref bean="fileObjectNameCompleter"/>
+ <null/>
+ </gshell:completers>
+ </gshell:command>
+
+ <gshell:command name="vfs/edit">
+ <gshell:action class="org.apache.geronimo.gshell.commands.vfs.EditAction"/>
+ <gshell:completers>
+ <ref bean="fileObjectNameCompleter"/>
+ <null/>
+ </gshell:completers>
+ </gshell:command>
+
+ <gshell:command name="vfs/touch">
+ <gshell:action class="org.apache.geronimo.gshell.commands.vfs.TouchAction"/>
+ <gshell:completers>
+ <ref bean="fileObjectNameCompleter"/>
+ <null/>
+ </gshell:completers>
+ </gshell:command>
+
+ <gshell:command name="vfs/fileinfo">
+ <gshell:action class="org.apache.geronimo.gshell.commands.vfs.FileInfoAction"/>
+ <gshell:completers>
+ <ref bean="fileObjectNameCompleter"/>
+ <null/>
+ </gshell:completers>
+ </gshell:command>
+
+ <gshell:command name="vfs/find">
+ <gshell:action class="org.apache.geronimo.gshell.commands.vfs.FindAction"/>
+ <gshell:completers>
+ <ref bean="fileObjectNameCompleter"/>
+ <null/>
+ </gshell:completers>
+ </gshell:command>
+
+ <gshell:command name="vfs/grep">
+ <gshell:action class="org.apache.geronimo.gshell.commands.vfs.GrepAction"/>
+ </gshell:command>
+ </gshell:command-bundle>
</beans>
\ No newline at end of file
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-remote.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-remote.xml?rev=707430&r1=707429&r2=707430&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-remote.xml (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-remote.xml Thu Oct 23 11:04:50 2008
@@ -39,7 +39,7 @@
<list>
<bean class="org.apache.geronimo.gshell.remote.server.handler.ConnectHandler"/>
<bean class="org.apache.geronimo.gshell.remote.server.handler.LoginHandler"/>
- <bean class="org.apache.geronimo.gshell.remote.server.handler.OpenShellHandler"/>
+ <bean class="org.apache.servicemix.kernel.gshell.core.remote.OpenShellHandler"/>
<bean class="org.apache.geronimo.gshell.remote.server.handler.ExecuteHandler"/>
<bean class="org.apache.geronimo.gshell.remote.server.handler.CloseShellHandler"/>
<bean class="org.apache.geronimo.gshell.remote.server.handler.EchoHandler"/>
@@ -126,92 +126,4 @@
<property name="provider" value="default"/>
</bean>
- <!--
- <bean id="rshServer" class="org.apache.geronimo.gshell.remote.server.RshServer" destroy-method="close">
- <constructor-arg ref="timeoutManager" />
- <constructor-arg ref="transportFactoryLocator" />
- <constructor-arg>
- <list>
- <bean class="org.apache.geronimo.gshell.remote.server.handler.SpringCloseShellHandler" />
- <bean class="org.apache.geronimo.gshell.remote.server.handler.ConnectHandler">
- <constructor-arg ref="cryptoContext" />
- <constructor-arg ref="timeoutManager" />
- </bean>
- <bean class="org.apache.geronimo.gshell.remote.server.handler.EchoHandler" />
- <bean class="org.apache.geronimo.gshell.remote.server.handler.SpringExecuteHandler" />
- <bean class="org.apache.geronimo.gshell.remote.server.handler.SpringLoginHandler" init-method="initialize">
- <constructor-arg ref="timeoutManager" />
- <constructor-arg value="RshServer" />
- </bean>
- <bean class="org.apache.geronimo.gshell.remote.server.handler.SpringOpenShellHandler">
- <constructor-arg ref="shellInfo" />
- <constructor-arg ref="commandExecutor" />
- </bean>
- </list>
- </constructor-arg>
- </bean>
-
- <bean id="timeoutManager" class="org.apache.geronimo.gshell.remote.server.timeout.DefaultTimeoutManager" init-method="initialize"/>
-
- <bean id="transportFactoryLocator" class="org.apache.geronimo.gshell.whisper.transport.SpringTransportFactoryLocator">
- <property name="factories">
- <list>
- <ref local="tcpTransportFactory" />
- <ref local="sslTransportFactory" />
- <ref local="vmTransportFactory" />
- </list>
- </property>
- </bean>
-
- <bean id="sslContextFactory" class="org.apache.geronimo.gshell.whisper.transport.ssl.KeystoreSSLContextFactory">
- <property name="keystoreManager" ref="keystoreManager" />
- <property name="clientKeystore" value="${clientKeystore}" />
- <property name="clientKeyAlias" value="${clientKeyAlias}" />
- <property name="clientTruststore" value="${clientTruststore}" />
- <property name="serverKeystore" value="${serverKeystore}" />
- <property name="serverKeyAlias" value="${serverKeyAlias}" />
- <property name="serverTruststore" value="${serverTruststore}" />
- </bean>
-
- <bean id="sslTransportFactory" class="org.apache.geronimo.gshell.whisper.transport.ssl.SpringSslTransportFactory">
- <property name="contextFactory" ref="sslContextFactory" />
- </bean>
-
- <bean id="tcpTransportFactory" class="org.apache.geronimo.gshell.whisper.transport.tcp.SpringTcpTransportFactory" />
-
- <bean id="vmTransportFactory" class="org.apache.geronimo.gshell.whisper.transport.vm.SpringVmTransportFactory" />
-
- <bean id="cryptoContext" class="org.apache.geronimo.gshell.remote.crypto.CryptoContext">
- <constructor-arg value="RSA" />
- <constructor-arg><null /></constructor-arg>
- </bean>
-
- <bean id="remoteShell" class="org.apache.geronimo.gshell.spring.SpringRshServer" init-method="start" destroy-method="stop">
- <property name="server" ref="rshServer" />
- <property name="start" value="${startRemoteShell}" />
- <property name="location" value="${remoteShellLocation}" />
- </bean>
-
- <bean id="rsh" class="org.apache.geronimo.gshell.remote.client.SpringRshCommand">
- <constructor-arg ref="terminal" />
- <constructor-arg ref="cryptoContext" />
- <constructor-arg ref="transportFactoryLocator" />
- <constructor-arg>
- <list>
- <bean class="org.apache.geronimo.gshell.remote.client.handler.EchoHandler" />
- </list>
- </constructor-arg>
- </bean>
-
- <osgi:reference id="keystoreManager" interface="org.apache.servicemix.kernel.jaas.config.KeystoreManager" cardinality="1..1" />
-
- <jaas:config id="RshClient">
- <jaas:module className="org.apache.geronimo.gshell.remote.client.auth.RemoteLoginModule" flags="required" />
- </jaas:config>
-
- <jaas:config id="RshServer" rank="-1">
- <jaas:module className="org.apache.geronimo.gshell.remote.server.auth.BogusLoginModule" flags="required" />
- </jaas:config>
- -->
-
</beans>
\ No newline at end of file
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-vfs.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-vfs.xml?rev=707430&r1=707429&r2=707430&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-vfs.xml (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-vfs.xml Thu Oct 23 11:04:50 2008
@@ -97,4 +97,11 @@
</property>
</bean>
+ <bean class="org.apache.geronimo.gshell.vfs.config.FileProviderConfigurer">
+ <property name="scheme" value="mvn"/>
+ <property name="provider">
+ <bean class="org.apache.servicemix.kernel.gshell.core.vfs.mvn.MvnFileProvider"/>
+ </property>
+ </bean>
+
</beans>
\ No newline at end of file
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-features/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-features/pom.xml?rev=707430&r1=707429&r2=707430&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-features/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-features/pom.xml Thu Oct 23 11:04:50 2008
@@ -84,6 +84,7 @@
<Import-Package>
org.apache.geronimo.gshell.wisdom.command,
org.apache.servicemix.kernel.gshell.core,
+ org.apache.geronimo.gshell.wisdom.registry,
*
</Import-Package>
<Private-Package>!*</Private-Package>
Copied: servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/AddUrlCommand.java (from r707428, servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/AddUrlCommand.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/AddUrlCommand.java?p2=servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/AddUrlCommand.java&p1=servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/AddUrlCommand.java&r1=707428&r2=707430&rev=707430&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/AddUrlCommand.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/AddUrlCommand.java Thu Oct 23 11:04:50 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.features.internal.commands;
+package org.apache.servicemix.kernel.gshell.features.commands;
import java.util.List;
import java.net.URI;
Copied: servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/FeaturesCommandSupport.java (from r707428, servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/FeaturesCommandSupport.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/FeaturesCommandSupport.java?p2=servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/FeaturesCommandSupport.java&p1=servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/FeaturesCommandSupport.java&r1=707428&r2=707430&rev=707430&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/FeaturesCommandSupport.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/FeaturesCommandSupport.java Thu Oct 23 11:04:50 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.features.internal.commands;
+package org.apache.servicemix.kernel.gshell.features.commands;
import org.apache.servicemix.kernel.gshell.features.FeaturesService;
import org.apache.servicemix.kernel.gshell.core.OsgiCommandSupport;
Copied: servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/InstallFeatureCommand.java (from r707428, servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/InstallFeatureCommand.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/InstallFeatureCommand.java?p2=servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/InstallFeatureCommand.java&p1=servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/InstallFeatureCommand.java&r1=707428&r2=707430&rev=707430&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/InstallFeatureCommand.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/InstallFeatureCommand.java Thu Oct 23 11:04:50 2008
@@ -14,10 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.features.internal.commands;
-
-import java.util.List;
-import java.net.URL;
+package org.apache.servicemix.kernel.gshell.features.commands;
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.servicemix.kernel.gshell.features.FeaturesService;
Copied: servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/ListFeaturesCommand.java (from r707428, servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/ListFeaturesCommand.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/ListFeaturesCommand.java?p2=servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/ListFeaturesCommand.java&p1=servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/ListFeaturesCommand.java&r1=707428&r2=707430&rev=707430&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/ListFeaturesCommand.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/ListFeaturesCommand.java Thu Oct 23 11:04:50 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.features.internal.commands;
+package org.apache.servicemix.kernel.gshell.features.commands;
import org.apache.servicemix.kernel.gshell.features.FeaturesService;
import org.apache.geronimo.gshell.clp.Option;
Copied: servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/ListUrlCommand.java (from r707428, servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/ListUrlCommand.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/ListUrlCommand.java?p2=servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/ListUrlCommand.java&p1=servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/ListUrlCommand.java&r1=707428&r2=707430&rev=707430&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/ListUrlCommand.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/ListUrlCommand.java Thu Oct 23 11:04:50 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.features.internal.commands;
+package org.apache.servicemix.kernel.gshell.features.commands;
import org.apache.servicemix.kernel.gshell.features.FeaturesService;
import org.apache.servicemix.kernel.gshell.features.Repository;
Copied: servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/RefreshUrlCommand.java (from r707428, servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/RefreshUrlCommand.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/RefreshUrlCommand.java?p2=servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/RefreshUrlCommand.java&p1=servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/RefreshUrlCommand.java&r1=707428&r2=707430&rev=707430&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/RefreshUrlCommand.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/commands/RefreshUrlCommand.java Thu Oct 23 11:04:50 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.gshell.features.internal.commands;
+package org.apache.servicemix.kernel.gshell.features.commands;
import java.net.URI;
import java.util.ArrayList;