ghoward 2003/10/26 18:05:15
Modified: src/java/org/apache/cocoon/components/source/impl
SitemapSourceFactory.java ContextSourceFactory.java
src/java/org/apache/cocoon/components/source
CocoonSourceResolver.java
Log:
Fortressizing questions:
- x-avalon.lifestyle - Case sensitive? Singleton vs. singleton which is
correct?
- @avalon.dependency needs to be in javadoc vs. non-javadoc comment?
- is conditional lookup a problem with dependency? See CocoonSourceResolver
service()
- is lookup on SourceResolver/Cocoon a dependency on SourceResolver?
Revision Changes Path
1.4 +10 -2
cocoon-2.2/src/java/org/apache/cocoon/components/source/impl/SitemapSourceFactory.java
Index: SitemapSourceFactory.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/source/impl/SitemapSourceFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SitemapSourceFactory.java 19 Oct 2003 16:21:28 -0000 1.3
+++ SitemapSourceFactory.java 27 Oct 2003 02:05:15 -0000 1.4
@@ -72,6 +72,11 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
* @version CVS $Id$
+ *
+ * @avalon.component
+ * @avalon.service type="SourceFactory"
+ * @x-avalon.lifestyle type="singleton"
+ * @x-avalon.info name="cocoon"
*/
public final class SitemapSourceFactory
extends AbstractLogEnabled
@@ -81,7 +86,10 @@
private ServiceManager manager;
/**
- * Composable
+ * Serviceable
+ *
+ * @avalon.dependency type="org.apache.excalibur.source.SourceResolver"
+ * @avalon.dependency type="org.apache.cocoon.Processor"
*/
public void service(ServiceManager manager) throws ServiceException {
this.manager = manager;
1.5 +10 -4
cocoon-2.2/src/java/org/apache/cocoon/components/source/impl/ContextSourceFactory.java
Index: ContextSourceFactory.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/source/impl/ContextSourceFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ContextSourceFactory.java 25 Oct 2003 18:14:25 -0000 1.4
+++ ContextSourceFactory.java 27 Oct 2003 02:05:15 -0000 1.5
@@ -64,7 +64,6 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
-import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.Context;
@@ -76,10 +75,15 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
* @author <a href="http://www.apache.org/~sylvain";>Sylvain Wallez</a>
* @version CVS $Id$
+ *
+ * @avalon.component
+ * @avalon.service type="SourceFactory"
+ * @x-avalon.lifestyle type="singleton"
+ * @x-avalon.info name="context"
*/
public class ContextSourceFactory
extends AbstractLogEnabled
- implements SourceFactory, Serviceable, Disposable, Contextualizable,
ThreadSafe, URIAbsolutizer
+ implements SourceFactory, Serviceable, Disposable, Contextualizable,
URIAbsolutizer
{
/** The context */
@@ -92,7 +96,9 @@
protected SourceResolver resolver;
/**
- * Composable Interface
+ * Serviceable Interface
+ *
+ * @avalon.dependency type="SourceResolver"
*/
public void service(ServiceManager manager) throws ServiceException {
this.manager = manager;
1.3 +11 -2
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CocoonSourceResolver.java 24 Oct 2003 12:49:40 -0000 1.2
+++ CocoonSourceResolver.java 27 Oct 2003 02:05:15 -0000 1.3
@@ -70,6 +70,11 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
* @version CVS $Id$
+ *
+ * @avalon.component
+ * @avalon.service type="SourceResolver"
+ * @x-avalon.lifestyle="singleton"
+ * @x-avalon.info="source-resolver"
*/
public class CocoonSourceResolver
extends SourceResolverImpl
@@ -104,8 +109,12 @@
return this.resolveURI(location, null, null);
}
- /* (non-Javadoc)
+ /**
+ * 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);
