cziegeler 2003/02/27 06:18:20
Modified: src/java/org/apache/cocoon/xml/dom Tag: cocoon_2_0_3_branch
DOMStreamer.java
src/java/org/apache/cocoon/xml Tag: cocoon_2_0_3_branch
XMLUtils.java
src/java/org/apache/cocoon/components/deli Tag:
cocoon_2_0_3_branch Deli.java DeliImpl.java
src/java/org/apache/cocoon/components/resolver Tag:
cocoon_2_0_3_branch ResolverImpl.java
Log:
Updating to latest versions
PR:
Obtained from:
Submitted by:
Reviewed by:
CVS: ----------------------------------------------------------------------
CVS: PR:
CVS: If this change addresses a PR in the problem report tracking
CVS: database, then enter the PR number(s) here.
CVS: Obtained from:
CVS: If this change has been taken from another system, such as NCSA,
CVS: then name the system in this line, otherwise delete it.
CVS: Submitted by:
CVS: If this code has been contributed to Apache by someone else; i.e.,
CVS: they sent us a patch or a new module, then include their name/email
CVS: address here. If this is your work then delete this line.
CVS: Reviewed by:
CVS: If we are doing pre-commit code reviews and someone else has
CVS: reviewed your changes, include their name(s) here.
CVS: If you have not had it reviewed then delete this line.
Revision Changes Path
No revision
No revision
1.4.2.3 +4 -4 xml-cocoon2/src/java/org/apache/cocoon/xml/dom/DOMStreamer.java
Index: DOMStreamer.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/xml/dom/DOMStreamer.java,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- DOMStreamer.java 27 Feb 2003 12:03:39 -0000 1.4.2.2
+++ DOMStreamer.java 27 Feb 2003 14:18:18 -0000 1.4.2.3
@@ -603,14 +603,14 @@
ContentHandler handler;
if (node.getNodeType() == Node.DOCUMENT_NODE) {
// Pass all SAX events
- handler = super.contentHandler;
+ handler = contentHandler;
} else {
// Strip start/endDocument
- handler = new EmbeddedXMLPipe(super.contentHandler);
+ handler = new EmbeddedXMLPipe(contentHandler);
}
SAXResult result = new SAXResult(handler);
- result.setLexicalHandler(super.lexicalHandler);
+ result.setLexicalHandler(lexicalHandler);
try {
transformer.transform(source, result);
No revision
No revision
1.6.2.6 +11 -14 xml-cocoon2/src/java/org/apache/cocoon/xml/XMLUtils.java
Index: XMLUtils.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/xml/XMLUtils.java,v
retrieving revision 1.6.2.5
retrieving revision 1.6.2.6
diff -u -r1.6.2.5 -r1.6.2.6
--- XMLUtils.java 27 Feb 2003 12:03:40 -0000 1.6.2.5
+++ XMLUtils.java 27 Feb 2003 14:18:19 -0000 1.6.2.6
@@ -52,28 +52,25 @@
import java.io.StringWriter;
import java.util.ArrayList;
-import java.util.Properties;
import java.util.Collection;
import java.util.Iterator;
+import java.util.Properties;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.sax.SAXTransformerFactory;
+import javax.xml.transform.sax.TransformerHandler;
+import javax.xml.transform.stream.StreamResult;
+
+import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.xml.dom.DOMStreamer;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.w3c.dom.Node;
import org.w3c.dom.NamedNodeMap;
-
+import org.w3c.dom.Node;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
import org.xml.sax.ext.LexicalHandler;
-
-import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.xml.dom.DOMStreamer;
-
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
/**
* XML utility methods.
No revision
No revision
1.7.2.2 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/components/deli/Attic/Deli.java
Index: Deli.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/deli/Attic/Deli.java,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -r1.7.2.1 -r1.7.2.2
--- Deli.java 7 Feb 2003 07:19:24 -0000 1.7.2.1
+++ Deli.java 27 Feb 2003 14:18:19 -0000 1.7.2.2
@@ -65,7 +65,7 @@
public interface Deli extends Component {
- String ROLE = "org.apache.cocoon.components.deli.Deli";
+ String ROLE = Deli.class.getName();
/**
* Convert a profile stored as a vector of profile attributes
1.17.2.3 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/components/deli/Attic/DeliImpl.java
Index: DeliImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/deli/Attic/DeliImpl.java,v
retrieving revision 1.17.2.2
retrieving revision 1.17.2.3
diff -u -r1.17.2.2 -r1.17.2.3
--- DeliImpl.java 7 Feb 2003 07:19:24 -0000 1.17.2.2
+++ DeliImpl.java 27 Feb 2003 14:18:19 -0000 1.17.2.3
@@ -164,7 +164,7 @@
public void initialize()
throws Exception {
try {
- this.workspace = new Workspace(this.servletContext, this.deliConfig);
+ Workspace.getInstance().configure(this.servletContext, this.deliConfig);
} catch (Exception e) {
getLogger().error("DELI Exception while creating workspace: ", e);
throw e;
@@ -193,7 +193,7 @@
throws IOException, ServletException, Exception {
try {
CocoonServletRequest servletRequest = new CocoonServletRequest(theRequest);
- Profile theProfile = new Profile(this.workspace, (HttpServletRequest)
servletRequest);
+ Profile theProfile = new Profile((HttpServletRequest) servletRequest);
return theProfile;
} catch (Exception e) {
getLogger().error("DELI Exception while retrieving profile: ", e);
No revision
No revision
1.9.2.6 +7 -8
xml-cocoon2/src/java/org/apache/cocoon/components/resolver/ResolverImpl.java
Index: ResolverImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/resolver/ResolverImpl.java,v
retrieving revision 1.9.2.5
retrieving revision 1.9.2.6
diff -u -r1.9.2.5 -r1.9.2.6
--- ResolverImpl.java 7 Feb 2003 07:19:22 -0000 1.9.2.5
+++ ResolverImpl.java 27 Feb 2003 14:18:20 -0000 1.9.2.6
@@ -64,12 +64,9 @@
import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
-
import org.apache.cocoon.Constants;
-
-import org.apache.xml.resolver.helpers.Debug;
+import org.apache.xml.resolver.CatalogManager;
import org.apache.xml.resolver.tools.CatalogResolver;
-
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -105,8 +102,11 @@
ThreadSafe,
Disposable {
+ /** The catalog manager */
+ protected CatalogManager catalogManager = new CatalogManager();
+
/** The catalog resolver */
- protected CatalogResolver catalogResolver = new CatalogResolver();
+ protected CatalogResolver catalogResolver = new CatalogResolver(catalogManager);
/** The component manager */
protected ComponentManager manager = null;
@@ -131,7 +131,6 @@
public void parameterize(Parameters params) throws ParameterException {
/* Over-ride debug level that is set by CatalogManager.properties */
- int debugLevel = Debug.getDebug();
String verbosity = params.getParameter("verbosity", "");
if (verbosity != "") {
if (this.getLogger().isDebugEnabled()) {
@@ -141,7 +140,7 @@
int verbosityLevel = 0;
try {
verbosityLevel = Integer.parseInt(verbosity);
- Debug.setDebug(verbosityLevel);
+ catalogManager.setVerbosity(verbosityLevel);
} catch (NumberFormatException ce1) {
this.getLogger().warn("Trouble setting Catalog verbosity",
ce1);
