Skip to content
This repository was archived by the owner on Jun 15, 2022. It is now read-only.

changed appengine sdk version to 1.9.4 #6

Open
mpoehler wants to merge 7 commits into
base: master
Choose a base branch
from
Open

changed appengine sdk version to 1.9.4 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
edde255
changed appengine sdk version to 1.9.3
Apr 17, 2014
4366c81
changed appengine-maven-plugin version to placeholder
Apr 17, 2014
ac0d7e5
since 1.9.0 only java 7 must be used. I adopt the maven compiler plug…
Apr 17, 2014
cd09600
changed module name from guestbook to default - because every project…
Apr 19, 2014
78bc8cc
app version is now propergated from central pom.xml to modules appeng…
Apr 19, 2014
c5315c6
added Link to other module in guestbook to demonstrate link creation …
Apr 19, 2014
22bbb1a
changed appengine sdk version to 1.9.4
May 2, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions appengine-modules-ear/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5.1</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>
<plugin>
Expand All @@ -39,7 +39,7 @@
<plugin>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-maven-plugin</artifactId>
<version>1.9.0</version>
<version>${appengine.target.version}</version>
</plugin>
</plugins>
</build>
Expand Down
16 changes: 13 additions & 3 deletions appengine-modules-guestbook/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,17 +69,27 @@
<version>2.5.1</version>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.6</source>
<target>1.6</target>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.3</version>
<configuration>
<archiveClasses>false</archiveClasses>
<webResources>
<!-- in order to interpolate version from pom into appengine-web.xml -->
<resource>
<directory>${basedir}/src/main/webapp/WEB-INF</directory>
<filtering>true</filtering>
<targetPath>WEB-INF</targetPath>
</resource>
</webResources>
</configuration>
</plugin>

<plugin>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-maven-plugin</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions appengine-modules-guestbook/src/main/webapp/WEB-INF/appengine-web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
<application>guestbook</application>
<version>1</version>
<version>${appengine.app.version}</version>
<threadsafe>true</threadsafe>

<module>guestbook</module>
<module>default</module>
<system-properties>
<property name="java.util.logging.config.file" value="WEB-INF/logging.properties"/>
</system-properties>
Expand Down
10 changes: 10 additions & 0 deletions appengine-modules-guestbook/src/main/webapp/guestbook.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" %>

Expand Down Expand Up @@ -89,5 +91,13 @@
<div><input type="submit" value="Switch Guestbook"/></div>
</form>

<%
ModulesService modulesService = ModulesServiceFactory.getModulesService();
String currentVersion = modulesService.getCurrentVersion();
String linkToOtherModule = modulesService.getVersionHostname("shardedcounter", currentVersion);
%>

<a href="http://<%=linkToOtherModule %>">Link to other Module</a>

</body>
</html>
4 changes: 2 additions & 2 deletions appengine-modules-shardedcounter/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@
<version>2.5.1</version>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.6</source>
<target>1.6</target>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>
<plugin>
Expand Down
2 changes: 1 addition & 1 deletion appengine-modules-shardedcounter/src/main/webapp/WEB-INF/appengine-web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
<application>yet-another-sharded-counter</application>
<version>1</version>
<version>${appengine.app.version}</version>
<threadsafe>true</threadsafe>

<module>shardedcounter</module>
Expand Down
3 changes: 2 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@

<properties>
<appengine.app.version>1</appengine.app.version>
<appengine.target.version>1.9.0</appengine.target.version>
<appengine.target.version>1.9.4</appengine.target.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.7</java.version>
</properties>
<modules>
<module>appengine-modules-ear</module>
Expand Down