giacomo 01/06/21 12:24:07
Modified: src/org/apache/cocoon/components/url Tag: cocoon_20_branch
URLFactoryImpl.java
webapp Tag: cocoon_20_branch cocoon.xconf sitemap.xmap
webapp/protected Tag: cocoon_20_branch sitemap.xmap
Log:
make pseudo protocol context:// consistent with the resource:// pseudo protocol
Revision Changes Path
No revision
No revision
1.2.2.2 +2 -1
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.1
retrieving revision 1.2.2.2
diff -u -u -r1.2.2.1 -r1.2.2.2
--- URLFactoryImpl.java 2001/06/14 14:44:04 1.2.2.1
+++ URLFactoryImpl.java 2001/06/21 19:24:01 1.2.2.2
@@ -29,7 +29,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
- * @version $Id: URLFactoryImpl.java,v 1.2.2.1 2001/06/14 14:44:04 bloritsch Exp $
+ * @version $Id: URLFactoryImpl.java,v 1.2.2.2 2001/06/21 19:24:01 giacomo Exp $
*/
public class URLFactoryImpl extends AbstractLoggable implements URLFactory,
Component, Configurable, Contextualizable {
@@ -57,6 +57,7 @@
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));
}
}
No revision
No revision
1.7.2.5 +1 -1 xml-cocoon2/webapp/cocoon.xconf
Index: cocoon.xconf
===================================================================
RCS file: /home/cvs/xml-cocoon2/webapp/cocoon.xconf,v
retrieving revision 1.7.2.4
retrieving revision 1.7.2.5
diff -u -u -r1.7.2.4 -r1.7.2.5
--- cocoon.xconf 2001/06/20 13:17:01 1.7.2.4
+++ cocoon.xconf 2001/06/21 19:24:03 1.7.2.5
@@ -123,7 +123,7 @@
<builtin-logicsheet>
<parameter name="prefix" value="soap"/>
<parameter name="uri" value="http://apache.org/xsp/soap/2.0"/>
- <parameter name="href" value="context:///docs/samples/soap/soap-lib.xsl"/>
+ <parameter name="href" value="context://docs/samples/soap/soap-lib.xsl"/>
</builtin-logicsheet>
</target-language>
1.11.2.6 +1 -1 xml-cocoon2/webapp/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-cocoon2/webapp/sitemap.xmap,v
retrieving revision 1.11.2.5
retrieving revision 1.11.2.6
diff -u -u -r1.11.2.5 -r1.11.2.6
--- sitemap.xmap 2001/06/19 13:38:27 1.11.2.5
+++ sitemap.xmap 2001/06/21 19:24:03 1.11.2.6
@@ -375,7 +375,7 @@
<!-- ========================== Forms ================================= -->
<map:match pattern="forms/employee">
<map:act set="employee">
- <map:parameter name="form-descriptor"
value="context:///docs/samples/forms/employee.xml"/>
+ <map:parameter name="form-descriptor"
value="context://docs/samples/forms/employee.xml"/>
<map:generate type="serverpages" src="docs/samples/forms/employee.xsp"/>
<map:transform src="stylesheets/dynamic-page2html.xsl">
<map:parameter name="view-source"
value="docs/samples/forms/employee.xsp"/>
No revision
No revision
1.4.2.1 +3 -3 xml-cocoon2/webapp/protected/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-cocoon2/webapp/protected/sitemap.xmap,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -u -r1.4 -r1.4.2.1
--- sitemap.xmap 2001/05/25 16:13:47 1.4
+++ sitemap.xmap 2001/06/21 19:24:06 1.4.2.1
@@ -58,11 +58,11 @@
<map:match pattern="do-login">
<!-- first validate whether submitted values are ok -->
<map:act type="form-validator">
- <map:parameter name="descriptor"
value="context:///protected/descriptors/params.xml"/>
+ <map:parameter name="descriptor"
value="context://protected/descriptors/params.xml"/>
<map:parameter name="validate" value="username"/>
<!-- now try to log in -->
<map:act type="db-authenticator">
- <map:parameter name="descriptor"
value="context:///protected/descriptors/auth.xml"/>
+ <map:parameter name="descriptor"
value="context://protected/descriptors/auth.xml"/>
<!-- now go to protected area -->
<map:redirect-to uri="protected"/>
</map:act>
@@ -77,7 +77,7 @@
<map:match pattern="protected">
<!-- first validate whether user has logged in -->
<map:act type="session-validator">
- <map:parameter name="descriptor"
value="context:///protected//descriptors/params.xml"/>
+ <map:parameter name="descriptor"
value="context://protected//descriptors/params.xml"/>
<map:parameter name="validate" value="username,department_id,theme"/>
<!-- generate protected content -->
<map:generate type="serverpages" src="docs/protected.xsp"/>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
