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 2009/01/05 14:32:34 UTC
svn commit: r731564 - in /servicemix/smx4/kernel/trunk:
assembly/src/main/distribution/text/etc/
gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/
gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/g...
Author: gnodet
Date: Mon Jan 5 05:32:33 2009
New Revision: 731564
URL: http://svn.apache.org/viewvc?rev=731564&view=rev
Log:
SMX4KNL-114: prompt should print username@instance-name
Modified:
servicemix/smx4/kernel/trunk/assembly/src/main/distribution/text/etc/system.properties
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/resources/org/apache/servicemix/kernel/gshell/admin/etc/system.properties
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/ServiceMixBranding.java
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.xml
Modified: servicemix/smx4/kernel/trunk/assembly/src/main/distribution/text/etc/system.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/distribution/text/etc/system.properties?rev=731564&r1=731563&r2=731564&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/src/main/distribution/text/etc/system.properties (original)
+++ servicemix/smx4/kernel/trunk/assembly/src/main/distribution/text/etc/system.properties Mon Jan 5 05:32:33 2009
@@ -18,3 +18,4 @@
################################################################################
org.ops4j.pax.logging.DefaultServiceLog.level=ERROR
+servicemix.name=root
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=731564&r1=731563&r2=731564&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 Mon Jan 5 05:32:33 2009
@@ -123,12 +123,13 @@
copyResourceToDir(serviceMixBase, "etc/org.ops4j.pax.logging.cfg", true);
copyResourceToDir(serviceMixBase, "etc/org.ops4j.pax.url.mvn.cfg", true);
copyResourceToDir(serviceMixBase, "etc/startup.properties", true);
- copyResourceToDir(serviceMixBase, "etc/system.properties", true);
HashMap<String, String> props = new HashMap<String, String>();
+ props.put("${servicemix.name}", name);
props.put("${servicemix.home}", System.getProperty("servicemix.home"));
props.put("${servicemix.base}", serviceMixBase.getPath());
props.put("${servicemix.sshPort}", Integer.toString(sshPort));
+ copyFilteredResourceToDir(serviceMixBase, "etc/system.properties", props);
copyFilteredResourceToDir(serviceMixBase, "etc/org.apache.servicemix.shell.cfg", props);
if( System.getProperty("os.name").startsWith("Win") ) {
copyFilteredResourceToDir(serviceMixBase, "bin/servicemix.bat", props);
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/etc/system.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/etc/system.properties?rev=731564&r1=731563&r2=731564&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/etc/system.properties (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/resources/org/apache/servicemix/kernel/gshell/admin/etc/system.properties Mon Jan 5 05:32:33 2009
@@ -17,4 +17,5 @@
#
################################################################################
-org.ops4j.pax.logging.DefaultServiceLog.level=ERROR
\ No newline at end of file
+org.ops4j.pax.logging.DefaultServiceLog.level=ERROR
+servicemix.name=${servicemix.name}
\ No newline at end of file
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=731564&r1=731563&r2=731564&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 Mon Jan 5 05:32:33 2009
@@ -80,9 +80,7 @@
}
public void init() {
- shell.getContext().getVariables().set("gshell.prompt",
- "@|bold %{gshell.user}|@%{application.localHost.hostName}:@|bold %{gshell.group}|> ");
- shell.getContext().getVariables().set("gshell.user", "smx");
+ shell.getContext().getVariables().set("gshell.username", "smx");
frameworkStarted = new CountDownLatch(1);
getBundleContext().addFrameworkListener(new FrameworkListener(){
public void frameworkEvent(FrameworkEvent event) {
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=731564&r1=731563&r2=731564&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 Mon Jan 5 05:32:33 2009
@@ -34,6 +34,8 @@
"|____/ \\___|_| \\_/ |_|\\___\\___|_| |_|_/_/\\_\\",
};
+ private String prompt;
+
public String getName() {
return "servicemix";
}
@@ -77,4 +79,12 @@
return writer.toString();
}
+
+ public String getPrompt() {
+ return prompt;
+ }
+
+ public void setPrompt(String prompt) {
+ this.prompt = prompt;
+ }
}
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=731564&r1=731563&r2=731564&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 Mon Jan 5 05:32:33 2009
@@ -43,6 +43,7 @@
<property name="port" value="${sshPort}" />
<property name="shellFactory">
<bean class="org.apache.geronimo.gshell.commands.ssh.ShellFactoryImpl">
+ <property name="application" ref="application" />
<property name="completers">
<list>
<ref bean="commandsCompleter"/>
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell.xml?rev=731564&r1=731563&r2=731564&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell.xml (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell.xml Mon Jan 5 05:32:33 2009
@@ -37,10 +37,12 @@
<property name="verbosity" value="DEBUG"/>
</bean>
- <bean id="branding" class="org.apache.servicemix.kernel.gshell.core.ServiceMixBranding"/>
+ <bean id="branding" class="org.apache.servicemix.kernel.gshell.core.ServiceMixBranding">
+ <property name="prompt" value="@|bold %{gshell.username}|@%{application.id}:@|bold %{gshell.group}|> " />
+ </bean>
<bean id="application" class="org.apache.servicemix.kernel.gshell.core.ApplicationImpl">
- <property name="id" value="servicemix"/>
+ <property name="id" value="${servicemix.name}"/>
<property name="io" ref="io"/>
<property name="model">
<bean class="org.apache.geronimo.gshell.application.model.ApplicationModel">