Author: degenaro
Date: Tue Jun 7 14:30:41 2016
New Revision: 1747244
URL: http://svn.apache.org/viewvc?rev=1747244&view=rev
Log:
UIMA-4961 DUCC Web Server (WS) main pages should display alerts and/or messages
Added:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/t2-alerts.jsp
(with props)
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/t2-messages.jsp
(with props)
Modified:
uima/sandbox/uima-ducc/trunk/src/main/resources/default.ducc.properties
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesResolver.java
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part4/admin/ducc-properties.tex
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/ducc.css
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/jobs.jsp
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/js/ducc.js
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/reservations.jsp
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/services.jsp
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/system.administration.jsp
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/system.broker.jsp
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/system.classes.jsp
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/system.daemons.jsp
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/system.machines.jsp
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/viz.jsp
Modified:
uima/sandbox/uima-ducc/trunk/src/main/resources/default.ducc.properties
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/resources/default.ducc.properties?rev=1747244&r1=1747243&r2=1747244&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/resources/default.ducc.properties
(original)
+++ uima/sandbox/uima-ducc/trunk/src/main/resources/default.ducc.properties Tue
Jun 7 14:30:41 2016
@@ -208,6 +208,13 @@ ducc.ws.visualization.strip.domain = tru
# Logs are written to DUCC_HOME/logs/webserver
ducc.ws.requestLog.RetainDays = 30
+# --------------------------------------------------------------
+# name: ducc.ws.banner.message
+# purpose: display banner message on all main pages
+# choices: default=none
+# change: effective immediately
+#ducc.ws.banner.message = Do not adjust your set. This is a message from your
DUCC administrator.
+
# ========== Web Server Configuration block ==========
# ========== Job Driver Configuration block ==========
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesResolver.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesResolver.java?rev=1747244&r1=1747243&r2=1747244&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesResolver.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesResolver.java
Tue Jun 7 14:30:41 2016
@@ -158,6 +158,7 @@ public class DuccPropertiesResolver {
public static final String ducc_ws_max_history_entries =
"ducc.ws.max.history.entries";
public static final String ducc_ws_login_enabled = "ducc.ws.login.enabled";
public static final String ducc_ws_bytes_per_page =
"ducc.ws.bytes.per.page";
+ public static final String ducc_ws_banner_message =
"ducc.ws.banner.message";
public static final String ducc_rm_node_stability =
"ducc.rm.node.stability";
public static final String ducc_agent_node_metrics_publish_rate =
"ducc.agent.node.metrics.publish.rate";
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part4/admin/ducc-properties.tex
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part4/admin/ducc-properties.tex?rev=1747244&r1=1747243&r2=1747244&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part4/admin/ducc-properties.tex
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part4/admin/ducc-properties.tex
Tue Jun 7 14:30:41 2016
@@ -545,6 +545,16 @@
\item[Type] Local
\end{description}
+ \item[ducc.ws.banner.message] \hfill \\
+ A message to be displayed under the banner of each main page.
+ Changes are effective immediately.
+ Can be used, for example, to post a notice that the cluster will
+ be down for maintenenace.
+ \begin{description}
+ \item[Default Value] None
+ \item[Type] Local
+ \end{description}
+
\item[ducc.ws.session.minutes] \hfill \\
Once authenticated, this property determines the lifetime of the
authenticated session to the
Web Server.
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java?rev=1747244&r1=1747243&r2=1747244&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
Tue Jun 7 14:30:41 2016
@@ -100,6 +100,7 @@ import org.apache.uima.ducc.ws.MachineIn
import org.apache.uima.ducc.ws.authentication.DuccAsUser;
import org.apache.uima.ducc.ws.authentication.DuccAuthenticator;
import org.apache.uima.ducc.ws.helper.BrokerHelper;
+import org.apache.uima.ducc.ws.helper.DatabaseHelper;
import org.apache.uima.ducc.ws.registry.IServicesRegistry;
import org.apache.uima.ducc.ws.registry.ServiceInterpreter;
import org.apache.uima.ducc.ws.registry.ServiceInterpreter.StartState;
@@ -179,6 +180,8 @@ public class DuccHandler extends DuccAbs
private String duccClusterName =
duccContext+"/cluster-name";
private String duccClusterUtilization =
duccContext+"/cluster-utilization";
private String duccTimeStamp =
duccContext+"/timestamp";
+ private String duccAlerts =
duccContext+"/alerts";
+ private String duccBannerMessage =
duccContext+"/banner-message";
private String duccJobSubmit =
duccContext+"/job-submit-request";
private String duccJobCancel =
duccContext+"/job-cancel-request";
private String duccReservationSubmit =
duccContext+"/reservation-submit-request";
@@ -3691,6 +3694,82 @@ public class DuccHandler extends DuccAbs
duccLogger.trace(methodName, null, messages.fetch("exit"));
}
+ private static BrokerHelper brokerHelper = BrokerHelper.getInstance();
+ private static DatabaseHelper databaseHelper =
DatabaseHelper.getInstance();
+
+ private void addDownDaemon(StringBuffer sb, String name) {
+ if(sb.length() == 0) {
+ sb.append("ALERT - critical component(s) unresponsive:
"+name);
+ }
+ else {
+ sb.append(", "+name);
+ }
+ }
+
+ private void handleDuccServletAlerts(String target,Request
baseRequest,HttpServletRequest request,HttpServletResponse response)
+ throws IOException, ServletException
+ {
+ String methodName = "handleDuccServletAlerts";
+ duccLogger.trace(methodName, null, messages.fetch("enter"));
+ StringBuffer sb = new StringBuffer();
+ daemons:
+ for(DaemonName daemonName :
DuccDaemonRuntimeProperties.daemonNames) {
+ switch(daemonName) {
+ case Database:
+ if(databaseHelper.isDisabled()) {
+ continue daemons;
+ }
+ if(!databaseHelper.isAlive()) {
+ addDownDaemon(sb, daemonName.name());
+ }
+ break;
+ case Broker:
+ if(!brokerHelper.isAlive()) {
+ addDownDaemon(sb, daemonName.name());
+ }
+ break;
+ case Orchestrator:
+ case ProcessManager:
+ case ResourceManager:
+ case ServiceManager:
+ long timeout = getMillisMIA(daemonName)/1000;
+ if(timeout > 0) {
+ try {
+ long heartbeatLast =
Long.parseLong(DuccDaemonsData.getInstance().getHeartbeat(daemonName));
+ long overtime = timeout -
heartbeatLast;
+ if(overtime < 0) {
+ addDownDaemon(sb,
daemonName.name());
+ }
+ }
+ catch(Exception e) {
+ addDownDaemon(sb,
daemonName.name());
+ }
+ }
+ break;
+ }
+ }
+ response.getWriter().println(sb);
+ duccLogger.trace(methodName, null, messages.fetch("exit"));
+ }
+
+ private void handleDuccServletBannerMessage(String target,Request
baseRequest,HttpServletRequest request,HttpServletResponse response)
+ throws IOException, ServletException
+ {
+ String methodName = "handleDuccServletBannerMessage";
+ duccLogger.trace(methodName, null, messages.fetch("enter"));
+ StringBuffer sb = new StringBuffer();
+ String key = DuccPropertiesResolver.ducc_ws_banner_message;
+ String value =
DuccPropertiesResolver.getInstance().getFileProperty(key);
+ if(value != null) {
+ String message = value.trim();
+ if(message.length() > 0) {
+ sb.append(message);
+ }
+ }
+ response.getWriter().println(sb);
+ duccLogger.trace(methodName, null, messages.fetch("exit"));
+ }
+
private void handleDuccServletReservationSchedulingClasses(String
target,Request baseRequest,HttpServletRequest request,HttpServletResponse
response)
throws Exception
{
@@ -4704,6 +4783,14 @@ public class DuccHandler extends DuccAbs
handleDuccServletTimeStamp(target, baseRequest,
request, response);
DuccWebUtil.noCache(response);
}
+ else if(reqURI.startsWith(duccAlerts)) {
+ handleDuccServletAlerts(target, baseRequest,
request, response);
+ DuccWebUtil.noCache(response);
+ }
+ else if(reqURI.startsWith(duccBannerMessage)) {
+ handleDuccServletBannerMessage(target,
baseRequest, request, response);
+ DuccWebUtil.noCache(response);
+ }
else if(reqURI.startsWith(duccJobSubmit)) {
duccLogger.info(methodName,
null,"getRequestURI():"+request.getRequestURI());
handleDuccServletJobSubmit(target, baseRequest,
request, response);
Added:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/t2-alerts.jsp
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/%24banner/t2-alerts.jsp?rev=1747244&view=auto
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/t2-alerts.jsp
(added)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/t2-alerts.jsp
Tue Jun 7 14:30:41 2016
@@ -0,0 +1,27 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<div id="alerts_div">
+<table class="flex-heading">
+<tr class="heading-alerts">
+<td align="center">
+<span id="alerts_area">
+</span>
+</td>
+</table>
+</div>
\ No newline at end of file
Propchange:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/t2-alerts.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/t2-alerts.jsp
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/t2-messages.jsp
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/%24banner/t2-messages.jsp?rev=1747244&view=auto
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/t2-messages.jsp
(added)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/t2-messages.jsp
Tue Jun 7 14:30:41 2016
@@ -0,0 +1,27 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<div id="messages_div">
+<table class="flex-heading">
+<tr class="heading-messages">
+<td>
+<span id="messages_area">
+</span>
+</td>
+</table>
+</div>
\ No newline at end of file
Propchange:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/t2-messages.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/t2-messages.jsp
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/ducc.css
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/ducc.css?rev=1747244&r1=1747243&r2=1747244&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/ducc.css
(original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/ducc.css
Tue Jun 7 14:30:41 2016
@@ -178,6 +178,16 @@ tr.heading {
background-color: #ddddff;
}
+tr.heading-alerts {
+ font-weight: bold;
+ color: #ffffff;
+ background-color: #ff0000;
+}
+
+tr.heading-messages {
+ background-color: #ffff00;
+}
+
table.flex-heading {
width: 100%;
}
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/jobs.jsp
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/jobs.jsp?rev=1747244&r1=1747243&r2=1747244&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/jobs.jsp
(original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/jobs.jsp
Tue Jun 7 14:30:41 2016
@@ -98,6 +98,10 @@ if (table_style.equals("scroll")) {
</td>
</table>
<!-- *********************** /table ************************ -->
+<!-- *********************** table ************************* -->
+<%@ include file="$banner/t2-alerts.jsp" %>
+<%@ include file="$banner/t2-messages.jsp" %>
+<!-- *********************** /table ************************ -->
<!-- ####################### /common ####################### -->
<!-- @@@@@@@@@@@@@@@@@@@@@@@ unique @@@@@@@@@@@@@@@@@@@@@@@@ -->
<%
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/js/ducc.js
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/js/ducc.js?rev=1747244&r1=1747243&r2=1747244&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/js/ducc.js
(original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/js/ducc.js
Tue Jun 7 14:30:41 2016
@@ -3204,6 +3204,86 @@ function ducc_refresh(type) {
ducc_console_exit(fname);
}
+var wip_alerts = false;
+
+function ducc_alerts() {
+ var fname = "ducc_alerts";
+ var data = null;
+ if(wip_alerts) {
+ ducc_console_warn(fname+" already in progress...")
+ return;
+ }
+ wip_alerts = true;
+ try {
+ var servlet = "/ducc-servlet/alerts";
+ var tomsecs = ms_timeout;
+ $.ajax({
+ url: servlet,
+ timeout: tomsecs
+ }).done(function(data) {
+ wip_alerts = false;
+ target = "alerts_div";
+ display = "initial";
+ if(data != null) {
+ tdata = data.trim();
+ if(tdata.length == 0) {
+ display = "none";
+ }
+ }
+ document.getElementById(target).style.display = display;
+ $("#alerts_area").html(data);
+ data = null;
+ ducc_console_success(fname);
+ }).fail(function(jqXHR, textStatus) {
+ wip_alerts = false;
+ ducc_console_fail(fname, textStatus);
+ });
+ } catch (err) {
+ wip_alerts = false;
+ ducc_error(fname, err);
+ }
+}
+
+var wip_messages = false;
+
+function ducc_messages() {
+ var fname = "ducc_messages";
+ var data = null;
+ if(wip_messages) {
+ ducc_console_warn(fname+" already in progress...")
+ return;
+ }
+ wip_messages = true;
+ try {
+ var servlet = "/ducc-servlet/banner-message";
+ var tomsecs = ms_timeout;
+ $.ajax({
+ url: servlet,
+ timeout: tomsecs
+ }).done(function(data) {
+ wip_messages = false;
+ target = "messages_div";
+ display = "initial";
+ if(data != null) {
+ tdata = data.trim();
+ if(tdata.length == 0) {
+ display = "none";
+ }
+ }
+ document.getElementById(target).style.display = display;
+ $("#messages_area").html(data);
+ data = null;
+ ducc_console_success(fname);
+ }).fail(function(jqXHR, textStatus) {
+ wip_messages = false;
+ ducc_console_fail(fname, textStatus);
+ });
+ } catch (err) {
+ wip_messages = false;
+ ducc_error(fname, err);
+ }
+}
+
var to_timed_loop = null;
function ducc_timed_loop(type) {
@@ -3211,6 +3291,8 @@ function ducc_timed_loop(type) {
ducc_console_enter(fname);
try {
ducc_cookies();
+ ducc_alerts();
+ ducc_messages();
var refreshmode = ducc_appl("refreshmode");
var c_value = ducc_get_cookie(refreshmode);
if (c_value == null) {
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/reservations.jsp
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/reservations.jsp?rev=1747244&r1=1747243&r2=1747244&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/reservations.jsp
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/reservations.jsp
Tue Jun 7 14:30:41 2016
@@ -96,6 +96,10 @@ if (table_style.equals("scroll")) {
</td>
</table>
<!-- *********************** /table ************************ -->
+<!-- *********************** table ************************* -->
+<%@ include file="$banner/t2-alerts.jsp" %>
+<%@ include file="$banner/t2-messages.jsp" %>
+<!-- *********************** /table ************************ -->
<!-- ####################### /common ####################### -->
<!-- @@@@@@@@@@@@@@@@@@@@@@@ unique @@@@@@@@@@@@@@@@@@@@@@@@ -->
<%
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/services.jsp
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/services.jsp?rev=1747244&r1=1747243&r2=1747244&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/services.jsp
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/services.jsp
Tue Jun 7 14:30:41 2016
@@ -96,6 +96,10 @@ if (table_style.equals("scroll")) {
</td>
</table>
<!-- *********************** /table ************************ -->
+<!-- *********************** table ************************* -->
+<%@ include file="$banner/t2-alerts.jsp" %>
+<%@ include file="$banner/t2-messages.jsp" %>
+<!-- *********************** /table ************************ -->
<!-- ####################### /common ####################### -->
<!-- @@@@@@@@@@@@@@@@@@@@@@@ unique @@@@@@@@@@@@@@@@@@@@@@@@ -->
<%
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/system.administration.jsp
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/system.administration.jsp?rev=1747244&r1=1747243&r2=1747244&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/system.administration.jsp
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/system.administration.jsp
Tue Jun 7 14:30:41 2016
@@ -71,6 +71,10 @@ under the License.
</td>
</table>
<!-- *********************** /table ************************ -->
+<!-- *********************** table ************************* -->
+<%@ include file="$banner/t2-alerts.jsp" %>
+<%@ include file="$banner/t2-messages.jsp" %>
+<!-- *********************** /table ************************ -->
</div>
<!-- ####################### /common ####################### -->
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/system.broker.jsp
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/system.broker.jsp?rev=1747244&r1=1747243&r2=1747244&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/system.broker.jsp
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/system.broker.jsp
Tue Jun 7 14:30:41 2016
@@ -85,6 +85,10 @@ if (table_style.equals("scroll")) {
</td>
</table>
<!-- *********************** /table ************************ -->
+<!-- *********************** table ************************* -->
+<%@ include file="$banner/t2-alerts.jsp" %>
+<%@ include file="$banner/t2-messages.jsp" %>
+<!-- *********************** /table ************************ -->
</div>
<!-- ####################### /common ####################### -->
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/system.classes.jsp
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/system.classes.jsp?rev=1747244&r1=1747243&r2=1747244&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/system.classes.jsp
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/system.classes.jsp
Tue Jun 7 14:30:41 2016
@@ -84,6 +84,10 @@ if (table_style.equals("scroll")) {
</td>
</table>
<!-- *********************** /table ************************ -->
+<!-- *********************** table ************************* -->
+<%@ include file="$banner/t2-alerts.jsp" %>
+<%@ include file="$banner/t2-messages.jsp" %>
+<!-- *********************** /table ************************ -->
</div>
<!-- ####################### /common ####################### -->
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/system.daemons.jsp
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/system.daemons.jsp?rev=1747244&r1=1747243&r2=1747244&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/system.daemons.jsp
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/system.daemons.jsp
Tue Jun 7 14:30:41 2016
@@ -94,6 +94,10 @@ if (table_style.equals("scroll")) {
</td>
</table>
<!-- *********************** /table ************************ -->
+<!-- *********************** table ************************* -->
+<%@ include file="$banner/t2-alerts.jsp" %>
+<%@ include file="$banner/t2-messages.jsp" %>
+<!-- *********************** /table ************************ -->
</div>
<!-- ####################### /common ####################### -->
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/system.machines.jsp
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/system.machines.jsp?rev=1747244&r1=1747243&r2=1747244&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/system.machines.jsp
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/system.machines.jsp
Tue Jun 7 14:30:41 2016
@@ -89,6 +89,10 @@ under the License.
</td>
</table>
<!-- *********************** /table ************************ -->
+<!-- *********************** table ************************* -->
+<%@ include file="$banner/t2-alerts.jsp" %>
+<%@ include file="$banner/t2-messages.jsp" %>
+<!-- *********************** /table ************************ -->
</div>
<!-- ####################### /common ####################### -->
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/viz.jsp
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/viz.jsp?rev=1747244&r1=1747243&r2=1747244&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/viz.jsp
(original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/viz.jsp Tue
Jun 7 14:30:41 2016
@@ -56,6 +56,10 @@ under the License.
</td>
</table>
<!-- *********************** /table ************************ -->
+<!-- *********************** table ************************* -->
+<%@ include file="$banner/t2-alerts.jsp" %>
+<%@ include file="$banner/t2-messages.jsp" %>
+<!-- *********************** /table ************************ -->
<!-- ####################### /common ####################### -->
<span class="viz-nodes" id="viz-nodes"></span>
<script>
