align

liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/audit/service/persistence/AuditEventPersistenceImpl.java

@@ -43,7 +43,6 @@ import it.tref.liferay.portos.audit.NoSuchAuditEventException;
 import it.tref.liferay.portos.audit.model.AuditEvent;
 import it.tref.liferay.portos.audit.model.impl.AuditEventImpl;
 import it.tref.liferay.portos.audit.model.impl.AuditEventModelImpl;
-import it.tref.liferay.portos.audit.service.persistence.AuditEventPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/common/details_column.jsp

@@ -1,4 +1,3 @@
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@page import="com.liferay.portal.kernel.util.TextFormatter"%>
 <%@page import="com.liferay.portal.kernel.json.JSONArray"%>
 <%@page import="it.tref.liferay.portos.audit.model.AuditEvent"%>

liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/common/relations_column.jsp

@@ -1,4 +1,3 @@
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@page import="com.liferay.portal.kernel.util.TextFormatter"%>
 <%@page import="com.liferay.portal.kernel.json.JSONArray"%>
 <%@page import="it.tref.liferay.portos.audit.model.AuditEvent"%>

liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/detail/detail.jsp

@@ -1,4 +1,3 @@
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 
 <%@page import="it.tref.liferay.portos.audit.shared.permission.HistoryPermission"%>
 <%@page import="com.liferay.portal.security.permission.ActionKeys"%>

liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/detail/view.jsp

@@ -1,4 +1,3 @@
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 
 <%@page import="it.tref.liferay.portos.audit.shared.permission.HistoryPermission"%>
 <%@page import="com.liferay.portal.security.permission.ActionKeys"%>

liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/detail/view_list.jsp

@@ -1,4 +1,3 @@
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 
 <%@page import="it.tref.liferay.portos.audit.shared.permission.HistoryPermission"%>
 <%@page import="com.liferay.portal.security.permission.ActionKeys"%>

liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/storicizzazione/edit.jsp

@@ -1,4 +1,3 @@
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 
 <%@ include file="/html/init.jsp" %>
 

liferay-plugins-sdk-6.2/portlets/portos-audit-portlet/docroot/html/storicizzazione/view.jsp

@@ -1,4 +1,3 @@
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 
 <%@ include file="/html/init.jsp" %>
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/liferay-hook.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE hook PUBLIC "-//Liferay//DTD Hook 6.2.0//EN" "http://www.liferay.com/dtd/liferay-hook_6_2_0.dtd">
 
 <hook>

liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/DuplicateFunzionarioException.java

@@ -13,7 +13,6 @@ import com.liferay.portal.kernel.exception.PortalException;
 /**
  * @author 3F Consulting + Manifattura Web Group s.r.l.
  */
