Repository: karaf
Updated Branches:
  refs/heads/karaf-2.x ae2bee96f -> 353bca3e9


Fix integration tests

Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/353bca3e
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/353bca3e
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/353bca3e

Branch: refs/heads/karaf-2.x
Commit: 353bca3e9535d6293dbb5357411c90d80578f919
Parents: ae2bee9
Author: Guillaume Nodet <gno...@gmail.com>
Authored: Mon Jun 16 20:14:45 2014 +0200
Committer: Guillaume Nodet <gno...@gmail.com>
Committed: Mon Jun 16 20:14:45 2014 +0200

----------------------------------------------------------------------
 .../etc/org.apache.karaf.features.cfg                  |  2 +-
 .../features/spring/src/main/resources/features.xml    |  6 +++---
 .../apache/karaf/management/KarafMBeanServerGuard.java | 13 ++++++++-----
 3 files changed, 12 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/353bca3e/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
----------------------------------------------------------------------
diff --git 
a/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
 
b/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
index c279b55..4bd416e 100644
--- 
a/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
+++ 
b/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
@@ -22,7 +22,7 @@ respectStartLvlDuringFeatureStartup = false
 #
 # Comma separated list of features repositories to register by default
 #
-featuresRepositories = 
mvn:org.apache.karaf.assemblies.features/standard/${project.version}/xml/features,mvn:org.apache.karaf.assemblies.features/enterprise/${project.version}/xml/features
+featuresRepositories = 
mvn:org.apache.karaf.assemblies.features/standard/${project.version}/xml/features,mvn:org.apache.karaf.assemblies.features/spring/${project.version}/xml/features,mvn:org.apache.karaf.assemblies.features/enterprise/${project.version}/xml/features
 
 #
 # Comma separated list of features to install at startup

http://git-wip-us.apache.org/repos/asf/karaf/blob/353bca3e/assemblies/features/spring/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/spring/src/main/resources/features.xml 
b/assemblies/features/spring/src/main/resources/features.xml
index c67fba1..788084a 100644
--- a/assemblies/features/spring/src/main/resources/features.xml
+++ b/assemblies/features/spring/src/main/resources/features.xml
@@ -112,7 +112,7 @@
 
     <feature name="spring-web-portlet" description="Spring 3.1.x Web Portlet 
support" version="${spring31.version}">
         <feature version="[${spring31.version},3.2)">spring-web</feature>
-        <bundle dependency="true" 
start-level="30">mvn:javax.portlet/portlet-api/${portlet-api.version}</bundle>
+        <bundle dependency="true" 
start-level="30">wrap:mvn:javax.portlet/portlet-api/${portlet-api.version}</bundle>
         <bundle 
start-level="30">mvn:org.springframework/spring-webmvc-portlet/${spring31.version}</bundle>
     </feature>
 
@@ -189,7 +189,7 @@
 
     <feature name="spring-web-portlet" description="Spring 3.2.x Web Portlet 
support" version="${spring32.version}">
         <feature version="[${spring32.version},3.3)">spring-web</feature>
-        <bundle dependency="true" 
start-level="30">mvn:javax.portlet/portlet-api/${portlet-api.version}</bundle>
+        <bundle dependency="true" 
start-level="30">wrap:mvn:javax.portlet/portlet-api/${portlet-api.version}</bundle>
         <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc-portlet/${spring32.version}</bundle>
     </feature>
 
@@ -257,7 +257,7 @@
 
     <feature name="spring-web-portlet" description="Spring 4.0.x Web Portlet 
support" version="${spring40.version}">
         <feature version="[${spring40.version},4.1)">spring-web</feature>
-        <bundle dependency="true" 
start-level="30">mvn:javax.portlet/portlet-api/${portlet-api.version}</bundle>
+        <bundle dependency="true" 
start-level="30">wrap:mvn:javax.portlet/portlet-api/${portlet-api.version}</bundle>
         <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc-portlet/${spring40.version}</bundle>
     </feature>
 

http://git-wip-us.apache.org/repos/asf/karaf/blob/353bca3e/management/server/src/main/java/org/apache/karaf/management/KarafMBeanServerGuard.java
----------------------------------------------------------------------
diff --git 
a/management/server/src/main/java/org/apache/karaf/management/KarafMBeanServerGuard.java
 
b/management/server/src/main/java/org/apache/karaf/management/KarafMBeanServerGuard.java
index 15013f6..50af000 100644
--- 
a/management/server/src/main/java/org/apache/karaf/management/KarafMBeanServerGuard.java
+++ 
b/management/server/src/main/java/org/apache/karaf/management/KarafMBeanServerGuard.java
@@ -247,11 +247,14 @@ public class KarafMBeanServerGuard implements 
InvocationHandler {
     private boolean canBypassRBAC(ObjectName objectName) {
         List<String> allBypassObjectName = new ArrayList<String>();
         try {
-            for (Configuration config : 
configAdmin.listConfigurations("(service.pid=" + JMX_ACL_WHITELIST + ")")) {
-                Enumeration<String> keys = config.getProperties().keys();
-                while (keys.hasMoreElements()) {
-                    String element = keys.nextElement();
-                    allBypassObjectName.add(element);
+            Configuration[] configs = 
configAdmin.listConfigurations("(service.pid=" + JMX_ACL_WHITELIST + ")");
+            if (configs != null) {
+                for (Configuration config : configs) {
+                    Enumeration<String> keys = config.getProperties().keys();
+                    while (keys.hasMoreElements()) {
+                        String element = keys.nextElement();
+                        allBypassObjectName.add(element);
+                    }
                 }
             }
         } catch (InvalidSyntaxException ise) {

Reply via email to