From 48081764ee68d4c2cc431e1f8445b15c116102f3 Mon Sep 17 00:00:00 2001
From: francesco <francesco@pc-francesco>
Date: Tue, 13 Oct 2020 12:38:21 +0200
Subject: [PATCH] fixing portlet configurations

---
 .classpath                                    |  1 -
 .../com.gwtplugins.gdt.eclipse.core.prefs     |  2 +-
 .settings/org.eclipse.wst.common.component    | 28 +++++++++++++------
 ...java => GeoPortalDataEntryAppPortlet.java} |  4 +--
 .../GeoPortalDataEntryApp.gwt.xml             |  4 +++
 ... => GeoPortalDataEntryAppPortlet_view.jsp} |  0
 src/main/webapp/WEB-INF/liferay-display.xml   |  2 +-
 .../WEB-INF/liferay-plugin-package.properties |  2 +-
 src/main/webapp/WEB-INF/liferay-portlet.xml   |  2 +-
 src/main/webapp/WEB-INF/portlet.xml           |  6 ++--
 10 files changed, 32 insertions(+), 19 deletions(-)
 rename src/main/java/org/gcube/portlets/user/geoportaldataentry/portlet/{GeoPortalDataEntryApp.java => GeoPortalDataEntryAppPortlet.java} (91%)
 rename src/main/webapp/WEB-INF/jsp/{GeoPortalDataEntryApp_view.jsp => GeoPortalDataEntryAppPortlet_view.jsp} (100%)

diff --git a/.classpath b/.classpath
index 0ca36d1..215c1c9 100644
--- a/.classpath
+++ b/.classpath
@@ -27,7 +27,6 @@
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
diff --git a/.settings/com.gwtplugins.gdt.eclipse.core.prefs b/.settings/com.gwtplugins.gdt.eclipse.core.prefs
index 0fd92a7..3f6f7f3 100644
--- a/.settings/com.gwtplugins.gdt.eclipse.core.prefs
+++ b/.settings/com.gwtplugins.gdt.eclipse.core.prefs
@@ -1,5 +1,5 @@
 eclipse.preferences.version=1
 jarsExcludedFromWebInfLib=
-lastWarOutDir=/home/francesco-mangiacrapa/git/geoportal-data-entry-app/target/geoportal-data-entry-app-1.0.0-SNAPSHOT
+lastWarOutDir=/home/francesco/git/geoportal-data-entry-app/target/geoportal-data-entry-app-1.0.0-SNAPSHOT
 warSrcDir=src/main/webapp
 warSrcDirIsOutput=false
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 7ba2034..6f1f647 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,32 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-            
+                
+    
     
     <wb-module deploy-name="geoportal-data-entry-app-1.0.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="/target/generated-sources/gwt"/>
-                        
+                                
+        
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
         <dependent-module archiveName="metadata-profile-form-builder-widget-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/metadata-profile-form-builder-widget/metadata-profile-form-builder-widget">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-                        
+                                
+        
         
         <property name="java-output-path" value="/geoportal-data-entry-app/target/geoportal-data-entry-app-1.0.0-SNAPSHOT/WEB-INF/classes"/>
+                
         <property name="context-root" value="geoportal-data-entry-app"/>
-                    
+                            
+    
     
     </wb-module>
-        
+            
+
 
 </project-modules>
diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/portlet/GeoPortalDataEntryApp.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/portlet/GeoPortalDataEntryAppPortlet.java
similarity index 91%
rename from src/main/java/org/gcube/portlets/user/geoportaldataentry/portlet/GeoPortalDataEntryApp.java
rename to src/main/java/org/gcube/portlets/user/geoportaldataentry/portlet/GeoPortalDataEntryAppPortlet.java
index 213b44d..b43af56 100644
--- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/portlet/GeoPortalDataEntryApp.java
+++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/portlet/GeoPortalDataEntryAppPortlet.java
@@ -16,7 +16,7 @@ import javax.portlet.RenderResponse;
  * 
  * Oct 8, 2020
  */
