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:17:52 UTC
svn commit: r707434 - in /servicemix/smx4/kernel/trunk/gshell:
gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/
gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/
gshell-core/src/main/j...
Author: gnodet
Date: Thu Oct 23 11:17:51 2008
New Revision: 707434
URL: http://svn.apache.org/viewvc?rev=707434&view=rev
Log:
Upgrade to latest gshell trunk
Modified:
servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/AdminServiceImpl.java
servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/ConnectCommand.java
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/ServiceMixBranding.java
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/commands/InfoAction.java
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/resources/META-INF/spring/gshell-vfs.xml
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/org/apache/servicemix/kernel/gshell/core/commands.xml
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/FeaturesServiceImpl.java
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/AdminServiceImpl.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/AdminServiceImpl.java?rev=707434&r1=707433&r2=707434&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/AdminServiceImpl.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/AdminServiceImpl.java Thu Oct 23 11:17:51 2008
@@ -31,7 +31,8 @@
import org.apache.servicemix.kernel.gshell.admin.Instance;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.gshell.io.IO;
+import org.apache.geronimo.gshell.shell.ShellContextHolder;
+import org.apache.geronimo.gshell.shell.ShellContext;
import org.osgi.service.prefs.PreferencesService;
import org.osgi.service.prefs.Preferences;
import org.osgi.service.prefs.BackingStoreException;
@@ -204,12 +205,12 @@
}
private void println(String st) {
- //IO io = ProxyIO.getIO();
- //if (io != null) {
- // io.out.println(st);
- //} else {
+ ShellContext ctx = ShellContextHolder.get(true);
+ if (ctx != null) {
+ ctx.getIo().out.println(st);
+ } else {
System.out.println(st);
- //}
+ }
}
private void copyFilteredResourceToDir(File target, String resource, HashMap<String, String> props) throws Exception {
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/ConnectCommand.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/ConnectCommand.java?rev=707434&r1=707433&r2=707434&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/ConnectCommand.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/commands/ConnectCommand.java Thu Oct 23 11:17:51 2008
@@ -48,7 +48,7 @@
return null;
}
- exec.execute("remote rsh -u " + username + " -p " + password + " -n " + instance + " tcp://localhost:" + port);
+ exec.execute("remote/rsh -u " + username + " -p " + password + " -n " + instance + " tcp://localhost:" + port);
}
finally {
getBundleContext().ungetService(ref);
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/ServiceMixBranding.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/ServiceMixBranding.java?rev=707434&r1=707433&r2=707434&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/ServiceMixBranding.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/ServiceMixBranding.java Thu Oct 23 11:17:51 2008
@@ -19,9 +19,9 @@
import java.io.PrintWriter;
import java.io.StringWriter;
-import org.apache.geronimo.gshell.ansi.Buffer;
-import org.apache.geronimo.gshell.ansi.Code;
-import org.apache.geronimo.gshell.ansi.RenderWriter;
+import org.apache.geronimo.gshell.ansi.AnsiBuffer;
+import org.apache.geronimo.gshell.ansi.AnsiCode;
+import org.apache.geronimo.gshell.ansi.AnsiRenderWriter;
import org.apache.geronimo.gshell.application.model.Branding;
public class ServiceMixBranding extends Branding {
@@ -48,7 +48,7 @@
public String getAboutMessage() {
StringWriter writer = new StringWriter();
- PrintWriter out = new RenderWriter(writer);
+ PrintWriter out = new AnsiRenderWriter(writer);
out.println("For information about @|cyan ServiceMix|, visit:");
out.println(" @|bold http://servicemix.apache.org| ");
@@ -59,11 +59,11 @@
public String getWelcomeMessage() {
StringWriter writer = new StringWriter();
- PrintWriter out = new RenderWriter(writer);
- Buffer buff = new Buffer();
+ PrintWriter out = new AnsiRenderWriter(writer);
+ AnsiBuffer buff = new AnsiBuffer();
for (String line : BANNER) {
- buff.attrib(line, Code.CYAN);
+ buff.attrib(line, AnsiCode.CYAN);
out.println(buff);
}
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/commands/InfoAction.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/commands/InfoAction.java?rev=707434&r1=707433&r2=707434&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/commands/InfoAction.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/commands/InfoAction.java Thu Oct 23 11:17:51 2008
@@ -15,8 +15,8 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.geronimo.gshell.ansi.Renderer;
-import org.apache.geronimo.gshell.ansi.Code;
+import org.apache.geronimo.gshell.ansi.AnsiRenderer;
+import org.apache.geronimo.gshell.ansi.AnsiCode;
import org.apache.geronimo.gshell.application.model.Branding;
import org.apache.geronimo.gshell.command.CommandAction;
import org.apache.geronimo.gshell.command.CommandContext;
@@ -30,7 +30,7 @@
private IO io;
- private Renderer renderer = new Renderer();
+ private AnsiRenderer renderer = new AnsiRenderer();
private NumberFormat fmtI = new DecimalFormat("###,###", new DecimalFormatSymbols(Locale.ENGLISH));
private NumberFormat fmtD = new DecimalFormat("###,##0.000", new DecimalFormatSymbols(Locale.ENGLISH));
@@ -152,7 +152,7 @@
}
void printValue(String name, int pad, String value) {
- io.out.println(" " + renderer.render(Renderer.encode(StringUtils.rightPad(name, pad), Code.BOLD)) + " " + value);
+ io.out.println(" " + renderer.render(AnsiRenderer.encode(StringUtils.rightPad(name, pad), AnsiCode.BOLD)) + " " + value);
}
}
Modified: 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=707434&r1=707433&r2=707434&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/remote/OpenShellHandler.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/servicemix/kernel/gshell/core/remote/OpenShellHandler.java Thu Oct 23 11:17:51 2008
@@ -23,14 +23,12 @@
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;
@@ -66,8 +64,14 @@
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() {
+ // Create a new shell instance
+ context.shell = context.container.getBean("remoteShell", Shell.class);
+
+ context.shellContext = new ShellContext() {
+ public Shell getShell() {
+ return context.shell;
+ }
+
public IO getIo() {
return context.io;
}
@@ -77,16 +81,6 @@
}
};
- 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);
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=707434&r1=707433&r2=707434&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:17:51 2008
@@ -101,7 +101,7 @@
<property name="fileSystemManager" ref="fileSystemManager"/>
<property name="scheme" value="file"/>
<property name="provider">
- <bean class="org.apache.geronimo.gshell.vfs.provider.local.LocalFileProvider"/>
+ <bean class="org.apache.commons.vfs.provider.local.DefaultLocalFileProvider"/>
</property>
</bean>
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/org/apache/servicemix/kernel/gshell/core/commands.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/org/apache/servicemix/kernel/gshell/core/commands.xml?rev=707434&r1=707433&r2=707434&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/org/apache/servicemix/kernel/gshell/core/commands.xml (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/org/apache/servicemix/kernel/gshell/core/commands.xml Thu Oct 23 11:17:51 2008
@@ -33,10 +33,6 @@
<bean class="org.apache.geronimo.gshell.wisdom.command.MessageSourceCommandDocumenter"/>
</property>
- <property name="completer">
- <bean class="org.apache.geronimo.gshell.wisdom.command.NullCommandCompleter"/>
- </property>
-
<property name="messages">
<bean class="org.apache.geronimo.gshell.wisdom.command.CommandMessageSource"/>
</property>
@@ -47,10 +43,6 @@
<bean class="org.apache.geronimo.gshell.wisdom.command.MessageSourceCommandDocumenter"/>
</property>
- <property name="completer">
- <bean class="org.apache.geronimo.gshell.wisdom.command.NullCommandCompleter"/>
- </property>
-
<property name="messages">
<bean class="org.apache.geronimo.gshell.wisdom.command.CommandMessageSource"/>
</property>
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/FeaturesServiceImpl.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/FeaturesServiceImpl.java?rev=707434&r1=707433&r2=707434&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/FeaturesServiceImpl.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/FeaturesServiceImpl.java Thu Oct 23 11:17:51 2008
@@ -31,8 +31,6 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.Collections;
-import java.util.Comparator;
import java.util.jar.JarInputStream;
import java.util.jar.Manifest;