diff --git a/liferay-plugins-sdk-6.2/ivy-settings.xml b/liferay-plugins-sdk-6.2/ivy-settings.xml
index e4b51893..fe481848 100644
--- a/liferay-plugins-sdk-6.2/ivy-settings.xml
+++ b/liferay-plugins-sdk-6.2/ivy-settings.xml
@@ -1,14 +1,20 @@
-
-
+
-
-
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
+
+
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.wst.common.component b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.wst.common.component
index 56fd9a0b..46a12de8 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.wst.common.component
+++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/.settings/org.eclipse.wst.common.component
@@ -9,6 +9,9 @@
uses
+
+ uses
+
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/commons-csv-1.4.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/commons-csv.jar
similarity index 100%
rename from liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/commons-csv-1.4.jar
rename to liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/commons-csv.jar
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/httpcore-4.4.6.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/httpcore-4.4.6.jar
deleted file mode 100644
index 16ed0d16..00000000
Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/httpcore-4.4.6.jar and /dev/null differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/httpmime-4.5.3.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/httpmime-4.5.3.jar
deleted file mode 100644
index fe2cf8e3..00000000
Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/httpmime-4.5.3.jar and /dev/null differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/jettison-1.3.8.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/jettison.jar
similarity index 100%
rename from liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/jettison-1.3.8.jar
rename to liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/jettison.jar
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/stax-api.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/stax-api.jar
new file mode 100644
index 00000000..d9a16651
Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/stax-api.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 c2c0f663..1635433e 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
@@ -22,4 +22,5 @@ portal-dependency-tlds=\
c.tld
required-deployment-contexts=\
hms-taglib-hook,\
- portos-kaleo-portlet
+ portos-kaleo-portlet,\
+ portos-mail-manager-portlet
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 99293b01..e126e106 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
@@ -17,6 +17,7 @@ import it.tref.liferay.portos.bo.model.DocPratica;
import it.tref.liferay.portos.bo.model.FineLavori;
import it.tref.liferay.portos.bo.model.IntPratica;
import it.tref.liferay.portos.bo.model.Pagamento;
+import it.tref.liferay.portos.bo.model.ParereGeologo;
import it.tref.liferay.portos.bo.model.Soggetto;
import it.tref.liferay.portos.bo.model.Tempistica;
import it.tref.liferay.portos.bo.service.AllegatoManualeLocalServiceUtil;
@@ -31,6 +32,7 @@ import it.tref.liferay.portos.bo.service.DocPraticaLocalServiceUtil;
import it.tref.liferay.portos.bo.service.FineLavoriLocalServiceUtil;
import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil;
import it.tref.liferay.portos.bo.service.PagamentoLocalServiceUtil;
+import it.tref.liferay.portos.bo.service.ParereGeologoLocalServiceUtil;
import it.tref.liferay.portos.bo.service.SoggettoLocalServiceUtil;
import it.tref.liferay.portos.bo.service.TempisticaLocalServiceUtil;
import it.tref.liferay.portos.mailmanager.model.Email;
@@ -59,7 +61,6 @@ import com.liferay.portal.model.LayoutSetPrototype;
import com.liferay.portal.model.Organization;
import com.liferay.portal.model.User;
import com.liferay.portal.model.UserPersonalSite;
-import com.liferay.portal.service.ClassNameLocalServiceUtil;
import com.liferay.portal.service.CompanyLocalServiceUtil;
import com.liferay.portal.service.ContactLocalServiceUtil;
import com.liferay.portal.service.GroupLocalServiceUtil;
@@ -76,9 +77,11 @@ public class SvuotaDatabase {
private static final Log _log = LogFactoryUtil.getLog(SvuotaDatabase.class);
private static final int SLICE = 1000;
+ private static int docPraticaCancellati;
+
public static List pulisci(ServiceContext serviceContext) throws SystemException, PortalException {
List esito = new ArrayList<>();
- esito.addAll(puliziaDocumentLibrary());
+ // esito.addAll(puliziaDocumentLibrary());
esito.addAll(svuotaDatabase(serviceContext));
try {
@@ -95,6 +98,8 @@ public class SvuotaDatabase {
private static List svuotaDatabase(ServiceContext serviceContext) throws SystemException,
PortalException {
List esito = new ArrayList<>();
+ esitoLog(esito, "Cancellati " + svuotaDettPratica() + " DettPratica");
+
esitoLog(esito, "Cancellati " + svuotaAllegatoManuale() + " AllegatoManuale");
esitoLog(esito, "Cancellati " + svuotaAsseverazione() + " Asseverazione");
esitoLog(esito, "Cancellati " + svuotaAvviso() + " Avviso");
@@ -102,7 +107,6 @@ public class SvuotaDatabase {
esitoLog(esito, "Cancellati " + svuotaContact() + " Contacts");
esitoLog(esito, "Cancellati " + svuotaControlloPratica() + " ControlloPratica");
esitoLog(esito, "Cancellati " + svuotaDelega() + " Delega");
- esitoLog(esito, "Cancellati " + svuotaDettPratica() + " DettPratica");
esitoLog(esito, "Cancellati " + svuotaDocAggiuntiva() + " DocAggiuntiva");
esitoLog(esito, "Cancellati " + svuotaDocPratica() + " DocPratica");
esitoLog(esito, "Cancellati " + svuotaEmail() + " Email");
@@ -110,6 +114,9 @@ public class SvuotaDatabase {
esitoLog(esito, "Cancellati " + svuotaFineLavori() + " FineLavori");
esitoLog(esito, "Cancellati " + svuotaGroup() + " Group");
esitoLog(esito, "Cancellati " + svuotaPagamento() + " Pagamento");
+ docPraticaCancellati = 0;
+ esitoLog(esito, "Cancellati " + svuotaSoggetto() + " Soggetto, cancellati " + docPraticaCancellati
+ + " DocPratica");
esitoLog(esito, "Cancellati " + svuotaTempistica() + " Tempistica");
return esito;
}
@@ -168,8 +175,8 @@ public class SvuotaDatabase {
|| !esiste(Avviso.class.getName(), allegatoManuale.getAvvisoId())) {
deleteFileEntry(allegatoManuale.getFileEntryId());
AllegatoManualeLocalServiceUtil.deleteAllegatoManuale(allegatoManuale);
- rimossi++;
cancellati++;
+ rimossi++;
}
}
start += SLICE - rimossi;
@@ -183,15 +190,14 @@ public class SvuotaDatabase {
List asseverazioni = null;
do {
int rimossi = 0;
- asseverazioni = AsseverazioneLocalServiceUtil.getAsseveraziones(start, start + SLICE);
+asseverazioni = AsseverazioneLocalServiceUtil.getAsseveraziones(start, start + SLICE);
for (Asseverazione asseverazione : asseverazioni) {
if (!esiste(IntPratica.class.getName(), asseverazione.getIntPraticaId())
- || !esiste(DettPratica.class.getName(), asseverazione.getDettPraticaId())
- || !esiste(Soggetto.class.getName(), asseverazione.getSoggettoId())) {
+ || !esiste(DettPratica.class.getName(), asseverazione.getDettPraticaId())) {
deleteFileEntry(asseverazione.getFileEntryId());
AsseverazioneLocalServiceUtil.deleteAsseverazione(asseverazione);
- rimossi++;
cancellati++;
+ rimossi++;
}
}
start += SLICE - rimossi;
@@ -204,8 +210,8 @@ public class SvuotaDatabase {
int cancellati = 0;
List avvisi = null;
do {
- avvisi = AvvisoLocalServiceUtil.getAvvisos(start, start + SLICE);
int rimossi = 0;
+ avvisi = AvvisoLocalServiceUtil.getAvvisos(start, start + SLICE);
for (Avviso avviso : avvisi) {
if (!esiste(avviso.getClassName(), avviso.getClassPk())
|| !esiste(IntPratica.class.getName(), avviso.getIntPraticaId())) {
@@ -213,8 +219,8 @@ public class SvuotaDatabase {
deleteFileEntry(avviso.getFileEntryIdInvio());
deleteFileEntry(avviso.getFileEntryIdProtocollo());
AvvisoLocalServiceUtil.deleteAvviso(avviso);
- rimossi++;
cancellati++;
+ rimossi++;
}
}
start += SLICE - rimossi;
@@ -227,13 +233,13 @@ public class SvuotaDatabase {
int cancellati = 0;
List collaudi = null;
do {
- collaudi = CollaudoLocalServiceUtil.getCollaudos(start, start + SLICE);
int rimossi = 0;
+ collaudi = CollaudoLocalServiceUtil.getCollaudos(start, start + SLICE);
for (Collaudo collaudo : collaudi) {
if (!esiste(IntPratica.class.getName(), collaudo.getIntPraticaId())) {
CollaudoLocalServiceUtil.deleteCollaudo(collaudo);
- rimossi++;
cancellati++;
+ rimossi++;
}
}
start += SLICE - rimossi;
@@ -246,14 +252,14 @@ public class SvuotaDatabase {
int cancellati = 0;
List controlliPratiche = null;
do {
- controlliPratiche = ControlloPraticaLocalServiceUtil.getControlloPraticas(start, start + SLICE);
int rimossi = 0;
+ controlliPratiche = ControlloPraticaLocalServiceUtil.getControlloPraticas(start, start + SLICE);
for (ControlloPratica controlloPratica : controlliPratiche) {
if (!esiste(IntPratica.class.getName(), controlloPratica.getIntPraticaId())
|| !esiste(DettPratica.class.getName(), controlloPratica.getDettPraticaId())) {
ControlloPraticaLocalServiceUtil.deleteControlloPratica(controlloPratica);
- rimossi++;
cancellati++;
+ rimossi++;
}
}
start += SLICE - rimossi;
@@ -266,14 +272,14 @@ public class SvuotaDatabase {
int cancellati = 0;
List deleghe = null;
do {
- deleghe = DelegaLocalServiceUtil.getDelegas(start, start + SLICE);
int rimossi = 0;
+ deleghe = DelegaLocalServiceUtil.getDelegas(start, start + SLICE);
for (Delega delega : deleghe) {
if (!esiste(IntPratica.class.getName(), delega.getIntPraticaId())
|| !esiste(DettPratica.class.getName(), delega.getDettPraticaId())) {
DelegaLocalServiceUtil.deleteDelega(delega);
- rimossi++;
cancellati++;
+ rimossi++;
}
}
start += SLICE - rimossi;
@@ -286,13 +292,13 @@ public class SvuotaDatabase {
int cancellati = 0;
List contacts = null;
do {
- contacts = ContactLocalServiceUtil.getContacts(start, start + SLICE);
int rimossi = 0;
+ contacts = ContactLocalServiceUtil.getContacts(start, start + SLICE);
for (Contact contact : contacts) {
if (!esiste(contact.getClassName(), contact.getClassPK())) {
ContactLocalServiceUtil.deleteContact(contact);
- rimossi++;
cancellati++;
+ rimossi++;
}
}
start += SLICE - rimossi;
@@ -300,23 +306,23 @@ public class SvuotaDatabase {
return cancellati;
}
- private static int svuotaDettPratica() throws SystemException, PortalException {
+ private static String svuotaDettPratica() throws SystemException, PortalException {
int start = 0;
int cancellati = 0;
List dettPratiche = null;
do {
- dettPratiche = DettPraticaLocalServiceUtil.getDettPraticas(start, start + SLICE);
int rimossi = 0;
+ dettPratiche = DettPraticaLocalServiceUtil.getDettPraticas(start, start + SLICE);
for (DettPratica dettPratica : dettPratiche) {
if (!esiste(IntPratica.class.getName(), dettPratica.getIntPraticaId())) {
DettPraticaLocalServiceUtil.deleteDettPratica(dettPratica);
- rimossi++;
cancellati++;
+ rimossi++;
}
}
start += SLICE - rimossi;
} while (dettPratiche.size() > 0);
- return cancellati;
+ return "Cancellati " + cancellati + " DettPratica";
}
private static int svuotaDocAggiuntiva() throws SystemException, PortalException {
@@ -324,15 +330,15 @@ public class SvuotaDatabase {
int cancellati = 0;
List docAggiuntive = null;
do {
- docAggiuntive = DocAggiuntivaLocalServiceUtil.getDocAggiuntivas(start, start + SLICE);
int rimossi = 0;
+ docAggiuntive = DocAggiuntivaLocalServiceUtil.getDocAggiuntivas(start, start + SLICE);
for (DocAggiuntiva docAggiuntiva : docAggiuntive) {
if (!esiste(IntPratica.class.getName(), docAggiuntiva.getIntPraticaId())
|| !esiste(DettPratica.class.getName(), docAggiuntiva.getDettPraticaId())) {
deleteFileEntry(docAggiuntiva.getFileEntryId());
DocAggiuntivaLocalServiceUtil.deleteDocAggiuntiva(docAggiuntiva);
- rimossi++;
cancellati++;
+ rimossi++;
}
}
start += SLICE - rimossi;
@@ -345,14 +351,14 @@ public class SvuotaDatabase {
int cancellati = 0;
List docPratiche = null;
do {
- docPratiche = DocPraticaLocalServiceUtil.getDocPraticas(start, start + SLICE);
int rimossi = 0;
+ docPratiche = DocPraticaLocalServiceUtil.getDocPraticas(start, start + SLICE);
for (DocPratica docPratica : docPratiche) {
if (!esiste(IntPratica.class.getName(), docPratica.getIntPraticaId())) {
deleteFileEntry(docPratica.getDlFileEntryId());
DocPraticaLocalServiceUtil.deleteDocPratica(docPratica);
- rimossi++;
cancellati++;
+ rimossi++;
}
}
start += SLICE - rimossi;
@@ -365,13 +371,13 @@ public class SvuotaDatabase {
int cancellati = 0;
List emails = null;
do {
- emails = EmailLocalServiceUtil.getEmails(start, start + SLICE);
int rimossi = 0;
+ emails = EmailLocalServiceUtil.getEmails(start, start + SLICE);
for (Email email : emails) {
if (!esiste(email.getClassName(), email.getClassPK())) {
EmailLocalServiceUtil.deleteEmail(email);
- rimossi++;
cancellati++;
+ rimossi++;
}
}
start += SLICE - rimossi;
@@ -384,14 +390,14 @@ public class SvuotaDatabase {
int cancellati = 0;
List emailAttachments = null;
do {
- emailAttachments = EmailAttachmentLocalServiceUtil.getEmailAttachments(start, start + SLICE);
int rimossi = 0;
+ emailAttachments = EmailAttachmentLocalServiceUtil.getEmailAttachments(start, start + SLICE);
for (EmailAttachment emailAttachment : emailAttachments) {
if (!esiste(Email.class.getName(), emailAttachment.getEmailId())) {
deleteFileEntry(emailAttachment.getFileEntryId());
EmailAttachmentLocalServiceUtil.deleteEmailAttachment(emailAttachment);
- rimossi++;
cancellati++;
+ rimossi++;
}
}
start += SLICE - rimossi;
@@ -404,13 +410,13 @@ public class SvuotaDatabase {
int cancellati = 0;
List finiLavori = null;
do {
- finiLavori = FineLavoriLocalServiceUtil.getFineLavoris(start, start + SLICE);
int rimossi = 0;
+ finiLavori = FineLavoriLocalServiceUtil.getFineLavoris(start, start + SLICE);
for (FineLavori fineLavori : finiLavori) {
if (!esiste(IntPratica.class.getName(), fineLavori.getIntPraticaId())) {
FineLavoriLocalServiceUtil.deleteFineLavori(fineLavori);
- rimossi++;
cancellati++;
+ rimossi++;
}
}
start += SLICE - rimossi;
@@ -423,13 +429,13 @@ public class SvuotaDatabase {
int cancellati = 0;
List groups = null;
do {
- groups = GroupLocalServiceUtil.getGroups(start, start + SLICE);
int rimossi = 0;
+ groups = GroupLocalServiceUtil.getGroups(start, start + SLICE);
for (Group group : groups) {
if (!esiste(group.getClassName(), group.getClassPK())) {
GroupLocalServiceUtil.deleteGroup(group);
- rimossi++;
cancellati++;
+ rimossi++;
}
}
start += SLICE - rimossi;
@@ -442,15 +448,15 @@ public class SvuotaDatabase {
int cancellati = 0;
List pagamenti = null;
do {
- pagamenti = PagamentoLocalServiceUtil.getPagamentos(start, start + SLICE);
int rimossi = 0;
+ pagamenti = PagamentoLocalServiceUtil.getPagamentos(start, start + SLICE);
for (Pagamento pagamento : pagamenti) {
if (!esiste(pagamento.getClassName(), pagamento.getClassPk())
|| !esiste(IntPratica.class.getName(), pagamento.getIntPraticaId())) {
deleteFileEntry(pagamento.getFileEntryId());
PagamentoLocalServiceUtil.deletePagamento(pagamento);
- rimossi++;
cancellati++;
+ rimossi++;
}
}
start += SLICE - rimossi;
@@ -458,19 +464,49 @@ public class SvuotaDatabase {
return cancellati;
}
+ private static int svuotaSoggetto() throws SystemException, PortalException {
+ int start = 0;
+ int cancellati = 0;
+ List soggetti = null;
+ do {
+ int rimossi = 0;
+ soggetti = SoggettoLocalServiceUtil.getSoggettos(start, start + SLICE);
+ for (Soggetto soggetto : soggetti) {
+ if (!esiste(IntPratica.class.getName(), soggetto.getIntPraticaId())
+ || !esiste(DettPratica.class.getName(), soggetto.getDettPraticaId())) {
+ if (Validator.isNotNull(soggetto.getFileVariazioneId())) {
+ try {
+ DocPratica docPratica = DocPraticaLocalServiceUtil.getDocPratica(soggetto
+ .getFileVariazioneId());
+ deleteFileEntry(docPratica.getDlFileEntryId());
+ DocPraticaLocalServiceUtil.deleteDocPratica(docPratica);
+ docPraticaCancellati++;
+ } catch (PortalException e) {
+ }
+ }
+ SoggettoLocalServiceUtil.deleteSoggetto(soggetto);
+ cancellati++;
+ rimossi++;
+ }
+ }
+ start += SLICE - rimossi;
+ } while (soggetti.size() > 0);
+ return cancellati;
+ }
+
private static int svuotaTempistica() throws SystemException, PortalException {
int start = 0;
int cancellati = 0;
List tempistiche = null;
do {
- tempistiche = TempisticaLocalServiceUtil.getTempisticas(start, start + SLICE);
int rimossi = 0;
+ tempistiche = TempisticaLocalServiceUtil.getTempisticas(start, start + SLICE);
for (Tempistica tempistica : tempistiche) {
if (!esiste(IntPratica.class.getName(), tempistica.getIntPraticaId())
|| !esiste(DettPratica.class.getName(), tempistica.getDettPraticaId())) {
TempisticaLocalServiceUtil.deleteTempistica(tempistica);
- rimossi++;
cancellati++;
+ rimossi++;
}
}
start += SLICE - rimossi;
@@ -478,16 +514,14 @@ public class SvuotaDatabase {
return cancellati;
}
- private static boolean esiste(long classNameId, long classPK) throws PortalException, SystemException {
- return esiste(ClassNameLocalServiceUtil.getClassName(classNameId).getClassName(), classPK);
- }
-
private static boolean esiste(String className, long classPK) throws SystemException {
try {
if (className.equalsIgnoreCase(Asseverazione.class.getName())) {
AsseverazioneLocalServiceUtil.getAsseverazione(classPK);
} else if (className.equalsIgnoreCase(Avviso.class.getName())) {
AvvisoLocalServiceUtil.getAvviso(classPK);
+ } else if (className.equalsIgnoreCase(Collaudo.class.getName())) {
+ CollaudoLocalServiceUtil.getCollaudo(classPK);
} else if (className.equalsIgnoreCase(Company.class.getName())) {
CompanyLocalServiceUtil.getCompany(classPK);
} else if (className.equalsIgnoreCase(Delega.class.getName())) {
@@ -496,6 +530,8 @@ public class SvuotaDatabase {
DettPraticaLocalServiceUtil.getDettPratica(classPK);
} else if (className.equalsIgnoreCase(Email.class.getName())) {
EmailLocalServiceUtil.getEmail(classPK);
+ } else if (className.equalsIgnoreCase(FineLavori.class.getName())) {
+ FineLavoriLocalServiceUtil.getFineLavori(classPK);
} else if (className.equalsIgnoreCase(Group.class.getName())) {
GroupLocalServiceUtil.getGroup(classPK);
} else if (className.equalsIgnoreCase(IntPratica.class.getName())) {
@@ -504,6 +540,8 @@ public class SvuotaDatabase {
LayoutPrototypeLocalServiceUtil.getLayoutPrototype(classPK);
} else if (className.equalsIgnoreCase(LayoutSetPrototype.class.getName())) {
LayoutSetPrototypeLocalServiceUtil.getLayoutSetPrototype(classPK);
+ } else if (className.equalsIgnoreCase(ParereGeologo.class.getName())) {
+ ParereGeologoLocalServiceUtil.getParereGeologo(classPK);
} else if (className.equalsIgnoreCase(Organization.class.getName())) {
OrganizationLocalServiceUtil.getOrganization(classPK);
} else if (className.equalsIgnoreCase(Soggetto.class.getName())) {
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 760439fb..a1178fa6 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,5 +14,14 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
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 282d19a6..dfda30f8 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 @@
-d5b426ffc55beefdfcdf11773539dda8
+291fbe4be1f094ebfa7c95b6381ba6af
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/bcmail-jdk14.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/bcmail-jdk14.jar
new file mode 100644
index 00000000..ab606b5f
Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/bcmail-jdk14.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/bcprov-jdk14.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/bcprov-jdk14.jar
new file mode 100644
index 00000000..d1befb7f
Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/bcprov-jdk14.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/bctsp-jdk14.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/bctsp-jdk14.jar
new file mode 100644
index 00000000..058fde1e
Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/bctsp-jdk14.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/castor.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/castor.jar
new file mode 100644
index 00000000..5a8d7a66
Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/castor.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/commons-beanutils.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/commons-beanutils.jar
index 6baf5ecb..caf7ae33 100644
Binary files a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/commons-beanutils.jar and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/commons-beanutils.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/commons-digester.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/commons-digester.jar
index 1110f0aa..a07cfa8e 100644
Binary files a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/commons-digester.jar and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/commons-digester.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/iText-2.1.7.js1.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/itext.jar
similarity index 93%
rename from liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/iText-2.1.7.js1.jar
rename to liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/itext.jar
index 0a324006..5d319fcd 100644
Binary files a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/iText-2.1.7.js1.jar and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/itext.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jOpenDocument-1.3.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jOpenDocument.jar
similarity index 100%
rename from liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jOpenDocument-1.3.jar
rename to liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jOpenDocument.jar
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jackson-annotations.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jackson-annotations.jar
new file mode 100644
index 00000000..88064d07
Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jackson-annotations.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jackson-core.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jackson-core.jar
new file mode 100644
index 00000000..51d1fdeb
Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jackson-core.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jackson-databind.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jackson-databind.jar
new file mode 100644
index 00000000..20f98992
Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jackson-databind.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/jasperreports-fonts-5.0.0.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jasperreports-fonts.jar
similarity index 99%
rename from liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/jasperreports-fonts-5.0.0.jar
rename to liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jasperreports-fonts.jar
index 63d40a66..c778df33 100644
Binary files a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/jasperreports-fonts-5.0.0.jar and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jasperreports-fonts.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/jasperreports-5.0.0.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jasperreports.jar
similarity index 65%
rename from liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/jasperreports-5.0.0.jar
rename to liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jasperreports.jar
index f03768ad..41819e1c 100644
Binary files a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/jasperreports-5.0.0.jar and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jasperreports.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jcommon.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jcommon.jar
new file mode 100644
index 00000000..d0dc26de
Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jcommon.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jdtcore.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jdtcore.jar
new file mode 100644
index 00000000..d9207382
Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jdtcore.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jfreechart.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jfreechart.jar
new file mode 100644
index 00000000..73be90fd
Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jfreechart.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/xml-apis.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/xml-apis.jar
new file mode 100644
index 00000000..243eaeae
Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/xml-apis.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/ivy.xml b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/ivy.xml
index cca38d16..fe4214ac 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/ivy.xml
+++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/ivy.xml
@@ -14,5 +14,11 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/ivy.xml.MD5
index 4b52827d..487b85f1 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/ivy.xml.MD5
+++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/ivy.xml.MD5
@@ -1 +1 @@
-e06b82dc0c33b2acbc1b260acdbf8b8c
+2b88062fbb293f8650a3e1f7d317db7f
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/ant-launcher.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/ant-launcher.jar
new file mode 100644
index 00000000..7c8f849e
Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/ant-launcher.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/ant.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/ant.jar
index 7f5be4a4..70471777 100644
Binary files a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/ant.jar and b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/ant.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/antlr2.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/antlr2.jar
deleted file mode 100644
index 42f25e54..00000000
Binary files a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/antlr2.jar and /dev/null differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/asm.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/asm.jar
deleted file mode 100644
index 7638ae05..00000000
Binary files a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/asm.jar and /dev/null differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/avalon-framework-impl.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/avalon-framework-impl.jar
new file mode 100644
index 00000000..ca61697c
Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/avalon-framework-impl.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/barcode4j-2.1.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/barcode4j.jar
similarity index 100%
rename from liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/barcode4j-2.1.jar
rename to liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/barcode4j.jar
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/batik-anim.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/batik-anim.jar
index 6913e421..2a150b2b 100644
Binary files a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/batik-anim.jar and b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/batik-anim.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/batik-awt-util.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/batik-awt-util.jar
index e64605af..f83b5bd4 100644
Binary files a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/batik-awt-util.jar and b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/batik-awt-util.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/batik-bridge.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/batik-bridge.jar
index 62c10bae..872cf27a 100644
Binary files a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/batik-bridge.jar and b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/batik-bridge.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/batik-css.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/batik-css.jar
index c1f1c9a8..ef3013d0 100644
Binary files a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/batik-css.jar and b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/batik-css.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/batik-dom.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/batik-dom.jar
index 32d5b46d..02064754 100644
Binary files a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/batik-dom.jar and b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/batik-dom.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/batik-ext.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/batik-ext.jar
index 8c904e1f..57fb2732 100644
Binary files a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/batik-ext.jar and b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/batik-ext.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/batik-gvt.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/batik-gvt.jar
index ee47ec82..9aa96868 100644
Binary files a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/batik-gvt.jar and b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/batik-gvt.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/batik-js.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/batik-js.jar
new file mode 100644
index 00000000..ccad3cc1
Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/batik-js.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/batik-parser.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/batik-parser.jar
index 286b3799..b84ad36e 100644
Binary files a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/batik-parser.jar and b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/batik-parser.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/batik-script.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/batik-script.jar
index 433f02e6..a684f1c7 100644
Binary files a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/batik-script.jar and b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/batik-script.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/batik-svg-dom.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/batik-svg-dom.jar
index b4c8a620..463d0e01 100644
Binary files a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/batik-svg-dom.jar and b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/batik-svg-dom.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/batik-util.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/batik-util.jar
index 86d75e70..c50d1ff2 100644
Binary files a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/batik-util.jar and b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/batik-util.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/batik-xml.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/batik-xml.jar
index d05eb25f..45ba1570 100644
Binary files a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/batik-xml.jar and b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/batik-xml.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/bcmail-jdk14.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/bcmail-jdk14.jar
new file mode 100644
index 00000000..ab606b5f
Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/bcmail-jdk14.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/bcprov-jdk14.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/bcprov-jdk14.jar
new file mode 100644
index 00000000..d1befb7f
Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/bcprov-jdk14.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/bctsp-jdk14.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/bctsp-jdk14.jar
new file mode 100644
index 00000000..058fde1e
Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/bctsp-jdk14.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/castor.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/castor.jar
new file mode 100644
index 00000000..5a8d7a66
Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/castor.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/commons-beanutils.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/commons-beanutils.jar
index 6baf5ecb..caf7ae33 100644
Binary files a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/commons-beanutils.jar and b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/commons-beanutils.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/commons-cli.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/commons-cli.jar
new file mode 100644
index 00000000..22a004e1
Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/commons-cli.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/commons-digester.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/commons-digester.jar
index 1110f0aa..a07cfa8e 100644
Binary files a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/commons-digester.jar and b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/commons-digester.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/groovy-all-2.0.1.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/groovy-all-2.0.1.jar
deleted file mode 100644
index aad41857..00000000
Binary files a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/groovy-all-2.0.1.jar and /dev/null differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/iText-2.1.7.js1.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/itext.jar
similarity index 93%
rename from liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/iText-2.1.7.js1.jar
rename to liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/itext.jar
index 0a324006..5d319fcd 100644
Binary files a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/iText-2.1.7.js1.jar and b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/itext.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/jOpenDocument-1.3.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/jOpenDocument.jar
similarity index 100%
rename from liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/jOpenDocument-1.3.jar
rename to liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/jOpenDocument.jar
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/jackson-annotations.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/jackson-annotations.jar
new file mode 100644
index 00000000..88064d07
Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/jackson-annotations.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/jackson-core.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/jackson-core.jar
new file mode 100644
index 00000000..51d1fdeb
Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/jackson-core.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/jackson-databind.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/jackson-databind.jar
new file mode 100644
index 00000000..20f98992
Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/jackson-databind.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jasperreports-fonts-5.0.0.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/jasperreports-fonts.jar
similarity index 99%
rename from liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jasperreports-fonts-5.0.0.jar
rename to liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/jasperreports-fonts.jar
index 63d40a66..c778df33 100644
Binary files a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jasperreports-fonts-5.0.0.jar and b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/jasperreports-fonts.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jasperreports-5.0.0.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/jasperreports.jar
similarity index 65%
rename from liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jasperreports-5.0.0.jar
rename to liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/jasperreports.jar
index f03768ad..41819e1c 100644
Binary files a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/jasperreports-5.0.0.jar and b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/jasperreports.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/jcommon.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/jcommon.jar
new file mode 100644
index 00000000..d0dc26de
Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/jcommon.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/jdtcore.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/jdtcore.jar
new file mode 100644
index 00000000..d9207382
Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/jdtcore.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/jfreechart.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/jfreechart.jar
new file mode 100644
index 00000000..73be90fd
Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/jfreechart.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/junit.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/junit.jar
new file mode 100644
index 00000000..914a5cfa
Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/junit.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/portal-compat-client.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/portal-compat-client.jar
deleted file mode 100644
index 8b2f0105..00000000
Binary files a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/portal-compat-client.jar and /dev/null differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/xalan.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/xalan.jar
new file mode 100644
index 00000000..73cf175f
Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/xalan.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/xml-apis.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/xml-apis.jar
new file mode 100644
index 00000000..d42c0ea6
Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/lib/xml-apis.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/persistence/ReportTaskPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/persistence/ReportTaskPersistenceImpl.java
index 24b521c5..b9edd78f 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/persistence/ReportTaskPersistenceImpl.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/service/persistence/ReportTaskPersistenceImpl.java
@@ -42,6 +42,7 @@ import it.tref.liferay.portos.report.NoSuchReportTaskException;
import it.tref.liferay.portos.report.model.ReportTask;
import it.tref.liferay.portos.report.model.impl.ReportTaskImpl;
import it.tref.liferay.portos.report.model.impl.ReportTaskModelImpl;
+import it.tref.liferay.portos.report.service.persistence.ReportTaskPersistence;
import java.io.Serializable;
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 b9c19dab..05201d92 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=20
- build.date=1601546601661
+ build.number=22
+ build.date=1604073335660
build.auto.upgrade=true
##
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/ivy.xml b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/ivy.xml
index c2fc79d0..89aa194f 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/ivy.xml
+++ b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/ivy.xml
@@ -14,5 +14,11 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/ivy.xml.MD5
index 1c398956..c8cd60e8 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/ivy.xml.MD5
+++ b/liferay-plugins-sdk-6.2/portlets/portos-report-portlet/ivy.xml.MD5
@@ -1 +1 @@
-21fa9f8b1b5d0cad29c66d9d411fb7a4
+3983ec64257638ed926baedf51077cc9