servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r750511 - in /servicemix/smx4/kernel/trunk: assembly/src/main/distribution/text/etc/ gshell/gshell-core/src/main/resources/META-INF/spring/
Date Thu, 05 Mar 2009 17:07:54 GMT
Author: gnodet
Date: Thu Mar  5 17:07:52 2009
New Revision: 750511

URL: http://svn.apache.org/viewvc?rev=750511&view=rev
Log:
Fix startLocalShell / startRemoteShell properties so that they don't go through the ConfigAdmin
because if so they are not overriden by the system property values.

Modified:
    servicemix/smx4/kernel/trunk/assembly/src/main/distribution/text/etc/org.apache.servicemix.shell.cfg
    servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-local.xml
    servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-osgi.xml
    servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-remote.xml

Modified: servicemix/smx4/kernel/trunk/assembly/src/main/distribution/text/etc/org.apache.servicemix.shell.cfg
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/distribution/text/etc/org.apache.servicemix.shell.cfg?rev=750511&r1=750510&r2=750511&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/src/main/distribution/text/etc/org.apache.servicemix.shell.cfg
(original)
+++ servicemix/smx4/kernel/trunk/assembly/src/main/distribution/text/etc/org.apache.servicemix.shell.cfg
Thu Mar  5 17:07:52 2009
@@ -18,8 +18,6 @@
 ################################################################################
 
 #
-startLocalConsole=${servicemix.startLocalConsole}
-startRemoteShell=${servicemix.startRemoteShell}
 sshPort=8101
 sshRealm=servicemix
 hostKey=${servicemix.base}/etc/host.key

Modified: servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-local.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-local.xml?rev=750511&r1=750510&r2=750511&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-local.xml
(original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-local.xml
Thu Mar  5 17:07:52 2009
@@ -42,7 +42,7 @@
     <osgi:reference id="mainService" interface="org.apache.servicemix.kernel.main.spi.MainService"/>
 
     <bean id="localConsole" class="org.apache.servicemix.kernel.gshell.core.LocalConsole">
-        <property name="createLocalShell" value="${startLocalConsole}"/>
+        <property name="createLocalShell" value="${servicemix.startLocalConsole}"/>
         <property name="shell" ref="localShell"/>
         <property name="mainService" ref="mainService" />
     </bean>

Modified: servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-osgi.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-osgi.xml?rev=750511&r1=750510&r2=750511&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-osgi.xml
(original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-osgi.xml
Thu Mar  5 17:07:52 2009
@@ -63,8 +63,6 @@
     </osgi:service>
 
     <osgix:cm-properties id="cmProps" persistent-id="org.apache.servicemix.shell">
-        <prop key="startLocalConsole">${servicemix.startLocalConsole}</prop>
-        <prop key="startRemoteShell">${servicemix.startRemoteShell}</prop>
         <prop key="sshPort">8101</prop>
         <prop key="sshRealm">servicemix</prop>
         <prop key="hostKey">${servicemix.base}/etc/host.key</prop>

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=750511&r1=750510&r2=750511&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 Mar  5 17:07:52 2009
@@ -79,7 +79,7 @@
 
     <bean id="sshServerFactory" class="org.apache.servicemix.kernel.gshell.core.sshd.SshServerFactory"
init-method="start" destroy-method="stop">
         <constructor-arg ref="sshServer" />
-        <property name="start" value="${startRemoteShell}" />
+        <property name="start" value="${servicemix.startRemoteShell}" />
     </bean>
 
     <!--



Mime
View raw message