You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ge...@apache.org on 2008/08/27 09:07:53 UTC
svn commit: r689392 - in
/servicemix/sandbox/gertv/smx-sling/servicemix-sling-console/src/main/resources/initial-content:
apps/servicemix/dashboard/ apps/servicemix/exchange/
apps/servicemix/exchanges/ apps/servicemix/message_flow/ content/
Author: gertv
Date: Wed Aug 27 00:07:52 2008
New Revision: 689392
URL: http://svn.apache.org/viewvc?rev=689392&view=rev
Log:
Patch applied with thanks to Vladislav
Modified:
servicemix/sandbox/gertv/smx-sling/servicemix-sling-console/src/main/resources/initial-content/apps/servicemix/dashboard/html.esp
servicemix/sandbox/gertv/smx-sling/servicemix-sling-console/src/main/resources/initial-content/apps/servicemix/exchange/tr.esp
servicemix/sandbox/gertv/smx-sling/servicemix-sling-console/src/main/resources/initial-content/apps/servicemix/exchanges/html.esp
servicemix/sandbox/gertv/smx-sling/servicemix-sling-console/src/main/resources/initial-content/apps/servicemix/exchanges/tr.esp
servicemix/sandbox/gertv/smx-sling/servicemix-sling-console/src/main/resources/initial-content/apps/servicemix/message_flow/html.esp
servicemix/sandbox/gertv/smx-sling/servicemix-sling-console/src/main/resources/initial-content/content/servicemix.json
Modified: servicemix/sandbox/gertv/smx-sling/servicemix-sling-console/src/main/resources/initial-content/apps/servicemix/dashboard/html.esp
URL: http://svn.apache.org/viewvc/servicemix/sandbox/gertv/smx-sling/servicemix-sling-console/src/main/resources/initial-content/apps/servicemix/dashboard/html.esp?rev=689392&r1=689391&r2=689392&view=diff
==============================================================================
--- servicemix/sandbox/gertv/smx-sling/servicemix-sling-console/src/main/resources/initial-content/apps/servicemix/dashboard/html.esp (original)
+++ servicemix/sandbox/gertv/smx-sling/servicemix-sling-console/src/main/resources/initial-content/apps/servicemix/dashboard/html.esp Wed Aug 27 00:07:52 2008
@@ -1,30 +1,64 @@
<html>
<head>
-<title>ServiceMix :: Dashboard</title>
+<title>Apache ServiceMix :: Dashboard</title>
<link rel="stylesheet" type="text/css" href="theme/master.css"/>
</head>
<body>
<div id="page">
-<h1>Servicemix :: Dashboard</h1>
+<h1>Apache Servicemix :: Dashboard</h1>
<div id="content">
<div id="portlet">
- <h2>Recent exchange archives</h2>
+ <h2>Recent exchange archives (sorted by date)</h2>
<ul>
<%
- var iter = request.resourceResolver.findResources("content/servicemix/exchanges/* order by @Created descending",
+ var iter = request.resourceResolver.findResources("content/servicemix/message_flows/* order by @Created descending",
Packages.javax.jcr.query.Query.XPATH);
var i = 0;
- while (iter.hasNext() && ++i <= 10) {
+ while (iter.hasNext() && ++i <= 15) {
var resource = iter.next();
- var name = resource.getPath().substr(resource.getPath().lastIndexOf("/")+1)
+ var name = resource.getPath().substr(resource.getPath().lastIndexOf("/")+1);
%>
<li><a href="<%= resource.getPath() + ".html" %>"><%=name%></a></li>
<%
}
%>
</ul>
- </div>
+ </div>
+
+ <div id="portlet">
+ <h2>Recent exchange archives (sorted by correlation id)</h2>
+ <ul>
+ <%
+ var current = 0;
+ for (var n in currentNode.getChildren()) {
+
+ var node_name = currentNode[n].getPath().substr(currentNode[n].getPath().lastIndexOf("/")+1);
+
+ if (node_name == "message_flows") {
+
+ var cNode = currentNode[n];
+
+ /*dates nodes*/
+ for (var dt in cNode.getChildren()) {
+
+ var idNode = cNode[dt];
+
+ /*corr_ids nodes*/
+ for (var id in idNode.getChildren()) {
+
+ var name2 = idNode[id].getPath().substr(idNode[id].getPath().lastIndexOf("/")+1);
+ %>
+ <li><a href="<%= idNode[id].getPath() + ".html" %>"><%= name2%></a></li>
+ <%
+ if (++current >= 15) break;
+ }
+ }
+ }
+ }
+ %>
+ </ul>
+ </div>
</div>
<% sling.include("/servicemix/navigation.div"); %>
Modified: servicemix/sandbox/gertv/smx-sling/servicemix-sling-console/src/main/resources/initial-content/apps/servicemix/exchange/tr.esp
URL: http://svn.apache.org/viewvc/servicemix/sandbox/gertv/smx-sling/servicemix-sling-console/src/main/resources/initial-content/apps/servicemix/exchange/tr.esp?rev=689392&r1=689391&r2=689392&view=diff
==============================================================================
--- servicemix/sandbox/gertv/smx-sling/servicemix-sling-console/src/main/resources/initial-content/apps/servicemix/exchange/tr.esp (original)
+++ servicemix/sandbox/gertv/smx-sling/servicemix-sling-console/src/main/resources/initial-content/apps/servicemix/exchange/tr.esp Wed Aug 27 00:07:52 2008
@@ -1,6 +1,7 @@
<tr>
- <td><a href="<%=currentNode%>.html">→</a></td>
- <td><%=currentNode['org.apache.servicemix.datestamp'] %></td>
+ <td>→</td>
+ <td><a href="<%=currentNode%>.html"><%=currentNode['org.apache.servicemix.datestamp'] %> </a></td>
+ <td> : </td>
<td><%=currentNode.Service == undefined ? "n/a" : currentNode.Service%></td>
<td><%=currentNode.Endpoint == undefined ? "n/a" : currentNode.Endpoint%></td>
<td><%=currentNode.ExchangeStatus%></td>
Modified: servicemix/sandbox/gertv/smx-sling/servicemix-sling-console/src/main/resources/initial-content/apps/servicemix/exchanges/html.esp
URL: http://svn.apache.org/viewvc/servicemix/sandbox/gertv/smx-sling/servicemix-sling-console/src/main/resources/initial-content/apps/servicemix/exchanges/html.esp?rev=689392&r1=689391&r2=689392&view=diff
==============================================================================
--- servicemix/sandbox/gertv/smx-sling/servicemix-sling-console/src/main/resources/initial-content/apps/servicemix/exchanges/html.esp (original)
+++ servicemix/sandbox/gertv/smx-sling/servicemix-sling-console/src/main/resources/initial-content/apps/servicemix/exchanges/html.esp Wed Aug 27 00:07:52 2008
@@ -1,20 +1,23 @@
<html>
<head>
-<title>ServiceMix :: Browse the archive</title>
+<title>Apache ServiceMix :: Browse the archive</title>
<link rel="stylesheet" type="text/css" href="/theme/master.css"/>
</head>
<body>
<div id="page">
-<h1>ServiceMix :: Browse the archive</h1>
+<h1>Apache ServiceMix :: Browse the archive</h1>
<div id="content">
+<br>
+<b>Message flows:</b>
<h2></h2>
+
<table>
<% var current = 0;
- for (var exchange in currentNode.getChildren()) {
- sling.include(currentNode[exchange] + ".tr");
- if (++current >= 50) break;
- }
+ for (var flow in currentNode.getChildren()) {
+ sling.include(currentNode[flow] + ".tr");
+ if (++current >= 50) break;
+ }
%>
</table>
</div>
Modified: servicemix/sandbox/gertv/smx-sling/servicemix-sling-console/src/main/resources/initial-content/apps/servicemix/exchanges/tr.esp
URL: http://svn.apache.org/viewvc/servicemix/sandbox/gertv/smx-sling/servicemix-sling-console/src/main/resources/initial-content/apps/servicemix/exchanges/tr.esp?rev=689392&r1=689391&r2=689392&view=diff
==============================================================================
--- servicemix/sandbox/gertv/smx-sling/servicemix-sling-console/src/main/resources/initial-content/apps/servicemix/exchanges/tr.esp (original)
+++ servicemix/sandbox/gertv/smx-sling/servicemix-sling-console/src/main/resources/initial-content/apps/servicemix/exchanges/tr.esp Wed Aug 27 00:07:52 2008
@@ -1,10 +1,4 @@
-<tr>
- <!-- <td><a href="<%=currentNode%>.html">+</a></td>
- <td><%=currentNode['org.apache.servicemix.datestamp'] %></td>
- <td><%=currentNode.Service == undefined ? "n/a" : currentNode.Service%></td>
- <td><%=currentNode.Endpoint == undefined ? "n/a" : currentNode.Endpoint%></td>
- <td><%=currentNode.ExchangeStatus%></td> -->
-
- <td><a href="<%=currentNode%>.html">+ <%=currentNode['CorrelationId'] %></a></td>
-
+<tr>
+ <td>→</td>
+ <td><a href="<%=currentNode%>.html"><%=currentNode['CorrelationId'] %></a></td>
</tr>
Modified: servicemix/sandbox/gertv/smx-sling/servicemix-sling-console/src/main/resources/initial-content/apps/servicemix/message_flow/html.esp
URL: http://svn.apache.org/viewvc/servicemix/sandbox/gertv/smx-sling/servicemix-sling-console/src/main/resources/initial-content/apps/servicemix/message_flow/html.esp?rev=689392&r1=689391&r2=689392&view=diff
==============================================================================
--- servicemix/sandbox/gertv/smx-sling/servicemix-sling-console/src/main/resources/initial-content/apps/servicemix/message_flow/html.esp (original)
+++ servicemix/sandbox/gertv/smx-sling/servicemix-sling-console/src/main/resources/initial-content/apps/servicemix/message_flow/html.esp Wed Aug 27 00:07:52 2008
@@ -1,19 +1,45 @@
<html>
<head>
<title>ServiceMix :: Dashboard</title>
-<link rel="stylesheet" type="text/css" href="theme/master.css"/>
+<link rel="stylesheet" type="text/css" href="/theme/master.css"/>
</head>
<body>
<div id="page">
<h1>Servicemix :: Message flow</h1>
<div id="content">
- <div id="portlet">
- <h2>Recent exchange archives</h2>
- <ul>
-
- </ul>
- </div>
+<br>
+<%
+var first = currentNode.getChildren()[0];
+%>
+
+<table>
+<tr>
+ <td><b>MEP: </b></td>
+ <td><%=first.Pattern == undefined ? "n/a" : first.Pattern%></td>
+</tr>
+<tr>
+ <td><b>Components: </b></td>
+ <td><%=first.Components == undefined ? "n/a" : first.Components%></td>
+</tr>
+<tr>
+ <td><b>Status: </b></td>
+ <td><%=first.ExchangeStatus == undefined ? "n/a" : first.ExchangeStatus%></td>
+</tr>
+</table>
+
+<br><br>
+<b>Exchanges:</b>
+<h2></h2>
+
+<table>
+<% var current = 0;
+ for (var exchange in currentNode.getChildren()) {
+ sling.include(currentNode[exchange] + ".tr");
+ if (++current >= 50) break;
+ }
+%>
+</table>
</div>
<% sling.include("/servicemix/navigation.div"); %>
Modified: servicemix/sandbox/gertv/smx-sling/servicemix-sling-console/src/main/resources/initial-content/content/servicemix.json
URL: http://svn.apache.org/viewvc/servicemix/sandbox/gertv/smx-sling/servicemix-sling-console/src/main/resources/initial-content/content/servicemix.json?rev=689392&r1=689391&r2=689392&view=diff
==============================================================================
--- servicemix/sandbox/gertv/smx-sling/servicemix-sling-console/src/main/resources/initial-content/content/servicemix.json (original)
+++ servicemix/sandbox/gertv/smx-sling/servicemix-sling-console/src/main/resources/initial-content/content/servicemix.json Wed Aug 27 00:07:52 2008
@@ -7,9 +7,9 @@
"sling:resourceType":"servicemix/exchanges"
},
- "message_flow":{
+ "message_flows":{
"jcr:primaryType":"nt:unstructured",
- "sling:resourceType":"servicemix/message_flow"
+ "sling:resourceType":"servicemix/message_flows"
},
"navigation":{