You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2011/02/03 16:55:37 UTC
svn commit: r1066840 - in /karaf/trunk:
admin/command/src/main/resources/OSGI-INF/blueprint/
admin/management/src/main/resources/OSGI-INF/blueprint/
deployer/blueprint/src/main/resources/OSGI-INF/blueprint/
deployer/spring/src/main/resources/OSGI-INF/b...
Author: gnodet
Date: Thu Feb 3 15:55:36 2011
New Revision: 1066840
URL: http://svn.apache.org/viewvc?rev=1066840&view=rev
Log:
[KARAF-443] Most of the blueprint bundles should be lazy by default
Modified:
karaf/trunk/admin/command/src/main/resources/OSGI-INF/blueprint/admin-command.xml
karaf/trunk/admin/management/src/main/resources/OSGI-INF/blueprint/admin-management.xml
karaf/trunk/deployer/blueprint/src/main/resources/OSGI-INF/blueprint/blueprint-deployer.xml
karaf/trunk/deployer/spring/src/main/resources/OSGI-INF/blueprint/spring-deployer.xml
karaf/trunk/deployer/wrap/src/main/java/org/apache/karaf/deployer/wrap/WrapDeploymentListener.java
karaf/trunk/diagnostic/command/src/main/resources/OSGI-INF/blueprint/shell-diagnostic.xml
karaf/trunk/diagnostic/common/src/main/resources/OSGI-INF/blueprint/diagnostic-services.xml
karaf/trunk/diagnostic/management/src/main/resources/OSGI-INF/blueprint/diagnostic-management.xml
karaf/trunk/features/command/src/main/resources/OSGI-INF/blueprint/features-command.xml
karaf/trunk/features/core/src/main/resources/OSGI-INF/blueprint/gshell-features.xml
karaf/trunk/features/management/src/main/resources/OSGI-INF/blueprint/features-management.xml
karaf/trunk/features/obr/src/main/resources/OSGI-INF/blueprint/features-obr.xml
karaf/trunk/shell/commands/src/main/resources/OSGI-INF/blueprint/shell-commands.xml
karaf/trunk/shell/dev/src/main/resources/OSGI-INF/blueprint/shell-dev.xml
karaf/trunk/shell/log/src/main/resources/OSGI-INF/blueprint/shell-log.xml
karaf/trunk/shell/obr/src/main/resources/OSGI-INF/blueprint/shell-obr.xml
karaf/trunk/shell/osgi/src/main/resources/OSGI-INF/blueprint/shell-osgi.xml
karaf/trunk/shell/packages/src/main/resources/OSGI-INF/blueprint/shell-packages.xml
karaf/trunk/shell/web/src/main/resources/OSGI-INF/blueprint/shell-web.xml
karaf/trunk/shell/wrapper/src/main/resources/OSGI-INF/blueprint/shell-wrapper.xml
karaf/trunk/webconsole/admin/src/main/resources/OSGI-INF/blueprint/webconsole-admin.xml
karaf/trunk/webconsole/gogo/src/main/resources/OSGI-INF/blueprint/webconsole-gogo.xml
Modified: karaf/trunk/admin/command/src/main/resources/OSGI-INF/blueprint/admin-command.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/command/src/main/resources/OSGI-INF/blueprint/admin-command.xml?rev=1066840&r1=1066839&r2=1066840&view=diff
==============================================================================
--- karaf/trunk/admin/command/src/main/resources/OSGI-INF/blueprint/admin-command.xml (original)
+++ karaf/trunk/admin/command/src/main/resources/OSGI-INF/blueprint/admin-command.xml Thu Feb 3 15:55:36 2011
@@ -18,7 +18,6 @@
-->
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
- xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0"
default-activation="lazy">
<command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.0.0">
Modified: karaf/trunk/admin/management/src/main/resources/OSGI-INF/blueprint/admin-management.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/management/src/main/resources/OSGI-INF/blueprint/admin-management.xml?rev=1066840&r1=1066839&r2=1066840&view=diff
==============================================================================
--- karaf/trunk/admin/management/src/main/resources/OSGI-INF/blueprint/admin-management.xml (original)
+++ karaf/trunk/admin/management/src/main/resources/OSGI-INF/blueprint/admin-management.xml Thu Feb 3 15:55:36 2011
@@ -17,7 +17,7 @@
limitations under the License.
-->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" default-activation="lazy">
<reference id="adminService" interface="org.apache.karaf.admin.AdminService" />
Modified: karaf/trunk/deployer/blueprint/src/main/resources/OSGI-INF/blueprint/blueprint-deployer.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/blueprint/src/main/resources/OSGI-INF/blueprint/blueprint-deployer.xml?rev=1066840&r1=1066839&r2=1066840&view=diff
==============================================================================
--- karaf/trunk/deployer/blueprint/src/main/resources/OSGI-INF/blueprint/blueprint-deployer.xml (original)
+++ karaf/trunk/deployer/blueprint/src/main/resources/OSGI-INF/blueprint/blueprint-deployer.xml Thu Feb 3 15:55:36 2011
@@ -17,7 +17,7 @@
limitations under the License.
-->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" default-activation="lazy">
<service id="blueprintUrlHandler" interface="org.osgi.service.url.URLStreamHandlerService">
<service-properties>
Modified: karaf/trunk/deployer/spring/src/main/resources/OSGI-INF/blueprint/spring-deployer.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/spring/src/main/resources/OSGI-INF/blueprint/spring-deployer.xml?rev=1066840&r1=1066839&r2=1066840&view=diff
==============================================================================
--- karaf/trunk/deployer/spring/src/main/resources/OSGI-INF/blueprint/spring-deployer.xml (original)
+++ karaf/trunk/deployer/spring/src/main/resources/OSGI-INF/blueprint/spring-deployer.xml Thu Feb 3 15:55:36 2011
@@ -17,7 +17,7 @@
limitations under the License.
-->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" default-activation="lazy">
<service id="springUrlHandler" interface="org.osgi.service.url.URLStreamHandlerService">
<service-properties>
Modified: karaf/trunk/deployer/wrap/src/main/java/org/apache/karaf/deployer/wrap/WrapDeploymentListener.java
URL: http://svn.apache.org/viewvc/karaf/trunk/deployer/wrap/src/main/java/org/apache/karaf/deployer/wrap/WrapDeploymentListener.java?rev=1066840&r1=1066839&r2=1066840&view=diff
==============================================================================
--- karaf/trunk/deployer/wrap/src/main/java/org/apache/karaf/deployer/wrap/WrapDeploymentListener.java (original)
+++ karaf/trunk/deployer/wrap/src/main/java/org/apache/karaf/deployer/wrap/WrapDeploymentListener.java Thu Feb 3 15:55:36 2011
@@ -42,14 +42,18 @@ public class WrapDeploymentListener impl
return false;
}
JarFile jar = new JarFile(artifact);
- // only handle non OSGi jar
- Manifest manifest = jar.getManifest();
- if (manifest != null &&
- manifest.getMainAttributes().getValue(new Attributes.Name("Bundle-SymbolicName")) != null &&
- manifest.getMainAttributes().getValue(new Attributes.Name("Bundle-Version")) != null) {
- return false;
+ try {
+ // only handle non OSGi jar
+ Manifest manifest = jar.getManifest();
+ if (manifest != null &&
+ manifest.getMainAttributes().getValue(new Attributes.Name("Bundle-SymbolicName")) != null &&
+ manifest.getMainAttributes().getValue(new Attributes.Name("Bundle-Version")) != null) {
+ return false;
+ }
+ return true;
+ } finally {
+ jar.close();
}
- return true;
} catch (Exception e) {
return false;
}
Modified: karaf/trunk/diagnostic/command/src/main/resources/OSGI-INF/blueprint/shell-diagnostic.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/diagnostic/command/src/main/resources/OSGI-INF/blueprint/shell-diagnostic.xml?rev=1066840&r1=1066839&r2=1066840&view=diff
==============================================================================
--- karaf/trunk/diagnostic/command/src/main/resources/OSGI-INF/blueprint/shell-diagnostic.xml (original)
+++ karaf/trunk/diagnostic/command/src/main/resources/OSGI-INF/blueprint/shell-diagnostic.xml Thu Feb 3 15:55:36 2011
@@ -17,7 +17,7 @@
limitations under the License.
-->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" default-activation="lazy">
<command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.0.0">
<command name="dev/create-dump">
Modified: karaf/trunk/diagnostic/common/src/main/resources/OSGI-INF/blueprint/diagnostic-services.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/diagnostic/common/src/main/resources/OSGI-INF/blueprint/diagnostic-services.xml?rev=1066840&r1=1066839&r2=1066840&view=diff
==============================================================================
--- karaf/trunk/diagnostic/common/src/main/resources/OSGI-INF/blueprint/diagnostic-services.xml (original)
+++ karaf/trunk/diagnostic/common/src/main/resources/OSGI-INF/blueprint/diagnostic-services.xml Thu Feb 3 15:55:36 2011
@@ -17,7 +17,7 @@
limitations under the License.
-->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" default-activation="lazy">
<bean id="features" class="org.apache.karaf.diagnostic.common.FeaturesDumpProvider">
<argument>
Modified: karaf/trunk/diagnostic/management/src/main/resources/OSGI-INF/blueprint/diagnostic-management.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/diagnostic/management/src/main/resources/OSGI-INF/blueprint/diagnostic-management.xml?rev=1066840&r1=1066839&r2=1066840&view=diff
==============================================================================
--- karaf/trunk/diagnostic/management/src/main/resources/OSGI-INF/blueprint/diagnostic-management.xml (original)
+++ karaf/trunk/diagnostic/management/src/main/resources/OSGI-INF/blueprint/diagnostic-management.xml Thu Feb 3 15:55:36 2011
@@ -17,7 +17,7 @@
limitations under the License.
-->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" default-activation="lazy">
<reference-list id="providers" availability="optional"
interface="org.apache.karaf.diagnostic.core.DumpProvider" />
Modified: karaf/trunk/features/command/src/main/resources/OSGI-INF/blueprint/features-command.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/features/command/src/main/resources/OSGI-INF/blueprint/features-command.xml?rev=1066840&r1=1066839&r2=1066840&view=diff
==============================================================================
--- karaf/trunk/features/command/src/main/resources/OSGI-INF/blueprint/features-command.xml (original)
+++ karaf/trunk/features/command/src/main/resources/OSGI-INF/blueprint/features-command.xml Thu Feb 3 15:55:36 2011
@@ -17,8 +17,7 @@
limitations under the License.
-->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
- xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0">
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" default-activation="lazy">
<command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.0.0">
<command name="features/addUrl">
Modified: karaf/trunk/features/core/src/main/resources/OSGI-INF/blueprint/gshell-features.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/features/core/src/main/resources/OSGI-INF/blueprint/gshell-features.xml?rev=1066840&r1=1066839&r2=1066840&view=diff
==============================================================================
--- karaf/trunk/features/core/src/main/resources/OSGI-INF/blueprint/gshell-features.xml (original)
+++ karaf/trunk/features/core/src/main/resources/OSGI-INF/blueprint/gshell-features.xml Thu Feb 3 15:55:36 2011
@@ -18,7 +18,8 @@
-->
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
- xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0">
+ xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0"
+ default-activation="lazy">
<ext:property-placeholder placeholder-prefix="$(" placeholder-suffix=")"/>
Modified: karaf/trunk/features/management/src/main/resources/OSGI-INF/blueprint/features-management.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/features/management/src/main/resources/OSGI-INF/blueprint/features-management.xml?rev=1066840&r1=1066839&r2=1066840&view=diff
==============================================================================
--- karaf/trunk/features/management/src/main/resources/OSGI-INF/blueprint/features-management.xml (original)
+++ karaf/trunk/features/management/src/main/resources/OSGI-INF/blueprint/features-management.xml Thu Feb 3 15:55:36 2011
@@ -18,7 +18,7 @@
-->
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
- xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0">
+ default-activation="lazy">
<reference id="featuresService" interface="org.apache.karaf.features.FeaturesService" />
Modified: karaf/trunk/features/obr/src/main/resources/OSGI-INF/blueprint/features-obr.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/features/obr/src/main/resources/OSGI-INF/blueprint/features-obr.xml?rev=1066840&r1=1066839&r2=1066840&view=diff
==============================================================================
--- karaf/trunk/features/obr/src/main/resources/OSGI-INF/blueprint/features-obr.xml (original)
+++ karaf/trunk/features/obr/src/main/resources/OSGI-INF/blueprint/features-obr.xml Thu Feb 3 15:55:36 2011
@@ -17,7 +17,7 @@
limitations under the License.
-->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" default-activation="lazy">
<bean id="obrResolver" class="org.apache.karaf.features.obr.internal.ObrResolver">
<property name="repositoryAdmin" ref="repositoryAdmin" />
Modified: karaf/trunk/shell/commands/src/main/resources/OSGI-INF/blueprint/shell-commands.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/resources/OSGI-INF/blueprint/shell-commands.xml?rev=1066840&r1=1066839&r2=1066840&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/main/resources/OSGI-INF/blueprint/shell-commands.xml (original)
+++ karaf/trunk/shell/commands/src/main/resources/OSGI-INF/blueprint/shell-commands.xml Thu Feb 3 15:55:36 2011
@@ -17,7 +17,7 @@
limitations under the License.
-->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" default-activation="lazy">
<command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.0.0">
<command name="shell/cat">
Modified: karaf/trunk/shell/dev/src/main/resources/OSGI-INF/blueprint/shell-dev.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/dev/src/main/resources/OSGI-INF/blueprint/shell-dev.xml?rev=1066840&r1=1066839&r2=1066840&view=diff
==============================================================================
--- karaf/trunk/shell/dev/src/main/resources/OSGI-INF/blueprint/shell-dev.xml (original)
+++ karaf/trunk/shell/dev/src/main/resources/OSGI-INF/blueprint/shell-dev.xml Thu Feb 3 15:55:36 2011
@@ -17,9 +17,7 @@
limitations under the License.
-->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
- xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0"
- xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0">
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" default-activation="lazy">
<command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.0.0">
<command name="dev/show-tree">
Modified: karaf/trunk/shell/log/src/main/resources/OSGI-INF/blueprint/shell-log.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/log/src/main/resources/OSGI-INF/blueprint/shell-log.xml?rev=1066840&r1=1066839&r2=1066840&view=diff
==============================================================================
--- karaf/trunk/shell/log/src/main/resources/OSGI-INF/blueprint/shell-log.xml (original)
+++ karaf/trunk/shell/log/src/main/resources/OSGI-INF/blueprint/shell-log.xml Thu Feb 3 15:55:36 2011
@@ -18,7 +18,8 @@
-->
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
- xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0">
+ xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0"
+ default-activation="lazy">
<!-- TODO: use dynamic CM config -->
Modified: karaf/trunk/shell/obr/src/main/resources/OSGI-INF/blueprint/shell-obr.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/obr/src/main/resources/OSGI-INF/blueprint/shell-obr.xml?rev=1066840&r1=1066839&r2=1066840&view=diff
==============================================================================
--- karaf/trunk/shell/obr/src/main/resources/OSGI-INF/blueprint/shell-obr.xml (original)
+++ karaf/trunk/shell/obr/src/main/resources/OSGI-INF/blueprint/shell-obr.xml Thu Feb 3 15:55:36 2011
@@ -17,7 +17,7 @@
limitations under the License.
-->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" default-activation="lazy">
<command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.0.0">
<command name="obr/addUrl">
Modified: karaf/trunk/shell/osgi/src/main/resources/OSGI-INF/blueprint/shell-osgi.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/osgi/src/main/resources/OSGI-INF/blueprint/shell-osgi.xml?rev=1066840&r1=1066839&r2=1066840&view=diff
==============================================================================
--- karaf/trunk/shell/osgi/src/main/resources/OSGI-INF/blueprint/shell-osgi.xml (original)
+++ karaf/trunk/shell/osgi/src/main/resources/OSGI-INF/blueprint/shell-osgi.xml Thu Feb 3 15:55:36 2011
@@ -17,7 +17,7 @@
limitations under the License.
-->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" default-activation="lazy">
<command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.0.0">
<command name="osgi/bundle-level">
Modified: karaf/trunk/shell/packages/src/main/resources/OSGI-INF/blueprint/shell-packages.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/packages/src/main/resources/OSGI-INF/blueprint/shell-packages.xml?rev=1066840&r1=1066839&r2=1066840&view=diff
==============================================================================
--- karaf/trunk/shell/packages/src/main/resources/OSGI-INF/blueprint/shell-packages.xml (original)
+++ karaf/trunk/shell/packages/src/main/resources/OSGI-INF/blueprint/shell-packages.xml Thu Feb 3 15:55:36 2011
@@ -17,7 +17,7 @@
limitations under the License.
-->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" default-activation="lazy">
<command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.0.0">
<command name="packages/exports">
Modified: karaf/trunk/shell/web/src/main/resources/OSGI-INF/blueprint/shell-web.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/web/src/main/resources/OSGI-INF/blueprint/shell-web.xml?rev=1066840&r1=1066839&r2=1066840&view=diff
==============================================================================
--- karaf/trunk/shell/web/src/main/resources/OSGI-INF/blueprint/shell-web.xml (original)
+++ karaf/trunk/shell/web/src/main/resources/OSGI-INF/blueprint/shell-web.xml Thu Feb 3 15:55:36 2011
@@ -17,7 +17,7 @@
limitations under the License.
-->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" default-activation="lazy">
<reference id="slService" interface="org.osgi.service.startlevel.StartLevel" availability="optional" />
Modified: karaf/trunk/shell/wrapper/src/main/resources/OSGI-INF/blueprint/shell-wrapper.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/wrapper/src/main/resources/OSGI-INF/blueprint/shell-wrapper.xml?rev=1066840&r1=1066839&r2=1066840&view=diff
==============================================================================
--- karaf/trunk/shell/wrapper/src/main/resources/OSGI-INF/blueprint/shell-wrapper.xml (original)
+++ karaf/trunk/shell/wrapper/src/main/resources/OSGI-INF/blueprint/shell-wrapper.xml Thu Feb 3 15:55:36 2011
@@ -17,7 +17,7 @@
limitations under the License.
-->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" default-activation="lazy">
<command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.0.0">
<command name="wrapper/install">
Modified: karaf/trunk/webconsole/admin/src/main/resources/OSGI-INF/blueprint/webconsole-admin.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/admin/src/main/resources/OSGI-INF/blueprint/webconsole-admin.xml?rev=1066840&r1=1066839&r2=1066840&view=diff
==============================================================================
--- karaf/trunk/webconsole/admin/src/main/resources/OSGI-INF/blueprint/webconsole-admin.xml (original)
+++ karaf/trunk/webconsole/admin/src/main/resources/OSGI-INF/blueprint/webconsole-admin.xml Thu Feb 3 15:55:36 2011
@@ -17,8 +17,7 @@
limitations under the License.
-->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
- xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0">
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" default-activation="lazy">
<reference id="adminService" interface="org.apache.karaf.admin.AdminService" />
Modified: karaf/trunk/webconsole/gogo/src/main/resources/OSGI-INF/blueprint/webconsole-gogo.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/gogo/src/main/resources/OSGI-INF/blueprint/webconsole-gogo.xml?rev=1066840&r1=1066839&r2=1066840&view=diff
==============================================================================
--- karaf/trunk/webconsole/gogo/src/main/resources/OSGI-INF/blueprint/webconsole-gogo.xml (original)
+++ karaf/trunk/webconsole/gogo/src/main/resources/OSGI-INF/blueprint/webconsole-gogo.xml Thu Feb 3 15:55:36 2011
@@ -17,8 +17,7 @@
limitations under the License.
-->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
- xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0">
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" default-activation="lazy">
<reference id="commandProcessor" interface="org.apache.felix.service.command.CommandProcessor" />