You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by pi...@apache.org on 2012/04/26 13:08:21 UTC
svn commit: r1330771 -
/karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/KarafTestContainer.java
Author: pieber
Date: Thu Apr 26 11:08:21 2012
New Revision: 1330771
URL: http://svn.apache.org/viewvc?rev=1330771&view=rev
Log:
Some formatting improvements to make future change clear
NO FUNCTIONAL CHANGE --> NO ISSUE
Signed-off-by: Andreas Pieber <an...@gmail.com>
Modified:
karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/KarafTestContainer.java
Modified: karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/KarafTestContainer.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/KarafTestContainer.java?rev=1330771&r1=1330770&r2=1330771&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/KarafTestContainer.java (original)
+++ karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/KarafTestContainer.java Thu Apr 26 11:08:21 2012
@@ -93,13 +93,13 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
public class KarafTestContainer implements TestContainer {
-
+
private static final Logger LOGGER = LoggerFactory.getLogger(KarafTestContainer.class);
private static final String KARAF_TEST_CONTAINER = "KarafTestContainer.start";
private static final String EXAM_INVOKER_PROPERTY = "pax.exam.invoker";
private static final String EXAM_INJECT_PROPERTY = "pax.exam.inject";
-
+
private final Runner runner;
private final RMIRegistry registry;
private final ExamSystem system;
@@ -184,12 +184,12 @@ public class KarafTestContainer implemen
setupExamProperties(karafHome, subsystem);
makeScriptsInBinExec(karafBin);
- int startLevel = Constants.DEFAULT_START_LEVEL;
- ExamBundlesStartLevel examBundlesStartLevel = system.getSingleOption(ExamBundlesStartLevel.class);
- if (examBundlesStartLevel != null) {
- startLevel = examBundlesStartLevel.getStartLevel();
- }
-
+ int startLevel = Constants.DEFAULT_START_LEVEL;
+ ExamBundlesStartLevel examBundlesStartLevel = system.getSingleOption(ExamBundlesStartLevel.class);
+ if (examBundlesStartLevel != null) {
+ startLevel = examBundlesStartLevel.getStartLevel();
+ }
+
ExamFeaturesFile examFeaturesFile;
if (framework.isUseDeployFolder()) {
copyReferencedArtifactsToDeployFolder(deploy, subsystem, fileEndings);