Return-Path: 
 <scm-return-48847-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
X-Original-To: apmail-geronimo-scm-archive@www.apache.org
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 4F1D7970A
	for <apmail-geronimo-scm-archive@www.apache.org>;
 Thu, 26 Jul 2012 13:36:05 +0000 (UTC)
Received: (qmail 40637 invoked by uid 500); 26 Jul 2012 13:27:10 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 4661 invoked by uid 500); 26 Jul 2012 13:26:16 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 22219 invoked by uid 99); 26 Jul 2012 06:45:33 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Jul 2012 06:45:33 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Jul 2012 06:45:32 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id C26EF238890D;
	Thu, 26 Jul 2012 06:44:48 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1365891 -
 /geronimo/server/branches/3.0/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp
Date: Thu, 26 Jul 2012 06:44:48 -0000
To: scm@geronimo.apache.org
From: genspring@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120726064448.C26EF238890D@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: genspring
Date: Thu Jul 26 06:44:48 2012
New Revision: 1365891

URL: http://svn.apache.org/viewvc?rev=1365891&view=rev
Log:
GERONIMO-5729 Access the wrong web console page should get appropriate error message, patch from Shenghao Fang

Modified:
    geronimo/server/branches/3.0/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp

Modified: geronimo/server/branches/3.0/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp?rev=1365891&r1=1365890&r2=1365891&view=diff
==============================================================================
--- geronimo/server/branches/3.0/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp (original)
+++ geronimo/server/branches/3.0/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp Thu Jul 26 06:44:48 2012
@@ -20,6 +20,11 @@
 <fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
 
+<script language="javascript">
+    if (window.top == window.self) {
+        window.location="/console/portal/0/Welcome?noxssShowTree=true";
+    }
+</script>
 
 <table style="width:100%" cellpadding="10"> <!-- an IE rendering fix -->
     <tr>