From fec9ef60e163f376a5f665fa29dfcd67d29ea877 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Mon, 12 Oct 2015 09:53:46 +0000 Subject: [PATCH] Renamed class git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/vre-management/smart-executor@119602 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../vremanagement/executor/SmartContextServletListener.java | 2 +- ...torInitalizator.java => SmartExecutorInitializator.java} | 4 ++-- .../jsonbased/FileScheduledTaskConfiguration.java | 4 ++-- .../persistence/couchdb/PluginStateEvolutionObjectNode.java | 6 +++--- .../executor/scheduler/SmartExecutorScheduler.java | 4 ++-- ...gcube.smartgears.handlers.application.ApplicationHandler | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) rename src/main/java/org/gcube/vremanagement/executor/{SmartExecutorInitalizator.java => SmartExecutorInitializator.java} (99%) diff --git a/src/main/java/org/gcube/vremanagement/executor/SmartContextServletListener.java b/src/main/java/org/gcube/vremanagement/executor/SmartContextServletListener.java index 3f48716..7b78dec 100644 --- a/src/main/java/org/gcube/vremanagement/executor/SmartContextServletListener.java +++ b/src/main/java/org/gcube/vremanagement/executor/SmartContextServletListener.java @@ -36,7 +36,7 @@ public class SmartContextServletListener implements ServletContextListener { ApplicationContext ctx = ContextProvider.get(); logger.debug(String.format("ApplicationContext %s", ctx)); if(ctx!=null){ - List scopes = SmartExecutorInitalizator.getScopes(ctx); + List scopes = SmartExecutorInitializator.getScopes(ctx); logger.debug(String.format("Scopes %s", scopes)); } } diff --git a/src/main/java/org/gcube/vremanagement/executor/SmartExecutorInitalizator.java b/src/main/java/org/gcube/vremanagement/executor/SmartExecutorInitializator.java similarity index 99% rename from src/main/java/org/gcube/vremanagement/executor/SmartExecutorInitalizator.java rename to src/main/java/org/gcube/vremanagement/executor/SmartExecutorInitializator.java index 01bf74b..9dd31e4 100644 --- a/src/main/java/org/gcube/vremanagement/executor/SmartExecutorInitalizator.java +++ b/src/main/java/org/gcube/vremanagement/executor/SmartExecutorInitializator.java @@ -46,12 +46,12 @@ import org.slf4j.LoggerFactory; * */ @XmlRootElement(name = "plugin-registration-handler") -public class SmartExecutorInitalizator extends ApplicationLifecycleHandler { +public class SmartExecutorInitializator extends ApplicationLifecycleHandler { /** * Logger */ - private static Logger logger = LoggerFactory.getLogger(SmartExecutorInitalizator.class); + private static Logger logger = LoggerFactory.getLogger(SmartExecutorInitializator.class); public static final long JOIN_TIMEOUT = 1000; diff --git a/src/main/java/org/gcube/vremanagement/executor/configuration/jsonbased/FileScheduledTaskConfiguration.java b/src/main/java/org/gcube/vremanagement/executor/configuration/jsonbased/FileScheduledTaskConfiguration.java index 1422062..23a14ed 100644 --- a/src/main/java/org/gcube/vremanagement/executor/configuration/jsonbased/FileScheduledTaskConfiguration.java +++ b/src/main/java/org/gcube/vremanagement/executor/configuration/jsonbased/FileScheduledTaskConfiguration.java @@ -13,7 +13,7 @@ import java.util.List; import java.util.UUID; import org.apache.commons.io.FileUtils; -import org.gcube.vremanagement.executor.SmartExecutorInitalizator; +import org.gcube.vremanagement.executor.SmartExecutorInitializator; import org.gcube.vremanagement.executor.api.types.LaunchParameter; import org.gcube.vremanagement.executor.api.types.Scheduling; import org.gcube.vremanagement.executor.configuration.ScheduledTaskConfiguration; @@ -44,7 +44,7 @@ public class FileScheduledTaskConfiguration implements ScheduledTaskConfiguratio public static final String CONFIG_TASK_FILENAME = "definedTasks.json"; public FileScheduledTaskConfiguration() throws Exception { - this(SmartExecutorInitalizator.getCtx().persistence().location()); + this(SmartExecutorInitializator.getCtx().persistence().location()); } public FileScheduledTaskConfiguration(String location) throws IOException, JSONException { diff --git a/src/main/java/org/gcube/vremanagement/executor/persistence/couchdb/PluginStateEvolutionObjectNode.java b/src/main/java/org/gcube/vremanagement/executor/persistence/couchdb/PluginStateEvolutionObjectNode.java index 7d272af..53db3e1 100644 --- a/src/main/java/org/gcube/vremanagement/executor/persistence/couchdb/PluginStateEvolutionObjectNode.java +++ b/src/main/java/org/gcube/vremanagement/executor/persistence/couchdb/PluginStateEvolutionObjectNode.java @@ -10,7 +10,7 @@ import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.node.ObjectNode; import org.gcube.common.resources.gcore.GCoreEndpoint; import org.gcube.common.scope.api.ScopeProvider; -import org.gcube.vremanagement.executor.SmartExecutorInitalizator; +import org.gcube.vremanagement.executor.SmartExecutorInitializator; import org.gcube.vremanagement.executor.plugin.PluginDeclaration; import org.gcube.vremanagement.executor.plugin.PluginStateEvolution; @@ -46,9 +46,9 @@ public class PluginStateEvolutionObjectNode { ObjectMapper objectMapper = new ObjectMapper(); ObjectNode objectNode = objectMapper.createObjectNode(); try { - GCoreEndpoint gCoreEndpoint = SmartExecutorInitalizator.getCtx().profile(GCoreEndpoint.class); + GCoreEndpoint gCoreEndpoint = SmartExecutorInitializator.getCtx().profile(GCoreEndpoint.class); objectNode.put(GHN_ID_FIELD, gCoreEndpoint.profile().ghnId()); - objectNode.put(GHN_HOSTNAME_FIELD, SmartExecutorInitalizator.getCtx().container().configuration().hostname()); + objectNode.put(GHN_HOSTNAME_FIELD, SmartExecutorInitializator.getCtx().container().configuration().hostname()); }catch(Exception e){ objectNode.put(GHN_ID_FIELD, LOCALHOST + "_" + UUID.randomUUID()); objectNode.put(GHN_HOSTNAME_FIELD, LOCALHOST); diff --git a/src/main/java/org/gcube/vremanagement/executor/scheduler/SmartExecutorScheduler.java b/src/main/java/org/gcube/vremanagement/executor/scheduler/SmartExecutorScheduler.java index 80a774d..4971e06 100644 --- a/src/main/java/org/gcube/vremanagement/executor/scheduler/SmartExecutorScheduler.java +++ b/src/main/java/org/gcube/vremanagement/executor/scheduler/SmartExecutorScheduler.java @@ -12,7 +12,7 @@ import java.util.Map; import java.util.UUID; import org.gcube.common.resources.gcore.GCoreEndpoint; -import org.gcube.vremanagement.executor.SmartExecutorInitalizator; +import org.gcube.vremanagement.executor.SmartExecutorInitializator; import org.gcube.vremanagement.executor.api.types.LaunchParameter; import org.gcube.vremanagement.executor.api.types.Scheduling; import org.gcube.vremanagement.executor.configuration.ScheduledTaskConfiguration; @@ -139,7 +139,7 @@ public class SmartExecutorScheduler { try { ScheduledTaskConfiguration stc = ScheduledTaskConfigurationFactory.getLaunchConfiguration(); - String runningInstanceID = SmartExecutorInitalizator.getCtx().profile(GCoreEndpoint.class).id(); + String runningInstanceID = SmartExecutorInitializator.getCtx().profile(GCoreEndpoint.class).id(); stc.addScheduledTask(uuid, runningInstanceID, parameter); } catch (Exception e) { logger.error("Unable to persist the scheduling", e.getCause()); diff --git a/src/main/resources/META-INF/services/org.gcube.smartgears.handlers.application.ApplicationHandler b/src/main/resources/META-INF/services/org.gcube.smartgears.handlers.application.ApplicationHandler index d7ea84c..874ac97 100644 --- a/src/main/resources/META-INF/services/org.gcube.smartgears.handlers.application.ApplicationHandler +++ b/src/main/resources/META-INF/services/org.gcube.smartgears.handlers.application.ApplicationHandler @@ -1 +1 @@ -org.gcube.vremanagement.executor.SmartExecutorInitalizator \ No newline at end of file +org.gcube.vremanagement.executor.SmartExecutorInitializator \ No newline at end of file