Author: degenaro
Date: Mon Mar 4 21:38:10 2013
New Revision: 1452539
URL: http://svn.apache.org/r1452539
Log:
UIMA-2711 DUCC webserver (WS) should format classpath display for
Jobs/ManagedReservations/Services
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java?rev=1452539&r1=1452538&r2=1452539&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java
Mon Mar 4 21:38:10 2013
@@ -849,4 +849,27 @@ public abstract class DuccAbstractHandle
return sb.toString();
}
+ public String formatClasspath(String classpath) {
+ String retVal = classpath;
+ if(classpath != null) {
+ String[] cpList = classpath.split(":");
+ if(cpList != null) {
+ StringBuffer vb = new StringBuffer();
+ vb.append("<br>");
+ vb.append("<div>");
+ StringBuffer sb = new StringBuffer();
+ for(String item : cpList) {
+ if(sb.length() > 0) {
+ sb.append("<br>");
+ }
+ sb.append(item);
+ }
+ vb.append(sb);
+ vb.append("</div>");
+ retVal = vb.toString();
+ }
+ }
+ return retVal;
+ }
+
}
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=1452539&r1=1452538&r2=1452539&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
Mon Mar 4 21:38:10 2013
@@ -1252,6 +1252,7 @@ public class DuccHandler extends DuccAbs
String key = iterator.next();
String value =
properties.getProperty(key);
if(key.endsWith("classpath")) {
+ value = formatClasspath(value);
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;
@@ -1452,6 +1453,7 @@ public class DuccHandler extends DuccAbs
String key = iterator.next();
String value =
properties.getProperty(key);
if(key.endsWith("classpath")) {
+ value = formatClasspath(value);
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;
@@ -1561,6 +1563,7 @@ public class DuccHandler extends DuccAbs
String key = iterator.next();
String value = properties.getProperty(key);
if(key.endsWith("classpath")) {
+ value = formatClasspath(value);
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;
@@ -1582,6 +1585,7 @@ public class DuccHandler extends DuccAbs
String key = iterator.next();
String value = properties.getProperty(key);
if(key.endsWith("classpath")) {
+ value = formatClasspath(value);
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;
