[uima-uimaj] branch feature/UIMA-6126-Add-gitignore-file-to-trunk-v2 deleted (was 7fb367f)

[schor]

This is an automated email from the ASF dual-hosted git repository.

schor pushed a change to branch feature/UIMA-6126-Add-gitignore-file-to-trunk-v2
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git.


 was 7fb367f  [UIMA-6126] Add .gitignore file to trunk

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

[uima-uimaj] branch master-v2 updated: [UIMA-6126] Add .gitignore file to trunk

[schor]

This is an automated email from the ASF dual-hosted git repository.

schor pushed a commit to branch master-v2
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git


The following commit(s) were added to refs/heads/master-v2 by this push:
 new f6c43b7  [UIMA-6126] Add .gitignore file to trunk
f6c43b7 is described below

commit f6c43b778b8fd8b0617ea82f0e63a11ea07e1cfa
Author: Richard Eckart de Castilho 
AuthorDate: Mon Sep 16 20:31:26 2019 +0200

[UIMA-6126] Add .gitignore file to trunk

- Ignore files that should not go into the repo
---
 .gitignore | 9 +
 1 file changed, 9 insertions(+)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..b41dc86
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+.classpath
+.project
+.settings
+target
+META-INF
+checkpoint_synchPoint.xml
+checkpoint_synchPoint.xml.prev
+api-change-report
+.factorypath

[uima-uimaj] branch feature/UIMA-6126-Add-gitignore-file-to-trunk deleted (was 85b5139)

[schor]

This is an automated email from the ASF dual-hosted git repository.

schor pushed a change to branch feature/UIMA-6126-Add-gitignore-file-to-trunk
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git.


 was 85b5139  [UIMA-6126] Add .gitignore file to trunk

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

[uima-uimaj] branch master updated: [UIMA-6126] Add .gitignore file to trunk

[schor]

This is an automated email from the ASF dual-hosted git repository.

schor pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git


The following commit(s) were added to refs/heads/master by this push:
 new d35d5ce  [UIMA-6126] Add .gitignore file to trunk
d35d5ce is described below

commit d35d5ce1816457e8c11c45c1ae7a2ee5a9c07182
Author: Richard Eckart de Castilho 
AuthorDate: Mon Sep 16 20:20:20 2019 +0200

[UIMA-6126] Add .gitignore file to trunk

- Ignore files that should not go into the repo
---
 .gitignore | 9 +
 1 file changed, 9 insertions(+)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..b41dc86
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+.classpath
+.project
+.settings
+target
+META-INF
+checkpoint_synchPoint.xml
+checkpoint_synchPoint.xml.prev
+api-change-report
+.factorypath

svn commit: r1867900 - in /uima/uima-ducc/trunk/uima-ducc-web/src/main: java/org/apache/uima/ducc/ws/handlers/experiments/ java/org/apache/uima/ducc/ws/handlers/utilities/ java/org/apache/uima/ducc/ws

[burn]

Author: burn
Date: Wed Oct  2 22:30:34 2019
New Revision: 1867900

URL: http://svn.apache.org/viewvc?rev=1867900&view=rev
Log:
UIMA-6130 Fix problems with experiments pages - sorting & scroll view

Added:

uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/utils/FormatServlet.java
   (with props)

uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/utils/FormatServletClassic.java
   (with props)

uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/utils/FormatServletScroll.java
   (with props)
Modified:

uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/handlers/experiments/HandlerExperimentsAbstract.java

uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/handlers/experiments/HandlerExperimentsServlets.java

uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/handlers/utilities/HandlersUtilities.java

uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/handlers/utilities/ResponseHelper.java

uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccLocalConstants.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$imports.jsp

uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/experiment.details.jsp
uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/experiments.html
uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/experiments.jsp
uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/js/ducc.local.js

Modified: 
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/handlers/experiments/HandlerExperimentsAbstract.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/handlers/experiments/HandlerExperimentsAbstract.java?rev=1867900&r1=1867899&r2=1867900&view=diff
==
--- 
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/handlers/experiments/HandlerExperimentsAbstract.java
 (original)
+++ 
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/handlers/experiments/HandlerExperimentsAbstract.java
 Wed Oct  2 22:30:34 2019
@@ -56,45 +56,7 @@ public abstract class HandlerExperiments
 return HandlersUtilities.isIgnorable(t);
   }
 
-  public String getFmtDuration(IDuccWorkJob job, HttpServletRequest request, 
long now) {
-String retVal = "";
-StringBuffer tb = new StringBuffer();
-if (job.isCompleted()) {
-  String duration = getDuration(request, job);
-  String decoratedDuration = decorateDuration(request, job, duration);
-  tb.append("");
-  tb.append(decoratedDuration);
-  tb.append("");
-  retVal = tb.toString();
-} else {
-  String duration = getDuration(request, job, now);
-  String decoratedDuration = decorateDuration(request, job, duration);
-  tb.append("");
-  tb.append(decoratedDuration);
-  tb.append("");
-  String projection = getProjection(request, job);
-  tb.append(projection);
-  retVal = tb.toString();
-}
-return retVal;
-  }
-
-  public String getLink(IDuccWorkJob job) {
-String retVal = "";
-String parm = job.getDuccId().toString();
-String displayId = "j" + parm;
-String link = "" + displayId 
+ "";
-retVal = link;
-return retVal;
-  }
-
-  public String getTotal(IDuccWorkJob job) {
-String retVal = "";
-String total = job.getSchedulingInfo().getWorkItemsTotal();
-retVal = total;
-return retVal;
-  }
-
+  // Not used ?
   public String getDone(IDuccWorkJob job) {
 String retVal = "";
 String done = job.getSchedulingInfo().getWorkItemsCompleted();
@@ -129,31 +91,13 @@ public abstract class HandlerExperiments
 return retVal;
   }
 
-  public String getError(IDuccWorkJob job) {
-String retVal = "";
-retVal = buildErrorLink(job);
-return retVal;
-  }
-
-  public String getRetry(IDuccWorkJob job) {
-String retVal = "";
-retVal = job.getSchedulingInfo().getWorkItemsRetry();
-return retVal;
-  }
-
-  public String getPreempt(IDuccWorkJob job) {
-String retVal = "";
-retVal = job.getSchedulingInfo().getWorkItemsPreempt();
-return retVal;
-  }
-
   public String buildErrorLink(IDuccWorkJob job) {
 return (buildErrorLink(job, null));
   }
 
   public final String duccLogData = duccContext + "/log-data";
 
-  public String buildErrorLink(IDuccWorkJob job, String name) {
+  private String buildErrorLink(IDuccWorkJob job, String name) {
 String retVal = job.getSchedulingInfo().getWorkItemsError();
 if (!retVal.equals("0")) {
   String errorCount = retVal;
@@ -197,7 +141,7 @@ public abstract class HandlerExperiments
 return retVal;
   }
 
-  public String getDuration(DuccId jobId, String millisV2, String millisV1) {
+  private String getDuration(DuccId jobId, String millisV2