ghoward 2003/10/25 14:59:50
Modified: src/java/org/apache/cocoon/matching Matcher.java
CookieMatcher.java
Log:
start fortressizing Matchers. lots of open questions already,
so I'll pause here.
Revision Changes Path
1.2 +2 -3
cocoon-2.2/src/java/org/apache/cocoon/matching/Matcher.java
Index: Matcher.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/matching/Matcher.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Matcher.java 9 Mar 2003 00:09:33 -0000 1.1
+++ Matcher.java 25 Oct 2003 21:59:50 -0000 1.2
@@ -50,7 +50,6 @@
*/
package org.apache.cocoon.matching;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.sitemap.PatternException;
@@ -61,7 +60,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* @version CVS $Id$
*/
-public interface Matcher extends Component {
+public interface Matcher {
String ROLE = Matcher.class.getName();
1.3 +6 -1
cocoon-2.2/src/java/org/apache/cocoon/matching/CookieMatcher.java
Index: CookieMatcher.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/matching/CookieMatcher.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CookieMatcher.java 16 Mar 2003 17:49:15 -0000 1.2
+++ CookieMatcher.java 25 Oct 2003 21:59:50 -0000 1.3
@@ -66,6 +66,11 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Maciek Kaminski</a>
* @version CVS $Id$
+ *
+ * @avalon.component
+ * @avalon.service type="Matcher"
+ * @x-avalon.lifestyle type="pooled"
+ * @x-avalon.info name="cookie-matcher"
*/
public class CookieMatcher extends AbstractLogEnabled implements Matcher {
