Stabilize hudson (#21734)

* remove osgi-cache for domains

* add util methods, touch the nucleus root and as root before tests


* remove unnecessary changes, add copyrights

Author: SAMEER PANDIT

main/nucleus/test-utils/utils-ng/src/main/java/org/glassfish/tests/utils/NucleusTestUtils.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2012-2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012-2017 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -335,4 +335,58 @@ public static class NadminReturn {
         public String outAndErr;
     }
 
+    public static void deleteDirectoryContents(final File dir) {
+      if (dir == null || !dir.exists()) {
+        return;
+      }
+      System.out.println("Deleting contents of directory : " + dir);
+      File[] files = dir.listFiles();
+      if(files!=null) {
+        for(File f: files) {
+          if(f.isDirectory()) {
+            deleteDirectory(f);
+          }else{
+            f.delete();
+          }
+        }
+      }
+    }
+
+    public static void deleteDirectory (final File dir) {
+      if (dir == null || !dir.exists()) {
+        return;
+      }
+      File[] files = dir.listFiles();
+      if(files!=null) {
+        for(File f: files) {
+          if(f.isDirectory()) {
+            deleteDirectory(f);
+          }else{
+            f.delete();
+          }
+        }
+      }
+      dir.delete();
+    }
+
+    public static void touchDirectory (final File dir) {
+      if (dir == null || !dir.exists()) {
+        return;
+      }
+      long timestamp;
+      File[] files = dir.listFiles();
+      if(files!=null) {
+        for(File f: files) {
+          if(f.isDirectory()) {
+            touchDirectory(f);
+          }else{
+            timestamp = System.currentTimeMillis();
+            f.setLastModified(timestamp);
+          }
+        }
+      }
+      timestamp = System.currentTimeMillis();
+      dir.setLastModified(timestamp);
+      System.out.println("Touched contents of directory : " + dir);
+    }
 }

main/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/progress/DetachAttachTest.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012-2017 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -44,6 +44,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.io.File;
 import java.util.StringTokenizer;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
@@ -62,11 +63,14 @@
  */
 @Test(testName="DetachAttachTest")
 public class DetachAttachTest {
-    
+    private static File nucleusRoot  = getNucleusRoot();
+
     @AfterTest
     public void cleanUp() throws Exception {
         nadmin("stop-domain");
         JobManagerTest.deleteJobsFile();
+        //osgi-cache workaround
+        touchDirectory(nucleusRoot);
         nadmin("start-domain");
     }
 

main/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/progress/JobManagerTest.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012-2017 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -65,7 +65,8 @@ public void setUp() throws Exception {
         nadmin("stop-domain");
         //delete jobs.xml incase there were other jobs run
         deleteJobsFile();
-
+        //osgi-cache workaround
+        touchDirectory(nucleusRoot); 
         nadmin("start-domain");