bloritsch 01/07/19 06:41:00
Modified: src/org/apache/cocoon/components/language/markup/sitemap/java
Tag: cocoon_20_branch sitemap.xsl
src/org/apache/cocoon/matching Tag: cocoon_20_branch
RegexpTargetHostMatcherFactory.java
RegexpURIMatcherFactory.java
Log:
Fix Sitemap so that Jakarta Regexp is not needed unless
we use the RegExp Matcher
Revision Changes Path
No revision
No revision
1.11.2.21 +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.11.2.20
retrieving revision 1.11.2.21
diff -u -r1.11.2.20 -r1.11.2.21
--- sitemap.xsl 2001/07/18 12:46:09 1.11.2.20
+++ sitemap.xsl 2001/07/19 13:40:59 1.11.2.21
@@ -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.11.2.20 2001/07/18 12:46:09 sylvain Exp $
+ * @version CVS $Id: sitemap.xsl,v 1.11.2.21 2001/07/19 13:40:59 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"/>";
No revision
No revision
1.1.1.1.2.1 +4 -4
xml-cocoon2/src/org/apache/cocoon/matching/RegexpTargetHostMatcherFactory.java
Index: RegexpTargetHostMatcherFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/matching/RegexpTargetHostMatcherFactory.java,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- RegexpTargetHostMatcherFactory.java 2001/05/09 20:49:39 1.1.1.1
+++ RegexpTargetHostMatcherFactory.java 2001/07/19 13:41:00 1.1.1.1.2.1
@@ -23,14 +23,14 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Paul Russell</a>
- * @version CVS $Revision: 1.1.1.1 $ $Date: 2001/05/09 20:49:39 $
+ * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/07/19 13:41:00 $
*/
public class RegexpTargetHostMatcherFactory 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,
@@ -60,9 +60,9 @@
sb.append("0x").append(hex).append(", ");
}
sb.append("\n };")
- .append("\n static RE ")
+ .append("\n static 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("));");
return sb.toString();
1.1.1.1.2.1 +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.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- RegexpURIMatcherFactory.java 2001/05/09 20:49:39 1.1.1.1
+++ RegexpURIMatcherFactory.java 2001/07/19 13:41:00 1.1.1.1.2.1
@@ -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.1.1 $ $Date: 2001/05/09 20:49:39 $
+ * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/07/19 13:41:00 $
*/
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]
