From 02f5be5a6fe5a16a340f39d5c026b22edcdaed78 Mon Sep 17 00:00:00 2001
From: itruspc <liu_tong@itrus.com.cn>
Date: Mon, 4 May 2015 16:02:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=86=E9=A1=B5=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E4=BD=BF=E7=94=A8=E9=97=AE=E9=A2=98=EF=BC=9B=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8Dparent=E6=A8=A1=E5=9D=97pom.xml=E4=B8=ADjsp-a?=
 =?UTF-8?q?pi=E8=AE=BE=E7=BD=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quickstart/src/main/webapp/WEB-INF/tags/pagination.tag    | 4 ++--
 modules/parent/pom.xml                                        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/quickstart/src/main/webapp/WEB-INF/tags/pagination.tag b/examples/quickstart/src/main/webapp/WEB-INF/tags/pagination.tag
index 4e3ad4eb9..6b3cd9bf3 100644
--- a/examples/quickstart/src/main/webapp/WEB-INF/tags/pagination.tag
+++ b/examples/quickstart/src/main/webapp/WEB-INF/tags/pagination.tag
@@ -16,7 +16,7 @@ request.setAttribute("end", end);
 
 <div class="pagination">
 	<ul>
-		 <% if (page.hasPreviousPage()){%>
+		 <% if (page.hasPrevious()){%>
                	<li><a href="?page=1&sortType=${sortType}&${searchParams}">&lt;&lt;</a></li>
                 <li><a href="?page=${current-1}&sortType=${sortType}&${searchParams}">&lt;</a></li>
          <%}else{%>
@@ -35,7 +35,7 @@ request.setAttribute("end", end);
             </c:choose>
         </c:forEach>
 	  
-	  	 <% if (page.hasNextPage()){%>
+	  	 <% if (page.hasNext()){%>
                	<li><a href="?page=${current+1}&sortType=${sortType}&${searchParams}">&gt;</a></li>
                 <li><a href="?page=${page.totalPages}&sortType=${sortType}&${searchParams}">&gt;&gt;</a></li>
          <%}else{%>
diff --git a/modules/parent/pom.xml b/modules/parent/pom.xml
index 2c600a61b..6fca8e66d 100644
--- a/modules/parent/pom.xml
+++ b/modules/parent/pom.xml
@@ -238,7 +238,7 @@
 				<exclusions>
 					<exclusion>
 						<groupId>javax.servlet</groupId>
-						<artifactId>javax.servlet-api</artifactId>
+    					<artifactId>servlet-api</artifactId>
 					</exclusion>
 				</exclusions>
 			</dependency>