You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by el...@apache.org on 2006/10/04 21:06:26 UTC
svn commit: r452980 - in /incubator/roller/trunk:
src/org/apache/roller/ui/rendering/WeblogRequestMapper.java
web/WEB-INF/jsps/authoring/WeblogEdit.jsp
Author: eliast
Date: Wed Oct 4 12:06:25 2006
New Revision: 452980
URL: http://svn.apache.org/viewvc?view=rev&rev=452980
Log:
Fixes for weblog entry creation in WebSphere (ROL-1253)
- WAS 6.1 returns "" for getServletPath(), falling back on getPathInfo()
- Invalid use of " vs ' in WeblogEdit.jsp
Modified:
incubator/roller/trunk/src/org/apache/roller/ui/rendering/WeblogRequestMapper.java
incubator/roller/trunk/web/WEB-INF/jsps/authoring/WeblogEdit.jsp
Modified: incubator/roller/trunk/src/org/apache/roller/ui/rendering/WeblogRequestMapper.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/rendering/WeblogRequestMapper.java?view=diff&rev=452980&r1=452979&r2=452980
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/rendering/WeblogRequestMapper.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/WeblogRequestMapper.java Wed Oct 4 12:06:25 2006
@@ -25,6 +25,8 @@
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.config.RollerConfig;
@@ -103,6 +105,12 @@
// figure out potential weblog handle
String servlet = request.getServletPath();
String pathInfo = null;
+
+ // WAS6.1 returns "" for servletPath use pathInfo instead
+ if(StringUtils.isEmpty(request.getServletPath())) {
+ servlet = request.getPathInfo();
+ }
+
if(servlet != null && servlet.trim().length() > 1) {
// strip off the leading slash
Modified: incubator/roller/trunk/web/WEB-INF/jsps/authoring/WeblogEdit.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/web/WEB-INF/jsps/authoring/WeblogEdit.jsp?view=diff&rev=452980&r1=452979&r2=452980
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/jsps/authoring/WeblogEdit.jsp (original)
+++ incubator/roller/trunk/web/WEB-INF/jsps/authoring/WeblogEdit.jsp Wed Oct 4 12:06:25 2006
@@ -217,7 +217,7 @@
<div style="width: 100%;"> <%-- need this div to control text-area size in IE 6 --%>
<%-- include edit page --%>
<div >
- <jsp:include page="<%= "/roller-ui/authoring/editors/"+model.getEditorPage() %>" />
+ <jsp:include page='<%= "/roller-ui/authoring/editors/"+model.getEditorPage() %>' />
</div>
</div>
</c:if>