From 1b2dd319db6320b705f7ca2308230c61aee7a4b6 Mon Sep 17 00:00:00 2001
From: Sam Ottenhoff <ottenhoff@longsight.com>
Date: Thu, 3 Nov 2011 19:29:15 +0000
Subject: [PATCH] SAK-21364 fix JSP include statements so we don't need
 JAVA_OPTS workaround in Tomcat 7

git-svn-id: https://source.sakaiproject.org/svn/sections/trunk@100445 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
 sections/sections-app/src/webapp/common/addSections.jsp     | 6 +++---
 sections/sections-app/src/webapp/common/deleteSections.jsp  | 2 +-
 sections/sections-app/src/webapp/common/editManagers.jsp    | 6 +++---
 sections/sections-app/src/webapp/common/editSection.jsp     | 6 +++---
 .../sections-app/src/webapp/common/editStudentSections.jsp  | 6 +++---
 sections/sections-app/src/webapp/common/editStudents.jsp    | 6 +++---
 sections/sections-app/src/webapp/common/options.jsp         | 4 ++--
 sections/sections-app/src/webapp/common/overview.jsp        | 6 +++---
 sections/sections-app/src/webapp/common/roster.jsp          | 4 ++--
 sections/sections-app/src/webapp/common/studentView.jsp     | 2 +-
 10 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/sections/sections-app/src/webapp/common/addSections.jsp b/sections/sections-app/src/webapp/common/addSections.jsp
index 76b49b00c131..9f2424327ab6 100644
--- a/sections/sections-app/src/webapp/common/addSections.jsp
+++ b/sections/sections-app/src/webapp/common/addSections.jsp
@@ -5,7 +5,7 @@
 	<sakai:flowState bean="#{addSectionsBean}"/>
 
 	<t:aliasBean alias="#{viewName}" value="addSections">
-		<%@include file="/inc/navMenu.jspf"%>
+		<%@ include file="/inc/navMenu.jspf"%>
 	</t:aliasBean>
 
 	<h3><h:outputText value="#{msgs.add_sections}"/></h3>
@@ -14,7 +14,7 @@
 		<h:outputText value="#{msgs.add_section_instructions}"/>
 	</t:div>
 
-	<%@include file="/inc/globalMessages.jspf"%>
+	<%@ include file="/inc/globalMessages.jspf"%>
 	
 	<h:outputText value="#{msgs.add}"/>
 	<h:selectOneMenu
@@ -38,7 +38,7 @@
 	<h:outputText value="#{msgs.add_section_category}"/>
 
 	<t:aliasBean alias="#{bean}" value="#{addSectionsBean}">
-		<%@include file="/inc/sectionEditor.jspf"%>
+		<%@ include file="/inc/sectionEditor.jspf"%>
 	</t:aliasBean>
 
 	<t:div styleClass="act">
diff --git a/sections/sections-app/src/webapp/common/deleteSections.jsp b/sections/sections-app/src/webapp/common/deleteSections.jsp
index fcb1a4d9d835..5fc4aee14ded 100644
--- a/sections/sections-app/src/webapp/common/deleteSections.jsp
+++ b/sections/sections-app/src/webapp/common/deleteSections.jsp
@@ -5,7 +5,7 @@
     <sakai:flowState bean="#{overviewBean}"/>
 
     <t:aliasBean alias="#{viewName}" value="overview">
-        <%@include file="/inc/navMenu.jspf"%>
+        <%@ include file="/inc/navMenu.jspf"%>
     </t:aliasBean>
 
 	<h3 class="instructions">
diff --git a/sections/sections-app/src/webapp/common/editManagers.jsp b/sections/sections-app/src/webapp/common/editManagers.jsp
index f7d9c5abb07e..4a4209f5422f 100644
--- a/sections/sections-app/src/webapp/common/editManagers.jsp
+++ b/sections/sections-app/src/webapp/common/editManagers.jsp
@@ -6,14 +6,14 @@
 
     <h:panelGroup rendered="#{ ! editManagersBean.externallyManaged}">
         <t:aliasBean alias="#{viewName}" value="editManagers">
-            <%@include file="/inc/navMenu.jspf"%>
+            <%@ include file="/inc/navMenu.jspf"%>
         </t:aliasBean>
     </h:panelGroup>
 
         <h3><h:outputText value="#{msgs.edit_manager_page_header}"/></h3>
         <h4><h:outputText value="#{editManagersBean.sectionDescription}"/></h4>
 
