tdraier 2005/05/12 12:30:45 CEST
Modified files:
src/java/org/sensei/webapp BaseAction.java
ConfigurationAction.java
ViewFormAction.java
src/webapp/jsp viewForm.jsp
. project.xml
Log:
bugfixes for websphere
Revision Changes Path
1.8 +1 -1 senseiwebapp/project.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/senseiwebapp/project.xml.diff?r1=1.7&r2=1.8&f=h
1.12 +17 -5 senseiwebapp/src/java/org/sensei/webapp/BaseAction.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/senseiwebapp/src/java/org/sensei/webapp/BaseAction.java.diff?r1=1.11&r2=1.12&f=h
1.9 +5 -5
senseiwebapp/src/java/org/sensei/webapp/ConfigurationAction.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/senseiwebapp/src/java/org/sensei/webapp/ConfigurationAction.java.diff?r1=1.8&r2=1.9&f=h
1.13 +9 -9
senseiwebapp/src/java/org/sensei/webapp/ViewFormAction.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/senseiwebapp/src/java/org/sensei/webapp/ViewFormAction.java.diff?r1=1.12&r2=1.13&f=h
1.11 +5 -2 senseiwebapp/src/webapp/jsp/viewForm.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/senseiwebapp/src/webapp/jsp/viewForm.jsp.diff?r1=1.10&r2=1.11&f=h
Index: BaseAction.java
===================================================================
RCS file:
/home/cvs/repository/senseiwebapp/src/java/org/sensei/webapp/BaseAction.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- BaseAction.java 11 Feb 2005 18:25:22 -0000 1.11
+++ BaseAction.java 12 May 2005 10:30:44 -0000 1.12
@@ -19,6 +19,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
+import javax.servlet.http.Cookie;
import java.io.IOException;
import java.io.StringReader;
import java.net.URL;
@@ -32,11 +33,11 @@
* Date: 20 juil. 2004
* Time: 19:08:59
* <p/>
- * $Author: toto $
- * $Date: 2005/02/11 18:25:22 $
- * $Id: BaseAction.java,v 1.11 2005/02/11 18:25:22 toto Exp $
+ * $Author: tdraier $
+ * $Date: 2005/05/12 10:30:44 $
+ * $Id: BaseAction.java,v 1.12 2005/05/12 10:30:44 tdraier Exp $
* $RCSfile: BaseAction.java,v $
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
* $Source:
/home/cvs/repository/senseiwebapp/src/java/org/sensei/webapp/BaseAction.java,v $
* $State: Exp $
*/
@@ -62,7 +63,7 @@
SenseiClient client = createProxy(request);
try {
- client.connect(request.getSession().getId());
+ client.connect(getJsessionId(request));
senseiClient.set(client);
} catch (RemoteException e) {
e.printStackTrace();
@@ -72,7 +73,7 @@
protected synchronized void startSession(Locale locale,
HttpServletRequest request) {
SenseiClient client = createProxy(request);
try {
- client.connect(request.getSession().getId());
+ client.connect(getJsessionId(request));
senseiClient.set(client);
client.setLocale(locale.toString());
} catch (RemoteException e) {
@@ -80,6 +81,17 @@
}
}
+ protected String getJsessionId(HttpServletRequest request) {
+ Cookie[] cookies = request.getCookies();
+ for (int i = 0; i < cookies.length; i++) {
+ Cookie cookie = cookies[i];
+ if ("JSESSIONID".equalsIgnoreCase(cookie.getName())) {
+ return cookie.getValue();
+ }
+ }
+ return null;
+ }
+
protected synchronized void endSession() {
SenseiClient client = (SenseiClient) senseiClient.get();
try {
Index: ConfigurationAction.java
===================================================================
RCS file:
/home/cvs/repository/senseiwebapp/src/java/org/sensei/webapp/ConfigurationAction.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ConfigurationAction.java 11 Feb 2005 18:25:22 -0000 1.8
+++ ConfigurationAction.java 12 May 2005 10:30:44 -0000 1.9
@@ -25,11 +25,11 @@
* Date: 1 oct. 2004
* Time: 13:22:19
* <p/>
- * $Author: toto $
- * $Date: 2005/02/11 18:25:22 $
- * $Id: ConfigurationAction.java,v 1.8 2005/02/11 18:25:22 toto Exp $
+ * $Author: tdraier $
+ * $Date: 2005/05/12 10:30:44 $
+ * $Id: ConfigurationAction.java,v 1.9 2005/05/12 10:30:44 tdraier Exp $
* $RCSfile: ConfigurationAction.java,v $
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
* $Source:
/home/cvs/repository/senseiwebapp/src/java/org/sensei/webapp/ConfigurationAction.java,v
$
* $State: Exp $
*/
@@ -125,7 +125,7 @@
request.setAttribute("allProcesses",allProcesses);
URL url = new
URL(form.getSenseiEndpoint()+"services/SenseiClientService");
SenseiClient sensei = csl.getSenseiClientService(url);
- sensei.connect(request.getSession().getId());
+ sensei.connect(getJsessionId(request));
Object[] defs = sensei.getProcessDefinitionsList(new
ProcessFilter());
for (int i = 0; i < defs.length; i++) {
WorkflowProcess def = (WorkflowProcess) defs[i];
@@ -178,7 +178,7 @@
errors.add("configuration.badurl", new
ActionError("configuration.badurl"));
}
- return new ActionErrors();
+ return errors;
}
}
Index: ViewFormAction.java
===================================================================
RCS file:
/home/cvs/repository/senseiwebapp/src/java/org/sensei/webapp/ViewFormAction.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ViewFormAction.java 11 Feb 2005 18:25:22 -0000 1.12
+++ ViewFormAction.java 12 May 2005 10:30:44 -0000 1.13
@@ -37,11 +37,11 @@
* Date: 21 juil. 2004
* Time: 13:45:22
* <p/>
- * $Author: toto $
- * $Date: 2005/02/11 18:25:22 $
- * $Id: ViewFormAction.java,v 1.12 2005/02/11 18:25:22 toto Exp $
+ * $Author: tdraier $
+ * $Date: 2005/05/12 10:30:44 $
+ * $Id: ViewFormAction.java,v 1.13 2005/05/12 10:30:44 tdraier Exp $
* $RCSfile: ViewFormAction.java,v $
- * $Revision: 1.12 $
+ * $Revision: 1.13 $
* $Source:
/home/cvs/repository/senseiwebapp/src/java/org/sensei/webapp/ViewFormAction.java,v
$
* $State: Exp $
*/
@@ -49,9 +49,9 @@
public ActionForward execute(ActionMapping actionMapping, ActionForm
actionForm, HttpServletRequest httpServletRequest, HttpServletResponse
httpServletResponse) throws Exception {
if (httpServletRequest.getAttribute("org.portletapi.contextid") ==
null) {
- Cookie cookie = new Cookie("sessionSSO",
httpServletRequest.getSession(true).getId());
- cookie.setPath("/");
- httpServletResponse.addCookie(cookie);
+// Cookie cookie = new Cookie("sessionSSO",
httpServletRequest.getSession(true).getId());
+// cookie.setPath("/");
+// httpServletResponse.addCookie(cookie);
}
Settings settings = Settings.getSettings(httpServletRequest);
@@ -190,9 +190,9 @@
if (adapter == null || request.getMethod().equalsIgnoreCase("get")
|| request.getAttribute("execute.do")==null) {
URL url = null;
if (choice.getActivityInstance() != null &&
choice.getProcessInstance().getStatus() == Constants.ACTIVE) {
- url = new
URL(Settings.getSettings(request).getSenseiEndpoint().toString()+"getXForms.do?sid="+request.getSession().getId()+"&oid="+choice.getActivity().getOid()+"&instance="+choice.getActivityInstance().getOid()+"&locale="+getLocale(request));
+ url = new
URL(Settings.getSettings(request).getSenseiEndpoint().toString()+"getXForms.do?sid="+getJsessionId(request)+"&oid="+choice.getActivity().getOid()+"&instance="+choice.getActivityInstance().getOid()+"&locale="+getLocale(request));
} else if (choice.getActivity() != null) {
- url = new
URL(Settings.getSettings(request).getSenseiEndpoint().toString()+"getXForms.do?sid="+request.getSession().getId()+"&oid="+choice.getActivity().getOid()+"&locale="+getLocale(request));
+ url = new
URL(Settings.getSettings(request).getSenseiEndpoint().toString()+"getXForms.do?sid="+getJsessionId(request)+"&oid="+choice.getActivity().getOid()+"&locale="+getLocale(request));
}
if (url != null) {
@@ -263,7 +263,7 @@
return;
}
try {
- URL url = new
URL(Settings.getSettings(httpServletRequest).getSenseiEndpoint().toString()+"getProcessStatus.do?sid="+httpServletRequest.getSession().getId()+"&instance="+choice.getProcessInstance().getOid()+"&locale="+getLocale(httpServletRequest));
+ URL url = new
URL(Settings.getSettings(httpServletRequest).getSenseiEndpoint().toString()+"getProcessStatus.do?sid="+getJsessionId(httpServletRequest)+"&instance="+choice.getProcessInstance().getOid()+"&locale="+getLocale(httpServletRequest));
DOMParser parser = new DOMParser();
InputSource isource = new InputSource(url.openStream());
Index: viewForm.jsp
===================================================================
RCS file: /home/cvs/repository/senseiwebapp/src/webapp/jsp/viewForm.jsp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- viewForm.jsp 11 Feb 2005 18:25:23 -0000 1.10
+++ viewForm.jsp 12 May 2005 10:30:44 -0000 1.11
@@ -98,10 +98,13 @@
<table>
<tr><td><br>
<logic:iterate name="processes" id="choice">
-
<logic:equal name="selectChoiceForm" property="processKey" value="<%=
((Choice)pageContext.getAttribute("choice")).getProcessKey() %>" >
+
<%
+
String pk =
((Choice)pageContext.getAttribute("choice")).getProcessKey();
+
%>
+
<logic:equal name="selectChoiceForm" property="processKey" value="<%= pk
%>" >
<bean:write name="choice" property="processLabel"/><br>
</logic:equal>
-
<logic:notEqual name="selectChoiceForm" property="processKey"
value="<%= ((Choice)pageContext.getAttribute("choice")).getProcessKey() %>" >
+
<logic:notEqual name="selectChoiceForm" property="processKey"
value="<%= pk %>" >
<img align="middle" src="<%=path%>/jsp/images/diamon.gif"
border="0"> <html:link action="viewForm" paramId="processKey"
paramName="choice" paramProperty="processKey"><bean:write name="choice"
property="processLabel"/></html:link><br>
</logic:notEqual>
</logic:iterate>
Index: project.xml
===================================================================
RCS file: /home/cvs/repository/senseiwebapp/project.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.xml 11 Feb 2005 18:25:23 -0000 1.7
+++ project.xml 12 May 2005 10:30:45 -0000 1.8
@@ -287,7 +287,7 @@
<dependency>
<groupId>slide</groupId>
<artifactId>jakarta-slide-webdavlib</artifactId>
- <version>2.2pre1</version>
+ <version>2.2pre1-SNAPSHOT</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
