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 2013/01/31 19:14:33 UTC
svn commit: r1441097 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root: ./ js/
opensources/DataTables-plugins/
Author: degenaro
Date: Thu Jan 31 18:14:33 2013
New Revision: 1441097
URL: http://svn.apache.org/viewvc?rev=1441097&view=rev
Log:
UIMA-2625 DUCC webserver (WS) serves some pages having 2 errors: undefined function and missing file
Added:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/opensources/DataTables-plugins/
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/opensources/DataTables-plugins/fnReloadAjax.js
Modified:
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.definitions.jsp
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/services.deployments.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
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=1441097&r1=1441096&r2=1441097&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 Thu Jan 31 18:14:33 2013
@@ -49,6 +49,7 @@ if (cookies != null)
if (table_style.equals("scroll")) {
%>
<script type="text/javascript" language="javascript" src="opensources/DataTables-1.9.1/media/js/jquery.dataTables.min.js"></script>
+ <script type="text/javascript" language="javascript" src="opensources/DataTables-plugins/fnReloadAjax.js"></script>
<%
}
%>
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=1441097&r1=1441096&r2=1441097&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 Thu Jan 31 18:14:33 2013
@@ -250,7 +250,7 @@ function ducc_load_scroll_jobs_data()
function ducc_init_jobs_data()
{
try {
- data = "<img src=\"../images/ajax-loader.gif\" alt=\"waiting...\">"
+ data = "<img src=\"opensources/images/indicator.gif\" alt=\"waiting...\">"
$("#jobs_list_area").html(data);
data = "...?"
$("#timestamp_area").html(data);
@@ -316,7 +316,7 @@ function ducc_load_scroll_services_defin
function ducc_init_services_definitions_data()
{
try {
- data = "<img src=\"../images/ajax-loader.gif\" alt=\"waiting...\">"
+ data = "<img src=\"opensources/images/indicator.gif\" alt=\"waiting...\">"
data = "...?"
$("#timestamp_area").html(data);
data = "...?"
@@ -373,7 +373,7 @@ function ducc_load_scroll_services_deplo
function ducc_init_services_deployments_data()
{
try {
- data = "<img src=\"../images/ajax-loader.gif\" alt=\"waiting...\">"
+ data = "<img src=\"opensources/images/indicator.gif\" alt=\"waiting...\">"
data = "...?"
$("#timestamp_area").html(data);
data = "...?"
@@ -387,7 +387,7 @@ function ducc_init_services_deployments_
function ducc_init_job_workitems_count_data()
{
try {
- data = "<img src=\"../images/ajax-loader.gif\" alt=\"waiting...\">"
+ data = "<img src=\"opensources/images/indicator.gif\" alt=\"waiting...\">"
$("#job_workitems_count_area").html(data);
}
catch(err) {
@@ -417,7 +417,7 @@ function ducc_load_job_workitems_count_d
function ducc_init_job_workitems_data()
{
try {
- data = "<img src=\"../images/ajax-loader.gif\" alt=\"waiting...\">"
+ data = "<img src=\"opensources/images/indicator.gif\" alt=\"waiting...\">"
$("#workitems_data_area").html(data);
}
catch(err) {
@@ -447,7 +447,7 @@ function ducc_load_job_workitems_data()
function ducc_init_job_performance_data()
{
try {
- data = "<img src=\"../images/ajax-loader.gif\" alt=\"waiting...\">"
+ data = "<img src=\"opensources/images/indicator.gif\" alt=\"waiting...\">"
$("#performance_data_area").html(data);
}
catch(err) {
@@ -477,7 +477,7 @@ function ducc_load_job_performance_data(
function ducc_init_job_specification_data()
{
try {
- data = "<img src=\"../images/ajax-loader.gif\" alt=\"waiting...\">"
+ data = "<img src=\"opensources/images/indicator.gif\" alt=\"waiting...\">"
$("#specification_data_area").html(data);
}
catch(err) {
@@ -582,7 +582,7 @@ function ducc_load_job_processes_data()
function ducc_init_job_processes_data()
{
try {
- data = "<img src=\"../images/ajax-loader.gif\" alt=\"waiting...\">"
+ data = "<img src=\"opensources/images/indicator.gif\" alt=\"waiting...\">"
$("#processes_list_area").html(data);
data = "...?"
$("#timestamp_area").html(data);
@@ -618,7 +618,7 @@ function ducc_load_service_details_data(
function ducc_init_service_details_data()
{
try {
- data = "<img src=\"../images/ajax-loader.gif\" alt=\"waiting...\">"
+ data = "<img src=\"opensources/images/indicator.gif\" alt=\"waiting...\">"
$("#processes_list_area").html(data);
data = "...?"
$("#timestamp_area").html(data);
@@ -676,7 +676,7 @@ function ducc_load_scroll_machines_data(
function ducc_init_machines_data()
{
try {
- data = "<img src=\"../images/ajax-loader.gif\" alt=\"waiting...\">"
+ data = "<img src=\"opensources/images/indicator.gif\" alt=\"waiting...\">"
data = "...?"
$("#timestamp_area").html(data);
data = "...?"
@@ -759,7 +759,7 @@ function ducc_load_scroll_reservations_d
function ducc_init_reservations_data()
{
try {
- data = "<img src=\"../images/ajax-loader.gif\" alt=\"waiting...\">"
+ data = "<img src=\"opensources/images/indicator.gif\" alt=\"waiting...\">"
$("#reservations_list_area").html(data);
data = "...?"
$("#timestamp_area").html(data);
@@ -977,9 +977,9 @@ function ducc_load_system_administration
function ducc_init_system_administration_data()
{
try {
- data = "<img src=\"../images/ajax-loader.gif\" alt=\"waiting...\">"
+ data = "<img src=\"opensources/images/indicator.gif\" alt=\"waiting...\">"
$("#system_administration_administrators_area").html(data);
- data = "<img src=\"../images/ajax-loader.gif\" alt=\"waiting...\">"
+ data = "<img src=\"opensources/images/indicator.gif\" alt=\"waiting...\">"
$("#system_administration_quiesce_area").html(data);
data = "...?"
$("#timestamp_area").html(data);
@@ -1037,7 +1037,7 @@ function ducc_load_scroll_system_classes
function ducc_init_system_classes_data()
{
try {
- data = "<img src=\"../images/ajax-loader.gif\" alt=\"waiting...\">"
+ data = "<img src=\"opensources/images/indicator.gif\" alt=\"waiting...\">"
data = "...?"
$("#timestamp_area").html(data);
data = "...?"
@@ -1166,7 +1166,7 @@ function ducc_load_scroll_system_daemons
function ducc_init_system_daemons_data()
{
try {
- data = "<img src=\"../images/ajax-loader.gif\" alt=\"waiting...\">"
+ data = "<img src=\"opensources/images/indicator.gif\" alt=\"waiting...\">"
data = "...?"
$("#timestamp_area").html(data);
data = "...?"
@@ -2402,48 +2402,3 @@ function ducc_preferences()
ducc_error("ducc_preferences",err);
}
}
-
-$.fn.dataTableExt.oApi.fnReloadAjax = function ( oSettings, sNewSource, fnCallback, bStandingRedraw )
-{
- if ( typeof sNewSource != 'undefined' && sNewSource != null )
- {
- oSettings.sAjaxSource = sNewSource;
- }
- this.oApi._fnProcessingDisplay( oSettings, true );
- var that = this;
- var iStart = oSettings._iDisplayStart;
- var aData = [];
-
- this.oApi._fnServerParams( oSettings, aData );
-
- oSettings.fnServerData( oSettings.sAjaxSource, aData, function(json) {
- /* Clear the old information from the table */
- that.oApi._fnClearTable( oSettings );
-
- /* Got the data - add it to the table */
- var aData = (oSettings.sAjaxDataProp !== "") ?
- that.oApi._fnGetObjectDataFn( oSettings.sAjaxDataProp )( json ) : json;
-
- for ( var i=0 ; i<aData.length ; i++ )
- {
- that.oApi._fnAddData( oSettings, aData[i] );
- }
-
- oSettings.aiDisplay = oSettings.aiDisplayMaster.slice();
- that.fnDraw();
-
- if ( typeof bStandingRedraw != 'undefined' && bStandingRedraw === true )
- {
- oSettings._iDisplayStart = iStart;
- that.fnDraw( false );
- }
-
- that.oApi._fnProcessingDisplay( oSettings, false );
-
- /* Callback user function - for event handlers etc */
- if ( typeof fnCallback == 'function' && fnCallback != null )
- {
- fnCallback( oSettings );
- }
- }, oSettings );
-}
Added: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/opensources/DataTables-plugins/fnReloadAjax.js
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/opensources/DataTables-plugins/fnReloadAjax.js?rev=1441097&view=auto
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/opensources/DataTables-plugins/fnReloadAjax.js (added)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/opensources/DataTables-plugins/fnReloadAjax.js Thu Jan 31 18:14:33 2013
@@ -0,0 +1,46 @@
+
+$.fn.dataTableExt.oApi.fnReloadAjax = function ( oSettings, sNewSource, fnCallback, bStandingRedraw )
+{
+ if ( typeof sNewSource != 'undefined' && sNewSource != null )
+ {
+ oSettings.sAjaxSource = sNewSource;
+ }
+ this.oApi._fnProcessingDisplay( oSettings, true );
+ var that = this;
+ var iStart = oSettings._iDisplayStart;
+ var aData = [];
+
+ this.oApi._fnServerParams( oSettings, aData );
+
+ oSettings.fnServerData( oSettings.sAjaxSource, aData, function(json) {
+ /* Clear the old information from the table */
+ that.oApi._fnClearTable( oSettings );
+
+ /* Got the data - add it to the table */
+ var aData = (oSettings.sAjaxDataProp !== "") ?
+ that.oApi._fnGetObjectDataFn( oSettings.sAjaxDataProp )( json ) : json;
+
+ for ( var i=0 ; i<aData.length ; i++ )
+ {
+ that.oApi._fnAddData( oSettings, aData[i] );
+ }
+
+ oSettings.aiDisplay = oSettings.aiDisplayMaster.slice();
+ that.fnDraw();
+
+ if ( typeof bStandingRedraw != 'undefined' && bStandingRedraw === true )
+ {
+ oSettings._iDisplayStart = iStart;
+ that.fnDraw( false );
+ }
+
+ that.oApi._fnProcessingDisplay( oSettings, false );
+
+ /* Callback user function - for event handlers etc */
+ if ( typeof fnCallback == 'function' && fnCallback != null )
+ {
+ fnCallback( oSettings );
+ }
+ }, oSettings );
+}
+
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=1441097&r1=1441096&r2=1441097&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 Thu Jan 31 18:14:33 2013
@@ -49,6 +49,7 @@ if (cookies != null)
if (table_style.equals("scroll")) {
%>
<script type="text/javascript" language="javascript" src="opensources/DataTables-1.9.1/media/js/jquery.dataTables.min.js"></script>
+ <script type="text/javascript" language="javascript" src="opensources/DataTables-plugins/fnReloadAjax.js"></script>
<%
}
%>
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/services.definitions.jsp
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/services.definitions.jsp?rev=1441097&r1=1441096&r2=1441097&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/services.definitions.jsp (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/services.definitions.jsp Thu Jan 31 18:14:33 2013
@@ -49,6 +49,7 @@ if (cookies != null)
if (table_style.equals("scroll")) {
%>
<script type="text/javascript" language="javascript" src="opensources/DataTables-1.9.1/media/js/jquery.dataTables.min.js"></script>
+ <script type="text/javascript" language="javascript" src="opensources/DataTables-plugins/fnReloadAjax.js"></script>
<%
}
%>
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/services.deployments.jsp
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/services.deployments.jsp?rev=1441097&r1=1441096&r2=1441097&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/services.deployments.jsp (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/services.deployments.jsp Thu Jan 31 18:14:33 2013
@@ -49,6 +49,7 @@ if (cookies != null)
if (table_style.equals("scroll")) {
%>
<script type="text/javascript" language="javascript" src="opensources/DataTables-1.9.1/media/js/jquery.dataTables.min.js"></script>
+ <script type="text/javascript" language="javascript" src="opensources/DataTables-plugins/fnReloadAjax.js"></script>
<%
}
%>
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=1441097&r1=1441096&r2=1441097&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 Thu Jan 31 18:14:33 2013
@@ -49,6 +49,7 @@ if (cookies != null)
if (table_style.equals("scroll")) {
%>
<script type="text/javascript" language="javascript" src="opensources/DataTables-1.9.1/media/js/jquery.dataTables.min.js"></script>
+ <script type="text/javascript" language="javascript" src="opensources/DataTables-plugins/fnReloadAjax.js"></script>
<%
}
%>
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=1441097&r1=1441096&r2=1441097&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 Thu Jan 31 18:14:33 2013
@@ -49,6 +49,7 @@ if (cookies != null)
if (table_style.equals("scroll")) {
%>
<script type="text/javascript" language="javascript" src="opensources/DataTables-1.9.1/media/js/jquery.dataTables.min.js"></script>
+ <script type="text/javascript" language="javascript" src="opensources/DataTables-plugins/fnReloadAjax.js"></script>
<%
}
%>
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=1441097&r1=1441096&r2=1441097&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 Thu Jan 31 18:14:33 2013
@@ -49,6 +49,7 @@ if (cookies != null)
if (table_style.equals("scroll")) {
%>
<script type="text/javascript" language="javascript" src="opensources/DataTables-1.9.1/media/js/jquery.dataTables.min.js"></script>
+ <script type="text/javascript" language="javascript" src="opensources/DataTables-plugins/fnReloadAjax.js"></script>
<%
}
%>