tapestry-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hls...@apache.org
Subject cvs commit: jakarta-tapestry/framework/src/java/org/apache/tapestry/engine AbstractEngine.java
Date Sun, 12 Dec 2004 13:50:14 GMT
hlship      2004/12/12 05:50:14

  Modified:    framework/src/java/org/apache/tapestry/engine
                        AbstractEngine.java
  Log:
  Remove the Tapestry JSP tags (introduced in Tapestry 3.0).
  
  Revision  Changes    Path
  1.14      +1 -17     jakarta-tapestry/framework/src/java/org/apache/tapestry/engine/AbstractEngine.java
  
  Index: AbstractEngine.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/engine/AbstractEngine.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- AbstractEngine.java	9 Dec 2004 16:29:29 -0000	1.13
  +++ AbstractEngine.java	12 Dec 2004 13:50:14 -0000	1.14
  @@ -737,28 +737,12 @@
   
           if (_servletPath == null)
           {
  -            // Get the path *within* the servlet context
  -
  -            // In rare cases related to the tagsupport service, getServletPath()
  -            // is wrong
  -            // (its a JSP, which invokes Tapestry as an include, thus muddling
  -            // what
  -            // the real servlet and servlet path is). In those cases, the JSP
  -            // tag
  -            // will inform us.
  -
  -            String path = (String) request
  -                    .getAttribute(Tapestry.TAG_SUPPORT_SERVLET_PATH_ATTRIBUTE);
  -
  -            if (path == null)
  -                path = request.getServletPath();
  -
               // Get the context path, which may be the empty string
               // (but won't be null).
   
               _contextPath = request.getContextPath();
   
  -            _servletPath = _contextPath + path;
  +            _servletPath = _contextPath + request.getServletPath();
           }
   
           String servletName = context.getServlet().getServletName();
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tapestry-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tapestry-dev-help@jakarta.apache.org


Mime
View raw message