You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by un...@apache.org on 2003/12/28 21:54:24 UTC
cvs commit: cocoon-2.2/src/java/org/apache/cocoon/components/resolver DefaultResolver.java
unico 2003/12/28 12:54:24
Modified: src/java/org/apache/cocoon/components/resolver
DefaultResolver.java
Log:
fortress meta info
Revision Changes Path
1.7 +15 -9 cocoon-2.2/src/java/org/apache/cocoon/components/resolver/DefaultResolver.java
Index: DefaultResolver.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/resolver/DefaultResolver.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultResolver.java 27 Oct 2003 01:46:58 -0000 1.6
+++ DefaultResolver.java 28 Dec 2003 20:54:24 -0000 1.7
@@ -50,6 +50,8 @@
*/
package org.apache.cocoon.components.resolver;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
import org.apache.excalibur.xml.DefaultEntityResolver;
@@ -68,16 +70,19 @@
* @version CVS $Id$
* @since 2.1
*
- * TODO: what does DefaultEntityResolver lookup in service()? Do I
- * need to overload that here to declare the dependencies?
- *
* @avalon.component
- * @avalon.service type="org.apache.excalibur.xml.EntityResolver"
- * @x-avalon.lifestyle type="singleton"
- * @x-avalon.info name="entity-resolver"
+ * @avalon.service type=org.apache.excalibur.xml.EntityResolver
+ * @x-avalon.lifestyle type=singleton
+ * @x-avalon.info name=entity-resolver
*/
-public class DefaultResolver
- extends DefaultEntityResolver {
+public class DefaultResolver extends DefaultEntityResolver {
+
+ /**
+ * @avalon.dependency type=org.apache.excalibur.source.SourceResolver
+ */
+ public void service(ServiceManager manager) throws ServiceException {
+ super.service(manager);
+ }
/**
* Parse a catalog
@@ -103,4 +108,5 @@
protected String defaultCatalog() {
return "WEB-INF/entities/catalog";
}
+
}