You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by st...@locus.apache.org on 2000/09/27 18:07:59 UTC
cvs commit: xml-cocoon/src/org/apache/cocoon/matching AuthenticationMatcher.java.new FileAuthenticationMatcher.java.new BrowserMatcherFactory.java RegexpURIMatcherFactory.java WildcardURIMatcherFactory.java AuthenticationMatcher.java FileAuthenticationMatcher.java
stefano 00/09/27 09:07:55
Modified: src/org/apache/cocoon/matching Tag: xml-cocoon2
BrowserMatcherFactory.java
RegexpURIMatcherFactory.java
WildcardURIMatcherFactory.java
Added: src/org/apache/cocoon/matching Tag: xml-cocoon2
AuthenticationMatcher.java.new
FileAuthenticationMatcher.java.new
Removed: src/org/apache/cocoon/matching Tag: xml-cocoon2
AuthenticationMatcher.java
FileAuthenticationMatcher.java
Log:
changed names (to avoid ant recompilation)
used Enviornment instead of ObjectModel
Revision Changes Path
No revision
No revision
1.1.2.8 +2 -1 xml-cocoon/src/org/apache/cocoon/matching/Attic/BrowserMatcherFactory.java
Index: BrowserMatcherFactory.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/matching/Attic/BrowserMatcherFactory.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- BrowserMatcherFactory.java 2000/07/27 21:49:02 1.1.2.7
+++ BrowserMatcherFactory.java 2000/09/27 16:07:20 1.1.2.8
@@ -24,10 +24,11 @@
* for request URIs
*
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.7 $ $Date: 2000/07/27 21:49:02 $
+ * @version CVS $Revision: 1.1.2.8 $ $Date: 2000/09/27 16:07:20 $
*/
public class BrowserMatcherFactory implements MatcherFactory {
+
public String generateMethodSource (String prefix, String test_expression,
DocumentFragment conf)
throws ConfigurationException {
1.1.2.7 +2 -2 xml-cocoon/src/org/apache/cocoon/matching/Attic/RegexpURIMatcherFactory.java
Index: RegexpURIMatcherFactory.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/matching/Attic/RegexpURIMatcherFactory.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- RegexpURIMatcherFactory.java 2000/08/04 21:11:53 1.1.2.6
+++ RegexpURIMatcherFactory.java 2000/09/27 16:07:26 1.1.2.7
@@ -20,7 +20,7 @@
* for request URIs
*
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.6 $ $Date: 2000/08/04 21:11:53 $
+ * @version CVS $Revision: 1.1.2.7 $ $Date: 2000/09/27 16:07:26 $
*/
public class RegexpURIMatcherFactory implements MatcherFactory {
@@ -70,7 +70,7 @@
String instructions = name + "PatternInstructions";
String pat = correctPattern (pattern);
sb.append("java.util.ArrayList list = new java.util.ArrayList ();")
- .append("if (").append(name).append("Pattern.match(((javax.servlet.http.HttpServletRequest)objectModel.get(\"request\")).getRequestURI())) {");
+ .append("if (").append(name).append("Pattern.match(environment.getURI()) {");
// Count number of parens
int i = 0;
int j = -1;
1.1.2.12 +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.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- WildcardURIMatcherFactory.java 2000/09/08 18:10:30 1.1.2.11
+++ WildcardURIMatcherFactory.java 2000/09/27 16:07:29 1.1.2.12
@@ -18,7 +18,7 @@
*
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
* @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.11 $ $Date: 2000/09/08 18:10:30 $
+ * @version CVS $Revision: 1.1.2.12 $ $Date: 2000/09/27 16:07:29 $
*/
public class WildcardURIMatcherFactory implements MatcherFactory {
@@ -45,7 +45,7 @@
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(\"request\")).getRequestURI(), ")
+ .append ("if (org.apache.cocoon.matching.helpers.WildcardURIMatcher.match (list, environment.getUri(), ")
.append(prefix).append("_expr))")
.append ("return list;")
.append ("else return null;").toString();
No revision
No revision
1.1.2.1 +25 -0 xml-cocoon/src/org/apache/cocoon/matching/Attic/AuthenticationMatcher.java.new
1.1.2.1 +49 -0 xml-cocoon/src/org/apache/cocoon/matching/Attic/FileAuthenticationMatcher.java.new