You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2017/03/27 04:33:50 UTC
[1/5] karaf git commit: [KARAF-5003] Compare by class instead of by
class name
Repository: karaf
Updated Branches:
refs/heads/master 9f945fa7c -> 08444ba9f
[KARAF-5003] Compare by class instead of by class name
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/08444ba9
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/08444ba9
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/08444ba9
Branch: refs/heads/master
Commit: 08444ba9ffcf4fa8d3c3a946c8c6d074ad150645
Parents: 6ecbaf4
Author: Jean-Baptiste Onofr� <jb...@apache.org>
Authored: Mon Mar 27 06:32:44 2017 +0200
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Mon Mar 27 06:33:32 2017 +0200
----------------------------------------------------------------------
.../java/org/apache/karaf/shell/support/table/ShellTable.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/08444ba9/shell/core/src/main/java/org/apache/karaf/shell/support/table/ShellTable.java
----------------------------------------------------------------------
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/support/table/ShellTable.java b/shell/core/src/main/java/org/apache/karaf/shell/support/table/ShellTable.java
index b383203..bbde016 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/support/table/ShellTable.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/support/table/ShellTable.java
@@ -16,6 +16,8 @@
*/
package org.apache.karaf.shell.support.table;
+import org.apache.felix.gogo.runtime.threadio.ThreadPrintStream;
+
import java.io.OutputStreamWriter;
import java.io.PrintStream;
import java.lang.reflect.Field;
@@ -163,7 +165,7 @@ public class ShellTable {
}
private String getEncoding(PrintStream ps) {
- if (ps.getClass().getName().equals("org.apache.felix.gogo.runtime.threadio.ThreadPrintStream")) {
+ if (ps.getClass() == ThreadPrintStream.class) {
try {
ps = (PrintStream) ps.getClass().getMethod("getCurrent").invoke(ps);
} catch (Throwable t) {
[5/5] karaf git commit: [KARAF-5003] Fix enableGeneration checked
twice in the GenerateDescriptionMojo
Posted by jb...@apache.org.
[KARAF-5003] Fix enableGeneration checked twice in the GenerateDescriptionMojo
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/ff939b84
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/ff939b84
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/ff939b84
Branch: refs/heads/master
Commit: ff939b84df95a338bf6d1b1608ddf7e187150558
Parents: 2d7d952
Author: Jean-Baptiste Onofr� <jb...@apache.org>
Authored: Sun Mar 26 07:48:15 2017 +0200
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Mon Mar 27 06:33:32 2017 +0200
----------------------------------------------------------------------
.../org/apache/karaf/tooling/features/GenerateDescriptorMojo.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/ff939b84/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java
index 329280d..c6dc9fc 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java
@@ -318,7 +318,7 @@ public class GenerateDescriptorMojo extends MojoSupport {
try {
if (enableGeneration == null) {
String packaging = this.project.getPackaging();
- enableGeneration = !"feature".equals(packaging) && !"feature".equals(packaging);
+ enableGeneration = !"feature".equals(packaging);
}
if (!enableGeneration) {
[3/5] karaf git commit: [KARAF-5003] Fix contextPath trim in
WebContainer
Posted by jb...@apache.org.
[KARAF-5003] Fix contextPath trim in WebContainer
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/2d7d9523
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/2d7d9523
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/2d7d9523
Branch: refs/heads/master
Commit: 2d7d95238281554cfc6a115dc3f292e989e9ef5b
Parents: 9f945fa
Author: Jean-Baptiste Onofr� <jb...@apache.org>
Authored: Sun Mar 26 07:39:55 2017 +0200
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Mon Mar 27 06:33:32 2017 +0200
----------------------------------------------------------------------
.../org/apache/karaf/web/internal/WebContainerServiceImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/2d7d9523/web/src/main/java/org/apache/karaf/web/internal/WebContainerServiceImpl.java
----------------------------------------------------------------------
diff --git a/web/src/main/java/org/apache/karaf/web/internal/WebContainerServiceImpl.java b/web/src/main/java/org/apache/karaf/web/internal/WebContainerServiceImpl.java
index bab1bdd..c3a81ed 100644
--- a/web/src/main/java/org/apache/karaf/web/internal/WebContainerServiceImpl.java
+++ b/web/src/main/java/org/apache/karaf/web/internal/WebContainerServiceImpl.java
@@ -82,7 +82,7 @@ public class WebContainerServiceImpl implements WebContainerService, BundleListe
}
WebBundle webBundle = new WebBundle();
- contextPath.trim();
+ contextPath = contextPath.trim();
// get the bundle name
String name = (String) bundle.getHeaders().get(Constants.BUNDLE_NAME);
[2/5] karaf git commit: [KARAF-5003] Fix table exists checked twice
in JDBC lock
Posted by jb...@apache.org.
[KARAF-5003] Fix table exists checked twice in JDBC lock
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/2c0815fe
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/2c0815fe
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/2c0815fe
Branch: refs/heads/master
Commit: 2c0815feaaadf0947f08ac145ff4dbbb006591ad
Parents: ff939b8
Author: Jean-Baptiste Onofr� <jb...@apache.org>
Authored: Sun Mar 26 07:50:07 2017 +0200
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Mon Mar 27 06:33:32 2017 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/karaf/main/lock/DefaultJDBCLock.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/2c0815fe/main/src/main/java/org/apache/karaf/main/lock/DefaultJDBCLock.java
----------------------------------------------------------------------
diff --git a/main/src/main/java/org/apache/karaf/main/lock/DefaultJDBCLock.java b/main/src/main/java/org/apache/karaf/main/lock/DefaultJDBCLock.java
index 1fe4fe9..32fa216 100644
--- a/main/src/main/java/org/apache/karaf/main/lock/DefaultJDBCLock.java
+++ b/main/src/main/java/org/apache/karaf/main/lock/DefaultJDBCLock.java
@@ -154,8 +154,7 @@ public class DefaultJDBCLock implements Lock {
boolean schemaExist(String tableName) {
try {
DatabaseMetaData metadata = getConnection().getMetaData();
- return metadata != null && (checkTableExists(tableName.toLowerCase(), metadata) //
- || checkTableExists(tableName.toLowerCase(), metadata));
+ return metadata != null && (checkTableExists(tableName.toLowerCase(), metadata));
} catch (Exception ignore) {
return false;
//throw new RuntimeException("Error testing for db table", ignore);
[4/5] karaf git commit: [KARAF-5003] Fix test in JDBC lock
Posted by jb...@apache.org.
[KARAF-5003] Fix test in JDBC lock
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/6ecbaf4d
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/6ecbaf4d
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/6ecbaf4d
Branch: refs/heads/master
Commit: 6ecbaf4dfe3d905ac1b3161ec474736425e676db
Parents: 2c0815f
Author: Jean-Baptiste Onofr� <jb...@apache.org>
Authored: Mon Mar 27 06:16:13 2017 +0200
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Mon Mar 27 06:33:32 2017 +0200
----------------------------------------------------------------------
.../src/test/java/org/apache/karaf/main/lock/BaseJDBCLockTest.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/6ecbaf4d/main/src/test/java/org/apache/karaf/main/lock/BaseJDBCLockTest.java
----------------------------------------------------------------------
diff --git a/main/src/test/java/org/apache/karaf/main/lock/BaseJDBCLockTest.java b/main/src/test/java/org/apache/karaf/main/lock/BaseJDBCLockTest.java
index d4d697e..76776d9 100644
--- a/main/src/test/java/org/apache/karaf/main/lock/BaseJDBCLockTest.java
+++ b/main/src/test/java/org/apache/karaf/main/lock/BaseJDBCLockTest.java
@@ -90,8 +90,6 @@ public abstract class BaseJDBCLockTest {
connection.setAutoCommit(false);
expect(connection.getMetaData()).andReturn(metaData).anyTimes();
expect(metaData.getTables((String) isNull(), (String) isNull(), anyString(), aryEq(new String[]{"TABLE"}))).andReturn(resultSet);
- expect(metaData.getTables((String) isNull(), (String) isNull(), anyString(), aryEq(new String[]{"TABLE"}))).andReturn(resultSet);
- expect(resultSet.next()).andReturn(false);
expect(resultSet.next()).andReturn(false);
resultSet.close();
expectLastCall().atLeastOnce();