karaf git commit: [KARAF-4784] OsgiConfiguration for JAAS should fallback to default configuration

2016-12-01 Thread gnodet 
Repository: karaf
Updated Branches:
  refs/heads/master 040c805f4 -> ad3e4bd98


[KARAF-4784] OsgiConfiguration for JAAS should fallback to default configuration

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

Branch: refs/heads/master
Commit: ad3e4bd98e71eba03fd79f8fae1194f4c803c7aa
Parents: 040c805
Author: Guillaume Nodet 
Authored: Thu Dec 1 17:16:03 2016 +0100
Committer: Guillaume Nodet 
Committed: Thu Dec 1 17:16:03 2016 +0100

--
 .../org/apache/karaf/jaas/config/impl/OsgiConfiguration.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/karaf/blob/ad3e4bd9/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiConfiguration.java
--
diff --git 
a/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiConfiguration.java
 
b/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiConfiguration.java
index 522507d..cdc2471 100644
--- 
a/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiConfiguration.java
+++ 
b/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiConfiguration.java
@@ -75,6 +75,8 @@ public class OsgiConfiguration extends Configuration {
 }
 
 public void refresh() {
-// Nothing to do, as we auto-update the configuration
+if (defaultConfiguration != null) {
+defaultConfiguration.refresh();
+}
 }
 }

karaf git commit: [KARAF-4784] OsgiConfiguration for JAAS should fallback to default configuration

2016-12-01 Thread gnodet 
Repository: karaf
Updated Branches:
  refs/heads/master 7eea1ff73 -> 040c805f4


[KARAF-4784] OsgiConfiguration for JAAS should fallback to default configuration

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

Branch: refs/heads/master
Commit: 040c805f47abe0f0a3fd18258e14bec5f4bca5a8
Parents: 7eea1ff
Author: Guillaume Nodet 
Authored: Thu Dec 1 17:14:00 2016 +0100
Committer: Guillaume Nodet 
Committed: Thu Dec 1 17:14:36 2016 +0100

--
 .../karaf/jaas/config/impl/OsgiConfiguration.java   | 12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/karaf/blob/040c805f/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiConfiguration.java
--
diff --git 
a/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiConfiguration.java
 
b/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiConfiguration.java
index 6c995ba..522507d 100644
--- 
a/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiConfiguration.java
+++ 
b/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiConfiguration.java
@@ -23,18 +23,26 @@ import javax.security.auth.login.Configuration;
 
 import org.apache.karaf.jaas.config.JaasRealm;
 import org.apache.karaf.util.collections.CopyOnWriteArrayIdentityList;
