Scarab commit: svn commit: r11278 - branches/scarab_11079_legacy_with_ant_maven1/src: conf/classes java/org/tigris/scarab/actions java/org/tigris/scarab/services/email java/org/tigris/scarab/tools/localization

Author: dabbous
Date: 2012-06-08 06:09:57-0700
New Revision: 11278

Modified:
   branches/scarab_11079_legacy_with_ant_maven1/src/conf/classes/ScarabBund=
le_de.properties
   branches/scarab_11079_legacy_with_ant_maven1/src/conf/classes/ScarabBund=
le_en.properties
   branches/scarab_11079_legacy_with_ant_maven1/src/java/org/tigris/scarab/=
actions/Register.java
   branches/scarab_11079_legacy_with_ant_maven1/src/java/org/tigris/scarab/=
services/email/TemplateHtmlEmail.java
   branches/scarab_11079_legacy_with_ant_maven1/src/java/org/tigris/scarab/=
tools/localization/L10NKeySet.java

Log:
fix issues when email host unavailable during registration

Modified: branches/scarab_11079_legacy_with_ant_maven1/src/conf/classes/Sca=
rabBundle_de.properties
Url: http://scarab.tigris.org/source/browse/scarab/branches/scarab_11079_le=
gacy_with_ant_maven1/src/conf/classes/ScarabBundle_de.properties?view=3Ddif=
f&pathrev=3D11278&r1=3D11277&r2=3D11278
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/scarab_11079_legacy_with_ant_maven1/src/conf/classes/ScarabBun=
dle_de.properties=09(original)
+++ branches/scarab_11079_legacy_with_ant_maven1/src/conf/classes/ScarabBun=
dle_de.properties=092012-06-08 06:09:57-0700
@@ -362,6 +362,7 @@
 AccountConfirmedSuccess=3DIhr Zugang ist best=C3=A4tigt. Herzlich Willkomm=
en bei Scarab! Bitte melden Sie sich jetzt an.
 AccountConfirmedFailure=3DIhre Zugangsdaten konnten nicht gepr=C3=BCft wer=
den. Bei Ihrer Registrierung ist ein Fehler aufgetreten.
 InvalidConfirmationCode=3DDieser Benutzername und/oder Best=C3=A4tigungsco=
de ist/sind ung=C3=BCltig.
+CanNotConvertUserName=3DDer Benutzername "{0}" kann nicht angelegt werden =
(Bitte melden).
 InvalidUsername=3DDer Benutzername "{0}" ist ung=C3=BCltig.
 ConfirmationCodeSent=3DBest=C3=A4tigungscode gesendet!
 ForgotPasswordEmailSubject=3DScarab Benutzer-Kennwort
@@ -1214,7 +1215,7 @@
 MoreInformationWasRequired=3DEs sind mehr Informationen erforderlich, um I=
hre Anfrage zu bearbeiten. Um die Fehlermeldungen zu sehen, bl=C3=A4ttern S=
ie bitte nach unten.
 YouDoNotHavePermissionToAction=3DSie haben keine Berechtigung, um diese Ak=
tion auszuf=C3=BChren.
 YourChangesWereSaved=3DIhre =C3=84nderungen wurden gespeichert.
-CouldNotSendEmail=3DAufgrund eines Mailserver-Problems konnte keine E-Mail=
-Benachrichtigung versendet werden: {0}.
+CouldNotSendEmail=3DEs konnte keine E-Mail-Benachrichtigung versendet werd=
en:\nGrund: {0}.
 CouldNotSendEmail2=3D{0} Aber wegen eines Mailserver-Problems konnte keine=
 E-Mail-Benachrichtigung versendet werden: {1}.
=20
 ## GlobalArtifactTypeCreate

Modified: branches/scarab_11079_legacy_with_ant_maven1/src/conf/classes/Sca=
rabBundle_en.properties
Url: http://scarab.tigris.org/source/browse/scarab/branches/scarab_11079_le=
gacy_with_ant_maven1/src/conf/classes/ScarabBundle_en.properties?view=3Ddif=
f&pathrev=3D11278&r1=3D11277&r2=3D11278
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/scarab_11079_legacy_with_ant_maven1/src/conf/classes/ScarabBun=
dle_en.properties=09(original)
+++ branches/scarab_11079_legacy_with_ant_maven1/src/conf/classes/ScarabBun=
dle_en.properties=092012-06-08 06:09:57-0700
@@ -387,6 +387,7 @@
 AccountConfirmedSuccess=3DYour account has been confirmed. Welcome to Scar=
ab! Please login now.
 AccountConfirmedFailure=3DYour account has not been confirmed. There has b=
een an error.
 InvalidConfirmationCode=3DSorry, that user name and/or confirmation code i=
s invalid.
+CanNotConvertUserName=3DThe username "{0}" can not be used as a valid User=
name (please report this).
 InvalidUsername=3DThe username "{0}" is invalid.
 ConfirmationCodeSent=3DConfirmation code sent!
 ForgotPasswordEmailSubject=3DScarab account password
@@ -1281,7 +1282,7 @@
 MoreInformationWasRequired=3DMore information was required to submit your =
request. Please scroll down to see error messages.
 YouDoNotHavePermissionToAction=3DYou do not have permission to perform thi=
s action.
 YourChangesWereSaved=3DYour changes were saved.
-CouldNotSendEmail=3DCould not send notification email due to following mai=
l server error: {0}.
+CouldNotSendEmail=3DCould not send notification email:\nReason {0}.
 CouldNotSendEmail2=3D{0}, but could not send notification email due to fol=
