felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r771210 - in /felix/trunk/karaf/gshell/gshell-core/src/main: java/org/apache/felix/karaf/gshell/core/ java/org/apache/servicemix/ resources/META-INF/spring/ resources/org/apache/servicemix/
Date Mon, 04 May 2009 07:04:28 GMT
Author: gnodet
Date: Mon May  4 07:04:27 2009
New Revision: 771210

URL: http://svn.apache.org/viewvc?rev=771210&view=rev
Log:
FELIX-1098: Remove some spring strong dependencies

Removed:
    felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/servicemix/
    felix/trunk/karaf/gshell/gshell-core/src/main/resources/org/apache/servicemix/
Modified:
    felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/ApplicationImpl.java
    felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/LocalConsole.java
    felix/trunk/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-local.xml
    felix/trunk/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-osgi.xml
    felix/trunk/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell.xml

Modified: felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/ApplicationImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/ApplicationImpl.java?rev=771210&r1=771209&r2=771210&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/ApplicationImpl.java
(original)
+++ felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/ApplicationImpl.java
Mon May  4 07:04:27 2009
@@ -30,7 +30,7 @@
 import org.apache.geronimo.gshell.io.IO;
 import org.springframework.beans.factory.InitializingBean; 
 
-public class ApplicationImpl implements Application, InitializingBean  {
+public class ApplicationImpl implements Application  {
 
 	private static final String EMBEDDED_PROPS = "org/apache/felix/karaf/version/embedded.properties";
     private static final String SERVICEMIX_VERSION ="org/apache/felix/karaf/gshell/core/servicemix-version.properties";
@@ -49,7 +49,7 @@
         this.homeDir = detectHomeDir();    
     }           
      
-    public void afterPropertiesSet() throws Exception {      	         	    	
+    public void init() throws Exception {
         Properties props = new Properties();
         props.load(getClass().getClassLoader().getResourceAsStream(SERVICEMIX_VERSION));
         String kernelVersion = props.getProperty(VERSION_PROPERTY);

Modified: felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/LocalConsole.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/LocalConsole.java?rev=771210&r1=771209&r2=771210&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/LocalConsole.java
(original)
+++ felix/trunk/karaf/gshell/gshell-core/src/main/java/org/apache/felix/karaf/gshell/core/LocalConsole.java
Mon May  4 07:04:27 2009
@@ -32,9 +32,8 @@
 import org.osgi.util.tracker.ServiceTracker;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.osgi.context.BundleContextAware;
 
-public class LocalConsole implements Runnable, BundleContextAware {
+public class LocalConsole implements Runnable {
 
     private final Logger log = LoggerFactory.getLogger(getClass());
 

Modified: felix/trunk/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-local.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-local.xml?rev=771210&r1=771209&r2=771210&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-local.xml
(original)
+++ felix/trunk/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-local.xml
Mon May  4 07:04:27 2009
@@ -40,6 +40,7 @@
     </bean>
 
     <bean id="localConsole" class="org.apache.felix.karaf.gshell.core.LocalConsole">
+        <property name="bundleContext" ref="bundleContext"/>
         <property name="createLocalShell" value="${karaf.startLocalConsole}"/>
         <property name="shell" ref="localShell"/>
     </bean>

Modified: felix/trunk/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-osgi.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-osgi.xml?rev=771210&r1=771209&r2=771210&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-osgi.xml
(original)
+++ felix/trunk/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-osgi.xml
Mon May  4 07:04:27 2009
@@ -65,7 +65,7 @@
     <osgi:service ref="commandLineExecutor" interface="org.apache.geronimo.gshell.commandline.CommandLineExecutor">
     </osgi:service>
 
-    <osgix:cm-properties id="cmProps" persistent-id="org.apache.servicemix.shell">
+    <osgix:cm-properties id="cmProps" persistent-id="org.apache.felix.karaf.shell">
         <prop key="sshPort">8101</prop>
         <prop key="sshRealm">servicemix</prop>
         <prop key="hostKey">${karaf.base}/etc/host.key</prop>

Modified: felix/trunk/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell.xml?rev=771210&r1=771209&r2=771210&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell.xml (original)
+++ felix/trunk/karaf/gshell/gshell-core/src/main/resources/META-INF/spring/gshell.xml Mon
May  4 07:04:27 2009
@@ -41,7 +41,7 @@
         <property name="prompt" value="@|bold %{gshell.username}|@%{application.id}:@|bold
%{gshell.group}|> " />
     </bean>
 
-    <bean id="application" class="org.apache.felix.karaf.gshell.core.ApplicationImpl">
+    <bean id="application" class="org.apache.felix.karaf.gshell.core.ApplicationImpl"
init-method="init">
         <property name="id" value="${karaf.name}"/>
         <property name="io" ref="io"/>
         <property name="model">



Mime
View raw message