From d383924669023f43b00b56568503469c38b63c2f Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Thu, 21 Jan 2016 11:06:12 +0000
Subject: [PATCH] refs #2032: Create IS Sweeper as SmartExecutor Plugin
 https://support.d4science.org/issues/2032

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/information-system/is-sweeper-se-plugin@122414 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 pom.xml                                              | 11 ++++++-----
 .../sweeper/ISSweeperPlugin.java}                    | 12 ++++++------
 .../sweeper/ISSweeperPluginDeclaration.java}         | 10 +++++-----
 3 files changed, 17 insertions(+), 16 deletions(-)
 rename src/main/java/org/gcube/{vremanagement/smartexecutor/sweeper/ScheduledTaskSweeperPlugin.java => informationsystem/sweeper/ISSweeperPlugin.java} (52%)
 rename src/main/java/org/gcube/{vremanagement/smartexecutor/sweeper/ScheduledTaskSweeperPluginDeclaration.java => informationsystem/sweeper/ISSweeperPluginDeclaration.java} (82%)

diff --git a/pom.xml b/pom.xml
index 1aeaefc..7d71504 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,6 +39,11 @@
 	</properties>
 
 	<dependencies>
+		<dependency>
+			<groupId>org.gcube.resources</groupId>
+			<artifactId>registry-publisher</artifactId>
+			<scope>provided</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.gcube.vremanagement</groupId>
 			<artifactId>smart-executor-api</artifactId>
@@ -51,11 +56,6 @@
 		</dependency>
 		
 		<!-- Test dependencies -->
-		<dependency>
-			<groupId>org.gcube.resources</groupId>
-			<artifactId>registry-publisher</artifactId>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.gcube.core</groupId>
 			<artifactId>common-encryption</artifactId>
@@ -84,6 +84,7 @@
 			<version>1.0.13</version>
 			<scope>test</scope>
 		</dependency>
+		
 	</dependencies>
 	<build>
 		<plugins>
diff --git a/src/main/java/org/gcube/vremanagement/smartexecutor/sweeper/ScheduledTaskSweeperPlugin.java b/src/main/java/org/gcube/informationsystem/sweeper/ISSweeperPlugin.java
similarity index 52%
rename from src/main/java/org/gcube/vremanagement/smartexecutor/sweeper/ScheduledTaskSweeperPlugin.java
rename to src/main/java/org/gcube/informationsystem/sweeper/ISSweeperPlugin.java
index 0009092..016863c 100644
--- a/src/main/java/org/gcube/vremanagement/smartexecutor/sweeper/ScheduledTaskSweeperPlugin.java
+++ b/src/main/java/org/gcube/informationsystem/sweeper/ISSweeperPlugin.java
@@ -1,4 +1,4 @@
-package org.gcube.vremanagement.smartexecutor.sweeper;
+package org.gcube.informationsystem.sweeper;
 
 import java.util.Map;
 
@@ -9,14 +9,14 @@ import org.slf4j.LoggerFactory;
 /**
  * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
  */
-public class ScheduledTaskSweeperPlugin extends Plugin<ScheduledTaskSweeperPluginDeclaration> {
+public class ISSweeperPlugin extends Plugin<ISSweeperPluginDeclaration> {
 
 	/**
 	 * Logger
 	 */
-	private static Logger logger = LoggerFactory.getLogger(ScheduledTaskSweeperPlugin.class);
+	private static Logger logger = LoggerFactory.getLogger(ISSweeperPlugin.class);
 	
-	public ScheduledTaskSweeperPlugin(ScheduledTaskSweeperPluginDeclaration pluginDeclaration) {
+	public ISSweeperPlugin(ISSweeperPluginDeclaration pluginDeclaration) {
 		super(pluginDeclaration);
 		logger.debug("contructor");
 	}
@@ -24,9 +24,9 @@ public class ScheduledTaskSweeperPlugin extends Plugin<ScheduledTaskSweeperPlugi
 	/**{@inheritDoc}*/
 	@Override
 	public void launch(Map<String, Object> inputs) throws Exception {
-		logger.debug("Launching {} execution", ScheduledTaskSweeperPluginDeclaration.NAME);
+		logger.debug("Launching {} execution", ISSweeperPluginDeclaration.NAME);
 		// No inputs needed
-		logger.debug("{} execution finished", ScheduledTaskSweeperPluginDeclaration.NAME);
+		logger.debug("{} execution finished", ISSweeperPluginDeclaration.NAME);
 	}
 
 	/**{@inheritDoc}*/
diff --git a/src/main/java/org/gcube/vremanagement/smartexecutor/sweeper/ScheduledTaskSweeperPluginDeclaration.java b/src/main/java/org/gcube/informationsystem/sweeper/ISSweeperPluginDeclaration.java
similarity index 82%
rename from src/main/java/org/gcube/vremanagement/smartexecutor/sweeper/ScheduledTaskSweeperPluginDeclaration.java
rename to src/main/java/org/gcube/informationsystem/sweeper/ISSweeperPluginDeclaration.java
index 19eda6a..6d38933 100644
--- a/src/main/java/org/gcube/vremanagement/smartexecutor/sweeper/ScheduledTaskSweeperPluginDeclaration.java
+++ b/src/main/java/org/gcube/informationsystem/sweeper/ISSweeperPluginDeclaration.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.gcube.vremanagement.smartexecutor.sweeper;
+package org.gcube.informationsystem.sweeper;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -17,12 +17,12 @@ import org.slf4j.LoggerFactory;
  * SmartExecutor Persistence and with IS t find orphaned Running Instances
  * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
  */
-public class ScheduledTaskSweeperPluginDeclaration implements PluginDeclaration {
+public class ISSweeperPluginDeclaration implements PluginDeclaration {
 
 	/**
 	 * Logger
 	 */
-	private static Logger logger = LoggerFactory.getLogger(ScheduledTaskSweeperPlugin.class);
+	private static Logger logger = LoggerFactory.getLogger(ISSweeperPlugin.class);
 	
 	/**
 	 * Plugin name used by the Executor to retrieve this class
@@ -38,7 +38,7 @@ public class ScheduledTaskSweeperPluginDeclaration implements PluginDeclaration
 	/**{@inheritDoc}*/
 	@Override
 	public void init() {
-		logger.debug(String.format("%s initialized", ScheduledTaskSweeperPlugin.class.getSimpleName()));
+		logger.debug(String.format("%s initialized", ISSweeperPlugin.class.getSimpleName()));
 	}
 	
 	/**{@inheritDoc}*/
@@ -70,7 +70,7 @@ public class ScheduledTaskSweeperPluginDeclaration implements PluginDeclaration
 	/**{@inheritDoc}*/
 	@Override
 	public Class<? extends Plugin<? extends PluginDeclaration>> getPluginImplementation() {
-		return ScheduledTaskSweeperPlugin.class;
+		return ISSweeperPlugin.class;
 	}
 	
 }