SAK-8493

git-svn-id: https://source.sakaiproject.org/svn/gradebook/trunk@21937 66ffb92e-73f9-0310-93c1-f5514f145a0a
ox-it · Feb 27, 2007 · a9e918e · a9e918e
1 parent 560bfa3
commit a9e918e
Show file tree

Hide file tree

Showing 34 changed files with 249 additions and 166 deletions.
diff --git a/.classpath b/.classpath
@@ -6,7 +6,6 @@
 	<classpathentry kind="var" path="MAVEN_REPO/org.hibernate/jars/hibernate-3.1.3.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/org.springframework/jars/spring-1.2.8.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/commons-lang/jars/commons-lang-2.1.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/myfaces/jars/myfaces-1.0.9.jar" sourcepath="/THIRD_PARTY_SRC/myfaces-1.1.1-src"/>
 	<classpathentry kind="var" path="MAVEN_REPO/jspapi/jars/jsp-api-2.0.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/poi/jars/poi-2.5.1.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.1.jar"/>
@@ -32,5 +31,8 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/db-api"/>
 	<classpathentry kind="var" path="MAVEN_REPO/xstream/jars/xstream-1.2.1.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/import-api"/>
+	<classpathentry kind="var" path="MAVEN_REPO/myfaces/jars/myfaces-api-1.1.5.jar"/>
+	<classpathentry kind="var" path="MAVEN_REPO/myfaces/jars/tomahawk-1.1.3.jar" sourcepath="/THIRD_PARTY_SRC/myfaces-1.1.5-src/src/"/>
+	<classpathentry kind="var" path="MAVEN_REPO/myfaces/jars/myfaces-impl-1.1.5.jar" sourcepath="/THIRD_PARTY_SRC/myfaces-1.1.5-src/src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/app/business/pom.xml b/app/business/pom.xml
@@ -270,11 +270,19 @@
     </dependency>
 <!-- MyFaces JSF -->
     <dependency>
-
-      <groupId>myfaces</groupId>
-      <artifactId>myfaces-all</artifactId>
-      <version>1.1.1</version>
-      <scope>provided</scope>
+      <groupId>org.apache.myfaces.core</groupId>
+      <artifactId>myfaces-api</artifactId>
+      <version>1.1.5</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.myfaces.core</groupId>
+      <artifactId>myfaces-impl</artifactId>
+      <version>1.1.5</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.myfaces.tomahawk</groupId>
+      <artifactId>tomahawk</artifactId>
+      <version>1.1.3</version>
     </dependency>
 <!-- Needed by MyFaces ExtensionsFilter -->
     <dependency>

diff --git a/app/project.xml b/app/project.xml
@@ -265,8 +265,24 @@
 		<!-- MyFaces JSF -->
 		<dependency>
 			<groupId>myfaces</groupId>
-			<artifactId>myfaces-all</artifactId>
-			<version>1.1.1</version>
+			<artifactId>myfaces-api</artifactId>
+			<version>1.1.5</version>
+			<properties>
+				<war.bundle>true</war.bundle>
+			</properties>
+		</dependency>
+		<dependency>
+			<groupId>myfaces</groupId>
+			<artifactId>myfaces-impl</artifactId>
+			<version>1.1.5</version>
+			<properties>
+				<war.bundle>true</war.bundle>
+			</properties>
+		</dependency>
+		<dependency>
+			<groupId>myfaces</groupId>
+			<artifactId>tomahawk</artifactId>
+			<version>1.1.3</version>
 			<properties>
 				<war.bundle>true</war.bundle>
 			</properties>

diff --git a/app/sakai-tool/pom.xml b/app/sakai-tool/pom.xml
@@ -291,11 +291,21 @@
     </dependency>
 <!-- MyFaces JSF -->
     <dependency>
-
-      <groupId>myfaces</groupId>
-      <artifactId>myfaces-all</artifactId>
-      <version>1.1.1</version>
+      <groupId>org.apache.myfaces.core</groupId>
+      <artifactId>myfaces-api</artifactId>
+      <version>1.1.5</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.myfaces.core</groupId>
+      <artifactId>myfaces-impl</artifactId>
+      <version>1.1.5</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.myfaces.tomahawk</groupId>
+      <artifactId>tomahawk</artifactId>
+      <version>1.1.3</version>
+    </dependency>
+
 <!-- Needed by MyFaces ExtensionsFilter -->
 <!-- although this is in shared, the maven 1 build put it into the war -->
     <dependency>

