cziegeler 02/02/20 03:00:31
Modified: src/scratchpad/src/org/apache/cocoon/sunshine/context
RequestSessionContext.java
src/scratchpad/src/org/apache/cocoon/sunshine/xml
XMLUtil.java
Log:
Use excalibur parser
Revision Changes Path
1.2 +2 -2
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/context/RequestSessionContext.java
Index: RequestSessionContext.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/context/RequestSessionContext.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RequestSessionContext.java 18 Feb 2002 09:10:09 -0000 1.1
+++ RequestSessionContext.java 20 Feb 2002 11:00:30 -0000 1.2
@@ -57,11 +57,11 @@
import java.io.*;
import java.util.*;
+import org.apache.avalon.excalibur.xml.Parser;
import org.apache.avalon.excalibur.source.SourceParameters;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.components.parser.Parser;
import org.apache.cocoon.environment.Cookie;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
@@ -149,7 +149,7 @@
* - getLocales()
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: RequestSessionContext.java,v 1.1 2002/02/18 09:10:09 cziegeler
Exp $
+ * @version CVS $Id: RequestSessionContext.java,v 1.2 2002/02/20 11:00:30 cziegeler
Exp $
*/
public final class RequestSessionContext
implements SessionContext {
1.4 +3 -5
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/xml/XMLUtil.java
Index: XMLUtil.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/xml/XMLUtil.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLUtil.java 18 Feb 2002 15:03:34 -0000 1.3
+++ XMLUtil.java 20 Feb 2002 11:00:30 -0000 1.4
@@ -57,9 +57,9 @@
import java.io.*;
import java.util.Properties;
+import org.apache.avalon.excalibur.xml.Parser;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.components.parser.Parser;
import org.apache.cocoon.xml.dom.DOMBuilder;
import org.apache.avalon.excalibur.source.SourceParameters;
import org.apache.xpath.XPathAPI;
@@ -99,7 +99,7 @@
* @deprecated Do not use this class! We will provide a better solution for most
methods soon.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: XMLUtil.java,v 1.3 2002/02/18 15:03:34 cziegeler Exp $
+ * @version CVS $Id: XMLUtil.java,v 1.4 2002/02/20 11:00:30 cziegeler Exp $
*/
public final class XMLUtil {
@@ -481,9 +481,7 @@
builder.startElement("", "sunShine", "sunShine", new AttributesImpl());
IncludeFilter filter = new IncludeFilter(builder, builder);
- parser.setContentHandler(filter);
- parser.setLexicalHandler(filter);
- parser.parse(input);
+ parser.parse(input, filter);
builder.endElement("", "sunShine", "sunShine");
builder.endDocument();
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
