You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@river.apache.org by si...@apache.org on 2010/11/02 21:18:28 UTC

svn commit: r1030204 - in /incubator/river/jtsk/trunk/qa: build.xml src/com/sun/jini/qa/harness/HeartOfTheMachine.java src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loader.policy

Author: sijskes
Date: Tue Nov  2 20:18:28 2010
New Revision: 1030204

URL: http://svn.apache.org/viewvc?rev=1030204&view=rev
Log:
activated heartbeat

Modified:
    incubator/river/jtsk/trunk/qa/build.xml
    incubator/river/jtsk/trunk/qa/src/com/sun/jini/qa/harness/HeartOfTheMachine.java
    incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loader.policy

Modified: incubator/river/jtsk/trunk/qa/build.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/build.xml?rev=1030204&r1=1030203&r2=1030204&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/build.xml (original)
+++ incubator/river/jtsk/trunk/qa/build.xml Tue Nov  2 20:18:28 2010
@@ -331,7 +331,7 @@
         <zip basedir="${result.dir}" file="${result.zip}" />
     </target>
 
-    <target name="run">
+    <target name="run" depends="jiniharness.jar">
         <property name="run.categories"
                 value="id,loader,policyprovider,locatordiscovery,activation,config,discoverymanager,joinmanager,url,iiop,jrmp,reliability,thread,renewalmanager,constraint,export,lookupdiscovery,servicediscovery,io,security,lookupservice,renewalservice,eventmailbox,jeri,start,discoveryservice,discoveryproviders,javaspace,txnmanager"/>
         <antcall target="run-categories"/>

Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/qa/harness/HeartOfTheMachine.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/qa/harness/HeartOfTheMachine.java?rev=1030204&r1=1030203&r2=1030204&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/src/com/sun/jini/qa/harness/HeartOfTheMachine.java (original)
+++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/qa/harness/HeartOfTheMachine.java Tue Nov  2 20:18:28 2010
@@ -20,6 +20,7 @@ package com.sun.jini.qa.harness;
 
 import java.io.File;
 import java.util.concurrent.TimeUnit;
+import java.util.logging.Logger;
 
 /**
  *
@@ -27,10 +28,26 @@ import java.util.concurrent.TimeUnit;
  */
 public class HeartOfTheMachine
 {
-    private static String soul = null ; // System.getenv("SOUL");
+    private String soul ;
 
-    public HeartOfTheMachine()
+    private HeartOfTheMachine()
     {
+        soul = System.getenv("SOUL");
+
+        if( soul == null ) {
+            return ;
+        }
+
+        Thread t = new Thread( new Runnable() {
+
+            public void run()
+            {
+                ticktack();
+            }
+
+        }, "no heart without soul");
+        t.setDaemon(true);
+        t.start();
     }
 
     private boolean hasReasonToLive()
@@ -54,19 +71,12 @@ public class HeartOfTheMachine
 
     public static void start()
     {
-        if( soul == null ) {
-            return ;
+        try {
+            new HeartOfTheMachine();
+        } catch( Throwable t ) {
+            //System.out.println("Heart NOT started");
+            Logger.getAnonymousLogger().severe("Heart NOT started");
         }
-
-        Thread t = new Thread( new Runnable() {
-
-            public void run()
-            {
-                new HeartOfTheMachine().ticktack();
-            }
-
-        }, "no heart without soul");
-        t.setDaemon(true);
-        t.start();
     }
+
 }

Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loader.policy
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loader.policy?rev=1030204&r1=1030203&r2=1030204&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loader.policy (original)
+++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/loader/pref/requireDlPermProvider/loader.policy Tue Nov  2 20:18:28 2010
@@ -47,7 +47,7 @@ grant { 
 
 grant {
     permission java.lang.RuntimePermission "getenv.SOUL" ;
-}
+} ;
 
 /*
  * Harness-specific policy is the same as policy.qaHarness.