Author: davidb
Date: Mon Mar 31 11:28:50 2014
New Revision: 1583301
URL: http://svn.apache.org/r1583301
Log:
[ARIES-1167] Transaction itests failures
Patch applied on behalf of Grzegorz Grzybek with many thanks.
This closes pull request #2.
Modified:
aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java
Modified:
aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java?rev=1583301&r1=1583300&r2=1583301&view=diff
==============================================================================
---
aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java
(original)
+++
aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java
Mon Mar 31 11:28:50 2014
@@ -18,17 +18,16 @@
*/
package org.apache.aries.transaction.itests;
+import static org.apache.aries.itest.ExtraOptions.mavenBundle;
+import static org.apache.aries.itest.ExtraOptions.testOptions;
import static org.ops4j.pax.exam.CoreOptions.bootDelegationPackages;
import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption;
-import static org.apache.aries.itest.ExtraOptions.*;
-
-import org.ops4j.pax.exam.container.def.PaxRunnerOptions;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.container.def.PaxRunnerOptions;
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
@RunWith(JUnit4TestRunner.class)
@@ -54,7 +53,7 @@ public abstract class AbstractIntegratio
//mavenBundle("org.ow2.asm", "asm-all"),
mavenBundle("org.apache.derby", "derby"),
mavenBundle("org.apache.aries", "org.apache.aries.util"),
- mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint"),
+ mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint"),
mavenBundle("org.apache.aries.proxy",
"org.apache.aries.proxy"),
mavenBundle("org.apache.aries.transaction",
"org.apache.aries.transaction.manager"),
mavenBundle("org.apache.aries.transaction",
"org.apache.aries.transaction.blueprint"),
