stefano 2003/03/10 15:03:53
Modified: src/java/org/apache/cocoon/components/language/markup/xsp
XSPUtil.java
Log:
Fixed a few more issues with deprecated classes (now using excalibur parsers instead
of cocoon's)
Revision Changes Path
1.2 +9 -12
cocoon-2.1/src/java/org/apache/cocoon/components/language/markup/xsp/XSPUtil.java
Index: XSPUtil.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/language/markup/xsp/XSPUtil.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XSPUtil.java 9 Mar 2003 00:08:55 -0000 1.1
+++ XSPUtil.java 10 Mar 2003 23:03:53 -0000 1.2
@@ -53,7 +53,6 @@
import org.apache.avalon.framework.CascadingRuntimeException;
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.cocoon.components.parser.Parser;
import org.apache.cocoon.components.url.URLFactory;
import org.apache.cocoon.environment.Context;
import org.apache.cocoon.environment.ObjectModelHelper;
@@ -63,6 +62,7 @@
import org.apache.cocoon.util.Tokenizer;
import org.apache.cocoon.xml.IncludeXMLConsumer;
import org.apache.excalibur.source.Source;
+import org.apache.excalibur.xml.sax.SAXParser;
import org.xml.sax.ContentHandler;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -81,6 +81,7 @@
* @version CVS $Id$
*/
public class XSPUtil {
+
public static String pathComponent(String filename) {
int i = filename.lastIndexOf(File.separator);
return (i >= 0) ? filename.substring(0, i) : filename;
@@ -157,11 +158,9 @@
return result;
}
- public static void include(InputSource is, ContentHandler parentContentHandler,
Parser parser)
+ public static void include(InputSource is, ContentHandler parentContentHandler,
SAXParser parser)
throws SAXException, IOException {
- parser.setConsumer(
- new IncludeXMLConsumer(parentContentHandler));
- parser.parse(is);
+ parser.parse(is,new IncludeXMLConsumer(parentContentHandler));
}
public static String encodeMarkup(String string) {
@@ -187,12 +186,12 @@
}
public static String formEncode(String text) throws Exception {
- return URLEncoder.encode (text);
+ return URLEncoder.encode (text);
}
// Shameless, ain't it?
public static String formDecode(String s) throws Exception {
- return URLDecoder.decode (s);
+ return URLDecoder.decode (s);
}
/* Logicsheet Utility Methods */
@@ -352,10 +351,10 @@
public static void includeInputSource(InputSource source, ComponentManager
manager, ContentHandler contentHandler)
throws RuntimeException {
- Parser newParser = null;
+ SAXParser newParser = null;
try {
- newParser = (Parser) manager.lookup(Parser.ROLE);
+ newParser = (SAXParser) manager.lookup(SAXParser.ROLE);
XSPUtil.include(source, contentHandler, newParser);
} catch (Exception e) {
throw new CascadingRuntimeException("Could not include page", e);
@@ -363,6 +362,4 @@
if (newParser != null) manager.release((Component) newParser);
}
}
-
-
}