+import org.slf4j.LoggerFactory;
 
 public class OsgiConfiguration extends Configuration {
 
 private final List realms = new 
CopyOnWriteArrayIdentityList();
+private Configuration defaultConfiguration;
 
 public void init() {
+try {
+defaultConfiguration = Configuration.getConfiguration();
+} catch (Throwable ex) {
+// default configuration for fallback could not be retrieved
+LoggerFactory.getLogger(OsgiConfiguration.class).warn("Unable to 
retrieve default configuration", ex);
+}
 Configuration.setConfiguration(this);
 }
 
 public void close() {
 realms.clear();
-Configuration.setConfiguration(null);
+Configuration.setConfiguration(defaultConfiguration);
 }
 
 public void register(JaasRealm realm, Map properties) {
@@ -60,6 +68,8 @@ public class OsgiConfiguration extends Configuration {
 }
 if (realm != null) {
 return realm.getEntries();
+} else if (defaultConfiguration != null) {
+return defaultConfiguration.getAppConfigurationEntry(name);
 }
 return null;
 }

Jenkins build is still unstable: karaf-4.0.x » Apache Karaf :: Integration Tests #276

2016-12-01 Thread Apache Jenkins Server 
See

Jenkins build is still unstable: karaf-4.0.x #276

2016-12-01 Thread Apache Jenkins Server 
See

karaf git commit: [KARAF-4871] LDAPLoginModule allows non defined role filter. Thanks to Colm O hEigeartaigh.

2016-12-01 Thread jbonofre 
Repository: karaf
Updated Branches:
  refs/heads/karaf-4.0.x 48b067cde -> 69b067608


[KARAF-4871] LDAPLoginModule allows non defined role filter. Thanks to Colm O 
hEigeartaigh.


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

Branch: refs/heads/karaf-4.0.x
Commit: 69b06760856948e23b9cba7589de99c41ae6f85b
Parents: 48b067c
Author: Jean-Baptiste Onofré 
Authored: Thu Dec 1 15:44:06 2016 +0100
Committer: Jean-Baptiste Onofré 
Committed: Thu Dec 1 15:46:30 2016 +0100

--
 .../karaf/jaas/modules/ldap/LDAPCache.java  | 87 +++-
 1 file changed, 47 insertions(+), 40 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/karaf/blob/69b06760/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPCache.java
--
diff --git 
a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPCache.java 
b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPCache.java
index 203eb66..f80af8c 100644
--- 
a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPCache.java
+++ 
b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPCache.java
@@ -124,11 +124,13 @@ public class LDAPCache implements Closeable, 
NamespaceChangeListener, ObjectChan
 eventContext.addNamingListener(options.getUserBaseDn(), filter, 
constraints, this);
 
 filter = options.getRoleFilter();
-filter = filter.replaceAll(Pattern.quote("%u"), 
Matcher.quoteReplacement("*"));
-filter = filter.replaceAll(Pattern.quote("%dn"), 
Matcher.quoteReplacement("*"));
-filter = filter.replaceAll(Pattern.quote("%fqdn"), 
Matcher.quoteReplacement("*"));
-filter = filter.replace("\\", "");
-eventContext.addNamingListener(options.getRoleBaseDn(), filter, 
constraints, this);
+if (filter != null) {
+filter = filter.replaceAll(Pattern.quote("%u"), 
Matcher.quoteReplacement("*"));
+filter = filter.replaceAll(Pattern.quote("%dn"), 
Matcher.quoteReplacement("*"));
+filter = filter.replaceAll(Pattern.quote("%fqdn"), 
Matcher.quoteReplacement("*"));
+filter = filter.replace("\\", "");
+eventContext.addNamingListener(options.getRoleBaseDn(), 
filter, constraints, this);
+}
 }
 
 return context;
@@ -238,50 +240,55 @@ public class LDAPCache implements Closeable, 
NamespaceChangeListener, ObjectChan
 }
 
 String filter = options.getRoleFilter();