lowing mail server error: {1}.
=20
 ## GlobalArtifactTypeCreate

Modified: branches/scarab_11079_legacy_with_ant_maven1/src/java/org/tigris/=
scarab/actions/Register.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/scarab_11079_le=
gacy_with_ant_maven1/src/java/org/tigris/scarab/actions/Register.java?view=
=3Ddiff&pathrev=3D11278&r1=3D11277&r2=3D11278
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/scarab_11079_legacy_with_ant_maven1/src/java/org/tigris/scarab=
/actions/Register.java=09(original)
+++ branches/scarab_11079_legacy_with_ant_maven1/src/java/org/tigris/scarab=
/actions/Register.java=092012-06-08 06:09:57-0700
@@ -135,9 +135,18 @@
     {
         String nextTemplate =3D getNextTemplate(data);
         ScarabRequestTool scarabR =3D getScarabRequestTool(context);
-       =20
-        ScarabUser su =3D (ScarabUser) data.getUser()
-            .getTemp(ScarabConstants.SESSION_REGISTER);
+        ScarabUser su =3D null;
+
+        try
+        {
+            su =3D (ScarabUser) data.getUser().getTemp(ScarabConstants.SES=
SION_REGISTER);
+        }
+        catch (java.lang.ClassCastException cce)
+        {
+            su =3D null;
+            L10NMessage l10nMessage =3D new L10NMessage(L10NKeySet.CanNotC=
onvertUserName, data.getUser().toString());
+            scarabR.setAlertMessage(l10nMessage);
+        }
=20
         if (su =3D=3D null)
         {
@@ -169,9 +178,28 @@
             }
         }
         data.getUser().setTemp(ScarabConstants.SESSION_REGISTER, null);
-       scarabR.setUser(su);
-        sendConfirmationEmail(su, context);
-
+        scarabR.setUser(su);
+        try
+        {
+           sendConfirmationEmail(su, context);
+        }
+        catch(Exception e)
+        {
+            Throwable th =3D e.getCause();
+            String msg =3D null;
+            if(th !=3D null)
+            {
+                msg =3D th.getMessage();
+            }
+            if(msg =3D=3D null)
+            {
+                msg =3D e.getMessage();
+            }
+            L10NMessage l10nMessage =3D new L10NMessage(L10NKeySet.CouldNo=
tSendEmail, msg);
+            scarabR.setAlertMessage(l10nMessage);
+            setTarget(data, "Register.vm");
+            return;
+        }
         setTarget(data, nextTemplate);
     }
=20

Modified: branches/scarab_11079_legacy_with_ant_maven1/src/java/org/tigris/=
scarab/services/email/TemplateHtmlEmail.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/scarab_11079_le=
gacy_with_ant_maven1/src/java/org/tigris/scarab/services/email/TemplateHtml=
Email.java?view=3Ddiff&pathrev=3D11278&r1=3D11277&r2=3D11278
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/scarab_11079_legacy_with_ant_maven1/src/java/org/tigris/scarab=
/services/email/TemplateHtmlEmail.java=09(original)
+++ branches/scarab_11079_legacy_with_ant_maven1/src/java/org/tigris/scarab=
/services/email/TemplateHtmlEmail.java=092012-06-08 06:09:57-0700
@@ -399,7 +399,20 @@
             {
                 keystring =3D keys[i].toString();
                 val =3D context.get(keystring);
-                log.info("    " + keystring + "=3D" + ((val=3D=3Dnull)? "n=
ull (no value in context)":val.toString()) );                =20
+                String msg =3D "null (no value in context)";
+                if (val !=3D null)
+                {
+                    try
+                    {
+                        msg =3D val.toString();
+                    }
+                    catch (Exception ex)
+                    {
+                        // ignore conversion exception
+                        msg =3D " not convertable to String value ("+ex.ge=
tMessage()+")";
+                    }
+                }
+                log.info("    " + keystring + "=3D" + msg );              =
  =20
             }
         }
         catch(Exception ex)

Modified: branches/scarab_11079_legacy_with_ant_maven1/src/java/org/tigris/=
scarab/tools/localization/L10NKeySet.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/scarab_11079_le=
gacy_with_ant_maven1/src/java/org/tigris/scarab/tools/localization/L10NKeyS=
et.java?view=3Ddiff&pathrev=3D11278&r1=3D11277&r2=3D11278
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/scarab_11079_legacy_with_ant_maven1/src/java/org/tigris/scarab=
/tools/localization/L10NKeySet.java=09(original)
+++ branches/scarab_11079_legacy_with_ant_maven1/src/java/org/tigris/scarab=
/tools/localization/L10NKeySet.java=092012-06-08 06:09:57-0700
@@ -371,6 +371,7 @@
     public static final LocalizationKey PasswordChanged =3D new L10NKey("P=
asswordChanged");
     public static final LocalizationKey PasswordResetMessage =3D new L10NK=
ey("PasswordResetMessage");
     public static final LocalizationKey InvalidConfirmationCode =3D new L1=
0NKey("InvalidConfirmationCode");
+    public static final LocalizationKey CanNotConvertUserName =3D new L10N=
Key("CanNotConvertUserName");
     public static final LocalizationKey NoAttributesSelected =3D new L10NK=
ey("NoAttributesSelected");
     public static final LocalizationKey DuplicateTemplateName =3D new L10N=
Key("DuplicateTemplateName");
     public static final LocalizationKey CommentAdded =3D new L10NKey("Comm=
entAdded");

------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3D3577&dsMessageId=3D2=
969794