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 2012/09/28 13:44:10 UTC
svn commit: r1391406 [1/2] - in /karaf/trunk/tooling/exam:
container/src/main/java/org/apache/karaf/tooling/exam/container/internal/
container/src/main/java/org/apache/karaf/tooling/exam/container/internal/adaptions/
container/src/main/java/org/apache/...
Author: jbonofre
Date: Fri Sep 28 11:44:08 2012
New Revision: 1391406
URL: http://svn.apache.org/viewvc?rev=1391406&view=rev
Log:
Fix checkstyle on exam
Modified:
karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/Constants.java
karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/ExamFeaturesFile.java
karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/InternalKarafDistributionConfigurationOption.java
karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/KarafPropertiesFile.java
karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/KarafTestContainer.java
karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/KarafTestContainerFactory.java
karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/RMIRegistry.java
karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/adaptions/KarafManipulator.java
karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/adaptions/KarafManipulatorFactory.java
karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/adaptions/KarafManipulatorStartingFrom220.java
karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/BaseScriptRunner.java
karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/CommandLineBuilder.java
karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/InternalRunner.java
karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/KarafJavaRunner.java
karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/NixRunner.java
karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/Runner.java
karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/WindowsRunner.java
karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/ConfigurationPointer.java
karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/DoNotModifyLogOption.java
karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/ExamBundlesStartLevel.java
karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionBaseConfigurationOption.java
karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationConsoleOption.java
karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationFileExtendOption.java
karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationFileOption.java
karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationFilePutOption.java
karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationFileReplacementOption.java
karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationOption.java
karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionKitConfigurationOption.java
karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionOption.java
karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafExamSystemConfigurationOption.java
karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KeepRuntimeFolderOption.java
karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/LogLevelOption.java
karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/configs/CustomProperties.java
karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/configs/FeaturesCfg.java
karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/configs/JreProperties.java
karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/configs/LoggingCfg.java
karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/configs/ManagementCfg.java
karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/configs/SystemProperties.java
karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/configs/UsersProperties.java
karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/configs/WebCfg.java
Modified: karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/Constants.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/Constants.java?rev=1391406&r1=1391405&r2=1391406&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/Constants.java (original)
+++ karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/Constants.java Fri Sep 28 11:44:08 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.tooling.exam.container.internal;
public interface Constants {
@@ -22,7 +21,7 @@ public interface Constants {
static final String FEATURES_CFG_LOCATION = "/etc/org.apache.karaf.features.cfg";
static final int SYSTEM_BUNDLE = 0;
-
+
static final int DEFAULT_START_LEVEL = 5;
}
Modified: karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/ExamFeaturesFile.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/ExamFeaturesFile.java?rev=1391406&r1=1391405&r2=1391406&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/ExamFeaturesFile.java (original)
+++ karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/ExamFeaturesFile.java Fri Sep 28 11:44:08 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.tooling.exam.container.internal;
import java.io.File;
@@ -39,72 +38,72 @@ public class ExamFeaturesFile {
public ExamFeaturesFile(String extension, int startLevel) {
featuresXml =
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
- + "<features name=\"pax-exam-features-"
- + Info.getPaxExamVersion()
- + "\">\n"
- + "<feature name=\"exam\" version=\""
- + Info.getPaxExamVersion()
- + "\">\n"
- + extension + "\n"
- + "<bundle start-level='" + startLevel + "'>mvn:org.ops4j.base/ops4j-base-lang/"
- + Info.getOps4jBaseVersion()
- + "</bundle>\n"
- + "<bundle start-level='" + startLevel + "'>mvn:org.ops4j.base/ops4j-base-monitors/"
- + Info.getOps4jBaseVersion()
- + "</bundle>\n"
- + "<bundle start-level='" + startLevel + "'>mvn:org.ops4j.base/ops4j-base-net/"
- + Info.getOps4jBaseVersion()
- + "</bundle>\n"
- + "<bundle start-level='" + startLevel + "'>mvn:org.ops4j.base/ops4j-base-store/"
- + Info.getOps4jBaseVersion()
- + "</bundle>\n"
- + "<bundle start-level='" + startLevel + "'>mvn:org.ops4j.base/ops4j-base-io/"
- + Info.getOps4jBaseVersion()
- + "</bundle>\n"
- + "<bundle start-level='" + startLevel + "'>mvn:org.ops4j.base/ops4j-base-spi/"
- + Info.getOps4jBaseVersion()
- + "</bundle>\n"
- + "<bundle start-level='" + startLevel + "'>mvn:org.ops4j.base/ops4j-base-util-property/"
- + Info.getOps4jBaseVersion()
- + "</bundle>\n"
- + "<bundle start-level='" + startLevel + "'>mvn:org.ops4j.pax.swissbox/pax-swissbox-core/"
- + Info.getPaxSwissboxVersion()
- + "</bundle>\n"
- + "<bundle start-level='" + startLevel + "'>mvn:org.ops4j.pax.swissbox/pax-swissbox-extender/"
- + Info.getPaxSwissboxVersion()
- + "</bundle>\n"
- + "<bundle start-level='" + startLevel + "'>mvn:org.ops4j.pax.swissbox/pax-swissbox-lifecycle/"
- + Info.getPaxSwissboxVersion()
- + "</bundle>\n"
- + "<bundle start-level='" + startLevel + "'>mvn:org.ops4j.pax.swissbox/pax-swissbox-framework/"
- + Info.getPaxSwissboxVersion()
- + "</bundle>\n"
- + "<bundle start-level='" + startLevel + "'>mvn:org.ops4j.pax.exam/pax-exam/"
- + Info.getPaxExamVersion()
- + "</bundle>\n"
- + "<bundle start-level='" + startLevel + "'>mvn:org.ops4j.pax.exam/pax-exam-extender-service/"
- + Info.getPaxExamVersion()
- + "</bundle>\n"
- + "<bundle start-level='" + startLevel + "'>mvn:org.ops4j.pax.exam/pax-exam-container-rbc/"
- + Info.getPaxExamVersion()
- + "</bundle>\n"
- + "<bundle start-level='" + startLevel + "'>wrap:mvn:junit/junit/" + getJunitVersion()
- + "</bundle>\n"
- + "<bundle start-level='" + startLevel + "'>mvn:org.ops4j.pax.exam/pax-exam-invoker-junit/"
- + Info.getPaxExamVersion()
- + "</bundle>\n"
- + "<bundle start-level='" + startLevel
- + "'>mvn:org.apache.karaf.tooling.exam/org.apache.karaf.tooling.exam.options/"
- + getOptionsVersion()
- + "</bundle>\n"
- + "<bundle start-level='" + startLevel
- + "'>mvn:org.apache.geronimo.specs/geronimo-atinject_1.0_spec/" + getInjectionVersion()
- + "</bundle>\n"
- + "<bundle start-level='" + startLevel + "'>mvn:org.ops4j.pax.exam/pax-exam-inject/"
- + Info.getPaxExamVersion() + "</bundle>\n"
- + "</feature>\n"
- + "</features>";
+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+ + "<features name=\"pax-exam-features-"
+ + Info.getPaxExamVersion()
+ + "\">\n"
+ + "<feature name=\"exam\" version=\""
+ + Info.getPaxExamVersion()
+ + "\">\n"
+ + extension + "\n"
+ + "<bundle start-level='" + startLevel + "'>mvn:org.ops4j.base/ops4j-base-lang/"
+ + Info.getOps4jBaseVersion()
+ + "</bundle>\n"
+ + "<bundle start-level='" + startLevel + "'>mvn:org.ops4j.base/ops4j-base-monitors/"
+ + Info.getOps4jBaseVersion()
+ + "</bundle>\n"
+ + "<bundle start-level='" + startLevel + "'>mvn:org.ops4j.base/ops4j-base-net/"
+ + Info.getOps4jBaseVersion()
+ + "</bundle>\n"
+ + "<bundle start-level='" + startLevel + "'>mvn:org.ops4j.base/ops4j-base-store/"
+ + Info.getOps4jBaseVersion()
+ + "</bundle>\n"
+ + "<bundle start-level='" + startLevel + "'>mvn:org.ops4j.base/ops4j-base-io/"
+ + Info.getOps4jBaseVersion()
+ + "</bundle>\n"
+ + "<bundle start-level='" + startLevel + "'>mvn:org.ops4j.base/ops4j-base-spi/"
+ + Info.getOps4jBaseVersion()
+ + "</bundle>\n"
+ + "<bundle start-level='" + startLevel + "'>mvn:org.ops4j.base/ops4j-base-util-property/"
+ + Info.getOps4jBaseVersion()
+ + "</bundle>\n"
+ + "<bundle start-level='" + startLevel + "'>mvn:org.ops4j.pax.swissbox/pax-swissbox-core/"
+ + Info.getPaxSwissboxVersion()
+ + "</bundle>\n"
+ + "<bundle start-level='" + startLevel + "'>mvn:org.ops4j.pax.swissbox/pax-swissbox-extender/"
+ + Info.getPaxSwissboxVersion()
+ + "</bundle>\n"
+ + "<bundle start-level='" + startLevel + "'>mvn:org.ops4j.pax.swissbox/pax-swissbox-lifecycle/"
+ + Info.getPaxSwissboxVersion()
+ + "</bundle>\n"
+ + "<bundle start-level='" + startLevel + "'>mvn:org.ops4j.pax.swissbox/pax-swissbox-framework/"
+ + Info.getPaxSwissboxVersion()
+ + "</bundle>\n"
+ + "<bundle start-level='" + startLevel + "'>mvn:org.ops4j.pax.exam/pax-exam/"
+ + Info.getPaxExamVersion()
+ + "</bundle>\n"
+ + "<bundle start-level='" + startLevel + "'>mvn:org.ops4j.pax.exam/pax-exam-extender-service/"
+ + Info.getPaxExamVersion()
+ + "</bundle>\n"
+ + "<bundle start-level='" + startLevel + "'>mvn:org.ops4j.pax.exam/pax-exam-container-rbc/"
+ + Info.getPaxExamVersion()
+ + "</bundle>\n"
+ + "<bundle start-level='" + startLevel + "'>wrap:mvn:junit/junit/" + getJunitVersion()
+ + "</bundle>\n"
+ + "<bundle start-level='" + startLevel + "'>mvn:org.ops4j.pax.exam/pax-exam-invoker-junit/"
+ + Info.getPaxExamVersion()
+ + "</bundle>\n"
+ + "<bundle start-level='" + startLevel
+ + "'>mvn:org.apache.karaf.tooling.exam/org.apache.karaf.tooling.exam.options/"
+ + getOptionsVersion()
+ + "</bundle>\n"
+ + "<bundle start-level='" + startLevel
+ + "'>mvn:org.apache.geronimo.specs/geronimo-atinject_1.0_spec/" + getInjectionVersion()
+ + "</bundle>\n"
+ + "<bundle start-level='" + startLevel + "'>mvn:org.ops4j.pax.exam/pax-exam-inject/"
+ + Info.getPaxExamVersion() + "</bundle>\n"
+ + "</feature>\n"
+ + "</features>";
}
private String getJunitVersion() {
@@ -123,8 +122,8 @@ public class ExamFeaturesFile {
String optionsVersion = "";
try {
final InputStream is = ExamFeaturesFile.class.getClassLoader().getResourceAsStream(
- "META-INF/versions.properties"
- );
+ "META-INF/versions.properties"
+ );
if (is != null) {
final Properties properties = new Properties();
properties.load(is);
@@ -148,4 +147,5 @@ public class ExamFeaturesFile {
karafPropertiesFile.extend("featuresBoot", ",exam");
karafPropertiesFile.store();
}
+
}
Modified: karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/InternalKarafDistributionConfigurationOption.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/InternalKarafDistributionConfigurationOption.java?rev=1391406&r1=1391405&r2=1391406&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/InternalKarafDistributionConfigurationOption.java (original)
+++ karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/InternalKarafDistributionConfigurationOption.java Fri Sep 28 11:44:08 2012
@@ -48,12 +48,12 @@ public class InternalKarafDistributionCo
}
if (!distributionInfo.exists()) {
throw new IllegalStateException(
- "Either distribution.info or the property itself has to define a karaf version.");
+ "Either distribution.info or the property itself has to define a karaf version.");
}
String retrieveProperty = retrieveProperty(KARAF_VERSION);
if (retrieveProperty == null || retrieveProperty.length() == 0) {
throw new IllegalStateException(
- "Either distribution.info or the property itself has to define a karaf version.");
+ "Either distribution.info or the property itself has to define a karaf version.");
}
return retrieveProperty;
}
@@ -66,12 +66,12 @@ public class InternalKarafDistributionCo
}
if (!distributionInfo.exists()) {
throw new IllegalStateException(
- "Either distribution.info or the property itself has to define a name for the distribution..");
+ "Either distribution.info or the property itself has to define a name for the distribution..");
}
String retrieveProperty = retrieveProperty(NAME);
if (retrieveProperty == null || retrieveProperty.length() == 0) {
throw new IllegalStateException(
- "Either distribution.info or the property itself has to define a name for the distribution..");
+ "Either distribution.info or the property itself has to define a name for the distribution..");
}
return retrieveProperty;
}
Modified: karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/KarafPropertiesFile.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/KarafPropertiesFile.java?rev=1391406&r1=1391405&r2=1391406&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/KarafPropertiesFile.java (original)
+++ karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/KarafPropertiesFile.java Fri Sep 28 11:44:08 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.tooling.exam.container.internal;
import java.io.File;
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=1391406&r1=1391405&r2=1391406&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 Fri Sep 28 11:44:08 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.tooling.exam.container.internal;
import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.editConfigurationFileExtend;
@@ -116,7 +115,7 @@ public class KarafTestContainer implemen
private File targetFolder;
public KarafTestContainer(ExamSystem system, RMIRegistry registry,
- KarafDistributionBaseConfigurationOption framework, Runner runner) {
+ KarafDistributionBaseConfigurationOption framework, Runner runner) {
this.framework = framework;
this.registry = registry;
this.system = system;
@@ -129,22 +128,22 @@ public class KarafTestContainer implemen
String name = system.createID(KARAF_TEST_CONTAINER);
KarafExamSystemConfigurationOption[] internalConfigurationOptions =
- system.getOptions(KarafExamSystemConfigurationOption.class);
+ system.getOptions(KarafExamSystemConfigurationOption.class);
Option invokerConfiguration = systemProperty("pax.exam.invoker").value("junit");
if (internalConfigurationOptions != null && internalConfigurationOptions.length != 0) {
invokerConfiguration =
- systemProperty("pax.exam.invoker").value(internalConfigurationOptions[0].getInvoker());
+ systemProperty("pax.exam.invoker").value(internalConfigurationOptions[0].getInvoker());
}
ExamSystem subsystem = system.fork(
- options(
- systemProperty(RMI_HOST_PROPERTY).value(registry.getHost()),
- systemProperty(RMI_PORT_PROPERTY).value("" + registry.getPort()),
- systemProperty(RMI_NAME_PROPERTY).value(name),
- invokerConfiguration,
- systemProperty(EXAM_INJECT_PROPERTY).value("true"),
- editConfigurationFileExtend("etc/system.properties", "jline.shutdownhook", "true")
- ));
+ options(
+ systemProperty(RMI_HOST_PROPERTY).value(registry.getHost()),
+ systemProperty(RMI_PORT_PROPERTY).value("" + registry.getPort()),
+ systemProperty(RMI_NAME_PROPERTY).value(name),
+ invokerConfiguration,
+ systemProperty(EXAM_INJECT_PROPERTY).value("true"),
+ editConfigurationFileExtend("etc/system.properties", "jline.shutdownhook", "true")
+ ));
target = new RBCRemoteTarget(name, registry.getPort(), subsystem.getTimeout());
System.setProperty("java.protocol.handler.pkgs", "org.ops4j.pax.url");
@@ -174,19 +173,19 @@ public class KarafTestContainer implemen
ArrayList<String> javaOpts = Lists.newArrayList();
appendVmSettingsFromSystem(javaOpts, subsystem);
String[] javaEndorsedDirs =
- new String[]{ javaHome + "/jre/lib/endorsed", javaHome + "/lib/endorsed", karafHome + "/lib/endorsed" };
+ new String[]{javaHome + "/jre/lib/endorsed", javaHome + "/lib/endorsed", karafHome + "/lib/endorsed"};
String[] javaExtDirs =
- new String[]{ javaHome + "/jre/lib/ext", javaHome + "/lib/ext", javaHome + "/lib/ext" };
+ new String[]{javaHome + "/jre/lib/ext", javaHome + "/lib/ext", javaHome + "/lib/ext"};
String[] karafOpts = new String[]{};
ArrayList<String> opts =
- Lists.newArrayList("-Dkaraf.startLocalConsole=" + shouldLocalConsoleBeStarted(subsystem),
- "-Dkaraf.startRemoteShell=" + shouldRemoteShellBeStarted(subsystem));
+ Lists.newArrayList("-Dkaraf.startLocalConsole=" + shouldLocalConsoleBeStarted(subsystem),
+ "-Dkaraf.startRemoteShell=" + shouldRemoteShellBeStarted(subsystem));
String[] classPath = buildKarafClasspath(karafHome);
String main = "org.apache.karaf.main.Main";
String options = "";
String[] environment = new String[]{};
- String[] fileEndings = new String[]{ "jar", "war", "zip", "kar", "xml" };
+ String[] fileEndings = new String[]{"jar", "war", "zip", "kar", "xml"};
updateLogProperties(karafHome, subsystem);
updateUserSetProperties(karafHome, subsystem);
@@ -215,19 +214,18 @@ public class KarafTestContainer implemen
long startedAt = System.currentTimeMillis();
runner.exec(environment, karafBase, javaHome.toString(), javaOpts.toArray(new String[]{}),
- javaEndorsedDirs, javaExtDirs, karafHome.toString(), karafData, karafOpts,
- opts.toArray(new String[]{}), classPath, main, options);
+ javaEndorsedDirs, javaExtDirs, karafHome.toString(), karafData, karafOpts,
+ opts.toArray(new String[]{}), classPath, main, options);
LOGGER.debug("Test Container started in " + (System.currentTimeMillis() - startedAt) + " millis");
LOGGER.info("Wait for test container to finish its initialization " + subsystem.getTimeout());
if (subsystem.getOptions(ServerModeOption.class).length == 0) {
waitForState(org.apache.karaf.tooling.exam.container.internal.Constants.SYSTEM_BUNDLE,
- Bundle.ACTIVE, subsystem.getTimeout());
- }
- else {
+ Bundle.ACTIVE, subsystem.getTimeout());
+ } else {
LOGGER
- .info("System runs in Server Mode. Which means, no Test facility bundles available on target system.");
+ .info("System runs in Server Mode. Which means, no Test facility bundles available on target system.");
}
started = true;
@@ -238,15 +236,15 @@ public class KarafTestContainer implemen
}
private void copyBootClasspathLibraries(File karafHome, ExamSystem subsystem) throws MalformedURLException,
- IOException {
+ IOException {
BootClasspathLibraryOption[] bootClasspathLibraryOptions =
- subsystem.getOptions(BootClasspathLibraryOption.class);
+ subsystem.getOptions(BootClasspathLibraryOption.class);
for (BootClasspathLibraryOption bootClasspathLibraryOption : bootClasspathLibraryOptions) {
UrlReference libraryUrl = bootClasspathLibraryOption.getLibraryUrl();
FileUtils.copyURLToFile(
- new URL(libraryUrl.getURL()),
- createFileNameWithRandomPrefixFromUrlAtTarget(libraryUrl.getURL(), new File(karafHome + "/lib"),
- new String[]{ "jar" }));
+ new URL(libraryUrl.getURL()),
+ createFileNameWithRandomPrefixFromUrlAtTarget(libraryUrl.getURL(), new File(karafHome + "/lib"),
+ new String[]{"jar"}));
}
}
@@ -266,7 +264,7 @@ public class KarafTestContainer implemen
private String shouldRemoteShellBeStarted(ExamSystem subsystem) {
KarafDistributionConfigurationConsoleOption[] consoleOptions =
- subsystem.getOptions(KarafDistributionConfigurationConsoleOption.class);
+ subsystem.getOptions(KarafDistributionConfigurationConsoleOption.class);
if (consoleOptions == null) {
return "true";
}
@@ -280,7 +278,7 @@ public class KarafTestContainer implemen
private String shouldLocalConsoleBeStarted(ExamSystem subsystem) {
KarafDistributionConfigurationConsoleOption[] consoleOptions =
- subsystem.getOptions(KarafDistributionConfigurationConsoleOption.class);
+ subsystem.getOptions(KarafDistributionConfigurationConsoleOption.class);
if (consoleOptions == null) {
return "true";
}
@@ -330,7 +328,7 @@ public class KarafTestContainer implemen
for (ProvisionOption option : options) {
try {
FileUtils.copyURLToFile(new URL(option.getURL()),
- createFileNameWithRandomPrefixFromUrlAtTarget(option.getURL(), deploy, fileEndings));
+ createFileNameWithRandomPrefixFromUrlAtTarget(option.getURL(), deploy, fileEndings));
} catch (Exception e) {
// well, this can happen...
}
@@ -357,7 +355,7 @@ public class KarafTestContainer implemen
private void updateUserSetProperties(File karafHome, ExamSystem subsystem) throws IOException {
List<KarafDistributionConfigurationFileOption> options = Lists.newArrayList(
- subsystem.getOptions(KarafDistributionConfigurationFileOption.class));
+ subsystem.getOptions(KarafDistributionConfigurationFileOption.class));
options.addAll(extractFileOptionsBasedOnFeaturesScannerOptions(subsystem));
options.addAll(configureBootDelegation(subsystem));
options.addAll(configureSystemBundles(subsystem));
@@ -365,10 +363,10 @@ public class KarafTestContainer implemen
for (KarafDistributionConfigurationFileOption option : options) {
if (!optionMap.containsKey(option.getConfigurationFilePath())) {
optionMap.put(option.getConfigurationFilePath(),
- new HashMap<String, List<KarafDistributionConfigurationFileOption>>());
+ new HashMap<String, List<KarafDistributionConfigurationFileOption>>());
}
HashMap<String, List<KarafDistributionConfigurationFileOption>> optionEntries =
- optionMap.get(option.getConfigurationFilePath());
+ optionMap.get(option.getConfigurationFilePath());
if (!optionEntries.containsKey(option.getKey())) {
optionEntries.put(option.getKey(), new ArrayList<KarafDistributionConfigurationFileOption>());
} else {
@@ -387,7 +385,7 @@ public class KarafTestContainer implemen
KarafPropertiesFile karafPropertiesFile = new KarafPropertiesFile(karafHome, configFile);
karafPropertiesFile.load();
Collection<List<KarafDistributionConfigurationFileOption>> optionsToApply =
- optionMap.get(configFile).values();
+ optionMap.get(configFile).values();
boolean store = true;
for (List<KarafDistributionConfigurationFileOption> optionListToApply : optionsToApply) {
for (KarafDistributionConfigurationFileOption optionToApply : optionListToApply) {
@@ -395,8 +393,8 @@ public class KarafTestContainer implemen
karafPropertiesFile.put(optionToApply.getKey(), optionToApply.getValue());
} else if (optionToApply instanceof KarafDistributionConfigurationFileReplacementOption) {
karafPropertiesFile
- .replace(((KarafDistributionConfigurationFileReplacementOption) optionToApply)
- .getSource());
+ .replace(((KarafDistributionConfigurationFileReplacementOption) optionToApply)
+ .getSource());
store = false;
break;
} else {
@@ -426,11 +424,11 @@ public class KarafTestContainer implemen
return Lists.newArrayList();
}
return Lists.newArrayList(new KarafDistributionConfigurationFileExtendOption(
- CustomProperties.SYSTEM_PACKAGES_EXTRA, systemPackageString));
+ CustomProperties.SYSTEM_PACKAGES_EXTRA, systemPackageString));
}
private Collection<? extends KarafDistributionConfigurationFileOption>
- configureBootDelegation(ExamSystem subsystem) {
+ configureBootDelegation(ExamSystem subsystem) {
BootDelegationOption[] bootDelegationOptions = subsystem.getOptions(BootDelegationOption.class);
String bootDelegationString = "";
for (BootDelegationOption bootDelegationOption : bootDelegationOptions) {
@@ -438,11 +436,11 @@ public class KarafTestContainer implemen
bootDelegationString += bootDelegationOption.getValue();
}
return Lists.newArrayList(new KarafDistributionConfigurationFileExtendOption(CustomProperties.BOOTDELEGATION,
- bootDelegationString));
+ bootDelegationString));
}
private Collection<? extends KarafDistributionConfigurationFileOption>
- extractFileOptionsBasedOnFeaturesScannerOptions(ExamSystem subsystem) {
+ extractFileOptionsBasedOnFeaturesScannerOptions(ExamSystem subsystem) {
ArrayList<KarafDistributionConfigurationFileOption> retVal = Lists.newArrayList();
FeaturesScannerProvisionOption[] features = subsystem.getOptions(FeaturesScannerProvisionOption.class);
for (FeaturesScannerProvisionOption feature : features) {
@@ -530,10 +528,9 @@ public class KarafTestContainer implemen
extractZipDistribution(sourceDistribution, targetFolder);
} else if (sourceDistribution.getFile().indexOf(".tar.gz") > 0) {
extractTarGzDistribution(sourceDistribution, targetFolder);
- }
- else {
+ } else {
throw new IllegalStateException(
- "Unknow packaging of distribution; only zip or tar.gz could be handled.");
+ "Unknow packaging of distribution; only zip or tar.gz could be handled.");
}
return;
}
@@ -543,12 +540,12 @@ public class KarafTestContainer implemen
extractTarGzDistribution(sourceDistribution, targetFolder);
} else {
throw new IllegalStateException(
- "Unknow packaging of distribution; only zip or tar.gz could be handled.");
+ "Unknow packaging of distribution; only zip or tar.gz could be handled.");
}
}
private void extractTarGzDistribution(URL sourceDistribution, File targetFolder) throws IOException,
- FileNotFoundException {
+ FileNotFoundException {
File uncompressedFile = File.createTempFile("uncompressedTarGz-", ".tar");
extractGzArchive(sourceDistribution.openStream(), uncompressedFile);
extract(new TarArchiveInputStream(new FileInputStream(uncompressedFile)), targetFolder);
@@ -615,8 +612,7 @@ public class KarafTestContainer implemen
if (runner != null) {
runner.shutdown();
}
- }
- else {
+ } else {
throw new RuntimeException("Container never came up");
}
} finally {
@@ -640,7 +636,7 @@ public class KarafTestContainer implemen
}
private void waitForState(final long bundleId, final int state, final RelativeTimeout timeout)
- throws TimeoutException {
+ throws TimeoutException {
target.getClientRBC().waitForState(bundleId, state, timeout);
}
@@ -663,4 +659,5 @@ public class KarafTestContainer implemen
public String toString() {
return "KarafTestContainer{" + framework.getFrameworkURL() + "}";
}
+
}
Modified: karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/KarafTestContainerFactory.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/KarafTestContainerFactory.java?rev=1391406&r1=1391405&r2=1391406&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/KarafTestContainerFactory.java (original)
+++ karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/KarafTestContainerFactory.java Fri Sep 28 11:44:08 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.tooling.exam.container.internal;
import java.util.ArrayList;
@@ -49,30 +48,29 @@ public class KarafTestContainerFactory i
* {@inheritDoc}
*/
@Override
- public TestContainer[] create(ExamSystem system)
- {
+ public TestContainer[] create(ExamSystem system) {
List<TestContainer> containers = new ArrayList<TestContainer>();
KarafDistributionKitConfigurationOption[] kitOptions =
- system.getOptions(KarafDistributionKitConfigurationOption.class);
+ system.getOptions(KarafDistributionKitConfigurationOption.class);
for (KarafDistributionKitConfigurationOption kitOption : kitOptions) {
if (kitOption.getPlatform().equals(Platform.WINDOWS)) {
if (IS_WINDOWS_OS) {
containers.add(new KarafTestContainer(system, m_rmiRegistry, kitOption, new WindowsRunner(kitOption
- .getMakeExec(), kitOption.getExec())));
+ .getMakeExec(), kitOption.getExec())));
continue;
}
LOGGER.info("Ignore windows settings on non windows platforms");
} else {
if (!IS_WINDOWS_OS) {
containers.add(new KarafTestContainer(system, m_rmiRegistry, kitOption, new NixRunner(kitOption
- .getMakeExec(), kitOption.getExec())));
+ .getMakeExec(), kitOption.getExec())));
continue;
}
LOGGER.info("Ignore non windows settings on windows platforms");
}
}
KarafDistributionBaseConfigurationOption[] options =
- system.getOptions(KarafDistributionConfigurationOption.class);
+ system.getOptions(KarafDistributionConfigurationOption.class);
for (KarafDistributionBaseConfigurationOption testContainer : options) {
containers.add(new KarafTestContainer(system, m_rmiRegistry, testContainer, new KarafJavaRunner()));
}
Modified: karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/RMIRegistry.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/RMIRegistry.java?rev=1391406&r1=1391405&r2=1391406&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/RMIRegistry.java (original)
+++ karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/RMIRegistry.java Fri Sep 28 11:44:08 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.tooling.exam.container.internal;
import java.net.InetAddress;
@@ -60,11 +59,10 @@ public class RMIRegistry {
/**
* This will make sure a registry exists and is valid m_port. If its not available or does not work for some reason,
* it will select another port. This should really not happen usually. But it can.
- *
+ *
* @return this for fluent API. Or IllegalStateException if a port has not been detected successfully.
*/
- public synchronized RMIRegistry selectGracefully()
- {
+ public synchronized RMIRegistry selectGracefully() {
// if( ( m_port = select( m_defaultPort ) ) == UNSELECTED ) {
int alternativePort = new FreePort(m_altMin, m_altTo).getPort();
if ((m_port = select(alternativePort)) == UNSELECTED) {
@@ -77,21 +75,19 @@ public class RMIRegistry {
return this;
}
- private void printTakenStatus()
- {
+ private void printTakenStatus() {
int in_use = m_port - m_altMin + 1; // the one we just took
int max = m_altTo - m_altMin;
String info =
- "Currently " + in_use + " out of " + max + " ports are in use. Port range is from " + m_altMin + " up to "
- + m_altTo;
+ "Currently " + in_use + " out of " + max + " ports are in use. Port range is from " + m_altMin + " up to "
+ + m_altTo;
if (in_use + TREASURE > max) {
LOG.warn("--------------");
LOG.warn("BEWARE !!! " + info);
LOG.warn("--------------");
- }
- else {
+ } else {
LOG.debug(info);
}
}
@@ -99,19 +95,16 @@ public class RMIRegistry {
/**
* This contains basically two paths: 1. check if the given port already is valid rmi registry. Use that one if
* possible 2. make a new one at that port otherwise. Must also be validated.
- *
+ *
* @param port to select.
- *
* @return input port if successful or UNSELECTED
*/
- private Integer select(int port)
- {
+ private Integer select(int port) {
if (reuseRegistry(port)) {
LOG.debug("Reuse Registry on " + port);
return port;
- }
- else if (createNewRegistry(port)) {
+ } else if (createNewRegistry(port)) {
LOG.debug("Created Registry on " + port);
return port;
}
@@ -120,8 +113,7 @@ public class RMIRegistry {
}
- private boolean createNewRegistry(int port)
- {
+ private boolean createNewRegistry(int port) {
try {
Registry registry = LocateRegistry.createRegistry(port);
@@ -134,8 +126,7 @@ public class RMIRegistry {
return false;
}
- private boolean reuseRegistry(int port)
- {
+ private boolean reuseRegistry(int port) {
Registry reg = null;
try {
reg = LocateRegistry.getRegistry(port);
@@ -148,8 +139,7 @@ public class RMIRegistry {
}
- private boolean verifyRegistry(Registry reg)
- {
+ private boolean verifyRegistry(Registry reg) {
if (reg != null) {
// test:
try {
@@ -167,13 +157,12 @@ public class RMIRegistry {
return false;
}
- public String getHost()
- {
+ public String getHost() {
return m_host;
}
- public int getPort()
- {
+ public int getPort() {
return m_port;
}
+
}
Modified: karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/adaptions/KarafManipulator.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/adaptions/KarafManipulator.java?rev=1391406&r1=1391405&r2=1391406&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/adaptions/KarafManipulator.java (original)
+++ karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/adaptions/KarafManipulator.java Fri Sep 28 11:44:08 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.tooling.exam.container.internal.adaptions;
/**
Modified: karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/adaptions/KarafManipulatorFactory.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/adaptions/KarafManipulatorFactory.java?rev=1391406&r1=1391405&r2=1391406&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/adaptions/KarafManipulatorFactory.java (original)
+++ karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/adaptions/KarafManipulatorFactory.java Fri Sep 28 11:44:08 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.tooling.exam.container.internal.adaptions;
import org.osgi.framework.Version;
Modified: karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/adaptions/KarafManipulatorStartingFrom220.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/adaptions/KarafManipulatorStartingFrom220.java?rev=1391406&r1=1391405&r2=1391406&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/adaptions/KarafManipulatorStartingFrom220.java (original)
+++ karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/adaptions/KarafManipulatorStartingFrom220.java Fri Sep 28 11:44:08 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.tooling.exam.container.internal.adaptions;
/**
Modified: karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/BaseScriptRunner.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/BaseScriptRunner.java?rev=1391406&r1=1391405&r2=1391406&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/BaseScriptRunner.java (original)
+++ karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/BaseScriptRunner.java Fri Sep 28 11:44:08 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.tooling.exam.container.internal.runner;
import java.io.File;
@@ -38,8 +37,8 @@ public abstract class BaseScriptRunner i
@Override
public void exec(final String[] environment, final File karafBase, String javaHome, String[] javaOpts,
- String[] javaEndorsedDirs, String[] javaExtDirs, String karafHome,
- String karafData, String[] karafOpts, String[] opts, String[] classPath, String main, String options) {
+ String[] javaEndorsedDirs, String[] javaExtDirs, String karafHome,
+ String karafData, String[] karafOpts, String[] opts, String[] classPath, String main, String options) {
makeEnvironmentExecutable(karafBase);
startSystem(environment, karafBase);
}
Modified: karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/CommandLineBuilder.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/CommandLineBuilder.java?rev=1391406&r1=1391405&r2=1391406&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/CommandLineBuilder.java (original)
+++ karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/CommandLineBuilder.java Fri Sep 28 11:44:08 2012
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.tooling.exam.container.internal.runner;
public class CommandLineBuilder {
+
/**
* The command line array.
*/
@@ -26,8 +26,7 @@ public class CommandLineBuilder {
/**
* Creates a new command line builder.
*/
- public CommandLineBuilder()
- {
+ public CommandLineBuilder() {
m_commandLine = new String[0];
}
@@ -35,13 +34,10 @@ public class CommandLineBuilder {
* Appends an array of strings to command line.
*
* @param segments array to append
- *
* @return CommandLineBuilder for fluent api
*/
- public CommandLineBuilder append(final String[] segments)
- {
- if (segments != null && segments.length > 0)
- {
+ public CommandLineBuilder append(final String[] segments) {
+ if (segments != null && segments.length > 0) {
final String[] command = new String[m_commandLine.length + segments.length];
System.arraycopy(m_commandLine, 0, command, 0, m_commandLine.length);
System.arraycopy(segments, 0, command, m_commandLine.length, segments.length);
@@ -54,14 +50,11 @@ public class CommandLineBuilder {
* Appends a string to command line.
*
* @param segment string to append
- *
* @return CommandLineBuilder for fluent api
*/
- public CommandLineBuilder append(final String segment)
- {
- if (segment != null && !segment.isEmpty())
- {
- return append(new String[]{ segment });
+ public CommandLineBuilder append(final String segment) {
+ if (segment != null && !segment.isEmpty()) {
+ return append(new String[]{segment});
}
return this;
}
@@ -71,8 +64,7 @@ public class CommandLineBuilder {
*
* @return command line
*/
- public String[] toArray()
- {
+ public String[] toArray() {
return m_commandLine;
}
Modified: karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/InternalRunner.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/InternalRunner.java?rev=1391406&r1=1391405&r2=1391406&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/InternalRunner.java (original)
+++ karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/InternalRunner.java Fri Sep 28 11:44:08 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.tooling.exam.container.internal.runner;
import java.io.File;
@@ -27,23 +26,21 @@ import java.util.Map;
import org.ops4j.io.Pipe;
public class InternalRunner {
+
private Process m_frameworkProcess;
private Thread m_shutdownHook;
public synchronized void exec(CommandLineBuilder commandLine, final File workingDirectory,
- final String[] envOptions) {
- if (m_frameworkProcess != null)
- {
+ final String[] envOptions) {
+ if (m_frameworkProcess != null) {
throw new IllegalStateException("Platform already started");
}
- try
- {
+ try {
m_frameworkProcess =
- Runtime.getRuntime().exec(commandLine.toArray(), createEnvironmentVars(envOptions),
- workingDirectory);
- } catch (IOException e)
- {
+ Runtime.getRuntime().exec(commandLine.toArray(), createEnvironmentVars(envOptions),
+ workingDirectory);
+ } catch (IOException e) {
throw new IllegalStateException("Could not start up the process", e);
}
@@ -53,8 +50,7 @@ public class InternalRunner {
waitForExit();
}
- private String[] createEnvironmentVars(String[] envOptions)
- {
+ private String[] createEnvironmentVars(String[] envOptions) {
List<String> env = new ArrayList<String>();
Map<String, String> getenv = System.getenv();
for (String key : getenv.keySet()) {
@@ -69,8 +65,7 @@ public class InternalRunner {
/**
* {@inheritDoc}
*/
- public void shutdown()
- {
+ public void shutdown() {
try {
if (m_shutdownHook != null) {
synchronized (m_shutdownHook) {
@@ -82,8 +77,7 @@ public class InternalRunner {
}
}
}
- } catch (IllegalStateException ignore)
- {
+ } catch (IllegalStateException ignore) {
// just ignore
}
}
@@ -91,15 +85,12 @@ public class InternalRunner {
/**
* Wait till the framework process exits.
*/
- public void waitForExit()
- {
+ public void waitForExit() {
synchronized (m_frameworkProcess) {
- try
- {
+ try {
m_frameworkProcess.waitFor();
shutdown();
- } catch (Throwable e)
- {
+ } catch (Throwable e) {
shutdown();
}
}
@@ -109,35 +100,29 @@ public class InternalRunner {
* Create helper thread to safely shutdown the external framework process
*
* @param process framework process
- *
* @return stream handler
*/
- private Thread createShutdownHook(final Process process)
- {
+ private Thread createShutdownHook(final Process process) {
final Pipe errPipe = new Pipe(process.getErrorStream(), System.err).start("Error pipe");
final Pipe outPipe = new Pipe(process.getInputStream(), System.out).start("Out pipe");
final Pipe inPipe = new Pipe(process.getOutputStream(), System.in).start("In pipe");
return new Thread(
- new Runnable()
- {
- @Override
- public void run()
- {
- inPipe.stop();
- outPipe.stop();
- errPipe.stop();
-
- try
- {
- process.destroy();
+ new Runnable() {
+ @Override
+ public void run() {
+ inPipe.stop();
+ outPipe.stop();
+ errPipe.stop();
+
+ try {
+ process.destroy();
+ } catch (Exception e) {
+ // ignore if already shutting down
+ }
}
- catch (Exception e)
- {
- // ignore if already shutting down
- }
- }
- },
- "Pax-Runner shutdown hook");
+ },
+ "Pax-Runner shutdown hook");
}
+
}
Modified: karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/KarafJavaRunner.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/KarafJavaRunner.java?rev=1391406&r1=1391405&r2=1391406&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/KarafJavaRunner.java (original)
+++ karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/KarafJavaRunner.java Fri Sep 28 11:44:08 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.tooling.exam.container.internal.runner;
import java.io.File;
@@ -32,10 +31,10 @@ public class KarafJavaRunner implements
@Override
public synchronized void
- exec(final String[] environment, final File karafBase, final String javaHome, final String[] javaOpts,
- final String[] javaEndorsedDirs,
- final String[] javaExtDirs, final String karafHome, final String karafData, final String[] karafOpts,
- final String[] opts, final String[] classPath, final String main, final String options) {
+ exec(final String[] environment, final File karafBase, final String javaHome, final String[] javaOpts,
+ final String[] javaEndorsedDirs,
+ final String[] javaExtDirs, final String karafHome, final String karafData, final String[] karafOpts,
+ final String[] opts, final String[] classPath, final String main, final String options) {
new Thread("KarafJavaRunner") {
@Override
public void run() {
@@ -43,30 +42,28 @@ public class KarafJavaRunner implements
String endDirs = buildCmdSeparatedString(javaEndorsedDirs);
String extDirs = buildCmdSeparatedString(javaExtDirs);
final CommandLineBuilder commandLine = new CommandLineBuilder()
- .append(getJavaExecutable(javaHome))
- .append(javaOpts)
- .append("-Djava.endorsed.dirs=" + endDirs)
- .append("-Djava.ext.dirs=" + extDirs)
- .append("-Dkaraf.instances=" + karafHome + "/instances")
- .append("-Dkaraf.home=" + karafHome)
- .append("-Dkaraf.base=" + karafBase)
- .append("-Dkaraf.data=" + karafData)
- .append("-Djava.util.logging.config.file=" + karafBase + "/etc/java.util.logging.properties")
- .append(karafOpts)
- .append(opts)
- .append("-cp")
- .append(cp)
- .append(main)
- .append(options);
+ .append(getJavaExecutable(javaHome))
+ .append(javaOpts)
+ .append("-Djava.endorsed.dirs=" + endDirs)
+ .append("-Djava.ext.dirs=" + extDirs)
+ .append("-Dkaraf.instances=" + karafHome + "/instances")
+ .append("-Dkaraf.home=" + karafHome)
+ .append("-Dkaraf.base=" + karafBase)
+ .append("-Dkaraf.data=" + karafData)
+ .append("-Djava.util.logging.config.file=" + karafBase + "/etc/java.util.logging.properties")
+ .append(karafOpts)
+ .append(opts)
+ .append("-cp")
+ .append(cp)
+ .append(main)
+ .append(options);
runner.exec(commandLine, karafBase, environment);
}
private String buildCmdSeparatedString(final String[] splitted) {
final StringBuilder together = new StringBuilder();
- for (String path : splitted)
- {
- if (together.length() != 0)
- {
+ for (String path : splitted) {
+ if (together.length() != 0) {
together.append(File.pathSeparator);
}
together.append(path);
@@ -74,10 +71,8 @@ public class KarafJavaRunner implements
return together.toString();
}
- private String getJavaExecutable(final String javaHome)
- {
- if (javaHome == null)
- {
+ private String getJavaExecutable(final String javaHome) {
+ if (javaHome == null) {
throw new IllegalStateException("JAVA_HOME is not set.");
}
return javaHome + "/bin/java";
Modified: karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/NixRunner.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/NixRunner.java?rev=1391406&r1=1391405&r2=1391406&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/NixRunner.java (original)
+++ karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/NixRunner.java Fri Sep 28 11:44:08 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.tooling.exam.container.internal.runner;
import java.io.File;
@@ -32,8 +31,8 @@ public class NixRunner extends BaseScrip
@Override
protected CommandLineBuilder createCommandLine(String[] environment, File karafBase) {
CommandLineBuilder commandLine = new CommandLineBuilder()
- .append("/bin/sh")
- .append(new File(karafBase, exec).getAbsolutePath());
+ .append("/bin/sh")
+ .append(new File(karafBase, exec).getAbsolutePath());
return commandLine;
}
Modified: karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/Runner.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/Runner.java?rev=1391406&r1=1391405&r2=1391406&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/Runner.java (original)
+++ karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/Runner.java Fri Sep 28 11:44:08 2012
@@ -26,11 +26,10 @@ public interface Runner {
/**
* Starts the environment in the specific environment.
*/
- public abstract void
- exec(final String[] environment, final File karafBase, final String javaHome, final String[] javaOpts,
- final String[] javaEndorsedDirs,
- final String[] javaExtDirs, final String karafHome, final String karafData, final String[] karafOpts,
- final String[] opts, final String[] classPath, final String main, final String options);
+ public abstract void exec(final String[] environment, final File karafBase, final String javaHome, final String[] javaOpts,
+ final String[] javaEndorsedDirs,
+ final String[] javaExtDirs, final String karafHome, final String karafData, final String[] karafOpts,
+ final String[] opts, final String[] classPath, final String main, final String options);
/**
* Shutsdown the runner again.
Modified: karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/WindowsRunner.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/WindowsRunner.java?rev=1391406&r1=1391405&r2=1391406&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/WindowsRunner.java (original)
+++ karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/WindowsRunner.java Fri Sep 28 11:44:08 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.tooling.exam.container.internal.runner;
import java.io.File;
@@ -32,9 +31,10 @@ public class WindowsRunner extends BaseS
@Override
protected CommandLineBuilder createCommandLine(String[] environment, File karafBase) {
CommandLineBuilder commandLine = new CommandLineBuilder()
- .append("cmd.exe")
- .append("/c")
- .append(new File(karafBase, exec).getAbsolutePath());
+ .append("cmd.exe")
+ .append("/c")
+ .append(new File(karafBase, exec).getAbsolutePath());
return commandLine;
}
+
}
Modified: karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/ConfigurationPointer.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/ConfigurationPointer.java?rev=1391406&r1=1391405&r2=1391406&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/ConfigurationPointer.java (original)
+++ karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/ConfigurationPointer.java Fri Sep 28 11:44:08 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.tooling.exam.options;
/**
Modified: karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/DoNotModifyLogOption.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/DoNotModifyLogOption.java?rev=1391406&r1=1391405&r2=1391406&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/DoNotModifyLogOption.java (original)
+++ karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/DoNotModifyLogOption.java Fri Sep 28 11:44:08 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.tooling.exam.options;
import org.ops4j.pax.exam.Option;
Modified: karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/ExamBundlesStartLevel.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/ExamBundlesStartLevel.java?rev=1391406&r1=1391405&r2=1391406&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/ExamBundlesStartLevel.java (original)
+++ karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/ExamBundlesStartLevel.java Fri Sep 28 11:44:08 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.tooling.exam.options;
import org.ops4j.pax.exam.Option;
@@ -23,7 +22,7 @@ import org.ops4j.pax.exam.Option;
* This option allows to configure the start level of the bundles in the exam features descriptor.
*/
public class ExamBundlesStartLevel implements Option {
-
+
private final int startLevel;
/**
@@ -36,4 +35,5 @@ public class ExamBundlesStartLevel imple
public int getStartLevel() {
return startLevel;
}
+
}
Modified: karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionBaseConfigurationOption.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionBaseConfigurationOption.java?rev=1391406&r1=1391405&r2=1391406&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionBaseConfigurationOption.java (original)
+++ karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionBaseConfigurationOption.java Fri Sep 28 11:44:08 2012
@@ -45,7 +45,7 @@ public class KarafDistributionBaseConfig
}
public KarafDistributionBaseConfigurationOption(MavenUrlReference frameworkURLReference, String name,
- String karafVersion) {
+ String karafVersion) {
frameworkURL = null;
this.frameworkURLReference = frameworkURLReference;
this.name = name;
Modified: karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationConsoleOption.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationConsoleOption.java?rev=1391406&r1=1391405&r2=1391406&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationConsoleOption.java (original)
+++ karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationConsoleOption.java Fri Sep 28 11:44:08 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.tooling.exam.options;
import org.ops4j.pax.exam.Option;
Modified: karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationFileExtendOption.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationFileExtendOption.java?rev=1391406&r1=1391405&r2=1391406&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationFileExtendOption.java (original)
+++ karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationFileExtendOption.java Fri Sep 28 11:44:08 2012
@@ -14,14 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.tooling.exam.options;
-
/**
* This option allows to extend configurations in each configuration file based on the karaf.home location. The value
* extends the current value (e.g. a=b to a=a,b) instead of replacing it. If there is no current value it is added.
- *
+ * <p/>
* If you would like to have add or replace functionality please use the
* {@link KarafDistributionConfigurationFilePutOption} instead.
*/
Modified: karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationFileOption.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationFileOption.java?rev=1391406&r1=1391405&r2=1391406&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationFileOption.java (original)
+++ karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationFileOption.java Fri Sep 28 11:44:08 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.tooling.exam.options;
import org.ops4j.pax.exam.Option;
Modified: karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationFilePutOption.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationFilePutOption.java?rev=1391406&r1=1391405&r2=1391406&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationFilePutOption.java (original)
+++ karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationFilePutOption.java Fri Sep 28 11:44:08 2012
@@ -14,14 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.tooling.exam.options;
-
/**
* This option allows to configure each configuration fille based on the karaf.home location. The value is "put". Which
* means it is either replaced or added.
- *
+ * <p/>
* If you like to extend an option (e.g. make a=b to a=b,c) please make use of the
* {@link KarafDistributionConfigurationFileExtendOption}.
*/
Modified: karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationFileReplacementOption.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationFileReplacementOption.java?rev=1391406&r1=1391405&r2=1391406&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationFileReplacementOption.java (original)
+++ karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationFileReplacementOption.java Fri Sep 28 11:44:08 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.tooling.exam.options;
import java.io.File;
Modified: karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationOption.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationOption.java?rev=1391406&r1=1391405&r2=1391406&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationOption.java (original)
+++ karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationOption.java Fri Sep 28 11:44:08 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.tooling.exam.options;
import org.ops4j.pax.exam.options.MavenUrlReference;
@@ -34,7 +33,7 @@ public class KarafDistributionConfigurat
}
public KarafDistributionConfigurationOption(MavenUrlReference frameworkURLReference, String name,
- String karafVersion) {
+ String karafVersion) {
super(frameworkURLReference, name, karafVersion);
}
Modified: karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionKitConfigurationOption.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionKitConfigurationOption.java?rev=1391406&r1=1391405&r2=1391406&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionKitConfigurationOption.java (original)
+++ karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionKitConfigurationOption.java Fri Sep 28 11:44:08 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.tooling.exam.options;
import java.util.ArrayList;
@@ -37,13 +36,13 @@ public class KarafDistributionKitConfigu
private String exec;
public KarafDistributionKitConfigurationOption(KarafDistributionBaseConfigurationOption base,
- Platform platform) {
+ Platform platform) {
super(base);
setPlatform(platform);
}
public KarafDistributionKitConfigurationOption(MavenUrlReference frameworkURLReference, String name,
- String karafVersion, Platform platform) {
+ String karafVersion, Platform platform) {
super(frameworkURLReference, name, karafVersion);
setPlatform(platform);
}
@@ -54,7 +53,7 @@ public class KarafDistributionKitConfigu
}
public KarafDistributionKitConfigurationOption(String frameworkURL, String name, String karafVersion,
- Platform platform) {
+ Platform platform) {
super(frameworkURL, name, karafVersion);
setPlatform(platform);
}
Modified: karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionOption.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionOption.java?rev=1391406&r1=1391405&r2=1391406&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionOption.java (original)
+++ karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionOption.java Fri Sep 28 11:44:08 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.tooling.exam.options;
import static java.lang.String.format;
@@ -81,8 +80,8 @@ public final class KarafDistributionOpti
* version since all of those params are relevant to decide which wrapper configurations to use.
*/
public static KarafDistributionBaseConfigurationOption karafDistributionConfiguration(String frameworkURL,
- String name,
- String karafVersion) {
+ String name,
+ String karafVersion) {
return new KarafDistributionConfigurationOption(frameworkURL, name, karafVersion);
}
@@ -97,7 +96,7 @@ public final class KarafDistributionOpti
/**
* This option allows to configure each configuration fille based on the karaf.home location. The value is "put".
* Which means it is either replaced or added.
- *
+ * <p/>
* If you like to extend an option (e.g. make a=b to a=b,c) please make use of the
* {@link KarafDistributionConfigurationFileExtendOption}.
*/
@@ -108,7 +107,7 @@ public final class KarafDistributionOpti
/**
* This option allows to configure each configuration fille based on the karaf.home location. The value is "put".
* Which means it is either replaced or added.
- *
+ * <p/>
* If you like to extend an option (e.g. make a=b to a=b,c) please make use of the
* {@link KarafDistributionConfigurationFileExtendOption}.
*/
@@ -123,7 +122,7 @@ public final class KarafDistributionOpti
* specific values.
*/
public static Option[] editConfigurationFilePut(final String configurationFilePath,
- File source, String... keysToUseFromSource) {
+ File source, String... keysToUseFromSource) {
return createOptionListFromFile(source, new FileOptionFactory() {
@Override
public Option createOption(String key, String value) {
@@ -137,7 +136,7 @@ public final class KarafDistributionOpti
}
private static Option[] createOptionListFromFile(File source, FileOptionFactory optionFactory,
- String... keysToUseFromSource) {
+ String... keysToUseFromSource) {
Properties props = new Properties();
try {
props.load(new FileInputStream(source));
@@ -147,7 +146,7 @@ public final class KarafDistributionOpti
throw new IllegalStateException(e);
}
List<Option> options =
- new ArrayList<Option>();
+ new ArrayList<Option>();
if (keysToUseFromSource == null || keysToUseFromSource.length == 0) {
Set<Object> keySet = props.keySet();
for (Object key : keySet) {
@@ -167,7 +166,7 @@ public final class KarafDistributionOpti
* This option allows to extend configurations in each configuration file based on the karaf.home location. The
* value extends the current value (e.g. a=b to a=a,b) instead of replacing it. If there is no current value it is
* added.
- *
+ * <p/>
* If you would like to have add or replace functionality please use the
* {@link KarafDistributionConfigurationFilePutOption} instead.
*/
@@ -179,7 +178,7 @@ public final class KarafDistributionOpti
* This option allows to extend configurations in each configuration file based on the karaf.home location. The
* value extends the current value (e.g. a=b to a=a,b) instead of replacing it. If there is no current value it is
* added.
- *
+ * <p/>
* If you would like to have add or replace functionality please use the
* {@link KarafDistributionConfigurationFilePutOption} instead.
*/
@@ -194,7 +193,7 @@ public final class KarafDistributionOpti
* specific values.
*/
public static Option[] editConfigurationFileExtend(final String configurationFilePath, File source,
- String... keysToUseFromSource) {
+ String... keysToUseFromSource) {
return createOptionListFromFile(source, new FileOptionFactory() {
@Override
public Option createOption(String key, String value) {
@@ -240,7 +239,7 @@ public final class KarafDistributionOpti
*/
public static Option debugConfiguration(String port, boolean hold) {
return new VMOption(format("-Xrunjdwp:transport=dt_socket,server=y,suspend=%s,address=%s", hold ? "y" : "n",
- port));
+ port));
}
}
Modified: karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafExamSystemConfigurationOption.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafExamSystemConfigurationOption.java?rev=1391406&r1=1391405&r2=1391406&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafExamSystemConfigurationOption.java (original)
+++ karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafExamSystemConfigurationOption.java Fri Sep 28 11:44:08 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.tooling.exam.options;
import org.ops4j.pax.exam.Option;
Modified: karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KeepRuntimeFolderOption.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KeepRuntimeFolderOption.java?rev=1391406&r1=1391405&r2=1391406&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KeepRuntimeFolderOption.java (original)
+++ karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KeepRuntimeFolderOption.java Fri Sep 28 11:44:08 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.tooling.exam.options;
import org.ops4j.pax.exam.Option;
Modified: karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/LogLevelOption.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/LogLevelOption.java?rev=1391406&r1=1391405&r2=1391406&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/LogLevelOption.java (original)
+++ karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/LogLevelOption.java Fri Sep 28 11:44:08 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.tooling.exam.options;
import org.ops4j.pax.exam.Option;
Modified: karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/configs/CustomProperties.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/configs/CustomProperties.java?rev=1391406&r1=1391405&r2=1391406&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/configs/CustomProperties.java (original)
+++ karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/configs/CustomProperties.java Fri Sep 28 11:44:08 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.tooling.exam.options.configs;
import org.apache.karaf.tooling.exam.options.ConfigurationPointer;
@@ -33,7 +32,7 @@ public interface CustomProperties {
static final ConfigurationPointer KARAF_FRAMEWORK = new CustomPropertiesPointer("karaf.framework");
static final ConfigurationPointer SYSTEM_PACKAGES_EXTRA = new CustomPropertiesPointer(
- "org.osgi.framework.system.packages.extra");
+ "org.osgi.framework.system.packages.extra");
static final ConfigurationPointer BOOTDELEGATION = new CustomPropertiesPointer("org.osgi.framework.bootdelegation");
@@ -44,4 +43,5 @@ public interface CustomProperties {
}
}
+
}
Modified: karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/configs/FeaturesCfg.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/configs/FeaturesCfg.java?rev=1391406&r1=1391405&r2=1391406&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/configs/FeaturesCfg.java (original)
+++ karaf/trunk/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/configs/FeaturesCfg.java Fri Sep 28 11:44:08 2012
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.tooling.exam.options.configs;
import org.apache.karaf.tooling.exam.options.ConfigurationPointer;
@@ -24,6 +23,7 @@ import org.apache.karaf.tooling.exam.opt
* /etc/org.apache.karaf.features.cfg.
*/
public interface FeaturesCfg {
+
static final String FILE_PATH = "etc/org.apache.karaf.features.cfg";
static final ConfigurationPointer REPOSITORIES = new CustomPropertiesPointer("featuresRepositories");
@@ -36,4 +36,5 @@ public interface FeaturesCfg {
}
}
+
}