giacomo 01/06/21 12:35:09
Modified: src/org/apache/cocoon/components/url Tag: cocoon_20_branch
URLFactoryImpl.java ContextURLFactory.java
Log:
make context:// protocol consistent
Revision Changes Path
No revision
No revision
1.2.2.3 +1 -2
xml-cocoon2/src/org/apache/cocoon/components/url/URLFactoryImpl.java
Index: URLFactoryImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/url/URLFactoryImpl.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -u -r1.2.2.2 -r1.2.2.3
--- URLFactoryImpl.java 2001/06/21 19:24:01 1.2.2.2
+++ URLFactoryImpl.java 2001/06/21 19:35:04 1.2.2.3
@@ -29,7 +29,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
- * @version $Id: URLFactoryImpl.java,v 1.2.2.2 2001/06/21 19:24:01 giacomo Exp $
+ * @version $Id: URLFactoryImpl.java,v 1.2.2.3 2001/06/21 19:35:04 giacomo Exp $
*/
public class URLFactoryImpl extends AbstractLoggable implements URLFactory,
Component, Configurable, Contextualizable {
@@ -57,7 +57,6 @@
while (iter.hasNext()) {
protocol = (String)iter.next();
if (location.startsWith(protocol + "://")) {
- getLogger().debug("URLFactoryImpl: requesting " + location);
return
((URLFactory)factories.get(protocol)).getURL(location.substring(protocol.length() +
3));
}
}
1.1.1.1.2.1 +2 -2
xml-cocoon2/src/org/apache/cocoon/components/url/ContextURLFactory.java
Index: ContextURLFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/url/ContextURLFactory.java,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -u -r1.1.1.1 -r1.1.1.1.2.1
--- ContextURLFactory.java 2001/05/09 20:50:01 1.1.1.1
+++ ContextURLFactory.java 2001/06/21 19:35:06 1.1.1.1.2.1
@@ -17,7 +17,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
- * @version $Id: ContextURLFactory.java,v 1.1.1.1 2001/05/09 20:50:01 giacomo Exp $
+ * @version $Id: ContextURLFactory.java,v 1.1.1.1.2.1 2001/06/21 19:35:06 giacomo
Exp $
*/
public class ContextURLFactory extends AbstractLoggable implements URLFactory,
Contextualizable {
@@ -46,7 +46,7 @@
getLogger().warn("no environment-context in application context (making
an absolute URL)");
return new URL(location);
}
- URL u = envContext.getResource(location);
+ URL u = envContext.getResource("/" + location);
if (u != null)
return u;
else {
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
