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 2017/08/04 14:00:41 UTC
[1/2] karaf git commit: Do not install ssh feature as we already have
it
Repository: karaf
Updated Branches:
refs/heads/master 033bfdf96 -> 6b160e852
Do not install ssh feature as we already have it
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/8ce16d59
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/8ce16d59
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/8ce16d59
Branch: refs/heads/master
Commit: 8ce16d59a390fe08645c12a0d57ab1440de094a6
Parents: 033bfdf
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Fri Aug 4 15:59:49 2017 +0200
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Fri Aug 4 15:59:49 2017 +0200
----------------------------------------------------------------------
.../karaf/itests/ssh/SshCommandTestBase.java | 17 -----------------
1 file changed, 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/8ce16d59/itests/src/test/java/org/apache/karaf/itests/ssh/SshCommandTestBase.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/apache/karaf/itests/ssh/SshCommandTestBase.java b/itests/src/test/java/org/apache/karaf/itests/ssh/SshCommandTestBase.java
index 2b4f8cb..e9c628f 100644
--- a/itests/src/test/java/org/apache/karaf/itests/ssh/SshCommandTestBase.java
+++ b/itests/src/test/java/org/apache/karaf/itests/ssh/SshCommandTestBase.java
@@ -18,12 +18,9 @@ import java.io.IOException;
import java.io.OutputStream;
import java.io.PipedInputStream;
import java.io.PipedOutputStream;
-import java.util.Arrays;
import java.util.EnumSet;
-import java.util.HashSet;
import java.util.Set;
-import org.apache.karaf.features.Feature;
import org.apache.karaf.itests.KarafTestSupport;
import org.apache.sshd.client.SshClient;
import org.apache.sshd.client.channel.ClientChannel;
@@ -32,8 +29,6 @@ import org.apache.sshd.client.future.ConnectFuture;
import org.apache.sshd.client.session.ClientSession;
import org.apache.sshd.client.session.ClientSession.ClientSessionEvent;
import org.awaitility.Awaitility;
-import org.junit.After;
-import org.junit.Before;
import org.junit.Assert;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.PaxExam;
@@ -49,18 +44,6 @@ public class SshCommandTestBase extends KarafTestSupport {
private SshClient client;
private ClientChannel channel;
private ClientSession session;
- private HashSet<Feature> featuresBefore;
-
- @Before
- public void installSshFeature() throws Exception {
- featuresBefore = new HashSet<>(Arrays.asList(featureService.listInstalledFeatures()));
- installAndAssertFeature("ssh");
- }
-
- @After
- public void uninstallSshFeature() throws Exception {
- uninstallNewFeatures(featuresBefore);
- }
void addUsers(String manageruser, String vieweruser) throws Exception {
ByteArrayOutputStream out = new ByteArrayOutputStream();
[2/2] karaf git commit: Also suppress banner for ssh
Posted by cs...@apache.org.
Also suppress banner for ssh
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/6b160e85
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/6b160e85
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/6b160e85
Branch: refs/heads/master
Commit: 6b160e852bc539fd71f4a9aaae0ef45424d22ec3
Parents: 8ce16d5
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Fri Aug 4 16:00:35 2017 +0200
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Fri Aug 4 16:00:35 2017 +0200
----------------------------------------------------------------------
.../src/test/java/org/apache/karaf/itests/KarafTestSupport.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/6b160e85/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java b/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
index da70446..5831015 100644
--- a/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
+++ b/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
@@ -216,7 +216,8 @@ public class KarafTestSupport {
editConfigurationFilePut("etc/system.properties", "spring41.version", System.getProperty("spring41.version")),
editConfigurationFilePut("etc/system.properties", "spring42.version", System.getProperty("spring42.version")),
editConfigurationFilePut("etc/system.properties", "spring43.version", System.getProperty("spring43.version")),
- editConfigurationFilePut("etc/branding.properties", "welcome", "") // No welcome banner
+ editConfigurationFilePut("etc/branding.properties", "welcome", ""), // No welcome banner
+ editConfigurationFilePut("etc/branding-ssh.properties", "welcome", "")
};
}