1. fix all actions and tests

2. fix js and jsp about getProject from session. 3. remove 'Move Story' from 'Release Plan' page. 4. remove useless actions 5. add new http libraries.
ezScrum · May 18, 2015 · e5edf42 · e5edf42
1 parent 814f1f4
commit e5edf42
Show file tree

Hide file tree

Showing 211 changed files with 3,068 additions and 3,288 deletions.
diff --git a/.classpath b/.classpath
@@ -12,8 +12,11 @@
 	<classpathentry kind="lib" path="lib/tomcat5.5/naming-resources.jar"/>
 	<classpathentry kind="lib" path="lib/Executer.jar"/>
 	<classpathentry kind="lib" path="lib/jacoco/jacocoant.jar"/>
-	<classpathentry kind="lib" path="lib/test/jersey-test-framework-provider-jetty-2.17.jar"/>
-	<classpathentry kind="lib" path="lib/test/http-20070405.jar"/>
+	<classpathentry kind="lib" path="lib/test/http/httpclient-4.4.1.jar"/>
+	<classpathentry kind="lib" path="lib/test/http/httpclient-cache-4.4.1.jar"/>
+	<classpathentry kind="lib" path="lib/test/http/httpcore-4.4.1.jar"/>
+	<classpathentry kind="lib" path="lib/test/http/httpmime-4.4.1.jar"/>
+	<classpathentry kind="lib" path="lib/test/http/http-20070405.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v5.5">
 		<attributes>
 			<attribute name="owner.project.facets" value="#system#"/>

diff --git a/WebContent/Pages/ProjectEdit.jsp b/WebContent/Pages/ProjectEdit.jsp
@@ -119,7 +119,12 @@
 				if (projectStore.getTotalCount() == 1)
 				{
 					var record = projectStore.getAt(0);
-					projectInfoForm.getForm().setValues({Name : record.data['Name'], DisplayName : record.data['DisplayName'], Comment : record.data['Comment'], ProjectManager : record.data['ProjectManager'], AttachFileSize : record.data['AttachFileSize']});
+					projectInfoForm.getForm().setValues({
+						Name : record.data['Name'],
+						DisplayName : record.data['DisplayName'],
+						Comment : record.data['Comment'],
+						ProjectManager : record.data['ProjectManager'],
+						AttachFileSize : record.data['AttachFileSize']});
 					projectInfoForm.getForm().findField('Name').getEl().dom.readOnly = true;					
 				}
 			},

