servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r707592 - in /servicemix/smx4/kernel/trunk/gshell: gshell-config/src/main/resources/META-INF/spring/ gshell-core/src/main/filtered-resources/org/apache/geronimo/ gshell-core/src/main/java/org/apache/geronimo/gshell/ gshell-core/src/main/res...
Date Fri, 24 Oct 2008 09:53:56 GMT
Author: gnodet
Date: Fri Oct 24 02:53:55 2008
New Revision: 707592

URL: http://svn.apache.org/viewvc?rev=707592&view=rev
Log:
Remove empty dirs and fix the shell which does not start correctly

Removed:
    servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/filtered-resources/org/apache/geronimo/
    servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/
    servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/
    servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/
    servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/
    servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/
    servicemix/smx4/kernel/trunk/gshell/gshell-osgi/src/main/java/org/apache/geronimo/
Modified:
    servicemix/smx4/kernel/trunk/gshell/gshell-config/src/main/resources/META-INF/spring/gshell-config.xml
    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.xml

Modified: servicemix/smx4/kernel/trunk/gshell/gshell-config/src/main/resources/META-INF/spring/gshell-config.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-config/src/main/resources/META-INF/spring/gshell-config.xml?rev=707592&r1=707591&r2=707592&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-config/src/main/resources/META-INF/spring/gshell-config.xml
(original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-config/src/main/resources/META-INF/spring/gshell-config.xml
Fri Oct 24 02:53:55 2008
@@ -57,7 +57,7 @@
             <gshell:action class="org.apache.servicemix.kernel.gshell.config.PropSetCommand"
/>
         </gshell:command>
         <gshell:command name="config/update">
-            <gshell:action class="org.apache.servicemix.kernel.gshell.config.Update" />
+            <gshell:action class="org.apache.servicemix.kernel.gshell.config.UpdateCommand"
/>
         </gshell:command>
     </gshell:command-bundle>
 

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=707592&r1=707591&r2=707592&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
Fri Oct 24 02:53:55 2008
@@ -33,7 +33,7 @@
        default-init-method="init"
        default-destroy-method="destroy">
 
-    <bean id="localShell" factory-bean="applicationManager" factory-method="create"/>
+    <bean id="localShell" parent="shell" init-method="init" destroy-method="close"/>
 
     <osgi:reference id="mainService" interface="org.apache.servicemix.kernel.main.spi.MainService"/>
 

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=707592&r1=707591&r2=707592&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
Fri Oct 24 02:53:55 2008
@@ -102,7 +102,7 @@
         <constructor-arg ref="commandLineBuilder"/>
     </bean>
 
-    <bean id="shell" class="org.apache.geronimo.gshell.wisdom.shell.ShellImpl" scope="prototype">
+    <bean id="shell" class="org.apache.geronimo.gshell.wisdom.shell.ShellImpl" scope="prototype"
init-method="init" destroy-method="close">
         <constructor-arg ref="application"/>
         <constructor-arg ref="commandLineExecutor"/>
 
@@ -153,6 +153,4 @@
         <constructor-arg ref="applicationManager"/>                             
     </bean>
 
-    <bean id="metaDataRegistry" class="org.apache.geronimo.gshell.vfs.provider.meta.data.MetaDataRegistryImpl"/>
-
 </beans>
\ No newline at end of file



Mime
View raw message