vgritsenko 02/02/01 06:19:53
Modified: src/java/org/apache/cocoon/generation ComposerGenerator.java
HTMLGenerator.java SearchGenerator.java
ServletGenerator.java
Log:
Have Composer generator imlement Disposable also.
Revision Changes Path
1.2 +12 -4
xml-cocoon2/src/java/org/apache/cocoon/generation/ComposerGenerator.java
Index: ComposerGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/ComposerGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ComposerGenerator.java 3 Jan 2002 12:31:16 -0000 1.1
+++ ComposerGenerator.java 1 Feb 2002 14:19:53 -0000 1.2
@@ -7,6 +7,7 @@
*****************************************************************************/
package org.apache.cocoon.generation;
+import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Composable;
@@ -15,19 +16,26 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1 $ $Date: 2002/01/03 12:31:16 $
+ * @version CVS $Revision: 1.2 $ $Date: 2002/02/01 14:19:53 $
*/
public abstract class ComposerGenerator extends AbstractGenerator
-implements Composable {
+implements Composable, Disposable {
/** The component manager instance */
- protected ComponentManager manager=null;
+ protected ComponentManager manager = null;
/**
* Set the current <code>ComponentManager</code> instance used by this
* <code>Composable</code>.
*/
public void compose(ComponentManager manager) throws ComponentException {
- this.manager=manager;
+ this.manager = manager;
+ }
+
+ /**
+ * Release all resources.
+ */
+ public void dispose() {
+ this.manager = null;
}
}
1.3 +2 -1
xml-cocoon2/src/java/org/apache/cocoon/generation/HTMLGenerator.java
Index: HTMLGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/HTMLGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HTMLGenerator.java 21 Jan 2002 23:14:26 -0000 1.2
+++ HTMLGenerator.java 1 Feb 2002 14:19:53 -0000 1.3
@@ -46,7 +46,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Nicola Ken Barozzi</a>
- * @version CVS $Revision: 1.2 $ $Date: 2002/01/21 23:14:26 $
+ * @version CVS $Revision: 1.3 $ $Date: 2002/02/01 14:19:53 $
*/
public class HTMLGenerator extends ComposerGenerator implements Cacheable,
Recyclable, Composable, Disposable {
@@ -227,5 +227,6 @@
public void dispose()
{
this.manager.release((Component)this.processor);
+ super.dispose();
}
}
1.3 +2 -1
xml-cocoon2/src/java/org/apache/cocoon/generation/SearchGenerator.java
Index: SearchGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/SearchGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SearchGenerator.java 24 Jan 2002 03:20:25 -0000 1.2
+++ SearchGenerator.java 1 Feb 2002 14:19:53 -0000 1.3
@@ -79,7 +79,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Bernhard Huber</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Vadim Gritsenko</a>
- * @version CVS $Id: SearchGenerator.java,v 1.2 2002/01/24 03:20:25 vgritsenko
Exp $
+ * @version CVS $Id: SearchGenerator.java,v 1.3 2002/02/01 14:19:53 vgritsenko
Exp $
*/
public class SearchGenerator extends ComposerGenerator
implements Recyclable, Contextualizable, Initializable, Disposable
@@ -808,6 +808,7 @@
// this.manager.release(lcs);
// lcs = null;
// }
+ super.dispose();
}
}
1.2 +4 -4
xml-cocoon2/src/java/org/apache/cocoon/generation/ServletGenerator.java
Index: ServletGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/ServletGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ServletGenerator.java 3 Jan 2002 12:31:16 -0000 1.1
+++ ServletGenerator.java 1 Feb 2002 14:19:53 -0000 1.2
@@ -7,14 +7,15 @@
*****************************************************************************/
package org.apache.cocoon.generation;
-import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.parameters.Parameters;
+
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.Context;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Response;
import org.apache.cocoon.environment.SourceResolver;
+
import org.xml.sax.SAXException;
import java.io.IOException;
@@ -23,10 +24,9 @@
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
- * @version CVS $Revision: 1.1 $ $Date: 2002/01/03 12:31:16 $
+ * @version CVS $Revision: 1.2 $ $Date: 2002/02/01 14:19:53 $
*/
-public abstract class ServletGenerator extends ComposerGenerator
-implements Composable {
+public abstract class ServletGenerator extends ComposerGenerator {
protected Request request=null;
protected Response response=null;
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
