You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by di...@apache.org on 2001/07/06 23:31:22 UTC

cvs commit: xml-cocoon2/webapp/docs/samples samples.xml

dims        01/07/06 14:31:22

  Modified:    src/org/apache/cocoon/acting Tag: cocoon_20_branch
                        LocaleAction.java
               webapp   Tag: cocoon_20_branch sitemap.xmap
               webapp/docs/samples Tag: cocoon_20_branch samples.xml
  Log:
  Contribution and Patches from Marcus Crafter.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.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.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- LocaleAction.java	2001/07/02 19:39:31	1.1.2.1
  +++ LocaleAction.java	2001/07/06 21:31:17	1.1.2.2
  @@ -107,9 +107,9 @@
    *
    * <center>Code originated from org.apache.cocoon.acting.LangSelect</center>
    *
  - * @author: <a href="mailto:Marcus.Crafter@osa.de">Marcus Crafter</a>
  - * @author: <a href="mailto:kpiroumian@flagship.ru">Konstantin Piroumian</a>
  - * @author: <a href="mailto:lassi.immonen@valkeus.com">Lassi Immonen</a>
  + * @author <a href="mailto:Marcus.Crafter@osa.de">Marcus Crafter</a>
  + * @author <a href="mailto:kpiroumian@flagship.ru">Konstantin Piroumian</a>
  + * @author <a href="mailto:lassi.immonen@valkeus.com">Lassi Immonen</a>
    */
   public class LocaleAction extends ComposerAction {
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.11.2.9  +9 -2      xml-cocoon2/webapp/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/webapp/sitemap.xmap,v
  retrieving revision 1.11.2.8
  retrieving revision 1.11.2.9
  diff -u -r1.11.2.8 -r1.11.2.9
  --- sitemap.xmap	2001/07/04 09:19:39	1.11.2.8
  +++ sitemap.xmap	2001/07/06 21:31:19	1.11.2.9
  @@ -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,9 +96,11 @@
      <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>
  +</map:components>
   
   <!-- =========================== Views =================================== -->
   
  @@ -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  =========================== -->
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.3.2.1   +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.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- samples.xml	2001/05/23 09:40:55	1.3
  +++ samples.xml	2001/07/06 21:31:21	1.3.2.1
  @@ -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:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org