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/02/19 21:38:39 UTC
svn commit: r1447909 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main:
java/org/apache/uima/ducc/ws/server/DuccHandler.java webapp/root/ducc.css
webapp/root/js/ducc.js webapp/root/service.details.jsp
Author: degenaro
Date: Tue Feb 19 20:38:39 2013
New Revision: 1447909
URL: http://svn.apache.org/r1447909
Log:
UIMA-2676 DUCC webserver (WS) Services presentation improvements...Specification tab becomes Registry tab, and "meta" data exposed
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/ducc.css
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/service.details.jsp
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=1447909&r1=1447908&r2=1447909&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 Feb 19 20:38:39 2013
@@ -112,7 +112,7 @@ public class DuccHandler extends DuccAbs
private String duccJobInitializationFailData = duccContext+"/job-initialization-fail-data";
private String duccJobRuntimeFailData = duccContext+"/job-runtime-fail-data";
private String duccServiceDeploymentsData = duccContext+"/service-deployments-data";
- private String duccServiceSpecificationData = duccContext+"/service-specification-data";
+ private String duccServiceRegistryData = duccContext+"/service-registry-data";
private String duccServiceSummaryData = duccContext+"/service-summary-data";
private String duccSystemAdminAdminData = duccContext+"/system-admin-admin-data";
@@ -1371,25 +1371,16 @@ public class DuccHandler extends DuccAbs
duccLogger.trace(methodName, null, messages.fetch("exit"));
}
- private void handleDuccServletServiceSpecificationData(String target,Request baseRequest,HttpServletRequest request,HttpServletResponse response)
+ private void handleDuccServletServiceRegistryData(String target,Request baseRequest,HttpServletRequest request,HttpServletResponse response)
throws IOException, ServletException
{
- String methodName = "handleDuccServletServiceSpecificationData";
+ String methodName = "handleDuccServletServiceRegistryData";
duccLogger.trace(methodName, null, messages.fetch("enter"));
StringBuffer sb = new StringBuffer();
try {
String name = request.getParameter("name");
ServicesRegistry servicesRegistry = new ServicesRegistry();
ServicesRegistryMapPayload payload = servicesRegistry.findService(name);
- Properties properties;
- properties = payload.svc;
- TreeMap<String,String> map = new TreeMap<String,String>();
- Enumeration<?> enumeration = properties.keys();
- while(enumeration.hasMoreElements()) {
- String key = (String)enumeration.nextElement();
- map.put(key, key);
- }
- Iterator<String> iterator = map.keySet().iterator();
sb.append("<table>");
sb.append("<tr class=\"ducc-head\">");
sb.append("<th>");
@@ -1399,8 +1390,44 @@ public class DuccHandler extends DuccAbs
sb.append("Value");
sb.append("</th>");
sb.append("</tr>");
+ String prefix;
+ Properties properties;
+ TreeMap<String,String> map;
+ Enumeration<?> enumeration;
+ Iterator<String> iterator;
int i = 0;
int counter = 0;
+ //
+ prefix = "svc.";
+ properties = payload.svc;
+ map = new TreeMap<String,String>();
+ enumeration = properties.keys();
+ while(enumeration.hasMoreElements()) {
+ String key = (String)enumeration.nextElement();
+ map.put(key, key);
+ }
+ iterator = map.keySet().iterator();
+ while(iterator.hasNext()) {
+ String key = iterator.next();
+ String value = properties.getProperty(key);
+ if(key.endsWith("classpath")) {
+ String show = "<div class=\"hidedata\"><input type=\"submit\" name=\"showcp\" value=\"Show\" id=\"showbutton"+i+"\"/></div>";
+ String hide = "<div class=\"showdata\"><input type=\"submit\" name=\"hidecp\" value=\"Hide\" id=\"hidebutton"+i+"\"/>"+" "+value+"</div>";
+ value = show+hide;
+ i++;
+ }
+ putJobSpecEntry(properties, prefix+key, value, sb, counter++);
+ }
+ //
+ prefix = "meta.";
+ properties = payload.meta;
+ map = new TreeMap<String,String>();
+ enumeration = properties.keys();
+ while(enumeration.hasMoreElements()) {
+ String key = (String)enumeration.nextElement();
+ map.put(key, key);
+ }
+ iterator = map.keySet().iterator();
while(iterator.hasNext()) {
String key = iterator.next();
String value = properties.getProperty(key);
@@ -1410,7 +1437,7 @@ public class DuccHandler extends DuccAbs
value = show+hide;
i++;
}
- putJobSpecEntry(properties, key, value, sb, counter++);
+ putJobSpecEntry(properties, prefix+key, value, sb, counter++);
}
sb.append("</table>");
sb.append("<br>");
@@ -2624,8 +2651,8 @@ public class DuccHandler extends DuccAbs
handleDuccServletServiceDeploymentsData(target, baseRequest, request, response);
DuccWebUtil.noCache(response);
}
- else if(reqURI.startsWith(duccServiceSpecificationData)) {
- handleDuccServletServiceSpecificationData(target, baseRequest, request, response);
+ else if(reqURI.startsWith(duccServiceRegistryData)) {
+ handleDuccServletServiceRegistryData(target, baseRequest, request, response);
}
else if(reqURI.startsWith(duccServiceSummaryData)) {
handleDuccServletServiceSummaryData(target, baseRequest, request, response);
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=1447909&r1=1447908&r2=1447909&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 Feb 19 20:38:39 2013
@@ -47,6 +47,11 @@ th.ducc-filter {
th.ducc-no-filter {
}
+
+th.ducc-col-button {
+ background-color:#ffffff;
+}
+
th.ducc-col-terminate {
background-color:#ffffff;
}
@@ -67,6 +72,10 @@ tr.even {
background-color:#eeeeee;
}
+td.ducc-col-button {
+ background-color:#ffffff;
+}
+
td.ducc-col-terminate {
background-color:#ffffff;
}
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=1447909&r1=1447908&r2=1447909&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 Feb 19 20:38:39 2013
@@ -493,33 +493,33 @@ function ducc_load_job_specification_dat
}
}
-function ducc_init_service_specification_data()
+function ducc_init_service_registry_data()
{
try {
data = "<img src=\"opensources/images/indicator.gif\" alt=\"waiting...\">"
- $("#specification_data_area").html(data);
+ $("#registry_data_area").html(data);
}
catch(err) {
- ducc_error("ducc_init_service_specification_data",err);
+ ducc_error("ducc_init_service_registry_data",err);
}
}
-function ducc_load_service_specification_data()
+function ducc_load_service_registry_data()
{
try {
- server_url= "/ducc-servlet/service-specification-data"+location.search;
+ server_url= "/ducc-servlet/service-registry-data"+location.search;
$.ajax(
{
url : server_url,
success : function (data)
{
- $("#specification_data_area").html(data);
+ $("#registry_data_area").html(data);
hide_show();
}
});
}
catch(err) {
- ducc_error("ducc_load_service_specification_data",err);
+ ducc_error("ducc_load_service_registry_data",err);
}
}
@@ -1252,10 +1252,10 @@ function ducc_init(type)
if(type == "service-details") {
ducc_init_service_summary_data();
ducc_init_service_deployments_data();
- ducc_init_service_specification_data();
+ ducc_init_service_registry_data();
ducc_load_service_summary_data();
ducc_load_service_deployments_data();
- ducc_load_service_specification_data();
+ ducc_load_service_registry_data();
}
if(type == "system-machines") {
ducc_init_machines_data();
@@ -1683,7 +1683,7 @@ function ducc_update_page(type)
ducc_load_job_workitems_count_data();
}
if(type == "service-details") {
- //ducc_load_service_specification_data();
+ //ducc_load_service_registry_data();
ducc_load_service_deployments_data();
}
if(type == "system-machines") {
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/service.details.jsp
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/service.details.jsp?rev=1447909&r1=1447908&r2=1447909&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/service.details.jsp (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/service.details.jsp Tue Feb 19 20:38:39 2013
@@ -79,14 +79,14 @@ under the License.
<div id="tabs">
<ul>
<li><a href="#tabs-1">Deployments</a></li>
- <li><a href="#tabs-2">Specification</a></li>
+ <li><a href="#tabs-2">Registry</a></li>
</ul>
<div id="tabs-1">
<%@ include file="service.details.table.deployments.jsp" %>
</div>
<div id="tabs-2">
- <div class="specification_data_div">
- <span id="specification_data_area"></span>
+ <div class="registry_data_div">
+ <span id="registry_data_area"></span>
</div>
</div>
</div>