cziegeler 2003/10/23 01:27:46
Modified: src/java/org/apache/cocoon/transformation
CIncludeTransformer.java
src/java/org/apache/cocoon/transformation/helpers
DefaultIncludeCacheManager.java
Log:
Adding first meta infos
Revision Changes Path
1.10 +10 -1
cocoon-2.2/src/java/org/apache/cocoon/transformation/CIncludeTransformer.java
Index: CIncludeTransformer.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/transformation/CIncludeTransformer.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- CIncludeTransformer.java 23 Oct 2003 07:57:24 -0000 1.9
+++ CIncludeTransformer.java 23 Oct 2003 08:27:46 -0000 1.10
@@ -147,6 +147,11 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Andrew C. Oliver</a>
* @version CVS $Id$
+ *
+ * @avalon.component
+ * @avalon.service type="Transformer"
+ * @x-avalon.lifestyle type="pooled"
+ * @x-avalon.info name="cinclude-transformer"
*/
public class CIncludeTransformer
extends AbstractSAXTransformer
@@ -229,6 +234,10 @@
}
/**
+ * This component depends on the following:
+ *
+ * @avalon.dependency type="IncludeCacheManager"
+ *
* @see
org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
*/
public void service(ServiceManager manager) throws ServiceException {
1.7 +25 -20
cocoon-2.2/src/java/org/apache/cocoon/transformation/helpers/DefaultIncludeCacheManager.java
Index: DefaultIncludeCacheManager.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/transformation/helpers/DefaultIncludeCacheManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultIncludeCacheManager.java 24 Sep 2003 21:41:12 -0000 1.6
+++ DefaultIncludeCacheManager.java 23 Oct 2003 08:27:46 -0000 1.7
@@ -55,13 +55,13 @@
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameterizable;
import org.apache.avalon.framework.parameters.Parameters;
+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.ProcessingException;
import org.apache.cocoon.caching.CachedResponse;
@@ -92,17 +92,22 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
* @version CVS $Id$
* @since 2.1
+ *
+ * @avalon.component
+ * @avalon.service type="IncludeCacheManager"
+ * @x-avalon.lifestyle type="singleton"
+ * @x-avalon.info name="include-cache-manager"
*/
public final class DefaultIncludeCacheManager
extends AbstractLogEnabled
implements IncludeCacheManager,
ThreadSafe,
- Composable,
+ Serviceable,
Disposable,
Parameterizable,
Component {
- private ComponentManager manager;
+ private ServiceManager manager;
private SourceResolver resolver;
@@ -215,7 +220,7 @@
if (this.getLogger().isDebugEnabled()) {
this.getLogger().debug("Thread started for " + uri);
}
- } catch (ComponentException ce) {
+ } catch (ServiceException ce) {
throw new SourceException("Unable to lookup thread pool or
xml serializer.", ce);
} catch (Exception e) {
throw new SourceException("Unable to get pooled thread.", e);
@@ -308,7 +313,7 @@
deserializer = (XMLDeserializer)this.manager.lookup(
XMLDeserializer.ROLE );
deserializer.setConsumer(handler);
deserializer.deserialize(result);
- } catch (ComponentException ce) {
+ } catch (ServiceException ce) {
throw new SAXException("Unable to lookup xml deserializer.",
ce);
} finally {
this.manager.release( deserializer );
@@ -337,7 +342,7 @@
deserializer = (XMLDeserializer)this.manager.lookup(
XMLDeserializer.ROLE );
deserializer.setConsumer(handler);
deserializer.deserialize(response.getResponse());
- } catch (ComponentException ce) {
+ } catch (ServiceException ce) {
throw new SAXException("Unable to lookup xml
deserializer.", ce);
} finally {
this.manager.release( deserializer );
@@ -390,7 +395,7 @@
} catch (ProcessingException pe) {
throw new SAXException("ProcessingException", pe);
- } catch (ComponentException e) {
+ } catch (ServiceException e) {
throw new SAXException("Unable to lookup xml serializer.", e);
}
}
@@ -406,14 +411,6 @@
}
/**
- * @see
org.apache.avalon.framework.component.Composable#compose(org.apache.avalon.framework.component.ComponentManager)
- */
- public void compose(ComponentManager manager) throws ComponentException {
- this.manager = manager;
- this.resolver =
(SourceResolver)this.manager.lookup(SourceResolver.ROLE);
- }
-
- /**
* @see org.apache.avalon.framework.activity.Disposable#dispose()
*/
public void dispose() {
@@ -441,12 +438,20 @@
final String storeRole = parameters.getParameter("use-store",
Store.ROLE);
try {
this.store = (Store)this.manager.lookup(storeRole);
- } catch (ComponentException e) {
+ } catch (ServiceException e) {
throw new ParameterException("Unable to lookup store with role "
+ storeRole, e);
}
this.defaultCacheStorage = new
StoreIncludeCacheStorageProxy(this.store, this.getLogger());
}
+ /* (non-Javadoc)
+ * @see
org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
+ */
+ public void service(ServiceManager manager) throws ServiceException {
+ this.manager = manager;
+ this.resolver =
(SourceResolver)this.manager.lookup(SourceResolver.ROLE);
+ }
+
}
final class LoaderThread implements Runnable {
@@ -459,7 +464,7 @@
public LoaderThread(Source source,
XMLSerializer serializer,
- ComponentManager manager) {
+ ServiceManager manager) {
this.source = source;
this.serializer = serializer;
this.finished = false;
