svn commit: r1735595 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main: java/org/apache/uima/ducc/ws/server/DuccHandler.java webapp/root/$banner/$max-records-services.jsp webapp/root/$banner/c2-status-services.jsp webapp/root/js/ducc.js

[de...@apache.org]

Author: degenaro
Date: Fri Mar 18 13:10:44 2016
New Revision: 1735595

URL: http://svn.apache.org/viewvc?rev=1735595&view=rev
Log:
UIMA-4860 DUCC Web Server (WS) Services and Preferences improvements

Added:
    uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/$max-records-services.jsp   (with props)
Modified:
    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/$banner/c2-status-services.jsp
    uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/js/ducc.js

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=1735595&r1=1735594&r2=1735595&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 Fri Mar 18 13:10:44 2016
@@ -26,6 +26,7 @@ import java.io.InputStreamReader;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
 import java.util.Enumeration;
@@ -100,6 +101,7 @@ import org.apache.uima.ducc.ws.registry.
 import org.apache.uima.ducc.ws.registry.ServiceInterpreter.StartState;
 import org.apache.uima.ducc.ws.registry.ServicesRegistry;
 import org.apache.uima.ducc.ws.registry.ServicesRegistryMapPayload;
+import org.apache.uima.ducc.ws.registry.sort.IServiceAdapter;
 import org.apache.uima.ducc.ws.registry.sort.ServicesSortCache;
 import org.apache.uima.ducc.ws.server.IWebMonitor.MonitorType;
 import org.apache.uima.ducc.ws.sort.JobDetailsProcesses;
@@ -156,6 +158,8 @@ public class DuccHandler extends DuccAbs
 	private String duccReservationSpecificationData = duccContext+"/reservation-specification-data";
 	private String duccReservationFilesData 		= duccContext+"/reservation-files-data";
 	
+	private String duccServicesRecordsCeiling    	= duccContext+"/services-records-ceiling";
+	
 	private String duccServiceDeploymentsData    	= duccContext+"/service-deployments-data";
 	private String duccServiceRegistryData 			= duccContext+"/service-registry-data";
 	private String duccServiceFilesData 			= duccContext+"/service-files-data";
@@ -2675,6 +2679,40 @@ public class DuccHandler extends DuccAbs
 		duccLogger.trace(methodName, null, messages.fetch("exit"));
 	}
 	
+	private void handleDuccServletServicesRecordsCeilingData(String target,Request baseRequest,HttpServletRequest request,HttpServletResponse response) 
+	throws IOException, ServletException
+	{
+		String methodName = "handleDuccServletServicesRecordsCeilingData";
+		duccLogger.trace(methodName, null, messages.fetch("enter"));
+		StringBuffer sb = new StringBuffer();
+		try {
+			int counter = 0;  // force counter to be zero for isListable calculation
+			int ceiling = 0;
+			ServicesSortCache servicesSortCache = ServicesSortCache.getInstance();
+			Collection<IServiceAdapter> servicesSortedCollection = servicesSortCache.getSortedCollection();
+			if(!servicesSortedCollection.isEmpty()) {
+				int maxRecords = getServicesMax(request);
+				ArrayList<String> users = getServicesUsers(request);
+				for(IServiceAdapter service : servicesSortedCollection) {
+					boolean list = DuccWebUtil.isListable(request, users, maxRecords, counter, service);
+					if(!list) {
+						continue;
+					}
+					ceiling++;
+				}
+			}
+			sb.append(""+ceiling);
+		}
+		catch(Throwable t) {
+			duccLogger.trace(methodName, jobid, t);
+		}
+		if(sb.length() == 0) {
+			sb.append("0");
+		}
+		response.getWriter().println(sb);
+		duccLogger.trace(methodName, null, messages.fetch("exit"));
+	}
+	
 	private void handleDuccServletServiceDeploymentsData(String target,Request baseRequest,HttpServletRequest request,HttpServletResponse response) 
 	throws IOException, ServletException
 	{
@@ -4668,6 +4706,10 @@ public class DuccHandler extends DuccAbs
 				handleDuccServletReservationSpecificationData(target, baseRequest, request, response);
 				DuccWebUtil.noCache(response);
 			}
+			else if(reqURI.startsWith(duccServicesRecordsCeiling)) {
+				handleDuccServletServicesRecordsCeilingData(target, baseRequest, request, response);
+				DuccWebUtil.noCache(response);
+			}
 			else if(reqURI.startsWith(duccServiceDeploymentsData)) {
 				handleDuccServletServiceDeploymentsData(target, baseRequest, request, response);
 				DuccWebUtil.noCache(response);

Added: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/$max-records-services.jsp
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/%24banner/%24max-records-services.jsp?rev=1735595&view=auto
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/$max-records-services.jsp (added)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/$max-records-services.jsp Fri Mar 18 13:10:44 2016
@@ -0,0 +1,22 @@
+<!--
+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.
+-->
+<td valign="top" align="right">Max Records:&nbsp
+<td valign="top">
+<input type="text" size="8" id="maxrecs_input" value="default" placeholder="positive integer"/>
+of <span id="services_records_ceiling_area">0</span>
\ No newline at end of file

Propchange: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/$max-records-services.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/$max-records-services.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c2-status-services.jsp
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/%24banner/c2-status-services.jsp?rev=1735595&r1=1735594&r2=1735595&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c2-status-services.jsp (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c2-status-services.jsp Fri Mar 18 13:10:44 2016
@@ -32,7 +32,7 @@ under the License.
 <%@ include file="$users.jsp" %>
 </tr>
 <tr>
-<%@ include file="$max-records.jsp" %>
+<%@ include file="$max-records-services.jsp" %>
 </tr>
 </table>
 </form>

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=1735595&r1=1735594&r2=1735595&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 Fri Mar 18 13:10:44 2016
@@ -661,6 +661,7 @@ function ducc_load_services_head() {
     var fname = "ducc_load_services_head";
     ducc_services_max_records();
     ducc_services_users();
+    ducc_load_services_records_ceiling();
 }
 
 var ms_load_services_data = +new Date() - ms_reload_min;
@@ -680,6 +681,37 @@ function ducc_load_services_data() {
     }
 }
 
+var wip_services_records_ceiling = false;
+
+function ducc_load_services_records_ceiling() {
+    var fname = "ducc_load_services_records_ceiling";
+    var data = null;
+    if(wip_services_records_ceiling) {
+        ducc_console_warn(fname+" already in progress...")
+        return;
+    }
+    wip_services_records_ceiling = true;
+    try {
+        var servlet = "/ducc-servlet/services-records-ceiling";
+        var tomsecs = ms_timeout;
+        $.ajax({
+            url: servlet,
+            timeout: tomsecs
+        }).done(function(data) {
+            wip_services_records_ceiling = false;
+            $("#services_records_ceiling_area").html(data);
+            data = null;
+            ducc_console_success(fname);
+        }).fail(function(jqXHR, textStatus) {
+        	wip_services_records_ceiling = false;
+            ducc_console_fail(fname, textStatus);
+        });
+    } catch (err) {
+    	wip_services_records_ceiling = false;
+        ducc_error(fname, err);
+    }
+}
+
 var wip_services = false;
 
 function ducc_load_classic_services_data() {