You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by gi...@locus.apache.org on 2000/12/05 23:10:41 UTC

cvs commit: xml-cocoon/src/org/apache/cocoon/matching WildcardURIMatcherFactory.java

giacomo     00/12/05 14:10:39

  Modified:    src/org/apache/cocoon/matching Tag: xml-cocoon2
                        WildcardURIMatcherFactory.java
  Log:
  Temporary fix to a classloader problem concerning cast of org.apache.cocoon.environment.http.HttpRequest to javax.servlet.http.HttpServletRequest. Submitted by Stuart Roebuck
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.22  +2 -2      xml-cocoon/src/org/apache/cocoon/matching/Attic/WildcardURIMatcherFactory.java
  
  Index: WildcardURIMatcherFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/matching/Attic/WildcardURIMatcherFactory.java,v
  retrieving revision 1.1.2.21
  retrieving revision 1.1.2.22
  diff -u -r1.1.2.21 -r1.1.2.22
  --- WildcardURIMatcherFactory.java	2000/11/30 21:41:49	1.1.2.21
  +++ WildcardURIMatcherFactory.java	2000/12/05 22:10:36	1.1.2.22
  @@ -19,7 +19,7 @@
    * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.1.2.21 $ $Date: 2000/11/30 21:41:49 $
  + * @version CVS $Revision: 1.1.2.22 $ $Date: 2000/12/05 22:10:36 $
    */
   
   public class WildcardURIMatcherFactory implements MatcherFactory {
  @@ -52,7 +52,7 @@
       public String generateMethodSource (NodeIterator conf)
       throws ConfigurationException {
           return "ArrayList list = new ArrayList();" +
  -               "String uri = ((HttpServletRequest) objectModel.get(Cocoon.REQUEST_OBJECT)).getRequestURI();" +
  +               "String uri = ((org.apache.cocoon.environment.http.HttpRequest) objectModel.get(Cocoon.REQUEST_OBJECT)).getRequestURI();" +
                  "if (uri.startsWith(\"/\")) uri = uri.substring(1);" +
                  "if (org.apache.cocoon.matching.helpers.WildcardURIMatcher.match (list, uri, pattern)) {" +
                  "return list;" +