From 812594ce7036934f4ade1f8dbc42b3ea3f85ae95 Mon Sep 17 00:00:00 2001
From: Alfredo Oliviero <alfredo.oliviero@isti.cnr.it>
Date: Tue, 28 May 2024 18:25:53 +0200
Subject: [PATCH] added missing portlet, all working for binded vre

---
 .../CloudComputingMethodMonitorPortlet.java   | 10 ++++++
 src/main/webapp/WEB-INF/liferay-display.xml   |  1 +
 src/main/webapp/WEB-INF/liferay-portlet.xml   |  8 +++++
 src/main/webapp/WEB-INF/portlet.xml           | 33 +++++++++++++++++++
 .../webapp/html/methods/list/methodslist.jsp  | 13 +++++---
 .../html/methods/monitor/methodmonitor.jsp    |  9 +++++
 6 files changed, 69 insertions(+), 5 deletions(-)
 create mode 100644 src/main/java/org/gcube/portlets/user/cloudcomputing/methods/monitor/CloudComputingMethodMonitorPortlet.java
 create mode 100644 src/main/webapp/html/methods/monitor/methodmonitor.jsp

diff --git a/src/main/java/org/gcube/portlets/user/cloudcomputing/methods/monitor/CloudComputingMethodMonitorPortlet.java b/src/main/java/org/gcube/portlets/user/cloudcomputing/methods/monitor/CloudComputingMethodMonitorPortlet.java
new file mode 100644
index 0000000..d4c6963
--- /dev/null
+++ b/src/main/java/org/gcube/portlets/user/cloudcomputing/methods/monitor/CloudComputingMethodMonitorPortlet.java
@@ -0,0 +1,10 @@
+package org.gcube.portlets.user.cloudcomputing.methods.monitor;
+
+import com.liferay.portal.kernel.log.LogFactoryUtil;
+import com.liferay.util.bridges.mvc.MVCPortlet;
+
+public class CloudComputingMethodMonitorPortlet extends MVCPortlet {
+    private static com.liferay.portal.kernel.log.Log _log = LogFactoryUtil.getLog(CloudComputingMethodMonitorPortlet.class);
+
+
+}
diff --git a/src/main/webapp/WEB-INF/liferay-display.xml b/src/main/webapp/WEB-INF/liferay-display.xml
index f3438fb..2f9e22d 100644
--- a/src/main/webapp/WEB-INF/liferay-display.xml
+++ b/src/main/webapp/WEB-INF/liferay-display.xml
@@ -7,5 +7,6 @@
 		<portlet id="cloudcomputing-methods-list-portlet" />
 		<portlet id="cloudcomputing-method-edit-portlet" />
 		<portlet id="cloudcomputing-method-exec-portlet" />
+		<portlet id="cloudcomputing-method-monitor-portlet" />
 	</category>
 </display>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/liferay-portlet.xml b/src/main/webapp/WEB-INF/liferay-portlet.xml
index 24d1be1..58dba5e 100644
--- a/src/main/webapp/WEB-INF/liferay-portlet.xml
+++ b/src/main/webapp/WEB-INF/liferay-portlet.xml
@@ -34,6 +34,14 @@
 		<footer-portlet-javascript>/js/main.js</footer-portlet-javascript>
 	</portlet>
 
+	<portlet>
+		<portlet-name>cloudcomputing-method-monitor-portlet</portlet-name>
+		<icon>/icon.png</icon>
+		<header-portlet-css>/css/main.css</header-portlet-css>
+		<footer-portlet-javascript>/js/main.js</footer-portlet-javascript>
+	</portlet>
+
+
 	<role-mapper>
 		<role-name>administrator</role-name>
 		<role-link>Administrator</role-link>
diff --git a/src/main/webapp/WEB-INF/portlet.xml b/src/main/webapp/WEB-INF/portlet.xml
index ecffe4f..c317957 100644
--- a/src/main/webapp/WEB-INF/portlet.xml
+++ b/src/main/webapp/WEB-INF/portlet.xml
@@ -136,4 +136,37 @@
 		</security-role-ref>
 	</portlet>
 
+	<portlet>
+		<portlet-name>cloudcomputing-method-monitor-portlet</portlet-name>
+		<display-name>cloudcomputing-method-monitor-portlet</display-name>
+		<portlet-class>
+			org.gcube.portlets.user.cloudcomputing.methods.monitor.CloudComputingMethodMonitorPortlet
+		</portlet-class>
+		<init-param>
+			<name>view-template</name>
+			<value>/html/methods/monitor/methodmonitor.jsp</value>
+		</init-param>
+		<expiration-cache>0</expiration-cache>
+		<supports>
+			<mime-type>text/html</mime-type>
+		</supports>
+		<portlet-info>
+			<title>cloudcomputing-method-monitor-portlet</title>
+			<short-title>cloudcomputing-method-monitor-portlet</short-title>
+			<keywords>cloudcomputing-method-monitor-portlet</keywords>
+		</portlet-info>
+		<security-role-ref>
+			<role-name>administrator</role-name>
+		</security-role-ref>
+		<security-role-ref>
+			<role-name>guest</role-name>
+		</security-role-ref>
+		<security-role-ref>
+			<role-name>power-user</role-name>
+		</security-role-ref>
+		<security-role-ref>
+			<role-name>user</role-name>
+		</security-role-ref>
+	</portlet>
+
 </portlet-app>
\ No newline at end of file
diff --git a/src/main/webapp/html/methods/list/methodslist.jsp b/src/main/webapp/html/methods/list/methodslist.jsp
index e5af874..c6aee14 100644
--- a/src/main/webapp/html/methods/list/methodslist.jsp
+++ b/src/main/webapp/html/methods/list/methodslist.jsp
@@ -1,8 +1,11 @@
 <%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
-<%@include file="../../init.jsp" %>
+    <%@include file="../../init.jsp" %>
 
-<div><d4s-ccp-methodlist allow-execute="true" archive="true" serviceurl="https://ccp.cloud-dev.d4science.org">
-        <script src="https://cdn.cloud.d4science.org/ccp/js/methodlistcontroller.js"></script>
-    </d4s-ccp-methodlist></div>
+        <div>
+            <d4s-ccp-methodlist allow-execute="true" archive="true" 
+            serviceurl="https://ccp.cloud-dev.d4science.org">
+                <script src="https://cdn.cloud.d4science.org/ccp/js/methodlistcontroller.js"></script>
+            </d4s-ccp-methodlist>
+        </div>
 
-Method List Portlet
\ No newline at end of file
+        Method List Portlet
\ No newline at end of file
diff --git a/src/main/webapp/html/methods/monitor/methodmonitor.jsp b/src/main/webapp/html/methods/monitor/methodmonitor.jsp
new file mode 100644
index 0000000..a717a41
--- /dev/null
+++ b/src/main/webapp/html/methods/monitor/methodmonitor.jsp
@@ -0,0 +1,9 @@
+<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
+    <%@include file="../../init.jsp" %>
+
+        <div><d4s-ccp-executionhistory archive="true" serviceurl="https://ccp.cloud-dev.d4science.org">
+                <script src="https://cdn.cloud.d4science.org/ccp/js/executionhistorycontroller.js"></script>
+                <script src="https://cdn.cloud.d4science.org/ccp/js/logterminalcontroller.js"></script>
+            </d4s-ccp-executionhistory></div>
+
+        Method List Portlet
\ No newline at end of file