Updated pom.xml to include configuration resources [#26192]

Reviewed-on: #3

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 
 
+## [v2.8.0-SNAPSHOT]
+
+- Updated pom.xml to include configuration resources [#26192]
+
 ## [v2.7.1] - 2022-04-06
 
 - Updated to gcube-smartgears-bom.2.1.1 [#23133]

changelog.xml

@@ -1,4 +1,7 @@
 <ReleaseNotes>
+<Changeset component="org.gcube.dataanalysis.dataminer-pool-manager.2-8-0" date="2024-01-29">
+  <Change>Updated pom.xml to include configuration resources [#26192]</Change>
+</Changeset>
 <Changeset component="org.gcube.dataanalysis.dataminer-pool-manager.2-7-1" date="2022-04-06">
   <Change>Updated to gcube-smartgears-bom.2.2.0 [#23133]</Change>
 </Changeset>

pom.xml

@@ -5,14 +5,14 @@
 	<parent>
 		<artifactId>maven-parent</artifactId>
 		<groupId>org.gcube.tools</groupId>
-		<version>1.1.0</version>
+		<version>1.2.0</version>
 		<relativePath />
 	</parent>
 
 	<groupId>org.gcube.dataanalysis</groupId>
 	<artifactId>dataminer-pool-manager</artifactId>
 	<packaging>war</packaging>
-	<version>2.7.1</version>
+	<version>2.8.0-SNAPSHOT</version>
 
 	<name>dataminer-pool-manager</name>
 	<description>DataMiner Pool Manager is a service to support the integration of algorithms in D4Science Infrastructure</description>
@@ -151,7 +151,7 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>gcube-smartgears-bom</artifactId>
-				<version>2.1.1</version>
+				<version>2.5.0</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -191,6 +191,25 @@
 							</resources>
 						</configuration>
 					</execution>
+					<execution>
+						<id>copy-config</id>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<phase>process-resources</phase>
+						<configuration>
+							<outputDirectory>${webappDirectory}/classes</outputDirectory>
+							<resources>
+								<resource>
+									<directory>${project.basedir}/src/main/resources/</directory>
+									<filtering>true</filtering>
+									<includes>
+										<include>*/**</include>
+									</includes>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
 				</executions>
 			</plugin>
 

src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/clients/HAProxy.java

@@ -20,6 +20,9 @@ import au.com.bytecode.opencsv.CSVReader;
 
 public class HAProxy {
 
+	private static final String token1 = "";
+	private static final String token2 = "";
+	
 	private Logger logger;
 	
 	private CSVReader reader;
@@ -142,16 +145,16 @@ public class HAProxy {
 		HAProxy a = new HAProxy();
 		//ScopeProvider.instance.set("/gcube/devNext/NextNext");
 		//ScopeProvider.instance.set("/d4science.research-infrastructures.eu/gCubeApps/RPrototypingLab");
-		SecurityTokenProvider.instance.set("3a23bfa4-4dfe-44fc-988f-194b91071dd2-843339462");
+		SecurityTokenProvider.instance.set(token1);
 		
 		CheckPermission test = new CheckPermission();
-		CheckPermission.apply("708e7eb8-11a7-4e9a-816b-c9ed7e7e99fe-98187548", "/gcube/devNext/NextNext");
+		CheckPermission.apply(token2, "/gcube/devNext/NextNext");
 		
 		
 		//ScopeProvider.instance.set("/d4science.research-infrastructures.eu/gCubeApps/RPrototypingLab");
 		// System.out.println(a.getHProxy());
 		// System.out.println(a.MapCluster());
-		//System.out.println(a.listDataMinersByCluster("708e7eb8-11a7-4e9a-816b-c9ed7e7e99fe-98187548","/gcube/devNext/NextNext"));
+		//System.out.println(a.listDataMinersByCluster("xxx-xxx-xxx-xxx","/gcube/devNext/NextNext"));
 		// System.out.println(a.listDataMinersByCluster());
 
 		// List<Dependency> list = new LinkedList<Dependency>();

src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/clients/configuration/ClientConfigurationCache.java

@@ -97,16 +97,16 @@ public class ClientConfigurationCache
 						
 						if (repositoryPassword != null && repositoryPassword.trim() == "") repositoryPassword = null;
 						
-						this.logger.debug("Repository username "+repositoryUsername);
-						this.logger.debug("Repository password "+repositoryPassword);
+						logger.debug("Repository username "+repositoryUsername);
+						logger.debug("Repository password "+repositoryPassword);
 			
 					} catch (Exception e)
 					{
 						this.logger.debug("SVN Username and password not present");
 					}
 					
-					this.logger.debug("SVN Repository URL: "+repositoryURL);
-					this.logger.debug("SVN Repository path: "+repositoryPath);
+					logger.debug("SVN Repository URL: "+repositoryURL);
+					logger.debug("SVN Repository path: "+repositoryPath);
 				
 					response = new SVNRepository(repositoryURL, repositoryPath,repositoryUsername, repositoryPassword);
 				

src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/clients/configuration/ConfigurationImpl.java

@@ -30,23 +30,6 @@ public class ConfigurationImpl implements Configuration {
 	}
 	
 	
-//	enum REPOSITORIES {
-//		REPO ("svn.repository"),
-//		MAIN_ALGO ("svn.algo.main.repo");
-//		
-//		private String type;
-//		
-//		private REPOSITORIES(String type) {
-//			this.type = type;
-//		}
-//		
-//		@Override
-//		public String toString() {
-//			return this.type;
-//		}
-//	}
-	
-	
 	private CONFIGURATIONS type;
 	private ClientConfigurationCache cache;
 	

src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/clients/configuration/DMPMClientConfiguratorManager.java

@@ -14,7 +14,7 @@ import org.slf4j.LoggerFactory;
 import org.tmatesoft.svn.core.SVNException;
 
 public class DMPMClientConfiguratorManager {
-	private final Logger logger;
+	private final Logger logger=LoggerFactory.getLogger(DMPMClientConfiguratorManager.class);
 	private Properties defaultAdmins;
 
 	static DMPMClientConfiguratorManager instance;
@@ -22,28 +22,27 @@ public class DMPMClientConfiguratorManager {
 	private ScopedCacheMap cacheMap;
 
 	private DMPMClientConfiguratorManager() {
-		this.cacheMap = new ScopedCacheMap();
-		this.logger = LoggerFactory.getLogger(DMPMClientConfiguratorManager.class);
-		this.defaultAdmins = new Properties();
+		cacheMap = new ScopedCacheMap();
+		defaultAdmins = new Properties();
 
 		try {
-			this.defaultAdmins.load(this.getClass().getResourceAsStream("/default.admins"));
-			this.logger.debug("Default users successfully loaded");
+			defaultAdmins.load(this.getClass().getResourceAsStream("/default.admins"));
+			logger.debug("Default users successfully loaded");
 		} catch (Exception e) {
-			this.logger.error("Unable to get default users", e);
+			logger.error("Unable to get default users", e);
 		}
 	}
 
 	private ClientConfigurationCache getCurrentCache() {
 		String currentScope = ScopeProvider.instance.get();
-		this.logger.debug("Current scope = " + currentScope);
-		this.logger.debug("Getting current configuration cache");
-		ClientConfigurationCache cache = this.cacheMap.get(currentScope);
+		logger.debug("Current scope = " + currentScope);
+		logger.debug("Getting current configuration cache");
+		ClientConfigurationCache cache = cacheMap.get(currentScope);
 
 		if (cache == null) {
-			this.logger.debug("Cache not created yet, creating...");
+			logger.debug("Cache not created yet, creating...");
 			cache = new ClientConfigurationCache();
-			this.cacheMap.put(currentScope, cache);
+			cacheMap.put(currentScope, cache);
 
 		}
 
@@ -88,8 +87,8 @@ public class DMPMClientConfiguratorManager {
 
 	public static void main(String[] args) throws IOException, SVNException {
 		DMPMClientConfiguratorManager a = new DMPMClientConfiguratorManager();
-		ScopeProvider.instance.set("/gcube/devNext/NextNext");
-		// SecurityTokenProvider.instance.set("708e7eb8-11a7-4e9a-816b-c9ed7e7e99fe-98187548");
+		ScopeProvider.instance.set("/gcube/devsec/devVRE");
+		// SecurityTokenProvider.instance.set("xxx-xxx-xxx-xxx");
 
 		System.out.println("RESULT 1" + a.getStagingConfiguration().getSVNCRANDepsList());
 		System.out.println("RESULT 2" + a.getProductionConfiguration().getRepository());

src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/rest/RestPoolManager.java

@@ -1,6 +1,5 @@
 package org.gcube.dataanalysis.dataminer.poolmanager.rest;
 
-
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -24,52 +23,44 @@ import org.slf4j.LoggerFactory;
 import org.tmatesoft.svn.core.SVNException;
 
 @Path("/")
-public class RestPoolManager implements PoolManager 
-{
-    //@Context ServletContext context;
+public class RestPoolManager implements PoolManager {
+	// @Context ServletContext context;
 
 	private final Logger logger;
 	private DataminerPoolManager service;
-	
-	//@Context
-	//private ApplicationContext context = ContextProvider.get();
-	
-	public RestPoolManager() 
-	{
+
+	// @Context
+	// private ApplicationContext context = ContextProvider.get();
+
+	public RestPoolManager() {
 		this.logger = LoggerFactory.getLogger(RestPoolManager.class);
 		this.service = new DataminerPoolManager();
-	
+
 	}
-	
 
 	@GET
 	@Path("/algorithm/stage")
 	@Produces("text/plain")
-	public String stageAlgorithm(
-			@QueryParam("algorithmPackageURL") String algorithmPackageURL,
-			@QueryParam("targetVRE") String targetVRE,
-			@QueryParam("category") String category,
+	public String stageAlgorithm(@QueryParam("algorithmPackageURL") String algorithmPackageURL,
+			@QueryParam("targetVRE") String targetVRE, @QueryParam("category") String category,
 			@QueryParam("algorithm_type") String algorithm_type) throws IOException, InterruptedException {
 		this.logger.debug("Stage algorithm method called");
-		Algorithm algo = AlgorithmBuilder.create(algorithmPackageURL);	
-		//String env = context.application().getInitParameter("Environment");
-		return this.service.stageAlgorithm(algo,targetVRE,category,algorithm_type/*,env*/);
+		Algorithm algo = AlgorithmBuilder.create(algorithmPackageURL);
+		// String env = context.application().getInitParameter("Environment");
+		return this.service.stageAlgorithm(algo, targetVRE, category, algorithm_type/* ,env */);
 	}
 
-
 	@GET
 	@Path("/algorithm/add")
 	@Produces("text/plain")
-	public String publishAlgorithm(
-			@QueryParam("algorithmPackageURL") String algorithmPackageURL,
-			//@QueryParam("targetVREToken") String targetVREToken,
-			@QueryParam("targetVRE") String targetVRE,
-			@QueryParam("category") String category,
+	public String publishAlgorithm(@QueryParam("algorithmPackageURL") String algorithmPackageURL,
+			// @QueryParam("targetVREToken") String targetVREToken,
+			@QueryParam("targetVRE") String targetVRE, @QueryParam("category") String category,
 			@QueryParam("algorithm_type") String algorithm_type) throws IOException, InterruptedException {
 		this.logger.debug("Publish algorithm method called");
 		Algorithm algo = AlgorithmBuilder.create(algorithmPackageURL);
-		//String env = context.application().getInitParameter("Environment");
-		return this.service.publishAlgorithm(algo, /*targetVREToken,*/ targetVRE,category,algorithm_type/*,env*/);
+		// String env = context.application().getInitParameter("Environment");
+		return this.service.publishAlgorithm(algo, /* targetVREToken, */ targetVRE, category, algorithm_type/* ,env */);
 	}
 
 	/*
@@ -87,7 +78,6 @@ public class RestPoolManager implements PoolManager
 		return service.getLogById(logUrl);
 	}
 
-	
 	@GET
 	@Path("/monitor")
 	@Produces("text/plain")
@@ -97,72 +87,77 @@ public class RestPoolManager implements PoolManager
 		this.logger.debug("Returning Log =" + logUrl);
 		return service.getMonitorById(logUrl);
 	}
-	
-	
-	
-	
-	
-	
-		@Override
+
+	@Override
 	public Algorithm extractAlgorithm(String url) throws IOException {
 		// TODO Auto-generated method stub
 		return null;
 	}
 
 	public static void main(String[] args) throws ObjectNotFound, Exception {
-		
-		
+
 		// System.out.println(System.getProperty("user.home")+File.separator+"/gcube/dataminer-pool-manager");
 //		// ProxySelector.setDefault(new
 //		// PropertiesBasedProxySelector("/home/ngalante/.proxy-settings"));
 //
-//		ScopeProvider.instance.set("/d4science.research-infrastructures.eu/gCubeApps/RPrototypingLab");
-//		SecurityTokenProvider.instance.set("3a23bfa4-4dfe-44fc-988f-194b91071dd2-843339462");
-	
+
 		ScopeProvider.instance.set("/gcube/devNext");
-		SecurityTokenProvider.instance.set("708e7eb8-11a7-4e9a-816b-c9ed7e7e99fe-98187548");
-		
-		
-		
-//		AuthorizationEntry entry = authorizationService().get("708e7eb8-11a7-4e9a-816b-c9ed7e7e99fe-98187548");
+		SecurityTokenProvider.instance.set("");
+
+//		AuthorizationEntry entry = authorizationService().get("xxxx-xxx-xxxxx-xxxx");
 //		System.out.println(entry.getContext());
-		
 
 		RestPoolManager a = new RestPoolManager();
-		
+
 		a.stageAlgorithm("http://data-d.d4science.org/TSt3cUpDTG1teUJMemxpcXplVXYzV1lBelVHTTdsYjlHbWJQNStIS0N6Yz0");
-//		//a.publishAlgorithm("http://data.d4science.org/MnovRjZIdGV5WlB0WXE5NVNaZnRoRVg0SU8xZWpWQlFHbWJQNStIS0N6Yz0", "708e7eb8-11a7-4e9a-816b-c9ed7e7e99fe-98187548","/gcube/devNext/NextNext");
+//		//a.publishAlgorithm("http://data.d4science.org/MnovRjZIdGV5WlB0WXE5NVNaZnRoRVg0SU8xZWpWQlFHbWJQNStIS0N6Yz0", "xxxx-xxx-xxxx-xxxx","/gcube/devNext/NextNext");
 //		// PoolManager aa = new DataminerPoolManager();
 //
 
 	}
-	
-	
-	
-	//Production Testing
+
+	// Production Testing
 	/*
-	stageAlgorithm(Rproto caller token,pacchetto, category)
-	http://node2-d-d4s.d4science.org:8080/dataminer-pool-manager-1.0.0-SNAPSHOT/rest/algorithm/stage?gcube-token=3a23bfa4-4dfe-44fc-988f-194b91071dd2-843339462&algorithmPackageURL=http://data.d4science.org/dENQTTMxdjNZcGRpK0NHd2pvU0owMFFzN0VWemw3Zy9HbWJQNStIS0N6Yz0&category=ICHTHYOP_MODEL
-	
-	publishAlgorithm(Rproto caller token, pacchetto, category, target token, target prod vre)
-    node2-d-d4s.d4science.org:8080/dataminer-pool-manager-1.0.0-SNAPSHOT/rest/algorithm/add?gcube-token=708e7eb8-11a7-4e9a-816b-c9ed7e7e99fe-98187548&algorithmPackageURL=http://data.d4science.org/dENQTTMxdjNZcGRpK0NHd2pvU0owMFFzN0VWemw3Zy9HbWJQNStIS0N6Yz0&category=ICHTHYOP_MODEL&targetVREToken=3a23bfa4-4dfe-44fc-988f-194b91071dd2-843339462&targetVRE=/d4science.research-infrastructures.eu/gCubeApps/RPrototypingLab	
-	
-	getLogById(Rproto caller token, logid)
-	http://node2-d-d4s.d4science.org:8080/dataminer-pool-manager-1.0.0-SNAPSHOT/rest/log?gcube-token=3a23bfa4-4dfe-44fc-988f-194b91071dd2-843339462&logUrl=
-	*/
-	
-	
-	//dev Testing
+	 * stageAlgorithm(Rproto caller token,pacchetto, category)
+	 * http://node2-d-d4s.d4science.org:8080/dataminer-pool-manager-1.0.0-SNAPSHOT/
+	 * rest/algorithm/stage?gcube-token=xxx-xxx-xxx-xxx&algorithmPackageURL=http://
+	 * data.d4science.org/
+	 * dENQTTMxdjNZcGRpK0NHd2pvU0owMFFzN0VWemw3Zy9HbWJQNStIS0N6Yz0&category=
+	 * ICHTHYOP_MODEL
+	 * 
+	 * publishAlgorithm(Rproto caller token, pacchetto, category, target token,
+	 * target prod vre)
+	 * node2-d-d4s.d4science.org:8080/dataminer-pool-manager-1.0.0-SNAPSHOT/rest/
+	 * algorithm/add?gcube-token=xxxx-xxxx-xxx-xxx&algorithmPackageURL=http://data.
+	 * d4science.org/dENQTTMxdjNZcGRpK0NHd2pvU0owMFFzN0VWemw3Zy9HbWJQNStIS0N6Yz0&
+	 * category=ICHTHYOP_MODEL&targetVREToken=xxxx-xxxx-xxxx&targetVRE=/d4science.
+	 * research-infrastructures.eu/gCubeApps/RPrototypingLab
+	 * 
+	 * getLogById(Rproto caller token, logid)
+	 * http://node2-d-d4s.d4science.org:8080/dataminer-pool-manager-1.0.0-SNAPSHOT/
+	 * rest/log?gcube-token=xxxx-xxx-xxx-xxx&logUrl=
+	 */
+
+	// dev Testing
 	/*
-	stageAlgorithm(dev_caller_vre_token,pacchetto, category)
-	http://node2-d-d4s.d4science.org:8080/dataminer-pool-manager-1.0.0-SNAPSHOT/rest/algorithm/stage?gcube-token=708e7eb8-11a7-4e9a-816b-c9ed7e7e99fe-98187548&algorithmPackageURL=http://data.d4science.org/dENQTTMxdjNZcGRpK0NHd2pvU0owMFFzN0VWemw3Zy9HbWJQNStIS0N6Yz0&category=ICHTHYOP_MODEL		
-		
-	publishAlgorithm(dev_caller_vre_token, pacchetto, category, target token, target prod vre)
-	http://node2-d-d4s.d4science.org:8080/dataminer-pool-manager-1.0.0-SNAPSHOT/rest/log?gcube-token=708e7eb8-11a7-4e9a-816b-c9ed7e7e99fe-98187548&logUrl=450bb7f9-9e38-4bde-8f4d-f3296f95deba		
-	
-	getLogById(dev_caller_vre_token, logid)
-	http://node2-d-d4s.d4science.org:8080/dataminer-pool-manager-1.0.0-SNAPSHOT/rest/log?gcube-token=708e7eb8-11a7-4e9a-816b-c9ed7e7e99fe-98187548&logUrl=426c8e35-a624-4710-b612-c90929c32c27	*/
-	
+	 * stageAlgorithm(dev_caller_vre_token,pacchetto, category)
+	 * http://node2-d-d4s.d4science.org:8080/dataminer-pool-manager-1.0.0-SNAPSHOT/
+	 * rest/algorithm/stage?gcube-token=xxxx-xxxx-xxxx&algorithmPackageURL=http://
+	 * data.d4science.org/
+	 * dENQTTMxdjNZcGRpK0NHd2pvU0owMFFzN0VWemw3Zy9HbWJQNStIS0N6Yz0&category=
+	 * ICHTHYOP_MODEL
+	 * 
+	 * publishAlgorithm(dev_caller_vre_token, pacchetto, category, target token,
+	 * target prod vre)
+	 * http://node2-d-d4s.d4science.org:8080/dataminer-pool-manager-1.0.0-SNAPSHOT/
+	 * rest/log?gcube-token=xxxx-xxxx-xxx-xxxx&logUrl=450bb7f9-9e38-4bde-8f4d-
+	 * f3296f95deba
+	 * 
+	 * getLogById(dev_caller_vre_token, logid)
+	 * http://node2-d-d4s.d4science.org:8080/dataminer-pool-manager-1.0.0-SNAPSHOT/
+	 * rest/log?gcube-token=xxx-xxx-xxx-xxx&logUrl=426c8e35-a624-4710-b612-
+	 * c90929c32c27
+	 */
 
 	@Override
 	public void getLogId(Algorithm algo, String vre) {
@@ -176,8 +171,6 @@ public class RestPoolManager implements PoolManager
 		return null;
 	}
 
-
-
 	@Override
 	public URL getURLfromWorkerLog(String logUrl) throws MalformedURLException, UnknownHostException {
 		// TODO Auto-generated method stub
@@ -196,37 +189,31 @@ public class RestPoolManager implements PoolManager
 		return null;
 	}
 
-
 	@Override
 	public List<String> updateSVN(String file, List<String> ldep) throws SVNException {
 		// TODO Auto-generated method stub
 		return null;
 	}
 
-
 	@Override
-	public String addAlgorithmToHost(Algorithm algo, String host,  boolean test)
+	public String addAlgorithmToHost(Algorithm algo, String host, boolean test)
 			throws IOException, InterruptedException {
 		// TODO Auto-generated method stub
 		return null;
 	}
 
-
 	@Override
-	public String addAlgorithmToVRE(Algorithm algo, String vre, boolean test)
-			throws IOException, InterruptedException {
+	public String addAlgorithmToVRE(Algorithm algo, String vre, boolean test) throws IOException, InterruptedException {
 		// TODO Auto-generated method stub
 		return null;
 	}
 
-
 	@Override
 	public String stageAlgorithm(String algorithmPackageURL) throws IOException, InterruptedException {
 		// TODO Auto-generated method stub
 		return null;
 	}
 
-
 	@Override
 	public String publishAlgorithm(String algorithmPackageURL, String targetVREToken, String targetVRE)
 			throws IOException, InterruptedException {
@@ -234,12 +221,4 @@ public class RestPoolManager implements PoolManager
 		return null;
 	}
 
-
-
-
-
-	
-
-
-	
 }

src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/SVNRepositoryManager.java

@@ -14,11 +14,10 @@ public class SVNRepositoryManager {
 
 	private SVNRepository svnRepository;
 	private static  SVNRepositoryManager instance;
-	private Logger logger;
+	private Logger logger=LoggerFactory.getLogger(SVNRepositoryManager.class);
 	
 	private SVNRepositoryManager (Configuration configuration) throws SVNException
 	{
-		this.logger = LoggerFactory.getLogger(SVNRepositoryManager.class);
 		org.gcube.dataanalysis.dataminer.poolmanager.clients.configuration.SVNRepository repository = configuration.getSVNRepository();
 		this.svnRepository = SVNRepositoryFactory.create(SVNURL.parseURIEncoded(repository.getBaseUrl()));
 		ISVNAuthenticationManager authManager = null;

src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/SVNUpdater.java

@@ -45,12 +45,11 @@ public abstract class SVNUpdater {
 
 	private SVNRepository svnRepository;
 	private Configuration configuration;
-	private Logger logger;
+	private Logger logger=LoggerFactory.getLogger(SVNUpdater.class);
 
 	public SVNUpdater(Configuration configuration) throws SVNException {
 		this.configuration = configuration;
 		this.svnRepository = SVNRepositoryManager.getInstance(configuration).getSvnRepository();
-		this.logger = LoggerFactory.getLogger(SVNUpdater.class);
 	}
 
 //	public void updateRPRotoDeps(Algorithm algorithm) {
@@ -72,7 +71,7 @@ public abstract class SVNUpdater {
 	
 	private String getDependencyFile (Configuration configuration, String language)
 	{
-		this.logger.debug("Getting dependency file for language "+language);
+		logger.debug("Getting dependency file for language "+language);
 		
 		switch (language) 
 		{
@@ -123,7 +122,7 @@ public abstract class SVNUpdater {
 	
 	private void updateAlgorithmList(String svnMainAlgoRepo, File algorithmsFile) throws SVNException, SVNCommitException
 	{
-		this.logger.debug("Adding .jar file: " + algorithmsFile + " to repository " + svnMainAlgoRepo);
+		logger.debug("Adding .jar file: " + algorithmsFile + " to repository " + svnMainAlgoRepo);
 		
 		try
 		{
@@ -137,7 +136,7 @@ public abstract class SVNUpdater {
 		} 
 		catch (FileNotFoundException e)
 		{
-			this.logger.error("Temporary algorithm file not found: this exception should not happen",e);
+			logger.error("Temporary algorithm file not found: this exception should not happen",e);
 		}
 		finally
 		{
@@ -149,7 +148,7 @@ public abstract class SVNUpdater {
 	
 	public void putFile(FileInputStream fileInputSreeam, String destinationFolder, String fileName) throws SVNException, SVNCommitException 
 	{
-		this.logger.debug("Putting new file on the SVN repository");
+		logger.debug("Putting new file on the SVN repository");
 		final ISVNEditor commitEditor = svnRepository.getCommitEditor("Add algorithm to list", null);
 		commitEditor.openRoot(-1);
 		commitEditor.openDir(destinationFolder, -1);
@@ -166,17 +165,17 @@ public abstract class SVNUpdater {
 		
 		if (errorMessage != null)
 		{
-			this.logger.error("Operation failed: "+errorMessage.getFullMessage());
+			logger.error("Operation failed: "+errorMessage.getFullMessage());
 			throw new SVNCommitException(errorMessage,fileName);
 		}
 		
-		this.logger.debug("Operation completed");
+		logger.debug("Operation completed");
 	}
 	
 	
 	public void updateFile(FileInputStream fileInputStream, String destinationFolder, String fileName) throws SVNException, SVNCommitException  {
 		
-		this.logger.debug("Updating existing file on the SVN repository");		
+		logger.debug("Updating existing file on the SVN repository");		
 		final ISVNEditor commitEditor = svnRepository.getCommitEditor("Updating algorithm", null);
 		commitEditor.openRoot(-1);
 		commitEditor.openDir(destinationFolder, -1);
@@ -197,12 +196,12 @@ public abstract class SVNUpdater {
 		
 		if (errorMessage != null)
 		{
-			this.logger.error("Operation failed: "+errorMessage.getFullMessage());
+			logger.error("Operation failed: "+errorMessage.getFullMessage());
 
 			throw new SVNCommitException(errorMessage,fileName+" to be updated");
 		}
 		
-		this.logger.debug("Operation completed");
+		logger.debug("Operation completed");
 	}
 	
 	
@@ -231,7 +230,7 @@ public abstract class SVNUpdater {
 		boolean response = false;
 		
 		try {
-			this.logger.debug("Updating algorithm list: " + file);
+			logger.debug("Updating algorithm list: " + file);
 			final ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
 			svnRepository.getFile(file, SVNRepository.INVALID_REVISION, null, byteArrayOutputStream);
 			String lines[] = byteArrayOutputStream.toString().split("\\r?\\n");
@@ -277,7 +276,7 @@ public abstract class SVNUpdater {
 			
 			if (errorMessage != null)
 			{
-				this.logger.error("Operation failed: "+errorMessage.getFullMessage());
+				logger.error("Operation failed: "+errorMessage.getFullMessage());
 				response = false;
 			}
 			else response = true;
@@ -286,7 +285,7 @@ public abstract class SVNUpdater {
 		} 
 		catch (Exception ex) 
 		{
-			this.logger.error("Unable to commit algorithm list",ex);
+			logger.error("Unable to commit algorithm list",ex);
 			response = false;
 		}
 
@@ -314,7 +313,7 @@ public abstract class SVNUpdater {
 		sb.append("none | ");
 		sb.append(this.getTimeZone() + " | ");
 		
-		this.logger.info("Algo details: "+sb.toString());
+		logger.info("Algo details: "+sb.toString());
 		
 		return sb.toString();
 	}
@@ -337,7 +336,7 @@ public abstract class SVNUpdater {
 			}
 			
 			
-			this.logger.debug("Checking dependencies list: " + file);
+			logger.debug("Checking dependencies list: " + file);
 			
 
 			List<String> validDependencies = new LinkedList<String>();
@@ -351,7 +350,7 @@ public abstract class SVNUpdater {
 				validDependencies.add(l.trim());
 			}}
 
-			this.logger.debug("Valid dependencies are: "+validDependencies);
+			logger.debug("Valid dependencies are: "+validDependencies);
 			for(Dependency d: deps){
 				String depName = d.getName();
 				if(!validDependencies.contains(depName)){
@@ -410,6 +409,7 @@ public abstract class SVNUpdater {
 //			return check;
 		} catch (SVNException e)
 		{
+			logger.error(e.getLocalizedMessage(),e);
 			throw new GenericException(e);
 		}
 		
@@ -423,7 +423,7 @@ public abstract class SVNUpdater {
 
 		boolean check = false;
 		try {
-			this.logger.info("Checking dependencies list: " + file);
+			logger.info("Checking dependencies list: " + file);
 			final ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
 			svnRepository.getFile(file, SVNRepository.INVALID_REVISION, null, byteArrayOutputStream);
 			String lines[] = byteArrayOutputStream.toString().split("\\r?\\n");
@@ -454,7 +454,7 @@ public abstract class SVNUpdater {
 			// }
 		} catch (Exception a) 
 		{
-			this.logger.error(a.getMessage(),a);
+			logger.error(a.getMessage(),a);
 			
 		}
 
@@ -464,7 +464,7 @@ public abstract class SVNUpdater {
 
 	public void updateSVN(String file, Collection<Dependency> deps) {
 		try {
-			this.logger.info("Updating dependencies list: " + file);
+			logger.info("Updating dependencies list: " + file);
 
 			final ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
 			svnRepository.getFile(file, SVNRepository.INVALID_REVISION, null, byteArrayOutputStream);
@@ -543,7 +543,7 @@ public abstract class SVNUpdater {
 		Date fromDate = formatter.parse(cal.getTime().toString());
 	    TimeZone central = TimeZone.getTimeZone("UTC");
 	    formatter.setTimeZone(central);
-	    this.logger.info(formatter.format(fromDate));
+	    logger.info(formatter.format(fromDate));
 		return formatter.format(fromDate);
 	}
 	

src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/impl/CheckMethodProduction.java

@@ -46,7 +46,7 @@ public class CheckMethodProduction extends CheckMethod{
 	
 	
 	//a.copyFromDmToSVN(aa);
-//	if (a.checkMethod("dataminer-ghost-d.dev.d4science.org", "708e7eb8-11a7-4e9a-816b-c9ed7e7e99fe-98187548")){
+//	if (a.checkMethod("dataminer-ghost-d.dev.d4science.org", "xxx-xxx-xxx-xxx")){
 //		System.out.println("AAA");	}
 //		
 //	if (a.doesExist("/home/gcube/wps_algorithms/algorithms/WINDOWS_BLACK_BOX_EXAMPLE.jar")){
@@ -63,15 +63,14 @@ public class CheckMethodProduction extends CheckMethod{
 	
 	
 //System.out.println(a.checkMethod("dataminer-ghost-t.pre.d4science.org",
-//		"2eceaf27-0e22-4dbe-8075-e09eff199bf9-98187548"));
 
-//System.out.println(a.checkMethod("dataminer-proto-ghost.d4science.org",
-	//	"3a23bfa4-4dfe-44fc-988f-194b91071dd2-843339462"));
+//		"xxx-xxxx-xxx-xx"));
+
 
 	try
 	{
-		a.checkMethod("dataminer-ghost-d.dev.d4science.org",
-				"708e7eb8-11a7-4e9a-816b-c9ed7e7e99fe-98187548");
+		a.checkMethod("dataminer-ghost.cloud-dev.d4science.org",
+				"xxx-xxx-xxx-xxx");
 	} catch (Exception e)
 	{
 		e.printStackTrace();
@@ -85,7 +84,7 @@ public class CheckMethodProduction extends CheckMethod{
 ////
 //ServiceConfiguration bp = new ServiceConfiguration();
 ////
-//SecurityTokenProvider.instance.set("708e7eb8-11a7-4e9a-816b-c9ed7e7e99fe-98187548");
+//SecurityTokenProvider.instance.set("xxxx-xxx-xxx-xxx");
 ////
 //if (a.checkMethod(bp.getStagingHost(), SecurityTokenProvider.instance.get())&&a.algoExists(aa)); {
 //System.out.println("ciao");

src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/impl/CheckMethodStaging.java

@@ -38,7 +38,7 @@ public class CheckMethodStaging extends CheckMethod{
 	
 	
 	//a.copyFromDmToSVN(aa);
-//	if (a.checkMethod("dataminer-ghost-d.dev.d4science.org", "708e7eb8-11a7-4e9a-816b-c9ed7e7e99fe-98187548")){
+//	if (a.checkMethod("dataminer-ghost-d.dev.d4science.org", "xxxx-xxxx-xxx-xxx")){
 //		System.out.println("AAA");	}
 //		
 //	if (a.doesExist("/home/gcube/wps_algorithms/algorithms/WINDOWS_BLACK_BOX_EXAMPLE.jar")){
@@ -55,15 +55,15 @@ public class CheckMethodStaging extends CheckMethod{
 	
 	
 //System.out.println(a.checkMethod("dataminer-ghost-t.pre.d4science.org",
-//		"2eceaf27-0e22-4dbe-8075-e09eff199bf9-98187548"));
+//		"xxxx-xxx-xxx-xxx"));
 
 //System.out.println(a.checkMethod("dataminer-proto-ghost.d4science.org",
-	//	"3a23bfa4-4dfe-44fc-988f-194b91071dd2-843339462"));
+	//	"xxx-xxx-xxx-xxx"));
 
 	try
 	{
 		a.checkMethod("dataminer-ghost-d.dev.d4science.org",
-				"708e7eb8-11a7-4e9a-816b-c9ed7e7e99fe-98187548");
+				"xxxx-xxxx-xxxx-xxxx");
 	} catch (Exception e)
 	{
 		e.printStackTrace();
@@ -77,7 +77,8 @@ public class CheckMethodStaging extends CheckMethod{
 ////
 //ServiceConfiguration bp = new ServiceConfiguration();
 ////
-//SecurityTokenProvider.instance.set("708e7eb8-11a7-4e9a-816b-c9ed7e7e99fe-98187548");
+//SecurityTokenProvider.instance.set("xxx-xxx-xxx-xxx");
+
 ////
 //if (a.checkMethod(bp.getStagingHost(), SecurityTokenProvider.instance.get())&&a.algoExists(aa)); {
 //System.out.println("ciao");

src/main/resources/service.properties

@@ -6,7 +6,7 @@ svn.algo.main.repo = /trunk/data-analysis/DataMinerConfiguration/algorithms
 
 
 #STAGE
-STAGE_GHOST = dataminer-ghost-d.dev.d4science.org
+STAGE_GHOST = dataminer-ghost.cloud-dev.d4science.org
 svn.stage.algorithms-list = /trunk/data-analysis/DataMinerConfiguration/algorithms/dev/algorithms
 
 svn.stage.deps-linux-compiled = /trunk/data-analysis/RConfiguration/RPackagesManagement/r_deb_pkgs.txt

src/main/resources/static/gcube-algorithm-installer/meta/main.yaml

@@ -1,4 +1,4 @@
 dependencies:
 #  - { role: gcube-dataminer }
 #  - { role: os-unzip }
-#  - { role: os-java-1.7.0 }
+#  - { role: os-java-1.8.0 }

src/main/resources/static/os-java-1.8.0/tasks/main.yaml

@@ -1,7 +1,7 @@
 ---
 
-- name: adding OS Package java-1.7.0
+- name: adding OS Package java-1.8.0
   package: 
-    name: java-1.7.0-openjdk
+    name: java-1.8.0-openjdk
     state: "{{os_package_state}}"
   become: true

src/main/webapp/WEB-INF/.gitignore

@@ -3,3 +3,4 @@
 /changelog.xml
 /gcube-app.xml
 /profile.xml
+/classes/

src/test/java/org/gcube/dataanalysis/dataminerpoolmanager/SVNTests.java

@@ -24,7 +24,7 @@ public class SVNTests {
     //algo.setClazz(algo.getClazz() + "TEST");
     algo.setAlgorithmType("transducerers");
     algo.setCategory("NLP");
-    algo.setFullname("Ondřej Košarko");
+    algo.setFullname("Master Test");
     //System.out.println(algo.getCategory());
     //System.out.println(algo.getSkipJava());