giacomo 01/06/12 13:02:51
Modified: src/org/apache/cocoon/components/language/markup/xsp
XSPGenerator.java
src/org/apache/cocoon/generation ComposerGenerator.java
FileGenerator.java ServerPagesGenerator.java
Log:
Applied patch to correct the compose method
Submitted by: Peter Royal <[EMAIL PROTECTED]>
Revision Changes Path
1.3 +3 -2
xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPGenerator.java
Index: XSPGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- XSPGenerator.java 2001/05/10 21:16:41 1.2
+++ XSPGenerator.java 2001/06/12 20:02:44 1.3
@@ -8,6 +8,7 @@
package org.apache.cocoon.components.language.markup.xsp;
import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
@@ -21,7 +22,7 @@
* Base class for XSP-generated <code>ServerPagesGenerator</code> classes
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ricardo Rocha</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/05/10 21:16:41 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/06/12 20:02:44 $
*/
public abstract class XSPGenerator extends AbstractServerPage implements
CompiledComponent, Contextualizable, Recyclable {
protected Context avalonContext = null;
@@ -37,7 +38,7 @@
*
* @param manager The global component manager
*/
- public void compose(ComponentManager manager) {
+ public void compose(ComponentManager manager) throws ComponentException {
super.compose(manager);
}
}
1.2 +4 -2
xml-cocoon2/src/org/apache/cocoon/generation/ComposerGenerator.java
Index: ComposerGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/ComposerGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- ComposerGenerator.java 2001/05/09 20:49:40 1.1
+++ ComposerGenerator.java 2001/06/12 20:02:47 1.2
@@ -8,14 +8,16 @@
package org.apache.cocoon.generation;
import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
+
import org.apache.cocoon.Cocoon;
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:40 $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/06/12 20:02:47 $
*/
public abstract class ComposerGenerator extends AbstractGenerator
implements Composable {
@@ -27,7 +29,7 @@
* Set the current <code>ComponentManager</code> instance used by this
* <code>Composable</code>.
*/
- public void compose(ComponentManager manager) {
+ public void compose(ComponentManager manager) throws ComponentException {
this.manager=manager;
}
}
1.12 +2 -2 xml-cocoon2/src/org/apache/cocoon/generation/FileGenerator.java
Index: FileGenerator.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/FileGenerator.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -u -r1.11 -r1.12
--- FileGenerator.java 2001/06/08 20:28:21 1.11
+++ FileGenerator.java 2001/06/12 20:02:49 1.12
@@ -39,7 +39,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Revision: 1.11 $ $Date: 2001/06/08 20:28:21 $
+ * @version CVS $Revision: 1.12 $ $Date: 2001/06/12 20:02:49 $
*/
public class FileGenerator extends ComposerGenerator
implements Cacheable, Recyclable {
@@ -51,7 +51,7 @@
* Set the current <code>ComponentManager</code> instance used by this
* <code>Composable</code>.
*/
- public void compose(ComponentManager manager) {
+ public void compose(ComponentManager manager) throws ComponentException {
super.compose(manager);
}
1.9 +3 -2
xml-cocoon2/src/org/apache/cocoon/generation/ServerPagesGenerator.java
Index: ServerPagesGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/ServerPagesGenerator.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -u -r1.8 -r1.9
--- ServerPagesGenerator.java 2001/06/08 20:28:21 1.8
+++ ServerPagesGenerator.java 2001/06/12 20:02:49 1.9
@@ -16,6 +16,7 @@
import java.util.Map;
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.parameters.Parameters;
@@ -47,7 +48,7 @@
* delegating actual SAX event generation.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ricardo Rocha</a>
- * @version CVS $Revision: 1.8 $ $Date: 2001/06/08 20:28:21 $
+ * @version CVS $Revision: 1.9 $ $Date: 2001/06/12 20:02:49 $
*/
public class ServerPagesGenerator
extends ServletGenerator
@@ -69,7 +70,7 @@
*
* @param manager The global component manager
*/
- public void compose(ComponentManager manager) {
+ public void compose(ComponentManager manager) throws ComponentException {
super.compose(manager);
if (programGenerator == null) {
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
