refs 2521: Explore the possibility to port the StatMan interface onto Dataminer

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

Fixed bootstrap.js


git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/data-miner-manager@128658 82a268e6-3cf1-43bd-a215-b396298e98cf

src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationParametersPanel.java

@@ -107,7 +107,7 @@ public class ComputationParametersPanel extends SimpleContainer {
 		descr = (descr == null || descr.contentEquals("")) ? "no-description"
 				: operator.getDescription();// display:block;clear:both;'
 		HtmlLayoutContainer description = new HtmlLayoutContainer(
-				"<span style='padding-left:10px;padding-right:10px;'>" + descr
+				"<span style='padding-left:10px;padding-right:10px;display:inline-block;'>" + descr
 						+ "</span>");
 		description.addStyleName("workflow-description");
 		v.add(description, new VerticalLayoutData(-1, -1, new Margins(0)));

src/main/java/org/gcube/portlets/user/dataminermanager/server/smservice/wps/computationsvalue/ComputationValueBuilder.java

@@ -1,6 +1,5 @@
 package org.gcube.portlets.user.dataminermanager.server.smservice.wps.computationsvalue;
 
-import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.LinkedHashMap;
@@ -34,8 +33,13 @@ public class ComputationValueBuilder {
 				String value = valueParameters.get(key);
 				if (value != null && !value.isEmpty()
 						&& value.startsWith("http")) {
-					ComputationValue computationValue = retrieveFileName(value);
-					computationsValueParameters.put(key, computationValue);
+					if (value.contains("|")) {
+						ComputationValue valueString = new ComputationValue(value);
+						computationsValueParameters.put(key, valueString);
+					} else {
+						ComputationValue computationValue = retrieveFileName(value);
+						computationsValueParameters.put(key, computationValue);
+					}
 				} else {
 					ComputationValue valueString = new ComputationValue(value);
 					computationsValueParameters.put(key, valueString);
@@ -63,11 +67,12 @@ public class ComputationValueBuilder {
 				conn.setDoOutput(true);
 				conn.connect();
 				if (conn.getResponseCode() != 200) {
-					logger.error("Response Code: "+conn.getResponseCode());
+					logger.error("Retrieve File Name Response Code: "
+							+ conn.getResponseCode());
 					try {
 						Thread.sleep(5000);
 					} catch (InterruptedException e) {
-						
+
 					}
 				}
 				attempts++;
@@ -79,8 +84,8 @@ public class ComputationValueBuilder {
 				return new ComputationValueFile(value, null, null);
 			}
 
-		} catch (IOException e) {
-			logger.error(e.getLocalizedMessage());
+		} catch (Throwable e) {
+			logger.error("Retrieve File Name: " + e.getLocalizedMessage());
 			e.printStackTrace();
 			return new ComputationValueFile(value, null, null);
 		}

src/main/resources/org/gcube/portlets/user/dataminermanager/dataminermanager.gwt.xml

@@ -41,19 +41,19 @@
 	<entry-point
 		class='org.gcube.portlets.user.dataminermanager.client.DataMinerManager' />
 	
-
+	<!-- 
 	<set-property name="log_ConsoleLogger" value="ENABLED" /> <set-property 
 		name="log_DivLogger" value="ENABLED" /> <set-property name="log_GWTLogger" 
 		value="ENABLED" /> <set-property name="log_SystemLogger" value="ENABLED" 
-		/>  
+		/>  --> 
 	<!-- Not in GWT 2.6 <set-property name="log_FirebugLogger" value="ENABLED" 
 		/> -->
 
-	<!-- 
+
 	<set-property name="log_ConsoleLogger" value="DISABLED" />
 	<set-property name="log_DivLogger" value="DISABLED" />
 	<set-property name="log_GWTLogger" value="DISABLED" />
-	<set-property name="log_SystemLogger" value="DISABLED" />  -->
+	<set-property name="log_SystemLogger" value="DISABLED" /> 
 	<!-- Not in GWT 2.6 <set-property name="log_FirebugLogger" value="DISABLED" 
 		/> -->
 

src/main/webapp/DataMinerManager.html

@@ -9,9 +9,11 @@
 <link type="text/css" rel="stylesheet" href="gxt/css/gxt-all.css"> 
 
 <title>Data Miner Manager</title>
-<!-- <script type="text/javascript" language="javascript"
-	src="dataminermanager/js/jquery-1.10.1.min.js"></script>  -->
-<script type="text/javascript" language="javascript"
+<script type="text/javascript"
+	src="dataminermanager/js/jquery-1.10.1.min.js"></script>
+<script type="text/javascript"
+	src="dataminermanager/js/bootstrap.min.js"></script>
+<script type="text/javascript"
 	src="dataminermanager/dataminermanager.nocache.js"></script>
 </head>
 

src/main/webapp/WEB-INF/jsp/DataMinerManager_view.jsp

@@ -13,7 +13,11 @@
 <link rel="stylesheet"
 	href="<%=request.getContextPath()%>/gxt/css/gxt-all.css"
 	type="text/css">
-<%-- <script src='<%=request.getContextPath()%>/dataminermanager/js/jquery-1.10.1.min.js'></script>  --%>
+<script
+	src='<%=request.getContextPath()%>/dataminermanager/js/jquery-1.10.1.min.js'></script>
+<script
+	src='<%=request.getContextPath()%>/dataminermanager/js/bootstrap.min.js'></script>
+
 <script
 	src='<%=request.getContextPath()%>/dataminermanager/dataminermanager.nocache.js'></script>