perfsonar development work

Author: psnc.pietrzak
Date: 2013-02-07 15:03:45 +0000 (Thu, 07 Feb 2013)
New Revision: 6131

Added:
   trunk/psBase3/perfsonar-base/src/main/java/net/geant/perfsonar/base/
   
trunk/psBase3/perfsonar-base/src/main/java/net/geant/perfsonar/base/Scheduler.java
   trunk/psBase3/perfsonar-base/src/main/java/net/geant/perfsonar/selftest/
Removed:
   
trunk/psBase3/perfsonar-base/src/main/java/net/geant/perfsonar/base/Scheduler.java
Modified:
   trunk/psBase3/perfsonar-base/pom.xml
Log:
Merged perfsonar-base-api with perfsonar-base.

Modified: trunk/psBase3/perfsonar-base/pom.xml
===================================================================
--- trunk/psBase3/perfsonar-base/pom.xml        2013-02-07 11:38:21 UTC (rev 
6130)
+++ trunk/psBase3/perfsonar-base/pom.xml        2013-02-07 15:03:45 UTC (rev 
6131)
@@ -62,11 +62,6 @@
                </dependency>
                <dependency>
                        <groupId>net.geant.perfsonar</groupId>
-                       <artifactId>perfsonar-base-api</artifactId>
-                       <version>3.0.0-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>net.geant.perfsonar</groupId>
                        <artifactId>perfsonar-base-annotations</artifactId>
                        <version>3.0.0-SNAPSHOT</version>
                </dependency>

Deleted: 
trunk/psBase3/perfsonar-base/src/main/java/net/geant/perfsonar/base/Scheduler.java
===================================================================
--- 
trunk/psBase3/perfsonar-base-api/src/main/java/net/geant/perfsonar/base/Scheduler.java
      2013-01-09 23:28:50 UTC (rev 6100)
+++ 
trunk/psBase3/perfsonar-base/src/main/java/net/geant/perfsonar/base/Scheduler.java
  2013-02-07 15:03:45 UTC (rev 6131)
@@ -1,7 +0,0 @@
-package net.geant.perfsonar.base;
-
-public interface Scheduler {
-
-       void runInParallel(Runnable runnable);
-
-}
\ No newline at end of file

Copied: 
trunk/psBase3/perfsonar-base/src/main/java/net/geant/perfsonar/base/Scheduler.java
 (from rev 6106, 
trunk/psBase3/perfsonar-base-api/src/main/java/net/geant/perfsonar/base/Scheduler.java)
===================================================================
--- 
trunk/psBase3/perfsonar-base/src/main/java/net/geant/perfsonar/base/Scheduler.java
                          (rev 0)
+++ 
trunk/psBase3/perfsonar-base/src/main/java/net/geant/perfsonar/base/Scheduler.java
  2013-02-07 15:03:45 UTC (rev 6131)
@@ -0,0 +1,8 @@
+package net.geant.perfsonar.base;
+
+public interface Scheduler {
+
+       void runInParallel(Runnable task);
+
+       void runEvery(int seconds, Runnable task);
+}
\ No newline at end of file