You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by bl...@apache.org on 2003/10/15 18:55:01 UTC
cvs commit: cocoon-2.2/src/java/org/apache/cocoon/generation ServerPagesGenerator.java ServletGenerator.java
bloritsch 2003/10/15 09:55:01
Modified: src/java/org/apache/cocoon/generation
ServerPagesGenerator.java ServletGenerator.java
Log:
UPdate these to be Serviceable, and to use the Fortress libraries.
Revision Changes Path
1.5 +5 -3 cocoon-2.2/src/java/org/apache/cocoon/generation/ServerPagesGenerator.java
Index: ServerPagesGenerator.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/generation/ServerPagesGenerator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ServerPagesGenerator.java 7 Oct 2003 16:07:33 -0000 1.4
+++ ServerPagesGenerator.java 15 Oct 2003 16:55:00 -0000 1.5
@@ -58,6 +58,8 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.ServiceException;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.caching.CacheableProcessingComponent;
@@ -113,8 +115,8 @@
*
* @param manager The global component manager
*/
- public void compose(ComponentManager manager) throws ComponentException {
- super.compose(manager);
+ public void service(ServiceManager manager) throws ServiceException {
+ super.service(manager);
if (programGenerator == null) {
this.programGenerator =
1.3 +2 -2 cocoon-2.2/src/java/org/apache/cocoon/generation/ServletGenerator.java
Index: ServletGenerator.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/generation/ServletGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ServletGenerator.java 3 Sep 2003 15:00:56 -0000 1.2
+++ ServletGenerator.java 15 Oct 2003 16:55:01 -0000 1.3
@@ -69,7 +69,7 @@
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
* @version CVS $Id$
*/
-public abstract class ServletGenerator extends ComposerGenerator {
+public abstract class ServletGenerator extends ServiceableGenerator {
protected Request request;
protected Response response;