diff --git a/WebContent/Pages/ProjectSummary.jsp b/WebContent/Pages/ProjectSummary.jsp
@@ -76,11 +76,11 @@ Ext.onReady(function() {
 			<tr>
 				<td class="SummaryTableBodyBorder">
 				<li class="SummaryFieldText">Project comment: <span
-					class="SummaryDataText">${projectInfoForm.comment}</span></li>
+					class="SummaryDataText">${projectObject.getComment()}</span></li>
 				<li class="SummaryFieldText">Project Manager: <span
-					class="SummaryDataText">${projectInfoForm.projectManager}</span></li>
+					class="SummaryDataText">${projectObject.getManager()}</span></li>
 				<li class="SummaryFieldText">Create Date: <span
-					class="SummaryDataText">${projectInfoForm.createDate}</span></li>
+					class="SummaryDataText">${new Date(projectObject.getCreateTime())}</span></li>
 
 
 				</td>

diff --git a/WebContent/Pages/ntut/csie/ezScrum/stapler/ProductBacklog/ProductBacklogTopToolbar.jsp b/WebContent/Pages/ntut/csie/ezScrum/stapler/ProductBacklog/ProductBacklogTopToolbar.jsp
@@ -8,14 +8,14 @@
 </head>
 <body>
 <%@page import="ntut.csie.ezScrum.web.support.SessionManager"%>
-<%@page import="ntut.csie.jcis.resource.core.IProject"%>
+<%@page import="ntut.csie.ezScrum.web.dataObject.ProjectObject"%>
 <%@ page import="ntut.csie.ezScrum.stapler.ProductBacklog" %>
 <%
 String projectID = request.getParameter("PID");
 
-IProject project = (IProject) SessionManager.getProject( request );
+ProjectObject project = SessionManager.getProjectObject(request);
 if( project != null ){
-	projectID = project.getProjectDesc().getName();
+	projectID = project.getName();
 }
 
 ProductBacklog p = new ProductBacklog( projectID );

diff --git a/WebContent/Pages/ntut/csie/ezScrum/stapler/ProjectLeftTree.jsp b/WebContent/Pages/ntut/csie/ezScrum/stapler/ProjectLeftTree.jsp
@@ -11,7 +11,7 @@
 	<%@page import="ntut.csie.ezScrum.stapler.Project"%>
 	<%
 		String projectID = request.getParameter("PID");
-		ProjectObject projectObject = (ProjectObject) SessionManager.getProjectObject(request);
+		ProjectObject projectObject = SessionManager.getProjectObject(request);
 		
 		if (projectObject != null) {
 			projectID = projectObject.getName();

diff --git a/WebContent/Pages/ntut/csie/ezScrum/stapler/ReleasePlan/ReleasePlanTopToolbar.jsp b/WebContent/Pages/ntut/csie/ezScrum/stapler/ReleasePlan/ReleasePlanTopToolbar.jsp
@@ -7,14 +7,14 @@
 </head>
 <body>
 	<%@page import="ntut.csie.ezScrum.web.support.SessionManager"%>
-	<%@page import="ntut.csie.jcis.resource.core.IProject"%>
+	<%@page import="ntut.csie.ezScrum.web.dataObject.ProjectObject"%>
 	<%@page import="ntut.csie.ezScrum.stapler.ReleasePlan"%>
 	<%
 		String projectID = request.getParameter("PID");
-		IProject project = (IProject) SessionManager.getProject(request);
+		ProjectObject project = SessionManager.getProjectObject(request);
 		
 		if (project != null) {
-			projectID = project.getProjectDesc().getName();
+			projectID = project.getName();
 		}
 		ReleasePlan releasePlan = new ReleasePlan(projectID);
 	%>

diff --git a/WebContent/Pages/ntut/csie/ezScrum/stapler/TaskBoard/TaskBoardCardPanel.jsp b/WebContent/Pages/ntut/csie/ezScrum/stapler/TaskBoard/TaskBoardCardPanel.jsp
@@ -5,24 +5,22 @@
 	<title>ezScrum, SSLab NTUT</title>
 </head>
 <body>
-<%@ page import="ntut.csie.ezScrum.stapler.TaskBoard" %>
-<%@ page import="ntut.csie.ezScrum.web.form.ProjectInfoForm" %>
-<%@ page import="ntut.csie.ezScrum.web.internal.IProjectSummaryEnum" %>
-<%
-ProjectInfoForm projectInfoForm = (ProjectInfoForm)session.getAttribute( IProjectSummaryEnum.PROJECT_INFO_FORM );
-String projectID = projectInfoForm.getName();
-TaskBoard taskBoard = new TaskBoard( projectID ); 
-%>
-
-<script type="text/javascript">
-
-Ext.ns('ezScrum.TaskBoard');
-// Task Board include 3 panel(Sprint Information, Burndown Chart, Card Panel)
-// The extension point of TaskBoard only "Card Panel"
-
-// get Task Board plug-in ID
-ezScrum.TaskBoard.CardPanel = '<%=taskBoard.getBoardPlugin()%>';
-
-</script>
+	<%@page import="ntut.csie.ezScrum.stapler.TaskBoard"%>
+	<%@page import="ntut.csie.ezScrum.web.support.SessionManager"%>
+	<%@page import="ntut.csie.ezScrum.web.dataObject.ProjectObject"%>
+	<%
+		ProjectObject projectObject = (ProjectObject) request.getAttribute("projectObject");
+		String projectName = projectObject.getName();
+		TaskBoard taskBoard = new TaskBoard(projectName);
+	%>
+
+	<script type="text/javascript">
+		Ext.ns('ezScrum.TaskBoard');
+		// Task Board include 3 panel(Sprint Information, Burndown Chart, Card Panel)
+		// The extension point of TaskBoard only "Card Panel"
+		
+		// get Task Board plug-in ID
+		ezScrum.TaskBoard.CardPanel = '<%=taskBoard.getBoardPlugin()%>';
+	</script>
 </body>
 </html>
diff --git a/WebContent/WEB-INF/lib/commons-codec-1.10.jar b/WebContent/WEB-INF/lib/commons-codec-1.10.jar
diff --git a/WebContent/WEB-INF/lib/commons-codec-1.3.jar b/WebContent/WEB-INF/lib/commons-codec-1.3.jar
diff --git a/WebContent/WEB-INF/struts-config.xml b/WebContent/WEB-INF/struts-config.xml
@@ -252,7 +252,6 @@
         </action>
 
         <action path="/fileDownload" type="ntut.csie.ezScrum.web.action.FileDownloadAction" />
-        <action path="/AjaxGetCustomIssueType" type="ntut.csie.ezScrum.web.action.other.AjaxGetCustomIssueTypeAction" />
 
 		<action path="/logon" type="ntut.csie.ezScrum.web.action.LogonAction">
 			<exception key="error.invalidateUser"			type="ntut.csie.ezScrum.web.InvalidUserException" scope="request" />

diff --git a/WebContent/javascript/AjaxWidget/Common.js b/WebContent/javascript/AjaxWidget/Common.js
@@ -114,6 +114,13 @@ var taskJSReader = new Ext.data.JsonReader({
    totalProperty: 'Total'
 }, Task);
 
+/* Story Jason Parser */
+var storyJSReader = new Ext.data.JsonReader({
+   root: 'Story',
+   id : 'Id',
+   totalProperty: 'Total'
+}, Story);
+
 /* Issue Jason Parser, include Story and Task */
 var jsonIssueReader = new Ext.data.JsonReader({
    root: 'Issue',