portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r351839 - in /portals/jetspeed-2/trunk/components: portal/src/java/org/apache/jetspeed/ajax/ profiler/src/java/org/apache/jetspeed/profiler/rules/impl/
Date Fri, 02 Dec 2005 21:21:09 GMT
Author: taylor
Date: Fri Dec  2 13:20:57 2005
New Revision: 351839

URL: http://svn.apache.org/viewcvs?rev=351839&view=rev
Log:
do case conversion in the country code and language resolvers
not in the sitemanager

Modified:
    portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/ajax/AjaxRequestServiceImpl.java
    portals/jetspeed-2/trunk/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/CountryCriterionResolver.java
    portals/jetspeed-2/trunk/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/LanguageCriterionResolver.java

Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/ajax/AjaxRequestServiceImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/ajax/AjaxRequestServiceImpl.java?rev=351839&r1=351838&r2=351839&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/ajax/AjaxRequestServiceImpl.java
(original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/ajax/AjaxRequestServiceImpl.java
Fri Dec  2 13:20:57 2005
@@ -212,7 +212,7 @@
                 // Get the results from the velocity processing
                 String buffer = stringWriter.getBuffer().toString();
 
-                log.debug("output from AjaxService:" + buffer);
+                //log.debug("output from AjaxService:" + buffer);
 
                 // Put the response XML on the response object
                 HttpServletResponse response = requestContext.getResponse();

Modified: portals/jetspeed-2/trunk/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/CountryCriterionResolver.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/CountryCriterionResolver.java?rev=351839&r1=351838&r2=351839&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/CountryCriterionResolver.java
(original)
+++ portals/jetspeed-2/trunk/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/CountryCriterionResolver.java
Fri Dec  2 13:20:57 2005
@@ -41,10 +41,13 @@
         String value = super.resolve(context, criterion);
         if (value != null)
         {
-            return value;
+            return value.toUpperCase();
         }
      
-        return context.getLocale().getCountry();   
+        String country = context.getLocale().getCountry();
+        if (country != null)
+            country = country.toUpperCase();
+        return country;
     }    
     
     /* (non-Javadoc)

Modified: portals/jetspeed-2/trunk/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/LanguageCriterionResolver.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/LanguageCriterionResolver.java?rev=351839&r1=351838&r2=351839&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/LanguageCriterionResolver.java
(original)
+++ portals/jetspeed-2/trunk/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/LanguageCriterionResolver.java
Fri Dec  2 13:20:57 2005
@@ -38,10 +38,13 @@
         String value = super.resolve(context, criterion);
         if (value != null)
         {
-            return value;
+            return value.toLowerCase();
         }
      
-        return context.getLocale().getLanguage();   
+        String language = context.getLocale().getLanguage();
+        if (language != null)
+            language = language.toLowerCase();
+        return language;
     }    
     
     /* (non-Javadoc)



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message