unico 2003/12/27 07:10:22
Modified: src/java/org/apache/cocoon/components/source
CocoonSourceResolver.java
Log:
- tag quotes don't work
- also play excalibur SourceResolver role
- remove cyclic dependency declaration (Fortress chokes on it)
FIXME: now that a component can play multiple roles do we still need the
customResolver dependency?
(Carsten?)
Revision Changes Path
1.6 +5 -6
cocoon-2.2/src/java/org/apache/cocoon/components/source/CocoonSourceResolver.java
Index: CocoonSourceResolver.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/source/CocoonSourceResolver.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CocoonSourceResolver.java 30 Oct 2003 13:03:19 -0000 1.5
+++ CocoonSourceResolver.java 27 Dec 2003 15:10:22 -0000 1.6
@@ -72,9 +72,10 @@
* @version CVS $Id$
*
* @avalon.component
- * @avalon.service type="SourceResolver"
- * @x-avalon.lifestyle="singleton"
- * @x-avalon.info="source-resolver"
+ * @avalon.service type=SourceResolver
+ * @avalon.service type=org.apache.excalibur.source.SourceResolver
+ * @x-avalon.lifestyle type=singleton
+ * @x-avalon.info name=source-resolver
*/
public class CocoonSourceResolver
extends SourceResolverImpl
@@ -113,8 +114,6 @@
* Obtain a reference to the SourceResolver with "/Cocoon" hint
*
* @see
org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
- *
- * @avalon.dependency type="SourceResolver"
*/
public void service(ServiceManager manager) throws ServiceException {
super.service(manager);