-        <%@include file="/inc/globalMessages.jspf"%>
+        <%@ include file="/inc/globalMessages.jspf"%>
 
         <h:panelGrid id="transferTable" columns="3" columnClasses="available,transferButtons,selected">
         
@@ -29,7 +29,7 @@
                 </t:div>
             </h:panelGroup>
         
-            <%@include file="/inc/transferButtons.jspf"%>
+            <%@ include file="/inc/transferButtons.jspf"%>
             
             <h:panelGroup>
                 <h:outputFormat value="#{msgs.edit_manager_selected_label}" style="white-space:nowrap;">
diff --git a/sections/sections-app/src/webapp/common/editSection.jsp b/sections/sections-app/src/webapp/common/editSection.jsp
index 31b9eb0e7794..71da58a96df0 100644
--- a/sections/sections-app/src/webapp/common/editSection.jsp
+++ b/sections/sections-app/src/webapp/common/editSection.jsp
@@ -5,15 +5,15 @@
     <sakai:flowState bean="#{editSectionBean}"/>
 
     <t:aliasBean alias="#{viewName}" value="editSection">
-        <%@include file="/inc/navMenu.jspf"%>
+        <%@ include file="/inc/navMenu.jspf"%>
     </t:aliasBean>
     
     <h3><h:outputText value="#{msgs.edit_section_page_header}"/></h3>
         
-    <%@include file="/inc/globalMessages.jspf"%>
+    <%@ include file="/inc/globalMessages.jspf"%>
 
 	<t:aliasBean alias="#{bean}" value="#{editSectionBean}">
-		<%@include file="/inc/sectionEditor.jspf"%>
+		<%@ include file="/inc/sectionEditor.jspf"%>
 	</t:aliasBean>
 
     <t:div styleClass="act">
diff --git a/sections/sections-app/src/webapp/common/editStudentSections.jsp b/sections/sections-app/src/webapp/common/editStudentSections.jsp
index fb2f1c903179..b70ffee4af8f 100644
--- a/sections/sections-app/src/webapp/common/editStudentSections.jsp
+++ b/sections/sections-app/src/webapp/common/editStudentSections.jsp
@@ -6,7 +6,7 @@
 	<h:inputHidden id="elementToFocus" value="#{editStudentSectionsBean.elementToFocus}"/>
 
     <t:aliasBean alias="#{viewName}" value="editSection">
-        <%@include file="/inc/navMenu.jspf"%>
+        <%@ include file="/inc/navMenu.jspf"%>
     </t:aliasBean>
 
         <h3>
@@ -45,14 +45,14 @@
             </h:dataTable>
 		</t:div>
 
-        <%@include file="/inc/globalMessages.jspf"%>
+        <%@ include file="/inc/globalMessages.jspf"%>
     
         <t:div styleClass="instructions">
             <h:outputText value="#{msgs.edit_student_sections_instructions}"/>
         </t:div>
 
 		<t:aliasBean alias="#{filterBean}" value="#{editStudentSectionsBean}">
-	        <%@include file="/inc/sectionFilter.jspf"%>
+	        <%@ include file="/inc/sectionFilter.jspf"%>
 	    </t:aliasBean>
 
         <sec:rowGroupTable cellpadding="0" cellspacing="0"
diff --git a/sections/sections-app/src/webapp/common/editStudents.jsp b/sections/sections-app/src/webapp/common/editStudents.jsp
index e95a552a253a..82350642997e 100644
--- a/sections/sections-app/src/webapp/common/editStudents.jsp
+++ b/sections/sections-app/src/webapp/common/editStudents.jsp
@@ -5,13 +5,13 @@
     <sakai:flowState bean="#{editStudentsBean}"/>
 
     <t:aliasBean alias="#{viewName}" value="editStudents">
-        <%@include file="/inc/navMenu.jspf"%>
+        <%@ include file="/inc/navMenu.jspf"%>
     </t:aliasBean>
 
         <h3><h:outputText value="#{msgs.edit_student_page_header}"/></h3>
         <h4><h:outputText value="#{editStudentsBean.sectionDescription}"/></h4>
 
-        <%@include file="/inc/globalMessages.jspf"%>
+        <%@ include file="/inc/globalMessages.jspf"%>
 
         <h:panelGrid id="transferTable" columns="3" columnClasses="available,transferButtons,selected">
         
