tweaks

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@904580 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 60 insertions, 24 deletions

diff --git a/sandbox/kgoodson/jagg/src/main/java/services/PlanViewImpl.java b/sandbox/kgoodson/jagg/src/main/java/services/PlanViewImpl.java
index 1b71c9e66b..4bef994b3f 100644
--- a/sandbox/kgoodson/jagg/src/main/java/services/PlanViewImpl.java
+++ b/sandbox/kgoodson/jagg/src/main/java/services/PlanViewImpl.java
@@ -119,7 +119,8 @@ public class PlanViewImpl implements PlanView {
 					List<JAXBElement<?>> c  = i.getContent();
 					for (JAXBElement<?> element : c) {
 						if("title".equals(element.getName().getLocalPart())) {
-							jd.setTitle((String)element.getValue());
+							String jtitle = (String)element.getValue();
+							jd.setTitle(jtitle.substring(jtitle.indexOf(']')+1, jtitle.length()));
 						}
 						else if("status".equals(element.getName().getLocalPart())){
 							jd.setStatus((String)element.getValue());
diff --git a/sandbox/kgoodson/jagg/src/main/resources/JiraSideband.xml b/sandbox/kgoodson/jagg/src/main/resources/JiraSideband.xml
index fc6f66e770..0af97d7a9d 100644
--- a/sandbox/kgoodson/jagg/src/main/resources/JiraSideband.xml
+++ b/sandbox/kgoodson/jagg/src/main/resources/JiraSideband.xml
@@ -2,7 +2,7 @@
 <jagg:plan xmlns:jagg="http://www.example.com/tracking" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.example.com/tracking JiraSideband.xsd ">
   <issueBase>https://issues.apache.org/jira/browse/</issueBase>
 
- <milestone ID="M1">
+ <milestone ID="V8 M5I14a">
 	<dueDate>2001-01-01</dueDate>
 	<deliveredby>deliveredby</deliveredby>
 	<note>note</note>
@@ -16,7 +16,7 @@
   		<repository_vid>repository_vid</repository_vid>
   		<note>note</note>
   	</workItem>
-  	<workItem ID='ENHANCE_ART_PROC_PERF'>
+  	<workItem>
   		<title>Enhance artefact processing performance by returning URI and location URL in one call</title>
   		<responsible>LR</responsible>
   		<dueDate>2001-01-01</dueDate>
@@ -25,7 +25,7 @@
   		<repository_vid>repository_vid</repository_vid>
   		<note>note</note>
   	</workItem>
-  	<workItem ID='CONTRIBS_IDENT_SPEC_VERS'>
+  	<workItem>
   		<title>Add support for identifying the SCA Spec Version for contribution metadata</title>
   		<responsible>LR</responsible>
   		<dueDate>2001-01-01</dueDate>
@@ -35,17 +35,34 @@
   		<note>note</note>
   	</workItem>
 </milestone>
-<milestone ID="Dummy">
-  	<workItem ID='Activity1'>
-  		<title>Add support for ....</title>
-  		<responsible>FB</responsible>
-  		<dueDate>2001-01-01</dueDate>
-  		<jira>TUSCANY-3333</jira>
-  		<status>in progress</status>
-  		<repository_vid>repository_vid</repository_vid>
-  		<note>note</note>
-  	</workItem>
-</milestone>
-  	
+ <milestone ID="V8_M5I14b">
+ 	<workItem>
+ 		<title>Itest copy from 1.x to 2.x</title>
+ 		<responsible>Ram</responsible>
+ 		<jira>TUSCANY-3433</jira>
+ 	</workItem>
+ 	<workItem>
+ 		<title>Non-simple property injection</title>
+ 		<responsible>Raymond</responsible>
+ 		<jira>TUSCANY-3409</jira>
+ 	</workItem>
+ 	<workItem>
+ 		<title>local/remote determination</title>
+ 		<responsible>Raymond</responsible>
+ 		<jira>TUSCANY-3441</jira>
+ 	</workItem>
+ 	<workItem>
+ 		<title>SPI version tracking</title>
+ 		<responsible>SL</responsible>
+ 		<jira>TUSCANY-3443</jira>
+ 	</workItem>
+ 	<workItem>
+ 		<title>Mechanism to retrieve revision number</title>
+ 		<responsible>AE</responsible>
+ 	</workItem>
+ 	<workItem>
+ 		<title>client API no honouring domain URI</title>
+ 		<responsible>AE</responsible>
+ 	</workItem></milestone>
 
 </jagg:plan>
diff --git a/sandbox/kgoodson/jagg/src/main/resources/uiservices/plan.html b/sandbox/kgoodson/jagg/src/main/resources/uiservices/plan.html
index b5b3cba24c..90e34be917 100644
--- a/sandbox/kgoodson/jagg/src/main/resources/uiservices/plan.html
+++ b/sandbox/kgoodson/jagg/src/main/resources/uiservices/plan.html
@@ -34,18 +34,36 @@
 			alert(exception.message);
 			return;
 		}
+		ms = plan.milestone.list;
 		var mscontent = "<table border=\"1\" align=\"left\">";
-	 	ms = plan.milestone.list;
 		for(var i=0; i<ms.length; i++) {
-			mscontent += "<tr><th colspan=\"4\" align=\"left\">Milestone " + ms[i].ID + "</th></tr>";
+			mscontent += "<tr><th colspan=\"6\" align=\"left\">Milestone " + ms[i].ID + "</th></tr>";
 			var mswi = ms[i].workItem.list;
-			mscontent +="<tr><th align=\"left\">Title</th><td>JIRA</th><td>Responsible</th><th>Status</th></tr>";
+			mscontent +="<tr>"+
+
+							"<th>Work Item</th>"+
+							"<th>Owner</th>"+
+							"<th>Jira</th>"+
+							"<th>Jira title</th>"+
+							"<th>Jira Assigned To</th>"+
+							"<th>Status</th>"+
+
+							"</tr>";
 			for (var j=0; j<mswi.length; j++) {
-				mscontent +=
-					"<tr>"
-					+"<td>"+mswi[j].title+"</td>" + "<td><A HREF=\""+plan.issueBase+mswi[j].jira+"\">"+mswi[j].jira
-						+"</td>"+ "<td>"+mswi[j].jiraData.assignedTo+"</td>"+ "<td>"+mswi[j].jiraData.status+"</td>"+ "<td></td>"
-					+"</tr>";
+				mscontent +="<tr>"+"<td>"+mswi[j].title+"</td>"+
+				"<td>"+mswi[j].responsible+"</td>";
+				if(mswi[j].jira) {
+					mscontent += 
+					"<td><A HREF=\""+plan.issueBase+mswi[j].jira+"\">"+mswi[j].jira+"</A></td>"+
+
+					"<td>"+mswi[j].jiraData.title+"</td>"+
+					"<td>"+mswi[j].jiraData.assignedTo+"</td>"+
+					"<td>"+mswi[j].jiraData.status+"</td>"+
+					"<td></td>"
+				} else {
+					mscontent += "<td colspan=\"4\"></td>";
+				}
+				mscontent += "</tr>";
 			}
 
 		}