From fe1beac6f0b4d7f7feacf73df140d62b27ba4c96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mert=20C=CC=A7ALIS=CC=A7KAN?= <mert@t2.com.tr>
Date: Thu, 6 Jul 2017 08:31:39 +0300
Subject: [PATCH] 
 PAYARA-1832-Add-link-to-Notification-service-configuration-page-from-other-services-in-Admin-Console

---
 .../admingui/healthcheck/Strings.properties   |  4 +
 .../healthcheck/healthcheckConfiguration.jsf  | 90 ++++++++++---------
 .../payara/admingui/extras/Strings.properties |  7 +-
 .../requestTracing/requestTracing.jsf         | 15 +++-
 4 files changed, 72 insertions(+), 44 deletions(-)

diff --git a/appserver/admingui/healthcheck-service-console-plugin/src/main/resources/fish/payara/admingui/healthcheck/Strings.properties b/appserver/admingui/healthcheck-service-console-plugin/src/main/resources/fish/payara/admingui/healthcheck/Strings.properties
index 4726f9adc8a..f67faad1c2f 100644
--- a/appserver/admingui/healthcheck-service-console-plugin/src/main/resources/fish/payara/admingui/healthcheck/Strings.properties
+++ b/appserver/admingui/healthcheck-service-console-plugin/src/main/resources/fish/payara/admingui/healthcheck/Strings.properties
@@ -89,6 +89,10 @@ healthcheck.historic.table.empty=No Historic Healthchecks
 healthcheck.historic.table.headings.dateTime=Time
 healthcheck.historic.table.headings.message=Message
 
+healthcheck.link.to.notification.page.text.prefix=Selected Notifiers need to be enabled also in the
+healthcheck.link.to.notification.page.text=Notification Service
+healthcheck.link.to.notification.page.text.suffix=to receive notifications.
+
 healthcheck.checker.configuration.cpuUsage.pageTitle=CPU Usage
 healthcheck.checker.configuration.cpuUsage.pageTitleHelpText=Configuration options for the CPU Usage Healthcheck.
 
diff --git a/appserver/admingui/healthcheck-service-console-plugin/src/main/resources/healthcheck/healthcheckConfiguration.jsf b/appserver/admingui/healthcheck-service-console-plugin/src/main/resources/healthcheck/healthcheckConfiguration.jsf
index b64a1fe49bc..5a87373374d 100644
--- a/appserver/admingui/healthcheck-service-console-plugin/src/main/resources/healthcheck/healthcheckConfiguration.jsf
+++ b/appserver/admingui/healthcheck-service-console-plugin/src/main/resources/healthcheck/healthcheckConfiguration.jsf
@@ -1,42 +1,42 @@
 <!--
 
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
- Copyright (c) 2017 Payara Foundation and/or its affiliatess. 
- All rights reserved.
-
- The contents of this file are subject to the terms of either the GNU
- General Public License Version 2 only ("GPL") or the Common Development
- and Distribution License("CDDL") (collectively, the "License").  You
- may not use this file except in compliance with the License.  You can
- obtain a copy of the License at
- https://github.com/payara/Payara/blob/master/LICENSE.txt
- See the License for the specific
- language governing permissions and limitations under the License.
-
- When distributing the software, include this License Header Notice in each
- file and include the License file at glassfish/legal/LICENSE.txt.
-
- GPL Classpath Exception:
- The Payara Foundation designates this particular file as subject to the "Classpath"
- exception as provided by the Payara Foundation in the GPL Version 2 section of the License
- file that accompanied this code.
-
- Modifications:
- If applicable, add the following below the License Header, with the fields
- enclosed by brackets [] replaced by your own identifying information:
- Portions Copyright [year] [name of copyright owner]"
- Contributor(s):
- If you wish your version of this file to be governed by only the CDDL or
- only the GPL Version 2, indicate your decision by adding "[Contributor]
- elects to include this software in this distribution under the [CDDL or GPL
- Version 2] license."  If you don't indicate a single choice of license, a
- recipient has the option to distribute your version of this file under
- either the CDDL, the GPL Version 2 or to extend the choice of license to
- its licensees as provided above.  However, if you add GPL Version 2 code
- and therefore, elected the GPL Version 2 license, then the option applies
- only if the new code is made subject to such option by the copyright
- holder.
+DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+Copyright (c) [2017] Payara Foundation and/or its affiliates. All rights reserved.
+
+The contents of this file are subject to the terms of either the GNU
+General Public License Version 2 only ("GPL") or the Common Development
+and Distribution License("CDDL") (collectively, the "License").  You
+may not use this file except in compliance with the License.  You can
+obtain a copy of the License at
+https://github.com/payara/Payara/blob/master/LICENSE.txt
+See the License for the specific
+language governing permissions and limitations under the License.
+
+When distributing the software, include this License Header Notice in each
+file and include the License file at glassfish/legal/LICENSE.txt.
+
+GPL Classpath Exception:
+The Payara Foundation designates this particular file as subject to the "Classpath"
+exception as provided by the Payara Foundation in the GPL Version 2 section of the License
+file that accompanied this code.
+
+Modifications:
+If applicable, add the following below the License Header, with the fields
+enclosed by brackets [] replaced by your own identifying information:
+"Portions Copyright [year] [name of copyright owner]"
+
+Contributor(s):
+If you wish your version of this file to be governed by only the CDDL or
+only the GPL Version 2, indicate your decision by adding "[Contributor]
+elects to include this software in this distribution under the [CDDL or GPL
+Version 2] license."  If you don't indicate a single choice of license, a
+recipient has the option to distribute your version of this file under
+either the CDDL, the GPL Version 2 or to extend the choice of license to
+its licensees as provided above.  However, if you add GPL Version 2 code
+and therefore, elected the GPL Version 2 license, then the option applies
+only if the new code is made subject to such option by the copyright
+holder.
 -->
 
 <!initPage
