Return-Path: Delivered-To: apmail-felix-commits-archive@www.apache.org Received: (qmail 57304 invoked from network); 5 May 2009 17:12:41 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 5 May 2009 17:12:41 -0000 Received: (qmail 89753 invoked by uid 500); 5 May 2009 17:12:41 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 89713 invoked by uid 500); 5 May 2009 17:12:41 -0000 Mailing-List: contact commits-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list commits@felix.apache.org Received: (qmail 89704 invoked by uid 99); 5 May 2009 17:12:41 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 May 2009 17:12:41 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 May 2009 17:12:38 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A27C523889F5; Tue, 5 May 2009 17:12:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r771938 - in /felix/trunk/karaf: gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/ gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/internal/ gshell/gshell-features/src/main/java/org/apa... Date: Tue, 05 May 2009 17:12:17 -0000 To: commits@felix.apache.org From: gnodet@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090505171217.A27C523889F5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gnodet Date: Tue May 5 17:12:16 2009 New Revision: 771938 URL: http://svn.apache.org/viewvc?rev=771938&view=rev Log: Fix a few problems with command bundles not starting correctly Modified: felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/FeaturesRegistry.java felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/internal/FeaturesServiceImpl.java felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/management/ManagedFeaturesRegistry.java felix/trunk/karaf/gshell/gshell-features/src/main/resources/META-INF/spring/gshell-features.xml felix/trunk/karaf/jaas/jaas-modules/src/main/resources/META-INF/spring/karaf-jaas-module.xml Modified: felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/FeaturesRegistry.java URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/FeaturesRegistry.java?rev=771938&r1=771937&r2=771938&view=diff ============================================================================== --- felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/FeaturesRegistry.java (original) +++ felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/FeaturesRegistry.java Tue May 5 17:12:16 2009 @@ -21,6 +21,9 @@ * Tracks features and repositories. */ public interface FeaturesRegistry { + + void setFeaturesService(FeaturesService service); + void register(Feature feature); void unregister(Feature feature); Modified: felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/internal/FeaturesServiceImpl.java URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/internal/FeaturesServiceImpl.java?rev=771938&r1=771937&r2=771938&view=diff ============================================================================== --- felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/internal/FeaturesServiceImpl.java (original) +++ felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/internal/FeaturesServiceImpl.java Tue May 5 17:12:16 2009 @@ -105,6 +105,7 @@ public void setFeaturesServiceRegistry(FeaturesRegistry featuresRegistry) { this.featuresRegistry = featuresRegistry; + this.featuresRegistry.setFeaturesService(this); } public void setUrls(String uris) throws URISyntaxException { Modified: felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/management/ManagedFeaturesRegistry.java URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/management/ManagedFeaturesRegistry.java?rev=771938&r1=771937&r2=771938&view=diff ============================================================================== --- felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/management/ManagedFeaturesRegistry.java (original) +++ felix/trunk/karaf/gshell/gshell-features/src/main/java/org/apache/felix/karaf/gshell/features/management/ManagedFeaturesRegistry.java Tue May 5 17:12:16 2009 @@ -48,6 +48,7 @@ private Map repositories; private boolean mbeanServerInitialized; private FeaturesService featuresService; + private MBeanServer mbeanServer; @ManagedOperation public void installFeature(String name) throws Exception { @@ -182,12 +183,19 @@ if (namingStrategy == null) { throw new IllegalArgumentException("namingStrategy must not be null"); } + if (mbeanServer != null) { + registerMBeanServer(mbeanServer, null); + } } public void registerMBeanServer(MBeanServer mbeanServer, Map props ) throws Exception { if (mbeanServer != null) { - mbeanServerInitialized = true; + this.mbeanServer = mbeanServer; + } + if (managementAgent == null) { + return; } + mbeanServerInitialized = true; managementAgent.register(this, namingStrategy.getObjectName(this)); Modified: felix/trunk/karaf/gshell/gshell-features/src/main/resources/META-INF/spring/gshell-features.xml URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-features/src/main/resources/META-INF/spring/gshell-features.xml?rev=771938&r1=771937&r2=771938&view=diff ============================================================================== --- felix/trunk/karaf/gshell/gshell-features/src/main/resources/META-INF/spring/gshell-features.xml (original) +++ felix/trunk/karaf/gshell/gshell-features/src/main/resources/META-INF/spring/gshell-features.xml Tue May 5 17:12:16 2009 @@ -39,7 +39,7 @@ http://servicemix.apache.org/schema/servicemix-gshell/servicemix-gshell.xsd"> - + @@ -108,7 +108,6 @@ - Modified: felix/trunk/karaf/jaas/jaas-modules/src/main/resources/META-INF/spring/karaf-jaas-module.xml URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/jaas-modules/src/main/resources/META-INF/spring/karaf-jaas-module.xml?rev=771938&r1=771937&r2=771938&view=diff ============================================================================== --- felix/trunk/karaf/jaas/jaas-modules/src/main/resources/META-INF/spring/karaf-jaas-module.xml (original) +++ felix/trunk/karaf/jaas/jaas-modules/src/main/resources/META-INF/spring/karaf-jaas-module.xml Tue May 5 17:12:16 2009 @@ -53,7 +53,7 @@ - users = ${servicemix.base}/etc/users.properties + users = ${karaf.base}/etc/users.properties