checkpoint

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

2 files changed, 64 insertions, 19 deletions

diff --git a/sandbox/kgoodson/jagg/src/main/resources/JiraSideband.xml b/sandbox/kgoodson/jagg/src/main/resources/JiraSideband.xml
index afe66a5c32..d7a473763e 100644
--- a/sandbox/kgoodson/jagg/src/main/resources/JiraSideband.xml
+++ b/sandbox/kgoodson/jagg/src/main/resources/JiraSideband.xml
@@ -27,6 +27,20 @@
             </jiraData>
         </workItem>
         <workItem>
+            <jira>TUSCANY-1400</jira>
+        </workItem>
+        <workItem>
+            <jira>TUSCANY-2223</jira>
+        </workItem>
+        <workItem>
+            <jira>TUSCANY-1122</jira>
+            <jiraData ID="TUSCANY-1122">
+                <title> TypeConversionTestCase fails for JDK 1.4.2</title>
+                <status>Resolved</status>
+                <assignedTo>Unassigned</assignedTo>
+            </jiraData>
+        </workItem>
+        <workItem>
             <jira>TUSCANY-1111</jira>
             <jiraData ID="TUSCANY-1111">
                 <title> Interchangeability of Java and WSDL</title>
@@ -60,8 +74,18 @@
                 <assignedTo>Unassigned</assignedTo>
             </jiraData>
         </workItem>
+    </milestone>
+    <milestone ID="abcd">
+        <workItem>
+            <jira>TUSCANY-1357</jira>
+            <jiraData ID="TUSCANY-1357">
+                <title> The Result returned by SDOUtil.getTypes includes DocumentRoot Type</title>
+                <status>Closed</status>
+                <assignedTo>Unassigned</assignedTo>
+            </jiraData>
+        </workItem>
         <workItem>
-            <jira>TUSCANY-2222</jira>
+            <jira>TUSCANY-1359</jira>
         </workItem>
     </milestone>
 </ns2:plan>
diff --git a/sandbox/kgoodson/jagg/src/main/resources/uiservices/plan.html b/sandbox/kgoodson/jagg/src/main/resources/uiservices/plan.html
index a914dbe14e..a26049f958 100644
--- a/sandbox/kgoodson/jagg/src/main/resources/uiservices/plan.html
+++ b/sandbox/kgoodson/jagg/src/main/resources/uiservices/plan.html
@@ -49,14 +49,17 @@
 						"</tr>";
 			for (var j=0; j<mswi.length; j++) {
 				mscontent +="<tr>";
-				if(mswi[j].jira) {
+				if(mswi[j].jira != null) {
 					mscontent += 
-					"<td><A HREF=\""+plan.issueBase+mswi[j].jira+"\">"+mswi[j].jira+"</A></td>"+
-
-					"<td>"+mswi[j].jiraData.title+"</td>"+
+					"<td><A HREF=\""+plan.issueBase+mswi[j].jira+"\">"+mswi[j].jira+"</A></td>";
+				} else {
+					mscontent += '<td>No JIRA for Work Item</td>';
+				}	
+				if(mswi[j].jiraData!= null) {
+					mscontent += "<td>"+mswi[j].jiraData.title+"</td>"+
 					"<td>"+mswi[j].jiraData.assignedTo+"</td>"+
 					"<td>"+mswi[j].jiraData.status+"</td>"+
-					"<td></td>"
+					"<td></td>";
 				} else {
 					mscontent += "<td colspan=\"4\"></td>";
 				}
@@ -74,14 +77,13 @@
 		var newmscontent =
 			'<form name="newWorkItemForm">'+
 	   	      '<div id="addWorkItem">'+
-	   	    	'JIRA: <input type="text" name="JIRA" value="TUSCANY-"><br/>'+
-	   	    	mschoice+
-	   	    	'<br/>New Milestone'+
-	   	    	'<input name="newmsname" type=text/></td></tr>'+
-			    '<input type="button" onClick="addWorkItem()" value="Add Work Item">'+
-			 '</div>'+
+	   	    	'Add new Work Item for JIRA: <input type="text" name="JIRA" value="TUSCANY-">'+ 'in Milestone '+mschoice+ 
+	   	    				    '<input type="button" onClick="addWorkItem()" value="Add"></div>'+
+	   	    	'<br/><div id="addMilestone>">Add New Milestone <input name="newmsname" type=text/><input type="button" onClick="addMilestone()" value="Add Milestone">'+
+	   	  	   	    	'</td></tr></div>'+
+	   	  	   	'<tr><td><input type="button" name="refresh" value="Refresh Jira Data" onclick="refreshJiraData"/></td></tr>'
 	   	    '</form>';
-
+	   	 
 	   	document.getElementById('addPlanData').innerHTML=newmscontent;
 		return;
 		
@@ -90,21 +92,39 @@
 	
 	function init()
 	{
-		planView.get().addCallback(plan_getResponse);
+		planView.getLite().addCallback(plan_getResponse);
 	}
 
+	
+
 	function addWorkItem() {
 
-		planView.post(document.newWorkItemForm.newmsname.value,
-				      document.newWorkItemForm.mschoice.value,
-				      document.newWorkItemForm.JIRA.value)
-		  .addCallback(plan_postNewItem_response);
+		planView.postNewWorkItem(
+			 document.newWorkItemForm.mschoice.value,
+			 document.newWorkItemForm.JIRA.value).addCallback(plan_postNewWorkItem_response);
 	}
 
-	function plan_postNewItem_response()
+	function plan_postNewWorkItem_response()
 	{
+		// refresh
+		planView.getLite().addCallback(plan_getResponse);
 	}
 
+	function addMilestone()
+	{
+		planView.postNewMilestone(document.newWorkItemForm.newmsname.value).addCallback(plan_postNewMilestone_response);		
+	}
+
+	function plan_postNewMilestone_response()
+	{
+		// refresh
+		planView.getLite().addCallback(plan_getResponse);
+	}
+
+	function refreshJiraData()
+	{
+		planView.get().addCallback(plan_getResponse);
+	}
 	
 </script>
 
@@ -117,6 +137,7 @@
 	<table>
 	  <tr><td><div id="milestones"></div></td></tr>
 	  <tr><td><div id="addPlanData"></div></td></tr>
+	  
 	</table>
 	</body>
 </html>
\ No newline at end of file