You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2014/01/17 15:31:19 UTC
git commit: Minor reordering
Updated Branches:
refs/heads/master f4dbff111 -> e473d9a9b
Minor reordering
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/e473d9a9
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/e473d9a9
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/e473d9a9
Branch: refs/heads/master
Commit: e473d9a9bc55e9351d9ca22c2c06f412316451a0
Parents: f4dbff1
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Fri Jan 17 15:30:55 2014 +0100
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Fri Jan 17 15:30:55 2014 +0100
----------------------------------------------------------------------
features/core/pom.xml | 3 +-
.../karaf/features/internal/BundleManager.java | 1 +
.../resources/OSGI-INF/blueprint/blueprint.xml | 35 ++++++++++----------
3 files changed, 21 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/e473d9a9/features/core/pom.xml
----------------------------------------------------------------------
diff --git a/features/core/pom.xml b/features/core/pom.xml
index 869f66c..0d9a1e3 100644
--- a/features/core/pom.xml
+++ b/features/core/pom.xml
@@ -65,12 +65,13 @@
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>org.apache.karaf.util</artifactId>
<scope>provided</scope>
</dependency>
+
+
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.junit</artifactId>
http://git-wip-us.apache.org/repos/asf/karaf/blob/e473d9a9/features/core/src/main/java/org/apache/karaf/features/internal/BundleManager.java
----------------------------------------------------------------------
diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/BundleManager.java b/features/core/src/main/java/org/apache/karaf/features/internal/BundleManager.java
index 3caae62..a0eab0c 100644
--- a/features/core/src/main/java/org/apache/karaf/features/internal/BundleManager.java
+++ b/features/core/src/main/java/org/apache/karaf/features/internal/BundleManager.java
@@ -99,6 +99,7 @@ public class BundleManager {
InputStream is = getInputStreamForBundle(bundleLocation);
try {
is.mark(256 * 1024);
+ @SuppressWarnings("resource")
JarInputStream jar = new JarInputStream(is);
Manifest m = jar.getManifest();
if (m == null) {
http://git-wip-us.apache.org/repos/asf/karaf/blob/e473d9a9/features/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git a/features/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/features/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 8b6f702..61f1413 100644
--- a/features/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/features/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -39,6 +39,22 @@
<ext:location>file:$(karaf.etc)/org.apache.karaf.features.cfg</ext:location>
</ext:property-placeholder>
+ <reference-list id="featuresListeners" interface="org.apache.karaf.features.FeaturesListener"
+ availability="optional">
+
+ <reference-listener ref="featuresService"
+ bind-method="registerListener"
+ unbind-method="unregisterListener"/>
+ </reference-list>
+
+ <reference id="configAdmin" interface="org.osgi.service.cm.ConfigurationAdmin"/>
+
+ <reference id="mvnUrlHandler" interface="org.osgi.service.url.URLStreamHandlerService"
+ filter="(url.handler.protocol=mvn)"/>
+
+ <reference id="regionsPersistence" availability="optional"
+ interface="org.apache.karaf.region.persist.RegionsPersistence"/>
+
<bean id="bundleManager" class="org.apache.karaf.features.internal.BundleManager">
<argument ref="blueprintBundleContext"/>
<argument ref="regionsPersistence"/>
@@ -64,28 +80,13 @@
<argument value="$[featuresBootAsynchronous]"/>
</bean>
- <reference-list id="featuresListeners" interface="org.apache.karaf.features.FeaturesListener"
- availability="optional">
- <reference-listener ref="featuresService"
- bind-method="registerListener"
- unbind-method="unregisterListener"/>
- </reference-list>
-
- <reference id="configAdmin" interface="org.osgi.service.cm.ConfigurationAdmin"/>
-
- <reference id="mvnUrlHandler" interface="org.osgi.service.url.URLStreamHandlerService"
- filter="(url.handler.protocol=mvn)"/>
-
- <service ref="featuresService" interface="org.apache.karaf.features.FeaturesService"/>
-
- <reference id="regionsPersistence" availability="optional"
- interface="org.apache.karaf.region.persist.RegionsPersistence"/>
-
<bean id="featuresServiceMBean" class="org.apache.karaf.features.management.internal.FeaturesServiceMBeanImpl">
<property name="bundleContext" ref="blueprintBundleContext"/>
<property name="featuresService" ref="featuresService"/>
</bean>
+ <service ref="featuresService" interface="org.apache.karaf.features.FeaturesService"/>
+
<service ref="featuresServiceMBean" auto-export="interfaces">
<service-properties>
<entry key="jmx.objectname" value="org.apache.karaf:type=feature,name=$(karaf.name)"/>