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 2013/07/21 20:33:28 UTC
svn commit: r1505441 - in /karaf/branches/karaf-2.x: ./ itests/
itests/src/test/java/org/apache/karaf/itests/ tooling/ tooling/exam/
tooling/exam/container/
tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/
tooling/...
Author: jbonofre
Date: Sun Jul 21 18:33:27 2013
New Revision: 1505441
URL: http://svn.apache.org/r1505441
Log:
[KARAF-2336] Remove karaf-pax-exam to use directly pax-exam 3.1.0 which provide pax-exam-container-karaf
Removed:
karaf/branches/karaf-2.x/tooling/exam/container/NOTICE
karaf/branches/karaf-2.x/tooling/exam/container/pom.xml
karaf/branches/karaf-2.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/Constants.java
karaf/branches/karaf-2.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/ExamFeaturesFile.java
karaf/branches/karaf-2.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/InternalKarafDistributionConfigurationOption.java
karaf/branches/karaf-2.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/KarafPropertiesFile.java
karaf/branches/karaf-2.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/KarafTestContainer.java
karaf/branches/karaf-2.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/KarafTestContainerFactory.java
karaf/branches/karaf-2.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/RMIRegistry.java
karaf/branches/karaf-2.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/adaptions/KarafManipulator.java
karaf/branches/karaf-2.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/adaptions/KarafManipulatorFactory.java
karaf/branches/karaf-2.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/adaptions/KarafManipulatorStartingFrom220.java
karaf/branches/karaf-2.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/BaseScriptRunner.java
karaf/branches/karaf-2.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/CommandLineBuilder.java
karaf/branches/karaf-2.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/InternalRunner.java
karaf/branches/karaf-2.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/KarafJavaRunner.java
karaf/branches/karaf-2.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/NixRunner.java
karaf/branches/karaf-2.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/Runner.java
karaf/branches/karaf-2.x/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/runner/WindowsRunner.java
karaf/branches/karaf-2.x/tooling/exam/container/src/main/resources/META-INF/services/org.ops4j.pax.exam.TestContainerFactory
karaf/branches/karaf-2.x/tooling/exam/container/src/main/resources/META-INF/versions.properties
karaf/branches/karaf-2.x/tooling/exam/options/NOTICE
karaf/branches/karaf-2.x/tooling/exam/options/pom.xml
karaf/branches/karaf-2.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/ConfigurationPointer.java
karaf/branches/karaf-2.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/DoNotModifyLogOption.java
karaf/branches/karaf-2.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/ExamBundlesStartLevel.java
karaf/branches/karaf-2.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionBaseConfigurationOption.java
karaf/branches/karaf-2.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationConsoleOption.java
karaf/branches/karaf-2.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationFileExtendOption.java
karaf/branches/karaf-2.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationFileOption.java
karaf/branches/karaf-2.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationFilePutOption.java
karaf/branches/karaf-2.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationFileReplacementOption.java
karaf/branches/karaf-2.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionConfigurationOption.java
karaf/branches/karaf-2.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionKitConfigurationOption.java
karaf/branches/karaf-2.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafDistributionOption.java
karaf/branches/karaf-2.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KarafExamSystemConfigurationOption.java
karaf/branches/karaf-2.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/KeepRuntimeFolderOption.java
karaf/branches/karaf-2.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/LogLevelOption.java
karaf/branches/karaf-2.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/configs/CustomProperties.java
karaf/branches/karaf-2.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/configs/FeaturesCfg.java
karaf/branches/karaf-2.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/configs/JreProperties.java
karaf/branches/karaf-2.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/configs/LoggingCfg.java
karaf/branches/karaf-2.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/configs/ManagementCfg.java
karaf/branches/karaf-2.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/configs/SystemProperties.java
karaf/branches/karaf-2.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/configs/UsersProperties.java
karaf/branches/karaf-2.x/tooling/exam/options/src/main/java/org/apache/karaf/tooling/exam/options/configs/WebCfg.java
karaf/branches/karaf-2.x/tooling/exam/pom.xml
Modified:
karaf/branches/karaf-2.x/itests/pom.xml
karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
karaf/branches/karaf-2.x/pom.xml
karaf/branches/karaf-2.x/tooling/pom.xml
Modified: karaf/branches/karaf-2.x/itests/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/itests/pom.xml?rev=1505441&r1=1505440&r2=1505441&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/itests/pom.xml (original)
+++ karaf/branches/karaf-2.x/itests/pom.xml Sun Jul 21 18:33:27 2013
@@ -77,9 +77,8 @@
</dependency>
<dependency>
- <groupId>org.apache.karaf.tooling.exam</groupId>
- <artifactId>org.apache.karaf.tooling.exam.container</artifactId>
- <version>${project.version}</version>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-container-karaf</artifactId>
<scope>test</scope>
</dependency>
@@ -89,6 +88,12 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-atinject_1.0_spec</artifactId>
+ <version>1.0</version>
+ </dependency>
+
</dependencies>
<build>
Modified: karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java?rev=1505441&r1=1505440&r2=1505441&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java (original)
+++ karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java Sun Jul 21 18:33:27 2013
@@ -17,7 +17,7 @@ import org.apache.felix.service.command.
import org.apache.felix.service.command.CommandSession;
import org.apache.karaf.features.Feature;
import org.apache.karaf.features.FeaturesService;
-import org.apache.karaf.tooling.exam.options.LogLevelOption;
+import org.ops4j.pax.exam.karaf.options.LogLevelOption;
import org.junit.Assert;
import org.ops4j.pax.exam.MavenUtils;
import org.ops4j.pax.exam.Option;
@@ -38,9 +38,9 @@ import java.io.PrintStream;
import java.util.*;
import java.util.concurrent.*;
-import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.karafDistributionConfiguration;
-import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.keepRuntimeFolder;
-import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.logLevel;
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDistributionConfiguration;
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.keepRuntimeFolder;
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.logLevel;
import static org.ops4j.pax.exam.CoreOptions.maven;
Modified: karaf/branches/karaf-2.x/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/pom.xml?rev=1505441&r1=1505440&r2=1505441&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/pom.xml (original)
+++ karaf/branches/karaf-2.x/pom.xml Sun Jul 21 18:33:27 2013
@@ -175,12 +175,11 @@
<osgi.version>4.3.1</osgi.version>
<org.json.version>20070829</org.json.version>
<pax.base.version>1.4.0</pax.base.version>
- <pax.exam.version>2.6.0</pax.exam.version>
+ <pax.exam.version>3.1.0</pax.exam.version>
<pax.logging.version>1.7.0</pax.logging.version>
- <pax.runner.version>1.7.6</pax.runner.version>
<pax.url.version>1.3.6</pax.url.version>
- <pax.web.version>2.1.4</pax.web.version>
<pax.swissbox.version>1.6.0</pax.swissbox.version>
+ <pax.web.version>2.1.4</pax.web.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>
@@ -948,27 +947,7 @@
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-container-remote</artifactId>
- <version>${pax.exam.version}</version>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-spi</artifactId>
- <version>${pax.exam.version}</version>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-invoker-junit</artifactId>
- <version>${pax.exam.version}</version>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-container-rbc</artifactId>
- <version>${pax.exam.version}</version>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-container-rbc-client</artifactId>
+ <artifactId>pax-exam-container-karaf</artifactId>
<version>${pax.exam.version}</version>
</dependency>
<dependency>
@@ -978,16 +957,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-extender-service</artifactId>
- <version>${pax.exam.version}</version>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-inject</artifactId>
- <version>${pax.exam.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-atinject_1.0_spec</artifactId>
<version>${injection.bundle.version}</version>
Modified: karaf/branches/karaf-2.x/tooling/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/tooling/pom.xml?rev=1505441&r1=1505440&r2=1505441&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/tooling/pom.xml (original)
+++ karaf/branches/karaf-2.x/tooling/pom.xml Sun Jul 21 18:33:27 2013
@@ -36,7 +36,6 @@
<modules>
<module>features-maven-plugin</module>
<module>cmdhelp-maven-plugin</module>
- <module>exam</module>
</modules>
</project>