@@ -140,9 +140,19 @@
                 selectedItemsLabel="$resource{i18nhx.healthcheck.configuration.selectedNotifiers}">
             </sun:addRemove>
         </sun:property>
-   </sun:propertySheetSection>
-      
-   <sun:propertySheetSection id="histroic">
+
+        <sun:property>
+            <sun:staticText text="$resource{i18nhx.healthcheck.link.to.notification.page.text.prefix}" />
+            <sun:hyperlink
+                    toolTip="$resource{i18nhx.healthcheck.link.to.notification.page.text}"
+                    url="/payaraExtras/notification/notification.jsf?configName=#{configName}">
+                <sun:staticText text="$resource{i18nhx.healthcheck.link.to.notification.page.text}" />
+            </sun:hyperlink>
+            <sun:staticText text="$resource{i18nhx.healthcheck.link.to.notification.page.text.suffix}" />
+        </sun:property>
+    </sun:propertySheetSection>
+
+   <sun:propertySheetSection id="historic">
      <sun:property>            
         <sun:table id="historicHealthcheckTable" title="$resource{i18nhx.healthcheck.historic.table.name}" >
             <sun:tableRowGroup id="historicHealthcheckRowGroup" data={"$attribute{historic}"} sourceVar="td" 
diff --git a/appserver/admingui/payara-console-extras/src/main/resources/fish/payara/admingui/extras/Strings.properties b/appserver/admingui/payara-console-extras/src/main/resources/fish/payara/admingui/extras/Strings.properties
index cd6e76025a1..aa56585b8bc 100644
--- a/appserver/admingui/payara-console-extras/src/main/resources/fish/payara/admingui/extras/Strings.properties
+++ b/appserver/admingui/payara-console-extras/src/main/resources/fish/payara/admingui/extras/Strings.properties
@@ -1,3 +1,4 @@
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 #
 # Copyright (c) 2016-2017 Payara Foundation and/or its affiliates. All rights reserved.
 #
@@ -160,4 +161,8 @@ requestTracing.configuration.notifier.name=Notifier Service Name
 requestTracing.configuration.notifier.nameHelp=Name of the Notifier Service
 
 requestTracing.configuration.availableNotifiers=Avaliable Notifiers
-requestTracing.configuration.selectedNotifiers=Active Notifiers
\ No newline at end of file
+requestTracing.configuration.selectedNotifiers=Selected Notifiers
+
+requestTracing.link.to.notification.page.text.prefix=Selected Notifiers need to be enabled also in the
+requestTracing.link.to.notification.page.text=Notification Service
+requestTracing.link.to.notification.page.text.suffix=to receive notifications.
\ No newline at end of file
diff --git a/appserver/admingui/payara-console-extras/src/main/resources/requestTracing/requestTracing.jsf b/appserver/admingui/payara-console-extras/src/main/resources/requestTracing/requestTracing.jsf
index ed311f3982f..a003a51b881 100644
--- a/appserver/admingui/payara-console-extras/src/main/resources/requestTracing/requestTracing.jsf
+++ b/appserver/admingui/payara-console-extras/src/main/resources/requestTracing/requestTracing.jsf
@@ -1,8 +1,7 @@
 <!--
+    DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-   Copyright (c) [2016-2017] Payara Foundation and/or its affiliates. All rights reserved.
+    Copyright (c) [2016-2017] Payara Foundation and/or its affiliates. All rights reserved.
 
     The contents of this file are subject to the terms of either the GNU
     General Public License Version 2 only ("GPL") or the Common Development
@@ -138,6 +137,16 @@ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
                 selectedItemsLabel="$resource{i18nrt.requestTracing.configuration.selectedNotifiers}">
             </sun:addRemove>
         </sun:property>
+
+        <sun:property>
+            <sun:staticText text="$resource{i18nrt.requestTracing.link.to.notification.page.text.prefix}" />
+            <sun:hyperlink
+                    toolTip="$resource{i18nrt.requestTracing.link.to.notification.page.text}"
+                    url="/payaraExtras/notification/notification.jsf?configName=#{configName}">
+                <sun:staticText text="$resource{i18nrt.requestTracing.link.to.notification.page.text}" />
+            </sun:hyperlink>
+            <sun:staticText text="$resource{i18nrt.requestTracing.link.to.notification.page.text.suffix}" />
+        </sun:property>
     </sun:propertySheetSection>
 </sun:propertySheet>
 </sun:form>