From edde25570d8eef7c5b688c5b47ce1cbf947012dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20P=C3=B6hler?= Date: Thu, 17 Apr 2014 11:42:46 +0200 Subject: [PATCH 1/7] changed appengine sdk version to 1.9.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 360f6d5..42d7209 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 1 - 1.9.0 + 1.9.3 UTF-8 From 4366c81e9c40e6b62e265000ff99faf755283450 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20P=C3=B6hler?= Date: Thu, 17 Apr 2014 12:01:27 +0200 Subject: [PATCH 2/7] changed appengine-maven-plugin version to placeholder --- appengine-modules-ear/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appengine-modules-ear/pom.xml b/appengine-modules-ear/pom.xml index 5ba8e82..241cdd0 100644 --- a/appengine-modules-ear/pom.xml +++ b/appengine-modules-ear/pom.xml @@ -39,7 +39,7 @@ com.google.appengine appengine-maven-plugin - 1.9.0 + ${appengine.target.version} From ac0d7e5d975afb400c20b0c451e3b53694fe51dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20P=C3=B6hler?= Date: Thu, 17 Apr 2014 12:08:45 +0200 Subject: [PATCH 3/7] since 1.9.0 only java 7 must be used. I adopt the maven compiler plugin to version 1.7 --- appengine-modules-ear/pom.xml | 4 ++-- appengine-modules-guestbook/pom.xml | 4 ++-- appengine-modules-shardedcounter/pom.xml | 4 ++-- pom.xml | 1 + 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/appengine-modules-ear/pom.xml b/appengine-modules-ear/pom.xml index 241cdd0..20c690d 100644 --- a/appengine-modules-ear/pom.xml +++ b/appengine-modules-ear/pom.xml @@ -21,8 +21,8 @@ maven-compiler-plugin 2.5.1 - 1.5 - 1.5 + ${java.version} + ${java.version} diff --git a/appengine-modules-guestbook/pom.xml b/appengine-modules-guestbook/pom.xml index a42329b..7e8a178 100644 --- a/appengine-modules-guestbook/pom.xml +++ b/appengine-modules-guestbook/pom.xml @@ -69,8 +69,8 @@ 2.5.1 maven-compiler-plugin - 1.6 - 1.6 + ${java.version} + ${java.version} diff --git a/appengine-modules-shardedcounter/pom.xml b/appengine-modules-shardedcounter/pom.xml index 04cea91..fe2ddab 100644 --- a/appengine-modules-shardedcounter/pom.xml +++ b/appengine-modules-shardedcounter/pom.xml @@ -77,8 +77,8 @@ 2.5.1 maven-compiler-plugin - 1.6 - 1.6 + ${java.version} + ${java.version} diff --git a/pom.xml b/pom.xml index 42d7209..d1ac2ae 100644 --- a/pom.xml +++ b/pom.xml @@ -11,6 +11,7 @@ 1 1.9.3 UTF-8 + 1.7 appengine-modules-ear From cd09600950543928066c985deaca6c9954544d2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20P=C3=B6hler?= Date: Sat, 19 Apr 2014 21:23:07 +0200 Subject: [PATCH 4/7] changed module name from guestbook to default - because every project needs a default module --- .../src/main/webapp/WEB-INF/appengine-web.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appengine-modules-guestbook/src/main/webapp/WEB-INF/appengine-web.xml b/appengine-modules-guestbook/src/main/webapp/WEB-INF/appengine-web.xml index 876171a..ad12a65 100644 --- a/appengine-modules-guestbook/src/main/webapp/WEB-INF/appengine-web.xml +++ b/appengine-modules-guestbook/src/main/webapp/WEB-INF/appengine-web.xml @@ -4,7 +4,7 @@ 1 true - guestbook + default From 78bc8cc12c3897b52374a36bacc59f1c71f39fff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20P=C3=B6hler?= Date: Sat, 19 Apr 2014 23:15:31 +0200 Subject: [PATCH 5/7] app version is now propergated from central pom.xml to modules appengine-web.xmls --- appengine-modules-guestbook/pom.xml | 12 +++++++++++- .../src/main/webapp/WEB-INF/appengine-web.xml | 2 +- .../src/main/webapp/WEB-INF/appengine-web.xml | 2 +- pom.xml | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/appengine-modules-guestbook/pom.xml b/appengine-modules-guestbook/pom.xml index 7e8a178..372586e 100644 --- a/appengine-modules-guestbook/pom.xml +++ b/appengine-modules-guestbook/pom.xml @@ -78,8 +78,18 @@ org.apache.maven.plugins maven-war-plugin 2.3 + + false + + + + ${basedir}/src/main/webapp/WEB-INF + true + WEB-INF + + + - com.google.appengine appengine-maven-plugin diff --git a/appengine-modules-guestbook/src/main/webapp/WEB-INF/appengine-web.xml b/appengine-modules-guestbook/src/main/webapp/WEB-INF/appengine-web.xml index ad12a65..d96be1a 100644 --- a/appengine-modules-guestbook/src/main/webapp/WEB-INF/appengine-web.xml +++ b/appengine-modules-guestbook/src/main/webapp/WEB-INF/appengine-web.xml @@ -1,7 +1,7 @@ guestbook - 1 + ${appengine.app.version} true default diff --git a/appengine-modules-shardedcounter/src/main/webapp/WEB-INF/appengine-web.xml b/appengine-modules-shardedcounter/src/main/webapp/WEB-INF/appengine-web.xml index 2c187b6..582f5c2 100644 --- a/appengine-modules-shardedcounter/src/main/webapp/WEB-INF/appengine-web.xml +++ b/appengine-modules-shardedcounter/src/main/webapp/WEB-INF/appengine-web.xml @@ -1,6 +1,6 @@ yet-another-sharded-counter - 1 + ${appengine.app.version} true shardedcounter diff --git a/pom.xml b/pom.xml index d1ac2ae..e26389b 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ appengine-modules-sample-java - 1 + 2 1.9.3 UTF-8 1.7 From c5315c6f55ba519cdbd0094cfeb3e19fc650a935 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20P=C3=B6hler?= Date: Sat, 19 Apr 2014 23:54:49 +0200 Subject: [PATCH 6/7] added Link to other module in guestbook to demonstrate link creation between modules --- .../src/main/webapp/guestbook.jsp | 10 ++++++++++ pom.xml | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/appengine-modules-guestbook/src/main/webapp/guestbook.jsp b/appengine-modules-guestbook/src/main/webapp/guestbook.jsp index 20b4297..46ebdd1 100644 --- a/appengine-modules-guestbook/src/main/webapp/guestbook.jsp +++ b/appengine-modules-guestbook/src/main/webapp/guestbook.jsp @@ -9,6 +9,8 @@ <%@ page import="com.google.appengine.api.users.User" %> <%@ page import="com.google.appengine.api.users.UserService" %> <%@ page import="com.google.appengine.api.users.UserServiceFactory" %> +<%@ page import="com.google.appengine.api.modules.ModulesService" %> +<%@ page import="com.google.appengine.api.modules.ModulesServiceFactory" %> <%@ page import="java.util.List" %> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> @@ -89,5 +91,13 @@
+<% + ModulesService modulesService = ModulesServiceFactory.getModulesService(); + String currentVersion = modulesService.getCurrentVersion(); + String linkToOtherModule = modulesService.getVersionHostname("shardedcounter", currentVersion); +%> + + Link to other Module + diff --git a/pom.xml b/pom.xml index e26389b..d1ac2ae 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ appengine-modules-sample-java - 2 + 1 1.9.3 UTF-8 1.7 From 22bbb1ad42e5ab826bee1d169841b3ac5cdd6388 Mon Sep 17 00:00:00 2001 From: Marco Poehler Date: Fri, 2 May 2014 10:53:09 +0200 Subject: [PATCH 7/7] changed appengine sdk version to 1.9.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d1ac2ae..bbe5f3b 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 1 - 1.9.3 + 1.9.4 UTF-8 1.7