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/27 18:30:12 UTC
svn commit: r1391087 [1/2] - in /karaf/branches/karaf-2.3.x: ./ itests/
itests/src/test/java/org/apache/karaf/itests/
tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/
tooling/exam/container/src/main/java/org/apache...
Author: jbonofre
Date: Thu Sep 27 16:30:10 2012
New Revision: 1391087
URL: http://svn.apache.org/viewvc?rev=1391087&view=rev
Log:
[KARAF-1858] Fix itests
Modified:
karaf/branches/karaf-2.3.x/itests/pom.xml
karaf/branches/karaf-2.3.x/itests/src/test/java/org/apache/karaf/itests/EnterpriseFeaturesTest.java
karaf/branches/karaf-2.3.x/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
karaf/branches/karaf-2.3.x/itests/src/test/java/org/apache/karaf/itests/StandardFeaturesTest.java
karaf/branches/karaf-2.3.x/pom.xml
karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/Constants.java
karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/ExamFeaturesFile.java
karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/InternalKarafDistributionConfigurationOption.java
karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/KarafPropertiesFile.java
karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/KarafTestContainer.java
karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/KarafTestContainerFactory.java
karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/RMIRegistry.java
karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/adaptions/KarafManipulatorFactory.java
karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/BaseScriptRunner.java
karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/CommandLineBuilder.java
karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/InternalRunner.java
karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/KarafJavaRunner.java
karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/NixRunner.java
karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/Runner.java
karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/DoNotModifyLogOption.java
karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/ExamBundlesStartLevel.java
karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionBaseConfigurationOption.java
karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationConsoleOption.java
karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationFileExtendOption.java
karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationFilePutOption.java
karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationFileReplacementOption.java
karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationOption.java
karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionKitConfigurationOption.java
karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionOption.java
karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafExamSystemConfigurationOption.java
karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KeepRuntimeFolderOption.java
karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/LogLevelOption.java
karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/configs/CustomProperties.java
karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/configs/FeaturesCfg.java
karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/configs/JreProperties.java
karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/configs/LoggingCfg.java
karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/configs/ManagementCfg.java
karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/configs/SystemProperties.java
karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/configs/UsersProperties.java
karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/configs/WebCfg.java
Modified: karaf/branches/karaf-2.3.x/itests/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/itests/pom.xml?rev=1391087&r1=1391086&r2=1391087&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/itests/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/itests/pom.xml Thu Sep 27 16:30:10 2012
@@ -72,6 +72,11 @@
</dependency>
<dependency>
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>org.apache.karaf.features.core</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.karaf.tooling.exam</groupId>
<artifactId>org.apache.karaf.tooling.exam.container</artifactId>
<version>${project.version}</version>
Modified: karaf/branches/karaf-2.3.x/itests/src/test/java/org/apache/karaf/itests/EnterpriseFeaturesTest.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/itests/src/test/java/org/apache/karaf/itests/EnterpriseFeaturesTest.java?rev=1391087&r1=1391086&r2=1391087&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/itests/src/test/java/org/apache/karaf/itests/EnterpriseFeaturesTest.java (original)
+++ karaf/branches/karaf-2.3.x/itests/src/test/java/org/apache/karaf/itests/EnterpriseFeaturesTest.java Thu Sep 27 16:30:10 2012
@@ -27,32 +27,32 @@ public class EnterpriseFeaturesTest exte
@Test
public void testTransactionFeature() throws Exception {
- System.out.println(executeCommand("feature:install transaction"));
- String transactionFeatureStatus = executeCommand("feature:list | grep transaction");
+ System.out.println(executeCommand("features:install transaction"));
+ String transactionFeatureStatus = executeCommand("features:list | grep transaction");
System.out.println(transactionFeatureStatus);
assertFalse("transaction feature is not installed", transactionFeatureStatus.isEmpty());
}
@Test
public void testJpaFeature() throws Exception {
- System.out.println(executeCommand("feature:install jpa"));
- String jpaFeatureStatus = executeCommand("feature:list | grep jpa");
+ System.out.println(executeCommand("features:install jpa"));
+ String jpaFeatureStatus = executeCommand("features:list | grep jpa");
System.out.println(jpaFeatureStatus);
assertFalse("jpa feature is not installed", jpaFeatureStatus.isEmpty());
}
@Test
public void testJndiFeature() throws Exception {
- System.out.println(executeCommand("feature:install jndi"));
- String jndiFeatureStatus = executeCommand("feature:list | grep jndi");
+ System.out.println(executeCommand("features:install jndi"));
+ String jndiFeatureStatus = executeCommand("features:list | grep jndi");
System.out.println(jndiFeatureStatus);
assertFalse("jndi feature is not installed", jndiFeatureStatus.isEmpty());
}
@Test
public void testApplicationWithoutIsolationFeature() throws Exception {
- System.out.println(executeCommand("feature:install application-without-isolation"));
- String applicationWithoutIsolationFeatureStatus = executeCommand("feature:list | grep application-without-isolation");
+ System.out.println(executeCommand("features:install application-without-isolation"));
+ String applicationWithoutIsolationFeatureStatus = executeCommand("features:list | grep application-without-isolation");
System.out.println(applicationWithoutIsolationFeatureStatus);
assertFalse("application-without-isolation feature is not installed", applicationWithoutIsolationFeatureStatus.isEmpty());
}
Modified: karaf/branches/karaf-2.3.x/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java?rev=1391087&r1=1391086&r2=1391087&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java (original)
+++ karaf/branches/karaf-2.3.x/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java Thu Sep 27 16:30:10 2012
@@ -64,7 +64,7 @@ public class KarafTestSupport {
karafDistributionConfiguration().frameworkUrl(maven().groupId("org.apache.karaf").artifactId("apache-karaf").versionAsInProject().type("tar.gz"))
.karafVersion(MavenUtils.getArtifactVersion("org.apache.karaf", "apache-karaf")).name("Apache Karaf").unpackDirectory(new File("target/exam")),
keepRuntimeFolder(),
- logLevel(LogLevelOption.LogLevel.ERROR) };
+ logLevel(LogLevelOption.LogLevel.ERROR)};
}
/**
@@ -196,7 +196,7 @@ public class KarafTestSupport {
public JMXConnector getJMXConnector() throws Exception {
JMXServiceURL url = new JMXServiceURL("service:jmx:rmi:///jndi/rmi://localhost:1099/karaf-root");
Hashtable env = new Hashtable();
- String[] credentials = new String[]{ "karaf", "karaf" };
+ String[] credentials = new String[]{"karaf", "karaf"};
env.put("jmx.remote.credentials", credentials);
JMXConnector connector = JMXConnectorFactory.connect(url, env);
return connector;
Modified: karaf/branches/karaf-2.3.x/itests/src/test/java/org/apache/karaf/itests/StandardFeaturesTest.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/itests/src/test/java/org/apache/karaf/itests/StandardFeaturesTest.java?rev=1391087&r1=1391086&r2=1391087&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/itests/src/test/java/org/apache/karaf/itests/StandardFeaturesTest.java (original)
+++ karaf/branches/karaf-2.3.x/itests/src/test/java/org/apache/karaf/itests/StandardFeaturesTest.java Thu Sep 27 16:30:10 2012
@@ -28,203 +28,203 @@ public class StandardFeaturesTest extend
@Test
public void testBootFeatures() throws Exception {
// config
- String configFeatureStatus = executeCommand("feature:list -i | grep config");
+ String configFeatureStatus = executeCommand("features:list -i | grep config");
System.out.println(configFeatureStatus);
assertFalse("config feature is not installed", configFeatureStatus.isEmpty());
// ssh
- String sshFeatureStatus = executeCommand("feature:list -i | grep ssh");
+ String sshFeatureStatus = executeCommand("features:list -i | grep ssh");
System.out.println(sshFeatureStatus);
assertFalse("ssh feature is not installed", sshFeatureStatus.isEmpty());
// management
- String managementFeatureStatus = executeCommand("feature:list -i | grep management");
+ String managementFeatureStatus = executeCommand("features:list -i | grep management");
System.out.println(managementFeatureStatus);
assertFalse("management feature is not installed", managementFeatureStatus.isEmpty());
// kar
- String karFeatureStatus = executeCommand("feature:list -i | grep i kar");
+ String karFeatureStatus = executeCommand("features:list -i | grep \"kar \"");
System.out.println(karFeatureStatus);
assertFalse("kar feature is not installed", karFeatureStatus.isEmpty());
}
@Test
public void testSpringFeature() throws Exception {
- System.out.println(executeCommand("feature:install spring"));
- String springFeatureStatus = executeCommand("feature:list -i | grep spring");
+ System.out.println(executeCommand("features:install spring"));
+ String springFeatureStatus = executeCommand("features:list -i | grep spring");
System.out.println(springFeatureStatus);
assertFalse("spring feature is not installed", springFeatureStatus.isEmpty());
}
@Test
public void testSpringAspectsFeature() throws Exception {
- System.out.println(executeCommand("feature:install spring-aspects"));
- String springAspectsFeatureStatus = executeCommand("feature:list -i | grep spring-aspects");
+ System.out.println(executeCommand("features:install spring-aspects"));
+ String springAspectsFeatureStatus = executeCommand("features:list -i | grep spring-aspects");
System.out.println(springAspectsFeatureStatus);
assertFalse("spring-aspects feature is not installed", springAspectsFeatureStatus.isEmpty());
}
@Test
public void testSpringDmFeature() throws Exception {
- System.out.println(executeCommand("feature:install spring-dm"));
- String springDmFeatureStatus = executeCommand("feature:list -i | grep spring-dm");
+ System.out.println(executeCommand("features:install spring-dm"));
+ String springDmFeatureStatus = executeCommand("features:list -i | grep spring-dm");
System.out.println(springDmFeatureStatus);
assertFalse("spring-dm feature is not installed", springDmFeatureStatus.isEmpty());
}
@Test
public void testSpringDmWebFeature() throws Exception {
- System.out.println(executeCommand("feature:install spring-dm-web"));
- String springDmWebFeatureStatus = executeCommand("feature:list -i | grep spring-dm-web");
+ System.out.println(executeCommand("features:install spring-dm-web"));
+ String springDmWebFeatureStatus = executeCommand("features:list -i | grep spring-dm-web");
System.out.println(springDmWebFeatureStatus);
assertFalse("spring-dm-web feature is not installed", springDmWebFeatureStatus.isEmpty());
}
@Test
public void testSpringInstrumentFeature() throws Exception {
- System.out.println(executeCommand("feature:install spring-instrument"));
- String springInstrumentFeatureStatus = executeCommand("feature:list -i | grep spring-instrument");
+ System.out.println(executeCommand("features:install spring-instrument"));
+ String springInstrumentFeatureStatus = executeCommand("features:list -i | grep spring-instrument");
System.out.println(springInstrumentFeatureStatus);
assertFalse("spring-instrument feature is not installed", springInstrumentFeatureStatus.isEmpty());
}
@Test
public void testSpringJdbcFeature() throws Exception {
- System.out.println(executeCommand("feature:install spring-jdbc"));
- String springJdbcFeatureStatus = executeCommand("feature:list -i | grep spring-jdbc");
+ System.out.println(executeCommand("features:install spring-jdbc"));
+ String springJdbcFeatureStatus = executeCommand("features:list -i | grep spring-jdbc");
System.out.println(springJdbcFeatureStatus);
assertFalse("spring-jdbc feature is not installed", springJdbcFeatureStatus.isEmpty());
}
@Test
public void testSpringJmsFeature() throws Exception {
- System.out.println(executeCommand("feature:install spring-jms"));
- String springJmsFeatureStatus = executeCommand("feature:list -i | grep spring-jms");
+ System.out.println(executeCommand("features:install spring-jms"));
+ String springJmsFeatureStatus = executeCommand("features:list -i | grep spring-jms");
System.out.println(springJmsFeatureStatus);
assertFalse("spring-jms feature is not installed", springJmsFeatureStatus.isEmpty());
}
@Test
public void testSpringStrutsFeature() throws Exception {
- System.out.println(executeCommand("feature:install spring-struts"));
- String springStrutsFeatureStatus = executeCommand("feature:list -i | grep spring-struts");
+ System.out.println(executeCommand("features:install spring-struts"));
+ String springStrutsFeatureStatus = executeCommand("features:list -i | grep spring-struts");
System.out.println(springStrutsFeatureStatus);
assertFalse("spring-struts feature is not installed", springStrutsFeatureStatus.isEmpty());
}
@Test
public void testSpringTestFeature() throws Exception {
- System.out.println(executeCommand("feature:install spring-test"));
- String springTestFeatureStatus = executeCommand("feature:list -i | grep spring-test");
+ System.out.println(executeCommand("features:install spring-test"));
+ String springTestFeatureStatus = executeCommand("features:list -i | grep spring-test");
System.out.println(springTestFeatureStatus);
assertFalse("spring-test feature is not installed", springTestFeatureStatus.isEmpty());
}
@Test
public void testSpringOrmFeature() throws Exception {
- System.out.println(executeCommand("feature:install spring-orm"));
- String springOrmFeatureStatus = executeCommand("feature:list -i | grep spring-orm");
+ System.out.println(executeCommand("features:install spring-orm"));
+ String springOrmFeatureStatus = executeCommand("features:list -i | grep spring-orm");
System.out.println(springOrmFeatureStatus);
assertFalse("spring-orm feature is not installed", springOrmFeatureStatus.isEmpty());
}
@Test
public void testSpringOxmFeature() throws Exception {
- System.out.println(executeCommand("feature:install spring-oxm"));
- String springOxmFeatureStatus = executeCommand("feature:list -i | grep spring-oxm");
+ System.out.println(executeCommand("features:install spring-oxm"));
+ String springOxmFeatureStatus = executeCommand("features:list -i | grep spring-oxm");
System.out.println(springOxmFeatureStatus);
assertFalse("spring-oxm feature is not installed", springOxmFeatureStatus.isEmpty());
}
@Test
public void testSpringTxFeature() throws Exception {
- System.out.println(executeCommand("feature:install spring-tx"));
- String springTxFeatureStatus = executeCommand("feature:list -i | grep spring-tx");
+ System.out.println(executeCommand("features:install spring-tx"));
+ String springTxFeatureStatus = executeCommand("features:list -i | grep spring-tx");
System.out.println(springTxFeatureStatus);
assertFalse("spring-tx feature is not installed", springTxFeatureStatus.isEmpty());
}
@Test
public void testSpringWebFeature() throws Exception {
- System.out.println(executeCommand("feature:install spring-web"));
- String springWebFeatureStatus = executeCommand("feature:list -i | grep spring-web");
+ System.out.println(executeCommand("features:install spring-web"));
+ String springWebFeatureStatus = executeCommand("features:list -i | grep spring-web");
System.out.println(springWebFeatureStatus);
assertFalse("spring-web feature is not installed", springWebFeatureStatus.isEmpty());
}
@Test
public void testSpringWebPortletFeature() throws Exception {
- System.out.println(executeCommand("feature:install spring-web-portlet"));
- String springWebPortletFeatureStatus = executeCommand("feature:list -i | grep spring-web-portlet");
+ System.out.println(executeCommand("features:install spring-web-portlet"));
+ String springWebPortletFeatureStatus = executeCommand("features:list -i | grep spring-web-portlet");
System.out.println(springWebPortletFeatureStatus);
assertFalse("spring-web-portlet feature is not installed", springWebPortletFeatureStatus.isEmpty());
}
@Test
public void testWrapperFeature() throws Exception {
- System.out.println(executeCommand("feature:install wrapper"));
- String wrapperFeatureStatus = executeCommand("feature:list -i | grep wrapper");
+ System.out.println(executeCommand("features:install wrapper"));
+ String wrapperFeatureStatus = executeCommand("features:list -i | grep wrapper");
System.out.println(wrapperFeatureStatus);
assertFalse("wrapper feature is not installed", wrapperFeatureStatus.isEmpty());
}
@Test
public void testObrFeature() throws Exception {
- System.out.println(executeCommand("feature:install obr"));
- String obrFeatureStatus = executeCommand("feature:list -i | grep obr");
+ System.out.println(executeCommand("features:install obr"));
+ String obrFeatureStatus = executeCommand("features:list -i | grep obr");
System.out.println(obrFeatureStatus);
assertFalse("obr feature is not installed", obrFeatureStatus.isEmpty());
}
@Test
public void testJettyFeature() throws Exception {
- System.out.println(executeCommand("feature:install jetty"));
- String jettyFeatureStatus = executeCommand("feature:list -i | grep jetty");
+ System.out.println(executeCommand("features:install jetty"));
+ String jettyFeatureStatus = executeCommand("features:list -i | grep jetty");
System.out.println(jettyFeatureStatus);
assertFalse("jetty feature is not installed", jettyFeatureStatus.isEmpty());
}
@Test
public void testHttpFeature() throws Exception {
- System.out.println(executeCommand("feature:install http"));
- String httpFeatureStatus = executeCommand("feature:list -i | grep http");
+ System.out.println(executeCommand("features:install http"));
+ String httpFeatureStatus = executeCommand("features:list -i | grep http");
System.out.println(httpFeatureStatus);
assertFalse("http feature is not installed", httpFeatureStatus.isEmpty());
}
@Test
public void testHttpWhiteboardFeature() throws Exception {
- System.out.println(executeCommand("feature:install http-whiteboard"));
- String httpWhiteboardFeatureStatus = executeCommand("feature:list -i | grep http-whiteboard");
+ System.out.println(executeCommand("features:install http-whiteboard"));
+ String httpWhiteboardFeatureStatus = executeCommand("features:list -i | grep http-whiteboard");
System.out.println(httpWhiteboardFeatureStatus);
assertFalse("http-whiteboard feature is not installed", httpWhiteboardFeatureStatus.isEmpty());
}
@Test
public void testWarFeature() throws Exception {
- System.out.println(executeCommand("feature:install war"));
- String warFeatureStatus = executeCommand("feature:list -i | grep war");
+ System.out.println(executeCommand("features:install war"));
+ String warFeatureStatus = executeCommand("features:list -i | grep war");
System.out.println(warFeatureStatus);
assertFalse("war feature is not installed", warFeatureStatus.isEmpty());
}
@Test
public void testWebconsoleFeature() throws Exception {
- System.out.println(executeCommand("feature:install webconsole"));
- String webconsoleFeatureStatus = executeCommand("feature:list -i | grep webconsole");
+ System.out.println(executeCommand("features:install webconsole"));
+ String webconsoleFeatureStatus = executeCommand("features:list -i | grep webconsole");
System.out.println(webconsoleFeatureStatus);
assertFalse("webconsole feature is not installed", webconsoleFeatureStatus.isEmpty());
}
@Test
public void testEventadminFeature() throws Exception {
- System.out.println(executeCommand("feature:install eventadmin"));
- String eventadminFeatureStatus = executeCommand("feature:list -i | grep eventadmin");
+ System.out.println(executeCommand("features:install eventadmin"));
+ String eventadminFeatureStatus = executeCommand("features:list -i | grep eventadmin");
System.out.println(eventadminFeatureStatus);
assertFalse("eventadmin feature is not installed", eventadminFeatureStatus.isEmpty());
}
@Test
public void testJasyptEncryptionFeature() throws Exception {
- System.out.println(executeCommand("feature:install jasypt-encryption"));
- String jasyptEncryptionFeatureStatus = executeCommand("feature:list -i | grep jasypt-encryption");
+ System.out.println(executeCommand("features:install jasypt-encryption"));
+ String jasyptEncryptionFeatureStatus = executeCommand("features:list -i | grep jasypt-encryption");
System.out.println(jasyptEncryptionFeatureStatus);
assertFalse("jasypt-encryption feature is not installed", jasyptEncryptionFeatureStatus.isEmpty());
}
Modified: karaf/branches/karaf-2.3.x/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/pom.xml?rev=1391087&r1=1391086&r2=1391087&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/pom.xml Thu Sep 27 16:30:10 2012
@@ -116,6 +116,7 @@
<injection.bundle.version>1.0</injection.bundle.version>
<jasypt.bundle.version>1.9.0_1</jasypt.bundle.version>
<jetty.version>7.6.5.v20120716</jetty.version>
+ <junit.version>4.10</junit.version>
<junit.bundle.version>4.10_1</junit.bundle.version>
<geronimo.jms-spec.version>1.1.1</geronimo.jms-spec.version>
<geronimo.jpa-spec.version>1.1</geronimo.jpa-spec.version>
@@ -164,6 +165,7 @@
<pax.runner.version>1.7.6</pax.runner.version>
<pax.url.version>1.3.5</pax.url.version>
<pax.web.version>1.1.3</pax.web.version>
+ <pax.swissbox.version>1.5.1</pax.swissbox.version>
<pax.tinybundles.version>1.3.0</pax.tinybundles.version>
<plexus.utils.version>2.1</plexus.utils.version>
<portlet-api.version>2.0</portlet-api.version>
@@ -959,9 +961,31 @@
<dependency>
<groupId>org.ops4j.pax.swissbox</groupId>
+ <artifactId>pax-swissbox-bnd</artifactId>
+ <version>${pax.swissbox.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.swissbox</groupId>
+ <artifactId>pax-swissbox-lifecycle</artifactId>
+ <version>${pax.swissbox.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.swissbox</groupId>
+ <artifactId>pax-swissbox-property</artifactId>
+ <version>${pax.swissbox.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.swissbox</groupId>
+ <artifactId>pax-swissbox-tracker</artifactId>
+ <version>${pax.swissbox.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.ops4j.pax.swissbox</groupId>
<artifactId>pax-swissbox-tinybundles</artifactId>
<version>${pax.tinybundles.version}</version>
</dependency>
+
<dependency>
<groupId>org.eclipse</groupId>
<artifactId>osgi</artifactId>
Modified: karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/Constants.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/Constants.java?rev=1391087&r1=1391086&r2=1391087&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/Constants.java (original)
+++ karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/Constants.java Thu Sep 27 16:30:10 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 {
@@ -25,4 +24,4 @@ public interface Constants {
static final int DEFAULT_START_LEVEL = 5;
-}
\ No newline at end of file
+}
Modified: karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/ExamFeaturesFile.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/ExamFeaturesFile.java?rev=1391087&r1=1391086&r2=1391087&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/ExamFeaturesFile.java (original)
+++ karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/ExamFeaturesFile.java Thu Sep 27 16:30:10 2012
@@ -14,17 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.tooling.exam.container.internal;
+import org.apache.commons.io.FileUtils;
+import org.ops4j.pax.exam.Info;
+
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
-import org.apache.commons.io.FileUtils;
-import org.ops4j.pax.exam.Info;
-
public class ExamFeaturesFile {
private String featuresXml;
@@ -148,4 +147,5 @@ public class ExamFeaturesFile {
karafPropertiesFile.extend("featuresBoot", ",exam");
karafPropertiesFile.store();
}
+
}
Modified: karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/InternalKarafDistributionConfigurationOption.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/InternalKarafDistributionConfigurationOption.java?rev=1391087&r1=1391086&r2=1391087&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/InternalKarafDistributionConfigurationOption.java (original)
+++ karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/InternalKarafDistributionConfigurationOption.java Thu Sep 27 16:30:10 2012
@@ -16,13 +16,13 @@
*/
package org.apache.karaf.tooling.exam.container.internal;
+import org.apache.karaf.tooling.exam.options.KarafDistributionBaseConfigurationOption;
+import org.apache.karaf.tooling.exam.options.KarafDistributionConfigurationOption;
+
import java.io.File;
import java.io.FileInputStream;
import java.util.Properties;
-import org.apache.karaf.tooling.exam.options.KarafDistributionBaseConfigurationOption;
-import org.apache.karaf.tooling.exam.options.KarafDistributionConfigurationOption;
-
/**
* Extends the {@link KarafDistributionConfigurationOption} to add functionality to store those values also in a
* distribution.info file in the distirbution.
@@ -34,7 +34,8 @@ public class InternalKarafDistributionCo
private File distributionInfo;
- public InternalKarafDistributionConfigurationOption(KarafDistributionBaseConfigurationOption distributionConfigurationOption, File distributionInfo) {
+ public InternalKarafDistributionConfigurationOption(
+ KarafDistributionBaseConfigurationOption distributionConfigurationOption, File distributionInfo) {
super(distributionConfigurationOption);
this.distributionInfo = distributionInfo;
}
@@ -90,4 +91,4 @@ public class InternalKarafDistributionCo
}
}
-}
\ No newline at end of file
+}
Modified: karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/KarafPropertiesFile.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/KarafPropertiesFile.java?rev=1391087&r1=1391086&r2=1391087&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/KarafPropertiesFile.java (original)
+++ karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/KarafPropertiesFile.java Thu Sep 27 16:30:10 2012
@@ -16,14 +16,14 @@
*/
package org.apache.karaf.tooling.exam.container.internal;
+import org.apache.commons.io.FileUtils;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.Properties;
-import org.apache.commons.io.FileUtils;
-
public class KarafPropertiesFile {
private final Properties properties;
@@ -73,4 +73,4 @@ public class KarafPropertiesFile {
}
}
-}
\ No newline at end of file
+}
Modified: karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/KarafTestContainer.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/KarafTestContainer.java?rev=1391087&r1=1391086&r2=1391087&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/KarafTestContainer.java (original)
+++ karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/KarafTestContainer.java Thu Sep 27 16:30:10 2012
@@ -16,35 +16,8 @@
*/
package org.apache.karaf.tooling.exam.container.internal;
-import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.editConfigurationFileExtend;
-import static org.ops4j.pax.exam.CoreOptions.options;
-import static org.ops4j.pax.exam.CoreOptions.systemProperty;
-import static org.ops4j.pax.exam.rbc.Constants.RMI_HOST_PROPERTY;
-import static org.ops4j.pax.exam.rbc.Constants.RMI_NAME_PROPERTY;
-import static org.ops4j.pax.exam.rbc.Constants.RMI_PORT_PROPERTY;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Properties;
-import java.util.Queue;
-import java.util.Set;
-import java.util.UUID;
-
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
import org.apache.commons.compress.archivers.ArchiveEntry;
import org.apache.commons.compress.archivers.ArchiveInputStream;
import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
@@ -56,33 +29,12 @@ import org.apache.commons.io.filefilter.
import org.apache.karaf.tooling.exam.container.internal.adaptions.KarafManipulator;
import org.apache.karaf.tooling.exam.container.internal.adaptions.KarafManipulatorFactory;
import org.apache.karaf.tooling.exam.container.internal.runner.Runner;
-import org.apache.karaf.tooling.exam.options.DoNotModifyLogOption;
-import org.apache.karaf.tooling.exam.options.ExamBundlesStartLevel;
-import org.apache.karaf.tooling.exam.options.KarafDistributionBaseConfigurationOption;
-import org.apache.karaf.tooling.exam.options.KarafDistributionConfigurationConsoleOption;
-import org.apache.karaf.tooling.exam.options.KarafDistributionConfigurationFileExtendOption;
-import org.apache.karaf.tooling.exam.options.KarafDistributionConfigurationFileOption;
-import org.apache.karaf.tooling.exam.options.KarafDistributionConfigurationFilePutOption;
-import org.apache.karaf.tooling.exam.options.KarafDistributionConfigurationFileReplacementOption;
-import org.apache.karaf.tooling.exam.options.KarafExamSystemConfigurationOption;
-import org.apache.karaf.tooling.exam.options.KeepRuntimeFolderOption;
-import org.apache.karaf.tooling.exam.options.LogLevelOption;
+import org.apache.karaf.tooling.exam.options.*;
import org.apache.karaf.tooling.exam.options.configs.CustomProperties;
import org.apache.karaf.tooling.exam.options.configs.FeaturesCfg;
-import org.ops4j.pax.exam.ExamSystem;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.RelativeTimeout;
-import org.ops4j.pax.exam.TestAddress;
-import org.ops4j.pax.exam.TestContainer;
-import org.ops4j.pax.exam.TimeoutException;
+import org.ops4j.pax.exam.*;
import org.ops4j.pax.exam.container.remote.RBCRemoteTarget;
-import org.ops4j.pax.exam.options.BootClasspathLibraryOption;
-import org.ops4j.pax.exam.options.BootDelegationOption;
-import org.ops4j.pax.exam.options.ProvisionOption;
-import org.ops4j.pax.exam.options.ServerModeOption;
-import org.ops4j.pax.exam.options.SystemPackageOption;
-import org.ops4j.pax.exam.options.SystemPropertyOption;
-import org.ops4j.pax.exam.options.UrlReference;
+import org.ops4j.pax.exam.options.*;
import org.ops4j.pax.exam.options.extra.FeaturesScannerProvisionOption;
import org.ops4j.pax.exam.options.extra.VMOption;
import org.ops4j.pax.exam.rbc.client.RemoteBundleContextClient;
@@ -90,8 +42,15 @@ import org.osgi.framework.Bundle;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
+import java.io.*;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.*;
+
+import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.editConfigurationFileExtend;
+import static org.ops4j.pax.exam.CoreOptions.options;
+import static org.ops4j.pax.exam.CoreOptions.systemProperty;
+import static org.ops4j.pax.exam.rbc.Constants.*;
public class KarafTestContainer implements TestContainer {
@@ -148,7 +107,7 @@ public class KarafTestContainer implemen
System.setProperty("java.protocol.handler.pkgs", "org.ops4j.pax.url");
- URL sourceDistribution = new URL(framework.getFrameworkUrl());
+ URL sourceDistribution = new URL(framework.getFrameworkURL());
KeepRuntimeFolderOption[] keepRuntimeFolder = subsystem.getOptions(KeepRuntimeFolderOption.class);
if (keepRuntimeFolder != null && keepRuntimeFolder.length != 0) {
@@ -173,9 +132,9 @@ 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),
@@ -185,7 +144,7 @@ public class KarafTestContainer implemen
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);
@@ -223,8 +182,7 @@ public class KarafTestContainer implemen
if (subsystem.getOptions(ServerModeOption.class).length == 0) {
waitForState(org.apache.karaf.tooling.exam.container.internal.Constants.SYSTEM_BUNDLE,
Bundle.ACTIVE, subsystem.getTimeout());
- }
- else {
+ } else {
LOGGER
.info("System runs in Server Mode. Which means, no Test facility bundles available on target system.");
}
@@ -245,7 +203,7 @@ public class KarafTestContainer implemen
FileUtils.copyURLToFile(
new URL(libraryUrl.getURL()),
createFileNameWithRandomPrefixFromUrlAtTarget(libraryUrl.getURL(), new File(karafHome + "/lib"),
- new String[]{ "jar" }));
+ new String[]{"jar"}));
}
}
@@ -529,8 +487,7 @@ 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.");
}
@@ -614,8 +571,7 @@ public class KarafTestContainer implemen
if (runner != null) {
runner.shutdown();
}
- }
- else {
+ } else {
throw new RuntimeException("Container never came up");
}
} finally {
@@ -660,6 +616,7 @@ public class KarafTestContainer implemen
@Override
public String toString() {
- return "KarafTestContainer{" + framework.getFrameworkUrl() + "}";
+ return "KarafTestContainer{" + framework.getFrameworkURL() + "}";
}
+
}
Modified: karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/KarafTestContainerFactory.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/KarafTestContainerFactory.java?rev=1391087&r1=1391086&r2=1391087&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/KarafTestContainerFactory.java (original)
+++ karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/KarafTestContainerFactory.java Thu Sep 27 16:30:10 2012
@@ -16,9 +16,6 @@
*/
package org.apache.karaf.tooling.exam.container.internal;
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.karaf.tooling.exam.container.internal.runner.KarafJavaRunner;
import org.apache.karaf.tooling.exam.container.internal.runner.NixRunner;
import org.apache.karaf.tooling.exam.container.internal.runner.WindowsRunner;
@@ -32,6 +29,9 @@ import org.ops4j.pax.exam.TestContainerF
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.ArrayList;
+import java.util.List;
+
public class KarafTestContainerFactory implements TestContainerFactory {
private static final Logger LOGGER = LoggerFactory.getLogger(KarafTestContainer.class);
@@ -48,8 +48,7 @@ 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);
Modified: karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/RMIRegistry.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/RMIRegistry.java?rev=1391087&r1=1391086&r2=1391087&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/RMIRegistry.java (original)
+++ karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/RMIRegistry.java Thu Sep 27 16:30:10 2012
@@ -16,15 +16,15 @@
*/
package org.apache.karaf.tooling.exam.container.internal;
+import org.ops4j.net.FreePort;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.rmi.registry.LocateRegistry;
import java.rmi.registry.Registry;
-import org.ops4j.net.FreePort;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
/**
* Graceful RMI registry creation/reuse. Tries to reuse an existing one but is fine with creating one on another port.
*/
@@ -43,7 +43,9 @@ public class RMIRegistry {
private Integer m_altTo;
private static final int TREASURE = 30;
- public RMIRegistry(Integer defaultPort, Integer alternativeRangeFrom, Integer alternativeRangeTo) {
+ public RMIRegistry(Integer defaultPort, Integer alternativeRangeFrom, Integer alternativeRangeTo)
+
+ {
try {
m_host = InetAddress.getLocalHost().getHostName();
} catch (UnknownHostException e) {
@@ -61,27 +63,31 @@ public class RMIRegistry {
* @return this for fluent API. Or IllegalStateException if a port has not been detected successfully.
*/
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) {
throw new IllegalStateException("No port found for RMI at all. Even though " + alternativePort
+ " should have worked. Thats.. not. good. at. all.");
}
printTakenStatus();
+ // }
+
return this;
}
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;
+
if (in_use + TREASURE > max) {
LOG.warn("--------------");
LOG.warn("BEWARE !!! " + info);
LOG.warn("--------------");
- }
- else {
+ } else {
LOG.debug(info);
}
}
@@ -91,20 +97,20 @@ public class RMIRegistry {
* 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) {
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;
}
// fail
return UNSELECTED;
+
}
private boolean createNewRegistry(int port) {
@@ -114,8 +120,9 @@ public class RMIRegistry {
return verifyRegistry(registry);
} catch (Exception e) {
- // ignore
+ //
}
+
return false;
}
@@ -129,6 +136,7 @@ public class RMIRegistry {
// exception? then its not a fine registry.
}
return false;
+
}
private boolean verifyRegistry(Registry reg) {
Modified: karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/adaptions/KarafManipulatorFactory.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/adaptions/KarafManipulatorFactory.java?rev=1391087&r1=1391086&r2=1391087&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/adaptions/KarafManipulatorFactory.java (original)
+++ karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/adaptions/KarafManipulatorFactory.java Thu Sep 27 16:30:10 2012
@@ -24,7 +24,7 @@ import org.osgi.framework.Version;
public final class KarafManipulatorFactory {
private KarafManipulatorFactory() {
- // Not required for a final class
+ // not required for a final class
}
public static KarafManipulator createManipulator(String karafVersion) {
Modified: karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/BaseScriptRunner.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/BaseScriptRunner.java?rev=1391087&r1=1391086&r2=1391087&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/BaseScriptRunner.java (original)
+++ karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/BaseScriptRunner.java Thu Sep 27 16:30:10 2012
@@ -21,7 +21,7 @@ import java.util.ArrayList;
import java.util.List;
/**
- * Abstract implementation of the script runner containing the entire self repeating code.
+ * Abstract implementation of the script runner containging the entire self repeating code.
*/
public abstract class BaseScriptRunner implements Runner {
Modified: karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/CommandLineBuilder.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/CommandLineBuilder.java?rev=1391087&r1=1391086&r2=1391087&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/CommandLineBuilder.java (original)
+++ karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/CommandLineBuilder.java Thu Sep 27 16:30:10 2012
@@ -34,7 +34,6 @@ 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) {
@@ -51,12 +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 });
+ return append(new String[]{segment});
}
return this;
}
Modified: karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/InternalRunner.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/InternalRunner.java?rev=1391087&r1=1391086&r2=1391087&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/InternalRunner.java (original)
+++ karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/InternalRunner.java Thu Sep 27 16:30:10 2012
@@ -16,6 +16,8 @@
*/
package org.apache.karaf.tooling.exam.container.internal.runner;
+import org.ops4j.io.Pipe;
+
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
@@ -23,8 +25,6 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
-import org.ops4j.io.Pipe;
-
public class InternalRunner {
private Process m_frameworkProcess;
@@ -78,7 +78,7 @@ public class InternalRunner {
}
}
} catch (IllegalStateException ignore) {
- // ignore
+ // just ignore
}
}
@@ -87,12 +87,10 @@ public class InternalRunner {
*/
public void waitForExit() {
synchronized (m_frameworkProcess) {
- try
- {
+ try {
m_frameworkProcess.waitFor();
shutdown();
- } catch (Throwable e)
- {
+ } catch (Throwable e) {
shutdown();
}
}
@@ -102,7 +100,6 @@ 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) {
@@ -111,21 +108,16 @@ public class InternalRunner {
final Pipe inPipe = new Pipe(process.getOutputStream(), System.in).start("In pipe");
return new Thread(
- new Runnable()
- {
+ new Runnable() {
@Override
- public void run()
- {
+ public void run() {
inPipe.stop();
outPipe.stop();
errPipe.stop();
- try
- {
+ try {
process.destroy();
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
// ignore if already shutting down
}
}
Modified: karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/KarafJavaRunner.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/KarafJavaRunner.java?rev=1391087&r1=1391086&r2=1391087&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/KarafJavaRunner.java (original)
+++ karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/KarafJavaRunner.java Thu Sep 27 16:30:10 2012
@@ -62,10 +62,8 @@ public class KarafJavaRunner implements
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);
@@ -73,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/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/NixRunner.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/NixRunner.java?rev=1391087&r1=1391086&r2=1391087&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/NixRunner.java (original)
+++ karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/NixRunner.java Thu Sep 27 16:30:10 2012
@@ -20,7 +20,7 @@ import java.io.File;
import java.util.List;
/**
- * Runner implementation starting Karaf based distributions no unix based systems like linux, mac, ...
+ * Runner implementation starting karaf based distributions no unix based systems like linux, mac, ...
*/
public class NixRunner extends BaseScriptRunner {
Modified: karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/Runner.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/Runner.java?rev=1391087&r1=1391086&r2=1391087&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/Runner.java (original)
+++ karaf/branches/karaf-2.3.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/Runner.java Thu Sep 27 16:30:10 2012
@@ -33,7 +33,7 @@ public interface Runner {
final String[] opts, final String[] classPath, final String main, final String options);
/**
- * Shutdown the runner again.
+ * Shutsdown the runner again.
*/
public abstract void shutdown();
Modified: karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/DoNotModifyLogOption.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/DoNotModifyLogOption.java?rev=1391087&r1=1391086&r2=1391087&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/DoNotModifyLogOption.java (original)
+++ karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/DoNotModifyLogOption.java Thu Sep 27 16:30:10 2012
@@ -19,9 +19,9 @@ package org.apache.karaf.tooling.exam.op
import org.ops4j.pax.exam.Option;
/**
- * The Karaf pax-logging configuration is typically not a file manipulated very often. Therefore we take the freedom
- * of adding a console logger and changing the log level directly. If you want to configure the file manually (or had
- * so in your distribution) add this option to avoid any automatic modifications to this file.
+ * The karaf pax-logging configuration is typically not a file manipulated very often. Therefore we take the freedom of
+ * adding a console logger and changing the log level directly. IF you like to configure the file manually (or had so in
+ * your distribution) add this option to avoid any automatic modifications to this file!
*/
public class DoNotModifyLogOption implements Option {
Modified: karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/ExamBundlesStartLevel.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/ExamBundlesStartLevel.java?rev=1391087&r1=1391086&r2=1391087&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/ExamBundlesStartLevel.java (original)
+++ karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/ExamBundlesStartLevel.java Thu Sep 27 16:30:10 2012
@@ -27,7 +27,6 @@ public class ExamBundlesStartLevel imple
/**
* Sets the start level of the bundles in the generated exam features descriptor.
- * @param startLevel
*/
public ExamBundlesStartLevel(int startLevel) {
this.startLevel = startLevel;
Modified: karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionBaseConfigurationOption.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionBaseConfigurationOption.java?rev=1391087&r1=1391086&r2=1391087&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionBaseConfigurationOption.java (original)
+++ karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionBaseConfigurationOption.java Thu Sep 27 16:30:10 2012
@@ -23,47 +23,46 @@ import java.io.File;
public class KarafDistributionBaseConfigurationOption implements Option {
- protected String frameworkUrl;
- protected MavenUrlReference frameworkUrlReference;
+ protected String frameworkURL;
+ protected MavenUrlReference frameworkURLReference;
protected String name;
protected String karafVersion;
protected File unpackDirectory;
protected boolean useDeployFolder = true;
public KarafDistributionBaseConfigurationOption() {
- frameworkUrl = null;
- frameworkUrlReference = null;
+ frameworkURL = null;
+ frameworkURLReference = null;
name = null;
karafVersion = null;
}
- public KarafDistributionBaseConfigurationOption(String frameworkUrl, String name, String karafVersion) {
- this.frameworkUrl = frameworkUrl;
- frameworkUrlReference = null;
+ public KarafDistributionBaseConfigurationOption(String frameworkURL, String name, String karafVersion) {
+ this.frameworkURL = frameworkURL;
+ frameworkURLReference = null;
this.name = name;
this.karafVersion = karafVersion;
}
- public KarafDistributionBaseConfigurationOption(MavenUrlReference frameworkUrlReference, String name, String karafVersion) {
- frameworkUrl = null;
- this.frameworkUrlReference = frameworkUrlReference;
+ public KarafDistributionBaseConfigurationOption(MavenUrlReference frameworkURLReference, String name,
+ String karafVersion) {
+ frameworkURL = null;
+ this.frameworkURLReference = frameworkURLReference;
this.name = name;
this.karafVersion = karafVersion;
}
- public KarafDistributionBaseConfigurationOption(MavenUrlReference frameworkUrlReference) {
- frameworkUrl = null;
- this.frameworkUrlReference = frameworkUrlReference;
+ public KarafDistributionBaseConfigurationOption(MavenUrlReference frameworkURLReference) {
+ frameworkURL = null;
+ this.frameworkURLReference = frameworkURLReference;
}
/**
- * Simply clone the inserted {@link KarafDistributionBaseConfigurationOption}
- *
- * @param base the <code>KarafDistributionBaseConfigurationOption</code> to clone.
+ * Simply clones the insterted {@link KarafDistributionConfigurationOption}
*/
public KarafDistributionBaseConfigurationOption(KarafDistributionBaseConfigurationOption base) {
- frameworkUrl = base.frameworkUrl;
- frameworkUrlReference = base.frameworkUrlReference;
+ frameworkURL = base.frameworkURL;
+ frameworkURLReference = base.frameworkURLReference;
name = base.name;
karafVersion = base.karafVersion;
unpackDirectory = base.unpackDirectory;
@@ -71,32 +70,23 @@ public class KarafDistributionBaseConfig
}
/**
- * Set the URL of the framework as a String (for example a file).
- *
- * @param frameworkUrl the framework URL.
- * @return the updated <code>KarafDistributionBaseConfigurationOption</code>.
+ * Sets the URL of the framework as a String (for example a file).
*/
- public KarafDistributionBaseConfigurationOption frameworkUrl(String frameworkUrl) {
- this.frameworkUrl = frameworkUrl;
+ public KarafDistributionBaseConfigurationOption frameworkUrl(String frameworkURL) {
+ this.frameworkURL = frameworkURL;
return this;
}
/**
- * Set the URL of the framework as a Maven URL reference.
- *
- * @param frameworkUrlReference the framework Maven URL.
- * @return the updated <code>KarafDistributionBaseConfigurationOption</code>.
+ * Sets the URL of the frameworks as a maven reference.
*/
- public KarafDistributionBaseConfigurationOption frameworkUrl(MavenUrlReference frameworkUrlReference) {
- this.frameworkUrlReference = frameworkUrlReference;
+ public KarafDistributionBaseConfigurationOption frameworkUrl(MavenUrlReference frameworkURL) {
+ frameworkURLReference = frameworkURL;
return this;
}
/**
- * Set the name of the framework. This is only used for logging.
- *
- * @param name the framework name.
- * @return the updated <code>KarafDistributionBaseConfigurationOption</code>.
+ * Set's the name of the framework. This is only used for logging.
*/
public KarafDistributionBaseConfigurationOption name(String name) {
this.name = name;
@@ -104,11 +94,8 @@ public class KarafDistributionBaseConfig
}
/**
- * The version of Karaf used by the framework. That one is required since there is the high possibility that
- * configuration is different between various Karaf versions.
- *
- * @param karafVersion the Karaf version to use.
- * @return the updated <code>KarafDistributionBaseConfigurationOption</code>.
+ * The version of karaf used by the framework. That one is required since there is the high possibility that
+ * configuration is different between various karaf versions.
*/
public KarafDistributionBaseConfigurationOption karafVersion(String karafVersion) {
this.karafVersion = karafVersion;
@@ -116,11 +103,8 @@ public class KarafDistributionBaseConfig
}
/**
- * Define the unpack directory for the Karaf distribution. In this directory a UUID named directory will be
- * created for each environment.
- *
- * @param unpackDirectory the unpack directory location.
- * @return the updated <code>KarafDistributionBaseConfigurationOption</code>.
+ * Define the unpack directory for the karaf distribution. In this directory a UUID named directory will be created
+ * for each environment.
*/
public KarafDistributionBaseConfigurationOption unpackDirectory(File unpackDirectory) {
this.unpackDirectory = unpackDirectory;
@@ -128,24 +112,21 @@ public class KarafDistributionBaseConfig
}
/**
- * By default, the framework simply copies all referenced artifacts (via PaxExam DistributionOption) to the
- * deploy folder of the Karaf (based) distribution. If you don't have such a folder (for any reason) you can set
- * this option to false. PaxExam Karaf will then try to add those deployment URLs directly to a feature XML instead
- * of copying those files to the deploy folder.
- *
- * @param useDeployFolder flag defining if we have to use the deploy folder (true) or not (false).
- * @return the updated <code>KarafDistributionBaseConfigurationOption</code>.
+ * Per default the framework simply copies all referenced artifacts (via Pax Exam DistributionOption) to the deploy
+ * folder of the karaf (based) distribution. If you don't have such a folder (for any reason) you can set this
+ * option to false. PaxExam Karaf will then try to add those deployment urls directly to a features xml instead of
+ * copying those files to the deploy folder.
*/
public KarafDistributionBaseConfigurationOption useDeployFolder(boolean useDeployFolder) {
this.useDeployFolder = useDeployFolder;
return this;
}
- public String getFrameworkUrl() {
- if (frameworkUrl == null && frameworkUrlReference == null) {
- throw new IllegalStateException("Either frameworkUrl or frameworkUrlReference have to be set.");
+ public String getFrameworkURL() {
+ if (frameworkURL == null && frameworkURLReference == null) {
+ throw new IllegalStateException("Either frameworkurl or frameworkUrlReference need to be set.");
}
- return frameworkUrl != null ? frameworkUrl : frameworkUrlReference.getURL();
+ return frameworkURL != null ? frameworkURL : frameworkURLReference.getURL();
}
public String getName() {
Modified: karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationConsoleOption.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationConsoleOption.java?rev=1391087&r1=1391086&r2=1391087&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationConsoleOption.java (original)
+++ karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationConsoleOption.java Thu Sep 27 16:30:10 2012
@@ -19,9 +19,8 @@ package org.apache.karaf.tooling.exam.op
import org.ops4j.pax.exam.Option;
/**
- * Option to configure the Karaf <code>-Dkaraf.startLocalConsole</code> and <code>-Dkaraf.startRemoteShell</code>
- * options. By default, both are started automatically. If you want to change this behavior, simply add this option
- * to your container configuration.
+ * Option to configure the Karaf -Dkaraf.startLocalConsole and -Dkaraf.startRemoteShell options. Per default both are
+ * started automatically. If you like to change this behavior simply add this option to your container configuration.
*/
public class KarafDistributionConfigurationConsoleOption implements Option {
@@ -34,9 +33,7 @@ public class KarafDistributionConfigurat
}
/**
- * Set the <code>-Dkaraf.startLocalConsole</code> to true.
- *
- * @return the updated <code>KarafDistributionConfigurationConsoleOption</code>.
+ * Sets the -Dkaraf.startLocalConsole to true
*/
public KarafDistributionConfigurationConsoleOption startLocalConsole() {
startLocalConsole = true;
@@ -44,9 +41,7 @@ public class KarafDistributionConfigurat
}
/**
- * Set the <code>-Dkaraf.startLocalConsole</code> to false.
- *
- * @return the updated <code>KarafDistributionConfigurationConsoleOption</code>.
+ * Sets the -Dkaraf.startLocalConsole to false
*/
public KarafDistributionConfigurationConsoleOption ignoreLocalConsole() {
startLocalConsole = false;
@@ -54,9 +49,7 @@ public class KarafDistributionConfigurat
}
/**
- * Set the <code>-Dkaraf.startRemoteShell</code> to true.
- *
- * @return the updated <code>KarafDistributionConfigurationConsoleOption</code>.
+ * Sets the -Dkaraf.startRemoteShell to true
*/
public KarafDistributionConfigurationConsoleOption startRemoteShell() {
startRemoteShell = true;
@@ -64,9 +57,7 @@ public class KarafDistributionConfigurat
}
/**
- * Set the <code>-Dkaraf.startRemoteShell</code> to false.
- *
- * @return the updated <code>KarafDistributionConfigurationConsoleOption</code>.
+ * Sets the -Dkaraf.startRemoteShell to false
*/
public KarafDistributionConfigurationConsoleOption ignoreRemoteShell() {
startRemoteShell = false;
Modified: karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationFileExtendOption.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationFileExtendOption.java?rev=1391087&r1=1391086&r2=1391087&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationFileExtendOption.java (original)
+++ karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationFileExtendOption.java Thu Sep 27 16:30:10 2012
@@ -17,11 +17,10 @@
package org.apache.karaf.tooling.exam.options;
/**
- * This option allows to extend configurations in each configuration file based on the <code>karaf.home</code> 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.
- *
- * If you want to have add or replace functionality please use the
+ * 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.
*/
public class KarafDistributionConfigurationFileExtendOption extends KarafDistributionConfigurationFileOption {
Modified: karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationFilePutOption.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationFilePutOption.java?rev=1391087&r1=1391086&r2=1391087&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationFilePutOption.java (original)
+++ karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationFilePutOption.java Thu Sep 27 16:30:10 2012
@@ -17,10 +17,10 @@
package org.apache.karaf.tooling.exam.options;
/**
- * This option allows to configure each configuration file based on the <code>karaf.home</code> location.
- * The value is "put", which means it is either replaced or added.
- *
- * If you want to extend a value (e.g. make a=b to a=b,c) please use the
+ * 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}.
*/
public class KarafDistributionConfigurationFilePutOption extends KarafDistributionConfigurationFileOption {
Modified: karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationFileReplacementOption.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationFileReplacementOption.java?rev=1391087&r1=1391086&r2=1391087&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationFileReplacementOption.java (original)
+++ karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationFileReplacementOption.java Thu Sep 27 16:30:10 2012
@@ -19,8 +19,8 @@ package org.apache.karaf.tooling.exam.op
import java.io.File;
/**
- * If you don't want to replace (or extend) values in a file, but rather simply replace a configuration file
- * "brute force", this option is the one to use. It removes the original file and replaces it with the one
+ * If you do not want to replace (or extend) values in a file but rather simply want to replace a configuration file
+ * "brute force" this option is the one of your choice. It simply removes the original file and replaces it with the one
* configured here.
*/
public class KarafDistributionConfigurationFileReplacementOption extends KarafDistributionConfigurationFileOption {
Modified: karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationOption.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationOption.java?rev=1391087&r1=1391086&r2=1391087&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationOption.java (original)
+++ karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationOption.java Thu Sep 27 16:30:10 2012
@@ -19,8 +19,8 @@ package org.apache.karaf.tooling.exam.op
import org.ops4j.pax.exam.options.MavenUrlReference;
/**
- * Option describing the Karaf distribution to use. Without this option, no Karaf based distribution can be used in
- * exam tests.
+ * Option describing the karaf distribution to use. Without this option no karaf based distribution can be used in exam
+ * tests.
*/
public class KarafDistributionConfigurationOption extends KarafDistributionBaseConfigurationOption {
@@ -32,12 +32,13 @@ public class KarafDistributionConfigurat
super(base);
}
- public KarafDistributionConfigurationOption(MavenUrlReference frameworkUrlReference, String name, String karafVersion) {
- super(frameworkUrlReference, name, karafVersion);
+ public KarafDistributionConfigurationOption(MavenUrlReference frameworkURLReference, String name,
+ String karafVersion) {
+ super(frameworkURLReference, name, karafVersion);
}
- public KarafDistributionConfigurationOption(String frameworkUrl, String name, String karafVersion) {
- super(frameworkUrl, name, karafVersion);
+ public KarafDistributionConfigurationOption(String frameworkURL, String name, String karafVersion) {
+ super(frameworkURL, name, karafVersion);
}
}
Modified: karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionKitConfigurationOption.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionKitConfigurationOption.java?rev=1391087&r1=1391086&r2=1391087&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionKitConfigurationOption.java (original)
+++ karaf/branches/karaf-2.3.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionKitConfigurationOption.java Thu Sep 27 16:30:10 2012
@@ -22,8 +22,8 @@ import java.util.ArrayList;
import java.util.List;
/**
- * Option describing the Karaf distribution to use. This option uses the specified scripts to run the environment
- * depending on the platform. If a platform is defined and run on another platform, it is ignored.
+ * Option describing the karaf distribution to use; This option uses the specified scripts to run the environment
+ * depending on the platform. If a platform is defined and run on another platform it is simply ignored.
*/
public class KarafDistributionKitConfigurationOption extends KarafDistributionBaseConfigurationOption {
@@ -35,23 +35,26 @@ public class KarafDistributionKitConfigu
private List<String> makeExec = new ArrayList<String>();
private String exec;
- public KarafDistributionKitConfigurationOption(KarafDistributionBaseConfigurationOption base, Platform platform) {
+ public KarafDistributionKitConfigurationOption(KarafDistributionBaseConfigurationOption base,
+ Platform platform) {
super(base);
setPlatform(platform);
}
- public KarafDistributionKitConfigurationOption(MavenUrlReference frameworkUrlReference, String name, String karafVersion, Platform platform) {
- super(frameworkUrlReference, name, karafVersion);
+ public KarafDistributionKitConfigurationOption(MavenUrlReference frameworkURLReference, String name,
+ String karafVersion, Platform platform) {
+ super(frameworkURLReference, name, karafVersion);
setPlatform(platform);
}
- public KarafDistributionKitConfigurationOption(MavenUrlReference frameworkUrlReference, Platform platform) {
- super(frameworkUrlReference);
+ public KarafDistributionKitConfigurationOption(MavenUrlReference frameworkURLReference, Platform platform) {
+ super(frameworkURLReference);
setPlatform(platform);
}
- public KarafDistributionKitConfigurationOption(String frameworkUrl, String name, String karafVersion, Platform platform) {
- super(frameworkUrl, name, karafVersion);
+ public KarafDistributionKitConfigurationOption(String frameworkURL, String name, String karafVersion,
+ Platform platform) {
+ super(frameworkURL, name, karafVersion);
setPlatform(platform);
}