diff --git a/README.md b/README.md index f97aaa7..051df99 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# gCube System - Cloud Computing Platform Weblets +# gCube System - Cloud Computing Platform Portlets This component is a Liferay 6.2.6 CE Porlet which iinteracts with the Cloud Computing Platform analytics service ## Structure of the project @@ -16,7 +16,7 @@ This component is a Liferay 6.2.6 CE Porlet which iinteracts with the Cloud Comp ## Change log -See [Releases](https://code-repo.d4science.org/gCubeSystem/cloudcomputing-platform-weblets/releases). +See [Releases](https://code-repo.d4science.org/gCubeSystem/cloudcomputing-platform-portlet/releases). ## Authors diff --git a/deploy.sh b/deploy.sh index 7c71e8a..e414142 100755 --- a/deploy.sh +++ b/deploy.sh @@ -29,7 +29,8 @@ MVN_FINALNAME=$(mvn -q \ exec:exec) echo "MVN_FINALNAME=${MVN_FINALNAME}" -mvn package +mvn clean package -U + scp target/$MVN_FINALNAME.war life@$DEST_HOST:/home/life/Portal-Bundle/deploy/$MVN_NAME.war ssh $DEST_HOST "sudo journalctl -fl -u liferay" diff --git a/pom.xml b/pom.xml index a1943c0..872f2d5 100644 --- a/pom.xml +++ b/pom.xml @@ -11,13 +11,13 @@ org.gcube.portlets.user - cloudcomputing-platform-weblets + cloudcomputing-platform-portlet 1.0.0-SNAPSHOT war - cloudcomputing-platform-weblets Portlets + cloudcomputing-platform-portlet Portlets - gCube Cloud Computing Platform Weblets. + gCube Cloud Computing Platform Portlets. scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git @@ -34,8 +34,6 @@ 6.2.10.12 - - @@ -47,6 +45,7 @@ + diff --git a/src/main/java/org/gcube/portlets/user/cloudcomputing/boot/CloudComputingBootPlatformWeblet.java b/src/main/java/org/gcube/portlets/user/cloudcomputing/boot/CloudComputingBootPlatformPortlet.java similarity index 97% rename from src/main/java/org/gcube/portlets/user/cloudcomputing/boot/CloudComputingBootPlatformWeblet.java rename to src/main/java/org/gcube/portlets/user/cloudcomputing/boot/CloudComputingBootPlatformPortlet.java index 7983cc5..3a7aa07 100644 --- a/src/main/java/org/gcube/portlets/user/cloudcomputing/boot/CloudComputingBootPlatformWeblet.java +++ b/src/main/java/org/gcube/portlets/user/cloudcomputing/boot/CloudComputingBootPlatformPortlet.java @@ -21,8 +21,8 @@ import org.gcube.vomanagement.usermanagement.GroupManager; import org.gcube.vomanagement.usermanagement.impl.LiferayGroupManager; import org.gcube.vomanagement.usermanagement.model.GCubeGroup; -public class CloudComputingBootPlatformWeblet extends MVCPortlet { - private static com.liferay.portal.kernel.log.Log _log = LogFactoryUtil.getLog(CloudComputingBootPlatformWeblet.class); +public class CloudComputingBootPlatformPortlet extends MVCPortlet { + private static com.liferay.portal.kernel.log.Log _log = LogFactoryUtil.getLog(CloudComputingBootPlatformPortlet.class); @Override public void render(RenderRequest renderRequest, RenderResponse renderResponse) diff --git a/src/main/java/org/gcube/portlets/user/cloudcomputing/methods/edit/CloudComputingMethodEditorWeblet.java b/src/main/java/org/gcube/portlets/user/cloudcomputing/methods/edit/CloudComputingMethodEditorPortlet.java similarity index 64% rename from src/main/java/org/gcube/portlets/user/cloudcomputing/methods/edit/CloudComputingMethodEditorWeblet.java rename to src/main/java/org/gcube/portlets/user/cloudcomputing/methods/edit/CloudComputingMethodEditorPortlet.java index 8d2b772..9588a32 100644 --- a/src/main/java/org/gcube/portlets/user/cloudcomputing/methods/edit/CloudComputingMethodEditorWeblet.java +++ b/src/main/java/org/gcube/portlets/user/cloudcomputing/methods/edit/CloudComputingMethodEditorPortlet.java @@ -3,8 +3,8 @@ package org.gcube.portlets.user.cloudcomputing.methods.edit; import com.liferay.portal.kernel.log.LogFactoryUtil; import com.liferay.util.bridges.mvc.MVCPortlet; -public class CloudComputingMethodEditorWeblet extends MVCPortlet { - private static com.liferay.portal.kernel.log.Log _log = LogFactoryUtil.getLog(CloudComputingMethodEditorWeblet.class); +public class CloudComputingMethodEditorPortlet extends MVCPortlet { + private static com.liferay.portal.kernel.log.Log _log = LogFactoryUtil.getLog(CloudComputingMethodEditorPortlet.class); } diff --git a/src/main/java/org/gcube/portlets/user/cloudcomputing/methods/exec/CloudComputingMethodExecutorWeblet.java b/src/main/java/org/gcube/portlets/user/cloudcomputing/methods/exec/CloudComputingMethodExecutorPortlet.java similarity index 63% rename from src/main/java/org/gcube/portlets/user/cloudcomputing/methods/exec/CloudComputingMethodExecutorWeblet.java rename to src/main/java/org/gcube/portlets/user/cloudcomputing/methods/exec/CloudComputingMethodExecutorPortlet.java index a7c67b2..7e25400 100644 --- a/src/main/java/org/gcube/portlets/user/cloudcomputing/methods/exec/CloudComputingMethodExecutorWeblet.java +++ b/src/main/java/org/gcube/portlets/user/cloudcomputing/methods/exec/CloudComputingMethodExecutorPortlet.java @@ -3,8 +3,8 @@ package org.gcube.portlets.user.cloudcomputing.methods.exec; import com.liferay.portal.kernel.log.LogFactoryUtil; import com.liferay.util.bridges.mvc.MVCPortlet; -public class CloudComputingMethodExecutorWeblet extends MVCPortlet { - private static com.liferay.portal.kernel.log.Log _log = LogFactoryUtil.getLog(CloudComputingMethodExecutorWeblet.class); +public class CloudComputingMethodExecutorPortlet extends MVCPortlet { + private static com.liferay.portal.kernel.log.Log _log = LogFactoryUtil.getLog(CloudComputingMethodExecutorPortlet.class); } diff --git a/src/main/java/org/gcube/portlets/user/cloudcomputing/methods/list/CloudComputingMethodListWeblet.java b/src/main/java/org/gcube/portlets/user/cloudcomputing/methods/list/CloudComputingMethodListPortlet.java similarity index 65% rename from src/main/java/org/gcube/portlets/user/cloudcomputing/methods/list/CloudComputingMethodListWeblet.java rename to src/main/java/org/gcube/portlets/user/cloudcomputing/methods/list/CloudComputingMethodListPortlet.java index d71b0e5..f81feaa 100644 --- a/src/main/java/org/gcube/portlets/user/cloudcomputing/methods/list/CloudComputingMethodListWeblet.java +++ b/src/main/java/org/gcube/portlets/user/cloudcomputing/methods/list/CloudComputingMethodListPortlet.java @@ -3,8 +3,8 @@ package org.gcube.portlets.user.cloudcomputing.methods.list; import com.liferay.portal.kernel.log.LogFactoryUtil; import com.liferay.util.bridges.mvc.MVCPortlet; -public class CloudComputingMethodListWeblet extends MVCPortlet { - private static com.liferay.portal.kernel.log.Log _log = LogFactoryUtil.getLog(CloudComputingMethodListWeblet.class); +public class CloudComputingMethodListPortlet extends MVCPortlet { + private static com.liferay.portal.kernel.log.Log _log = LogFactoryUtil.getLog(CloudComputingMethodListPortlet.class); } diff --git a/src/main/webapp/WEB-INF/liferay-display.xml b/src/main/webapp/WEB-INF/liferay-display.xml index 170dca8..f3438fb 100644 --- a/src/main/webapp/WEB-INF/liferay-display.xml +++ b/src/main/webapp/WEB-INF/liferay-display.xml @@ -3,9 +3,9 @@ - - - - + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/liferay-plugin-package.properties b/src/main/webapp/WEB-INF/liferay-plugin-package.properties index 2655851..697ea5d 100644 --- a/src/main/webapp/WEB-INF/liferay-plugin-package.properties +++ b/src/main/webapp/WEB-INF/liferay-plugin-package.properties @@ -1,4 +1,4 @@ -name=cloudcomputing-platform-weblets +name=cloudcomputing-platform-portlet module-group-id=liferay module-incremental-version=1 tags= diff --git a/src/main/webapp/WEB-INF/liferay-portlet.xml b/src/main/webapp/WEB-INF/liferay-portlet.xml index 7b53d60..24d1be1 100644 --- a/src/main/webapp/WEB-INF/liferay-portlet.xml +++ b/src/main/webapp/WEB-INF/liferay-portlet.xml @@ -3,32 +3,32 @@ + --> + - cloudcomputing-boot-platform-weblet + cloudcomputing-boot-platform-portlet /icon.png /css/main.css /js/main.js - cloudcomputing-methods-list-weblet + cloudcomputing-methods-list-portlet /icon.png /css/main.css /js/main.js - cloudcomputing-method-edit-weblet + cloudcomputing-method-edit-portlet /icon.png /css/main.css /js/main.js - cloudcomputing-method-exec-weblet + cloudcomputing-method-exec-portlet /icon.png /css/main.css /js/main.js diff --git a/src/main/webapp/WEB-INF/portlet.xml b/src/main/webapp/WEB-INF/portlet.xml index 4572e4a..ecffe4f 100644 --- a/src/main/webapp/WEB-INF/portlet.xml +++ b/src/main/webapp/WEB-INF/portlet.xml @@ -5,10 +5,10 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" version="2.0"> - cloudcomputing-boot-platform-weblet - cloudcomputing-boot-platform-weblet + cloudcomputing-boot-platform-portlet + cloudcomputing-boot-platform-portlet - org.gcube.portlets.user.cloudcomputing.boot.CloudComputingBootPlatformWeblet + org.gcube.portlets.user.cloudcomputing.boot.CloudComputingBootPlatformPortlet view-template @@ -19,9 +19,9 @@ text/html - cloudcomputing-boot-platform-weblet - cloudcomputing-boot-platform-weblet - cloudcomputing-boot-platform-weblet + cloudcomputing-boot-platform-portlet + cloudcomputing-boot-platform-portlet + cloudcomputing-boot-platform-portlet administrator @@ -38,10 +38,10 @@ - cloudcomputing-methods-list-weblet - cloudcomputing-methods-list-weblet + cloudcomputing-methods-list-portlet + cloudcomputing-methods-list-portlet - org.gcube.portlets.user.cloudcomputing.methods.list.CloudComputingMethodListWeblet + org.gcube.portlets.user.cloudcomputing.methods.list.CloudComputingMethodListPortlet view-template @@ -52,9 +52,9 @@ text/html - cloudcomputing-methods-list-weblet - cloudcomputing-methods-list-weblet - cloudcomputing-methods-list-weblet + cloudcomputing-methods-list-portlet + cloudcomputing-methods-list-portlet + cloudcomputing-methods-list-portlet administrator @@ -71,10 +71,11 @@ - cloudcomputing-method-edit-weblet - cloudcomputing-method-edit-weblet + cloudcomputing-method-edit-portlet + cloudcomputing-method-edit-portlet - org.gcube.portlets.user.cloudcomputing.methods.edit.CloudComputingMethodEditorWeblet + org.gcube.portlets.user.cloudcomputing.methods.edit.CloudComputingMethodEditorPortlet + view-template /html/methods/edit/methodeditor.jsp @@ -84,9 +85,9 @@ text/html - cloudcomputing-method-edit-weblet - cloudcomputing-method-edit-weblet - cloudcomputing-method-edit-weblet + cloudcomputing-method-edit-portlet + cloudcomputing-method-edit-portlet + cloudcomputing-method-edit-portlet administrator @@ -103,10 +104,11 @@ - cloudcomputing-method-exec-weblet - cloudcomputing-method-exec-weblet + cloudcomputing-method-exec-portlet + cloudcomputing-method-exec-portlet - org.gcube.portlets.user.cloudcomputing.methods.exec.CloudComputingMethodExecutorWeblet + org.gcube.portlets.user.cloudcomputing.methods.exec.CloudComputingMethodExecutorPortlet + view-template /html/methods/exec/methodexecutor.jsp @@ -116,9 +118,9 @@ text/html - cloudcomputing-method-exec-weblet - cloudcomputing-method-exec-weblet - cloudcomputing-method-exec-weblet + cloudcomputing-method-exec-portlet + cloudcomputing-method-exec-portlet + cloudcomputing-method-exec-portlet administrator diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 0b63757..283a055 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -1,5 +1,4 @@ - diff --git a/src/main/webapp/view.jsp b/src/main/webapp/view.jsp index 971938d..bfd5399 100644 --- a/src/main/webapp/view.jsp +++ b/src/main/webapp/view.jsp @@ -18,4 +18,4 @@ -This is the cloudcomputing-platform-weblets. \ No newline at end of file +This is the cloudcomputing-platform-portlet. \ No newline at end of file