From 0e0ec7f7856a50e5616d4a8b2c50cf9a765e26d2 Mon Sep 17 00:00:00 2001
From: unknown <jmartinez@JWINGS32.(none)>
Date: Thu, 18 Apr 2013 21:00:12 +0200
Subject: [PATCH 1/2] Before setting the karaf classpath,
 BootClasspathLibraries must be copied to the ${karaf.home}/lib folder

---
 .../tooling/exam/container/internal/KarafTestContainer.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/KarafTestContainer.java b/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/KarafTestContainer.java
index 80f54c2e972..e419122016e 100644
--- a/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/KarafTestContainer.java
+++ b/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/KarafTestContainer.java
@@ -181,7 +181,9 @@ public synchronized TestContainer start() {
                     Lists.newArrayList("-Dkaraf.startLocalConsole=" + shouldLocalConsoleBeStarted(subsystem),
                             "-Dkaraf.startRemoteShell=" + shouldRemoteShellBeStarted(subsystem));
 
+			copyBootClasspathLibraries(karafHome, subsystem);
             String[] classPath = buildKarafClasspath(karafHome);
+			
             String main = "org.apache.karaf.main.Main";
             String options = "";
             String[] environment = new String[]{};
@@ -189,7 +191,6 @@ public synchronized TestContainer start() {
 
             updateLogProperties(karafHome, subsystem);
             updateUserSetProperties(karafHome, subsystem);
-            copyBootClasspathLibraries(karafHome, subsystem);
             setupExamProperties(karafHome, subsystem);
             makeScriptsInBinExec(karafBin);
 

From 1007f296fcc09d70bb43523315a1bb11bfe0628e Mon Sep 17 00:00:00 2001
From: j2fringe <j2fringe@gmail.com>
Date: Sat, 25 May 2013 18:38:33 +0200
Subject: [PATCH 2/2] Added dependency org.apache.felix.gogo.runtime (required
 for commands)

---
 features/command/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/features/command/pom.xml b/features/command/pom.xml
index f070b6260ad..39dc2b62c17 100644
--- a/features/command/pom.xml
+++ b/features/command/pom.xml
@@ -48,6 +48,11 @@
             <artifactId>org.osgi.compendium</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.gogo.runtime</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.karaf.shell</groupId>
             <artifactId>org.apache.karaf.shell.table</artifactId>