Menu
▾
▴
[Hyperic-hq-discuss] hq r10244 - in branches/HQ_3_2/src/org/hyperic/hq: hqu/rendit hqu/rendit_sys hqu/rendit_sys/helpers ui/servlet
|
From: <rm...@hy...> - 2008-07-17 17:58:46
|
Author: rmorgan Date: 2008-07-17 10:58:43 -0700 (Thu, 17 Jul 2008) New Revision: 10244 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=10244 Modified: branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit/RequestInvocationBindings.java branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/BaseController.groovy branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/helpers/AgentHelper.groovy branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/helpers/AlertHelper.groovy branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/helpers/AuditHelper.groovy branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/helpers/AutodiscoveryHelper.groovy branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/helpers/BaseHelper.groovy branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/helpers/EscalationHelper.groovy branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/helpers/MetricHelper.groovy branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/helpers/ResourceHelper.groovy branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/helpers/RoleHelper.groovy branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/helpers/UserHelper.groovy branches/HQ_3_2/src/org/hyperic/hq/ui/servlet/RenditServlet.java Log: Add sessionId to helper classes. [merge from trunk] Modified: branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit/RequestInvocationBindings.java =================================================================== --- branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit/RequestInvocationBindings.java 2008-07-17 17:53:53 UTC (rev 10243) +++ branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit/RequestInvocationBindings.java 2008-07-17 17:58:43 UTC (rev 10244) @@ -40,6 +40,7 @@ private String _servletPath; private String _queryStr; private AuthzSubject _user; + private int _sessionId; private HttpServletRequest _request; private HttpServletResponse _response; private ServletContext _context; @@ -47,6 +48,7 @@ public RequestInvocationBindings(String requestURI, String ctxPath, String pathInfo, String servletPath, String queryStr, AuthzSubject user, + int sessionId, HttpServletRequest request, HttpServletResponse response, ServletContext ctx) @@ -57,6 +59,7 @@ _servletPath = servletPath; _queryStr = queryStr; _user = user; + _sessionId = sessionId; _request = request; _response = response; _context = ctx; @@ -86,6 +89,10 @@ return _user; } + public int getSessionId() { + return _sessionId; + } + public HttpServletRequest getRequest() { return _request; } Modified: branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/BaseController.groovy =================================================================== --- branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/BaseController.groovy 2008-07-17 17:53:53 UTC (rev 10243) +++ branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/BaseController.groovy 2008-07-17 17:58:43 UTC (rev 10244) @@ -351,37 +351,45 @@ protected AuthzSubject getUser() { invokeArgs.user } - + + protected int getSessionId() { + invokeArgs.sessionId + } + protected AgentHelper getAgentHelper() { - new AgentHelper(user) + new AgentHelper(user, sessionId) } protected AlertHelper getAlertHelper() { - new AlertHelper(user) + new AlertHelper(user, sessionId) } protected AuditHelper getAuditHelper() { - new AuditHelper(user) + new AuditHelper(user, sessionId) } protected ResourceHelper getResourceHelper() { - new ResourceHelper(user) + new ResourceHelper(user, sessionId) } protected MetricHelper getMetricHelper() { - new MetricHelper(user) + new MetricHelper(user, sessionId) } protected UserHelper getUserHelper() { - new UserHelper(user) + new UserHelper(user, sessionId) } + + protected EscalationHelper getEscalationHelper() { + new EscalationHelper(user, sessionId) + } protected AutodiscoveryHelper getAutodiscoveryHelper() { - new AutodiscoveryHelper(user) + new AutodiscoveryHelper(user, sessionId) } protected RoleHelper getRoleHelper() { - new RoleHelper(user) + new RoleHelper(user, sessionId) } /** Modified: branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/helpers/AgentHelper.groovy =================================================================== --- branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/helpers/AgentHelper.groovy 2008-07-17 17:53:53 UTC (rev 10243) +++ branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/helpers/AgentHelper.groovy 2008-07-17 17:58:43 UTC (rev 10244) @@ -5,8 +5,8 @@ import org.hyperic.hq.authz.server.session.AuthzSubject class AgentHelper extends BaseHelper { - AgentHelper(AuthzSubject user) { - super(user) + AgentHelper(AuthzSubject user, int sessionId) { + super(user, sessionId) } /** Modified: branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/helpers/AlertHelper.groovy =================================================================== --- branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/helpers/AlertHelper.groovy 2008-07-17 17:53:53 UTC (rev 10243) +++ branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/helpers/AlertHelper.groovy 2008-07-17 17:58:43 UTC (rev 10244) @@ -14,8 +14,8 @@ private galertMan = GalertManagerEJBImpl.one private defMan = AlertDefinitionManagerEJBImpl.one - AlertHelper(AuthzSubject user) { - super(user) + AlertHelper(AuthzSubject user, int sessionId) { + super(user, sessionId) } /** Modified: branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/helpers/AuditHelper.groovy =================================================================== --- branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/helpers/AuditHelper.groovy 2008-07-17 17:53:53 UTC (rev 10243) +++ branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/helpers/AuditHelper.groovy 2008-07-17 17:58:43 UTC (rev 10244) @@ -9,8 +9,8 @@ class AuditHelper extends BaseHelper { private auditMan = AuditManagerEJBImpl.one - AuditHelper(AuthzSubject user) { - super(user) + AuditHelper(AuthzSubject user, int sessionId) { + super(user, sessionId) } def findAudits(long startTime, long endTime, AuditImportance minImportance, Modified: branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/helpers/AutodiscoveryHelper.groovy =================================================================== --- branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/helpers/AutodiscoveryHelper.groovy 2008-07-17 17:53:53 UTC (rev 10243) +++ branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/helpers/AutodiscoveryHelper.groovy 2008-07-17 17:58:43 UTC (rev 10244) @@ -16,8 +16,8 @@ private aiqMan = AIQMan.one private AuthzSubjectValue userValue - AutodiscoveryHelper(AuthzSubject user) { - super(user) + AutodiscoveryHelper(AuthzSubject user, int sessionId) { + super(user, sessionId) userValue = user.valueObject } Modified: branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/helpers/BaseHelper.groovy =================================================================== --- branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/helpers/BaseHelper.groovy 2008-07-17 17:53:53 UTC (rev 10243) +++ branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/helpers/BaseHelper.groovy 2008-07-17 17:58:43 UTC (rev 10244) @@ -7,11 +7,13 @@ abstract class BaseHelper { private AuthzSubject overlord = AuthzSubjectManagerEJBImpl.one.overlordPojo AuthzSubject user - AuthzSubjectValue userValue + AuthzSubjectValue userValue + int sessionId - BaseHelper(AuthzSubject user) { + BaseHelper(AuthzSubject user, int sessionId) { this.user = user this.userValue = user.authzSubjectValue + this.sessionId = sessionId } protected AuthzSubject getOverlord() { Modified: branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/helpers/EscalationHelper.groovy =================================================================== --- branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/helpers/EscalationHelper.groovy 2008-07-17 17:53:53 UTC (rev 10243) +++ branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/helpers/EscalationHelper.groovy 2008-07-17 17:58:43 UTC (rev 10244) @@ -10,8 +10,8 @@ class EscalationHelper extends BaseHelper { private escMan = EscMan.one - EscalationHelper(AuthzSubject user) { - super(user) + EscalationHelper(AuthzSubject user, int sessionId) { + super(user, sessionId) } /** Modified: branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/helpers/MetricHelper.groovy =================================================================== --- branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/helpers/MetricHelper.groovy 2008-07-17 17:53:53 UTC (rev 10243) +++ branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/helpers/MetricHelper.groovy 2008-07-17 17:58:43 UTC (rev 10244) @@ -19,8 +19,8 @@ private tmplMan = TemplateManagerEJBImpl.one private measMan = DerivedMeasurementManagerEJBImpl.one - MetricHelper(AuthzSubject user) { - super(user) + MetricHelper(AuthzSubject user, int sessionId) { + super(user, sessionId) } /** Modified: branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/helpers/ResourceHelper.groovy =================================================================== --- branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/helpers/ResourceHelper.groovy 2008-07-17 17:53:53 UTC (rev 10243) +++ branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/helpers/ResourceHelper.groovy 2008-07-17 17:58:43 UTC (rev 10244) @@ -22,8 +22,8 @@ private rman = ResourceManagerEJBImpl.one private groupMan = GroupMan.one - ResourceHelper(AuthzSubject user) { - super(user) + ResourceHelper(AuthzSubject user, int sessionId) { + super(user, sessionId) } /** Modified: branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/helpers/RoleHelper.groovy =================================================================== --- branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/helpers/RoleHelper.groovy 2008-07-17 17:53:53 UTC (rev 10243) +++ branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/helpers/RoleHelper.groovy 2008-07-17 17:58:43 UTC (rev 10244) @@ -10,8 +10,8 @@ def roleMan = RoleMan.one - RoleHelper(AuthzSubject user) { - super(user) + RoleHelper(AuthzSubject user, int sessionId) { + super(user, sessionId) } /** Modified: branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/helpers/UserHelper.groovy =================================================================== --- branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/helpers/UserHelper.groovy 2008-07-17 17:53:53 UTC (rev 10243) +++ branches/HQ_3_2/src/org/hyperic/hq/hqu/rendit_sys/helpers/UserHelper.groovy 2008-07-17 17:58:43 UTC (rev 10244) @@ -15,8 +15,8 @@ private authMan = AuthMan.one private AuthzSubjectValue userValue - UserHelper(AuthzSubject user) { - super(user) + UserHelper(AuthzSubject user, int sessionId) { + super(user, sessionId) userValue = user.valueObject } Modified: branches/HQ_3_2/src/org/hyperic/hq/ui/servlet/RenditServlet.java =================================================================== --- branches/HQ_3_2/src/org/hyperic/hq/ui/servlet/RenditServlet.java 2008-07-17 17:53:53 UTC (rev 10243) +++ branches/HQ_3_2/src/org/hyperic/hq/ui/servlet/RenditServlet.java 2008-07-17 17:58:43 UTC (rev 10244) @@ -187,7 +187,8 @@ RequestInvocationBindings b = new RequestInvocationBindings(reqUri, ctxPath, pathInfo, servletPath, queryStr, user, - req, resp, getServletContext()); + sessId, req, resp, + getServletContext()); long start = System.currentTimeMillis(); try { RenditServer.getInstance().handleRequest(plugin, b); |