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/src/java/org/apache/jetspeed/util/template JetspeedTool.java
Date Wed, 09 Jul 2003 16:23:45 GMT
morciuch    2003/07/09 09:23:44

  Modified:    src/java/org/apache/jetspeed/modules/actions
                        ChangePassword.java CreateNewUserAndConfirm.java
                        JLoginUser.java SendConfirmationEmail.java
                        SendNewUserNotificationEmail.java
                        UpdateAccount.java
               src/java/org/apache/jetspeed/modules/actions/controllers
                        MultiColumnControllerAction.java
               src/java/org/apache/jetspeed/modules/actions/portlets
                        CustomizeSetAction.java
               src/java/org/apache/jetspeed/modules/parameters
                        RegistryEntryListBox.java
               src/java/org/apache/jetspeed/portal BasePortletSet.java
               src/java/org/apache/jetspeed/portal/security/portlets
                        PortletWrapper.java
               src/java/org/apache/jetspeed/util/template JetspeedTool.java
  Log:
  Properly localized messages in affected modules (see Bugzilla bug# 19863).
  
  Revision  Changes    Path
  1.5       +7 -7      jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/ChangePassword.java
  
  Index: ChangePassword.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/ChangePassword.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ChangePassword.java	17 Jan 2003 21:30:37 -0000	1.4
  +++ ChangePassword.java	9 Jul 2003 16:23:41 -0000	1.5
  @@ -1,7 +1,7 @@
   /* ====================================================================
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -80,7 +80,7 @@
       public void doPerform(RunData rundata) throws Exception
       {
   
  -        String cancelBtn = rundata.getParameters().getString(Localization.getString("PASSWORDFORM_CANCEL"));
  +        String cancelBtn = rundata.getParameters().getString(Localization.getString(rundata,
"PASSWORDFORM_CANCEL"));
           String username  = rundata.getParameters().getString("username" , "");
           String oldPassword  = JetspeedSecurity.convertPassword(rundata.getParameters().getString("old_password"
, ""));
           String password  = JetspeedSecurity.convertPassword(rundata.getParameters().getString("password",
""));
  @@ -90,7 +90,7 @@
           //
           // check to see if the Cancel button was pressed.
           // if so, return to default portal page
  -        if (cancelBtn != null && cancelBtn.equalsIgnoreCase(Localization.getString("PASSWORDFORM_CANCEL")))
  +        if (cancelBtn != null && cancelBtn.equalsIgnoreCase(Localization.getString(rundata,
"PASSWORDFORM_CANCEL")))
           {
               return;
           }
  @@ -104,21 +104,21 @@
   
               if (!password.equals(password2))
               {
  -                rundata.setMessage(Localization.getString("UPDATEACCOUNT_PWNOTMATCH"));
  +                rundata.setMessage(Localization.getString(rundata, "UPDATEACCOUNT_PWNOTMATCH"));
                   rundata.setScreenTemplate(returnTemplate);
                   return;
               }
   
               if (password.equals(oldPassword))
               {
  -                rundata.setMessage(Localization.getString("PASSWORDFORM_THESAME_MSG"));
  +                rundata.setMessage(Localization.getString(rundata, "PASSWORDFORM_THESAME_MSG"));
                   rundata.setScreenTemplate(returnTemplate);
                   return;
               }
   
               // Change the password
               JetspeedSecurity.changePassword(user, oldPassword, password);
  -            rundata.setMessage(Localization.getString("PASSWORDFORM_DONE"));
  +            rundata.setMessage(Localization.getString(rundata, "PASSWORDFORM_DONE"));
   
               // Login again
               rundata.getParameters().setString("username", username);
  
  
  
  1.36      +7 -7      jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/CreateNewUserAndConfirm.java
  
  Index: CreateNewUserAndConfirm.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/CreateNewUserAndConfirm.java,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- CreateNewUserAndConfirm.java	4 Mar 2003 00:04:52 -0000	1.35
  +++ CreateNewUserAndConfirm.java	9 Jul 2003 16:23:42 -0000	1.36
  @@ -1,7 +1,7 @@
   /* ====================================================================
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -124,7 +124,7 @@
               if ( (pass1.length() == 0 || pass2.length() == 0 )
                   || ! pass1.equals ( pass2 ) )
               {
  -                data.setMessage(Localization.getString("CREATENEWUSERANDCONFIRM_PWNOTMATCH"));
  +                data.setMessage(Localization.getString(data, "CREATENEWUSERANDCONFIRM_PWNOTMATCH"));
                   data.setScreenTemplate("NewAccount");
                   return;
               }
  @@ -139,7 +139,7 @@
               // make sure the username exists
               if ( username.length() == 0 )
               {
  -                data.setMessage(Localization.getString("CREATENEWUSERANDCONFIRM_NOUSERNAME"));
  +                data.setMessage(Localization.getString(data, "CREATENEWUSERANDCONFIRM_NOUSERNAME"));
                   data.setScreenTemplate("NewAccount");
                   return;
               }
  @@ -148,12 +148,12 @@
               // make sure the email exists
               if ( email.length() == 0 )
               {
  -                data.setMessage(Localization.getString("CREATENEWUSERANDCONFIRM_NOEMAIL"));
  +                data.setMessage(Localization.getString(data, "CREATENEWUSERANDCONFIRM_NOEMAIL"));
                   data.setScreenTemplate("NewAccount");
                   return;
               }
   
  -            String CHNAME = Localization.getString("CREATENEWUSERANDCONFIRM_DUPLICATEMSG");
  +            String CHNAME = Localization.getString(data, "CREATENEWUSERANDCONFIRM_DUPLICATEMSG");
   
               boolean accountExists = true;
               try
  @@ -205,7 +205,7 @@
                     user.setHasLoggedIn(new Boolean (true));
                     user.setLastLogin(new Date(0));
                   }
  -                data.setMessage(Localization.getString("CREATENEWUSERANDCONFIRM_CREATE"));
  +                data.setMessage(Localization.getString(data, "CREATENEWUSERANDCONFIRM_CREATE"));
                   if (enableMail || newUserNotification || newUserApproval)
                   {
                       data.setUser(JetspeedSecurity.getAnonymousUser());
  @@ -235,7 +235,7 @@
               }
               else // username exists. show the screen again.
               {
  -                data.setMessage(Localization.getString("CREATENEWUSERANDCONFIRM_CHOOSENEWNAME"));
  +                data.setMessage(Localization.getString(data, "CREATENEWUSERANDCONFIRM_CHOOSENEWNAME"));
                   data.setScreenTemplate("NewAccount");
                   // set the username to be the CHNAME string so that it is
                   // clear that this needs to be replaced
  
  
  
  1.35      +15 -15    jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/JLoginUser.java
  
  Index: JLoginUser.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/JLoginUser.java,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- JLoginUser.java	19 Jun 2003 23:28:20 -0000	1.34
  +++ JLoginUser.java	9 Jul 2003 16:23:42 -0000	1.35
  @@ -1,7 +1,7 @@
   /* ====================================================================
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -119,7 +119,7 @@
                   data.setScreenTemplate("LoginHelp");
                   data.setMessage(Localization.getString("JLOGINUSER_PASSWORDREMINDER_INVALIDUSER"));
                   if (Log.getLogger().isDebugEnabled())
  -                    Log.debug(Localization.getString("JLOGINUSER_PASSWORDREMINDER_INVALIDUSER"));
  +                    Log.debug(Localization.getString(rundata, "JLOGINUSER_PASSWORDREMINDER_INVALIDUSER"));
                   return;
               }
   
  @@ -163,13 +163,13 @@
   
               se.send();
   
  -            data.setMessage (Localization.getString("JLOGINUSER_PASSWORDREMINDER_SENT"));
  +            data.setMessage (Localization.getString(rundata, "JLOGINUSER_PASSWORDREMINDER_SENT"));
               Log.info( "Password for user " + user.getUserName() + " was sent to " + user.getEmail());
  -            Log.info(Localization.getString("JLOGINUSER_PASSWORDREMINDER_SENT"));
  +            Log.info(Localization.getString(rundata, "JLOGINUSER_PASSWORDREMINDER_SENT"));
               data.setScreenTemplate("Login");
           } catch ( Exception e ) {
               data.setScreenTemplate("LoginHelp");
  -            String errorTitle = Localization.getString("JLOGINUSER_PASSWORDREMINDER_ERROR")
;
  +            String errorTitle = Localization.getString(rundata, "JLOGINUSER_PASSWORDREMINDER_ERROR")
;
               String errorMessage = errorTitle + e.toString();
   
               Log.warn( errorMessage, e );
  @@ -214,7 +214,7 @@
               {
                   if ( newUserApproval )
                   {
  -                    data.setMessage(Localization.getString("JLOGINUSER_KEYNOTVALID"));
  +                    data.setMessage(Localization.getString(rundata, "JLOGINUSER_KEYNOTVALID"));
                       data.setScreenTemplate("NewUserAwaitingAcceptance");
                       return;
                   }
  @@ -222,13 +222,13 @@
                   {
                     if ( user.getConfirmed().equals(JetspeedResources.CONFIRM_VALUE_REJECTED))
                     {
  -                    data.setMessage(Localization.getString("JLOGINUSER_KEYNOTVALID"));
  +                    data.setMessage(Localization.getString(rundata, "JLOGINUSER_KEYNOTVALID"));
                       data.setScreenTemplate("NewUserRejected");
                       return;
                     }
                     else
                     {
  -                    data.setMessage(Localization.getString("JLOGINUSER_KEYNOTVALID"));
  +                    data.setMessage(Localization.getString(rundata, "JLOGINUSER_KEYNOTVALID"));
                       data.setScreenTemplate("ConfirmRegistration");
                       return;
                     }
  @@ -236,7 +236,7 @@
               }
                
               user.setConfirmed( JetspeedResources.CONFIRM_VALUE );
  -            data.setMessage (Localization.getString("JLOGINUSER_WELCOME"));
  +            data.setMessage (Localization.getString(rundata, "JLOGINUSER_WELCOME"));
           }
           
           JetspeedUser user = null;
  @@ -256,7 +256,7 @@
               if (e instanceof FailedLoginException)
               {
                   Log.info("JLoginUser: Credential Failure on login for user: " + username);
  -                data.setMessage(Localization.getString("PASSWORDFORM_FAILED_MSG"));
  +                data.setMessage(Localization.getString(rundata, "PASSWORDFORM_FAILED_MSG"));
               }
               else if (e instanceof AccountExpiredException)
               {
  @@ -268,7 +268,7 @@
                   data.setScreenTemplate(
                       JetspeedResources.getString(JetspeedResources.CHANGE_PASSWORD_TEMPLATE,
"ChangePassword")
                       );
  -                data.setMessage(Localization.getString("PASSWORDFORM_EXPIRED_MSG"));
  +                data.setMessage(Localization.getString(rundata, "PASSWORDFORM_EXPIRED_MSG"));
                   data.getParameters().setString("username", username);
               } 
   
  @@ -287,7 +287,7 @@
   
           if (user.getDisabled())
           {
  -            data.setMessage(Localization.getString("JLOGINUSER_ACCOUNT_DISABLED"));
  +            data.setMessage(Localization.getString(rundata, "JLOGINUSER_ACCOUNT_DISABLED"));
               data.setScreenTemplate(JetspeedResources.getString("logon.disabled.form"));
               data.getUser().setHasLoggedIn(new Boolean (false) );
               return;
  @@ -308,14 +308,14 @@
               {
                   if (confirmed != null && confirmed.equals(JetspeedResources.CONFIRM_VALUE_REJECTED))
                   {
  -                  data.setMessage(Localization.getString("JLOGINUSER_KEYNOTVALID"));
  +                  data.setMessage(Localization.getString(rundata, "JLOGINUSER_KEYNOTVALID"));
                     data.setScreenTemplate("NewUserRejected");
                     data.getUser().setHasLoggedIn(new Boolean (false) );
                     return;
                   }
                   else
                   {
  -                  data.setMessage(Localization.getString("JLOGINUSER_CONFIRMFIRST"));
  +                  data.setMessage(Localization.getString(rundata, "JLOGINUSER_CONFIRMFIRST"));
                     data.setScreenTemplate("ConfirmRegistration");
                     data.getUser().setHasLoggedIn(new Boolean (false) );
                     return;
  @@ -391,7 +391,7 @@
                   boolean disabled = JetspeedSecurity.checkDisableAccount(data.getParameters().getString("username",
""));
                   if (disabled)
                   {
  -                    data.setMessage(Localization.getString("JLOGINUSER_ACCOUNT_DISABLED"));
  +                    data.setMessage(Localization.getString(rundata, "JLOGINUSER_ACCOUNT_DISABLED"));
                       data.setScreenTemplate(JetspeedResources.getString("logon.disabled.form"));
                       data.getUser().setHasLoggedIn(new Boolean (false) );
                   }
  
  
  
  1.17      +2 -2      jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/SendConfirmationEmail.java
  
  Index: SendConfirmationEmail.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/SendConfirmationEmail.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- SendConfirmationEmail.java	28 Jun 2002 05:37:28 -0000	1.16
  +++ SendConfirmationEmail.java	9 Jul 2003 16:23:42 -0000	1.17
  @@ -1,7 +1,7 @@
   /* ====================================================================
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -120,7 +120,7 @@
   
               se.send();
   
  -            data.setMessage (Localization.getString("SENDCONFIRMATIONEMAIL_SENT"));
  +            data.setMessage (Localization.getString(data, "SENDCONFIRMATIONEMAIL_SENT"));
           }
           catch ( Exception e )
           {
  
  
  
  1.3       +3 -3      jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/SendNewUserNotificationEmail.java
  
  Index: SendNewUserNotificationEmail.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/SendNewUserNotificationEmail.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SendNewUserNotificationEmail.java	28 Jun 2002 05:37:28 -0000	1.2
  +++ SendNewUserNotificationEmail.java	9 Jul 2003 16:23:42 -0000	1.3
  @@ -1,7 +1,7 @@
   /* ====================================================================
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -127,10 +127,10 @@
   
               se.send();
   
  -            data.setMessage (Localization.getString("SENDCONFIRMATIONEMAIL_SENT"));
  +            data.setMessage (Localization.getString(data, "SENDCONFIRMATIONEMAIL_SENT"));
           } catch ( Exception e )
           {
  -            String errorTitle = Localization.getString("SENDCONFIRMATIONEMAIL_ERROR") ;
  +            String errorTitle = Localization.getString(data, "SENDCONFIRMATIONEMAIL_ERROR")
;
               String errorMessage = errorTitle + e.toString();
   
               Log.error( errorMessage );
  
  
  
  1.21      +7 -7      jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/UpdateAccount.java
  
  Index: UpdateAccount.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/UpdateAccount.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- UpdateAccount.java	4 Mar 2003 00:04:52 -0000	1.20
  +++ UpdateAccount.java	9 Jul 2003 16:23:42 -0000	1.21
  @@ -1,7 +1,7 @@
   /* ====================================================================
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -131,7 +131,7 @@
           
           if ( changepass == true && ! password.equals( password2 ) )
           {
  -            data.setMessage(Localization.getString("UPDATEACCOUNT_PWNOTMATCH"));
  +            data.setMessage(Localization.getString(rundata, "UPDATEACCOUNT_PWNOTMATCH"));
               backToEditAccount( data, screenData );
               return;
           }
  @@ -147,7 +147,7 @@
           // make sure the firstname exists
           if ( firstname.length() == 0 )
           {
  -            data.setMessage(Localization.getString("UPDATEACCOUNT_NOFIRSTNAME"));
  +            data.setMessage(Localization.getString(rundata, "UPDATEACCOUNT_NOFIRSTNAME"));
               backToEditAccount( data, screenData );
               return;
           }
  @@ -157,7 +157,7 @@
           // make sure the lastname exists
           if ( lastname.length() == 0 )
           {
  -            data.setMessage(Localization.getString("UPDATEACCOUNT_NOLASTNAME"));
  +            data.setMessage(Localization.getString(rundata, "UPDATEACCOUNT_NOLASTNAME"));
               backToEditAccount( data, screenData );
               return;
           }
  @@ -256,7 +256,7 @@
           // make sure the email exists
           if ( email.length() == 0 )
           {
  -            data.setMessage(Localization.getString("UPDATEACCOUNT_NOEMAIL"));
  +            data.setMessage(Localization.getString(rundata, "UPDATEACCOUNT_NOEMAIL"));
               backToEditAccount( data, screenData );
               return;
           }
  @@ -273,7 +273,7 @@
                   ActionLoader.getInstance().exec(data, "SendConfirmationEmail");
                   // add in the username to the parameters because ConfirmRegistration needs
it
                   data.getParameters().add("username", data.getUser().getUserName() );
  -                data.setMessage(Localization.getString("UPDATEACCOUNT_NEWEMAILCONFIRM"));
  +                data.setMessage(Localization.getString(rundata, "UPDATEACCOUNT_NEWEMAILCONFIRM"));
                   data.setScreenTemplate("ConfirmRegistration");
               }
           else
  @@ -302,7 +302,7 @@
           updateUser(data);
   
           JetspeedSecurity.saveUser( data.getJetspeedUser() );
  -        data.setMessage (Localization.getString("UPDATEACCOUNT_DONE"));
  +        data.setMessage (Localization.getString(rundata, "UPDATEACCOUNT_DONE"));
           
       }
   
  
  
  
  1.28      +3 -3      jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controllers/MultiColumnControllerAction.java
  
  Index: MultiColumnControllerAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controllers/MultiColumnControllerAction.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- MultiColumnControllerAction.java	6 Jun 2003 17:33:03 -0000	1.27
  +++ MultiColumnControllerAction.java	9 Jul 2003 16:23:43 -0000	1.28
  @@ -362,12 +362,12 @@
   
                   if (identityElement instanceof Reference)
                   {
  -                    titles.put(identityElement.getId(), Localization.getString("CUSTOMIZER_REF_DEFAULTTITLE"));
  +                    titles.put(identityElement.getId(), Localization.getString(rundata,
"CUSTOMIZER_REF_DEFAULTTITLE"));
                       continue;
                   }
   
                   // Let's make sure their is a title
  -                titles.put(identityElement.getId(), Localization.getString("CUSTOMIZER_NOTITLESET"));
  +                titles.put(identityElement.getId(), Localization.getString(rundata, "CUSTOMIZER_NOTITLESET"));
               }
           }
   
  
  
  
  1.44      +3 -3      jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/CustomizeSetAction.java
  
  Index: CustomizeSetAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/CustomizeSetAction.java,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- CustomizeSetAction.java	7 Jul 2003 15:21:59 -0000	1.43
  +++ CustomizeSetAction.java	9 Jul 2003 16:23:43 -0000	1.44
  @@ -1,7 +1,7 @@
   /* ====================================================================
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -735,7 +735,7 @@
                   }
                   else
                   {
  -                    String tmpl = Localization.getString("CUSTOMIZER_ADD_REF_ERROR");
  +                    String tmpl = Localization.getString(rundata, "CUSTOMIZER_ADD_REF_ERROR");
                       Object[] args = {
                           refNames[i]
                       };
  
  
  
  1.6       +7 -7      jakarta-jetspeed/src/java/org/apache/jetspeed/modules/parameters/RegistryEntryListBox.java
  
  Index: RegistryEntryListBox.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/parameters/RegistryEntryListBox.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- RegistryEntryListBox.java	11 Apr 2003 15:30:40 -0000	1.5
  +++ RegistryEntryListBox.java	9 Jul 2003 16:23:43 -0000	1.6
  @@ -3,7 +3,7 @@
   /* ====================================================================
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -182,11 +182,11 @@
           String label = null;
           if (regName.equals(Registry.PORTLET))
           {
  -            label = Localization.getString("CUSTOMIZER_PORTLET");        
  +            label = Localization.getString(data, "CUSTOMIZER_PORTLET");        
           }
           else if (regName.equals(Registry.SECURITY))
           {
  -            label = Localization.getString("CUSTOMIZER_SECURITY_REF");
  +            label = Localization.getString(data, "CUSTOMIZER_SECURITY_REF");
   //            SecurityReference defaultRef = PortalToolkit.getDefaultSecurityRef(
   //                ((JetspeedRunData) data).getCustomizedProfile());
   //            if (defaultRef != null)
  @@ -196,15 +196,15 @@
           }
           else if (regName.equals(Registry.MEDIA_TYPE))
           {
  -            label = Localization.getString("CUSTOMIZER_MEDIATYPE");
  +            label = Localization.getString(data, "CUSTOMIZER_MEDIATYPE");
           }
           else if (regName.equals(Registry.PORTLET_CONTROLLER))
           {
  -            label = Localization.getString("CUSTOMIZER_LAYOUT");
  +            label = Localization.getString(data, "CUSTOMIZER_LAYOUT");
           }
           else if (regName.equals(Registry.PORTLET_CONTROL))
           {
  -            label = Localization.getString("CUSTOMIZER_DECORATION");
  +            label = Localization.getString(data, "CUSTOMIZER_DECORATION");
           }
           else if (regName.equals(Registry.CLIENT))
           {
  
  
  
  1.32      +2 -2      jakarta-jetspeed/src/java/org/apache/jetspeed/portal/BasePortletSet.java
  
  Index: BasePortletSet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/BasePortletSet.java,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- BasePortletSet.java	3 Jun 2003 17:10:00 -0000	1.31
  +++ BasePortletSet.java	9 Jul 2003 16:23:43 -0000	1.32
  @@ -361,7 +361,7 @@
               {
                   this.portlets.clear();
               }
  -            return new StringElement(Localization.getString("SECURITY_NO_ACCESS"));
  +            return new StringElement(Localization.getString(rundata, "SECURITY_NO_ACCESS"));
           }
           else
           {
  
  
  
  1.21      +3 -3      jakarta-jetspeed/src/java/org/apache/jetspeed/portal/security/portlets/PortletWrapper.java
  
  Index: PortletWrapper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/security/portlets/PortletWrapper.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- PortletWrapper.java	13 Mar 2003 01:08:11 -0000	1.20
  +++ PortletWrapper.java	9 Jul 2003 16:23:43 -0000	1.21
  @@ -1,7 +1,7 @@
   /* ====================================================================
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -160,7 +160,7 @@
               {
                   PortletStats.logAccess(rundata, this, PortletStats.ACCESS_DENIED);
               }
  -            return new JetspeedClearElement(Localization.getString("SECURITY_NO_ACCESS_TO_PORTLET"));
  +            return new JetspeedClearElement(Localization.getString(rundata, "SECURITY_NO_ACCESS_TO_PORTLET"));
           }
       }
   
  
  
  
  1.35      +2 -2      jakarta-jetspeed/src/java/org/apache/jetspeed/util/template/JetspeedTool.java
  
  Index: JetspeedTool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/util/template/JetspeedTool.java,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- JetspeedTool.java	19 Jun 2003 19:19:32 -0000	1.34
  +++ JetspeedTool.java	9 Jul 2003 16:23:44 -0000	1.35
  @@ -633,7 +633,7 @@
               }
               else
               {
  -                result = new JetspeedClearElement(Localization.getString("SECURITY_NO_ACCESS_TO_PORTLET"));
  +                result = new JetspeedClearElement(Localization.getString(data, "SECURITY_NO_ACCESS_TO_PORTLET"));
               }
           } 
           catch (Exception e) 
  
  
  

---------------------------------------------------------------------
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