-public class GeoPortalDataEntryApp extends GenericPortlet{
+public class GeoPortalDataEntryAppPortlet extends GenericPortlet{
 
 	/**
 	 * JSP folder name
@@ -26,7 +26,7 @@ public class GeoPortalDataEntryApp extends GenericPortlet{
     /**
      *
      */
-    public static final String VIEW_JSP = JSP_FOLDER + "GeoPortalDataEntryApp_view.jsp";
+    public static final String VIEW_JSP = JSP_FOLDER + "GeoPortalDataEntryAppPortlet_view.jsp";
 
     /**
      * Do view.
diff --git a/src/main/resources/org/gcube/portlets/user/geoportaldataentry/GeoPortalDataEntryApp.gwt.xml b/src/main/resources/org/gcube/portlets/user/geoportaldataentry/GeoPortalDataEntryApp.gwt.xml
index da6f014..62c8534 100644
--- a/src/main/resources/org/gcube/portlets/user/geoportaldataentry/GeoPortalDataEntryApp.gwt.xml
+++ b/src/main/resources/org/gcube/portlets/user/geoportaldataentry/GeoPortalDataEntryApp.gwt.xml
@@ -8,6 +8,10 @@
   <!-- any one of the following lines.                            -->
   <!--<inherits name='com.google.gwt.user.theme.standard.Standard' />    -->
   	
+  <inherits name="com.github.gwtbootstrap.Bootstrap" />
+  
+  <inherits name="com.google.gwt.json.JSON" />
+  	
   <inherits name='org.gcube.portlets.widgets.mpformbuilder.MetadataProfileFormBuilder' />
 
   <!-- <inherits name='com.google.gwt.user.theme.chrome.Chrome'/> -->
diff --git a/src/main/webapp/WEB-INF/jsp/GeoPortalDataEntryApp_view.jsp b/src/main/webapp/WEB-INF/jsp/GeoPortalDataEntryAppPortlet_view.jsp
similarity index 100%
rename from src/main/webapp/WEB-INF/jsp/GeoPortalDataEntryApp_view.jsp
rename to src/main/webapp/WEB-INF/jsp/GeoPortalDataEntryAppPortlet_view.jsp
diff --git a/src/main/webapp/WEB-INF/liferay-display.xml b/src/main/webapp/WEB-INF/liferay-display.xml
index b6c995a..7b86a61 100644
--- a/src/main/webapp/WEB-INF/liferay-display.xml
+++ b/src/main/webapp/WEB-INF/liferay-display.xml
@@ -1,5 +1,5 @@
  <display>
      <category name="gCube Applications">
-        <portlet id="GeoPortalDataEntryApp" />
+        <portlet id="GeoPortalDataEntryAppPortlet" />
      </category>
   </display>
\ 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 62a126b..e717c8b 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=GeoPortalDataEntryApp
+name=GeoPortalDataEntryAppPortlet
 module-group-id=liferay
 module-incremental-version=2
 tags=
diff --git a/src/main/webapp/WEB-INF/liferay-portlet.xml b/src/main/webapp/WEB-INF/liferay-portlet.xml
index 8c15f3a..5253710 100644
--- a/src/main/webapp/WEB-INF/liferay-portlet.xml
+++ b/src/main/webapp/WEB-INF/liferay-portlet.xml
@@ -3,7 +3,7 @@
 
 <liferay-portlet-app>
 	<portlet>
-		<portlet-name>GeoPortalDataEntryApp</portlet-name>
+		<portlet-name>GeoPortalDataEntryAppPortlet</portlet-name>
 		<layout-cacheable>false</layout-cacheable>
 		<instanceable>false</instanceable>
 		<ajaxable>false</ajaxable>
diff --git a/src/main/webapp/WEB-INF/portlet.xml b/src/main/webapp/WEB-INF/portlet.xml
index f484464..e085ce6 100644
--- a/src/main/webapp/WEB-INF/portlet.xml
+++ b/src/main/webapp/WEB-INF/portlet.xml
@@ -2,9 +2,9 @@
 <portlet-app>
 	<portlet>
 		<description>GeoPortalDataEntryApp Portlet</description>
-		<portlet-name>GeoPortalDataEntryApp</portlet-name>
-		<display-name>GeoPortal Data Entry Portlet</display-name>
-		<portlet-class>org.gcube.portlets.user.geoportaldataentry.portlet.GeoPortalDataEntryApp
+		<portlet-name>GeoPortalDataEntryAppPortlet</portlet-name>
+		<display-name>GeoPortal-DataEntry-Portlet</display-name>
+		<portlet-class>org.gcube.portlets.user.geoportaldataentry.portlet.GeoPortalDataEntryAppPortlet
 		</portlet-class>
 		<expiration-cache>0</expiration-cache>
 		<supports>