Author: rmannibucau
Date: Tue Apr 10 20:19:28 2012
New Revision: 1311968
URL: http://svn.apache.org/viewvc?rev=1311968&view=rev
Log:
removing org.apache.karaf.tooling.exam.container snapshot dependency
Modified:
openejb/trunk/openejb/osgi/openejb-osgi-tests/pom.xml
openejb/trunk/openejb/osgi/openejb-osgi-tests/src/test/java/org/apache/openejb/osgi/test/OSGiKarafStartupTest.java
Modified: openejb/trunk/openejb/osgi/openejb-osgi-tests/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/osgi/openejb-osgi-tests/pom.xml?rev=1311968&r1=1311967&r2=1311968&view=diff
==============================================================================
--- openejb/trunk/openejb/osgi/openejb-osgi-tests/pom.xml (original)
+++ openejb/trunk/openejb/osgi/openejb-osgi-tests/pom.xml Tue Apr 10 20:19:28
2012
@@ -32,7 +32,7 @@
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit4</artifactId>
- <version>2.3.0.M1</version>
+ <version>2.3.0</version>
<scope>test</scope>
</dependency>
<dependency> <!-- to avoid a snapshot dep -->
@@ -42,11 +42,19 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.openengsb.labs.paxexam.karaf</groupId>
+ <artifactId>paxexam-karaf-container</artifactId>
+ <version>0.5.2</version>
+ <scope>test</scope>
+ </dependency>
+ <!--
+ <dependency>
<groupId>org.apache.karaf.tooling.exam</groupId>
<artifactId>org.apache.karaf.tooling.exam.container</artifactId>
<version>3.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
+ -->
<dependency>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.console</artifactId>
Modified:
openejb/trunk/openejb/osgi/openejb-osgi-tests/src/test/java/org/apache/openejb/osgi/test/OSGiKarafStartupTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/osgi/openejb-osgi-tests/src/test/java/org/apache/openejb/osgi/test/OSGiKarafStartupTest.java?rev=1311968&r1=1311967&r2=1311968&view=diff
==============================================================================
---
openejb/trunk/openejb/osgi/openejb-osgi-tests/src/test/java/org/apache/openejb/osgi/test/OSGiKarafStartupTest.java
(original)
+++
openejb/trunk/openejb/osgi/openejb-osgi-tests/src/test/java/org/apache/openejb/osgi/test/OSGiKarafStartupTest.java
Tue Apr 10 20:19:28 2012
@@ -17,33 +17,35 @@
package org.apache.openejb.osgi.test;
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import javax.inject.Inject;
import org.apache.felix.service.command.CommandProcessor;
import org.apache.felix.service.command.CommandSession;
-import
org.apache.karaf.tooling.exam.options.KarafDistributionConfigurationFilePutOption;
import org.apache.openejb.OpenEJB;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.spi.ContainerSystem;
import org.apache.openejb.util.NetworkUtil;
import org.junit.Test;
import org.junit.runner.RunWith;
+import
org.openengsb.labs.paxexam.karaf.options.KarafDistributionConfigurationFilePutOption;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.TestProbeBuilder;
import org.ops4j.pax.exam.junit.Configuration;
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
import org.ops4j.pax.exam.junit.ProbeBuilder;
-import javax.inject.Inject;
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-
-import static
org.apache.karaf.tooling.exam.options.KarafDistributionOption.karafDistributionConfiguration;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+import static
org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.karafDistributionConfiguration;
import static org.ops4j.pax.exam.CoreOptions.felix;
import static org.ops4j.pax.exam.CoreOptions.maven;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.osgi.framework.Constants.DYNAMICIMPORT_PACKAGE;
+// if you replace openengsb by karaf 3.0.0 dependency for testing use:
+// import static
org.apache.karaf.tooling.exam.options.KarafDistributionOption.karafDistributionConfiguration;
+
@RunWith(JUnit4TestRunner.class)
public class OSGiKarafStartupTest {
@Inject
