cziegeler 02/04/25 02:37:01
Modified: src/java/org/apache/cocoon/environment Environment.java
SourceResolver.java URLFactorySourceResolver.java
src/java/org/apache/cocoon/sitemap Handler.java
Log:
Correcting interface
Revision Changes Path
1.9 +1 -15
xml-cocoon2/src/java/org/apache/cocoon/environment/Environment.java
Index: Environment.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/environment/Environment.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Environment.java 25 Apr 2002 09:30:48 -0000 1.8
+++ Environment.java 25 Apr 2002 09:37:01 -0000 1.9
@@ -50,7 +50,6 @@
*/
package org.apache.cocoon.environment;
-import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.source.SourceHandler;
import org.apache.excalibur.xmlizer.XMLizer;
import java.io.IOException;
@@ -58,15 +57,13 @@
import java.net.URL;
import java.util.Enumeration;
import java.util.Map;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.SAXException;
/**
* Base interface for an environment abstraction
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: Environment.java,v 1.8 2002/04/25 09:30:48 cziegeler Exp $
+ * @version CVS $Id: Environment.java,v 1.9 2002/04/25 09:37:01 cziegeler Exp $
*/
public interface Environment
@@ -232,16 +229,5 @@
*/
boolean tryResetResponse();
- /**
- * Generates SAX events from the given source
- * <b>NOTE</b> : if the implementation can produce lexical events, care should
be taken
- * that <code>handler</code> can actually
- * directly implement the LexicalHandler interface!
- * @param source the data
- * @throws ProcessingException if no suitable converter is found
- */
- void toSAX( org.apache.excalibur.source.Source source,
- ContentHandler handler )
- throws SAXException, IOException, ProcessingException;
}
1.7 +14 -1
xml-cocoon2/src/java/org/apache/cocoon/environment/SourceResolver.java
Index: SourceResolver.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/environment/SourceResolver.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SourceResolver.java 19 Apr 2002 11:02:57 -0000 1.6
+++ SourceResolver.java 25 Apr 2002 09:37:01 -0000 1.7
@@ -51,6 +51,7 @@
package org.apache.cocoon.environment;
import org.apache.cocoon.ProcessingException;
+import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
import java.io.IOException;
@@ -58,7 +59,7 @@
* Base interface for resolving a source by system identifiers.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: SourceResolver.java,v 1.6 2002/04/19 11:02:57 cziegeler Exp $
+ * @version CVS $Id: SourceResolver.java,v 1.7 2002/04/25 09:37:01 cziegeler Exp $
*/
public interface SourceResolver
@@ -71,5 +72,17 @@
*/
Source resolve(String systemID)
throws ProcessingException, SAXException, IOException;
+
+ /**
+ * Generates SAX events from the given source
+ * <b>NOTE</b> : if the implementation can produce lexical events, care should
be taken
+ * that <code>handler</code> can actually
+ * directly implement the LexicalHandler interface!
+ * @param source the data
+ * @throws ProcessingException if no suitable converter is found
+ */
+ void toSAX( org.apache.excalibur.source.Source source,
+ ContentHandler handler )
+ throws SAXException, IOException, ProcessingException;
}
1.8 +16 -1
xml-cocoon2/src/java/org/apache/cocoon/environment/URLFactorySourceResolver.java
Index: URLFactorySourceResolver.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/environment/URLFactorySourceResolver.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- URLFactorySourceResolver.java 24 Apr 2002 13:48:20 -0000 1.7
+++ URLFactorySourceResolver.java 25 Apr 2002 09:37:01 -0000 1.8
@@ -56,6 +56,7 @@
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.source.URLSource;
import org.apache.cocoon.components.url.URLFactory;
+import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
import java.io.IOException;
@@ -67,7 +68,7 @@
* A <code>SourceResolver</code> based on a <code>URLFactory</code>.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Sylvain Wallez</a>
- * @version CVS $Id: URLFactorySourceResolver.java,v 1.7 2002/04/24 13:48:20
cziegeler Exp $
+ * @version CVS $Id: URLFactorySourceResolver.java,v 1.8 2002/04/25 09:37:01
cziegeler Exp $
*/
public class URLFactorySourceResolver implements SourceResolver {
@@ -134,6 +135,20 @@
*/
public void release( final org.apache.excalibur.source.Source source ) {
throw new RuntimeException("URLFactorySourceResolver.release() is not
implemented yet.");
+ }
+
+ /**
+ * Generates SAX events from the given source
+ * <b>NOTE</b> : if the implementation can produce lexical events, care should
be taken
+ * that <code>handler</code> can actually
+ * directly implement the LexicalHandler interface!
+ * @param source the data
+ * @throws ProcessingException if no suitable converter is found
+ */
+ public void toSAX( org.apache.excalibur.source.Source source,
+ ContentHandler handler )
+ throws SAXException, IOException, ProcessingException {
+ throw new RuntimeException("ProcessingException.toSAX() is not implemented
yet.");
}
}
1.18 +16 -1 xml-cocoon2/src/java/org/apache/cocoon/sitemap/Handler.java
Index: Handler.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/sitemap/Handler.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Handler.java 24 Apr 2002 13:48:20 -0000 1.17
+++ Handler.java 25 Apr 2002 09:37:01 -0000 1.18
@@ -73,6 +73,7 @@
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.environment.Source;
import org.apache.cocoon.environment.SourceResolver;
+import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
import java.io.FileNotFoundException;
@@ -87,7 +88,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
- * @version CVS $Id: Handler.java,v 1.17 2002/04/24 13:48:20 cziegeler Exp $
+ * @version CVS $Id: Handler.java,v 1.18 2002/04/25 09:37:01 cziegeler Exp $
*/
public class Handler extends AbstractLoggable
implements Runnable, Contextualizable, Composable, Processor, Disposable,
SourceResolver {
@@ -379,6 +380,20 @@
*/
public void release( final org.apache.excalibur.source.Source source ) {
throw new RuntimeException("Handler.release() is not implemented yet.");
+ }
+
+ /**
+ * Generates SAX events from the given source
+ * <b>NOTE</b> : if the implementation can produce lexical events, care should
be taken
+ * that <code>handler</code> can actually
+ * directly implement the LexicalHandler interface!
+ * @param source the data
+ * @throws ProcessingException if no suitable converter is found
+ */
+ public void toSAX( org.apache.excalibur.source.Source source,
+ ContentHandler handler )
+ throws SAXException, IOException, ProcessingException {
+ throw new ProcessingException("Handler.toSAX() is not implemented yet.");
}
}
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
