prussell 01/02/11 11:13:19
Modified: src/org/apache/cocoon/generation Tag: xml-cocoon2
AbstractGenerator.java DirectoryGenerator.java
FileGenerator.java ServletGenerator.java
Log:
Brought AbstractGenerator.setup(...)'s throws clause into line with
SitemapModelComponent, and modified existing generators where required.
Revision Changes Path
No revision
No revision
1.1.2.7 +6 -2
xml-cocoon/src/org/apache/cocoon/generation/Attic/AbstractGenerator.java
Index: AbstractGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/AbstractGenerator.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- AbstractGenerator.java 2000/10/19 14:43:46 1.1.2.6
+++ AbstractGenerator.java 2001/02/11 19:13:19 1.1.2.7
@@ -8,18 +8,21 @@
package org.apache.cocoon.generation;
import java.util.Map;
+import java.io.IOException;
import org.apache.avalon.Parameters;
import org.apache.cocoon.xml.AbstractXMLProducer;
+import org.apache.cocoon.ProcessingException;
import org.xml.sax.EntityResolver;
+import org.xml.sax.SAXException;
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.6 $ $Date: 2000/10/19 14:43:46 $
+ * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/02/11 19:13:19 $
*/
public abstract class AbstractGenerator extends AbstractXMLProducer
implements Generator {
@@ -37,7 +40,8 @@
* Set the <code>EntityResolver</code>, object model <code>Map</code>,
* the source and sitemap <code>Parameters</code> used to process the
request.
*/
- public void setup(EntityResolver resolver, Map objectModel, String src,
Parameters par) {
+ public void setup(EntityResolver resolver, Map objectModel, String src,
Parameters par)
+ throws ProcessingException, SAXException, IOException {
this.resolver=resolver;
this.objectModel=objectModel;
this.source=src;
1.1.2.15 +3 -2
xml-cocoon/src/org/apache/cocoon/generation/Attic/DirectoryGenerator.java
Index: DirectoryGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/DirectoryGenerator.java,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -u -r1.1.2.14 -r1.1.2.15
--- DirectoryGenerator.java 2001/02/09 20:51:11 1.1.2.14
+++ DirectoryGenerator.java 2001/02/11 19:13:19 1.1.2.15
@@ -59,7 +59,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1.2.14 $ $Date: 2001/02/09 20:51:11 $ */
+ * @version CVS $Revision: 1.1.2.15 $ $Date: 2001/02/11 19:13:19 $ */
public class DirectoryGenerator extends ComposerGenerator implements
Poolable {
@@ -100,7 +100,8 @@
* @param par
* configuration parameters
*/
- public void setup(EntityResolver resolver, Map objectModel, String src,
Parameters par) {
+ public void setup(EntityResolver resolver, Map objectModel, String src,
Parameters par)
+ throws ProcessingException, SAXException, IOException {
super.setup(resolver, objectModel, src, par);
String dateFormatString = par.getParameter("dateFormat", null);
1.1.2.15 +3 -2
xml-cocoon/src/org/apache/cocoon/generation/Attic/FileGenerator.java
Index: FileGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/FileGenerator.java,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -u -r1.1.2.14 -r1.1.2.15
--- FileGenerator.java 2001/02/05 16:23:09 1.1.2.14
+++ FileGenerator.java 2001/02/11 19:13:19 1.1.2.15
@@ -57,7 +57,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.1.2.14 $ $Date: 2001/02/05 16:23:09 $
+ * @version CVS $Revision: 1.1.2.15 $ $Date: 2001/02/11 19:13:19 $
*/
public class FileGenerator extends ComposerGenerator implements Poolable,
Configurable {
@@ -98,7 +98,8 @@
/**
* Set the use-store parameter
*/
- public void setup(EntityResolver resolver, Map objectModel, String src,
Parameters par) {
+ public void setup(EntityResolver resolver, Map objectModel, String src,
Parameters par)
+ throws ProcessingException, SAXException, IOException {
super.setup(resolver, objectModel, src, par);
this.useStore = par.getParameterAsBoolean("use-store",
this.defaultUseStore);
}
1.1.2.7 +6 -2
xml-cocoon/src/org/apache/cocoon/generation/Attic/ServletGenerator.java
Index: ServletGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/ServletGenerator.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- ServletGenerator.java 2001/02/09 22:16:55 1.1.2.6
+++ ServletGenerator.java 2001/02/11 19:13:19 1.1.2.7
@@ -8,6 +8,7 @@
package org.apache.cocoon.generation;
import java.util.Map;
+import java.io.IOException;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
@@ -19,13 +20,15 @@
import org.apache.avalon.Poolable;
import org.apache.cocoon.Cocoon;
+import org.apache.cocoon.ProcessingException;
import org.xml.sax.EntityResolver;
+import org.xml.sax.SAXException;
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/02/09 22:16:55 $
+ * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/02/11 19:13:19 $
*/
public abstract class ServletGenerator extends ComposerGenerator
implements Composer, Poolable {
@@ -34,7 +37,8 @@
protected HttpServletResponse response=null;
protected ServletContext context=null;
- public void setup(EntityResolver resolver, Map objectModel, String src,
Parameters par) {
+ public void setup(EntityResolver resolver, Map objectModel, String src,
Parameters par)
+ throws ProcessingException, SAXException, IOException {
super.setup(resolver, objectModel, src, par);
this.request = (HttpServletRequest)
objectModel.get(Cocoon.REQUEST_OBJECT);
this.response = (HttpServletResponse)
objectModel.get(Cocoon.RESPONSE_OBJECT);
