[seam-commits] Seam SVN: r8507 - trunk/src/mail/org/jboss/seam/mail/ui and 1 other directory.

[seam-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2008-07-28 08:14:28 -0400 (Mon, 28 Jul 2008)
New Revision: 8507

Modified:
   branches/Seam_2_0/src/mail/org/jboss/seam/mail/ui/UIMessage.java
   trunk/src/mail/org/jboss/seam/mail/ui/UIMessage.java
Log:
Revert r8358, r8359, JBSEAM-3083

Modified: branches/Seam_2_0/src/mail/org/jboss/seam/mail/ui/UIMessage.java
===================================================================
--- branches/Seam_2_0/src/mail/org/jboss/seam/mail/ui/UIMessage.java	2008-07-28 12:07:03 UTC (rev 8506)
+++ branches/Seam_2_0/src/mail/org/jboss/seam/mail/ui/UIMessage.java	2008-07-28 12:14:28 UTC (rev 8507)
@@ -84,8 +84,8 @@
    @Override
    public void encodeBegin(FacesContext context) throws IOException
    {
-      String contextPathOverride = getUrlBase();
-      MailFacesContextImpl.start(contextPathOverride == null ? context.getExternalContext().getRequestContextPath() : contextPathOverride);
+      MailFacesContextImpl.start(getUrlBase()
+                  + context.getExternalContext().getRequestContextPath() == null ? "" : context.getExternalContext().getRequestContextPath());
       mimeMessage = null;
       try
       {
@@ -228,7 +228,7 @@
    {
       if (urlBase == null)
       {
-         return getString("urlBase");
+         return urlBase;
       }
       else
       {

Modified: trunk/src/mail/org/jboss/seam/mail/ui/UIMessage.java
===================================================================
--- trunk/src/mail/org/jboss/seam/mail/ui/UIMessage.java	2008-07-28 12:07:03 UTC (rev 8506)
+++ trunk/src/mail/org/jboss/seam/mail/ui/UIMessage.java	2008-07-28 12:14:28 UTC (rev 8507)
@@ -109,8 +109,8 @@
    @Override
    public void encodeBegin(FacesContext context) throws IOException
    {
-      String contextPathOverride = getUrlBase();
-      MailFacesContextImpl.start(contextPathOverride == null ? context.getExternalContext().getRequestContextPath() : contextPathOverride);
+      MailFacesContextImpl.start(getUrlBase()
+                  + context.getExternalContext().getRequestContextPath() == null ? "" : context.getExternalContext().getRequestContextPath());
       mimeMessage = null;
       try
       {
@@ -253,7 +253,7 @@
    {
       if (urlBase == null)
       {
-         return getString("urlBase");
+         return urlBase;
       }
       else
       {