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/08/28 19:34:20 UTC
svn commit: r1621167 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server:
DuccHandlerClassic.java DuccHandlerJsonFormat.java
Author: degenaro
Date: Thu Aug 28 17:34:19 2014
New Revision: 1621167
URL: http://svn.apache.org/r1621167
Log: (empty)
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
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=1621167&r1=1621166&r2=1621167&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 Thu Aug 28 17:34:19 2014
@@ -1805,6 +1805,8 @@ public class DuccHandlerClassic extends
private static DecimalFormat formatter3 = new DecimalFormat("##0.000");
+ private static String Topic = "Topic";
+
private void handleServletClassicSystemBroker(String target,Request baseRequest,HttpServletRequest request,HttpServletResponse response)
throws IOException, ServletException
{
@@ -1824,6 +1826,9 @@ public class DuccHandlerClassic extends
FrameworkAttribute.MemoryPercentUsage.name(),
};
+ StringBuffer topics = new StringBuffer();
+ StringBuffer queues = new StringBuffer();
+
if(entityInfoList.size() > 0) {
for(EntityInfo entityInfo : entityInfoList) {
String name = entityInfo.getName();
@@ -1874,8 +1879,15 @@ public class DuccHandlerClassic extends
row.append(messages.fetch("</td>"));
//
row.append(messages.fetch("</tr>"));
- sb.append(row);
+ if(type.equals(Topic)) {
+ topics.append(row);
+ }
+ else {
+ queues.append(row);
+ }
}
+ sb.append(topics);
+ sb.append(queues);
}
else {
StringBuffer row = new StringBuffer();
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=1621167&r1=1621166&r2=1621167&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 Thu Aug 28 17:34:19 2014
@@ -1523,6 +1523,8 @@ public class DuccHandlerJsonFormat exten
private static DecimalFormat formatter3 = new DecimalFormat("##0.000");
+ private static String Topic = "Topic";
+
private void handleServletJsonFormatBrokerAaData(String target,Request baseRequest,HttpServletRequest request,HttpServletResponse response)
throws Exception
{
@@ -1545,6 +1547,9 @@ public class DuccHandlerJsonFormat exten
FrameworkAttribute.MemoryPercentUsage.name(),
};
+ JsonArray topics = new JsonArray();
+ JsonArray queues = new JsonArray();
+
if(entityInfoList.size() > 0) {
for(EntityInfo entityInfo : entityInfoList) {
String name = entityInfo.getName();
@@ -1579,8 +1584,15 @@ public class DuccHandlerJsonFormat exten
attrValue = map.get(FrameworkAttribute.MemoryPercentUsage.name());
row.add(new JsonPrimitive(attrValue));
// Row
- data.add(row);
+ if(type.equals(Topic)) {
+ topics.add(row);
+ }
+ else {
+ queues.add(row);
+ }
}
+ data.addAll(topics);
+ data.addAll(queues);
}
jsonResponse.add("aaData", data);