@@ -28,7 +28,7 @@
                 </t:div>
             </h:panelGroup>
 
-            <%@include file="/inc/transferButtons.jspf"%>
+            <%@ include file="/inc/transferButtons.jspf"%>
             
             <h:panelGroup>
                 <h:panelGrid styleClass="sectionContainerNav" columns="3" columnClasses="sectionLeftNav,sectionRightNav,sectionRightNav">
diff --git a/sections/sections-app/src/webapp/common/options.jsp b/sections/sections-app/src/webapp/common/options.jsp
index b1857dbe9c5e..d568b9c08a88 100644
--- a/sections/sections-app/src/webapp/common/options.jsp
+++ b/sections/sections-app/src/webapp/common/options.jsp
@@ -5,13 +5,13 @@
     <sakai:flowState bean="#{optionsBean}"/>
 
     <t:aliasBean alias="#{viewName}" value="options">
-        <%@include file="/inc/navMenu.jspf"%>
+        <%@ include file="/inc/navMenu.jspf"%>
     </t:aliasBean>
 
         <h3><h:outputText value="#{msgs.options_page_header}"/></h3>
         <h4><h:outputText value="#{msgs.options_page_subheader}"/></h4>
         
-        <%@include file="/inc/globalMessages.jspf"%>
+        <%@ include file="/inc/globalMessages.jspf"%>
         
         <t:div rendered="#{optionsBean.confirmMode}" styleClass="validation">
         	<h:panelGrid columns="1">
diff --git a/sections/sections-app/src/webapp/common/overview.jsp b/sections/sections-app/src/webapp/common/overview.jsp
index e1eb81e95efa..9f02aa69f0f7 100644
--- a/sections/sections-app/src/webapp/common/overview.jsp
+++ b/sections/sections-app/src/webapp/common/overview.jsp
@@ -5,7 +5,7 @@
     <sakai:flowState bean="#{overviewBean}"/>
 
     <t:aliasBean alias="#{viewName}" value="overview">
-        <%@include file="/inc/navMenu.jspf"%>
+        <%@ include file="/inc/navMenu.jspf"%>
     </t:aliasBean>
 
 	<div class="instructions">
@@ -17,10 +17,10 @@
 		<h:outputText value="#{overviewBean.instructions}"/>
 	</div>
 
-    <%@include file="/inc/globalMessages.jspf"%>
+    <%@ include file="/inc/globalMessages.jspf"%>
 
     <t:aliasBean alias="#{filterBean}" value="#{overviewBean}">
-        <%@include file="/inc/sectionFilter.jspf"%>
+        <%@ include file="/inc/sectionFilter.jspf"%>
     </t:aliasBean>
 
     <sec:rowGroupTable cellpadding="0" cellspacing="0"
diff --git a/sections/sections-app/src/webapp/common/roster.jsp b/sections/sections-app/src/webapp/common/roster.jsp
index 753aecb439fb..a6dd580ec5e9 100644
--- a/sections/sections-app/src/webapp/common/roster.jsp
+++ b/sections/sections-app/src/webapp/common/roster.jsp
@@ -5,7 +5,7 @@
     <sakai:flowState bean="#{rosterBean}"/>
 
     <t:aliasBean alias="#{viewName}" value="roster">
-        <%@include file="/inc/navMenu.jspf"%>
+        <%@ include file="/inc/navMenu.jspf"%>
     </t:aliasBean>
 
 	<div class="instructions">
@@ -14,7 +14,7 @@
 			rendered="#{ ! rosterBean.externallyManaged}"/>
 	</div>
 
-    <%@include file="/inc/globalMessages.jspf"%>
+    <%@ include file="/inc/globalMessages.jspf"%>
 
 	<t:div>
 		<h:outputText value="#{msgs.roster_view_students}"/>
diff --git a/sections/sections-app/src/webapp/common/studentView.jsp b/sections/sections-app/src/webapp/common/studentView.jsp
index d7f4d5e2e032..54951c5f2090 100644
--- a/sections/sections-app/src/webapp/common/studentView.jsp
+++ b/sections/sections-app/src/webapp/common/studentView.jsp
@@ -16,7 +16,7 @@
             <h:outputText value="#{studentViewBean.instructions}"/>
         </t:div>
 
-        <%@include file="/inc/globalMessages.jspf"%>
+        <%@ include file="/inc/globalMessages.jspf"%>
 
 		<t:div>
 			<h:outputText value="#{msgs.student_view_view}"/>