diff --git a/app/sakai-tool/src/webapp/WEB-INF/web.xml b/app/sakai-tool/src/webapp/WEB-INF/web.xml
@@ -95,7 +95,7 @@
     <!-- Support for MyFaces component resources. -->
     <filter>
         <filter-name>MyFacesExtensionsFilter</filter-name>
-        <filter-class>org.apache.myfaces.component.html.util.ExtensionsFilter</filter-class>
+        <filter-class>org.apache.myfaces.webapp.filter.ExtensionsFilter</filter-class>
         <init-param>
             <param-name>uploadMaxFileSize</param-name>
             <param-value>10m</param-value>

diff --git a/app/sakai-tool/src/webapp/inc/preludeEmbeddedClassic.jspf b/app/sakai-tool/src/webapp/inc/preludeEmbeddedClassic.jspf
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
 <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://myfaces.apache.org/extensions" prefix="x"%>
+<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
 <%@ taglib uri="http://sakaiproject.org/jsf/sakai" prefix="sakai"%>
 <%@ taglib uri="http://sakaiproject.org/jsf/gradebook" prefix="gbx"%>
 <jsp:useBean id="msgs" class="org.sakaiproject.util.ResourceLoader" scope="session">

diff --git a/app/standalone-app/pom.xml b/app/standalone-app/pom.xml
@@ -298,12 +298,21 @@
     </dependency>
 <!-- MyFaces JSF -->
     <dependency>
-
-      <groupId>myfaces</groupId>
-      <artifactId>myfaces-all</artifactId>
-      <version>1.1.1</version>
-      <scope>provided</scope>
+      <groupId>org.apache.myfaces.core</groupId>
+      <artifactId>myfaces-api</artifactId>
+      <version>1.1.5</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.myfaces.core</groupId>
+      <artifactId>myfaces-impl</artifactId>
+      <version>1.1.5</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.myfaces.tomahawk</groupId>
+      <artifactId>tomahawk</artifactId>
+      <version>1.1.3</version>
     </dependency>
+
 <!-- Needed by MyFaces ExtensionsFilter -->
     <dependency>
 

diff --git a/app/standalone-app/src/webapp/WEB-INF/web.xml b/app/standalone-app/src/webapp/WEB-INF/web.xml
@@ -44,7 +44,7 @@
 	<!-- Support for MyFaces component resources. -->
 	<filter>
 		<filter-name>MyFacesExtensionsFilter</filter-name>
-		<filter-class>org.apache.myfaces.component.html.util.ExtensionsFilter</filter-class>
+		<filter-class>org.apache.myfaces.webapp.filter.ExtensionsFilter</filter-class>
         <init-param>
             <param-name>uploadMaxFileSize</param-name>
             <param-value>10m</param-value>

diff --git a/app/standalone-app/src/webapp/inc/preludeStandalone.jspf b/app/standalone-app/src/webapp/inc/preludeStandalone.jspf
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
 <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://myfaces.apache.org/extensions" prefix="x"%>
+<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
 <%@ taglib uri="http://sakaiproject.org/jsf/sakai" prefix="sakai"%>
 <%@ taglib uri="http://sakaiproject.org/jsf/gradebook" prefix="gbx"%>
 <f:loadBundle basename="org.sakaiproject.tool.gradebook.bundle.Messages" var="msgs"/>

diff --git a/app/ui/pom.xml b/app/ui/pom.xml
@@ -277,12 +277,21 @@
     </dependency>
 <!-- MyFaces JSF -->
     <dependency>
