bloritsch 01/07/19 06:36:23
Modified: src/org/apache/cocoon/components/language/markup/sitemap/java
sitemap.xsl
src/org/apache/cocoon/matching RegexpURIMatcherFactory.java
Log:
Fix Sitemap so that Jakarta Regexp is not needed unless
we use the RegExp Matcher
Revision Changes Path
1.29 +1 -4
xml-cocoon2/src/org/apache/cocoon/components/language/markup/sitemap/java/sitemap.xsl
Index: sitemap.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/sitemap/java/sitemap.xsl,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sitemap.xsl 2001/07/18 12:22:19 1.28
+++ sitemap.xsl 2001/07/19 13:36:23 1.29
@@ -99,9 +99,6 @@
import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.parameters.Parameters;
- import org.apache.regexp.RE;
- import org.apache.regexp.REProgram;
-
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
@@ -127,7 +124,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Id: sitemap.xsl,v 1.28 2001/07/18 12:22:19 sylvain Exp $
+ * @version CVS $Id: sitemap.xsl,v 1.29 2001/07/19 13:36:23 bloritsch Exp $
*/
public class <xsl:value-of select="@file-name"/> extends AbstractSitemap {
static final String LOCATION = "<xsl:value-of select="translate(@file-path,
'/', '.')"/>.<xsl:value-of select="@file-name"/>";
1.2 +4 -4
xml-cocoon2/src/org/apache/cocoon/matching/RegexpURIMatcherFactory.java
Index: RegexpURIMatcherFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/matching/RegexpURIMatcherFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RegexpURIMatcherFactory.java 2001/05/09 20:49:39 1.1
+++ RegexpURIMatcherFactory.java 2001/07/19 13:36:23 1.2
@@ -21,14 +21,14 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
- * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:39 $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/07/19 13:36:23 $
*/
public class RegexpURIMatcherFactory extends AbstractLoggable implements
CodeFactory {
public String generateParameterSource (NodeList conf)
throws ConfigurationException {
- return "RE";
+ return "org.apache.regexp.RE";
}
public String generateClassSource (String prefix, String pattern,
@@ -57,9 +57,9 @@
}
sb.append("0x").append(hex).append(", ");
}
- sb.append("\n};\nstatic RE ")
+ sb.append("\n};\nstatic org.apache.regexp.RE ")
.append(name)
- .append("_expr = new RE(new REProgram(")
+ .append("_expr = new org.apache.regexp.RE(new
org.apache.regexp.REProgram(")
.append(instructions)
.append("));\n")
.append("static ArrayList ")
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