-filter = filter.replaceAll(Pattern.quote("%u"), 
Matcher.quoteReplacement(user));
-filter = filter.replaceAll(Pattern.quote("%dn"), 
Matcher.quoteReplacement(userDn));
-filter = filter.replaceAll(Pattern.quote("%fqdn"), 
Matcher.quoteReplacement(userDnNamespace));
-filter = filter.replace("\\", "");
+if (filter != null) {
+filter = filter.replaceAll(Pattern.quote("%u"), 
Matcher.quoteReplacement(user));
+filter = filter.replaceAll(Pattern.quote("%dn"), 
Matcher.quoteReplacement(userDn));
+filter = filter.replaceAll(Pattern.quote("%fqdn"), 
Matcher.quoteReplacement(userDnNamespace));
+filter = filter.replace("\\", "");
 
-LOGGER.debug("Looking for the user roles in LDAP with ");
-LOGGER.debug("  base DN: " + options.getRoleBaseDn());
-LOGGER.debug("  filter: " + filter);
+LOGGER.debug("Looking for the user roles in LDAP with ");
+LOGGER.debug("  base DN: " + options.getRoleBaseDn());
+LOGGER.debug("  filter: " + filter);
 
-NamingEnumeration namingEnumeration = 
context.search(options.getRoleBaseDn(), filter, controls);
-try {
-List rolesList = new ArrayList<>();
-while (namingEnumeration.hasMore()) {
-SearchResult result = (SearchResult) namingEnumeration.next();
-Attributes attributes = result.getAttributes();
-Attribute roles1 = 
attributes.get(options.getRoleNameAttribute());
-if (roles1 != null) {
-for (int i = 0; i < roles1.size(); i++) {
-String role = (String) roles1.get(i);
-if (role != null) {
-LOGGER.debug("User {} is a member of role {}", 
user, role);
-// handle role mapping
-Set roleMappings = tryMappingRole(role);
-if (roleMappings.isEmpty()) {
-

karaf git commit: [KARAF-4871] LDAPLoginModule allows non defined role filter. Thanks to Colm O hEigeartaigh.

2016-12-01 Thread jbonofre 
Repository: karaf
Updated Branches:
  refs/heads/master f08248feb -> 7eea1ff73


[KARAF-4871] LDAPLoginModule allows non defined role filter. Thanks to Colm O 
hEigeartaigh.


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

Branch: refs/heads/master
Commit: 7eea1ff73ca667db6505c38d2dcf29c9048dcaec
Parents: f08248f
Author: Jean-Baptiste Onofré 
Authored: Thu Dec 1 15:44:06 2016 +0100
Committer: Jean-Baptiste Onofré 
Committed: Thu Dec 1 15:44:06 2016 +0100

--
 .../karaf/jaas/modules/ldap/LDAPCache.java  | 87 +++-
 1 file changed, 47 insertions(+), 40 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/karaf/blob/7eea1ff7/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPCache.java
--
diff --git 
a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPCache.java 
b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPCache.java
index 203eb66..f80af8c 100644
--- 
a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPCache.java
+++ 
b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPCache.java
@@ -124,11 +124,13 @@ public class LDAPCache implements Closeable, 
NamespaceChangeListener, ObjectChan
 eventContext.addNamingListener(options.getUserBaseDn(), filter, 
constraints, this);
 
 filter = options.getRoleFilter();
-filter = filter.replaceAll(Pattern.quote("%u"), 
Matcher.quoteReplacement("*"));
-filter = filter.replaceAll(Pattern.quote("%dn"), 
Matcher.quoteReplacement("*"));
-filter = filter.replaceAll(Pattern.quote("%fqdn"), 
Matcher.quoteReplacement("*"));
-filter = filter.replace("\\", "");
-eventContext.addNamingListener(options.getRoleBaseDn(), filter, 
constraints, this);
+if (filter != null) {
+filter = filter.replaceAll(Pattern.quote("%u"), 
Matcher.quoteReplacement("*"));
+filter = filter.replaceAll(Pattern.quote("%dn"), 
Matcher.quoteReplacement("*"));
+filter = filter.replaceAll(Pattern.quote("%fqdn"), 
Matcher.quoteReplacement("*"));
+filter = filter.replace("\\", "");
+eventContext.addNamingListener(options.getRoleBaseDn(), 
filter, constraints, this);
+}
 }
 
 return context;
@@ -238,50 +240,55 @@ public class LDAPCache implements Closeable, 
NamespaceChangeListener, ObjectChan
 }
 
 String filter = options.getRoleFilter();
-filter = filter.replaceAll(Pattern.quote("%u"), 
Matcher.quoteReplacement(user));
-filter = filter.replaceAll(Pattern.quote("%dn"), 
Matcher.quoteReplacement(userDn));
-filter = filter.replaceAll(Pattern.quote("%fqdn"), 
Matcher.quoteReplacement(userDnNamespace));
-filter = filter.replace("\\", "");
+if (filter != null) {
+filter = filter.replaceAll(Pattern.quote("%u"), 
Matcher.quoteReplacement(user));
+filter = filter.replaceAll(Pattern.quote("%dn"), 
Matcher.quoteReplacement(userDn));
+filter = filter.replaceAll(Pattern.quote("%fqdn"), 
Matcher.quoteReplacement(userDnNamespace));
+filter = filter.replace("\\", "");
 
-LOGGER.debug("Looking for the user roles in LDAP with ");
-LOGGER.debug("  base DN: " + options.getRoleBaseDn());
-LOGGER.debug("  filter: " + filter);
+LOGGER.debug("Looking for the user roles in LDAP with ");
+LOGGER.debug("  base DN: " + options.getRoleBaseDn());
+LOGGER.debug("  filter: " + filter);
 
-NamingEnumeration namingEnumeration = 
context.search(options.getRoleBaseDn(), filter, controls);
-try {
-List rolesList = new ArrayList<>();
-while (namingEnumeration.hasMore()) {
-SearchResult result = (SearchResult) namingEnumeration.next();
-Attributes attributes = result.getAttributes();
-Attribute roles1 = 
attributes.get(options.getRoleNameAttribute());
-if (roles1 != null) {
-for (int i = 0; i < roles1.size(); i++) {
-String role = (String) roles1.get(i);
-if (role != null) {
-LOGGER.debug("User {} is a member of role {}", 
user, role);
-// handle role mapping
-Set roleMappings = tryMappingRole(role);
-if (roleMappings.isEmpty()) {
-

karaf git commit: [KARAF-4875] bundle:list should limit the table size to the terminal width

2016-12-01 Thread gnodet 
Repository: karaf
Updated Branches:
  refs/heads/master 56eccaaf9 -> f08248feb


[KARAF-4875] bundle:list should limit the table size to the terminal width

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

Branch: refs/heads/master
Commit: f08248feb0851cf939bc58fdcdb917264b529f77
Parents: 56eccaa
Author: Guillaume Nodet 
Authored: Thu Dec 1 14:43:19 2016 +0100
Committer: Guillaume Nodet 
Committed: Thu Dec 1 14:43:19 2016 +0100

--
 .../core/src/main/java/org/apache/karaf/bundle/command/List.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/karaf/blob/f08248fe/bundle/core/src/main/java/org/apache/karaf/bundle/command/List.java
--
diff --git 
a/bundle/core/src/main/java/org/apache/karaf/bundle/command/List.java 
b/bundle/core/src/main/java/org/apache/karaf/bundle/command/List.java
index 000d3bd..656a5d6 100644
--- a/bundle/core/src/main/java/org/apache/karaf/bundle/command/List.java
+++ b/bundle/core/src/main/java/org/apache/karaf/bundle/command/List.java
@@ -89,7 +89,7 @@ public class List extends BundlesCommand {
 }
 
 ShellTable table = new ShellTable();
-if (!noEllipsis && showLocation && terminal != null && 
terminal.getWidth() > 0) {
+if (!noEllipsis && terminal != null && terminal.getWidth() > 0) {
 table.size(terminal.getWidth());
 }
 table.column("ID").alignRight();

karaf git commit: [KARAF-4834] Infinite loop in console if an I/O exception is thrown by the input stream

2016-12-01 Thread gnodet 
Repository: karaf
Updated Branches:
  refs/heads/master e4469dca2 -> 56eccaaf9


[KARAF-4834] Infinite loop in console if an I/O exception is thrown by the 
input stream

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

Branch: refs/heads/master
Commit: 56eccaaf95b8e3cd81f9fabbf4322abdf8f427aa
Parents: e4469dc
Author: Guillaume Nodet 
Authored: Thu Dec 1 12:01:45 2016 +0100
Committer: Guillaume Nodet 
Committed: Thu Dec 1 12:01:45 2016 +0100

--
 .../shell/impl/console/ConsoleSessionImpl.java  | 29 ++--
 1 file changed, 15 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/karaf/blob/56eccaaf/shell/core/src/main/java/org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java
--
diff --git 
a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java
 
b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java
index 22d2a1e..5dc793e 100644
--- 
a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java
+++ 
b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java
@@ -328,25 +328,26 @@ public class ConsoleSessionImpl implements Session {
 String scriptFileName = System.getProperty(SHELL_INIT_SCRIPT);
 executeScript(scriptFileName);
 while (running) {
+String command = null;
+reading.set(true);
+try {
+command = reader.readLine(getPrompt(), getRPrompt(), null, 
null);
+} catch (UserInterruptException e) {
+// Ignore, loop again
+continue;
+} catch (Throwable t) {
+ShellUtil.logException(this, t);
+} finally {
+reading.set(false);
+}
+if (command == null) {
+break;
+}
 try {
-reading.set(true);
-String command;
-try {
-command = reader.readLine(getPrompt(), getRPrompt(), 
null, null);
-} finally {
-reading.set(false);
-}
-if (command == null) {
-break;
-}
 Object result = session.execute(command);
 if (result != null) {
 session.getConsole().println(session.format(result, 
Converter.INSPECT));
 }
-} catch (UserInterruptException e) {
-// Ignore, loop again
-} catch (EndOfFileException e) {
-break;
 } catch (Throwable t) {
 ShellUtil.logException(this, t);
 }

Jenkins build is still unstable: karaf-4.0.x #275

2016-12-01 Thread Apache Jenkins Server 
See

Jenkins build is still unstable: karaf-4.0.x » Apache Karaf :: Integration Tests #275

2016-12-01 Thread Apache Jenkins Server 
See

karaf git commit: [KARAF-4859] Upgrade to Felix Utils 1.8.4

2016-12-01 Thread jbonofre 
Repository: karaf
Updated Branches:
  refs/heads/karaf-4.0.x 6237f43e1 -> 48b067cde


[KARAF-4859] Upgrade to Felix Utils 1.8.4


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

Branch: refs/heads/karaf-4.0.x
Commit: 48b067cdeda2869ef3c6a0f90928d76db23dd014
Parents: 6237f43
Author: Jean-Baptiste Onofré 
Authored: Thu Dec 1 11:04:10 2016 +0100
Committer: Jean-Baptiste Onofré 
Committed: Thu Dec 1 11:04:51 2016 +0100

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/karaf/blob/48b067cd/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 7e5f5e9..d922a6a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -189,7 +189,7 @@
 0.16.2
 1.0.4
 3.2.0
-1.8.2
+1.8.4
 4.2.14
 3.1.2
 1.1.2

karaf git commit: [KARAF-4859] Upgrade to Felix Utils 1.8.4

2016-12-01 Thread jbonofre 
Repository: karaf
Updated Branches:
  refs/heads/master 0dfaab74b -> e4469dca2


[KARAF-4859] Upgrade to Felix Utils 1.8.4


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

Branch: refs/heads/master
Commit: e4469dca2af99dc49970f468c058dfcd103ff921
Parents: 0dfaab7
Author: Jean-Baptiste Onofré 
Authored: Thu Dec 1 11:04:10 2016 +0100
Committer: Jean-Baptiste Onofré 
Committed: Thu Dec 1 11:04:10 2016 +0100

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/karaf/blob/e4469dca/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 6d4dd88..21a8d1b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -192,7 +192,7 @@
 0.1.5
 1.0.4
 3.2.0
-1.8.2
+1.8.4
 4.2.14
 3.1.2
 1.1.2

karaf git commit: [KARAF-4839] Infinite System bundle restart on feature deployment

2016-12-01 Thread gnodet 
Repository: karaf
Updated Branches:
  refs/heads/master 34908fb1d -> 0dfaab74b


[KARAF-4839] Infinite System bundle restart on feature deployment

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

Branch: refs/heads/master
Commit: 0dfaab74b21055bda6c1026063e482853481d04f
Parents: 34908fb
Author: Guillaume Nodet 
Authored: Thu Dec 1 10:18:40 2016 +0100
Committer: Guillaume Nodet 
Committed: Thu Dec 1 10:19:25 2016 +0100

--
 .../karaf/deployer/features/FeatureDeploymentListener.java   | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/karaf/blob/0dfaab74/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java
--
diff --git 
a/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java
 
b/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java
index 5a82469..2220b38 100644
--- 
a/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java
+++ 
b/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java
@@ -212,10 +212,14 @@ public class FeatureDeploymentListener implements 
ArtifactUrlTransformer, Bundle
 Set autoInstallFeatures = new 
HashSet();
 for(Feature feature:features) {
 if(feature.getInstall() != null && 
feature.getInstall().equals(Feature.DEFAULT_INSTALL_MODE)){
-
autoInstallFeatures.add(feature.getId());
+if 
(!featuresService.isInstalled(feature)) {
+
autoInstallFeatures.add(feature.getId());
+}
 }
 }
-
featuresService.installFeatures(autoInstallFeatures, 
EnumSet.noneOf(FeaturesService.Option.class));
+if (!autoInstallFeatures.isEmpty()) {
+
featuresService.installFeatures(autoInstallFeatures, 
EnumSet.noneOf(FeaturesService.Option.class));
+}
 } else {
 //remove older out-of-data feature repo
 if 
(repo.getURI().toString().contains(FEATURE_PATH)) {

[1/2] karaf git commit: [KARAF-4839] Infinite System bundle restart on feature deployment

2016-12-01 Thread gnodet 
Repository: karaf
Updated Branches:
  refs/heads/karaf-4.0.x 68f31c09f -> 6237f43e1


[KARAF-4839] Infinite System bundle restart on feature deployment

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

Branch: refs/heads/karaf-4.0.x
Commit: 6237f43e1523e629883cfd4713be4473a35d16e5
Parents: 1369d9f
Author: Guillaume Nodet 
Authored: Thu Dec 1 10:18:40 2016 +0100
Committer: Guillaume Nodet 
Committed: Thu Dec 1 10:19:05 2016 +0100

--
 .../karaf/deployer/features/FeatureDeploymentListener.java   | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/karaf/blob/6237f43e/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java
--
diff --git 
a/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java
 
b/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java
index 5a82469..2220b38 100644
--- 
a/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java
+++ 
b/deployer/features/src/main/java/org/apache/karaf/deployer/features/FeatureDeploymentListener.java
@@ -212,10 +212,14 @@ public class FeatureDeploymentListener implements 
ArtifactUrlTransformer, Bundle
 Set autoInstallFeatures = new 
HashSet();
 for(Feature feature:features) {
 if(feature.getInstall() != null && 
feature.getInstall().equals(Feature.DEFAULT_INSTALL_MODE)){
-
autoInstallFeatures.add(feature.getId());
+if 
(!featuresService.isInstalled(feature)) {
+
autoInstallFeatures.add(feature.getId());
+}
 }
 }
-
featuresService.installFeatures(autoInstallFeatures, 
EnumSet.noneOf(FeaturesService.Option.class));
+if (!autoInstallFeatures.isEmpty()) {
+
featuresService.installFeatures(autoInstallFeatures, 
EnumSet.noneOf(FeaturesService.Option.class));
+}
 } else {
 //remove older out-of-data feature repo
 if 
(repo.getURI().toString().contains(FEATURE_PATH)) {

[2/2] karaf git commit: KARAF-4739 Fix computation of snapshots crc for fragments

2016-12-01 Thread gnodet 
KARAF-4739 Fix computation of snapshots crc for fragments

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

Branch: refs/heads/karaf-4.0.x
Commit: 1369d9f4e0bb53d62aa36bb9f199fab594473e86
Parents: 68f31c0
Author: Guillaume Nodet 
Authored: Thu Dec 1 10:18:09 2016 +0100
Committer: Guillaume Nodet 
Committed: Thu Dec 1 10:19:05 2016 +0100

--
 .../java/org/apache/karaf/features/internal/service/Deployer.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/karaf/blob/1369d9f4/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java
--
diff --git 
a/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java
 
b/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java
index f55045e..6068c2d 100644
--- 
a/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java
+++ 
b/features/core/src/main/java/org/apache/karaf/features/internal/service/Deployer.java
@@ -1188,7 +1188,7 @@ public class Deployer {
 // corresponding jar url and use that one 
to compute the checksum of the bundle.
 oldCrc = 0l;
 try {
-URL url = 
bundle.getResource("META-INF/MANIFEST.MF");
+URL url = 
bundle.getEntry("META-INF/MANIFEST.MF");
 URLConnection con = 
url.openConnection();
 Method method = 
con.getClass().getDeclaredMethod("getLocalURL");
 method.setAccessible(true);

Jenkins build is back to stable : karaf-master #4080

2016-12-01 Thread Apache Jenkins Server 
See

karaf git commit: [KARAF-4847] Cannot start feature pax-jetty with JDK 9 Add missing jar url protocol handler

2016-12-01 Thread gnodet 
Repository: karaf
Updated Branches:
  refs/heads/master 88d9480d1 -> 34908fb1d


[KARAF-4847] Cannot start feature pax-jetty with JDK 9
Add missing jar url protocol handler

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

Branch: refs/heads/master
Commit: 34908fb1df416cc7e08a0750d47930078e7b733b
Parents: 88d9480
Author: Guillaume Nodet 
Authored: Thu Dec 1 09:08:11 2016 +0100
Committer: Guillaume Nodet 
Committed: Thu Dec 1 09:08:11 2016 +0100

--
 assemblies/features/base/src/main/resources/resources/bin/karaf | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/karaf/blob/34908fb1/assemblies/features/base/src/main/resources/resources/bin/karaf
--
diff --git a/assemblies/features/base/src/main/resources/resources/bin/karaf 
b/assemblies/features/base/src/main/resources/resources/bin/karaf
index 451b85a..c65f4ae 100755
--- a/assemblies/features/base/src/main/resources/resources/bin/karaf
+++ b/assemblies/features/base/src/main/resources/resources/bin/karaf
@@ -496,6 +496,7 @@ run() {
 if [ "${VERSION}" -gt "80" ]; then
 
JDK_89_OPTS="--add-exports=java.base/sun.net.www.protocol.http=ALL-UNNAMED"
 JDK_89_OPTS="${JDK_89_OPTS} 
--add-exports=java.base/sun.net.www.protocol.https=ALL-UNNAMED"
+JDK_89_OPTS="${JDK_89_OPTS} 
--add-exports=java.base/sun.net.www.protocol.jar=ALL-UNNAMED"
 JDK_89_OPTS="${JDK_89_OPTS} 
--add-exports=java.xml.bind/com.sun.xml.internal.bind.v2.runtime=ALL-UNNAMED"
 JDK_89_OPTS="${JDK_89_OPTS} 
--add-exports=jdk.xml.dom/org.w3c.dom.html=ALL-UNNAMED"
 JDK_89_OPTS="${JDK_89_OPTS} 
--add-exports=jdk.naming.rmi/com.sun.jndi.url.rmi=ALL-UNNAMED"