-
-      <groupId>myfaces</groupId>
-      <artifactId>myfaces-all</artifactId>
-      <version>1.1.1</version>
-      <scope>provided</scope>
+      <groupId>org.apache.myfaces.core</groupId>
+      <artifactId>myfaces-api</artifactId>
+      <version>1.1.5</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.myfaces.core</groupId>
+      <artifactId>myfaces-impl</artifactId>
+      <version>1.1.5</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.myfaces.tomahawk</groupId>
+      <artifactId>tomahawk</artifactId>
+      <version>1.1.3</version>
     </dependency>
+
 <!-- Needed by MyFaces ExtensionsFilter -->
     <dependency>
 

diff --git a/app/ui/src/java/org/sakaiproject/tool/gradebook/jsf/HtmlSortHeaderRenderer.java b/app/ui/src/java/org/sakaiproject/tool/gradebook/jsf/HtmlSortHeaderRenderer.java
@@ -58,8 +58,8 @@
 import org.apache.myfaces.component.UserRoleUtils;
 import org.apache.myfaces.component.html.ext.HtmlDataTable;
 import org.apache.myfaces.custom.sortheader.HtmlCommandSortHeader;
-import org.apache.myfaces.renderkit.html.HTML;
-import org.apache.myfaces.renderkit.html.HtmlLinkRendererBase;
+import org.apache.myfaces.shared_impl.renderkit.html.HTML;
+import org.apache.myfaces.shared_impl.renderkit.html.HtmlLinkRendererBase;
 
 /**
  * Based on org.apache.myfaces.custom.sortheader.HtmlSortHeaderRenderer.

diff --git a/app/ui/src/webapp/addAssignment.jsp b/app/ui/src/webapp/addAssignment.jsp
@@ -2,9 +2,9 @@
   <div class="portletBody">
 	<h:form id="gbForm">
 
-		<x:aliasBean alias="#{bean}" value="#{addAssignmentBean}">
+		<t:aliasBean alias="#{bean}" value="#{addAssignmentBean}">
 			<%@include file="/inc/appMenu.jspf"%>
-		</x:aliasBean>
+		</t:aliasBean>
 
 		<sakai:flowState bean="#{addAssignmentBean}" />
 
@@ -15,9 +15,9 @@
 
 		<h4><h:outputText value="#{msgs.add_assignment_header}"/></h4>
 
-		<x:aliasBean alias="#{bean}" value="#{addAssignmentBean}">
+		<t:aliasBean alias="#{bean}" value="#{addAssignmentBean}">
 			<%@include file="/inc/assignmentEditing.jspf"%>
-		</x:aliasBean>
+		</t:aliasBean>
 
 		<p class="act calendarPadding">
 			<h:commandButton

diff --git a/app/ui/src/webapp/assignmentDetails.jsp b/app/ui/src/webapp/assignmentDetails.jsp
@@ -9,9 +9,9 @@
   <div class="portletBody">
 	<h:form id="gbForm">
 
-		<x:aliasBean alias="#{bean}" value="#{assignmentDetailsBean}">
+		<t:aliasBean alias="#{bean}" value="#{assignmentDetailsBean}">
 			<%@include file="/inc/appMenu.jspf"%>
-		</x:aliasBean>
+		</t:aliasBean>
 
 		<sakai:flowState bean="#{assignmentDetailsBean}" />
 
@@ -120,11 +120,11 @@
 
 		<%@include file="/inc/globalMessages.jspf"%>
 
-		<x:aliasBean alias="#{bean}" value="#{assignmentDetailsBean}">
+		<t:aliasBean alias="#{bean}" value="#{assignmentDetailsBean}">
 			<%@include file="/inc/filterPaging.jspf"%>
-		</x:aliasBean>
+		</t:aliasBean>
 
-		<x:dataTable cellpadding="0" cellspacing="0"
+		<t:dataTable cellpadding="0" cellspacing="0"
 			id="gradingTable"
 			value="#{assignmentDetailsBean.scoreRows}"
 			var="scoreRow"
@@ -136,23 +136,23 @@
 			styleClass="listHier narrowerTable">
 			<h:column>
 				<f:facet name="header">
-		            <x:commandSortHeader columnName="studentSortName" arrow="true" immediate="false" actionListener="#{assignmentDetailsBean.sort}">
+		            <t:commandSortHeader columnName="studentSortName" arrow="true" immediate="false" actionListener="#{assignmentDetailsBean.sort}">
 						<h:outputText value="#{msgs.assignment_details_student_name}" styleClass="tier0"/>
-		            </x:commandSortHeader>
+		            </t:commandSortHeader>
 				</f:facet>
-				<x:div styleClass="gbTextOnRow">
+				<t:div styleClass="gbTextOnRow">
 					<h:outputText value="#{scoreRow.enrollment.user.sortName}"/>
-				</x:div>
+				</t:div>
 			</h:column>
 			<h:column>
 				<f:facet name="header">
-		            <x:commandSortHeader columnName="studentDisplayId" arrow="true" immediate="false" actionListener="#{assignmentDetailsBean.sort}">
+		            <t:commandSortHeader columnName="studentDisplayId" arrow="true" immediate="false" actionListener="#{assignmentDetailsBean.sort}">
 						<h:outputText value="#{msgs.assignment_details_student_id}" styleClass="tier0"/>
-		            </x:commandSortHeader>
+		            </t:commandSortHeader>
 				</f:facet>
-				<x:div styleClass="gbTextOnRow">
+				<t:div styleClass="gbTextOnRow">
 					<h:outputText value="#{scoreRow.enrollment.user.displayId}"/>
-				</x:div>
+				</t:div>
 			</h:column>
 
 			<h:column>
@@ -168,12 +168,12 @@
 
 			<h:column>
 				<f:facet name="header">
-		            <x:commandSortHeader columnName="studentScore" arrow="true" immediate="false" actionListener="#{assignmentDetailsBean.sort}">
+		            <t:commandSortHeader columnName="studentScore" arrow="true" immediate="false" actionListener="#{assignmentDetailsBean.sort}">
 						<h:outputText value="#{msgs.assignment_details_points}"/>
-		            </x:commandSortHeader>
+		            </t:commandSortHeader>
 				</f:facet>
 
-				<x:div styleClass="shorttext">
+				<t:div styleClass="shorttext">
 					<h:inputText id="Score" value="#{scoreRow.score}" size="4" rendered="#{!assignmentDetailsBean.assignment.externallyMaintained}" style="text-align:right;"
 						onkeypress="return submitOnEnter(event, 'gbForm:saveButton');">
 						<f:converter converterId="org.sakaiproject.gradebook.jsf.converter.NONTRAILING_DOUBLE" />
@@ -184,7 +184,7 @@
 					<h:outputText value="#{scoreRow.score}" rendered="#{assignmentDetailsBean.assignment.externallyMaintained}">
 						<f:converter converterId="org.sakaiproject.gradebook.jsf.converter.POINTS" />
 					</h:outputText>
-				</x:div>
+				</t:div>
 			</h:column>
 			<h:column>
 				<f:facet name="header">
@@ -201,20 +201,20 @@
 					</h:panelGroup>
 				</f:facet>
 				<h:message for="Score" styleClass="validationEmbedded gbMessageAdjustForContent"/>
-				<x:div styleClass="gbTextOnRow" rendered="#{!scoreRow.commentEditable}">
+				<t:div styleClass="gbTextOnRow" rendered="#{!scoreRow.commentEditable}">
 					<h:outputText value="#{scoreRow.commentText}"/>
-				</x:div>
-				<x:div rendered="#{scoreRow.commentEditable}">
+				</t:div>
+				<t:div rendered="#{scoreRow.commentEditable}">
 					<h:inputTextarea id="Comment" value="#{scoreRow.commentText}"
 						rows="4" cols="35">
 					</h:inputTextarea>
-				</x:div>
+				</t:div>
 			</h:column>
-		</x:dataTable>
+		</t:dataTable>
 
-		<x:aliasBean alias="#{bean}" value="#{assignmentDetailsBean}">
+		<t:aliasBean alias="#{bean}" value="#{assignmentDetailsBean}">
 			<%@include file="/inc/gradingEventLogs.jspf"%>
-		</x:aliasBean>
+		</t:aliasBean>
 
 		<p class="instruction">
 			<h:outputText value="#{msgs.assignment_details_no_enrollments}" rendered="#{assignmentDetailsBean.emptyEnrollments}" />