giacomo 01/06/21 12:29:03
Modified: src/org/apache/cocoon/components/url ContextURLFactory.java
webapp cocoon.xconf sitemap.xmap
webapp/protected sitemap.xmap
Log:
make pseudo protocol context:// consistent with the resource:// pseudo protocol
Revision Changes Path
1.2 +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
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- ContextURLFactory.java 2001/05/09 20:50:01 1.1
+++ ContextURLFactory.java 2001/06/21 19:28:56 1.2
@@ -17,7 +17,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
- * @version $Id: ContextURLFactory.java,v 1.1 2001/05/09 20:50:01 giacomo Exp $
+ * @version $Id: ContextURLFactory.java,v 1.2 2001/06/21 19:28:56 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 {
1.12 +1 -1 xml-cocoon2/webapp/cocoon.xconf
Index: cocoon.xconf
===================================================================
RCS file: /home/cvs/xml-cocoon2/webapp/cocoon.xconf,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -u -r1.11 -r1.12
--- cocoon.xconf 2001/06/20 13:19:25 1.11
+++ cocoon.xconf 2001/06/21 19:28:59 1.12
@@ -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.17 +1 -1 xml-cocoon2/webapp/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-cocoon2/webapp/sitemap.xmap,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -u -r1.16 -r1.17
--- sitemap.xmap 2001/06/19 13:39:21 1.16
+++ sitemap.xmap 2001/06/21 19:28:59 1.17
@@ -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"/>
1.5 +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.5
diff -u -u -r1.4 -r1.5
--- sitemap.xmap 2001/05/25 16:13:47 1.4
+++ sitemap.xmap 2001/06/21 19:29:02 1.5
@@ -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]
