summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2013-05-13 09:08:57 (EDT)
committerStephan Born2013-08-28 12:51:20 (EDT)
commitc22d0deb2fca456cb3099946d516920ae34e0e40 (patch)
treec24c90f52a449224639e7d4d7105c01bdd0e530b
parentc7cd20983185f0f005090df496045ea6e9d9ac8f (diff)
downloadorg.eclipse.stardust.ui.web-c22d0deb2fca456cb3099946d516920ae34e0e40.zip
org.eclipse.stardust.ui.web-c22d0deb2fca456cb3099946d516920ae34e0e40.tar.gz
org.eclipse.stardust.ui.web-c22d0deb2fca456cb3099946d516920ae34e0e40.tar.bz2
Jira-ID: CRNT-27045
Removed the trace logs from infinityStartup.java,LoginFilter.java , IppAuthenticationProvider and SessionContextListener.java added as part of CRNT-26873. Merged the changes done for worklistPanelConfiguration.xhtml from CRNT-27254 git-svn-id: https://svn.csa.sungard.com/repos/ipp2/product/trunk/stardust/ui.web@64803 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b Signed-off-by: Sidharth Singh <sidharth.singh@sungard.com>
-rw-r--r--portal-common/src/main/java/org/eclipse/stardust/ui/web/common/app/PortalApplication.java21
-rw-r--r--process-portal/src/main/resources/META-INF/xhtml/processportal/worklistPanelConfiguration.xhtml29
-rw-r--r--views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/common/listener/SessionContextListener.java37
-rw-r--r--views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/common/spi/user/impl/IppAuthenticationProvider.java10
-rw-r--r--views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/login/InfinityStartup.java21
-rw-r--r--views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/login/filter/LoginFilter.java78
6 files changed, 29 insertions, 167 deletions
diff --git a/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/app/PortalApplication.java b/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/app/PortalApplication.java
index 0af7949..ef1335d 100644
--- a/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/app/PortalApplication.java
+++ b/portal-common/src/main/java/org/eclipse/stardust/ui/web/common/app/PortalApplication.java
@@ -926,18 +926,9 @@ public class PortalApplication
*/
public String logout()
{
- if (trace.isDebugEnabled())
- {
- trace.debug("#PortalApplication.logout() invoked...");
- }
// Close All Open Views
closeAllViews();
- if (trace.isDebugEnabled())
- {
- trace.debug("#closeAllViews()...");
- }
-
// If All Views are successfully closed, then fire logout
if (getOpenViewsSize() == 0)
{
@@ -945,15 +936,7 @@ public class PortalApplication
String logoutScript = "InfinityBpm.Core.closeSession();";
//JavascriptContext.addJavascriptCall(FacesContext.getCurrentInstance(), logoutScript);
addEventScript(logoutScript); // This is required since addJavascriptCall does not work if JSF Page refresh is involved
- if (trace.isDebugEnabled())
- {
- trace.debug("#addEventScript(logoutScript)...");
- }
SessionRendererHelper.removeCurrentSession(SessionRendererHelper.getPortalSessionRendererId(getLoggedInUser()));
- if (trace.isDebugEnabled())
- {
- trace.debug("#SessionRendererHelper.removeCurrentSession(SessionRendererHelper.getPortalSessionRendererId(getLoggedInUser()))...");
- }
}
else
{
@@ -962,10 +945,6 @@ public class PortalApplication
trace.debug("Not all Views got closed successully. Cannot logout...");
}
}
- if (trace.isDebugEnabled())
- {
- trace.debug("#Returning from Logout....");
- }
return null;
}
diff --git a/process-portal/src/main/resources/META-INF/xhtml/processportal/worklistPanelConfiguration.xhtml b/process-portal/src/main/resources/META-INF/xhtml/processportal/worklistPanelConfiguration.xhtml
index 101cc10..7441d87 100644
--- a/process-portal/src/main/resources/META-INF/xhtml/processportal/worklistPanelConfiguration.xhtml
+++ b/process-portal/src/main/resources/META-INF/xhtml/processportal/worklistPanelConfiguration.xhtml
@@ -37,7 +37,36 @@
<ice:panelGroup styleClass="clearing" />
+ <ice:panelGroup styleClass="heading" style="width: 100%">
+ <ice:outputText value="#{processportal_msgPropsBean['views.worklistPanelConfiguration.refreshInterval.title']}" />
+ </ice:panelGroup>
+ <ice:panelGrid columns="3" cellspacing="2px" cellpadding="2px">
+ <ice:outputLabel
+ value="#{processportal_msgPropsBean['views.worklistPanelConfiguration.refreshInterval']}#{common_msgPropsBean['common.colon']}"
+ styleClass="label-form" />
+ <ice:panelGroup>
+ <ice:panelGrid columns="2" cellspacing="0px" cellpadding="0px">
+ <ice:inputText partialSubmit="true" immediate="true"
+ id="refreshInterval" maxlength="3" style="width: 30px"
+ value="#{worklistConfigurationBean.refreshInterval}">
+ <f:validateLongRange maximum="100" minimum="1" />
+ <pc:automationTag value="auto-PP-WorklistPnlConf-RefreshInterval"
+ standAlone="false" />
+ </ice:inputText>
+ </ice:panelGrid>
+ </ice:panelGroup>
+ <ice:panelGroup >
+ <ice:outputLabel styleClass="label-desc"
+ value="#{processportal_msgPropsBean['views.worklistPanelConfiguration.refreshIntMsg']}" />
+ </ice:panelGroup>
+ </ice:panelGrid>
+ <ice:panelGrid columns="2">
+ <ice:message styleClass="iceMsgImage" id="refIntervalErrorImage"
+ for="refreshInterval" showDetail="false" showSummary="false" />
+ <ice:message id="refIntervalError" for="refreshInterval" />
+ </ice:panelGrid>
+
<ice:panelCollapsible
expanded="#{worklistConfigurationBean.participantsSectionExpanded}">
<f:facet name="header">
diff --git a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/common/listener/SessionContextListener.java b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/common/listener/SessionContextListener.java
index 17f906a..624f44e 100644
--- a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/common/listener/SessionContextListener.java
+++ b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/common/listener/SessionContextListener.java
@@ -31,21 +31,7 @@ public class SessionContextListener implements HttpSessionListener
public void sessionCreated(HttpSessionEvent event)
{
- if (trace.isDebugEnabled())
- {
- trace.debug("#sessionCreated(HttpSessionEvent event)");
- if (null != event.getSession())
- {
- trace.debug("#Session Id: " + event.getSession().getId());
- }
- }
-
correctHeadlessSetting(event.getSession().getServletContext());
-
- if (trace.isDebugEnabled())
- {
- trace.debug("#Returning from sessionCreated(HttpSessionEvent event)");
- }
}
/**
@@ -97,27 +83,12 @@ public class SessionContextListener implements HttpSessionListener
public void sessionDestroyed(HttpSessionEvent event)
{
- if (trace.isDebugEnabled())
- {
- trace.debug("#sessionDestroyed(HttpSessionEvent event)");
- }
-
HttpSession session = event.getSession();
boolean sessionUnregistered = ApplicationContext.unregisterSession(session);
- if (trace.isDebugEnabled())
- {
- trace.debug("#ApplicationContext.unregisterSession(session)....");
- }
-
if (session != null)
{
- if (trace.isDebugEnabled())
- {
- trace.debug("#Session Id: " + session.getId());
- }
-
Object attr = session.getAttribute(SessionContext.BEAN_ID);
if (attr instanceof SessionContext)
{
@@ -127,10 +98,6 @@ public class SessionContextListener implements HttpSessionListener
ServiceFactory serviceFactory = sessionCtx.getServiceFactory();
serviceFactory.close();
session.setAttribute(SessionContext.BEAN_ID, null);
- if (trace.isDebugEnabled())
- {
- trace.debug("#resetting ServiceFactory done....");
- }
}
}
@@ -146,10 +113,6 @@ public class SessionContextListener implements HttpSessionListener
}
}
}
- if (trace.isDebugEnabled())
- {
- trace.debug("#sessionDestroyed(HttpSessionEvent event) exiting...");
- }
}
}
diff --git a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/common/spi/user/impl/IppAuthenticationProvider.java b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/common/spi/user/impl/IppAuthenticationProvider.java
index 896c836..efec2d8 100644
--- a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/common/spi/user/impl/IppAuthenticationProvider.java
+++ b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/common/spi/user/impl/IppAuthenticationProvider.java
@@ -44,18 +44,8 @@ public class IppAuthenticationProvider implements AuthenticationProvider
public void initialize(ServletContext servletContext, HttpServletRequest request,
HttpServletResponse response)
{
- if (trace.isDebugEnabled())
- {
- trace.debug("#IppAuthenticationProvider()....");
- }
infinityStartup = new InfinityStartup(servletContext, request, response);
infinityStartup.createSession();
-
- if (trace.isDebugEnabled())
- {
- trace.debug("#IppAuthenticationProvider initialized....");
- }
-
}
/* (non-Javadoc)
diff --git a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/login/InfinityStartup.java b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/login/InfinityStartup.java
index 17ba404..1944186 100644
--- a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/login/InfinityStartup.java
+++ b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/login/InfinityStartup.java
@@ -54,20 +54,11 @@ public class InfinityStartup
public InfinityStartup(ServletContext servletContext, HttpServletRequest request, HttpServletResponse response)
{
- if (trace.isDebugEnabled())
- {
- trace.debug("#creating InfinityStartup....");
- }
-
this.servletContext = servletContext;
this.request = request;
this.response = response;
this.params = getParams(request);
- if (trace.isDebugEnabled())
- {
- trace.debug("#InfinityStartup created....");
- }
//read parameter
this.timeout = Parameters.instance().getInteger(TIMEOUT, 1000);
@@ -127,10 +118,6 @@ public class InfinityStartup
public void createSession()
{
- if (trace.isDebugEnabled())
- {
- trace.debug("#InfinityStartup createSession()....");
- }
HttpSession httpSession = request.getSession();
if(null != httpSession)
{
@@ -157,10 +144,6 @@ public class InfinityStartup
}
}
}
- if (trace.isDebugEnabled())
- {
- trace.debug("#Invalidating Session....");
- }
if (request.isRequestedSessionIdValid())
{
@@ -192,10 +175,6 @@ public class InfinityStartup
}
request.getSession(true);
- if (trace.isDebugEnabled())
- {
- trace.debug("#exiting from createSession()");
- }
}
}
diff --git a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/login/filter/LoginFilter.java b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/login/filter/LoginFilter.java
index 3462c4b..ecd7a35 100644
--- a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/login/filter/LoginFilter.java
+++ b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/login/filter/LoginFilter.java
@@ -152,18 +152,10 @@ public class LoginFilter implements Filter
private void handleInvalidSession(HttpServletRequest request,
HttpServletResponse response, FacesContext facesContext)
{
- if (trace.isDebugEnabled())
- {
- trace.debug("#handleInvalidSession() invoked...");
- }
String user = request.getParameter("j_username");
String password = request.getParameter("j_password");
if(!StringUtils.isEmpty(user) && !StringUtils.isEmpty(password))
{
- if (trace.isDebugEnabled())
- {
- trace.debug("#creating new session...");
- }
request.getSession(true);
LoginDialogBean loginBean = (LoginDialogBean) FacesUtils.getBeanFromContext(
facesContext, LoginDialogBean.BEAN_ID);
@@ -179,10 +171,6 @@ public class LoginFilter implements Filter
String outcome = loginBean.login();
if(Constants.WORKFLOW_PRINCIPAL_LOGIN.equals(outcome))
{
- if (trace.isDebugEnabled())
- {
- trace.debug("#forwardToPage(request, response, logoutPage, false)...");
- }
// cannot be handled yet - go back to the logout page
// TODO: If you try to forward to the proxy page on JBOSS
// an error 400 is thrown with the message:
@@ -191,10 +179,6 @@ public class LoginFilter implements Filter
}
else
{
- if (trace.isDebugEnabled())
- {
- trace.debug("#handleJsfNavigation()...");
- }
handleJsfNavigation(facesContext, "/" + loginPage, outcome);
}
}
@@ -204,10 +188,6 @@ public class LoginFilter implements Filter
}
}
}
- if (trace.isDebugEnabled())
- {
- trace.debug("#handleInvalidSession() exiting...");
- }
}
/* (non-Javadoc)
@@ -220,18 +200,6 @@ public class LoginFilter implements Filter
final HttpServletRequest request = (HttpServletRequest) req;
final HttpServletResponse response = (HttpServletResponse) res;
- if (trace.isDebugEnabled())
- {
- if (null != request.getSession(false))
- {
- trace.debug("#request.getSession(false).getId(): " + request.getSession(false).getId());
- }
- else
- {
- trace.debug("#request.getSession(false): null");
- }
- }
-
String preForwardUri = (String)request.getAttribute("javax.servlet.forward.request_uri");
String preForwardContextPath = (String)request.getAttribute("javax.servlet.forward.context_path");
@@ -255,11 +223,6 @@ public class LoginFilter implements Filter
}
FacesContext facesContext = FacesUtils.getFacesContext(servletContext, request, response);
- if (trace.isDebugEnabled())
- {
- trace.debug("#Finding session....");
- }
-
SessionContext sessionContext = SessionContext.findSessionContext(facesContext);
includeCustomJS(facesContext);
@@ -268,11 +231,6 @@ public class LoginFilter implements Filter
{
if( !sessionContext.isSessionInitialized())
{
- if (trace.isDebugEnabled())
- {
- trace.debug("#session not initialized....");
- }
-
if((null != request.getUserPrincipal()) && isUserInRoleList(request))
{
// initialize session
@@ -285,11 +243,6 @@ public class LoginFilter implements Filter
{
if(!requestUri.endsWith(loginPage))
{
- if (trace.isDebugEnabled())
- {
- trace.debug("#Redirect to login, because session was not initialized.");
- }
-
trace.info("Redirect to login, because session was not initialized.");
StringBuffer url = new StringBuffer(request.getContextPath());
url.append("/").append(loginPage);
@@ -329,26 +282,13 @@ public class LoginFilter implements Filter
}
url.deleteCharAt(url.length() - 1);
}
- if (trace.isDebugEnabled())
- {
- trace.debug("#response.sendRedirect(response.encodeRedirectURL(url.toString()))...");
- }
response.sendRedirect(response.encodeRedirectURL(url.toString()));
-
- if (trace.isDebugEnabled())
- {
- trace.debug("#response.sendRedirect(response.encodeRedirectURL(url.toString())) done...");
- }
return;
}
else
{
if( !request.isRequestedSessionIdValid())
{
- if (trace.isDebugEnabled())
- {
- trace.debug("#request.isRequestedSessionIdValid() is false");
- }
handleInvalidSession(request, response, facesContext);
}
}
@@ -358,30 +298,12 @@ public class LoginFilter implements Filter
&& !ApplicationContext.isPrincipalLogin()
&& requestUri.indexOf(loginPage) > -1)
{
- if (trace.isDebugEnabled())
- {
- trace.debug("#session initialized....");
- }
-
LoginDialogBean loginBean = (LoginDialogBean)FacesUtils.getBeanFromContext(
facesContext, LoginDialogBean.BEAN_ID);
handleJsfNavigation(facesContext, "/" + loginPage, loginBean.getNavigationOutcome());
}
}
- if (trace.isDebugEnabled())
- {
- if (null != request.getSession(false))
- {
- trace.debug("#2. request.getSession(false).getId(): " + request.getSession(false).getId());
- }
- else
- {
- trace.debug("#2. request.getSession(false): null");
- }
- trace.debug("#request.isRequestedSessionIdValid(): " + request.isRequestedSessionIdValid());
- }
-
chain.doFilter(request, response);
}