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 2014/07/15 10:19:52 UTC
[1/4] git commit: Add missing wagon provider dependency in the
features-maven-plugin
Repository: karaf
Updated Branches:
refs/heads/karaf-2.x f2368b0ca -> dc8f285f2
Add missing wagon provider dependency in the features-maven-plugin
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/d571f141
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/d571f141
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/d571f141
Branch: refs/heads/karaf-2.x
Commit: d571f1412e6f95d3b324e1ff9c82d07bb2b4cb6d
Parents: f2368b0
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Tue Jul 15 09:58:59 2014 +0200
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Tue Jul 15 09:58:59 2014 +0200
----------------------------------------------------------------------
tooling/features-maven-plugin/pom.xml | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/d571f141/tooling/features-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/features-maven-plugin/pom.xml b/tooling/features-maven-plugin/pom.xml
index 59d0ff6..79f8a3e 100644
--- a/tooling/features-maven-plugin/pom.xml
+++ b/tooling/features-maven-plugin/pom.xml
@@ -106,6 +106,11 @@
<artifactId>plexus-utils</artifactId>
<version>${plexus.utils.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-http-lightweight</artifactId>
+ <version>2.6</version>
+ </dependency>
</dependencies>
<build>
[2/4] git commit: [KARAF-2878] The thread reading the system input
stream should exit automatically when the console bundle stops
Posted by gn...@apache.org.
[KARAF-2878] The thread reading the system input stream should exit automatically when the console bundle stops
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/e046011b
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/e046011b
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/e046011b
Branch: refs/heads/karaf-2.x
Commit: e046011bdb327ae6574192a28e6f48471fba7439
Parents: d571f14
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Tue Jul 15 09:59:30 2014 +0200
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Tue Jul 15 09:59:30 2014 +0200
----------------------------------------------------------------------
.../java/org/apache/karaf/shell/console/jline/Console.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/e046011b/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java b/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java
index 70c46e9..90bd094 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java
@@ -593,6 +593,12 @@ public class Console implements Runnable
{
try
{
+ while (in.available() == 0) {
+ if (!running) {
+ return;
+ }
+ Thread.sleep(50);
+ }
int c = in.read();
if (c == -1)
{
[4/4] git commit: [KARAF-3118] Avoid possible exceptions when closing
the console
Posted by gn...@apache.org.
[KARAF-3118] Avoid possible exceptions when closing the console
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/dc8f285f
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/dc8f285f
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/dc8f285f
Branch: refs/heads/karaf-2.x
Commit: dc8f285f2dd56fe06ec6f17630a4af6db11991e0
Parents: 8f85881
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Tue Jul 15 10:05:36 2014 +0200
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Tue Jul 15 10:05:36 2014 +0200
----------------------------------------------------------------------
.../org/apache/karaf/shell/console/jline/Console.java | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/dc8f285f/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java b/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java
index 070d6f9..b9b2e40 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java
@@ -212,10 +212,18 @@ public class Console implements Runnable
logException(t);
}
}
- secCP.close();
+ try {
+ secCP.close();
+ } catch (Throwable t) {
+ // Ignore
+ }
close(true);
} finally {
- threadIO.close();
+ try {
+ threadIO.close();
+ } catch (Throwable t) {
+ // Ignore
+ }
}
}
[3/4] git commit: [KARAF-3117] The console welcome message is garbled
when the console is restarted
Posted by gn...@apache.org.
[KARAF-3117] The console welcome message is garbled when the console is restarted
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/8f858813
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/8f858813
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/8f858813
Branch: refs/heads/karaf-2.x
Commit: 8f858813ff87b5af807c264c66e14f5955d699cf
Parents: e046011
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Tue Jul 15 10:01:07 2014 +0200
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Tue Jul 15 10:01:07 2014 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/karaf/shell/console/jline/Console.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/8f858813/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java b/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java
index 90bd094..070d6f9 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java
@@ -156,6 +156,7 @@ public class Console implements Runnable
if (!running) {
return;
}
+ out.println();
if (reader.getHistory() instanceof PersistentHistory) {
try {
((PersistentHistory) reader.getHistory()).flush();