You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by de...@apache.org on 2017/11/10 19:30:30 UTC
svn commit: r1814907 - in /uima/uima-ducc/trunk: src/main/legal/
uima-ducc-web/src/main/webapp/root/ uima-ducc-web/src/main/webapp/root/js/
uima-ducc-web/src/main/webapp/root/opensources/cluetip/
Author: degenaro
Date: Fri Nov 10 19:30:30 2017
New Revision: 1814907
URL: http://svn.apache.org/viewvc?rev=1814907&view=rev
Log:
UIMA-5646 DUCC Web Server (WS) does not use cluetip javascript ==> it should be removed.
Removed:
uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/opensources/cluetip/
Modified:
uima/uima-ducc/trunk/src/main/legal/LICENSE
uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$imports-classic.jsp
uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$imports-scroll.jsp
uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$imports.jsp
uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/js/ducc.js
Modified: uima/uima-ducc/trunk/src/main/legal/LICENSE
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/src/main/legal/LICENSE?rev=1814907&r1=1814906&r2=1814907&view=diff
==============================================================================
--- uima/uima-ducc/trunk/src/main/legal/LICENSE (original)
+++ uima/uima-ducc/trunk/src/main/legal/LICENSE Fri Nov 10 19:30:30 2017
@@ -401,7 +401,6 @@
(webserver)jgrowl-1.3
(webserver)sorttable.js v.2
- (webserver)clueTip 1.2.6
(webserver)jQuery v2.0.3
(webserver)jQuery UI v.1.11.0
(webserver)DataTables v.1.10.1
@@ -414,7 +413,6 @@
(webserver)libpam4j-1.7.jar
(webserver)sorttable.js v.2
- (webserver)clueTip 1.2.6
(webserver)jQuery v2.0.3
(webserver)jQuery UI v.1.11.0
(webserver)DataTables v.1.10.1
@@ -996,7 +994,6 @@ iso-relax, RelaxNG - Copyright (c)
slf4j (api, log4j, jcl-over) - Copyright (c) 2004-2013 QOS.ch
libpam4j - Copyright (c) 2009, Sun Microsystems, Inc.
-cluetip - Copyright 2012, Karl Swedberg
jQuery, jQuery UI - Copyright 2005, 2013 jQuery Foundation, Inc
DataTables, DataTables-plugins - Copyright (C) 2008-2014, SpryMedia Ltd.
sorttable - Copyright (c) 1997-date Stuart Langridge
@@ -4422,7 +4419,6 @@ EXHIBIT A.
iso-relax, RelaxNG - Copyright (c)
slf4j (api, log4j, jcl-over) - Copyright (c) 2004-2013 QOS.ch
libpam4j - Copyright (c) 2009, Sun Microsystems, Inc.
-cluetip - Copyright 2012, Karl Swedberg
jQuery, jQuery UI - Copyright 2005, 2013 jQuery Foundation, Inc
DataTables, DataTables-plugins - Copyright (C) 2008-2014, SpryMedia Ltd.
sorttable - Copyright (c) 1997-date Stuart Langridge
Modified: uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$imports-classic.jsp
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/%24imports-classic.jsp?rev=1814907&r1=1814906&r2=1814907&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$imports-classic.jsp (original)
+++ uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$imports-classic.jsp Fri Nov 10 19:30:30 2017
@@ -17,8 +17,6 @@ specific language governing permissions
under the License.
-->
<script src="opensources/jquery-2.0.3.min.js" type="text/javascript"></script>
- <script src="opensources/cluetip/jquery.cluetip.js" type="text/javascript"></script>
- <link href="opensources/cluetip/jquery.cluetip.css" rel="stylesheet" type="text/css">
<script type="text/javascript" src="opensources/sorttable.js"></script>
<script src="opensources/jgrowl-1.3/jquery.jgrowl.js" type="text/javascript"></script>
<link rel="stylesheet" href="opensources/jgrowl-1.3/jquery.jgrowl.css" type="text/css"/>
Modified: uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$imports-scroll.jsp
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/%24imports-scroll.jsp?rev=1814907&r1=1814906&r2=1814907&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$imports-scroll.jsp (original)
+++ uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$imports-scroll.jsp Fri Nov 10 19:30:30 2017
@@ -39,8 +39,6 @@ if (cookies != null)
}
%>
<script src="opensources/jquery-2.0.3.min.js" type="text/javascript"></script>
- <script src="opensources/cluetip/jquery.cluetip.js" type="text/javascript"></script>
- <link href="opensources/cluetip/jquery.cluetip.css" rel="stylesheet" type="text/css">
<%
if (table_style.equals("scroll")) {
%>
Modified: uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$imports.jsp
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/%24imports.jsp?rev=1814907&r1=1814906&r2=1814907&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$imports.jsp (original)
+++ uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$imports.jsp Fri Nov 10 19:30:30 2017
@@ -39,8 +39,6 @@ if (cookies != null)
}
%>
<script src="opensources/jquery-2.0.3.min.js" type="text/javascript"></script>
- <script src="opensources/cluetip/jquery.cluetip.js" type="text/javascript"></script>
- <link href="opensources/cluetip/jquery.cluetip.css" rel="stylesheet" type="text/css">
<%
if (table_style.equals("scroll")) {
%>
Modified: uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/js/ducc.js
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/js/ducc.js?rev=1814907&r1=1814906&r2=1814907&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/js/ducc.js (original)
+++ uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/js/ducc.js Fri Nov 10 19:30:30 2017
@@ -38,8 +38,6 @@ var ms_reload_min = 5000;
var ms_timeout = 25000;
-var cluetips_disabled = true;
-
var login_prompt = 0;
$(window).resize(function() {
@@ -87,39 +85,6 @@ function ducc_console_fail(fname, textSt
ducc_console_warn(text);
}
-function ducc_cluetips() {
- if (cluetips_disabled) {
- return;
- }
- try {
- $('a.logfileLink').cluetip('destroy');
- $('a.logfileLink').cluetip({
- width: '600px',
- attribute: 'href',
- activation: 'click',
- sticky: true,
- closePosition: 'title',
- closeText: '<img src="opensources/cluetip/cross.png" alt="close" />',
- mouseOutClose: true
- });
- $('a.classLoad').cluetip('destroy');
- $('a.classLoad').cluetip({
- width: 'auto',
- local: true,
- cluetipClass: 'jtip',
- activation: 'click',
- sticky: true,
- titleAttribute: 'title',
- closePosition: 'title',
- mouseOutClose: true,
- dropShadow: false,
- arrows: true
- });
- } catch (err) {
- //ducc_error("ducc_cluetips",err);
- }
-}
-
function toggleById(id) {
$("#" + id).toggle();
}
@@ -718,7 +683,6 @@ function ducc_load_classic_jobs_data() {
data = null;
ducc_console_success(fname);
ducc_load_common();
- ducc_cluetips();
}).fail(function(jqXHR, textStatus) {
wip_jobs = false;
ducc_console_fail(fname, textStatus);
@@ -742,7 +706,6 @@ function ducc_load_scroll_jobs_callback(
var fname = "ducc_load_scroll_jobs_callback";
try {
ducc_load_common();
- ducc_cluetips();
oTable.fnAdjustColumnSizing();
} catch (err) {
ducc_error(fname, err);
@@ -841,7 +804,6 @@ function ducc_load_classic_services_data
data = null;
ducc_console_success(fname);
ducc_load_common();
- ducc_cluetips();
}).fail(function(jqXHR, textStatus) {
wip_services = false;
ducc_console_fail(fname, textStatus);
@@ -865,7 +827,6 @@ function ducc_load_scroll_services_callb
var fname = "ducc_load_scroll_services_callback";
try {
ducc_load_common();
- ducc_cluetips();
oTable.fnAdjustColumnSizing();
} catch (err) {
ducc_error(fname, err);
@@ -1518,7 +1479,6 @@ function ducc_load_service_deployments_d
}).done(function(data) {
wip_service_deployments_data = false;
$("#deployments_list_area").html(data);
- ducc_cluetips();
hide_show();
data = null;
ducc_console_success(fname);
@@ -1729,7 +1689,6 @@ function ducc_load_job_processes_data()
}).done(function(data) {
wip_job_processes_data = false;
$("#processes_list_area").html(data);
- ducc_cluetips();
hide_show();
data = "";
$("#loading_processes_area").html(data);
@@ -1792,7 +1751,6 @@ function ducc_load_reservation_processes
}).done(function(data) {
wip_reservation_processes_data = false;
$("#processes_list_area").html(data);
- ducc_cluetips();
hide_show();
data = "";
$("#loading_processes_area").html(data);
@@ -1866,7 +1824,6 @@ function ducc_load_classic_machines_data
data = null;
ducc_console_success(fname);
ducc_load_common();
- ducc_cluetips();
}).fail(function(jqXHR, textStatus) {
wip_classic_machines_data = false;
ducc_console_fail(fname, textStatus);
@@ -1890,7 +1847,6 @@ function ducc_load_scroll_machines_callb
var fname = "ducc_load_scroll_machines_callback";
try {
ducc_load_common();
- ducc_cluetips();
oTable.fnAdjustColumnSizing();
} catch (err) {
ducc_error(fname, err);
@@ -1986,7 +1942,6 @@ function ducc_load_classic_reservations_
data = null;
ducc_console_success(fname);
ducc_load_common();
- ducc_cluetips();
}).fail(function(jqXHR, textStatus) {
wip_classic_reservations_data = false;
ducc_console_fail(fname, textStatus);
@@ -2010,7 +1965,6 @@ function ducc_load_scroll_reservations_c
var fname = "ducc_load_scroll_reservations_callback";
try {
ducc_load_common();
- ducc_cluetips();
oTable.fnAdjustColumnSizing();
} catch (err) {
ducc_error(fname, err);
@@ -2348,7 +2302,6 @@ function ducc_load_classic_system_classe
data = null;
ducc_console_success(fname);
ducc_load_common();
- ducc_cluetips();
}).fail(function(jqXHR, textStatus) {
wip_classic_system_classes_data = false;
ducc_console_fail(fname, textStatus);
@@ -2372,7 +2325,6 @@ function ducc_load_scroll_system_classes
var fname = "ducc_load_scroll_system_classes_callback";
try {
ducc_load_common();
- ducc_cluetips();
oTable.fnAdjustColumnSizing();
} catch (err) {
ducc_error(fname, err);
@@ -2495,7 +2447,6 @@ function ducc_load_classic_system_daemon
data = null;
ducc_console_success(fname);
ducc_load_common();
- ducc_cluetips();
}).fail(function(jqXHR, textStatus) {
wip_classic_system_daemons_data = false;
ducc_console_fail(fname, textStatus);
@@ -2519,7 +2470,6 @@ function ducc_load_scroll_system_daemons
var fname = "ducc_load_scroll_system_daemons_callback";
try {
ducc_load_common();
- ducc_cluetips();
oTable.fnAdjustColumnSizing();
} catch (err) {
ducc_error(fname, err);
@@ -2577,7 +2527,6 @@ function ducc_load_classic_system_broker
data = null;
ducc_console_success(fname);
ducc_load_common();
- ducc_cluetips();
}).fail(function(jqXHR, textStatus) {
wip_classic_system_broker_data = false;
ducc_console_fail(fname, textStatus);
@@ -2601,7 +2550,6 @@ function ducc_load_scroll_system_broker_
var fname = "ducc_load_scroll_system_broker_callback";
try {
ducc_load_common();
- ducc_cluetips();
oTable.fnAdjustColumnSizing();
} catch (err) {
ducc_error(fname, err);