Fixing token replacement and cleaning up Guice

Author: Frank Natividad

appengine/endpoints-frameworks-v2/backend/src/main/webapp/WEB-INF/appengine-web.xml

@@ -15,8 +15,6 @@
  limitations under the License.
 -->
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
-    <application>${endpoints.project.id}</application>
-    <version>1</version>
     <threadsafe>true</threadsafe>
 
     <basic-scaling>

appengine/endpoints-frameworks-v2/guice-example/pom.xml

@@ -99,6 +99,20 @@
                     </serviceClasses>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>2.6</version>
+                <configuration>
+                    <webResources>
+                        <resource>
+                            <directory>${basedir}/src/main/webapp/WEB-INF</directory>
+                            <filtering>true</filtering>
+                            <targetPath>WEB-INF</targetPath>
+                        </resource>
+                    </webResources>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>versions-maven-plugin</artifactId>

appengine/endpoints-frameworks-v2/guice-example/src/main/java/com/example/echo/EchoEndpointModule.java

@@ -25,6 +25,7 @@ public class EchoEndpointModule extends EndpointsModule {
   public void configureServlets() {
     bind(Echo.class).toInstance(new Echo());
     configureEndpoints("/_ah/api/*", ImmutableList.of(Echo.class));
+    super.configureServlets();
   }
 }
 // [END endpoints_module]

appengine/endpoints-frameworks-v2/guice-example/src/main/webapp/WEB-INF/appengine-web.xml

@@ -15,8 +15,6 @@
  limitations under the License.
 -->
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
-    <application>${endpoints.project.id}</application>
-    <version>1</version>
     <threadsafe>true</threadsafe>
 
     <basic-scaling>