Integrate r11139 into releases/2.5.

Review by: skybrian@google.com

git-svn-id: https://google-web-toolkit.googlecode.com/svn/releases/2.5@11143 8db76d5a-ed1c-0410-87a9-c151d255dfc7

samples/dynatable/src/com/google/gwt/sample/dynatable/DynaTable.gwt.xml

diff --git a/samples/dynatable/src/com/google/gwt/sample/dynatable/DynaTable.gwt.xml b/samples/dynatable/src/com/google/gwt/sample/dynatable/DynaTable.gwt.xml
index 26fcd1d..8ee2188 100644
--- a/samples/dynatable/src/com/google/gwt/sample/dynatable/DynaTable.gwt.xml
+++ b/samples/dynatable/src/com/google/gwt/sample/dynatable/DynaTable.gwt.xml
@@ -14,7 +14,6 @@
 
 <module rename-to="dynatable">
   <inherits name='com.google.gwt.user.User' />
-  <inherits name='com.google.gwt.rpc.RPC' />
   <entry-point class='com.google.gwt.sample.dynatable.client.DynaTable' />
   <servlet path='/calendar'
     class='com.google.gwt.sample.dynatable.server.SchoolCalendarServiceImpl' />

samples/dynatable/src/com/google/gwt/sample/dynatable/client/SchoolCalendarService.java

diff --git a/samples/dynatable/src/com/google/gwt/sample/dynatable/client/SchoolCalendarService.java b/samples/dynatable/src/com/google/gwt/sample/dynatable/client/SchoolCalendarService.java
index 8e6357a..34b4349 100644
--- a/samples/dynatable/src/com/google/gwt/sample/dynatable/client/SchoolCalendarService.java
+++ b/samples/dynatable/src/com/google/gwt/sample/dynatable/client/SchoolCalendarService.java
@@ -15,12 +15,12 @@
  */
 package com.google.gwt.sample.dynatable.client;
 
-import com.google.gwt.rpc.client.RpcService;
+import com.google.gwt.user.client.rpc.RemoteService;
 
 /**
  * The interface for the RPC server endpoint to get school calendar information.
  */
-public interface SchoolCalendarService extends RpcService {
+public interface SchoolCalendarService extends RemoteService {
 
   Person[] getPeople(int startIndex, int maxCount);
 

samples/dynatable/src/com/google/gwt/sample/dynatable/server/SchoolCalendarServiceImpl.java

diff --git a/samples/dynatable/src/com/google/gwt/sample/dynatable/server/SchoolCalendarServiceImpl.java b/samples/dynatable/src/com/google/gwt/sample/dynatable/server/SchoolCalendarServiceImpl.java
index 07f3ba9..d032f4e 100644
--- a/samples/dynatable/src/com/google/gwt/sample/dynatable/server/SchoolCalendarServiceImpl.java
+++ b/samples/dynatable/src/com/google/gwt/sample/dynatable/server/SchoolCalendarServiceImpl.java
@@ -21,7 +21,7 @@
 import com.google.gwt.sample.dynatable.client.SchoolCalendarService;
 import com.google.gwt.sample.dynatable.client.Student;
 import com.google.gwt.sample.dynatable.client.TimeSlot;
-import com.google.gwt.user.server.rpc.HybridServiceServlet;
+import com.google.gwt.user.server.rpc.RemoteServiceServlet;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -31,7 +31,7 @@
 /**
  * The implemenation of the RPC service which runs on the server.
  */
-public class SchoolCalendarServiceImpl extends HybridServiceServlet implements
+public class SchoolCalendarServiceImpl extends RemoteServiceServlet implements
     SchoolCalendarService {
 
   private static final String[] FIRST_NAMES = new String[] {