[Comsuite-svn] SF.net SVN: comsuite: [196] trunk/code
Brought to you by:
zduniak
Menu
▾
▴
[Comsuite-svn] SF.net SVN: comsuite: [196] trunk/code
|
From: <sku...@us...> - 2006-10-05 07:52:24
|
Revision: 196
http://svn.sourceforge.net/comsuite/?rev=196&view=rev
Author: skuzniak
Date: 2006-10-05 00:52:07 -0700 (Thu, 05 Oct 2006)
Log Message:
-----------
'get' error corrected, exception after session expires corrected
Modified Paths:
--------------
trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/LanguageSelectionBean.java
trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/messages/SearchMessageBean.java
trunk/code/CSAdminPanel/WebContent/CSLoginForm.jsp
trunk/code/CSMiddleware/src/org/commsuite/ws/CommunicateWS.java
Modified: trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/LanguageSelectionBean.java
===================================================================
--- trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/LanguageSelectionBean.java 2006-10-05 07:44:27 UTC (rev 195)
+++ trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/LanguageSelectionBean.java 2006-10-05 07:52:07 UTC (rev 196)
@@ -72,7 +72,7 @@
*/
public LanguageSelectionBean() {
super();
-
+ logger.debug("Initializing LanguageSelectionBean");
// REFACTOR: [SK] Below hardcoded set of items must be placed in some configuration file (at
// least) or stored in a database.
Modified: trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/messages/SearchMessageBean.java
===================================================================
--- trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/messages/SearchMessageBean.java 2006-10-05 07:44:27 UTC (rev 195)
+++ trunk/code/CSAdminPanel/JavaSource/org/commsuite/web/beans/messages/SearchMessageBean.java 2006-10-05 07:52:07 UTC (rev 196)
@@ -20,9 +20,13 @@
*/
package org.commsuite.web.beans.messages;
+import java.io.IOException;
import java.util.List;
+import javax.faces.context.FacesContext;
import javax.faces.model.SelectItem;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import javolution.util.FastTable;
@@ -94,6 +98,22 @@
* TODO: JavaDoc
*/
public MessageExtended getMessageExtended() {
+ logger.debug("messageID: "+ this.messageId);
+ if (null == this.messageId) {
+ /*String redirectPage = "";
+ try {
+ FacesContext context = FacesContext.getCurrentInstance();
+ HttpServletResponse response = (HttpServletResponse)context.getExternalContext().getResponse();
+ HttpServletRequest request = (HttpServletRequest)context.getExternalContext().getRequest();
+ redirectPage = request.getContextPath()+ "/pages/messages/CSMessages.jsp";
+ response.sendRedirect(redirectPage);
+ return new MessageExtended();
+ } catch(IOException ioe) {
+ logger.fatal("404 - page not found");
+ return new MessageExtended();
+ }*/
+ return new MessageExtended();
+ }
final ICommunicateWS ws = SpringAdminPanelContext.getCommunicateWS();
try {
final WSMessage message = ws.getMessageById(this.messageId);
Modified: trunk/code/CSAdminPanel/WebContent/CSLoginForm.jsp
===================================================================
--- trunk/code/CSAdminPanel/WebContent/CSLoginForm.jsp 2006-10-05 07:44:27 UTC (rev 195)
+++ trunk/code/CSAdminPanel/WebContent/CSLoginForm.jsp 2006-10-05 07:52:07 UTC (rev 196)
@@ -10,7 +10,7 @@
</title>
</head>
<body>
- <form id="loginForm" action="loginuser">
+ <form id="loginForm" action="loginuser" method="post">
<h:messages />
<table>
<tr>
Modified: trunk/code/CSMiddleware/src/org/commsuite/ws/CommunicateWS.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/ws/CommunicateWS.java 2006-10-05 07:44:27 UTC (rev 195)
+++ trunk/code/CSMiddleware/src/org/commsuite/ws/CommunicateWS.java 2006-10-05 07:52:07 UTC (rev 196)
@@ -175,7 +175,7 @@
MessagesService service = MessagesService.getMessagesService();
return service.getMessageById(id);
} catch (Throwable t) {
- logger.fatal("error in getSentContentsByMessage method", t);
+ logger.fatal("error in getMessageById method", t);
throw new WebServiceException(t);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
