ref 19081: DM Pool Manager uses a deprecated social networking api

https://support.d4science.org/issues/19081

Updated to new Social Networking API

.settings/org.eclipse.wst.common.component

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="dataminer-pool-manager-2.7.1-SNAPSHOT">
+    <wb-module deploy-name="dataminer-pool-manager-2.7.0-SNAPSHOT">
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/resources"/>
         <property name="context-root" value="dataminer-pool-manager"/>
         <property name="java-output-path" value="/dataminer-pool-manager/target/classes"/>
     </wb-module>

CHANGELOG.md

@@ -1,62 +0,0 @@
-# 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]
-
-
-## [v2.7.0] - 2020-04-16
-
-- Updated to new Social Networking API [#19081]
-- Added application token for send notifications [#19186]
-
-
-## [v2.6.0] - 2019-12-11
-
-- Updated to Git and Jenkins
-- Knime 4.1 added [#18190]
-
-
-## [v2.5.0] - 2019-01-11
-
-- SVN parameters get from IS
-- Python3.6 added [#12742]
-
-
-## [v2.4.0] - 2018-11-01
-
-- Notifies the 'conflicts' on SVN
-
-
-## [v2.3.0] - 2018-08-01
-
-- Log information also if the verification of SVN dependencies fails
-
-
-## [v2.2.0] - 2018-06-01
-
-- Improvements and bugs fixed/SVN-UTF8 compliant/Installation in Production ghost added
-- Dynamic per-VRE configuration throght the information system
-
-
-## [v2.1.0] - 2018-05-01
-
-- New configuration file added
-
-
-## [v2.0.0] - 2018-01-01
-
-- Second Release
-
-
-## [v1.0.0] - 2017-11-01
-
-- First Release
-
-
-This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

FUNDING.md

@@ -1,26 +0,0 @@
-# Acknowledgments
-
-The projects leading to this software have received funding from a series of European Union programmes including:
-
-- the Sixth Framework Programme for Research and Technological Development
-    - [DILIGENT](https://cordis.europa.eu/project/id/004260) (grant no. 004260).
-- the Seventh Framework Programme for research, technological development and demonstration 
-    - [D4Science](https://cordis.europa.eu/project/id/212488) (grant no. 212488);
-    - [D4Science-II](https://cordis.europa.eu/project/id/239019) (grant no.239019);
-    - [ENVRI](https://cordis.europa.eu/project/id/283465) (grant no. 283465);
-    - [iMarine](https://cordis.europa.eu/project/id/283644) (grant no. 283644);
-    - [EUBrazilOpenBio](https://cordis.europa.eu/project/id/288754) (grant no. 288754).
-- the H2020 research and innovation programme 
-    - [SoBigData](https://cordis.europa.eu/project/id/654024) (grant no. 654024);
-    - [PARTHENOS](https://cordis.europa.eu/project/id/654119) (grant no. 654119);
-    - [EGI-Engage](https://cordis.europa.eu/project/id/654142) (grant no. 654142);
-    - [ENVRI PLUS](https://cordis.europa.eu/project/id/654182) (grant no. 654182);
-    - [BlueBRIDGE](https://cordis.europa.eu/project/id/675680) (grant no. 675680);
-    - [PerformFISH](https://cordis.europa.eu/project/id/727610) (grant no. 727610);
-    - [AGINFRA PLUS](https://cordis.europa.eu/project/id/731001) (grant no. 731001);
-    - [DESIRA](https://cordis.europa.eu/project/id/818194) (grant no. 818194);
-    - [ARIADNEplus](https://cordis.europa.eu/project/id/823914) (grant no. 823914);
-    - [RISIS 2](https://cordis.europa.eu/project/id/824091) (grant no. 824091);
-    - [EOSC-Pillar](https://cordis.europa.eu/project/id/857650) (grant no. 857650);
-    - [Blue Cloud](https://cordis.europa.eu/project/id/862409) (grant no. 862409);
-    - [SoBigData-PlusPlus](https://cordis.europa.eu/project/id/871042) (grant no. 871042);

LICENSE.md

@@ -1,10 +1,9 @@
-# European Union Public Licence V. 1.1
+#European Union Public Licence V.1.1
+
+##*EUPL © the European Community 2007*
 
 
-EUPL © the European Community 2007
-
-
-This European Union Public Licence (the “EUPL”) applies to the Work or Software
+This **European Union Public Licence** (the **“EUPL”**) applies to the Work or Software
 (as defined below) which is provided under the terms of this Licence. Any use of
 the Work, other than as authorised under this Licence is prohibited (to the
 extent such use is covered by a right of the copyright holder of the Work).
@@ -13,13 +12,13 @@ The Original Work is provided under the terms of this Licence when the Licensor
 (as defined below) has placed the following notice immediately following the
 copyright notice for the Original Work:
 
-Licensed under the EUPL V.1.1
+**Licensed under the EUPL V.1.1**
 
 or has expressed by any other mean his willingness to license under the EUPL.
 
 
 
-## 1. Definitions
+##1. Definitions
 
 In this Licence, the following terms have the following meaning:
 
@@ -60,7 +59,7 @@ In this Licence, the following terms have the following meaning:
 
 
 
-## 2. Scope of the rights granted by the Licence
+##2. Scope of the rights granted by the Licence
 
 The Licensor hereby grants You a world-wide, royalty-free, non-exclusive,
 sub-licensable licence to do the following, for the duration of copyright vested
@@ -86,7 +85,7 @@ rights granted on the Work under this Licence.
 
 
 
-## 3. Communication of the Source Code
+##3. Communication of the Source Code
 
 The Licensor may provide the Work either in its Source Code form, or as
 Executable Code. If the Work is provided as Executable Code, the Licensor
@@ -98,7 +97,7 @@ continues to distribute and/or communicate the Work.
 
 
 
-## 4. Limitations on copyright
+##4. Limitations on copyright
 
 Nothing in this Licence is intended to deprive the Licensee of the benefits from
 any exception or limitation to the exclusive rights of the rights owners in the
@@ -107,7 +106,7 @@ applicable limitations thereto.
 
 
 
-## 5. Obligations of the Licensee
+##5. Obligations of the Licensee
 
 The grant of the rights mentioned above is subject to some restrictions and
 obligations imposed on the Licensee. Those obligations are the following:
@@ -148,7 +147,7 @@ reproducing the content of the copyright notice.
 
 
 
-## 6. Chain of Authorship
+##6. Chain of Authorship
 
 The original Licensor warrants that the copyright in the Original Work granted
 hereunder is owned by him/her or licensed to him/her and that he/she has the
@@ -164,7 +163,7 @@ terms of this Licence.
 
 
 
-## 7. Disclaimer of Warranty
+##7. Disclaimer of Warranty
 
 The Work is a work in progress, which is continuously improved by numerous
 contributors. It is not a finished work and may therefore contain defects or
@@ -181,7 +180,7 @@ for the grant of any rights to the Work.
 
 
 
-## 8. Disclaimer of Liability
+##8. Disclaimer of Liability
 
 Except in the cases of wilful misconduct or damages directly caused to natural
 persons, the Licensor will in no event be liable for any direct or indirect,
@@ -194,7 +193,7 @@ laws as far such laws apply to the Work.
 
 
 
-## 9. Additional agreements
+##9. Additional agreements
 
 While distributing the Original Work or Derivative Works, You may choose to
 conclude an additional agreement to offer, and charge a fee for, acceptance of
@@ -208,7 +207,7 @@ any such warranty or additional liability.
 
 
 
-## 10. Acceptance of the Licence
+##10. Acceptance of the Licence
 
 The provisions of this Licence can be accepted by clicking on an icon “I agree”
 placed under the bottom of a window displaying the text of this Licence or by
@@ -223,7 +222,7 @@ Distribution and/or Communication by You of the Work or copies thereof.
 
 
 
-## 11. Information to the public
+##11. Information to the public
 
 In case of any Distribution and/or Communication of the Work by means of
 electronic communication by You (for example, by offering to download the Work
@@ -234,7 +233,7 @@ accessible, concluded, stored and reproduced by the Licensee.
 
 
 
-## 12. Termination of the Licence
+##12. Termination of the Licence
 
 The Licence and the rights granted hereunder will terminate automatically upon
 any breach by the Licensee of the terms of the Licence.
@@ -245,7 +244,7 @@ remain in full compliance with the Licence.
 
 
 
-## 13. Miscellaneous
+##13. Miscellaneous
 
 Without prejudice of Article 9 above, the Licence represents the complete
 agreement between the Parties as to the Work licensed hereunder.
@@ -266,7 +265,7 @@ their choice.
 
 
 
-## 14. Jurisdiction
+##14. Jurisdiction
 
 Any litigation resulting from the interpretation of this License, arising
 between the European Commission, as a Licensor, and any Licensee, will be
@@ -280,7 +279,7 @@ conducts its primary business.
 
 
 
-## 15. Applicable Law
+##15. Applicable Law
 
 This Licence shall be governed by the law of the European Union country where
 the Licensor resides or has his registered office.
@@ -292,12 +291,13 @@ This licence shall be governed by the Belgian law if:
 - or registered office inside a European Union country.
 
 
-
-## Appendix
+---
 
 
+##Appendix
 
-“Compatible Licences” according to article 5 EUPL are:
+
+**“Compatible Licences”** according to article 5 EUPL are:
 
 
 - GNU General Public License (GNU GPL) v. 2

README.md

@@ -17,7 +17,7 @@ DataMiner Pool Manager is a service to support the integration of algorithms in
 
 ## Change log
 
-See [CHANGELOG.md](CHANGELOG.md).
+See [Releases](https://code-repo.d4science.org/gCubeSystem/dataminer-pool-manager/releases).
 
 ## Authors
 
@@ -37,4 +37,12 @@ open-source software toolkit used for building and operating Hybrid Data
 Infrastructures enabling the dynamic deployment of Virtual Research Environments
 by favouring the realisation of reuse oriented policies.
  
-The projects leading to this software have received funding from a series of European Union programmes see [FUNDING.md](FUNDING.md)
+The projects leading to this software have received funding from a series of European Union programmes including:
+
+- the Sixth Framework Programme for Research and Technological Development
+    - DILIGENT (grant no. 004260);
+- the Seventh Framework Programme for research, technological development and demonstration 
+    - D4Science (grant no. 212488), D4Science-II (grant no.239019), ENVRI (grant no. 283465), EUBrazilOpenBio (grant no. 288754), iMarine(grant no. 283644);
+- the H2020 research and innovation programme 
+    - BlueBRIDGE (grant no. 675680), EGIEngage (grant no. 654142), ENVRIplus (grant no. 654182), Parthenos (grant no. 654119), SoBigData (grant no. 654024),DESIRA (grant no. 818194), ARIADNEplus (grant no. 823914), RISIS2 (grant no. 824091), PerformFish (grant no. 727610), AGINFRAplus (grant no. 731001);
+    

changelog.xml

@@ -1,21 +1,14 @@
 <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>
 <Changeset component="org.gcube.dataanalysis.dataminer-pool-manager.2-7-0" date="2020-04-16">
-  <Change>Updated to new Social Networking API [#19081]</Change>
-  <Change>Added application token for send notifications [#19186]</Change>
+  <Change>Updated to new Social Networking API [ticket #19081]</Change>
 </Changeset>
 <Changeset component="org.gcube.dataanalysis.dataminer-pool-manager.2-6-0" date="2019-12-11">
   <Change>Updated to Git and Jenkins</Change>
-  <Change>Knime 4.1 added [#18190]</Change>
+  <Change>Knime 4.1 added [ticket #18190]</Change>
 </Changeset>
 <Changeset component="org.gcube.dataanalysis.dataminer-pool-manager.2-5-0" date="2019-01-11">
   <Change>SVN parameters get from IS</Change>
-  <Change>Python3.6 added [#12742]</Change>
+  <Change>Python3.6 added [ticket #12742]</Change>
 </Changeset>
 <Changeset component="org.gcube.dataanalysis.dataminer-pool-manager.2-4-0" date="2018-11-01">
   <Change>Notifies the 'conflicts' on SVN</Change>

pom.xml

@@ -5,14 +5,14 @@
 	<parent>
 		<artifactId>maven-parent</artifactId>
 		<groupId>org.gcube.tools</groupId>
-		<version>1.2.0</version>
+		<version>1.1.0</version>
 		<relativePath />
 	</parent>
 
 	<groupId>org.gcube.dataanalysis</groupId>
 	<artifactId>dataminer-pool-manager</artifactId>
 	<packaging>war</packaging>
-	<version>2.8.0-SNAPSHOT</version>
+	<version>2.7.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>
@@ -56,10 +56,6 @@
 			<scope>provided</scope>
 		</dependency>
 
-		<dependency>
-			<groupId>org.gcube.core</groupId>
-			<artifactId>common-encryption</artifactId>
-		</dependency>
 
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
@@ -151,7 +147,7 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>gcube-smartgears-bom</artifactId>
-				<version>2.5.0</version>
+				<version>1.1.0</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -191,28 +187,9 @@
 							</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>
-
+			
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>

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

@@ -20,9 +20,6 @@ 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;
@@ -145,16 +142,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(token1);
+		SecurityTokenProvider.instance.set("3a23bfa4-4dfe-44fc-988f-194b91071dd2-843339462");
 		
 		CheckPermission test = new CheckPermission();
-		CheckPermission.apply(token2, "/gcube/devNext/NextNext");
+		CheckPermission.apply("708e7eb8-11a7-4e9a-816b-c9ed7e7e99fe-98187548", "/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("xxx-xxx-xxx-xxx","/gcube/devNext/NextNext"));
+		//System.out.println(a.listDataMinersByCluster("708e7eb8-11a7-4e9a-816b-c9ed7e7e99fe-98187548","/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;
 						
-						logger.debug("Repository username "+repositoryUsername);
-						logger.debug("Repository password "+repositoryPassword);
+						this.logger.debug("Repository username "+repositoryUsername);
+						this.logger.debug("Repository password "+repositoryPassword);
 			
 					} catch (Exception e)
 					{
 						this.logger.debug("SVN Username and password not present");
 					}
 					
-					logger.debug("SVN Repository URL: "+repositoryURL);
-					logger.debug("SVN Repository path: "+repositoryPath);
+					this.logger.debug("SVN Repository URL: "+repositoryURL);
+					this.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,6 +30,23 @@ 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=LoggerFactory.getLogger(DMPMClientConfiguratorManager.class);
+	private final Logger logger;
 	private Properties defaultAdmins;
 
 	static DMPMClientConfiguratorManager instance;
@@ -22,27 +22,28 @@ public class DMPMClientConfiguratorManager {
 	private ScopedCacheMap cacheMap;
 
 	private DMPMClientConfiguratorManager() {
-		cacheMap = new ScopedCacheMap();
-		defaultAdmins = new Properties();
+		this.cacheMap = new ScopedCacheMap();
+		this.logger = LoggerFactory.getLogger(DMPMClientConfiguratorManager.class);
+		this.defaultAdmins = new Properties();
 
 		try {
-			defaultAdmins.load(this.getClass().getResourceAsStream("/default.admins"));
-			logger.debug("Default users successfully loaded");
+			this.defaultAdmins.load(this.getClass().getResourceAsStream("/default.admins"));
+			this.logger.debug("Default users successfully loaded");
 		} catch (Exception e) {
-			logger.error("Unable to get default users", e);
+			this.logger.error("Unable to get default users", e);
 		}
 	}
 
 	private ClientConfigurationCache getCurrentCache() {
 		String currentScope = ScopeProvider.instance.get();
-		logger.debug("Current scope = " + currentScope);
-		logger.debug("Getting current configuration cache");
-		ClientConfigurationCache cache = cacheMap.get(currentScope);
+		this.logger.debug("Current scope = " + currentScope);
+		this.logger.debug("Getting current configuration cache");
+		ClientConfigurationCache cache = this.cacheMap.get(currentScope);
 
 		if (cache == null) {
-			logger.debug("Cache not created yet, creating...");
+			this.logger.debug("Cache not created yet, creating...");
 			cache = new ClientConfigurationCache();
-			cacheMap.put(currentScope, cache);
+			this.cacheMap.put(currentScope, cache);
 
 		}
 
@@ -87,8 +88,8 @@ public class DMPMClientConfiguratorManager {
 
 	public static void main(String[] args) throws IOException, SVNException {
 		DMPMClientConfiguratorManager a = new DMPMClientConfiguratorManager();
-		ScopeProvider.instance.set("/gcube/devsec/devVRE");
-		// SecurityTokenProvider.instance.set("xxx-xxx-xxx-xxx");
+		ScopeProvider.instance.set("/gcube/devNext/NextNext");
+		// SecurityTokenProvider.instance.set("708e7eb8-11a7-4e9a-816b-c9ed7e7e99fe-98187548");
 
 		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,5 +1,6 @@
 package org.gcube.dataanalysis.dataminer.poolmanager.rest;
 
+
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -23,44 +24,52 @@ 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*/);
 	}
 
 	/*
@@ -78,6 +87,7 @@ public class RestPoolManager implements PoolManager {
 		return service.getLogById(logUrl);
 	}
 
+	
 	@GET
 	@Path("/monitor")
 	@Produces("text/plain")
@@ -87,77 +97,72 @@ 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("");
-
-//		AuthorizationEntry entry = authorizationService().get("xxxx-xxx-xxxxx-xxxx");
+		SecurityTokenProvider.instance.set("708e7eb8-11a7-4e9a-816b-c9ed7e7e99fe-98187548");
+		
+		
+		
+//		AuthorizationEntry entry = authorizationService().get("708e7eb8-11a7-4e9a-816b-c9ed7e7e99fe-98187548");
 //		System.out.println(entry.getContext());
+		
 
 		RestPoolManager a = new RestPoolManager();
-
+		
 		a.stageAlgorithm("http://data-d.d4science.org/TSt3cUpDTG1teUJMemxpcXplVXYzV1lBelVHTTdsYjlHbWJQNStIS0N6Yz0");
-//		//a.publishAlgorithm("http://data.d4science.org/MnovRjZIdGV5WlB0WXE5NVNaZnRoRVg0SU8xZWpWQlFHbWJQNStIS0N6Yz0", "xxxx-xxx-xxxx-xxxx","/gcube/devNext/NextNext");
+//		//a.publishAlgorithm("http://data.d4science.org/MnovRjZIdGV5WlB0WXE5NVNaZnRoRVg0SU8xZWpWQlFHbWJQNStIS0N6Yz0", "708e7eb8-11a7-4e9a-816b-c9ed7e7e99fe-98187548","/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=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(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(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
-	 */
+	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	*/
+	
 
 	@Override
 	public void getLogId(Algorithm algo, String vre) {
@@ -171,6 +176,8 @@ public class RestPoolManager implements PoolManager {
 		return null;
 	}
 
+
+
 	@Override
 	public URL getURLfromWorkerLog(String logUrl) throws MalformedURLException, UnknownHostException {
 		// TODO Auto-generated method stub
@@ -189,31 +196,37 @@ 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 {
@@ -221,4 +234,12 @@ public class RestPoolManager implements PoolManager {
 		return null;
 	}
 
+
+
+
+
+	
+
+
+	
 }

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

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

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

@@ -12,7 +12,6 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
 import org.apache.http.client.methods.HttpGet;
@@ -22,12 +21,7 @@ import org.apache.http.util.EntityUtils;
 import org.gcube.common.authorization.client.exceptions.ObjectNotFound;
 import org.gcube.common.authorization.library.AuthorizationEntry;
 import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
-import org.gcube.common.encryption.encrypter.StringEncrypter;
 import org.gcube.common.resources.gcore.GCoreEndpoint;
-import org.gcube.common.resources.gcore.ServiceEndpoint;
-import org.gcube.common.resources.gcore.ServiceEndpoint.AccessPoint;
-import org.gcube.common.resources.gcore.ServiceEndpoint.Property;
-import org.gcube.common.resources.gcore.utils.Group;
 import org.gcube.dataanalysis.dataminer.poolmanager.clients.configuration.DMPMClientConfiguratorManager;
 import org.gcube.dataanalysis.dataminer.poolmanager.util.exception.EMailException;
 import org.gcube.resources.discovery.client.api.DiscoveryClient;
@@ -40,17 +34,13 @@ import org.slf4j.LoggerFactory;
 
 public class SendMail {
 
-	private static final Logger logger = LoggerFactory.getLogger(SendMail.class);
-	
-	private static final String WRITE_MESSAGE_ADDRESS_PATH = "2/messages/write-message?gcube-token=";
-	private static final String USER_ROLES_ADDRESS_PATH = "2/users/get-usernames-by-role?role-name=DataMiner-Manager&gcube-token=";
-	private static final String SOCIAL_SERVICE_QUERY_CONDITION = "$resource/Profile/ServiceName/text() eq 'SocialNetworking'";
-	private static final String SOCIAL_SERVICE_URI = "jersey-servlet", JSON_MIME_TYPE = "application/json";
-	private static final String DMPOOLMANAGER_SERVICE_QUERY_CONDITION = "$resource/Profile/Name/text() eq 'DMPoolManager'";
+	private Logger logger = LoggerFactory.getLogger(SendMail.class);
+	private final String WRITE_MESSAGE_ADDRESS_PATH = "2/messages/write-message?gcube-token=",
+			USER_ROLES_ADDRESS_PATH = "2/users/get-usernames-by-role?role-name=DataMiner-Manager&gcube-token=",
+			SOCIAL_SERVICE_QUERY_CONDITION = "$resource/Profile/ServiceName/text() eq 'SocialNetworking'",
+			SOCIAL_SERVICE_URI = "jersey-servlet", JSON_MIME_TYPE = "application/json";
 
-	
 	private String socialServiceAddress;
-	private String applicationToken;
 
 	public SendMail() {
 
@@ -61,13 +51,12 @@ public class SendMail {
 		logger.debug("Notification Subject: " + subject);
 		logger.debug("Notification Body: " + body);
 
-		applicationToken = retrieveApplicationToken();
-
 		retrieveSocialService();
 
 		String postBody = createPostBody(subject, body);
-
-		sendPostRequest(postBody);
+		String requestForMessage = getRequestMessage(WRITE_MESSAGE_ADDRESS_PATH);
+		
+		sendPostRequest(requestForMessage, postBody);
 
 	}
 
@@ -94,7 +83,7 @@ public class SendMail {
 			}
 			data.put("recipients", recipients);
 
-			logger.debug("Post Body: " + data);
+			logger.info("Post Body: " + data);
 			return data.toString();
 
 		} catch (EMailException e) {
@@ -107,50 +96,6 @@ public class SendMail {
 
 	}
 
-	private String retrieveApplicationToken() throws EMailException {
-		try {
-			logger.info("Retrieve Application Token");
-			SimpleQuery query = queryFor(ServiceEndpoint.class);
-			query.addCondition(DMPOOLMANAGER_SERVICE_QUERY_CONDITION);
-			DiscoveryClient<ServiceEndpoint> client = clientFor(ServiceEndpoint.class);
-			List<ServiceEndpoint> resources = client.submit(query);
-			if (resources.isEmpty()) {
-				logger.error("No services resource found on IS!");
-			} else {
-				logger.debug("Retrieved: " + resources.get(0));
-			}
-
-			Group<AccessPoint> accessPoints = resources.get(0).profile().accessPoints();
-			if (!accessPoints.isEmpty()) {
-				Iterator<AccessPoint> iterator = accessPoints.iterator();
-				AccessPoint ap = iterator.next();
-				Group<Property> props = ap.properties();
-				if (!props.isEmpty()) {
-					Iterator<Property> iteratorProps = props.iterator();
-					Property p = iteratorProps.next();
-					String applicationToken = StringEncrypter.getEncrypter().decrypt(p.value());
-					logger.debug("Application token found: " + applicationToken);
-					logger.info("Application Token retrieved");
-					return applicationToken;
-
-				} else {
-					String error = "DMPoolManager application token not found in service resource on IS!";
-					logger.error(error);
-					throw new EMailException(error);
-				}
-			} else {
-				String error = "DMPoolManager invalid service resource on IS!";
-				logger.error(error);
-				throw new EMailException(error);
-			}
-
-		} catch (Throwable e) {
-			logger.error("DMPoolManager application token not found: " + e.getLocalizedMessage(), e);
-			throw new EMailException("DMPoolManager application token not found: " + e.getLocalizedMessage(), e);
-		}
-
-	}
-
 	private void retrieveSocialService() throws EMailException {
 		try {
 			SimpleQuery query = queryFor(GCoreEndpoint.class);
@@ -173,26 +118,28 @@ public class SendMail {
 
 	}
 
+	private String getRequestMessage(String addressPath) {
+		StringBuilder requestMessageBuilder = new StringBuilder(socialServiceAddress);
+
+		if (!socialServiceAddress.endsWith("/"))
+			requestMessageBuilder.append('/');
+
+		requestMessageBuilder.append(addressPath).append(SecurityTokenProvider.instance.get());
+		String requestForMessage = requestMessageBuilder.toString();
+		logger.debug("Request " + requestForMessage);
+		return requestForMessage;
+	}
+
 	private String username(String token) throws ObjectNotFound, Exception {
 		AuthorizationEntry entry = authorizationService().get(token);
 		logger.debug(entry.getClientInfo().getId());
 		return entry.getClientInfo().getId();
 	}
 
-	private void sendPostRequest(String postBody) throws EMailException {
-
+	private void sendPostRequest(String endpoint, String postBody) throws EMailException {
+		logger.info("Execute Post:" + endpoint);
+		logger.info("Post Body:" + postBody);
 		try {
-			logger.info("Execute Post Body:" + postBody);
-
-			StringBuilder requestMessageBuilder = new StringBuilder(socialServiceAddress);
-
-			if (!socialServiceAddress.endsWith("/"))
-				requestMessageBuilder.append('/');
-
-			requestMessageBuilder.append(WRITE_MESSAGE_ADDRESS_PATH);
-			logger.info("Execute Post Request: " + requestMessageBuilder.toString());
-			requestMessageBuilder.append(applicationToken);
-			String endpoint = requestMessageBuilder.toString();
 
 			// Send the request
 			URL url = new URL(endpoint);
@@ -238,7 +185,7 @@ public class SendMail {
 	private void checkResponse(String response) throws EMailException {
 		if (response == null) {
 			logger.error("Invalid notification response: " + response);
-			throw new EMailException();
+			throw new EMailException();// TODO
 		} else {
 			try {
 				JSONObject res = new JSONObject(response);
@@ -246,7 +193,7 @@ public class SendMail {
 				if (!success) {
 					String message = res.getString("message");
 					logger.error("Error in send email notification: " + message);
-					throw new EMailException("Error in send email notification: " + message);
+					throw new EMailException("Error in send email notification: "+message);
 				}
 
 			} catch (JSONException e) {
@@ -291,17 +238,9 @@ public class SendMail {
 		// Try to retrieve a url like this:
 		// https://api.d4science.org/social-networking-library-ws/rest/2/users/get-usernames-by-role?role-name=DataMiner-Manager&gcube-token=xxx-xxxx-xxxx-xxx
 
-		StringBuilder requestMessageBuilder = new StringBuilder(socialServiceAddress);
+		String requestAdminsUrl = getRequestMessage(USER_ROLES_ADDRESS_PATH);
 
-		if (!socialServiceAddress.endsWith("/"))
-			requestMessageBuilder.append('/');
-
-		requestMessageBuilder.append(USER_ROLES_ADDRESS_PATH);
-		logger.info("Request Admins Url: " + requestMessageBuilder.toString());
-		// SecurityTokenProvider.instance.get()
-		requestMessageBuilder.append(applicationToken);
-
-		String requestAdminsUrl = requestMessageBuilder.toString();
+		logger.info("Request Admins Url: " + requestAdminsUrl);
 
 		CloseableHttpClient client = HttpClientBuilder.create().build();
 		HttpGet getReq = new HttpGet(requestAdminsUrl);

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", "xxx-xxx-xxx-xxx")){
+//	if (a.checkMethod("dataminer-ghost-d.dev.d4science.org", "708e7eb8-11a7-4e9a-816b-c9ed7e7e99fe-98187548")){
 //		System.out.println("AAA");	}
 //		
 //	if (a.doesExist("/home/gcube/wps_algorithms/algorithms/WINDOWS_BLACK_BOX_EXAMPLE.jar")){
@@ -63,14 +63,15 @@ public class CheckMethodProduction extends CheckMethod{
 	
 	
 //System.out.println(a.checkMethod("dataminer-ghost-t.pre.d4science.org",
+//		"2eceaf27-0e22-4dbe-8075-e09eff199bf9-98187548"));
 
-//		"xxx-xxxx-xxx-xx"));
-
+//System.out.println(a.checkMethod("dataminer-proto-ghost.d4science.org",
+	//	"3a23bfa4-4dfe-44fc-988f-194b91071dd2-843339462"));
 
 	try
 	{
-		a.checkMethod("dataminer-ghost.cloud-dev.d4science.org",
-				"xxx-xxx-xxx-xxx");
+		a.checkMethod("dataminer-ghost-d.dev.d4science.org",
+				"708e7eb8-11a7-4e9a-816b-c9ed7e7e99fe-98187548");
 	} catch (Exception e)
 	{
 		e.printStackTrace();
@@ -84,7 +85,7 @@ public class CheckMethodProduction extends CheckMethod{
 ////
 //ServiceConfiguration bp = new ServiceConfiguration();
 ////
-//SecurityTokenProvider.instance.set("xxxx-xxx-xxx-xxx");
+//SecurityTokenProvider.instance.set("708e7eb8-11a7-4e9a-816b-c9ed7e7e99fe-98187548");
 ////
 //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", "xxxx-xxxx-xxx-xxx")){
+//	if (a.checkMethod("dataminer-ghost-d.dev.d4science.org", "708e7eb8-11a7-4e9a-816b-c9ed7e7e99fe-98187548")){
 //		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",
-//		"xxxx-xxx-xxx-xxx"));
+//		"2eceaf27-0e22-4dbe-8075-e09eff199bf9-98187548"));
 
 //System.out.println(a.checkMethod("dataminer-proto-ghost.d4science.org",
-	//	"xxx-xxx-xxx-xxx"));
+	//	"3a23bfa4-4dfe-44fc-988f-194b91071dd2-843339462"));
 
 	try
 	{
 		a.checkMethod("dataminer-ghost-d.dev.d4science.org",
-				"xxxx-xxxx-xxxx-xxxx");
+				"708e7eb8-11a7-4e9a-816b-c9ed7e7e99fe-98187548");
 	} catch (Exception e)
 	{
 		e.printStackTrace();
@@ -77,8 +77,7 @@ public class CheckMethodStaging extends CheckMethod{
 ////
 //ServiceConfiguration bp = new ServiceConfiguration();
 ////
-//SecurityTokenProvider.instance.set("xxx-xxx-xxx-xxx");
-
+//SecurityTokenProvider.instance.set("708e7eb8-11a7-4e9a-816b-c9ed7e7e99fe-98187548");
 ////
 //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.cloud-dev.d4science.org
+STAGE_GHOST = dataminer-ghost-d.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.8.0 }
+#  - { role: os-java-1.7.0 }

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

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

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

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

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

@@ -1,69 +0,0 @@
-package org.gcube.dataanalysis.dataminerpoolmanager;
-
-import static org.gcube.resources.discovery.icclient.ICFactory.clientFor;
-import static org.gcube.resources.discovery.icclient.ICFactory.queryFor;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
-import org.gcube.common.encryption.encrypter.StringEncrypter;
-import org.gcube.common.resources.gcore.ServiceEndpoint;
-import org.gcube.common.resources.gcore.ServiceEndpoint.AccessPoint;
-import org.gcube.common.resources.gcore.ServiceEndpoint.Property;
-import org.gcube.common.resources.gcore.utils.Group;
-import org.gcube.common.scope.api.ScopeProvider;
-import org.gcube.resources.discovery.client.api.DiscoveryClient;
-import org.gcube.resources.discovery.client.queries.api.SimpleQuery;
-
-public class ApplicationTokenTest {
-
-	private static final String DMPOOLMANAGER_SERVICE_QUERY_CONDITION = "$resource/Profile/Name/text() eq 'DMPoolManager'";
-
-	public static void main(String[] args) {
-		ScopeProvider.instance.set("/gcube/devsec/devVRE");
-		SecurityTokenProvider.instance.set("xxxx-xxxx-xxx");
-
-		decryptToken();
-	}
-
-	private static void decryptToken() {
-		try {
-
-			SimpleQuery query = queryFor(ServiceEndpoint.class);
-			query.addCondition(DMPOOLMANAGER_SERVICE_QUERY_CONDITION);
-			DiscoveryClient<ServiceEndpoint> client = clientFor(ServiceEndpoint.class);
-			List<ServiceEndpoint> resources = client.submit(query);
-			if (resources.isEmpty()) {
-				System.out.println("No services resource found on IS!");
-				
-			} else {
-				System.out.println("Retrieved: " + resources.get(0));
-			}
-			
-			
-			Group<AccessPoint> accessPoints = resources.get(0).profile().accessPoints();
-			if (!accessPoints.isEmpty()) {
-				Iterator<AccessPoint> iterator = accessPoints.iterator();
-				AccessPoint ap = iterator.next();
-				Group<Property> props = ap.properties();
-				if (!props.isEmpty()) {
-					Iterator<Property> iteratorProps = props.iterator();
-					Property p = iteratorProps.next();
-					String applicationToken = StringEncrypter.getEncrypter().decrypt(p.value());
-					System.out.println("Application token found: " + applicationToken);
-
-				} else {
-					System.out.println("No application token found in service resource on IS!");
-				}
-			} else {
-				System.out.println("Invalid service resource on IS!");
-
-			}
-
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-}

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("Master Test");
+    algo.setFullname("Ondřej Košarko");
     //System.out.println(algo.getCategory());
     //System.out.println(algo.getSkipJava());
     

src/test/resources/.gitignore

@@ -1 +0,0 @@
-/devsec.gcubekey