crossley 2002/12/18 23:01:40
Modified: src/java/org/apache/cocoon/components/resolver
ResolverImpl.java
lib jars.xml
Added: lib/optional resolver-20021114.jar
Removed: lib/optional resolver-20020130.jar
Log:
Upgrade entity-resolver jar to the v1.1 pre-release from xml-commons.
Revision Changes Path
1.17 +7 -5
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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ResolverImpl.java 19 Dec 2002 03:42:04 -0000 1.16
+++ ResolverImpl.java 19 Dec 2002 07:01:40 -0000 1.17
@@ -64,7 +64,7 @@
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;
@@ -100,8 +100,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;
@@ -126,7 +129,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()) {
@@ -136,7 +138,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);
1.54 +3 -0 xml-cocoon2/lib/jars.xml
Index: jars.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/lib/jars.xml,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- jars.xml 8 Dec 2002 04:23:23 -0000 1.53
+++ jars.xml 19 Dec 2002 07:01:40 -0000 1.54
@@ -424,7 +424,10 @@
entity sets.
</description>
<used-by>Cocoon Role entity-resolver</used-by>
+<!--
<lib>optional/resolver-20020130.jar</lib>
+-->
+ <lib>optional/resolver-20021114.jar</lib>
<homepage>http://xml.apache.org/commons/</homepage>
</file>
<file name="servlet">
1.1 xml-cocoon2/lib/optional/resolver-20021114.jar
<<Binary file>>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
