portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From morci...@apache.org
Subject cvs commit: jakarta-jetspeed/xdocs changes.xml
Date Thu, 17 Apr 2003 15:28:57 GMT
morciuch    2003/04/17 08:28:57

  Modified:    docs/site changes.html
               src/java/org/apache/jetspeed/services/profiler
                        JetspeedProfilerService.java
               src/java/org/apache/jetspeed/services/psmlmanager
                        CastorPsmlManagerService.java
               src/java/org/apache/jetspeed/services/psmlmanager/db
                        DatabasePsmlManagerService.java
               xdocs    changes.xml
  Log:
  More fixes to psml browser for language specific psml, patch by Jeremy Ford (see Bugzilla
bug# 16627).
  
  Revision  Changes    Path
  1.130     +3 -3      jakarta-jetspeed/docs/site/changes.html
  
  Index: changes.html
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/docs/site/changes.html,v
  retrieving revision 1.129
  retrieving revision 1.130
  diff -u -r1.129 -r1.130
  --- changes.html	15 Apr 2003 20:43:01 -0000	1.129
  +++ changes.html	17 Apr 2003 15:28:56 -0000	1.130
  @@ -133,6 +133,9 @@
   </li>
   -->
   <li>
  +  Fix -   Bug # 16627 - 2003/04/17 - Fix to Psml browser error when language specific psml
exists (addition to fixes from 3/25), patch by Jeremy Ford (MO)
  +</li>
  +<li>
     Add -   Bug # 18737 - 2003/04/15 - Added client registry editor, contributed by Jeremy
Ford (MO)
   </li>
   <li>
  @@ -191,9 +194,6 @@
   </li>
   <li>
     Fix -   Bug # 17998 - 2003/03/25 - Fix to allusers.disable option, patch by Shinsuke
Sugaya (MO)
  -</li>
  -<li>
  -  Fix -   Bug # 16627 - 2003/03/25 - Fix to Psml browser error when language specific psml
exists, patch by Jeremy Ford (MO)
   </li>
   <li>
     Fix -   Bug # 17289 - 2003/03/25 - Fixed a minor bug related to the original enhancement
(MO)
  
  
  
  1.48      +13 -17    jakarta-jetspeed/src/java/org/apache/jetspeed/services/profiler/JetspeedProfilerService.java
  
  Index: JetspeedProfilerService.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/profiler/JetspeedProfilerService.java,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- JetspeedProfilerService.java	8 Apr 2003 21:35:30 -0000	1.47
  +++ JetspeedProfilerService.java	17 Apr 2003 15:28:56 -0000	1.48
  @@ -604,21 +604,17 @@
   
           if (language != null)
           {
  -            // dont use locale based fall back
  -            if (language.equals("-1"))
  -            {
  -                return;
  -            }
  -            else
  -            {
  -                profile.setLanguage(language);
  -            }
  +            // dont use locale based fall back            
  +            profile.setLanguage(language);
   
  -            String country = rundata.getParameters().getString(Profiler.PARAM_COUNTRY);
  -            if (country != null)
  -            {
  -                profile.setCountry(country);
  -            }
  +			if(! language.equals("-1"))
  +			{
  +	            String country = rundata.getParameters().getString(Profiler.PARAM_COUNTRY);
  +	            if (country != null)
  +	            {
  +	                profile.setCountry(country);
  +	            }
  +			}
           }
           else
           {
  @@ -738,7 +734,7 @@
               return doc;
   
           // remove country
  -        if (null != locator.getCountry())
  +        if (null != locator.getCountry() && (! locator.getCountry().equals("-1")))
           {
               locator.setCountry(null);
               doc = PsmlManager.getDocument( locator );
  @@ -747,7 +743,7 @@
           }
   
           // remove language
  -        if (null != locator.getLanguage())
  +        if (null != locator.getLanguage() && (! locator.getLanguage().equals("-1")))
           {
               locator.setLanguage(null);
               doc = PsmlManager.getDocument( locator );
  
  
  
  1.39      +5 -5      jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/CastorPsmlManagerService.java
  
  Index: CastorPsmlManagerService.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/CastorPsmlManagerService.java,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- CastorPsmlManagerService.java	4 Mar 2003 00:05:09 -0000	1.38
  +++ CastorPsmlManagerService.java	17 Apr 2003 15:28:57 -0000	1.39
  @@ -1019,13 +1019,13 @@
                   .append(locator.getMediaType());
           }
           // Language
  -        if (null != locator.getLanguage())
  +        if (null != locator.getLanguage() && (! locator.getLanguage().equals("-1")))
           {
               path.append(File.separator)
                   .append(locator.getLanguage());
           }
           // Country
  -        if (null != locator.getCountry())
  +        if (null != locator.getCountry() && (! locator.getCountry().equals("-1")))
           {
               path.append(File.separator)
                   .append(locator.getCountry());
  @@ -1033,10 +1033,10 @@
           // Resource Name
           if (null != locator.getName())
           {
  -            if (!(locator.getName().endsWith(this.DEFAULT_EXT)))
  +            if (!(locator.getName().endsWith(CastorPsmlManagerService.DEFAULT_EXT)))
               {
                   path.append(File.separator)
  -                    .append(locator.getName()).append(this.DEFAULT_EXT);
  +                    .append(locator.getName()).append(CastorPsmlManagerService.DEFAULT_EXT);
               }
               else
               {
  
  
  
  1.32      +3 -3      jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/db/DatabasePsmlManagerService.java
  
  Index: DatabasePsmlManagerService.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/db/DatabasePsmlManagerService.java,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- DatabasePsmlManagerService.java	4 Mar 2003 00:05:09 -0000	1.31
  +++ DatabasePsmlManagerService.java	17 Apr 2003 15:28:57 -0000	1.32
  @@ -427,11 +427,11 @@
               {
                   keybuf.append('$').append("MediaType:").append(mediaType);
               }
  -            if (country != null)
  +            if (country != null && (! country.equals("-1")))
               {
                   keybuf.append('$').append("Country:").append(country);
               }
  -            if (language != null)
  +            if (language != null && (! language.equals("-1")))
               {
                   keybuf.append('$').append("Language:").append(language);
               }
  
  
  
  1.151     +4 -4      jakarta-jetspeed/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/xdocs/changes.xml,v
  retrieving revision 1.150
  retrieving revision 1.151
  diff -u -r1.150 -r1.151
  --- changes.xml	15 Apr 2003 20:43:02 -0000	1.150
  +++ changes.xml	17 Apr 2003 15:28:57 -0000	1.151
  @@ -23,6 +23,9 @@
   </li>
   -->
   <li>
  +  Fix -   Bug # 16627 - 2003/04/17 - Fix to Psml browser error when language specific psml
exists (addition to fixes from 3/25), patch by Jeremy Ford (MO)
  +</li>
  +<li>
     Add -   Bug # 18737 - 2003/04/15 - Added client registry editor, contributed by Jeremy
Ford (MO)
   </li>
   <li>
  @@ -81,9 +84,6 @@
   </li>
   <li>
     Fix -   Bug # 17998 - 2003/03/25 - Fix to allusers.disable option, patch by Shinsuke
Sugaya (MO)
  -</li>
  -<li>
  -  Fix -   Bug # 16627 - 2003/03/25 - Fix to Psml browser error when language specific psml
exists, patch by Jeremy Ford (MO)
   </li>
   <li>
     Fix -   Bug # 17289 - 2003/03/25 - Fixed a minor bug related to the original enhancement
(MO)
  
  
  

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


Mime
View raw message