dims 01/07/06 14:35:05
Modified: src/org/apache/cocoon/acting LocaleAction.java
webapp sitemap.xmap
webapp/docs/samples samples.xml
Added: src/org/apache/cocoon/acting RequestParamAction.java
Log:
Contribution and Patches from Marcus Crafter.
Revision Changes Path
1.2 +3 -3 xml-cocoon2/src/org/apache/cocoon/acting/LocaleAction.java
Index: LocaleAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/LocaleAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LocaleAction.java 2001/07/02 19:38:55 1.1
+++ LocaleAction.java 2001/07/06 21:35:00 1.2
@@ -107,9 +107,9 @@
*
* <center>Code originated from org.apache.cocoon.acting.LangSelect</center>
*
- * @author: <a href="mailto:[EMAIL PROTECTED]";>Marcus Crafter</a>
- * @author: <a href="mailto:[EMAIL PROTECTED]";>Konstantin Piroumian</a>
- * @author: <a href="mailto:[EMAIL PROTECTED]";>Lassi Immonen</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Marcus Crafter</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Konstantin Piroumian</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Lassi Immonen</a>
*/
public class LocaleAction extends ComposerAction {
1.2 +104 -0 xml-cocoon2/src/org/apache/cocoon/acting/RequestParamAction.java
1.20 +8 -1 xml-cocoon2/webapp/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-cocoon2/webapp/sitemap.xmap,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sitemap.xmap 2001/07/04 09:12:52 1.19
+++ sitemap.xmap 2001/07/06 21:35:03 1.20
@@ -89,7 +89,6 @@
<map:matchers default="wildcard">
<map:matcher name="wildcard"
src="org.apache.cocoon.matching.WildcardURIMatcherFactory"/>
<map:matcher name="regexp"
src="org.apache.cocoon.matching.RegexpURIMatcherFactory"/>
- <map:matcher name="request"
src="org.apache.cocoon.matching.RequestParamMatcher"/>
</map:matchers>
<map:actions>
@@ -97,6 +96,8 @@
<map:action name="del-employee"
src="org.apache.cocoon.acting.DatabaseDeleteAction"/>
<map:action name="upd-employee"
src="org.apache.cocoon.acting.DatabaseUpdateAction"/>
<map:action name="lang-select" src="org.apache.cocoon.acting.LangSelect"/>
+ <map:action name="locale" src="org.apache.cocoon.acting.LocaleAction"/>
+ <map:action name="request" src="org.apache.cocoon.acting.RequestParamAction"/>
</map:actions>
</map:components>
@@ -230,6 +231,12 @@
<map:generate src="docs/samples/hello-page.xml"/>
<map:transform src="stylesheets/page/simple-page2fo.xsl"/>
<map:serialize type="fo2pdf"/>
+ </map:match>
+
+ <map:match pattern="redirect">
+ <map:act type="request">
+ <map:redirect-to uri="{dest}"/>
+ </map:act>
</map:match>
<!-- ================ Sites =========================== -->
1.4 +3 -0 xml-cocoon2/webapp/docs/samples/samples.xml
Index: samples.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/webapp/docs/samples/samples.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- samples.xml 2001/05/23 09:40:55 1.3
+++ samples.xml 2001/07/06 21:35:05 1.4
@@ -112,6 +112,9 @@
<sample name="Velocity Generator" href="templates/hello-page.vm">
An example of the VelocityGenerator producing XML out of a Velocity Template.
</sample>
+ <sample name="Parameterised Redirect"
href="redirect?dest=http://xml.apache.org/";>
+ An example of redirecting a client based on a request parameter.
+ </sample>
</group>
<group name="Web Applications">
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
