bloritsch 00/10/23 12:44:46
Modified: src/org/apache/cocoon/components/language/markup/sitemap/java
Tag: xml-cocoon2 sitemap.xsl
src/org/apache/cocoon/matching Tag: xml-cocoon2
WildcardURIMatcherFactory.java
Log:
Clean up some FQN in generated sitemap.
Revision Changes Path
No revision
No revision
1.1.2.51 +4 -1
xml-cocoon/src/org/apache/cocoon/components/language/markup/sitemap/java/Attic/sitemap.xsl
Index: sitemap.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/sitemap/java/Attic/sitemap.xsl,v
retrieving revision 1.1.2.50
retrieving revision 1.1.2.51
diff -u -r1.1.2.50 -r1.1.2.51
--- sitemap.xsl 2000/10/19 16:39:44 1.1.2.50
+++ sitemap.xsl 2000/10/23 19:44:45 1.1.2.51
@@ -47,6 +47,8 @@
import java.util.ArrayList;
import java.util.Map;
+ import javax.servlet.http.HttpServletRequest;
+
import org.apache.avalon.Configurable;
import org.apache.avalon.Configuration;
import org.apache.avalon.ConfigurationException;
@@ -62,6 +64,7 @@
import org.apache.cocoon.sitemap.ErrorNotifier;
import org.apache.cocoon.sitemap.Manager;
import org.apache.cocoon.xml.SAXConfigurationBuilder;
+ import org.apache.cocoon.matching.helpers.WildcardURIMatcher;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
@@ -70,7 +73,7 @@
* This is the automatically generated class from the sitemap definitions
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo
Pati</a>
- * @version CVS $Revision: 1.1.2.50 $ $Date: 2000/10/19 16:39:44 $
+ * @version CVS $Revision: 1.1.2.51 $ $Date: 2000/10/23 19:44:45 $
*/
public class <xsl:value-of select="@file-name"/> extends AbstractSitemap
{
static {
No revision
No revision
1.1.2.16 +3 -3
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.15
retrieving revision 1.1.2.16
diff -u -r1.1.2.15 -r1.1.2.16
--- WildcardURIMatcherFactory.java 2000/10/19 14:44:01 1.1.2.15
+++ WildcardURIMatcherFactory.java 2000/10/23 19:44:45 1.1.2.16
@@ -18,7 +18,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.15 $ $Date: 2000/10/19 14:44:01 $
+ * @version CVS $Revision: 1.1.2.16 $ $Date: 2000/10/23 19:44:45 $
*/
public class WildcardURIMatcherFactory implements MatcherFactory {
@@ -44,8 +44,8 @@
DocumentFragment conf)
throws ConfigurationException {
StringBuffer result = new StringBuffer();
- return result.append ("java.util.ArrayList list = new ArrayList();")
- .append ("if
(org.apache.cocoon.matching.helpers.WildcardURIMatcher.match
(list,((javax.servlet.http.HttpServletRequest)objectModel.get(org.apache.cocoon.Cocoon.REQUEST_OBJECT)).getRequestURI(),
")
+ return result.append ("ArrayList list = new ArrayList();")
+ .append ("if (WildcardURIMatcher.match
(list,((HttpServletRequest)objectModel.get(Cocoon.REQUEST_OBJECT)).getRequestURI(),
")
.append(prefix).append("_expr))")
.append ("return list;")
.append ("else return null;").toString();
