Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 141 → Rev 142

/impl/src/java/pt/estgp/estgweb/services/common/CommonServicesManager.java
16,6 → 16,7
import org.apache.log4j.Logger;
 
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
 
import jomm.ir.lucene.LuceneUtils;
 
49,8 → 50,8
* @return Cluster of Results for each Module with total module results, only return modules with results
* @throws Throwable on notAuthorized or internal error
*/
public ICommonSearchResults search(HttpServletRequest request, String query, SearchTypeEnum searchType) throws Throwable {
return search(RequestUtils.getRequester(request), query, searchType);
public ICommonSearchResults search(HttpServletRequest request,HttpServletResponse response, String query, SearchTypeEnum searchType) throws Throwable {
return search(RequestUtils.getRequester(request, response), query, searchType);
}
 
/**
96,8 → 97,8
* @throws Throwable on not authorized and internal error
*/
 
public ISearchResults search(HttpServletRequest request, String query, SearchTypeEnum searchType, String moduleKey, int page) throws Throwable {
return search(RequestUtils.getRequester(request), query, searchType, ModuleEnum.parse(moduleKey), page);
public ISearchResults search(HttpServletRequest request,HttpServletResponse response, String query, SearchTypeEnum searchType, String moduleKey, int page) throws Throwable {
return search(RequestUtils.getRequester(request, response), query, searchType, ModuleEnum.parse(moduleKey), page);
}
 
/**
196,12 → 197,12
return toDoCats;
}
 
public IToDoCat getToDoCats(HttpServletRequest request, String moduleKey) throws Throwable {
return getToDoCats(RequestUtils.getRequester(request), ModuleEnum.parse(moduleKey));
public IToDoCat getToDoCats(HttpServletRequest request, HttpServletResponse response, String moduleKey) throws Throwable {
return getToDoCats(RequestUtils.getRequester(request, response), ModuleEnum.parse(moduleKey));
}
 
public IToDoCat getToDoCats(HttpServletRequest request, ModuleEnum module) throws Throwable {
return getToDoCats(RequestUtils.getRequester(request), module);
public IToDoCat getToDoCats(HttpServletRequest request, HttpServletResponse response, ModuleEnum module) throws Throwable {
return getToDoCats(RequestUtils.getRequester(request, response), module);
}
 
/**
/impl/src/java/pt/estgp/estgweb/domain/UserSessionImpl.java
14,7 → 14,7
import pt.estgp.estgweb.domain.dao.DaoFactory;
 
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpServletResponse;
 
/**
* @author Jorge Machado
232,9 → 232,9
* @param request
* @throws Throwable
*/
public void serialize(HttpServletRequest request) throws Throwable
public void serialize(HttpServletRequest request, HttpServletResponse response) throws Throwable
{
serialize(RequestUtils.getRequester(request));
serialize(RequestUtils.getRequester(request, response));
}
 
/**
/impl/src/java/pt/estgp/estgweb/web/utils/RequestUtils.java
3,6 → 3,8
import pt.estgp.estgweb.web.exceptions.NoCookiesException;
 
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletResponse;
 
import org.apache.struts.action.ActionMessages;
import org.apache.struts.action.ActionMessage;
15,11 → 17,29
*/
public class RequestUtils
{
public static String getRequester(HttpServletRequest request) throws NoCookiesException
public static String getRequester(HttpServletRequest request, HttpServletResponse response) throws NoCookiesException
{
if(request.getCookies() == null || request.getCookies().length == 0)
throw new NoCookiesException();
return request.getCookies()[0].getValue();
{
Cookie cookie = new Cookie("bacoSession", request.getSession().getId());
response.addCookie(cookie);
return cookie.getValue();
}
else if(request.getCookies() != null && request.getCookies().length > 0)
{
for(Cookie cookie: request.getCookies())
{
if(cookie.getName().equals("bacoSession"))
{
return cookie.getValue();
}
}
Cookie cookie = new Cookie("bacoSession", request.getSession().getId());
response.addCookie(cookie);
return cookie.getValue();
 
}
throw new NoCookiesException();
}
 
 
/impl/src/java/pt/estgp/estgweb/web/UserSessionProxy.java
1,24 → 1,14
package pt.estgp.estgweb.web;
 
import pt.estgp.estgweb.domain.UserSession;
import pt.estgp.estgweb.services.authenticate.AuthenticateException;
import pt.estgp.estgweb.web.utils.RequestUtils;
import pt.estgp.estgweb.web.exceptions.NoCookiesException;
import pt.estgp.estgweb.filters.filters.Session;
import pt.estgp.estgweb.Globals;
import pt.utl.ist.berserk.logic.serviceManager.IServiceManager;
import pt.utl.ist.berserk.logic.serviceManager.ServiceManager;
import pt.utl.ist.berserk.logic.serviceManager.exceptions.ServiceManagerException;
import pt.utl.ist.berserk.logic.serviceManager.exceptions.InvalidServiceException;
import pt.utl.ist.berserk.logic.filterManager.exceptions.*;
 
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
 
import org.apache.struts.action.ActionMessages;
import org.apache.struts.action.ActionMessage;
 
import java.util.Date;
 
/**
* @author Jorge Machado
* @date 29/Fev/2008
57,14 → 47,14
// return userSession;
// }
 
public static UserSession loadUserSession(HttpServletRequest request) throws Throwable
public static UserSession loadUserSession(HttpServletRequest request, HttpServletResponse response) throws Throwable
{
try
{
 
IServiceManager sm = ServiceManager.getInstance();
Object[] args = new Object[]{RequestUtils.getRequester(request)};
UserSession userSession = (UserSession) sm.execute(RequestUtils.getRequester(request),"LoadUserSession",args);
Object[] args = new Object[]{RequestUtils.getRequester(request, response)};
UserSession userSession = (UserSession) sm.execute(RequestUtils.getRequester(request, response),"LoadUserSession",args);
request.setAttribute(Globals.USER_SESSION_KEY,userSession);
return userSession;
}
/impl/src/java/pt/estgp/estgweb/web/controllers/profile/ProfileController.java
1,20 → 1,13
package pt.estgp.estgweb.web.controllers.profile;
 
import pt.estgp.estgweb.web.controllers.ApplicationDispatchController;
import pt.estgp.estgweb.web.controllers.AddRolesController;
import pt.estgp.estgweb.web.controllers.authenticate.AuthenticateController;
import pt.estgp.estgweb.web.utils.RequestUtils;
import pt.estgp.estgweb.web.exceptions.NoCookiesException;
import pt.estgp.estgweb.web.UserSessionProxy;
import pt.estgp.estgweb.web.form.profile.ProfileForm;
import pt.estgp.estgweb.web.form.AddRolesForm;
import pt.estgp.estgweb.domain.UserSession;
import pt.estgp.estgweb.domain.UserImpl;
import pt.estgp.estgweb.domain.User;
import pt.estgp.estgweb.domain.UserSessionImpl;
import pt.estgp.estgweb.domain.views.UserView;
import pt.estgp.estgweb.Globals;
import pt.estgp.estgweb.services.authenticate.AuthenticateException;
import pt.utl.ist.berserk.logic.serviceManager.IServiceManager;
import pt.utl.ist.berserk.logic.serviceManager.ServiceManager;
import pt.utl.ist.berserk.logic.serviceManager.exceptions.FilterChainFailedException;
24,8 → 17,6
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.ServletException;
import java.io.IOException;
import java.io.Serializable;
import java.util.List;
import java.util.ArrayList;
 
52,12 → 43,12
UserView userView= profileForm.getUserView();
try
{
UserSessionImpl userSession = (UserSessionImpl) UserSessionProxy.loadUserSession(request);
UserSessionImpl userSession = (UserSessionImpl) UserSessionProxy.loadUserSession(request,response);
userView.setUserRoles((List<String>) userSession.get(TARGET_ROLES_KEY));
IServiceManager sm = ServiceManager.getInstance();
String[] names = new String[]{"object"};
Object[] args = new Object[]{userView};
User user = (User) sm.execute(RequestUtils.getRequester(request),"EditUser",args,names);
User user = (User) sm.execute(RequestUtils.getRequester(request, response),"EditUser",args,names);
if(userSession.getUser().getId()==user.getId()){
userSession.setUser(user);
request.setAttribute(Globals.USER_SESSION_KEY,userSession);
85,7 → 76,7
try
{
ProfileForm pF = (ProfileForm) form;
UserSessionImpl userSession = (UserSessionImpl) UserSessionProxy.loadUserSession(request);
UserSessionImpl userSession = (UserSessionImpl) UserSessionProxy.loadUserSession(request,response);
String id = request.getParameter("id");
long userToLoad;
 
98,7 → 89,7
IServiceManager sm = ServiceManager.getInstance();
String[] names = new String[]{"serializable"};
Object[] args = new Object[]{userToLoad};
UserView uV = (UserView) sm.execute(RequestUtils.getRequester(request),"LoadUserById",args,names);
UserView uV = (UserView) sm.execute(RequestUtils.getRequester(request, response),"LoadUserById",args,names);
pF.setUserView(uV);
pF.setSelectedRoles(uV.getUserRoles());
userSession.put(TARGET_ROLES_KEY, (Serializable) uV.getUserRoles());
128,7 → 119,7
IServiceManager sm = ServiceManager.getInstance();
String[] names = new String[]{"serializable"};
Object[] args = new Object[]{fromRequest.getTextToSearch()};
List<UserView> uVs = (List<UserView>) sm.execute(RequestUtils.getRequester(request),"SearchUser",args,names);
List<UserView> uVs = (List<UserView>) sm.execute(RequestUtils.getRequester(request, response),"SearchUser",args,names);
profileForm.setUsersFind(uVs);
request.setAttribute("ProfileForm",profileForm);
return mapping.findForward("search");
/impl/src/java/pt/estgp/estgweb/web/controllers/AddRolesController.java
39,9 → 39,9
{
try
{
UserSessionImpl sess = (UserSessionImpl) UserSessionProxy.loadUserSession(request);
UserSessionImpl sess = (UserSessionImpl) UserSessionProxy.loadUserSession(request,response);
sess.remove(TARGET_ROLES_KEY);
sess.serialize(request);
sess.serialize(request,response);
return mapping.findForward("submit");
}
catch(FilterChainFailedException e)
64,7 → 64,7
try
{
AddRolesForm addRolesForm = (AddRolesForm) form;
UserSessionImpl sess = (UserSessionImpl) UserSessionProxy.loadUserSession(request);
UserSessionImpl sess = (UserSessionImpl) UserSessionProxy.loadUserSession(request,response);
List<String> l = (List<String>) sess.get(TARGET_ROLES_KEY);
if(l == null)
l = new ArrayList<String>();
73,7 → 73,7
{
l.add(addRolesForm.getTargetRolesStr());
sess.put(TARGET_ROLES_KEY, (Serializable) l);
sess.serialize(request);
sess.serialize(request,response);
}
else
{
119,7 → 119,7
addRolessForm.setTargetRoles(roles);
addRolessForm.setSelectedRoles(roles);
sess.put(TARGET_ROLES_KEY, (Serializable) roles);
sess.serialize(request);
sess.serialize(request,response);
return mapping.getInputForward();
}
 
/impl/src/java/pt/estgp/estgweb/web/controllers/blogs/BlogsController.java
62,7 → 62,7
}
String[] names = new String[]{"object"};
Object[] args = new Object[]{blog};
BlogView bV = (BlogView) sm.execute(RequestUtils.getRequester(request), "CreateBlog", args, names);
BlogView bV = (BlogView) sm.execute(RequestUtils.getRequester(request, response), "CreateBlog", args, names);
addMessage(request, "blog.created.success", "" + bV.getId());
request.setAttribute("BlogView", bV);
return mapping.findForward("success");
71,7 → 71,7
IServiceManager sm = ServiceManager.getInstance();
String[] names = new String[]{"object"};
Object[] args = new Object[]{bV};
bV = (BlogView) sm.execute(RequestUtils.getRequester(request), "EditBlog", args, names);
bV = (BlogView) sm.execute(RequestUtils.getRequester(request, response), "EditBlog", args, names);
addMessage(request, "blog.edited.success", "" + bV.getId());
return mapping.findForward("success");
}
95,7 → 95,7
IServiceManager sm = ServiceManager.getInstance();
String[] names = new String[]{"serializable"};
Object[] args = new Object[]{Long.parseLong(request.getParameter("id"))};
BlogView bV = (BlogView) sm.execute(RequestUtils.getRequester(request), "LoadBlog", args, names);
BlogView bV = (BlogView) sm.execute(RequestUtils.getRequester(request, response), "LoadBlog", args, names);
request.setAttribute("BlogView", bV);
return mapping.findForward("success");
}
/impl/src/java/pt/estgp/estgweb/web/controllers/TesteController.java
2,18 → 2,10
 
import org.apache.log4j.Logger;
import org.apache.struts.action.*;
import pt.estgp.estgweb.web.controllers.authenticate.AuthenticateController;
import pt.estgp.estgweb.web.utils.RequestUtils;
import pt.estgp.estgweb.web.UserSessionProxy;
import pt.estgp.estgweb.web.form.TesteForm;
import pt.estgp.estgweb.web.exceptions.NoCookiesException;
import pt.estgp.estgweb.services.authenticate.AuthenticateException;
import pt.estgp.estgweb.domain.UserSession;
import pt.estgp.estgweb.Globals;
import pt.utl.ist.berserk.logic.serviceManager.IServiceManager;
import pt.utl.ist.berserk.logic.serviceManager.ServiceManager;
import pt.utl.ist.berserk.logic.serviceManager.exceptions.ServiceManagerException;
import pt.utl.ist.berserk.logic.filterManager.exceptions.*;
 
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
52,7 → 44,7
}
try
{
sm.execute(RequestUtils.getRequester(request), "TesteSaver", args2);
sm.execute(RequestUtils.getRequester(request, response), "TesteSaver", args2);
}
catch (Throwable e)
{
/impl/src/java/pt/estgp/estgweb/web/controllers/commons/CommonsController.java
48,7 → 48,7
{
try
{
ICommonSearchResults commonSearchResults = CommonServicesManager.getInstance().search(request,request.getParameter("query"), SearchTypeEnum.parse(request.getParameter("searchType")));
ICommonSearchResults commonSearchResults = CommonServicesManager.getInstance().search(request,response,request.getParameter("query"), SearchTypeEnum.parse(request.getParameter("searchType")));
// if(commonSearchResults.getTotalResults() == 0)
// return mapping.findForward("noresults");
request.setAttribute("ICommonSearchResults",commonSearchResults);
72,7 → 72,7
throws Throwable, ServletException {
try
{
ISearchResults searchResults = CommonServicesManager.getInstance().search(request,request.getParameter("query"), SearchTypeEnum.parse(request.getParameter("searchType")),request.getParameter("module"),Integer.parseInt(request.getParameter("page")));
ISearchResults searchResults = CommonServicesManager.getInstance().search(request,response,request.getParameter("query"), SearchTypeEnum.parse(request.getParameter("searchType")),request.getParameter("module"),Integer.parseInt(request.getParameter("page")));
request.setAttribute("ISearchResults",searchResults);
return mapping.findForward("searchModule");
}
/impl/src/java/pt/estgp/estgweb/web/controllers/announcements/AnnouncementsController.java
10,10 → 10,8
import pt.estgp.estgweb.web.utils.RequestUtils;
import pt.estgp.estgweb.web.utils.DatesUtils;
import pt.estgp.estgweb.domain.UserSessionImpl;
import pt.estgp.estgweb.domain.Announcement;
import pt.estgp.estgweb.domain.DomainObjectFactory;
import pt.estgp.estgweb.domain.Image;
import pt.estgp.estgweb.domain.dao.DaoFactory;
import pt.estgp.estgweb.domain.views.AnnouncementView;
import pt.utl.ist.berserk.logic.serviceManager.IServiceManager;
import pt.utl.ist.berserk.logic.serviceManager.ServiceManager;
112,7 → 110,7
boolean newAnnouncement = true;
if (view.getId() > 0)
newAnnouncement = false;
AnnouncementView aV = (AnnouncementView) sm.execute(RequestUtils.getRequester(request), "CreateAnnouncement", args, names);
AnnouncementView aV = (AnnouncementView) sm.execute(RequestUtils.getRequester(request, response), "CreateAnnouncement", args, names);
if (newAnnouncement)
addMessage(request, "announcement.created.success", request.getContextPath(), "" + aV.getId(), view.getTitle());
else
138,18 → 136,18
{
try
{
UserSessionImpl sess = (UserSessionImpl) UserSessionProxy.loadUserSession(request);
UserSessionImpl sess = (UserSessionImpl) UserSessionProxy.loadUserSession(request,response);
IServiceManager sm = ServiceManager.getInstance();
String[] names = new String[]{"serializable"};
Object[] args = new Object[]{new Long(request.getParameter("id"))};
AnnouncementView aV = (AnnouncementView) sm.execute(RequestUtils.getRequester(request), "LoadEditAnnouncement", args, names);
AnnouncementView aV = (AnnouncementView) sm.execute(RequestUtils.getRequester(request, response), "LoadEditAnnouncement", args, names);
AnnouncementsForm announcementsForm = (AnnouncementsForm) form;
announcementsForm.setAnnouncementView(aV);
announcementsForm.setStartDate(DatesUtils.getStringFromDate(aV.getStartDate()));
announcementsForm.setExpireDate(DatesUtils.getStringFromDate(aV.getExpireDate()));
announcementsForm.setSelectedRoles(aV.getTargetRoles());
sess.put(TARGET_ROLES_KEY, (Serializable) aV.getTargetRoles());
sess.serialize(request);
sess.serialize(request,response);
return mapping.getInputForward();
}
catch (FilterChainFailedException e)
175,7 → 173,7
IServiceManager sm = ServiceManager.getInstance();
String[] names = new String[]{"serializable"};
Object[] args = new Object[]{new Long(request.getParameter("id"))};
Boolean status= (Boolean) sm.execute(RequestUtils.getRequester(request),"DeleteAnnouncement",args,names);
Boolean status= (Boolean) sm.execute(RequestUtils.getRequester(request, response),"DeleteAnnouncement",args,names);
if(status)
{
addMessage(request,"announcement.deleted.success","" + request.getParameter("id"));
210,7 → 208,7
IServiceManager sm = ServiceManager.getInstance();
String[] names = new String[]{};
Object[] args = new Object[]{};
List<AnnouncementView> announcementViews = (List<AnnouncementView>) sm.execute(RequestUtils.getRequester(request), "LoadTargetMaxAnnouncements", args, names);
List<AnnouncementView> announcementViews = (List<AnnouncementView>) sm.execute(RequestUtils.getRequester(request, response), "LoadTargetMaxAnnouncements", args, names);
request.setAttribute("Announcements", announcementViews);
return mapping.findForward("success");
}
237,7 → 235,7
IServiceManager sm = ServiceManager.getInstance();
String[] names = new String[]{"serializable"};
Object[] args = new Object[]{new Long(id)};
AnnouncementView announcementView = (AnnouncementView) sm.execute(RequestUtils.getRequester(request), "LoadAnnouncementView", args, names);
AnnouncementView announcementView = (AnnouncementView) sm.execute(RequestUtils.getRequester(request, response), "LoadAnnouncementView", args, names);
request.setAttribute("Announcement", announcementView);
return mapping.findForward("load");
}
/impl/src/java/pt/estgp/estgweb/web/controllers/authenticate/AuthenticateController.java
2,34 → 2,23
 
import org.apache.struts.action.*;
import org.apache.log4j.Logger;
import pt.estgp.estgweb.web.controllers.announcements.AnnouncementsController;
import pt.estgp.estgweb.web.controllers.ApplicationController;
import pt.estgp.estgweb.web.controllers.ApplicationDispatchController;
import pt.estgp.estgweb.web.utils.RequestUtils;
import pt.estgp.estgweb.web.exceptions.NoCookiesException;
import pt.estgp.estgweb.web.UserSessionProxy;
import pt.estgp.estgweb.web.form.EmptyForm;
import pt.estgp.estgweb.web.form.profile.ProfileForm;
import pt.estgp.estgweb.utils.ConfigProperties;
import pt.estgp.estgweb.services.authenticate.AuthenticateException;
import pt.estgp.estgweb.Globals;
import pt.estgp.estgweb.domain.UserSession;
import pt.estgp.estgweb.domain.User;
import pt.estgp.estgweb.domain.UserImpl;
import pt.estgp.estgweb.domain.UserSessionImpl;
import pt.estgp.estgweb.domain.views.UserView;
import pt.utl.ist.berserk.logic.serviceManager.IServiceManager;
import pt.utl.ist.berserk.logic.serviceManager.ServiceManager;
import pt.utl.ist.berserk.logic.serviceManager.exceptions.ServiceManagerException;
import pt.utl.ist.berserk.logic.filterManager.exceptions.*;
 
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.ServletException;
import java.io.IOException;
import java.io.FileNotFoundException;
import java.net.URL;
import java.net.URLConnection;
 
/**
* @author Jorge Machado
56,7 → 45,7
{
IServiceManager sm = ServiceManager.getInstance();
Object[] args = new Object[]{username,password};
UserSession userSession = (UserSession) sm.execute(RequestUtils.getRequester(request),"Authenticate",args);
UserSession userSession = (UserSession) sm.execute(RequestUtils.getRequester(request, response),"Authenticate",args);
request.setAttribute(Globals.USER_SESSION_KEY,userSession);
if(!((UserImpl)userSession.getUser()).isNewUser())
return mapping.findForward("success");
66,7 → 55,7
IServiceManager sm2 = ServiceManager.getInstance();
String[] names = new String[]{"serializable"};
Object[] args2 = new Object[]{userSession.getUser().getId()};
UserView uV = (UserView) sm2.execute(RequestUtils.getRequester(request),"LoadUserById",args2,names);
UserView uV = (UserView) sm2.execute(RequestUtils.getRequester(request, response),"LoadUserById",args2,names);
profileForm.setUserView(uV);
request.setAttribute("ProfileForm",profileForm);
addMessage(request,"profile.enter.first.time",uV.getName());
112,7 → 101,7
else
request.setAttribute("name",userSession.getUser().getUsername());
 
userSession = (UserSession) sm.execute(RequestUtils.getRequester(request),"Logout",args);
userSession = (UserSession) sm.execute(RequestUtils.getRequester(request, response),"Logout",args);
request.setAttribute(Globals.USER_SESSION_KEY,userSession);
return mapping.findForward("logout");
}
/impl/src/java/pt/estgp/estgweb/web/controllers/urlstat/UrlStatController.java
39,7 → 39,7
UrlStatForm urlStatForm = (UrlStatForm) form;
IServiceManager sm = ServiceManager.getInstance();
Object[] args = new Object[]{request, urlStatForm.getRelativePathsStrs(), ChartTypeEnum.parse(urlStatForm.getChartType())};
String tmpLocation = (String) sm.execute(RequestUtils.getRequester(request),"BuildChartGetPath",args);
String tmpLocation = (String) sm.execute(RequestUtils.getRequester(request, response),"BuildChartGetPath",args);
request.getRequestDispatcher("/tmpStream" + tmpLocation).forward(request,response);
return null;
}
/impl/src/java/pt/estgp/estgweb/web/filters/UrlStatFilter.java
8,12 → 8,9
import java.io.IOException;
import java.util.HashMap;
import java.util.Date;
import java.util.Calendar;
import java.util.List;
 
import pt.estgp.estgweb.domain.UserSessionImpl;
import pt.estgp.estgweb.domain.UserImpl;
import pt.estgp.estgweb.domain.UserSession;
import pt.estgp.estgweb.Globals;
import pt.estgp.estgweb.utils.ConfigProperties;
import pt.estgp.estgweb.web.utils.RequestUtils;
71,6 → 68,7
{
 
HttpServletRequest hrequest = (HttpServletRequest) request;
HttpServletResponse hresponse = (HttpServletResponse) response;
UserSessionImpl userSession = (UserSessionImpl) request.getAttribute(Globals.USER_SESSION_KEY);
MyCalendar c = new MyCalendar();
int nowDay = c.getDay();
78,7 → 76,7
{
try
{
updateStats(hrequest, c.getTimeInMillis());
updateStats(hrequest, hresponse,c.getTimeInMillis());
}
catch (Throwable e)
{
131,7 → 129,7
userSession.put(relativePath,"");
try
{
userSession.serialize(hrequest);
userSession.serialize(hrequest,(HttpServletResponse)response);
}
catch (Throwable e)
{
147,7 → 145,7
{
try
{
createUrl(hrequest,c.getTimeInMillis(),relativePath);
createUrl(hrequest,((HttpServletResponse)response),c.getTimeInMillis(),relativePath);
}
catch (Throwable e)
{
162,22 → 160,22
chain.doFilter(request,response);
}
 
public static synchronized void updateStats(HttpServletRequest request, long nowMiliseconds) throws Throwable, InvalidFilterException, ServiceManagerException, InvalidFilterExpressionException, IncompatibleFilterException, FilterRetrieveException, NoCookiesException
public static synchronized void updateStats(HttpServletRequest request,HttpServletResponse response, long nowMiliseconds) throws Throwable, InvalidFilterException, ServiceManagerException, InvalidFilterExpressionException, IncompatibleFilterException, FilterRetrieveException, NoCookiesException
{
 
lastUpdate = nowMiliseconds;
IServiceManager sm = ServiceManager.getInstance();
Object[] args = new Object[]{urlStat,year,month,day};
sm.execute(RequestUtils.getRequester(request),"UpdateUrlStatistics",args);
sm.execute(RequestUtils.getRequester(request, response),"UpdateUrlStatistics",args);
urlStat.clear();
urlStat = null;
urlStat = new HashMap<String,IntegerContainer>();
}
 
public static synchronized void createUrl(HttpServletRequest request, long nowMiliseconds, String relativePath) throws Throwable, ClassNotIFilterException, ServiceManagerException, InvalidFilterExpressionException, IncompatibleFilterException, FilterRetrieveException, NoCookiesException
public static synchronized void createUrl(HttpServletRequest request,HttpServletResponse response, long nowMiliseconds, String relativePath) throws Throwable, ClassNotIFilterException, ServiceManagerException, InvalidFilterExpressionException, IncompatibleFilterException, FilterRetrieveException, NoCookiesException
{
if(urlStat.size() >= MAX_MAP_SYZE)
updateStats(request,nowMiliseconds);
updateStats(request,response,nowMiliseconds);
urlStat.put(relativePath, new IntegerContainer(1));
}
 
/impl/src/java/pt/estgp/estgweb/web/filters/UserSessionFilter.java
50,7 → 50,7
chain.doFilter(request,response);
try
{
UserSessionImpl userSession = (UserSessionImpl) UserSessionProxy.loadUserSession(hrequest);
UserSessionImpl userSession = (UserSessionImpl) UserSessionProxy.loadUserSession(hrequest,((HttpServletResponse) response));
request.setAttribute(Globals.USER_SESSION_KEY,userSession);
userSession.setIpAddress(request.getRemoteAddr() + " : " + request.getRemoteHost() + " : " + request.getRemotePort());
String lang = request.getParameter("language");
59,7 → 59,7
userSession.setLanguage(lang);
try
{
userSession.serialize((HttpServletRequest)request);
userSession.serialize((HttpServletRequest)request,(HttpServletResponse)response);
}
catch (Throwable e)
{