crossley 01/12/15 00:13:43
Modified: src/org/apache/cocoon/components/resolver Tag:
cocoon_20_branch ResolverImpl.java
Log:
Reverted part of a recent patch which seemed to introduce file: problems again.
The main part of Bug #5060 was with CommandlineContext.java
PR:5060
Revision Changes Path
No revision
No revision
1.2.2.9 +5 -5
xml-cocoon2/src/org/apache/cocoon/components/resolver/ResolverImpl.java
Index: ResolverImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/resolver/ResolverImpl.java,v
retrieving revision 1.2.2.8
retrieving revision 1.2.2.9
diff -u -r1.2.2.8 -r1.2.2.9
--- ResolverImpl.java 2001/12/15 05:31:13 1.2.2.8
+++ ResolverImpl.java 2001/12/15 08:13:42 1.2.2.9
@@ -44,7 +44,7 @@
* </resolver>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
- * @version CVS $Revision: 1.2.2.8 $ $Date: 2001/12/15 05:31:13 $
+ * @version CVS $Revision: 1.2.2.9 $ $Date: 2001/12/15 08:13:42 $
*/
public class ResolverImpl extends AbstractLoggable
implements Resolver, Contextualizable, Composable, Configurable,
ThreadSafe, Disposable {
@@ -94,12 +94,12 @@
String catalogFile = params.getParameter("catalog",
"/resources/entities/catalog");
try {
- String catalogFileName =
this.context.getResource(catalogFile).getFile();
+ String catalogURL =
this.context.getResource(catalogFile).toExternalForm();
if (this.getLogger().isDebugEnabled() == true) {
- this.getLogger().debug("System OASIS Catalog file name is "
- + catalogFileName);
+ this.getLogger().debug("System OASIS Catalog URL is "
+ + catalogURL);
}
- catalogResolver.getCatalog().parseCatalog(catalogFileName);
+ catalogResolver.getCatalog().parseCatalog(catalogURL);
} catch (Exception e) {
this.getLogger().warn("Could not get Catalog URL", e);
}
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
