diff --git a/liferay-plugins-sdk-6.2/build-common.xml b/liferay-plugins-sdk-6.2/build-common.xml
index 078468bb..7994ebc5 100644
--- a/liferay-plugins-sdk-6.2/build-common.xml
+++ b/liferay-plugins-sdk-6.2/build-common.xml
@@ -62,7 +62,7 @@
-
+
@@ -3514,4 +3514,4 @@ for (String path : paths) {
-
\ No newline at end of file
+
diff --git a/liferay-plugins-sdk-6.2/hooks/hms-taglib-hook/.classpath b/liferay-plugins-sdk-6.2/hooks/hms-taglib-hook/.classpath
index 2b987d2d..e0ca4766 100644
--- a/liferay-plugins-sdk-6.2/hooks/hms-taglib-hook/.classpath
+++ b/liferay-plugins-sdk-6.2/hooks/hms-taglib-hook/.classpath
@@ -1,7 +1,7 @@
-
+
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/httpclient.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/httpclient.jar
new file mode 100644
index 00000000..970c9891
Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/httpclient.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar
index f1371997..36c9b920 100644
Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/liferay-plugin-package.properties b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/liferay-plugin-package.properties
index 1635433e..7c7658ac 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/liferay-plugin-package.properties
+++ b/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=\
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SvuotaDatabase.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SvuotaDatabase.java
index c1bcd0a5..5ecc9317 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SvuotaDatabase.java
+++ b/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 pulisci(ServiceContext serviceContext) throws SystemException, PortalException {
List 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;
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties
index 6ef7b608..95545910 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties
+++ b/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
##
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/ivy.xml b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/ivy.xml
index a1178fa6..888d0c08 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/ivy.xml
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/ivy.xml
@@ -14,7 +14,7 @@
-
+
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/ivy.xml.MD5
index dfda30f8..0ab3f4ac 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/ivy.xml.MD5
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/ivy.xml.MD5
@@ -1 +1 @@
-291fbe4be1f094ebfa7c95b6381ba6af
+b4706b93723ae9407536bf048d125586
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.classpath
index fb126d23..b498b336 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.classpath
+++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.classpath
@@ -14,6 +14,6 @@
-
+
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/.classpath
index 1a538b03..9975372f 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/.classpath
+++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/.classpath
@@ -1,7 +1,7 @@
-
+
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar
index f1371997..36c9b920 100644
Binary files a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar and b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/lib/portos-kaleo-portlet-service.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/service.properties
index c1739538..fe45a085 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/service.properties
+++ b/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
##
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/.classpath
index 49008c9b..130677e9 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/.classpath
+++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/.classpath
@@ -1,7 +1,7 @@
-
+
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailAttachmentPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailAttachmentPersistenceImpl.java
index 967ba906..6931e006 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailAttachmentPersistenceImpl.java
+++ b/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;
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailPersistenceImpl.java
index 12f7c61e..6b806a45 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailPersistenceImpl.java
+++ b/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;
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailTemplatePersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailTemplatePersistenceImpl.java
index c7944800..b4583674 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/mailmanager/service/persistence/EmailTemplatePersistenceImpl.java
+++ b/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;
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/service.properties
index 63ec9c9d..3cf413e7 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/service.properties
+++ b/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
##
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/.classpath
index 5d845633..11cfe5fc 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/.classpath
+++ b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/.classpath
@@ -1,7 +1,7 @@
-
+
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/service.properties
index 05201d92..cccf8b7b 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/service.properties
+++ b/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
##