Correzioni permessi (finale)

liferay-plugins-sdk-6.2/build-common.xml

@@ -62,7 +62,7 @@
 	<path id="plugin.classpath">
 		<path refid="plugin-lib.classpath" />
 		<fileset dir="${app.server.lib.global.dir}" includes="*.jar" />
-		<fileset dir="${app.server.lib.portal.dir}" includes="annotations.jar,commons-logging.jar,log4j.jar,util-bridges.jar,util-java.jar,util-taglib.jar" />
+		<fileset dir="${app.server.lib.portal.dir}" includes="annotations.jar,commons-logging.jar,log4j.jar,util-bridges.jar,util-taglib.jar" />
 		<fileset dir="${sdk.dir}/dependencies/aQute.bnd/lib" includes="*.jar" />
 		<fileset dir="${sdk.dir}/lib" includes="activation.jar,javax.servlet-api.jar,jsp-api.jar,mail.jar" />
 	</path>
@@ -3514,4 +3514,4 @@ for (String path : paths) {
 			</outofdate>
 		</antelope:repeat>
 	</target>
-</project>
+</project>

liferay-plugins-sdk-6.2/hooks/hms-taglib-hook/.classpath

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="docroot/WEB-INF/src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0_79">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0_80">
 		<attributes>
 			<attribute name="owner.project.facets" value="java"/>
 		</attributes>

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/liferay-plugin-package.properties

@@ -10,14 +10,12 @@ author=Liferay, Inc.
 licenses=LGPL
 liferay-versions=6.2.0+
 portal-dependency-jars=\
+    axis.jar,\
+    jaxrpc.jar,\
     jstl-api.jar,\
     jstl-impl.jar,\
-    jaxrpc.jar,\
-    commons-discovery.jar,\
     wsdl4j.jar,\
-    axis.jar,\
-    xml-apis.jar,\
-    httpclient.jar
+    xml-apis.jar
 portal-dependency-tlds=\
     c.tld
 required-deployment-contexts=\

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SvuotaDatabase.java

@@ -67,6 +67,7 @@ import com.liferay.portal.model.Layout;
 import com.liferay.portal.model.LayoutPrototype;
 import com.liferay.portal.model.LayoutSetPrototype;
 import com.liferay.portal.model.Organization;
+import com.liferay.portal.model.ResourceConstants;
 import com.liferay.portal.model.ResourcePermission;
 import com.liferay.portal.model.Role;
 import com.liferay.portal.model.SystemEvent;
@@ -132,6 +133,10 @@ public class SvuotaDatabase {
 
 	public static List<String> pulisci(ServiceContext serviceContext) throws SystemException, PortalException {
 		List<String> esito = new ArrayList<>();
+		if (Validator.isNotNull(esito)) {
+			esito.add("Operazione non consentita");
+			return esito;
+		}
 		esito.addAll(puliziaDocumentLibrary());
 		esito.addAll(svuotaDatabase(serviceContext));
 		ConfigurazioneLocalServiceUtil.storeConfig(Constants.NUMERO_PROGETTO_KEY_DB, "1", serviceContext);
@@ -594,10 +599,16 @@ public class SvuotaDatabase {
 					}
 				} catch (NumberFormatException e) {
 				}
-				if (Validator.isNotNull(classPK) && !esiste(resourcePermission.getName(), classPK)) {
-					ResourcePermissionLocalServiceUtil.deleteResourcePermission(resourcePermission);
-					cancellati++;
-					rimossi++;
+				if (Validator.isNotNull(classPK)) {
+					switch (resourcePermission.getScope()) {
+					case ResourceConstants.SCOPE_INDIVIDUAL:
+						if (!esiste(resourcePermission.getName(), classPK)) {
+							ResourcePermissionLocalServiceUtil.deleteResourcePermission(resourcePermission);
+							cancellati++;
+							rimossi++;
+						}
+						break;
+					}
 				}
 			}
 			start += SLICE - rimossi;

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties

@@ -13,8 +13,8 @@
 ##
 
     build.namespace=portos_bo
-    build.number=2708
-    build.date=1604325577969
+    build.number=2715
+    build.date=1604411684042
     build.auto.upgrade=true
 
 ##

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/ivy.xml

@@ -14,7 +14,7 @@
 		<dependency conf="test->default" name="arquillian-junit-container" org="org.jboss.arquillian.junit" rev="1.1.6.Final" />
 		<dependency conf="test->default" name="arquillian-tomcat-remote-7" org="org.jboss.arquillian.container" rev="1.0.0.CR6" />
 		<dependency conf="test->default" name="com.liferay.ant.arquillian" org="com.liferay" rev="1.0.0" />
-		
+
 		<dependency name="commons-codec" org="commons-codec" rev="1.10"/>
 		<dependency name="commons-csv" org="org.apache.commons" rev="1.4"/>
 		<dependency name="commons-io" org="commons-io" rev="2.6"/>

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/ivy.xml.MD5

@@ -1 +1 @@
-291fbe4be1f094ebfa7c95b6381ba6af
+b4706b93723ae9407536bf048d125586

liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.classpath

@@ -14,6 +14,6 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry exported="true" kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=portos-fe-portlet&amp;ivyXmlPath=ivy.xml&amp;confs=*"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0_80"/>
 	<classpathentry kind="output" path="docroot/WEB-INF/classes"/>
 </classpath>

liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/.classpath

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="docroot/WEB-INF/src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0_79">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0_80">
 		<attributes>
 			<attribute name="owner.project.facets" value="java"/>
 		</attributes>

liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/service.properties

@@ -13,8 +13,8 @@
 ##
 
     build.namespace=portos_Kaleo
-    build.number=16
-    build.date=1579538967574
+    build.number=18
+    build.date=1604403556778
     build.auto.upgrade=true
 
 ##

liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/.classpath

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="docroot/WEB-INF/src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0_79">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0_80">
 		<attributes>
 			<attribute name="owner.project.facets" value="java"/>
 		</attributes>

liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailAttachmentPersistenceImpl.java

@@ -42,6 +42,7 @@ import it.tref.liferay.portos.mailmanager.NoSuchEmailAttachmentException;
 import it.tref.liferay.portos.mailmanager.model.EmailAttachment;
 import it.tref.liferay.portos.mailmanager.model.impl.EmailAttachmentImpl;
 import it.tref.liferay.portos.mailmanager.model.impl.EmailAttachmentModelImpl;
+import it.tref.liferay.portos.mailmanager.service.persistence.EmailAttachmentPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailPersistenceImpl.java

@@ -44,6 +44,7 @@ import it.tref.liferay.portos.mailmanager.NoSuchEmailException;
 import it.tref.liferay.portos.mailmanager.model.Email;
 import it.tref.liferay.portos.mailmanager.model.impl.EmailImpl;
 import it.tref.liferay.portos.mailmanager.model.impl.EmailModelImpl;
+import it.tref.liferay.portos.mailmanager.service.persistence.EmailPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailTemplatePersistenceImpl.java

@@ -46,6 +46,7 @@ import it.tref.liferay.portos.mailmanager.NoSuchEmailTemplateException;
 import it.tref.liferay.portos.mailmanager.model.EmailTemplate;
 import it.tref.liferay.portos.mailmanager.model.impl.EmailTemplateImpl;
 import it.tref.liferay.portos.mailmanager.model.impl.EmailTemplateModelImpl;
+import it.tref.liferay.portos.mailmanager.service.persistence.EmailTemplatePersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/service.properties

@@ -13,8 +13,8 @@
 ##
 
     build.namespace=portos_Mail
-    build.number=77
-    build.date=1598969853731
+    build.number=78
+    build.date=1604403348058
     build.auto.upgrade=true
 
 ##

liferay-plugins-sdk-6.2/portlets/portos-report-portlet/.classpath

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="docroot/WEB-INF/src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0_79">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0_80">
 		<attributes>
 			<attribute name="owner.project.facets" value="java"/>
 		</attributes>

liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/service.properties

@@ -13,8 +13,8 @@
 ##
 
     build.namespace=portos_rep
-    build.number=22
-    build.date=1604073335660
+    build.number=23
+    build.date=1604404252960
     build.auto.upgrade=true
 
 ##