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 2014/09/12 22:46:07 UTC
svn commit: r1624641 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main:
java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java
java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java
webapp/root/js/ducc.js
Author: degenaro
Date: Fri Sep 12 20:46:06 2014
New Revision: 1624641
URL: http://svn.apache.org/r1624641
Log:
UIMA-4009 DUCC Web Server (WS) transform Services page "Start" buttons into "Enable" buttons
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java
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/DuccHandlerClassic.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java?rev=1624641&r1=1624640&r2=1624641&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java Fri Sep 12 20:46:06 2014
@@ -863,23 +863,12 @@ public class DuccHandlerClassic extends
String user = service.getUser();
long deployments = service.getDeployments();
long instances = service.getInstances();
- // Start
+ // Enable
sb.append("<td valign=\"bottom\" class=\"ducc-col-start\">");
if(service.isRegistered()) {
if(buttonsEnabled) {
- if(service.isPingOnly()) {
- if(!service.isPingActive()) {
- sb.append("<input type=\"button\" onclick=\"ducc_confirm_service_start("+sid+")\" value=\"Start\" "+getDisabledWithHover(request,user)+"/>");
- }
- }
- else {
- try {
- if(deployments < instances) {
- sb.append("<input type=\"button\" onclick=\"ducc_confirm_service_start("+sid+")\" value=\"Start\" "+getDisabledWithHover(request,user)+"/>");
- }
- }
- catch(Exception e) {
- }
+ if(service.isDisabled()) {
+ sb.append("<input type=\"button\" onclick=\"ducc_confirm_service_enable("+sid+")\" value=\"Enable\" "+getDisabledWithHover(request,user)+"/>");
}
}
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java?rev=1624641&r1=1624640&r2=1624641&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java Fri Sep 12 20:46:06 2014
@@ -987,24 +987,13 @@ public class DuccHandlerJsonFormat exten
String user = service.getUser();
long deployments = service.getDeployments();
long instances = service.getInstances();
- // Start
+ // Enable
col = new StringBuffer();
col.append("<span class=\"ducc-col-start\">");
if(service.isRegistered()) {
if(buttonsEnabled) {
- if(service.isPingOnly()) {
- if(!service.isPingActive()) {
- col.append("<input type=\"button\" onclick=\"ducc_confirm_service_start("+sid+")\" value=\"Start\" "+getDisabledWithHover(request,user)+"/>");
- }
- }
- else {
- try {
- if(deployments < instances) {
- col.append("<input type=\"button\" onclick=\"ducc_confirm_service_start("+sid+")\" value=\"Start\" "+getDisabledWithHover(request,user)+"/>");
- }
- }
- catch(Exception e) {
- }
+ if(service.isDisabled()) {
+ col.append("<input type=\"button\" onclick=\"ducc_confirm_service_enable("+sid+")\" value=\"Enable\" "+getDisabledWithHover(request,user)+"/>");
}
}
}
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=1624641&r1=1624640&r2=1624641&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 Sep 12 20:46:06 2014
@@ -2515,14 +2515,14 @@ function ducc_terminate_service(id)
return false;
}
-function ducc_service_start(id)
+function ducc_service_enable(id)
{
try {
- $.jGrowl(" Pending start...");
+ $.jGrowl(" Pending enable...");
$.ajax(
{
type: 'POST',
- url : "/ducc-servlet/service-start-request"+"?id="+id,
+ url : "/ducc-servlet/service-enable-request"+"?id="+id,
success : function (data)
{
$.jGrowl(data, { life: 6000 });
@@ -2532,7 +2532,7 @@ function ducc_service_start(id)
setTimeout(function(){window.close();}, 5000);
}
catch(err) {
- ducc_error("ducc_service_start",err);
+ ducc_error("ducc_service_enable",err);
}
return false;
}
@@ -2709,16 +2709,16 @@ function ducc_confirm_terminate_service(
}
}
-function ducc_confirm_service_start(id)
+function ducc_confirm_service_enable(id)
{
try {
- var result=confirm("Start service "+id+"?");
+ var result=confirm("Enable service "+id+"?");
if (result==true) {
- ducc_service_start(id);
+ ducc_service_enable(id);
}
}
catch(err) {
- ducc_error("ducc_confirm_service_start",err);
+ ducc_error("ducc_confirm_service_enable",err);
}
}