-@SuppressWarnings("serial")
 public class DuplicateFunzionarioException extends PortalException {
 
 	public DuplicateFunzionarioException() {

liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/DuplicatePrenotazioneException.java

@@ -13,7 +13,6 @@ import com.liferay.portal.kernel.exception.PortalException;
 /**
  * @author 3F Consulting + Manifattura Web Group s.r.l.
  */
-@SuppressWarnings("serial")
 public class DuplicatePrenotazioneException extends PortalException {
 
 	public DuplicatePrenotazioneException() {

liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/DuplicateProfessionistaException.java

@@ -13,7 +13,6 @@ import com.liferay.portal.kernel.exception.PortalException;
 /**
  * @author 3F Consulting + Manifattura Web Group s.r.l.
  */
-@SuppressWarnings("serial")
 public class DuplicateProfessionistaException extends PortalException {
 
 	public DuplicateProfessionistaException() {

liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/NoSuchDisponibilitaException.java

@@ -13,7 +13,6 @@ import com.liferay.portal.NoSuchModelException;
 /**
  * @author 3F Consulting + Manifattura Web Group s.r.l.
  */
-@SuppressWarnings("serial")
 public class NoSuchDisponibilitaException extends NoSuchModelException {
 
 	public NoSuchDisponibilitaException() {

liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/NoSuchFunzionarioException.java

@@ -13,7 +13,6 @@ import com.liferay.portal.NoSuchModelException;
 /**
  * @author 3F Consulting + Manifattura Web Group s.r.l.
  */
-@SuppressWarnings("serial")
 public class NoSuchFunzionarioException extends NoSuchModelException {
 
 	public NoSuchFunzionarioException() {

liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/NoSuchPrenotazioneException.java

@@ -13,7 +13,6 @@ import com.liferay.portal.NoSuchModelException;
 /**
  * @author 3F Consulting + Manifattura Web Group s.r.l.
  */
-@SuppressWarnings("serial")
 public class NoSuchPrenotazioneException extends NoSuchModelException {
 
 	public NoSuchPrenotazioneException() {

liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/NoSuchProfessionistaException.java

@@ -13,7 +13,6 @@ import com.liferay.portal.NoSuchModelException;
 /**
  * @author 3F Consulting + Manifattura Web Group s.r.l.
  */
-@SuppressWarnings("serial")
 public class NoSuchProfessionistaException extends NoSuchModelException {
 
 	public NoSuchProfessionistaException() {

liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/service/it/tref/portos/calendar/appointments/SlotNotAvailableException.java

@@ -13,7 +13,6 @@ import com.liferay.portal.kernel.exception.PortalException;
 /**
  * @author 3F Consulting + Manifattura Web Group s.r.l.
  */
-@SuppressWarnings("serial")
 public class SlotNotAvailableException extends PortalException {
 
 	public SlotNotAvailableException() {

liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/model/impl/DisponibilitaImpl.java

@@ -20,7 +20,6 @@ package it.tref.portos.calendar.appointments.model.impl;
  *
  * @author 3F Consulting + Manifattura Web Group s.r.l.
  */
-@SuppressWarnings("serial")
 public class DisponibilitaImpl extends DisponibilitaBaseImpl {
 	/*
 	 * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a disponibilita model instance

liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/model/impl/FunzionarioImpl.java

@@ -22,7 +22,6 @@ import com.liferay.portal.kernel.util.StringPool;
  *
  * @author 3F Consulting + Manifattura Web Group s.r.l.
  */
-@SuppressWarnings("serial")
 public class FunzionarioImpl extends FunzionarioBaseImpl {
 	/*
 	 * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a funzionario model instance
@@ -30,7 +29,6 @@ public class FunzionarioImpl extends FunzionarioBaseImpl {
 	 */
 	public FunzionarioImpl() {}
 
-	@Override
   public String getFullDescription() {
     return getNome() + StringPool.SPACE + getCognome();
   }

liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/model/impl/PrenotazioneImpl.java

@@ -24,7 +24,6 @@ import org.apache.commons.lang.time.DateUtils;
  *
  * @author 3F Consulting + Manifattura Web Group s.r.l.
  */
-@SuppressWarnings("serial")
 public class PrenotazioneImpl extends PrenotazioneBaseImpl {
 	/*
 	 * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a prenotazione model instance
@@ -32,9 +31,17 @@ public class PrenotazioneImpl extends PrenotazioneBaseImpl {
 	 */
 	public PrenotazioneImpl() {}
 
-	@Override
   public boolean isExpired(Date now) {
 
-		return now.after(getStartDate()) || DateUtils.isSameDay(now, getStartDate());
+    if (now.after(getStartDate())) {
+      return true;
+    }
+
+    if (DateUtils.isSameDay(now, getStartDate())) {
+      return true;
+
+    }
+
+    return false;
   }
 }

liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/model/impl/ProfessionistaImpl.java

@@ -20,7 +20,6 @@ package it.tref.portos.calendar.appointments.model.impl;
  *
  * @author 3F Consulting + Manifattura Web Group s.r.l.
  */
-@SuppressWarnings("serial")
 public class ProfessionistaImpl extends ProfessionistaBaseImpl {
 	/*
 	 * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a professionista model instance

liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/DisponibilitaLocalServiceImpl.java

@@ -316,10 +316,10 @@ public class DisponibilitaLocalServiceImpl extends DisponibilitaLocalServiceBase
 
 		List<Disponibilita> results = disponibilitaPersistence.findWithDynamicQuery(dynamicQuery);
 		return results;
+	}
 
 	}
 
-	public List<Disponibilita> findByFunzionario_StartDate(long funzionarioId, Date date, long presidio) throws SystemException {
 		Date start = DateUtils.truncate(date, Calendar.DAY_OF_MONTH);
 		Date end = DateUtils.addHours(start, 22);
 		DynamicQuery dynamicQuery = dynamicQuery();
@@ -372,9 +372,9 @@ public class DisponibilitaLocalServiceImpl extends DisponibilitaLocalServiceBase
 			Role dirigenteGenerale = RoleLocalServiceUtil.getRole(user.getCompanyId(), "dirigente_generale");
 			boolean isDirigenteGenerale = RoleLocalServiceUtil.hasUserRole(user.getUserId(), dirigenteGenerale.getRoleId());
 
-			if(isDirigenteGenerale){
+			if (isDirigenteGenerale) {
-
+				List<Organization> orgs =
-				List<Organization> orgs = OrganizationLocalServiceUtil.getOrganizations(-1, -1);
+						OrganizationLocalServiceUtil.getOrganizations(QueryUtil.ALL_POS, QueryUtil.ALL_POS);
 				for (Organization organization : orgs) {
 					if (organization.getParentOrganization() != null) {
 						orgIds.add(organization.getOrganizationId());
@@ -427,9 +427,9 @@ public class DisponibilitaLocalServiceImpl extends DisponibilitaLocalServiceBase
 			Role dirigenteGenerale = RoleLocalServiceUtil.getRole(user.getCompanyId(), "dirigente_generale");
 			boolean isDirigenteGenerale = RoleLocalServiceUtil.hasUserRole(user.getUserId(), dirigenteGenerale.getRoleId());
 
-			if(isDirigenteGenerale){
+			if (isDirigenteGenerale) {
-
+				List<Organization> orgs =
-				List<Organization> orgs = OrganizationLocalServiceUtil.getOrganizations(-1, -1);
+						OrganizationLocalServiceUtil.getOrganizations(QueryUtil.ALL_POS, QueryUtil.ALL_POS);
 				for (Organization organization : orgs) {
 					if (organization.getParentOrganization() != null) {
 						orgIds.add(organization.getOrganizationId());

liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/DisponibilitaServiceImpl.java

@@ -11,6 +11,7 @@ package it.tref.portos.calendar.appointments.service.impl;
 import it.tref.portos.calendar.appointments.model.Disponibilita;
 import it.tref.portos.calendar.appointments.model.Funzionario;
 import it.tref.portos.calendar.appointments.model.Prenotazione;
+import it.tref.portos.calendar.appointments.service.PrenotazioneLocalServiceUtil;
 import it.tref.portos.calendar.appointments.service.base.DisponibilitaServiceBaseImpl;
 
 import java.text.ParseException;
@@ -37,6 +38,7 @@ import com.liferay.portal.service.OrganizationLocalServiceUtil;
 import com.liferay.portal.service.RoleLocalServiceUtil;
 import com.liferay.portal.service.ServiceContext;
 import com.liferay.portal.service.UserGroupRoleLocalServiceUtil;
+import com.liferay.portal.service.UserLocalServiceUtil;
 
 /**
  * The implementation of the disponibilita remote service.
@@ -61,7 +63,6 @@ public class DisponibilitaServiceImpl extends DisponibilitaServiceBaseImpl {
 
 	private static Log _log = LogFactoryUtil.getLog(DisponibilitaServiceImpl.class);
 
-	@Override
 	public Disponibilita addDisponibilita(long userId, long funzionarioId, Date startDate, Date endDate, long presidio,
 			ServiceContext serviceContext) throws SystemException, PortalException {
 
@@ -69,7 +70,6 @@ public class DisponibilitaServiceImpl extends DisponibilitaServiceBaseImpl {
 				serviceContext);
 	}
 
-	@Override
 	public List<Disponibilita> addDisponibilitaGenerale(long presidio, long userId, Date dataInizioDisponibilita,
 			Date dataFineDisponibilita, String giornoSettimana, String oraInizioDisponibilita,
 			String oraFineDisponibilita, ServiceContext serviceContext) throws SystemException, PortalException {
@@ -87,9 +87,7 @@ public class DisponibilitaServiceImpl extends DisponibilitaServiceBaseImpl {
 		return listDisponibilita;
 	}
 
-	@Override
+	public String verifyDisponibilitaByDateHour(String presidio, String date,String[] oreInizio, String idFunzionario) throws SystemException, ParseException {
-	public String verifyDisponibilitaByDateHour(String presidio, String date, String[] oreInizio, String idFunzionario)
-			throws SystemException, ParseException {
 
 		JSONObject json = JSONFactoryUtil.createJSONObject();
 		JSONArray array = JSONFactoryUtil.createJSONArray();
@@ -101,9 +99,18 @@ public class DisponibilitaServiceImpl extends DisponibilitaServiceBaseImpl {
 			String oraInizio = oreInizio[i];
 			jsonFiglio.put("ora", oraInizio);
 			Date dateVerify = formatDateTime(oraInizio, dateVerifyTemp);
-			List<Prenotazione> lista = prenotazioneLocalService.findByDateHourFunzionario(dateVerify,
+
-					Long.parseLong(idFunzionario), org.getGroupId());
+
-			jsonFiglio.put("disponibile", lista.isEmpty());
+			List<Prenotazione> lista =
+					PrenotazioneLocalServiceUtil.findByDateHourFunzionario(
+							dateVerify, Long.parseLong(idFunzionario), org.getGroupId());
+
+			if(lista.isEmpty()){
+				jsonFiglio.put("disponibile", true);
+			} else {
+				jsonFiglio.put("disponibile", false);
+			}
+
 			array.put(jsonFiglio);
 		}
 		json.put("slot", array);
@@ -117,23 +124,32 @@ public class DisponibilitaServiceImpl extends DisponibilitaServiceBaseImpl {
 		Organization organization = OrganizationLocalServiceUtil.fetchOrganization(Long.valueOf(presidio));
 		List<User> userDefinitivo = new ArrayList<User>();
 		try {
-			if (organization != null) {
+
-				List<User> users = userLocalService.getOrganizationUsers(Long.valueOf(presidio));
+			if(organization != null){
+				List<User> users = UserLocalServiceUtil.getOrganizationUsers(Long.valueOf(presidio));
+
 				for (User user : users) {
 					Role portosSupporto = RoleLocalServiceUtil.getRole(organization.getCompanyId(), "portos_supporto");
-					Role portosIstruttore = RoleLocalServiceUtil.getRole(organization.getCompanyId(),
+
-							"portos_calendario");
+					Role portosIstruttore = RoleLocalServiceUtil.getRole(organization.getCompanyId(), "portos_calendario");
-					if (!userLocalService.hasRoleUser(portosSupporto.getRoleId(), user.getUserId())) {
+
-						boolean isIstruttore = UserGroupRoleLocalServiceUtil.hasUserGroupRole(user.getUserId(),
+					if(!UserLocalServiceUtil.hasRoleUser(portosSupporto.getRoleId(), user.getUserId())){
-								organization.getGroupId(), portosIstruttore.getRoleId());
+
-						if (isIstruttore) {
+						boolean isIstruttore = UserGroupRoleLocalServiceUtil.hasUserGroupRole(
+								user.getUserId(), organization.getGroupId(), portosIstruttore.getRoleId());
+
+
+						if(isIstruttore){
 							userDefinitivo.add(user);
 						}
 					}
 				}
 			}
-		} catch (NumberFormatException | PortalException | SystemException e) {
+
-			_log.error(e, e);
+		} catch (NumberFormatException | SystemException e) {
+			_log.error(e,e);
+		} catch (PortalException e) {
+			_log.error(e,e);
 		}
 
 		Date startDate = new SimpleDateFormat("dd/MM/yyyy").parse(date);

liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/FunzionarioLocalServiceImpl.java

@@ -40,7 +40,6 @@ public class FunzionarioLocalServiceImpl extends FunzionarioLocalServiceBaseImpl
 	 * service.
 	 */
 
-	@Override
   public Funzionario addFunzionario(long userId, String nome, String cognome, String presidio, String tipologia,
       ServiceContext serviceContext) throws PortalException, SystemException {
 
@@ -75,7 +74,6 @@ public class FunzionarioLocalServiceImpl extends FunzionarioLocalServiceBaseImpl
 		return this.deleteFunzionario(funzionario);
 	}
 
-	@Override
   public List<Funzionario> findByPresidio(String presidio) throws SystemException {
 
     return funzionarioPersistence.findByPresidio(presidio);

liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/FunzionarioServiceImpl.java

@@ -8,7 +8,6 @@
 
 package it.tref.portos.calendar.appointments.service.impl;
 
-import it.tref.liferay.portos.bo.shared.util.Constants;
 import it.tref.portos.calendar.appointments.model.Funzionario;
 import it.tref.portos.calendar.appointments.service.base.FunzionarioServiceBaseImpl;
 
@@ -23,7 +22,6 @@ import com.liferay.portal.kernel.json.JSONFactoryUtil;
 import com.liferay.portal.kernel.json.JSONObject;
 import com.liferay.portal.kernel.log.Log;
 import com.liferay.portal.kernel.log.LogFactoryUtil;
-import com.liferay.portal.kernel.util.StringPool;
 import com.liferay.portal.kernel.util.Validator;
 import com.liferay.portal.model.Organization;
 import com.liferay.portal.model.Role;
@@ -32,6 +30,8 @@ import com.liferay.portal.service.OrganizationLocalServiceUtil;
 import com.liferay.portal.service.RoleLocalServiceUtil;
 import com.liferay.portal.service.ServiceContext;
 import com.liferay.portal.service.UserGroupRoleLocalServiceUtil;
+import com.liferay.portal.service.UserLocalServiceUtil;
+import it.tref.liferay.portos.bo.shared.util.Constants;
 
 /**
  * The implementation of the funzionario remote service.
@@ -55,56 +55,64 @@ public class FunzionarioServiceImpl extends FunzionarioServiceBaseImpl {
 
 	private static Log _log = LogFactoryUtil.getLog(FunzionarioServiceImpl.class);
 
-	@Override
   public Funzionario addFunzionario(long userId, String nome, String cognome, String presidio, String tipologia,
       ServiceContext serviceContext) throws PortalException, SystemException {
 
 		return funzionarioLocalService.addFunzionario(userId, nome, cognome, presidio, tipologia, serviceContext);
 	}
 
-	@Override
   public String getFunzionariByPresidio(String presidio) {
 
 	JSONArray json = JSONFactoryUtil.createJSONArray();
 	try {
 		Organization organization = OrganizationLocalServiceUtil.fetchOrganization(Long.valueOf(presidio));
-			if (organization != null) {
+		if(organization != null){
-				List<User> users = userLocalService.getOrganizationUsers(Long.valueOf(presidio));
+
+			List<User> users = UserLocalServiceUtil.getOrganizationUsers(Long.valueOf(presidio));
+
+			//Bug 32935
 			Collections.sort(users, new UserComparator());
 			for (User user : users) {
 				Role portosSupporto = RoleLocalServiceUtil.getRole(organization.getCompanyId(), "portos_supporto");
-					Role portosGeologo = RoleLocalServiceUtil.getRole(organization.getCompanyId(),
+
-							Constants.ROLE_NAME_GEOLOGO);
+				Role portosGeologo = RoleLocalServiceUtil.getRole(organization.getCompanyId(), Constants.ROLE_NAME_GEOLOGO);
-					Role portosCalendario = RoleLocalServiceUtil.getRole(organization.getCompanyId(),
+
-							"portos_calendario");
+				Role portosCalendario = RoleLocalServiceUtil.getRole(organization.getCompanyId(), "portos_calendario");
-					Role portosIstruttore = RoleLocalServiceUtil.getRole(organization.getCompanyId(),
+
-							Constants.ROLE_NAME_ISTRUTTORE);
+				Role portosIstruttore = RoleLocalServiceUtil.getRole(organization.getCompanyId(), Constants.ROLE_NAME_ISTRUTTORE);
-					if (!userLocalService.hasRoleUser(portosSupporto.getRoleId(), user.getUserId())) {
+
-						boolean isCalendario = UserGroupRoleLocalServiceUtil.hasUserGroupRole(user.getUserId(),
+				if(!UserLocalServiceUtil.hasRoleUser(portosSupporto.getRoleId(), user.getUserId())){
-								organization.getGroupId(), portosCalendario.getRoleId());
+
-						boolean isIstruttore = UserGroupRoleLocalServiceUtil.hasUserGroupRole(user.getUserId(),
+					boolean isCalendario = UserGroupRoleLocalServiceUtil.hasUserGroupRole(
-								organization.getGroupId(), portosIstruttore.getRoleId());
+							user.getUserId(), organization.getGroupId(), portosCalendario.getRoleId());
-						boolean isGeologo = userLocalService.hasRoleUser(portosGeologo.getRoleId(),
+
-								user.getUserId());
+					boolean isIstruttore = UserGroupRoleLocalServiceUtil.hasUserGroupRole(
-						if (isCalendario) {
+							user.getUserId(), organization.getGroupId(), portosIstruttore.getRoleId());
+
+					boolean isGeologo = UserLocalServiceUtil.hasRoleUser(portosGeologo.getRoleId(), user.getUserId());
+
+
+					if(isCalendario){
 						JSONObject jsonFunzionario = JSONFactoryUtil.createJSONObject();
 						jsonFunzionario.put("id", user.getUserId());
 						jsonFunzionario.put("nome", user.getFirstName());
 						jsonFunzionario.put("cognome", user.getLastName());
-							if (isIstruttore) {
+						if(isIstruttore){
 							jsonFunzionario.put("tipologia", "Istruttore");
-							} else if (isGeologo) {
+						} else if(isGeologo){
 							jsonFunzionario.put("tipologia", "Geologo");
 						} else {
-								jsonFunzionario.put("tipologia", StringPool.BLANK);
+							jsonFunzionario.put("tipologia", "");
 						}
 						json.put(jsonFunzionario);
 					}
 				}
 			}
 		}
-		} catch (NumberFormatException | PortalException | SystemException e) {
+	} catch (NumberFormatException | SystemException e) {
-			_log.error(e, e);
+		_log.error(e,e);
+	} catch (PortalException e) {
+		_log.error(e,e);
 	}
     return json.toString();
   }

liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/service/impl/PrenotazioneServiceImpl.java

@@ -10,6 +10,7 @@ package it.tref.portos.calendar.appointments.service.impl;
 
 import it.tref.portos.calendar.appointments.SlotNotAvailableException;
 import it.tref.portos.calendar.appointments.model.Prenotazione;
+import it.tref.portos.calendar.appointments.service.PrenotazioneLocalServiceUtil;
 import it.tref.portos.calendar.appointments.service.base.PrenotazioneServiceBaseImpl;
 
 import java.text.ParseException;
@@ -34,6 +35,7 @@ import com.liferay.portal.service.OrganizationLocalServiceUtil;
 import com.liferay.portal.service.RoleLocalServiceUtil;
 import com.liferay.portal.service.ServiceContext;
 import com.liferay.portal.service.UserGroupRoleLocalServiceUtil;
+import com.liferay.portal.service.UserLocalServiceUtil;
 
 /**
  * The implementation of the prenotazione remote service.
@@ -57,7 +59,7 @@ public class PrenotazioneServiceImpl extends PrenotazioneServiceBaseImpl {
 
 	private static Log _log = LogFactoryUtil.getLog(PrenotazioneServiceImpl.class);
 
-	@Override
+	//Product Backlog Item 32934
 	public void addPrenotazione(long userId, long funzionarioId, long professionistaId, Date startDate, Date endDate,
 			String descrizione, String telefono, String email, long presidio, ServiceContext serviceContext)
 			throws SystemException, PortalException {
@@ -69,11 +71,10 @@ public class PrenotazioneServiceImpl extends PrenotazioneServiceBaseImpl {
 				descrizione, telefono, email, presidio, serviceContext);
 	}
 
-	@Override
 	public void updatePrenotazione(long prenotazioneId, long userId, Date startDate, Date endDate, String descrizione,
 			ServiceContext serviceContext) throws SystemException, PortalException {
 
-		Prenotazione prenotazione = prenotazioneLocalService.fetchPrenotazione(prenotazioneId);
+		Prenotazione prenotazione = PrenotazioneLocalServiceUtil.fetchPrenotazione(prenotazioneId);
 		if (prenotazione.getUserId() != userId) {
 			throw new SystemException("error.calendar.appointments.prenotazione.not.allowed.update " + prenotazioneId
 					+ " user " + userId);
@@ -81,37 +82,50 @@ public class PrenotazioneServiceImpl extends PrenotazioneServiceBaseImpl {
 		prenotazioneLocalService.updatePrenotazione(prenotazioneId, startDate, endDate, descrizione, serviceContext);
 	}
 
-	@Override
 	public void deletePrenotazione(long prenotazioneId, long userId) throws SystemException, PortalException {
 
+		Prenotazione prenotazione = PrenotazioneLocalServiceUtil.fetchPrenotazione(prenotazioneId);
+
+		//Product Backlog Item 32933
+//		if (prenotazione.getUserId() != userId) {
+//			throw new SystemException("error.calendar.appointments.prenotazione.not.allowed.update " + prenotazioneId
+//					+ " user " + userId);
+//		}
+
 		prenotazioneLocalService.deletePrenotazione(prenotazioneId);
 	}
 
-	@Override
+	public String getPrenotazioniByDate(String presidio, String date, String userId) throws SystemException, ParseException {
-	public String getPrenotazioniByDate(String presidio, String date, String userId) throws SystemException,
-			ParseException {
 
 		long loggetUserId = Long.parseLong(userId);
 		Organization organization = OrganizationLocalServiceUtil.fetchOrganization(Long.valueOf(presidio));
 		List<User> userDefinitivo = new ArrayList<User>();
 		try {
-			if (organization != null) {
+			if(organization != null){
-				List<User> users = userLocalService.getOrganizationUsers(Long.valueOf(presidio));
+				List<User> users = UserLocalServiceUtil.getOrganizationUsers(Long.valueOf(presidio));
+
 				for (User user : users) {
 					Role portosSupporto = RoleLocalServiceUtil.getRole(organization.getCompanyId(), "portos_supporto");
-					Role portosIstruttore = RoleLocalServiceUtil.getRole(organization.getCompanyId(),
+
-							"portos_calendario");
+					Role portosIstruttore = RoleLocalServiceUtil.getRole(organization.getCompanyId(), "portos_calendario");
-					if (!userLocalService.hasRoleUser(portosSupporto.getRoleId(), user.getUserId())) {
+
-						boolean isIstruttore = UserGroupRoleLocalServiceUtil.hasUserGroupRole(user.getUserId(),
+					if(!UserLocalServiceUtil.hasRoleUser(portosSupporto.getRoleId(), user.getUserId())){
-								organization.getGroupId(), portosIstruttore.getRoleId());
+
-						if (isIstruttore) {
+						boolean isIstruttore = UserGroupRoleLocalServiceUtil.hasUserGroupRole(
+								user.getUserId(), organization.getGroupId(), portosIstruttore.getRoleId());
+
+
+						if(isIstruttore){
 							userDefinitivo.add(user);
 						}
 					}
 				}
 			}
-		} catch (NumberFormatException | PortalException | SystemException e) {
+
-			_log.error(e, e);
+		} catch (NumberFormatException | SystemException e) {
+			_log.error(e,e);
+		} catch (PortalException e) {
+			_log.error(e,e);
 		}
 
 		Date startDate = new SimpleDateFormat("dd/MM/yyyy").parse(date);
@@ -132,8 +146,10 @@ public class PrenotazioneServiceImpl extends PrenotazioneServiceBaseImpl {
 				jsonPrenotazione.put("idPrenotazione", prenotazione.getPrenotazioneId());
 				jsonPrenotazione.put("inizio", sdf.format(prenotazione.getStartDate()));
 				jsonPrenotazione.put("fine", sdf.format(prenotazione.getEndDate()));
-				User richiedente = userLocalService.fetchUser(prenotazione.getProfessionistaId());
+
-				if (loggetUserId == prenotazione.getProfessionistaId()) {
+				User richiedente = UserLocalServiceUtil.fetchUser(prenotazione.getProfessionistaId());
+
+				if(loggetUserId == prenotazione.getProfessionistaId()){
 					jsonPrenotazione.put("visible", true);
 				} else {
 					jsonPrenotazione.put("visible", canSeeFullInformations(loggetUserId));
@@ -154,8 +170,9 @@ public class PrenotazioneServiceImpl extends PrenotazioneServiceBaseImpl {
 	private boolean canSeeFullInformations(long loggetUserId) throws SystemException {
 
 		boolean canDo = false;
-		User user = userLocalService.fetchUser(loggetUserId);
+
-		if (user != null) {
+		User user = UserLocalServiceUtil.fetchUser(loggetUserId);
+		if(user != null){
 			Group siteBO = GroupLocalServiceUtil.fetchGroup(user.getCompanyId(), "Portos BackOffice");
 			boolean isBoUser = GroupLocalServiceUtil.hasUserGroup(user.getUserId(), siteBO.getGroupId());
 			if (isBoUser) {
@@ -165,7 +182,6 @@ public class PrenotazioneServiceImpl extends PrenotazioneServiceBaseImpl {
 		return canDo;
 	}
 
-	@Override
 	public boolean isSlotAvailable(long funzionarioId, Date startDate, Date endDate) throws SystemException {
 
 		return prenotazioneLocalService.getAvailableSlotByStartDate_EndDate(funzionarioId, startDate, endDate) == 0;

liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/WEB-INF/src/it/tref/portos/calendar/appointments/util/CalendarUtil.java

@@ -5,6 +5,7 @@ import it.tref.portos.calendar.appointments.model.Prenotazione;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 import java.util.regex.Matcher;
@@ -13,6 +14,8 @@ import java.util.regex.Pattern;
 import javax.mail.internet.AddressException;
 import javax.mail.internet.InternetAddress;
 
+import org.apache.log4j.net.TelnetAppender;
+
 import com.liferay.mail.service.MailServiceUtil;
 import com.liferay.portal.kernel.exception.SystemException;
 import com.liferay.portal.kernel.mail.MailMessage;

liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/init.jsp

@@ -1,4 +1,3 @@
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@page import="java.util.ArrayList"%>
 <%@page import="com.liferay.portal.model.Role"%>
 <%@page import="com.liferay.portal.service.UserGroupRoleLocalServiceUtil"%>

liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/tabs/amministrazione.jsp

@@ -1,4 +1,3 @@
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@page import="it.tref.portos.calendar.appointments.service.PrenotazioneLocalServiceUtil"%>
 <%@page import="com.liferay.portal.service.OrganizationLocalServiceUtil"%>
 <%@page import="com.liferay.portal.model.Organization"%>

liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/tabs/calendar.jsp

@@ -1,4 +1,3 @@
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@page import="com.liferay.portal.service.OrganizationLocalServiceUtil"%>
 <%@page import="com.liferay.portal.model.Organization"%>
 <%@page import="it.tref.portos.calendar.appointments.service.DisponibilitaLocalServiceUtil"%>

liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/tabs/gestione_disponibilita_action.jsp

@@ -1,4 +1,3 @@
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@page import="it.tref.portos.calendar.appointments.model.Disponibilita"%>
 <%@ include file="/html/calendar_appointments/init.jsp" %>
 

liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/calendar_appointments/view.jsp

@@ -1,4 +1,3 @@
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@page import="com.liferay.portal.service.GroupLocalServiceUtil"%>
 <%@ include file="/html/calendar_appointments/init.jsp" %>
 <%

liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/html/init.jsp

@@ -1,4 +1,3 @@
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@page import="java.text.Format"%>
 <%@page import="com.liferay.portal.kernel.util.FastDateFormatFactoryUtil"%>
 <%@page import="com.liferay.portal.kernel.util.StringUtil"%>

liferay-plugins-sdk-6.2/portlets/portos-calendar-appointments-portlet/docroot/view.jsp

@@ -1,4 +1,3 @@
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.

liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/companyconfig/portlet/CompanyConfigurationPortlet.java

@@ -2,8 +2,6 @@ package it.tref.liferay.portos.companyconfig.portlet;
 
 import com.liferay.portal.kernel.exception.PortalException;
 import com.liferay.portal.kernel.exception.SystemException;
-import com.liferay.portal.kernel.log.Log;
-import com.liferay.portal.kernel.log.LogFactoryUtil;
 import com.liferay.portal.model.Company;
 import com.liferay.portal.service.CompanyLocalServiceUtil;
 import com.liferay.portal.service.ServiceContext;

liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/docroot/html/company_configuration/init.jsp

@@ -1,3 +1,4 @@
+<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@include file="/html/init.jsp" %>
 
 <%@page import="com.liferay.portal.kernel.util.ParamUtil"%>

liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/docroot/html/company_configuration/view.jsp

@@ -1,3 +1,4 @@
+<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@page import="javax.portlet.PortletURL"%>
 <%@page import="javax.portlet.PortletRequest"%>
 <%@page import="com.liferay.portal.util.PortletKeys"%>
@@ -16,12 +17,9 @@ companyCustomFieldsURL.setParameter("modelResource", Company.class.getName());
 <div class="separator"></div>
 <aui:form name="fm" action="<%=saveCustomFieldsURL.toString() %>">
 	<aui:fieldset>
-		<liferay-ui:custom-attribute-list
+		<liferay-ui:custom-attribute-list className="<%= Company.class.getName() %>"
-			className="<%= Company.class.getName() %>"
 				classPK="<%= (company != null) ? company.getCompanyId() : 0 %>"
-			editable="<%= true %>"
+				editable="true" label="true" />
-			label="<%= true %>"
-		/>
 	</aui:fieldset>
 	<aui:button type="submit" value="btn-save-custom-fields"></aui:button>
 </aui:form>

liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/docroot/html/init.jsp

@@ -1,4 +1,3 @@
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 
 <%@taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>

liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/WEB-INF/liferay-hook.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hook PUBLIC "-//Liferay//DTD Hook 6.2.0//EN" "http://www.liferay.com/dtd/liferay-hook_6_2_0.dtd">
 
 <hook>

liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/init.jsp

@@ -1,3 +1,4 @@
+<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 
 <%@page import="java.text.SimpleDateFormat"%>
 <%@page import="com.liferay.portlet.PortletURLUtil"%>

liferay-plugins-sdk-6.2/portlets/portos-cookies-portlet/docroot/view.jsp

@@ -1,3 +1,4 @@
+<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@page import="com.liferay.portal.util.PortalUtil"%>
 <%@page import="com.liferay.portal.kernel.util.Validator"%>
 <%@page import="com.liferay.portal.kernel.util.StringPool"%>

liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/service.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE service-builder PUBLIC "-//Liferay//DTD Service Builder 6.2.0//EN" "http://www.liferay.com/dtd/liferay-service-builder_6_2_0.dtd">
 <service-builder package-path="it.tref.liferay.portos.deployalert">
 	<author>Matteo</author>

liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/control/DeployAlertControl.java

@@ -8,6 +8,7 @@ import com.liferay.portlet.BaseControlPanelEntry;
 
 public class DeployAlertControl extends BaseControlPanelEntry {
 
+	@Override
 	public boolean hasAccessPermission(PermissionChecker permissionChecker, Group group, Portlet portlet)
 			throws Exception {
 

liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/portlet/NotificatorPortlet.java

@@ -13,10 +13,6 @@ import it.tref.liferay.portos.deployalert.service.NotificationMailLocalServiceUt
 
 import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
-
-/**
- * Portlet implementation class AdminDeployNotificatorPortlet
- */
 public class NotificatorPortlet extends MVCPortlet {
 
 	public void addNotification(ActionRequest request, ActionResponse response) throws PortalException, SystemException {

liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/service/impl/NotificationLogLocalServiceImpl.java

@@ -35,6 +35,7 @@ import java.util.Date;
  */
 public class NotificationLogLocalServiceImpl extends NotificationLogLocalServiceBaseImpl {
 
+	@Override
 	public NotificationLog addNotification(String nomePlugin, String tipo) throws SystemException, PortalException {
 
 		Date now = new Date();

liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/service/impl/NotificationMailLocalServiceImpl.java

@@ -44,6 +44,7 @@ import java.util.List;
  */
 public class NotificationMailLocalServiceImpl extends NotificationMailLocalServiceBaseImpl {
 
+	@Override
 	public NotificationMail addNotification(String nomePlugin, String nomeTemplate, ServiceContext serviceContext)
 			throws PortalException, SystemException {
 
@@ -75,6 +76,7 @@ public class NotificationMailLocalServiceImpl extends NotificationMailLocalServi
 		}
 	}
 
+	@Override
 	public NotificationMail updateNotification(String nomePlugin, String nomeTemplate, ServiceContext serviceContext,
 			long notificationId) throws SystemException, PortalException {
 
@@ -89,10 +91,10 @@ public class NotificationMailLocalServiceImpl extends NotificationMailLocalServi
 		return notification;
 	}
 
+	@Override
 	public List<NotificationMail> findNotifications(long companyId, int start, int end) throws SystemException {
 
-    // return notificationMailPersistence.findBycompanyId(companyId, start, end);
+		DynamicQuery query = dynamicQuery();
-    DynamicQuery query = notificationMailLocalService.dynamicQuery();
 		query.addOrder(OrderFactoryUtil.asc("nomePlugin"));
 		List<NotificationMail> notifications = null;
 		try {
@@ -103,30 +105,30 @@ public class NotificationMailLocalServiceImpl extends NotificationMailLocalServi
 		return notifications;
 	}
 
+	@Override
 	public List<NotificationMail> findNotifications(long companyId) throws SystemException {
 
 		return notificationMailPersistence.findBycompanyId(companyId);
 	}
 
+	@Override
 	public int getNotificationCount(long companyId) throws SystemException {
 
 		return notificationMailPersistence.countBycompanyId(companyId);
 	}
 
+	@Override
 	public List<NotificationMail> findNotifications(long companyId, String servletContextName) throws SystemException {
 
-    DynamicQuery dynamicQuery = notificationMailLocalService.dynamicQuery();
+		DynamicQuery dynamicQuery = dynamicQuery();
-
 		if (Validator.isNull(servletContextName)) {
 			Disjunction or = RestrictionsFactoryUtil.disjunction();
 			or.add(RestrictionsFactoryUtil.isNull("nomePlugin"));
 			or.add(RestrictionsFactoryUtil.eq("nomePlugin", StringPool.BLANK));
-
 			dynamicQuery.add(or);
 		} else {
 			dynamicQuery.add(RestrictionsFactoryUtil.eq("nomePlugin", servletContextName));
 		}
-
 		return notificationMailPersistence.findWithDynamicQuery(dynamicQuery);
 	}
 }

liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/service/persistence/NotificationLogPersistenceImpl.java

@@ -45,6 +45,7 @@ import it.tref.liferay.portos.deployalert.NoSuchNotificationLogException;
 import it.tref.liferay.portos.deployalert.model.NotificationLog;
 import it.tref.liferay.portos.deployalert.model.impl.NotificationLogImpl;
 import it.tref.liferay.portos.deployalert.model.impl.NotificationLogModelImpl;
+import it.tref.liferay.portos.deployalert.service.persistence.NotificationLogPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/service/persistence/NotificationMailPersistenceImpl.java

@@ -45,6 +45,7 @@ import it.tref.liferay.portos.deployalert.NoSuchNotificationMailException;
 import it.tref.liferay.portos.deployalert.model.NotificationMail;
 import it.tref.liferay.portos.deployalert.model.impl.NotificationMailImpl;
 import it.tref.liferay.portos.deployalert.model.impl.NotificationMailModelImpl;
+import it.tref.liferay.portos.deployalert.service.persistence.NotificationMailPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/deployalert/util/DeployAlertUtil.java

@@ -1,5 +1,11 @@
 package it.tref.liferay.portos.deployalert.util;
 
+import it.tref.liferay.portos.deployalert.constants.MailConstants;
+import it.tref.liferay.portos.mailmanager.shared.messaging.util.MailManagerUtil;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
 import com.liferay.portal.kernel.exception.SystemException;
 import com.liferay.portal.kernel.json.JSONFactoryUtil;
 import com.liferay.portal.kernel.json.JSONObject;

liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/html/init.jsp

@@ -1,3 +1,4 @@
+<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 
 <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 

liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/html/notificator/edit_notification.jsp

@@ -1,3 +1,4 @@
+<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@page import="com.liferay.portal.kernel.util.Validator"%>
 <%@page import="com.liferay.portal.kernel.util.StringUtil"%>
 <%@ include file="/html/notificator/init.jsp"%>

liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/html/notificator/init.jsp

@@ -1,3 +1,4 @@
+<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@ include file="/html/init.jsp"%>
 <%@ page
 	import="it.tref.liferay.portos.deployalert.service.NotificationMailLocalServiceUtil"%>

liferay-plugins-sdk-6.2/portlets/portos-deploy-alert-portlet/docroot/html/notificator/view.jsp

@@ -1,3 +1,4 @@
+<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@ include file="/html/notificator/init.jsp"%>
 
 <aui:button-row>

liferay-plugins-sdk-6.2/portlets/portos-firma-portlet/docroot/WEB-INF/liferay-hook.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hook PUBLIC "-//Liferay//DTD Hook 6.2.0//EN" "http://www.liferay.com/dtd/liferay-hook_6_2_0.dtd">
 
 <hook>

liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/liferay-portlet.xml

@@ -2,10 +2,18 @@
 <!DOCTYPE liferay-portlet-app PUBLIC "-//Liferay//DTD Portlet Application 6.2.0//EN" "http://www.liferay.com/dtd/liferay-portlet-app_6_2_0.dtd">
 
 <liferay-portlet-app>
-	
 	<portlet>
 		<portlet-name>1</portlet-name>
 		<icon></icon>
+		<scheduler-entry>
+			<scheduler-event-listener-class>it.tref.liferay.portos.kaleo.controller.scheduler.SchedulerKaleoController</scheduler-event-listener-class>
+			<trigger>
+				<simple>
+					<simple-trigger-value>240</simple-trigger-value>
+					<time-unit>second</time-unit>
+				</simple>
+			</trigger>
+		</scheduler-entry>
 		<header-portlet-css></header-portlet-css>
 		<footer-portlet-javascript></footer-portlet-javascript>
 		<css-class-wrapper></css-class-wrapper>

liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/service.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE service-builder PUBLIC "-//Liferay//DTD Service Builder 6.1.0//EN" "http://www.liferay.com/dtd/liferay-service-builder_6_1_0.dtd">
 <service-builder package-path="it.tref.liferay.portos.kaleo.controller">
 	<author>3FC + Manifattura Web Group s.r.l.</author>

liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoInstanceTokenImpl.java

@@ -19,7 +19,6 @@ package it.tref.liferay.portos.kaleo.controller.model.impl;
  *
  * @author 3FC + Manifattura Web Group s.r.l.
  */
-@SuppressWarnings("serial")
 public class KaleoInstanceTokenImpl extends KaleoInstanceTokenBaseImpl {
 	/*
 	 * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a kaleo instance token model

liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoLogImpl.java

@@ -19,7 +19,6 @@ package it.tref.liferay.portos.kaleo.controller.model.impl;
  *
  * @author 3FC + Manifattura Web Group s.r.l.
  */
-@SuppressWarnings("serial")
 public class KaleoLogImpl extends KaleoLogBaseImpl {
 	/*
 	 * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a kaleo log model instance

liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoNodeImpl.java

@@ -19,7 +19,6 @@ package it.tref.liferay.portos.kaleo.controller.model.impl;
  *
  * @author 3FC + Manifattura Web Group s.r.l.
  */
-@SuppressWarnings("serial")
 public class KaleoNodeImpl extends KaleoNodeBaseImpl {
 	/*
 	 * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a kaleo node model instance

liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoTaskAssignmentInstanceImpl.java

@@ -19,8 +19,8 @@ package it.tref.liferay.portos.kaleo.controller.model.impl;
  *
  * @author 3FC + Manifattura Web Group s.r.l.
  */
-@SuppressWarnings("serial")
+public class KaleoTaskAssignmentInstanceImpl
-public class KaleoTaskAssignmentInstanceImpl extends KaleoTaskAssignmentInstanceBaseImpl {
+	extends KaleoTaskAssignmentInstanceBaseImpl {
 	/*
 	 * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a kaleo task assignment
 	 * instance model instance should use the {@link

liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoTaskImpl.java

@@ -19,7 +19,6 @@ package it.tref.liferay.portos.kaleo.controller.model.impl;
  *
  * @author 3FC + Manifattura Web Group s.r.l.
  */
-@SuppressWarnings("serial")
 public class KaleoTaskImpl extends KaleoTaskBaseImpl {
 	/*
 	 * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a kaleo task model instance

liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoTaskInstanceTokenImpl.java

@@ -19,7 +19,6 @@ package it.tref.liferay.portos.kaleo.controller.model.impl;
  *
  * @author 3FC + Manifattura Web Group s.r.l.
  */
-@SuppressWarnings("serial")
 public class KaleoTaskInstanceTokenImpl extends KaleoTaskInstanceTokenBaseImpl {
 	/*
 	 * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a kaleo task instance token

liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/service/persistence/KaleoInstancePersistenceImpl.java

@@ -42,6 +42,7 @@ import it.tref.liferay.portos.kaleo.controller.NoSuchKaleoInstanceException;
 import it.tref.liferay.portos.kaleo.controller.model.KaleoInstance;
 import it.tref.liferay.portos.kaleo.controller.model.impl.KaleoInstanceImpl;
 import it.tref.liferay.portos.kaleo.controller.model.impl.KaleoInstanceModelImpl;
+import it.tref.liferay.portos.kaleo.controller.service.persistence.KaleoInstancePersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/service/persistence/KaleoInstanceTokenPersistenceImpl.java

@@ -42,6 +42,7 @@ import it.tref.liferay.portos.kaleo.controller.NoSuchKaleoInstanceTokenException
 import it.tref.liferay.portos.kaleo.controller.model.KaleoInstanceToken;
 import it.tref.liferay.portos.kaleo.controller.model.impl.KaleoInstanceTokenImpl;
 import it.tref.liferay.portos.kaleo.controller.model.impl.KaleoInstanceTokenModelImpl;
+import it.tref.liferay.portos.kaleo.controller.service.persistence.KaleoInstanceTokenPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/service/persistence/KaleoLogPersistenceImpl.java

@@ -43,6 +43,7 @@ import it.tref.liferay.portos.kaleo.controller.NoSuchKaleoLogException;
 import it.tref.liferay.portos.kaleo.controller.model.KaleoLog;
 import it.tref.liferay.portos.kaleo.controller.model.impl.KaleoLogImpl;
 import it.tref.liferay.portos.kaleo.controller.model.impl.KaleoLogModelImpl;
+import it.tref.liferay.portos.kaleo.controller.service.persistence.KaleoLogPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/service/persistence/KaleoNodePersistenceImpl.java

@@ -41,6 +41,7 @@ import it.tref.liferay.portos.kaleo.controller.NoSuchKaleoNodeException;
 import it.tref.liferay.portos.kaleo.controller.model.KaleoNode;
 import it.tref.liferay.portos.kaleo.controller.model.impl.KaleoNodeImpl;
 import it.tref.liferay.portos.kaleo.controller.model.impl.KaleoNodeModelImpl;
+import it.tref.liferay.portos.kaleo.controller.service.persistence.KaleoNodePersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/service/persistence/KaleoTaskAssignmentInstancePersistenceImpl.java

@@ -42,6 +42,7 @@ import it.tref.liferay.portos.kaleo.controller.NoSuchKaleoTaskAssignmentInstance
 import it.tref.liferay.portos.kaleo.controller.model.KaleoTaskAssignmentInstance;
 import it.tref.liferay.portos.kaleo.controller.model.impl.KaleoTaskAssignmentInstanceImpl;
 import it.tref.liferay.portos.kaleo.controller.model.impl.KaleoTaskAssignmentInstanceModelImpl;
+import it.tref.liferay.portos.kaleo.controller.service.persistence.KaleoTaskAssignmentInstancePersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/service/persistence/KaleoTaskInstanceTokenPersistenceImpl.java

@@ -42,6 +42,7 @@ import it.tref.liferay.portos.kaleo.controller.NoSuchKaleoTaskInstanceTokenExcep
 import it.tref.liferay.portos.kaleo.controller.model.KaleoTaskInstanceToken;
 import it.tref.liferay.portos.kaleo.controller.model.impl.KaleoTaskInstanceTokenImpl;
 import it.tref.liferay.portos.kaleo.controller.model.impl.KaleoTaskInstanceTokenModelImpl;
+import it.tref.liferay.portos.kaleo.controller.service.persistence.KaleoTaskInstanceTokenPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/service/persistence/KaleoTaskPersistenceImpl.java

@@ -40,6 +40,7 @@ import it.tref.liferay.portos.kaleo.controller.NoSuchKaleoTaskException;
 import it.tref.liferay.portos.kaleo.controller.model.KaleoTask;
 import it.tref.liferay.portos.kaleo.controller.model.impl.KaleoTaskImpl;
 import it.tref.liferay.portos.kaleo.controller.model.impl.KaleoTaskModelImpl;
+import it.tref.liferay.portos.kaleo.controller.service.persistence.KaleoTaskPersistence;
 
 import java.io.Serializable;
 

liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/liferay-hook.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE hook PUBLIC "-//Liferay//DTD Hook 6.2.0//EN" "http://www.liferay.com/dtd/liferay-hook_6_2_0.dtd">
 
 <hook>

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

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE service-builder PUBLIC "-//Liferay//DTD Service Builder 6.2.0//EN" "http://www.liferay.com/dtd/liferay-service-builder_6_2_0.dtd">
 <service-builder package-path="it.tref.liferay.portos.kaleo">
 	<author></author>

liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/model/impl/FormDefinitionLinkImpl.java

@@ -19,7 +19,6 @@ package it.tref.liferay.portos.kaleo.model.impl;
  *
  * @author
  */
-@SuppressWarnings("serial")
 public class FormDefinitionLinkImpl extends FormDefinitionLinkBaseImpl {
 	/*
 	 * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a form definition link model

liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/model/impl/FormLogImpl.java

@@ -18,7 +18,6 @@ package it.tref.liferay.portos.kaleo.model.impl;
  *
  * @author
  */
-@SuppressWarnings("serial")
 public class FormLogImpl extends FormLogBaseImpl {
 	/*
 	 * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a form log model instance

liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/model/impl/FormTemplateLinkImpl.java

@@ -19,7 +19,6 @@ package it.tref.liferay.portos.kaleo.model.impl;
  *
  * @author
  */
-@SuppressWarnings("serial")
 public class FormTemplateLinkImpl extends FormTemplateLinkBaseImpl {
 	/*
 	 * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a form template link model

liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/portlet/WorkflowFormAdminPortletControlPanelEntry.java

@@ -12,6 +12,11 @@ public class WorkflowFormAdminPortletControlPanelEntry extends BaseControlPanelE
 	protected boolean hasAccessPermissionDenied(PermissionChecker permissionChecker, Group group, Portlet portlet)
 			throws Exception {
 
-		return group.isLayoutSetPrototype() || !WorkflowEngineManagerUtil.isDeployed();
+    if (group.isLayoutSetPrototype() || !WorkflowEngineManagerUtil.isDeployed()) {
+
+      return true;
+    }
+
+    return false;
   }
 }

liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/service/impl/FormDefinitionLinkLocalServiceImpl.java

@@ -48,7 +48,6 @@ public class FormDefinitionLinkLocalServiceImpl extends FormDefinitionLinkLocalS
 	 * service.
 	 */
 
-	@Override
   public FormDefinitionLink addFormDefinitionLink(String name, String definitionName, int definitionVersion,
       long ddmStructureId, ServiceContext serviceContext) throws PortalException, SystemException {
 
@@ -67,7 +66,6 @@ public class FormDefinitionLinkLocalServiceImpl extends FormDefinitionLinkLocalS
 		return addFormDefinitionLink(formDefinitionLink);
 	}
 
-	@Override
   public FormDefinitionLink updateFormDefinitionLink(long formDefinitionLinkId, String name, String definitionName,
       int definitionVersion, long ddmStructureId, ServiceContext serviceContext) throws PortalException,
       SystemException {
@@ -101,44 +99,39 @@ public class FormDefinitionLinkLocalServiceImpl extends FormDefinitionLinkLocalS
 		return formDefinitionLink;
 	}
 
-	@Override
   public int countByCompany(long companyId) throws SystemException {
-
     return formDefinitionLinkPersistence.countByCompany(companyId);
   }
 
-	@Override
   public List<FormDefinitionLink> findByCompany(long companyId) throws SystemException {
-
     return formDefinitionLinkPersistence.findByCompany(companyId);
   }
 
-	@Override
   public List<FormDefinitionLink> findByCompany(long companyId, int start, int end) throws SystemException {
-
     return formDefinitionLinkPersistence.findByCompany(companyId, start, end);
   }
 
-	@Override
+  public List<FormDefinitionLink> findByCompany(long companyId, int start, int end, OrderByComparator orderByComparator)
-	public List<FormDefinitionLink> findByCompany(long companyId, int start, int end,
+      throws SystemException {
-			OrderByComparator orderByComparator) throws SystemException {
-
     return formDefinitionLinkPersistence.findByCompany(companyId, start, end, orderByComparator);
   }
 
-	@Override
   public int countByDDMStructureId(long ddmStructureId) throws SystemException {
-
     return formDefinitionLinkPersistence.countByDDMStructureId(ddmStructureId);
   }
 
-	@Override
   public FormDefinitionLink fetchByC_DefinitionName_DefinitionVersion(long companyId, String definitionName,
       int definitionVersion) throws SystemException {
 
-		List<FormDefinitionLink> formDefinitionLinks = formDefinitionLinkPersistence
+    List<FormDefinitionLink> formDefinitionLinks =
-				.findByC_DefinitionName_DefinitionVersion(companyId, definitionName, definitionVersion);
+        formDefinitionLinkPersistence.findByC_DefinitionName_DefinitionVersion(companyId, definitionName,
-		return formDefinitionLinks.isEmpty() ? null : formDefinitionLinks.get(0);
+            definitionVersion);
+
+    if (formDefinitionLinks.isEmpty()) {
+      return null;
+    }
+
+    return formDefinitionLinks.get(0);
   }
 
 	private void setFormDefinitionLink(FormDefinitionLink formDefinitionLink, String name, String definitionName,

liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/service/impl/FormLogLocalServiceImpl.java

@@ -39,9 +39,8 @@ public class FormLogLocalServiceImpl extends FormLogLocalServiceBaseImpl {
 	 * it.tref.liferay.portos.kaleo.service.FormLogLocalServiceUtil} to access the form log local service.
 	 */
 
-	@Override
+  public FormLog addFormLog(long workflowInstanceId, long workflowTaskId, String transitionName, String formParameters,
-	public FormLog addFormLog(long workflowInstanceId, long workflowTaskId, String transitionName,
+      ServiceContext serviceContext) throws SystemException, PortalException {
-			String formParameters, ServiceContext serviceContext) throws SystemException, PortalException {
 
 		Date now = new Date();
 		User user = userLocalService.getUser(serviceContext.getUserId());
@@ -59,7 +58,6 @@ public class FormLogLocalServiceImpl extends FormLogLocalServiceBaseImpl {
 		return addFormLog(formLog);
 	}
 
-	@Override
   public FormLog updateFormLog(long formLogId, long workflowInstanceId, long workflowTaskId, String transitionName,
       String formParameters, ServiceContext serviceContext) throws SystemException, PortalException {
 
@@ -72,26 +70,20 @@ public class FormLogLocalServiceImpl extends FormLogLocalServiceBaseImpl {
 		return updateFormLog(formLog);
 	}
 
-	@Override
   public List<FormLog> findByC_Instance(long companyId, long workflowInstanceId, int start, int end)
       throws SystemException {
-
     return formLogPersistence.findByC_Instance(companyId, workflowInstanceId, start, end);
   }
 
-	@Override
   public FormLog findByC_Task(long companyId, long workflowTaskId) throws SystemException {
-
     List<FormLog> list = formLogPersistence.findByC_Task(companyId, workflowTaskId, 0, 1);
     return list.isEmpty() ? null : list.get(0);
   }
 
-	@Override
   public FormLog findByC_Task_TransitionName(long companyId, long workflowTaskId, String transitionName)
       throws SystemException {
-
+    List<FormLog> list =
-		List<FormLog> list = formLogPersistence.findByC_Task_TransitionName(companyId, workflowTaskId, transitionName,
+        formLogPersistence.findByC_Task_TransitionName(companyId, workflowTaskId, transitionName, 0, 1);
-				0, 1);
     return list.isEmpty() ? null : list.get(0);
   }
 }

liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/service/impl/FormTemplateLinkLocalServiceImpl.java

@@ -43,7 +43,6 @@ public class FormTemplateLinkLocalServiceImpl extends FormTemplateLinkLocalServi
 	 * service.
 	 */
 
-	@Override
   public FormTemplateLink addFormTemplateLink(long formDefinitionLinkId, long ddmTemplateId, long kaleoNodeId,
       String transitionName) throws SystemException, PortalException {
 
@@ -54,7 +53,6 @@ public class FormTemplateLinkLocalServiceImpl extends FormTemplateLinkLocalServi
 		return addFormTemplateLink(formTemplateLink);
 	}
 
-	@Override
   public FormTemplateLink updateFormTemplateLink(long formTemplateLinkId, long formDefinitionLinkId,
       long ddmTemplateId, long kaleoNodeId, String transitionName) throws SystemException, PortalException {
 
@@ -64,32 +62,23 @@ public class FormTemplateLinkLocalServiceImpl extends FormTemplateLinkLocalServi
 		return updateFormTemplateLink(formTemplateLink);
 	}
 
-	@Override
   public int countByFormDefinitionLinkId(long formDefinitionLinkId) throws SystemException {
-
     return formTemplateLinkPersistence.countByFormDefinitionLinkId(formDefinitionLinkId);
   }
 
-	@Override
   public List<FormTemplateLink> findByFormDefinitionLinkId(long formDefinitionLinkId) throws SystemException {
-
     return formTemplateLinkPersistence.findByFormDefinitionLinkId(formDefinitionLinkId);
   }
 
-	@Override
   public List<FormTemplateLink> findByFormDefinitionLinkId(long formDefinitionLinkId, int start, int end)
       throws SystemException {
-
     return formTemplateLinkPersistence.findByFormDefinitionLinkId(formDefinitionLinkId, start, end);
   }
 
-	@Override
   public int countByDDMTemplateId(long ddmTemplateId) throws SystemException {
-
     return formTemplateLinkPersistence.countByDDMTemplateId(ddmTemplateId);
   }
 
-	@Override
   public FormTemplateLink fetchByFormDefinitionLinkId_KaleoNodeId_TransitionName(long formDefinitionLinkId,
       long kaleoNodeId, String transitionName) throws SystemException {
 

liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/init.jsp

@@ -1,4 +1,3 @@
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 
 <%@page import="com.liferay.portal.kernel.util.StringUtil"%>
 <%@page import="java.util.Arrays"%>

liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/edit_form_definition_link.jsp

@@ -1,4 +1,3 @@
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 
 <%@page import="com.liferay.portal.workflow.kaleo.definition.NodeType"%>
 <%@page import="com.liferay.portal.workflow.kaleo.model.KaleoTransition"%>

liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/form_definition_link_action.jsp

@@ -1,4 +1,3 @@
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 
 <%@page import="it.tref.liferay.portos.kaleo.model.FormDefinitionLink"%>
 <%@page import="com.liferay.portal.kernel.util.Validator"%>

liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/init.jsp

@@ -1,3 +1,2 @@
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 
 <%@ include file="/html/init.jsp" %>

liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/select_workflow_definition.jsp

@@ -1,4 +1,3 @@
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 
 <%@page import="com.liferay.portal.kernel.util.HtmlUtil"%>
 <%@page import="com.liferay.portal.kernel.language.LanguageUtil"%>

liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/template/edit_form_template_link.jsp

@@ -1,4 +1,3 @@
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 
 <%@page import="it.tref.liferay.portos.kaleo.service.FormDefinitionLinkLocalServiceUtil"%>
 <%@page import="it.tref.liferay.portos.kaleo.FormTemplateLinkKaleoNodeIdException"%>

liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/template/form_template_link_action.jsp

@@ -1,4 +1,3 @@
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 
 <%@page import="it.tref.liferay.portos.kaleo.model.FormTemplateLink"%>
 <%@page import="com.liferay.portal.kernel.util.Validator"%>

liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/template/template_toolbar.jsp

@@ -1,4 +1,3 @@
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 
 <%@page import="javax.portlet.PortletRequest"%>
 <%@page import="com.liferay.portal.kernel.language.UnicodeLanguageUtil"%>

liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/template/view_form_template_links.jsp

@@ -1,4 +1,3 @@
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 
 <%@page import="com.liferay.portal.kernel.language.UnicodeLanguageUtil"%>
 <%@page import="com.liferay.portal.kernel.dao.search.RowChecker"%>

liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/toolbar.jsp

@@ -1,4 +1,3 @@
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 
 <%@page import="com.liferay.portlet.dynamicdatamapping.model.DDMStructure"%>
 <%@page import="javax.portlet.PortletRequest"%>

liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/html/workflow_form_admin/view.jsp

@@ -1,4 +1,3 @@
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 
 <%@page import="com.liferay.portlet.dynamicdatamapping.service.DDMStructureLocalServiceUtil"%>
 <%@page import="com.liferay.portlet.dynamicdatamapping.model.DDMStructure"%>

liferay-plugins-sdk-6.2/portlets/portos-log-portlet/docroot/WEB-INF/liferay-hook.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE hook PUBLIC "-//Liferay//DTD Hook 6.2.0//EN" "http://www.liferay.com/dtd/liferay-hook_6_2_0.dtd">
 
 <hook>

liferay-plugins-sdk-6.2/portlets/portos-log-portlet/docroot/WEB-INF/src/it/tref/portos/liferay/log/action/LogRequestPostAction.java

@@ -28,9 +28,9 @@ import com.liferay.portal.util.PortalUtil;
 import eu.bitwalker.useragentutils.UserAgent;
 import it.tref.portos.liferay.log.camel.core.CamelCoreInitializer;
 import it.tref.portos.liferay.log.model.LogActionDetails;
+import it.tref.portos.liferay.log.shared.util.Constants;
 import it.tref.portos.liferay.log.spring.SpringContextBeanScanner;
 import it.tref.portos.liferay.log.utility.ClassUtils;
-import it.tref.portos.liferay.log.utility.Constants;
 
 import java.lang.reflect.Field;
 import java.text.ParseException;

liferay-plugins-sdk-6.2/portlets/portos-log-portlet/docroot/WEB-INF/src/it/tref/portos/liferay/log/action/LogStartupAction.java

@@ -1,7 +1,5 @@
 package it.tref.portos.liferay.log.action;
 
-import it.tref.portos.liferay.log.utility.Constants;
-
 import com.liferay.portal.kernel.events.ActionException;
 import com.liferay.portal.kernel.events.SimpleAction;
 import com.liferay.portal.kernel.exception.PortalException;
@@ -26,6 +24,9 @@ import com.liferay.portlet.expando.model.ExpandoTableConstants;
 import com.liferay.portlet.expando.service.ExpandoColumnLocalServiceUtil;
 import com.liferay.portlet.expando.service.ExpandoTableLocalServiceUtil;
 
+import it.tref.portos.liferay.log.shared.util.Constants;
+
+
 public class LogStartupAction extends SimpleAction {
 
 	private static Log _log = LogFactoryUtil.getLog(LogStartupAction.class);

liferay-plugins-sdk-6.2/portlets/portos-log-portlet/docroot/html/init.jsp

@@ -1,4 +1,3 @@
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 
 <%@taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>

liferay-plugins-sdk-6.2/portlets/portos-log-portlet/docroot/view.jsp

@@ -1,4 +1,3 @@
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%
 /**
  * Copyright (c) 2000-2013 Liferay, Inc. All rights reserved.

liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/liferay-hook.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE hook PUBLIC "-//Liferay//DTD Hook 6.2.0//EN" "http://www.liferay.com/dtd/liferay-hook_6_2_0.dtd">
 
 <hook>

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

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE service-builder PUBLIC "-//Liferay//DTD Service Builder 6.2.0//EN" "http://www.liferay.com/dtd/liferay-service-builder_6_2_0.dtd">
 <service-builder package-path="it.tref.liferay.portos.mailmanager">
 	<author></author>

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

@@ -30,7 +30,8 @@ public class MailManagerMessageListener implements MessageListener {
 			String mode = (String) message.get("mode");
 			MailMessage mailMessage = (MailMessage) message.getPayload();
 			ServiceContext serviceContext = (ServiceContext) message.get("serviceContext");
-			boolean checkPermission = GetterUtil.getBoolean(message.get("checkPermission"), true);
+			boolean checkPermission = GetterUtil.getBoolean(message.get("checkPermission"), Boolean.TRUE);
+
 			String className = GetterUtil.getString(message.get("className"));
 			long classPK = GetterUtil.getLong(message.get("classPK"));
 			boolean sendSync = false;

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

@@ -46,11 +46,12 @@ import com.liferay.portal.service.ServiceContext;
  */
 public class EmailAttachmentLocalServiceImpl extends EmailAttachmentLocalServiceBaseImpl {
   /*
-	 * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link
+   * NOTE FOR DEVELOPERS:
-	 * it.noovle.azimut.icf.mailmanager.service.EmailAttachmentLocalServiceUtil} to access the email attachment local
+   *
-	 * service.
+   * Never reference this interface directly. Always use {@link
+   * it.noovle.azimut.icf.mailmanager.service.EmailAttachmentLocalServiceUtil} to access the
+   * email attachment local service.
    */
-	@Override
   public EmailAttachment addEmailAttachment(long companyId, long emailId, long folderId, String fileName, File file)
       throws PortalException, SystemException {
 
@@ -79,16 +80,15 @@ public class EmailAttachmentLocalServiceImpl extends EmailAttachmentLocalService
 						sourceFileName, mimeType, title, StringPool.BLANK, StringPool.BLANK, file, serviceContext);
 
     EmailAttachment emailAttachment =
-				createEmailAttachment(new EmailAttachmentPK(emailId, fileEntry
+        emailAttachmentLocalService.createEmailAttachment(new EmailAttachmentPK(emailId, fileEntry.getFileEntryId()));
-						.getFileEntryId()));
 
-		return addEmailAttachment(emailAttachment);
+    return emailAttachmentLocalService.addEmailAttachment(emailAttachment);
   }
 
   @Override
   public EmailAttachment deleteEmailAttachment(EmailAttachmentPK emailAttachmentPK) throws PortalException,
       SystemException {
-		EmailAttachment emailAttachment = getEmailAttachment(emailAttachmentPK);
+    EmailAttachment emailAttachment = emailAttachmentLocalService.getEmailAttachment(emailAttachmentPK);
     return deleteEmailAttachment(emailAttachment);
   }
 
@@ -106,22 +106,18 @@ public class EmailAttachmentLocalServiceImpl extends EmailAttachmentLocalService
 		return emailAttachment;
 	}
 
-	@Override
   public List<EmailAttachment> findByEmailId(long emailId) throws SystemException {
     return emailAttachmentPersistence.findByEmailId(emailId);
   }
 
-	@Override
   public List<EmailAttachment> findByEmailId(long emailId, int start, int end) throws SystemException {
     return emailAttachmentPersistence.findByEmailId(emailId);
   }
 
-	@Override
   public int countByEmailId(long emailId) throws SystemException {
     return emailAttachmentPersistence.countByEmailId(emailId);
   }
 
-	@Override
   public EmailAttachment fetchByFileEntryId(long fileEntryId) throws SystemException {
     return emailAttachmentPersistence.fetchByFileEntryId(fileEntryId);
   }

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

@@ -7,6 +7,24 @@
 
 package it.tref.liferay.portos.mailmanager.service.impl;
 
+import com.liferay.mail.model.FileAttachment;
+import com.liferay.portal.kernel.exception.PortalException;
+import com.liferay.portal.kernel.exception.SystemException;
+import com.liferay.portal.kernel.log.Log;
+import com.liferay.portal.kernel.log.LogFactoryUtil;
+import com.liferay.portal.kernel.repository.model.Folder;
+import com.liferay.portal.kernel.util.FileUtil;
+import com.liferay.portal.kernel.util.OrderByComparator;
+import com.liferay.portal.kernel.util.StringPool;
+import com.liferay.portal.kernel.util.StringUtil;
+import com.liferay.portal.kernel.util.Validator;
+import com.liferay.portal.model.Company;
+import com.liferay.portal.model.Group;
+import com.liferay.portal.model.User;
+import com.liferay.portal.security.permission.ActionKeys;
+import com.liferay.portal.service.ServiceContext;
+import com.liferay.portlet.documentlibrary.model.DLFolderConstants;
+
 import it.tref.liferay.portos.mailmanager.EmailBccException;
 import it.tref.liferay.portos.mailmanager.EmailBulkAddressesException;
 import it.tref.liferay.portos.mailmanager.EmailCcException;
@@ -27,24 +45,9 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
-import com.liferay.mail.model.FileAttachment;
-import com.liferay.portal.kernel.exception.PortalException;
-import com.liferay.portal.kernel.exception.SystemException;
-import com.liferay.portal.kernel.repository.model.Folder;
-import com.liferay.portal.kernel.util.FileUtil;
-import com.liferay.portal.kernel.util.OrderByComparator;
-import com.liferay.portal.kernel.util.StringPool;
-import com.liferay.portal.kernel.util.StringUtil;
-import com.liferay.portal.kernel.util.Validator;
-import com.liferay.portal.model.Company;
-import com.liferay.portal.model.Group;
-import com.liferay.portal.model.User;
-import com.liferay.portal.security.permission.ActionKeys;
-import com.liferay.portal.service.ServiceContext;
-import com.liferay.portlet.documentlibrary.model.DLFolderConstants;
-
 /**
  * The implementation of the email local service.
+ *
  * <p>
  * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy
  * their definitions into the {@link it.noovle.azimut.icf.mailmanager.service.EmailLocalService} interface.
@@ -63,63 +66,61 @@ public class EmailLocalServiceImpl extends EmailLocalServiceBaseImpl {
 	 * it.noovle.azimut.icf.mailmanager.service.EmailLocalServiceUtil} to access the email local service.
 	 */
 
-	@Override
+	private final static Log _log = LogFactoryUtil.getLog(EmailLocalServiceImpl.class);
-	public Email addEmail(String className, long classPK, String from, String to[], String cc[], String bcc[],
-			String subject, String body, boolean htmlFormat, ServiceContext serviceContext) throws Exception {
 
-		return addEmail(className, classPK, from, to, cc, bcc, null, subject, body, htmlFormat, null, null, null, null,
+	public Email addEmail(String className, long classPK, String from, String to[], String cc[],
-				0, false, null, null, Collections.<FileAttachment> emptyList(), serviceContext);
+			String bcc[], String subject, String body, boolean htmlFormat, ServiceContext serviceContext)
+			throws Exception {
+		return addEmail(className, classPK, from, to, cc, bcc, null, subject, body, htmlFormat, null, null,
+				null, null, 0, false, null, null, Collections.<FileAttachment> emptyList(), serviceContext);
 	}
 
-	@Override
+	public Email addEmail(String className, long classPK, String from, String to[], String cc[],
-	public Email addEmail(String className, long classPK, String from, String to[], String cc[], String bcc[],
+			String bcc[], String subject, String body, boolean htmlFormat,
-			String subject, String body, boolean htmlFormat, List<FileAttachment> fileAttachments,
+			List<FileAttachment> fileAttachments, ServiceContext serviceContext) throws Exception {
-			ServiceContext serviceContext) throws Exception {
+		return addEmail(className, classPK, from, to, cc, bcc, null, subject, body, htmlFormat, null, null,
-
+				null, null, 0, false, null, null, fileAttachments, false, null, serviceContext);
-		return addEmail(className, classPK, from, to, cc, bcc, null, subject, body, htmlFormat, null, null, null, null,
-				0, false, null, null, fileAttachments, false, null, serviceContext);
 	}
 
-	@Override
+	public Email addEmail(String className, long classPK, String from, String to[], String cc[],
-	public Email addEmail(String className, long classPK, String from, String to[], String cc[], String bcc[],
+			String bcc[], String[] bulkAddresses, String subject, String body, boolean htmlFormat,
-			String[] bulkAddresses, String subject, String body, boolean htmlFormat, String[] replyTo,
+			String[] replyTo, String messageId, String inReplyTo, String smtpHost, int smtpPort,
-			String messageId, String inReplyTo, String smtpHost, int smtpPort, boolean smtpSecure, String smtpUsername,
+			boolean smtpSecure, String smtpUsername, String smtpPassword,
-			String smtpPassword, List<FileAttachment> fileAttachments, ServiceContext serviceContext) throws Exception {
+			List<FileAttachment> fileAttachments, ServiceContext serviceContext) throws Exception {
-
+		return addEmail(className, classPK, from, to, cc, bcc, bulkAddresses, subject, body, htmlFormat,
-		return addEmail(className, classPK, from, to, cc, bcc, bulkAddresses, subject, body, htmlFormat, replyTo,
+				replyTo, messageId, inReplyTo, smtpHost, smtpPort, smtpSecure, smtpUsername, smtpPassword,
-				messageId, inReplyTo, smtpHost, smtpPort, smtpSecure, smtpUsername, smtpPassword, fileAttachments,
+				fileAttachments, false, null, serviceContext);
-				false, null, serviceContext);
 	}
 
-	@Override
+	public Email addEmail(String className, long classPK, String from, String to[], String cc[],
-	public Email addEmail(String className, long classPK, String from, String to[], String cc[], String bcc[],
+			String bcc[], String subject, String body, boolean htmlFormat,
-			String subject, String body, boolean htmlFormat, List<FileAttachment> fileAttachments, boolean sendSync,
+			List<FileAttachment> fileAttachments, boolean sendSync, ServiceContext serviceContext)
-			ServiceContext serviceContext) throws Exception {
+			throws Exception {
-
+		return addEmail(className, classPK, from, to, cc, bcc, null, subject, body, htmlFormat, null, null,
-		return addEmail(className, classPK, from, to, cc, bcc, null, subject, body, htmlFormat, null, null, null, null,
+				null, null, 0, false, null, null, fileAttachments, sendSync, null, serviceContext);
-				0, false, null, null, fileAttachments, sendSync, null, serviceContext);
 	}
 
-	@Override
+	public Email addEmail(String className, long classPK, String from, String to[], String cc[],
-	public Email addEmail(String className, long classPK, String from, String to[], String cc[], String bcc[],
+			String bcc[], String subject, String body, boolean htmlFormat,
-			String subject, String body, boolean htmlFormat, List<FileAttachment> fileAttachments, boolean sendSync,
+			List<FileAttachment> fileAttachments, boolean sendSync, String templateName,
-			String templateName, ServiceContext serviceContext) throws Exception {
+			ServiceContext serviceContext) throws Exception {
-
+		return addEmail(className, classPK, from, to, cc, bcc, null, subject, body, htmlFormat, null, null,
-		return addEmail(className, classPK, from, to, cc, bcc, null, subject, body, htmlFormat, null, null, null, null,
+				null, null, 0, false, null, null, fileAttachments, sendSync, templateName, serviceContext);
-				0, false, null, null, fileAttachments, sendSync, templateName, serviceContext);
 	}
 
-	@Override
+	public Email addEmail(String className, long classPK, String from, String to[], String cc[],
-	public Email addEmail(String className, long classPK, String from, String to[], String cc[], String bcc[],
+			String bcc[], String[] bulkAddresses, String subject, String body, boolean htmlFormat,
-			String[] bulkAddresses, String subject, String body, boolean htmlFormat, String[] replyTo,
+			String[] replyTo, String messageId, String inReplyTo, String smtpHost, int smtpPort,
-			String messageId, String inReplyTo, String smtpHost, int smtpPort, boolean smtpSecure, String smtpUsername,
+			boolean smtpSecure, String smtpUsername, String smtpPassword,
-			String smtpPassword, List<FileAttachment> fileAttachments, boolean sendSync, String templateName,
+			List<FileAttachment> fileAttachments, boolean sendSync, String templateName,
 			ServiceContext serviceContext) throws Exception {
 
 		User user = userLocalService.getUser(serviceContext.getUserId());
 		Date now = new Date();
 		validate(from, to, cc, bcc, bulkAddresses, subject, body, replyTo);
-		Email email = createEmail(counterLocalService.increment(Email.class.getName()));
+
+		Email email = emailLocalService.createEmail(counterLocalService.increment(Email.class.getName()));
+
 		email.setGroupId(serviceContext.getScopeGroupId());
 		email.setCompanyId(serviceContext.getCompanyId());
 		email.setCreateDate(serviceContext.getCreateDate(now));
@@ -171,11 +172,11 @@ public class EmailLocalServiceImpl extends EmailLocalServiceBaseImpl {
 		return email;
 	}
 
-	@Override
+	public Email updateEmail(long emailId, String from, String to[], String cc[], String bcc[],
-	public Email updateEmail(long emailId, String from, String to[], String cc[], String bcc[], String subject,
+			String subject, String body, ServiceContext serviceContext) throws Exception {
-			String body, ServiceContext serviceContext) throws Exception {
+
+		Email email = emailLocalService.getEmail(emailId);
 
-		Email email = getEmail(emailId);
 		validate(from, to, cc, bcc, null, subject, body, null);
 		email.setModifiedDate(new Date());
 		email.setFrom(from);
@@ -187,10 +188,10 @@ public class EmailLocalServiceImpl extends EmailLocalServiceBaseImpl {
 		return updateEmail(email);
 	}
 
-	@Override
+	public Email markAsSent(long emailId, Date sentDate, String statusMessage) throws PortalException,
-	public Email markAsSent(long emailId, Date sentDate, String statusMessage) throws PortalException, SystemException {
+			SystemException {
 
-		Email email = getEmail(emailId);
+		Email email = emailLocalService.getEmail(emailId);
 		email.setModifiedDate(new Date());
 		email.setSent(true);
 		email.setSentDate(sentDate);
@@ -198,19 +199,18 @@ public class EmailLocalServiceImpl extends EmailLocalServiceBaseImpl {
 		return updateEmail(email);
 	}
 
-	@Override
+	public Email updateStatusMessage(long emailId, String statusMessage) throws PortalException,
-	public Email updateStatusMessage(long emailId, String statusMessage) throws PortalException, SystemException {
+			SystemException {
 
-		Email email = getEmail(emailId);
+		Email email = emailLocalService.getEmail(emailId);
 		email.setModifiedDate(new Date());
 		email.setStatusMessage(statusMessage);
 		return updateEmail(email);
 	}
 
-	@Override
 	public Email resendEmail(long emailId) throws PortalException, SystemException {
 
-		Email email = getEmail(emailId);
+		Email email = emailLocalService.getEmail(emailId);
 		email.setModifiedDate(new Date());
 		email.setStatusMessage("");
 		email.setSent(false);
@@ -219,10 +219,9 @@ public class EmailLocalServiceImpl extends EmailLocalServiceBaseImpl {
 		return updateEmail(email);
 	}
 
-	@Override
 	public Email cancelEmail(long emailId) throws PortalException, SystemException {
 
-		Email email = getEmail(emailId);
+		Email email = emailLocalService.getEmail(emailId);
 		email.setModifiedDate(new Date());
 		email.setCancel(true);
 		return updateEmail(email);
@@ -230,8 +229,7 @@ public class EmailLocalServiceImpl extends EmailLocalServiceBaseImpl {
 
 	@Override
 	public Email deleteEmail(long emailId) throws PortalException, SystemException {
-
+		Email email = emailLocalService.getEmail(emailId);
-		Email email = getEmail(emailId);
 		return deleteEmail(email);
 	}
 
@@ -247,92 +245,76 @@ public class EmailLocalServiceImpl extends EmailLocalServiceBaseImpl {
 		return email;
 	}
 
-	@Override
 	public List<Email> findByCompany(long companyId) throws SystemException {
 
 		return emailPersistence.findByCompany(companyId);
 	}
 
-	@Override
 	public List<Email> findByCompany(long companyId, int start, int end) throws SystemException {
 
 		return emailPersistence.findByCompany(companyId, start, end);
 	}
 
-	@Override
 	public List<Email> findByCompany(long companyId, int start, int end, OrderByComparator orderByComparator)
 			throws SystemException {
 
 		return emailPersistence.findByCompany(companyId, start, end, orderByComparator);
 	}
 
-	@Override
 	public int countByCompany(long companyId) throws SystemException {
 
 		return emailPersistence.countByCompany(companyId);
 	}
 
-	@Override
 	public List<Email> findByC_G(long companyId, long groupId) throws SystemException {
 
 		return emailPersistence.findByC_G(companyId, groupId);
 	}
 
-	@Override
 	public List<Email> findByC_G(long companyId, long groupId, int start, int end) throws SystemException {
 
 		return emailPersistence.findByC_G(companyId, groupId, start, end);
 	}
 
-	@Override
+	public List<Email> findByC_G(long companyId, long groupId, int start, int end,
-	public List<Email> findByC_G(long companyId, long groupId, int start, int end, OrderByComparator orderByComparator)
+			OrderByComparator orderByComparator) throws SystemException {
-			throws SystemException {
-
 		return emailPersistence.findByC_G(companyId, groupId, start, end, orderByComparator);
 	}
 
-	@Override
 	public int countByC_G(long companyId, long groupId) throws SystemException {
 
 		return emailPersistence.countByC_G(companyId, groupId);
 	}
 
-	@Override
 	public List<Email> findByC_G_T(long companyId, long groupId, String templateName) throws SystemException {
 
 		return emailPersistence.findByC_G_T(companyId, groupId, templateName);
 	}
 
-	@Override
 	public List<Email> findByC_G_T(long companyId, long groupId, String templateName, int start, int end)
 			throws SystemException {
 
 		return emailPersistence.findByC_G_T(companyId, groupId, templateName, start, end);
 	}
 
-	@Override
 	public int countByC_G_T(long companyId, long groupId, String templateName) throws SystemException {
 
 		return emailPersistence.countByC_G_T(companyId, groupId, templateName);
 	}
 
-	@Override
 	public List<Email> findByC_G_C_C(long companyId, long groupId, long classNameId, long classPK)
 			throws SystemException {
 
 		return emailPersistence.findByC_G_C_C(companyId, groupId, classNameId, classPK);
 	}
 
-	@Override
+	public List<Email> findByC_G_C_C(long companyId, long groupId, long classNameId, long classPK, int start,
-	public List<Email> findByC_G_C_C(long companyId, long groupId, long classNameId, long classPK, int start, int end)
+			int end) throws SystemException {
-			throws SystemException {
-
 		return emailPersistence.findByC_G_C_C(companyId, groupId, classNameId, classPK, start, end);
 	}
 
-	@Override
+	public int countByC_G_C_C(long companyId, long groupId, long classNameId, long classPK)
-	public int countByC_G_C_C(long companyId, long groupId, long classNameId, long classPK) throws SystemException {
+			throws SystemException {
-
 		return emailPersistence.countByC_G_C_C(companyId, groupId, classNameId, classPK);
 	}
 

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

@@ -62,26 +62,35 @@ public class EmailTemplateLocalServiceImpl extends EmailTemplateLocalServiceBase
     User user = userLocalService.getUser(serviceContext.getUserId());
     Date now = new Date();
     validate(templateName, from, to, cc, ccn, subject, body);
-		EmailTemplate emailTemplate = createEmailTemplate(counterLocalService.increment(EmailTemplate.class.getName()));
+
+    EmailTemplate emailTemplate =
+        emailTemplateLocalService.createEmailTemplate(counterLocalService.increment(EmailTemplate.class.getName()));
+
     emailTemplate.setCompanyId(serviceContext.getCompanyId());
     emailTemplate.setUserId(user.getUserId());
     emailTemplate.setUserName(user.getFullName());
     emailTemplate.setCreateDate(serviceContext.getCreateDate(now));
     emailTemplate.setModifiedDate(serviceContext.getModifiedDate(now));
     emailTemplate.setGroupId(serviceContext.getScopeGroupId());
+
     emailTemplate.setTemplateName(templateName);
+
     emailTemplate.setFrom(from);
     emailTemplate.setTo(StringUtil.merge(to, StringPool.COMMA));
     emailTemplate.setCc(StringUtil.merge(cc, StringPool.COMMA));
     emailTemplate.setCcn(StringUtil.merge(ccn, StringPool.COMMA));
     emailTemplate.setSubject(subject);
     emailTemplate.setBody(body);
+
     emailTemplate.setAttachmentPermitted(attachmentPermitted);
-		emailTemplate = addEmailTemplate(emailTemplate);
+
+    emailTemplate = emailTemplateLocalService.addEmailTemplate(emailTemplate);
+
     // Resource
+
     resourceLocalService.addResources(emailTemplate.getCompanyId(), emailTemplate.getGroupId(),
-				emailTemplate.getUserId(), EmailTemplate.class.getName(), emailTemplate.getPrimaryKey(), false, true,
+        emailTemplate.getUserId(), EmailTemplate.class.getName(), emailTemplate.getPrimaryKey(), false, true, true);
-				true);
+
     return emailTemplate;
   }
 
@@ -90,24 +99,29 @@ public class EmailTemplateLocalServiceImpl extends EmailTemplateLocalServiceBase
 			String[] cc, String[] ccn, String subject, String body, boolean attachmentPermitted,
 			ServiceContext serviceContext) throws SystemException, PortalException {
 
-		EmailTemplate emailTemplate = getEmailTemplate(emailTemplateId);
+    EmailTemplate emailTemplate = emailTemplateLocalService.getEmailTemplate(emailTemplateId);
+
     validate(templateName, from, to, cc, ccn, subject, body);
+
     emailTemplate.setModifiedDate(serviceContext.getModifiedDate(new Date()));
+
     emailTemplate.setFrom(from);
     emailTemplate.setTo(StringUtil.merge(to, StringPool.COMMA));
     emailTemplate.setCc(StringUtil.merge(cc, StringPool.COMMA));
     emailTemplate.setCcn(StringUtil.merge(ccn, StringPool.COMMA));
     emailTemplate.setSubject(subject);
     emailTemplate.setBody(body);
+
     emailTemplate.setAttachmentPermitted(attachmentPermitted);
-		emailTemplate = updateEmailTemplate(emailTemplate);
+
+    emailTemplate = emailTemplateLocalService.updateEmailTemplate(emailTemplate);
+
     return emailTemplate;
   }
 
   @Override
   public EmailTemplate deleteEmailTemplate(long emailTemplateId) throws PortalException, SystemException {
-
+    EmailTemplate emailTemplate = emailTemplateLocalService.getEmailTemplate(emailTemplateId);
-		EmailTemplate emailTemplate = getEmailTemplate(emailTemplateId);
     return deleteEmailTemplate(emailTemplate);
   }