[webbeans-commits] Webbeans SVN: r2340 - test-harness/trunk/jboss/src/main/java/org/jboss/testharness/integration/jbossas and 1 other directory.

[webbeans-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2009-04-07 20:16:32 -0400 (Tue, 07 Apr 2009)
New Revision: 2340

Modified:
   ri/trunk/jboss-tck-runner/pom.xml
   test-harness/trunk/jboss/src/main/java/org/jboss/testharness/integration/jbossas/ProfileServiceConnector.java
Log:
minor

Modified: ri/trunk/jboss-tck-runner/pom.xml
===================================================================
--- ri/trunk/jboss-tck-runner/pom.xml	2009-04-07 23:40:11 UTC (rev 2339)
+++ ri/trunk/jboss-tck-runner/pom.xml	2009-04-08 00:16:32 UTC (rev 2340)
@@ -186,7 +186,7 @@
                            <value>../jboss-as</value>
                         </property>
                         <property>
-                           <name>jboss.force.restart</name>
+                           <name>org.jboss.testharness.container.forceRestart</name>
                            <value>true</value>
                         </property>
                         <property>

Modified: test-harness/trunk/jboss/src/main/java/org/jboss/testharness/integration/jbossas/ProfileServiceConnector.java
===================================================================
--- test-harness/trunk/jboss/src/main/java/org/jboss/testharness/integration/jbossas/ProfileServiceConnector.java	2009-04-07 23:40:11 UTC (rev 2339)
+++ test-harness/trunk/jboss/src/main/java/org/jboss/testharness/integration/jbossas/ProfileServiceConnector.java	2009-04-08 00:16:32 UTC (rev 2340)
@@ -33,6 +33,8 @@
    private final File tmpdir;
    private int deploymentCounter = 0;
    private Integer maxDeployments;
+   
+   private Boolean forceRestart;
 
 
    public ProfileServiceConnector() throws Exception
@@ -142,6 +144,8 @@
       {
          if (deploymentCounter >= getMaxDeployments())
          {
+            // Force into force-restart mode
+            forceRestart = true;
             deploymentCounter = 0;
             // Let everything stablise
             removeFailedUnDeployments();
@@ -232,5 +236,18 @@
       }
       return maxDeployments;
    }
+   
+   @Override
+   protected Boolean getForceRestart()
+   {
+      if (forceRestart == null)
+      {
+         return super.getForceRestart();
+      }
+      else
+      {
+         return forceRestart;
+      }
+   }
 
 }