You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by jb...@apache.org on 2010/10/13 23:40:30 UTC
svn commit: r1022302 - in /incubator/aries/sandbox/jbohn/interceptor-proto: blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/ quiesce/quiesce-manager-itest/src/test/java/org/apache/aries/quiesce/manager/itest/ transaction/tran...

Author: jbohn
Date: Wed Oct 13 21:40:29 2010
New Revision: 1022302

URL: http://svn.apache.org/viewvc?rev=1022302&view=rev
Log:
merge 1022298 from trunk

Modified:
    incubator/aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java
    incubator/aries/sandbox/jbohn/interceptor-proto/quiesce/quiesce-manager-itest/src/test/java/org/apache/aries/quiesce/manager/itest/QuiesceManagerTest.java
    incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java

Modified: incubator/aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java?rev=1022302&r1=1022301&r2=1022302&view=diff
==============================================================================
--- incubator/aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java (original)
+++ incubator/aries/sandbox/jbohn/interceptor-proto/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java Wed Oct 13 21:40:29 2010
@@ -74,7 +74,7 @@ public class BlueprintContainerTest exte
 
       bundle.start();
       
-      getBlueprintContainerForBundle(bundleContext, "org.apache.aries.blueprint.sample", DEFAULT_TIMEOUT);
+      getBlueprintContainerForBundle(bundleContext, "org.apache.aries.blueprint.sample",DEFAULT_TIMEOUT);
       
       // no actual assertions, we just don't want to deadlock
     }

Modified: incubator/aries/sandbox/jbohn/interceptor-proto/quiesce/quiesce-manager-itest/src/test/java/org/apache/aries/quiesce/manager/itest/QuiesceManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/jbohn/interceptor-proto/quiesce/quiesce-manager-itest/src/test/java/org/apache/aries/quiesce/manager/itest/QuiesceManagerTest.java?rev=1022302&r1=1022301&r2=1022302&view=diff
==============================================================================
--- incubator/aries/sandbox/jbohn/interceptor-proto/quiesce/quiesce-manager-itest/src/test/java/org/apache/aries/quiesce/manager/itest/QuiesceManagerTest.java (original)
+++ incubator/aries/sandbox/jbohn/interceptor-proto/quiesce/quiesce-manager-itest/src/test/java/org/apache/aries/quiesce/manager/itest/QuiesceManagerTest.java Wed Oct 13 21:40:29 2010
@@ -22,7 +22,7 @@ import static org.ops4j.pax.exam.CoreOpt
 import static org.ops4j.pax.exam.CoreOptions.wrappedBundle;
 import static org.ops4j.pax.exam.OptionUtils.combine;
 //import org.ops4j.pax.exam.container.def.options.VMOption;
-//import org.ops4j.pax.exam.options.TimeoutOption;
+//import org.ops4j.pax.exam.options.TimeoutOption
 
 import java.util.ArrayList;
 import java.util.Arrays;

Modified: incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java?rev=1022302&r1=1022301&r2=1022302&view=diff
==============================================================================
--- incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java (original)
+++ incubator/aries/sandbox/jbohn/interceptor-proto/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java Wed Oct 13 21:40:29 2010
@@ -28,6 +28,7 @@ import static org.ops4j.pax.exam.contain
 import org.ops4j.pax.exam.container.def.options.VMOption;
 import org.ops4j.pax.exam.options.TimeoutOption;
 
+
 import java.util.ArrayList;
 import java.util.List;