cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vgritse...@apache.org
Subject svn commit: rev 36519 - in cocoon/trunk: . src/java/org/apache/cocoon/matching src/webapp
Date Tue, 17 Aug 2004 12:18:44 GMT
Author: vgritsenko
Date: Tue Aug 17 05:18:43 2004
New Revision: 36519

Added:
   cocoon/trunk/src/java/org/apache/cocoon/matching/LocaleMatcher.java
      - copied, changed from rev 36515, cocoon/trunk/src/java/org/apache/cocoon/matching/I18nMatcher.java
Removed:
   cocoon/trunk/src/java/org/apache/cocoon/matching/I18nMatcher.java
Modified:
   cocoon/trunk/src/webapp/sitemap.xmap
   cocoon/trunk/status.xml
Log:
Rename I18nMatcher to LocaleMatcher


Copied: cocoon/trunk/src/java/org/apache/cocoon/matching/LocaleMatcher.java (from rev 36515,
cocoon/trunk/src/java/org/apache/cocoon/matching/I18nMatcher.java)
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/matching/I18nMatcher.java	(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/matching/LocaleMatcher.java	Tue Aug 17 05:18:43
2004
@@ -46,7 +46,7 @@
  * sitemap) is given below. This configuration shows default values.
  * </p>
  * <pre>
- *   &lt;map:matcher name="i18n" src="org.apache.cocoon.matching.I18nMatcher"&gt;
+ *   &lt;map:matcher name="i18n" src="org.apache.cocoon.matching.LocaleMatcher"&gt;
  *     &lt;locale-attribute&gt;locale&lt;/locale-attribute&gt;
  *     &lt;negotiate&gt;false&lt;/negotiate&gt;
  *     &lt;use-locale&gt;true&lt;/use-locale&gt;
@@ -147,7 +147,7 @@
  * @author <a href="mailto:vgritsenko@apache.org">Vadim Gritsenko</a>
  * @version CVS $Id$
  */
-public class I18nMatcher extends AbstractLogEnabled
+public class LocaleMatcher extends AbstractLogEnabled
                          implements Matcher, ThreadSafe, Serviceable, Configurable {
 
     private static final String DEFAULT_LOCALE_ATTRIBUTE = "locale";

Modified: cocoon/trunk/src/webapp/sitemap.xmap
==============================================================================
--- cocoon/trunk/src/webapp/sitemap.xmap	(original)
+++ cocoon/trunk/src/webapp/sitemap.xmap	Tue Aug 17 05:18:43 2004
@@ -243,7 +243,7 @@
     <map:matcher name="mount-table" src="org.apache.cocoon.matching.MountTableMatcher">
       <map:parameter name="ignore-missing-tables" value="true"/>
     </map:matcher>
-    <map:matcher logger="sitemap.matcher.i18n" name="i18n" src="org.apache.cocoon.matching.I18nMatcher">
+    <map:matcher logger="sitemap.matcher.locale" name="locale" src="org.apache.cocoon.matching.LocaleMatcher">
       <!--+
           | Default configuration:
       <locale-attribute>locale</locale-attribute>

Modified: cocoon/trunk/status.xml
==============================================================================
--- cocoon/trunk/status.xml	(original)
+++ cocoon/trunk/status.xml	Tue Aug 17 05:18:43 2004
@@ -217,14 +217,14 @@
      XMLDB Block: Add ability to delete collections with XMLDBTransformer.
    </action>
    <action dev="VG" type="update">
-     Reworked LocaleAction and I18nMatcher to have similar logic and
+     Reworked LocaleAction and LocaleMatcher to have similar logic and
      configuration.
      <br/><strong>NOTE:</strong> Sitemap variable "lang" renamed to
      "language", removed configuration parameters: "language-attribute",
      "country-attribute", "variant-attribute".
    </action>
    <action dev="UV" type="add">
-     Added I18nMatcher for file based internationalization.
+     Added LocaleMatcher for file based internationalization.
    </action>
    <action dev="CZ" type="fix" fixes-bug="27260">
      Make implementation of Cocoon protocol compliant with the Source interface.

Mime
View raw message