align

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

@@ -1,16 +1,18 @@
 package it.tref.liferay.portos.companyconfig.portlet;
 
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
 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;
 import com.liferay.portal.service.ServiceContextFactory;
 import com.liferay.util.bridges.mvc.MVCPortlet;
 
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+
 public class CompanyConfigurationPortlet extends MVCPortlet {
 
 	public void saveCustomFields(ActionRequest actionRequest, ActionResponse actionResponse) throws PortalException,

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

@@ -1,4 +1,3 @@
-<%@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,4 +1,3 @@
-<%@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"%>
@@ -17,9 +16,12 @@ companyCustomFieldsURL.setParameter("modelResource", Company.class.getName());
 <div class="separator"></div>
 <aui:form name="fm" action="<%=saveCustomFieldsURL.toString() %>">
 	<aui:fieldset>
-		<liferay-ui:custom-attribute-list className="<%= Company.class.getName() %>"
+		<liferay-ui:custom-attribute-list
-				classPK="<%= (company != null) ? company.getCompanyId() : 0 %>"
+			className="<%= Company.class.getName() %>"
-				editable="true" label="true" />
+			classPK="<%= (company != null) ? company.getCompanyId() : 0 %>"
+			editable="<%= 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,3 +1,4 @@
+<%@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" 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-cookies-portlet/docroot/init.jsp

@@ -1,4 +1,3 @@
-<%@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,4 +1,3 @@
-<%@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" 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.deployalert">
 	<author>Matteo</author>

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

@@ -1,14 +1,5 @@
 package it.tref.liferay.portos.deployalert.action;
 
-import it.tref.liferay.portos.deployalert.constants.MailConstants;
-import it.tref.liferay.portos.deployalert.model.NotificationMail;
-import it.tref.liferay.portos.deployalert.service.NotificationLogLocalServiceUtil;
-import it.tref.liferay.portos.deployalert.service.NotificationMailLocalServiceUtil;
-import it.tref.liferay.portos.deployalert.util.DeployAlertUtil;
-import it.tref.liferay.portos.mailmanager.shared.messaging.util.MailManagerUtil;
-
-import java.util.List;
-
 import com.liferay.portal.kernel.events.ActionException;
 import com.liferay.portal.kernel.events.SimpleAction;
 import com.liferay.portal.kernel.exception.PortalException;
@@ -25,6 +16,15 @@ import com.liferay.portal.model.Company;
 import com.liferay.portal.service.ServiceContext;
 import com.liferay.portal.util.PortalUtil;
 
+import it.tref.liferay.portos.deployalert.constants.MailConstants;
+import it.tref.liferay.portos.deployalert.model.NotificationMail;
+import it.tref.liferay.portos.deployalert.service.NotificationLogLocalServiceUtil;
+import it.tref.liferay.portos.deployalert.service.NotificationMailLocalServiceUtil;
+import it.tref.liferay.portos.deployalert.util.DeployAlertUtil;
+import it.tref.liferay.portos.mailmanager.shared.messaging.util.MailManagerUtil;
+
+import java.util.List;
+
 public class DeployAction extends SimpleAction {
 
 	private static final Log _log = LogFactoryUtil.getLog(DeployAction.class);

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

@@ -8,9 +8,8 @@ import com.liferay.portlet.BaseControlPanelEntry;
 
 public class DeployAlertControl extends BaseControlPanelEntry {
 
-	@Override
+  public boolean hasAccessPermission(PermissionChecker permissionChecker, Group group, Portlet portlet)
-	public boolean hasAccessPermission(PermissionChecker permissionChecker, Group group, Portlet portlet)
+      throws Exception {
-			throws Exception {
 
 		long companyId = PortalUtil.getDefaultCompanyId();
 		if (companyId == permissionChecker.getCompanyId()) {

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

@@ -1,11 +1,5 @@
 package it.tref.liferay.portos.deployalert.portlet;
 
-import it.tref.liferay.portos.deployalert.model.NotificationMail;
-import it.tref.liferay.portos.deployalert.service.NotificationMailLocalServiceUtil;
-
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
 import com.liferay.portal.kernel.exception.PortalException;
 import com.liferay.portal.kernel.exception.SystemException;
 import com.liferay.portal.kernel.servlet.SessionErrors;
@@ -14,6 +8,15 @@ import com.liferay.portal.service.ServiceContext;
 import com.liferay.portal.service.ServiceContextFactory;
 import com.liferay.util.bridges.mvc.MVCPortlet;
 
+import it.tref.liferay.portos.deployalert.model.NotificationMail;
+import it.tref.liferay.portos.deployalert.service.NotificationMailLocalServiceUtil;
+
+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

@@ -8,6 +8,10 @@
 
 package it.tref.liferay.portos.deployalert.service.impl;
 
+import com.liferay.portal.kernel.exception.PortalException;
+import com.liferay.portal.kernel.exception.SystemException;
+import com.liferay.portal.kernel.util.Validator;
+
 import it.tref.liferay.portos.deployalert.NotificationNomePluginException;
 import it.tref.liferay.portos.deployalert.NotificationTipoException;
 import it.tref.liferay.portos.deployalert.model.NotificationLog;
@@ -15,10 +19,6 @@ import it.tref.liferay.portos.deployalert.service.base.NotificationLogLocalServi
 
 import java.util.Date;
 
-import com.liferay.portal.kernel.exception.PortalException;
-import com.liferay.portal.kernel.exception.SystemException;
-import com.liferay.portal.kernel.util.Validator;
-
 /**
  * The implementation of the notification log local service.
  * <p>
@@ -35,8 +35,7 @@ import com.liferay.portal.kernel.util.Validator;
  */
 public class NotificationLogLocalServiceImpl extends NotificationLogLocalServiceBaseImpl {
 
-	@Override
+  public NotificationLog addNotification(String nomePlugin, String tipo) throws SystemException, PortalException {
-	public NotificationLog addNotification(String nomePlugin, String tipo) throws SystemException, PortalException {
 
 		Date now = new Date();
 		validate(nomePlugin, tipo);

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

@@ -8,15 +8,6 @@
 
 package it.tref.liferay.portos.deployalert.service.impl;
 
-import it.tref.liferay.portos.deployalert.NotificationNomePluginException;
-import it.tref.liferay.portos.deployalert.NotificationNomeTemplateException;
-import it.tref.liferay.portos.deployalert.model.NotificationMail;
-import it.tref.liferay.portos.deployalert.service.NotificationMailLocalServiceUtil;
-import it.tref.liferay.portos.deployalert.service.base.NotificationMailLocalServiceBaseImpl;
-
-import java.util.Date;
-import java.util.List;
-
 import com.liferay.portal.kernel.dao.orm.Disjunction;
 import com.liferay.portal.kernel.dao.orm.DynamicQuery;
 import com.liferay.portal.kernel.dao.orm.OrderFactoryUtil;
@@ -28,6 +19,15 @@ import com.liferay.portal.kernel.util.Validator;
 import com.liferay.portal.model.User;
 import com.liferay.portal.service.ServiceContext;
 
+import it.tref.liferay.portos.deployalert.NotificationNomePluginException;
+import it.tref.liferay.portos.deployalert.NotificationNomeTemplateException;
+import it.tref.liferay.portos.deployalert.model.NotificationMail;
+import it.tref.liferay.portos.deployalert.service.NotificationMailLocalServiceUtil;
+import it.tref.liferay.portos.deployalert.service.base.NotificationMailLocalServiceBaseImpl;
+
+import java.util.Date;
+import java.util.List;
+
 /**
  * The implementation of the notification mail local service.
  * <p>
@@ -44,9 +44,8 @@ import com.liferay.portal.service.ServiceContext;
  */
 public class NotificationMailLocalServiceImpl extends NotificationMailLocalServiceBaseImpl {
 
-	@Override
+  public NotificationMail addNotification(String nomePlugin, String nomeTemplate, ServiceContext serviceContext)
-	public NotificationMail addNotification(String nomePlugin, String nomeTemplate, ServiceContext serviceContext)
+      throws PortalException, SystemException {
-			throws PortalException, SystemException {
 
 		User user = userPersistence.findByPrimaryKey(serviceContext.getUserId());
 		Date now = new Date();
@@ -76,9 +75,8 @@ public class NotificationMailLocalServiceImpl extends NotificationMailLocalServi
 		}
 	}
 
-	@Override
+  public NotificationMail updateNotification(String nomePlugin, String nomeTemplate, ServiceContext serviceContext,
-	public NotificationMail updateNotification(String nomePlugin, String nomeTemplate, ServiceContext serviceContext,
+      long notificationId) throws SystemException, PortalException {
-			long notificationId) throws SystemException, PortalException {
 
 		Date now = new Date();
 		NotificationMail notification = getNotificationMail(notificationId);
@@ -91,44 +89,44 @@ public class NotificationMailLocalServiceImpl extends NotificationMailLocalServi
 		return notification;
 	}
 
-	@Override
+  public List<NotificationMail> findNotifications(long companyId, int start, int end) throws SystemException {
-	public List<NotificationMail> findNotifications(long companyId, int start, int end) throws SystemException {
 
-		DynamicQuery query = dynamicQuery();
+    // return notificationMailPersistence.findBycompanyId(companyId, start, end);
-		query.addOrder(OrderFactoryUtil.asc("nomePlugin"));
+    DynamicQuery query = notificationMailLocalService.dynamicQuery();
-		List<NotificationMail> notifications = null;
+    query.addOrder(OrderFactoryUtil.asc("nomePlugin"));
-		try {
+    List<NotificationMail> notifications = null;
-			notifications = NotificationMailLocalServiceUtil.dynamicQuery(query);
+    try {
-		} catch (SystemException e) {
+      notifications = NotificationMailLocalServiceUtil.dynamicQuery(query);
-			e.printStackTrace();
+    } catch (SystemException e) {
-		}
+      e.printStackTrace();
-		return notifications;
+    }
-	}
+    return notifications;
+  }
 
-	@Override
+  public List<NotificationMail> findNotifications(long companyId) throws SystemException {
-	public List<NotificationMail> findNotifications(long companyId) throws SystemException {
 
 		return notificationMailPersistence.findBycompanyId(companyId);
 	}
 
-	@Override
+  public int getNotificationCount(long companyId) throws SystemException {
-	public int getNotificationCount(long companyId) throws SystemException {
 
 		return notificationMailPersistence.countBycompanyId(companyId);
 	}
 
-	@Override
+  public List<NotificationMail> findNotifications(long companyId, String servletContextName) throws SystemException {
-	public List<NotificationMail> findNotifications(long companyId, String servletContextName) throws SystemException {
+
-
+    DynamicQuery dynamicQuery = notificationMailLocalService.dynamicQuery();
-		DynamicQuery dynamicQuery = dynamicQuery();
+
-		if (Validator.isNull(servletContextName)) {
+    if (Validator.isNull(servletContextName)) {
-			Disjunction or = RestrictionsFactoryUtil.disjunction();
+      Disjunction or = RestrictionsFactoryUtil.disjunction();
-			or.add(RestrictionsFactoryUtil.isNull("nomePlugin"));
+      or.add(RestrictionsFactoryUtil.isNull("nomePlugin"));
-			or.add(RestrictionsFactoryUtil.eq("nomePlugin", StringPool.BLANK));
+      or.add(RestrictionsFactoryUtil.eq("nomePlugin", StringPool.BLANK));
-			dynamicQuery.add(or);
+
-		} else {
+      dynamicQuery.add(or);
-			dynamicQuery.add(RestrictionsFactoryUtil.eq("nomePlugin", servletContextName));
+    } else {
-		}
+      dynamicQuery.add(RestrictionsFactoryUtil.eq("nomePlugin", servletContextName));
-		return notificationMailPersistence.findWithDynamicQuery(dynamicQuery);
+    }
-	}
+
+    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,7 +45,6 @@ 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,7 +45,6 @@ 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,11 +1,5 @@
 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,4 +1,3 @@
-<%@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,4 +1,3 @@
-<%@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,4 +1,3 @@
-<%@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,4 +1,3 @@
-<%@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" 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>