From 55bf9c9e76a88f41e375e734ce9d2650ecd79ef4 Mon Sep 17 00:00:00 2001
From: Lucio Lelii <lucio.lelii@isti.cnr.it>
Date: Tue, 18 Jul 2017 10:42:39 +0000
Subject: [PATCH] git-svn-id:
 https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/wps@151128
 82a268e6-3cf1-43bd-a215-b396298e98cf

---
 .../gcube/data/analysis/wps/RequestHandler.java  | 16 ++++++++--------
 src/main/webapp/WEB-INF/README                   |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/gcube/data/analysis/wps/RequestHandler.java b/src/main/java/org/gcube/data/analysis/wps/RequestHandler.java
index 9d78573..240292a 100644
--- a/src/main/java/org/gcube/data/analysis/wps/RequestHandler.java
+++ b/src/main/java/org/gcube/data/analysis/wps/RequestHandler.java
@@ -43,7 +43,7 @@ import javax.xml.parsers.ParserConfigurationException;
 import org.apache.commons.collections.map.CaseInsensitiveMap;
 import org.apache.commons.io.IOUtils;
 import org.gcube.common.authorization.library.AuthorizedTasks;
-import org.gcube.common.authorization.library.provider.CalledMethodProvider;
+import org.gcube.smartgears.utils.InnerMethodName;
 import org.n52.wps.server.ExceptionReport;
 import org.n52.wps.server.WebProcessingService;
 import org.n52.wps.server.handler.RequestExecutor;
@@ -131,20 +131,20 @@ public class RequestHandler {
 		
 		if (requestType.equalsIgnoreCase("GetCapabilities")) {
 			req = new CapabilitiesRequest(ciMap);
-			CalledMethodProvider.instance.set("GetCapabilities");
+			InnerMethodName.instance.set("GetCapabilities");
 		} 
 		else if (requestType.equalsIgnoreCase("DescribeProcess")) {
 			req = new DescribeProcessRequest(ciMap);
-			CalledMethodProvider.instance.set("DescribeProcess");
+			InnerMethodName.instance.set("DescribeProcess");
 		}
 		else if (requestType.equalsIgnoreCase("Execute")) {
 			req = new ExecuteRequest(ciMap);
 			setResponseMimeType((ExecuteRequest)req);
-			CalledMethodProvider.instance.set("Execute");
+			InnerMethodName.instance.set("Execute");
 		} 
 		else if (requestType.equalsIgnoreCase("RetrieveResult")) {
 			req = new RetrieveResultRequest(ciMap);
-			CalledMethodProvider.instance.set("RetrieveResult");
+			InnerMethodName.instance.set("RetrieveResult");
 		} 
 		else {
 			throw new ExceptionReport(
@@ -261,17 +261,17 @@ public class RequestHandler {
 			LOGGER.debug("Detected Request to Execute!");
 			req = new ExecuteRequest(doc);
 			setResponseMimeType((ExecuteRequest)req);
-			CalledMethodProvider.instance.set("Execute");
+			InnerMethodName.instance.set("Execute");
 			LOGGER.debug("Request to Execute Configured!");
 		}else if (nodeURI.equals(WebProcessingService.WPS_NAMESPACE) && localName.equals("GetCapabilities")){
 			LOGGER.debug("Detected GetCapabilities!");
 			req = new CapabilitiesRequest(doc);
-			CalledMethodProvider.instance.set("GetCapabilities");
+			InnerMethodName.instance.set("GetCapabilities");
 			this.responseMimeType = "text/xml";
 		} else if (nodeURI.equals(WebProcessingService.WPS_NAMESPACE) && localName.equals("DescribeProcess")) {
 			LOGGER.debug("Detected DescribeProcess!");
 			req = new DescribeProcessRequest(doc);
-			CalledMethodProvider.instance.set("DescribeProcess");
+			InnerMethodName.instance.set("DescribeProcess");
 			this.responseMimeType = "text/xml";
 			
 		}  else if(!localName.equals("Execute")){
diff --git a/src/main/webapp/WEB-INF/README b/src/main/webapp/WEB-INF/README
index 73c6232..61fbb2e 100644
--- a/src/main/webapp/WEB-INF/README
+++ b/src/main/webapp/WEB-INF/README
@@ -25,7 +25,7 @@ no. 654119), SoBigData (grant no. 654024);
 Version
 --------------------------------------------------
  
-1.0.0-SNAPSHOT (2017-07-17)
+1.0.0-SNAPSHOT (${maven.build.timestamp})
  
 Please see the file named "changelog.xml" in this directory for the release notes.