From 2c46a6071f4d1369a5c101a7fc7e6cdf58b6c3ab Mon Sep 17 00:00:00 2001
From: John Ferguson Smart <john.smart@wakaleo.com>
Date: Fri, 28 Sep 2012 08:01:25 +1000
Subject: [PATCH 1/7] Updated versions

---
 gameoflife-build/pom.xml | 2 +-
 gameoflife-core/pom.xml  | 2 +-
 gameoflife-web/pom.xml   | 4 ++--
 pom.xml                  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gameoflife-build/pom.xml b/gameoflife-build/pom.xml
index f5b73936a1..3df01726e1 100644
--- a/gameoflife-build/pom.xml
+++ b/gameoflife-build/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>gameoflife</artifactId>
         <groupId>com.wakaleo.gameoflife</groupId>
-        <version>0.9.66-SNAPSHOT</version>
+        <version>1.0-SNAPSHOT</version>
     </parent>
     <artifactId>gameoflife-build</artifactId>
     <packaging>jar</packaging>
diff --git a/gameoflife-core/pom.xml b/gameoflife-core/pom.xml
index a1f80e30df..80abb4f332 100644
--- a/gameoflife-core/pom.xml
+++ b/gameoflife-core/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>gameoflife</artifactId>
         <groupId>com.wakaleo.gameoflife</groupId>
-        <version>0.9.66-SNAPSHOT</version>
+        <version>1.0-SNAPSHOT</version>
     </parent>
     <groupId>com.wakaleo.gameoflife</groupId>
     <artifactId>gameoflife-core</artifactId>
diff --git a/gameoflife-web/pom.xml b/gameoflife-web/pom.xml
index 7c0cbd5d8b..4b86102a44 100644
--- a/gameoflife-web/pom.xml
+++ b/gameoflife-web/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>gameoflife</artifactId>
         <groupId>com.wakaleo.gameoflife</groupId>
-        <version>0.9.66-SNAPSHOT</version>
+        <version>1.0-SNAPSHOT</version>
     </parent>
     <groupId>com.wakaleo.gameoflife</groupId>
     <artifactId>gameoflife-web</artifactId>
@@ -121,7 +121,7 @@
         <dependency>
             <groupId>com.wakaleo.gameoflife</groupId>
             <artifactId>gameoflife-core</artifactId>
-            <version>0.9.66-SNAPSHOT</version>
+            <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.wakaleo.gameoflife</groupId>
diff --git a/pom.xml b/pom.xml
index b24086d4b8..36e242a705 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.wakaleo.gameoflife</groupId>
     <artifactId>gameoflife</artifactId>
-    <version>0.9.66-SNAPSHOT</version>
+    <version>1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>gameoflife</name>
     <url>https://github.com/wakaleo/game-of-life</url>

From 019435f7db77b2ac9749376071b079464d4b1d38 Mon Sep 17 00:00:00 2001
From: John Ferguson Smart <john.smart@wakaleo.com>
Date: Sat, 29 Sep 2012 10:57:44 -0700
Subject: [PATCH 2/7] Adapted tests to work better for the CD demo

---
 .../com/wakaleo/gameoflife/webtests/pages/EnterGridPage.java  | 2 +-
 .../com/wakaleo/gameoflife/webtests/pages/GameOfLifePage.java | 2 +-
 .../java/com/wakaleo/gameoflife/webtests/pages/HomePage.java  | 2 +-
 pom.xml                                                       | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gameoflife-acceptance-tests/src/test/java/com/wakaleo/gameoflife/webtests/pages/EnterGridPage.java b/gameoflife-acceptance-tests/src/test/java/com/wakaleo/gameoflife/webtests/pages/EnterGridPage.java
index 7266322511..9965131f15 100644
--- a/gameoflife-acceptance-tests/src/test/java/com/wakaleo/gameoflife/webtests/pages/EnterGridPage.java
+++ b/gameoflife-acceptance-tests/src/test/java/com/wakaleo/gameoflife/webtests/pages/EnterGridPage.java
@@ -6,7 +6,7 @@
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
 
-@DefaultUrl("http://localhost:9090/new")
+@DefaultUrl("http://localhost:9090/gameoflife/new")
 public class EnterGridPage extends GameOfLifePage {
 
     @FindBy(id = "submit")
diff --git a/gameoflife-acceptance-tests/src/test/java/com/wakaleo/gameoflife/webtests/pages/GameOfLifePage.java b/gameoflife-acceptance-tests/src/test/java/com/wakaleo/gameoflife/webtests/pages/GameOfLifePage.java
index bba2c37763..73c9d6d459 100644
--- a/gameoflife-acceptance-tests/src/test/java/com/wakaleo/gameoflife/webtests/pages/GameOfLifePage.java
+++ b/gameoflife-acceptance-tests/src/test/java/com/wakaleo/gameoflife/webtests/pages/GameOfLifePage.java
@@ -6,7 +6,7 @@
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
 
-@DefaultUrl("http://localhost:9090")
+@DefaultUrl("http://localhost:9090/gameoflife")
 public class GameOfLifePage extends PageObject {
 
     @FindBy(linkText = "home")
diff --git a/gameoflife-acceptance-tests/src/test/java/com/wakaleo/gameoflife/webtests/pages/HomePage.java b/gameoflife-acceptance-tests/src/test/java/com/wakaleo/gameoflife/webtests/pages/HomePage.java
index a116593aa0..d1503b771a 100644
--- a/gameoflife-acceptance-tests/src/test/java/com/wakaleo/gameoflife/webtests/pages/HomePage.java
+++ b/gameoflife-acceptance-tests/src/test/java/com/wakaleo/gameoflife/webtests/pages/HomePage.java
@@ -5,7 +5,7 @@
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
 
-@DefaultUrl("http://localhost:9090/home")
+@DefaultUrl("http://localhost:9090/gameoflife/home")
 public class HomePage extends GameOfLifePage {
 
     @FindBy(linkText = "New Game")
diff --git a/pom.xml b/pom.xml
index 0678f8a2df..8f0efc9411 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,6 +16,7 @@
         <targetJdk>1.6</targetJdk>
         <github.account>wakaleo</github.account>
         <thucydides.version>0.9.22</thucydides.version>
+        <jelastic.context>gameoflife</jelastic.context>
     </properties>
 
     <scm>
@@ -134,10 +135,9 @@
                 <configuration>
                     <email>${jelastic.username}</email>
                     <password>${jelastic.password}</password>
-                    <context>gameoflife</context>
+                    <context>${jelastic.context}</context>
                     <environment>wakaleo</environment>
                     <api_hoster>app.jelastic.servint.net</api_hoster>
-                    <finalName>gameoflife</finalName>
                 </configuration>
             </plugin>
 

From b2dbba194e942ada0977f8105bf61d62613ef41c Mon Sep 17 00:00:00 2001
From: John Ferguson Smart <john.smart@wakaleo.com>
Date: Sat, 29 Sep 2012 11:10:16 -0700
Subject: [PATCH 3/7] Fixed merge issue

---
 gameoflife-web/pom.xml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/gameoflife-web/pom.xml b/gameoflife-web/pom.xml
index d94626be51..ebba304fc7 100644
--- a/gameoflife-web/pom.xml
+++ b/gameoflife-web/pom.xml
@@ -121,17 +121,8 @@
         <dependency>
             <groupId>com.wakaleo.gameoflife</groupId>
             <artifactId>gameoflife-core</artifactId>
-<<<<<<< HEAD
             <version>1.0-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>com.wakaleo.gameoflife</groupId>
-            <artifactId>gameoflife-webservice</artifactId>
-            <version>0.9.66-SNAPSHOT</version>
-=======
-            <version>0.9.67-SNAPSHOT</version>
->>>>>>> master
-        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>

From f0020d5a17362c90044e57534b9b42085bc10fcf Mon Sep 17 00:00:00 2001
From: John Ferguson Smart <john.smart@wakaleo.com>
Date: Sat, 29 Sep 2012 11:28:44 -0700
Subject: [PATCH 4/7] We can now deploy to different platforms:

---
 pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8f0efc9411..cdc47e6191 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,6 +17,7 @@
         <github.account>wakaleo</github.account>
         <thucydides.version>0.9.22</thucydides.version>
         <jelastic.context>gameoflife</jelastic.context>
+        <jelastic.environment>wakaleo</jelastic.environment>
     </properties>
 
     <scm>
@@ -136,7 +137,7 @@
                     <email>${jelastic.username}</email>
                     <password>${jelastic.password}</password>
                     <context>${jelastic.context}</context>
-                    <environment>wakaleo</environment>
+                    <environment>${jelastic.environment}</environment>
                     <api_hoster>app.jelastic.servint.net</api_hoster>
                 </configuration>
             </plugin>

From 0da8942f2b20a787263dfca7ee1765b61839b616 Mon Sep 17 00:00:00 2001
From: John Ferguson Smart <john.smart@wakaleo.com>
Date: Sat, 29 Sep 2012 12:10:57 -0700
Subject: [PATCH 5/7] Updated thucydides for the acceptance tests

---
 gameoflife-acceptance-tests/pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gameoflife-acceptance-tests/pom.xml b/gameoflife-acceptance-tests/pom.xml
index 8035e04a73..31c2391138 100644
--- a/gameoflife-acceptance-tests/pom.xml
+++ b/gameoflife-acceptance-tests/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>gameoflife</artifactId>
         <groupId>com.wakaleo.gameoflife</groupId>
-        <version>0.9.47-SNAPSHOT</version>
+        <version>1.0-SNAPSHOT</version>
     </parent>
     <artifactId>gameoflife-acceptance-tests</artifactId>
     <name>gameoflife-acceptance-tests</name>
@@ -16,6 +16,7 @@
         <jetty.stop.port>9999</jetty.stop.port>
         <webdriver.base.url>http://localhost:${jetty.port}</webdriver.base.url>
         <webdriver.driver>firefox</webdriver.driver>
+        <thucydides.version>0.9.22</thucydides.version>
     </properties>
     <dependencies>
         <dependency>

From 03fbe777a53452ddde8f975be9d6699d9e468e87 Mon Sep 17 00:00:00 2001
From: John Ferguson Smart <john.smart@wakaleo.com>
Date: Sat, 29 Sep 2012 19:29:41 -0700
Subject: [PATCH 6/7] Adjusting PMD config

---
 pom.xml | 64 +++++++++++++++------------------------------------------
 1 file changed, 17 insertions(+), 47 deletions(-)

diff --git a/pom.xml b/pom.xml
index cdc47e6191..445be8f3d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -234,66 +234,36 @@
             <id>metrics</id>
             <build>
                 <plugins>
-
-                    <!-- CODE COVERAGE -->
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>cobertura-maven-plugin</artifactId>
-                        <version>${cobertura.version}</version>
-                        <configuration>
-                            <formats>
-                                <format>html</format>
-                                <format>xml</format>
-                            </formats>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>clean</goal>
-                                    <goal>check</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-
                     <!-- CHECKSTYLE -->
-                    <plugin>
-                        <artifactId>maven-checkstyle-plugin</artifactId>
-                        <version>2.9.1</version>
-                        <dependencies>
-                            <dependency>
-                                <groupId>com.wakaleo.gameoflife</groupId>
-                                <artifactId>gameoflife-build</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                        </dependencies>
-                        <configuration>
-                            <configLocation>custom-checkstyle.xml</configLocation>
-                        </configuration>
-                    </plugin>
+                    <!--<plugin>-->
+                        <!--<artifactId>maven-checkstyle-plugin</artifactId>-->
+                        <!--<version>2.9.1</version>-->
+                        <!--<dependencies>-->
+                            <!--<dependency>-->
+                                <!--<groupId>com.wakaleo.gameoflife</groupId>-->
+                                <!--<artifactId>gameoflife-build</artifactId>-->
+                                <!--<version>${project.version}</version>-->
+                            <!--</dependency>-->
+                        <!--</dependencies>-->
+                        <!--<configuration>-->
+                            <!--<configLocation>custom-checkstyle.xml</configLocation>-->
+                        <!--</configuration>-->
+                    <!--</plugin>-->
 
                     <!-- PMD -->
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-pmd-plugin</artifactId>
                         <version>2.5</version>
-                        <dependencies>
-                            <dependency>
-                                <groupId>com.wakaleo.gameoflife</groupId>
-                                <artifactId>gameoflife-build</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                        </dependencies>
                         <configuration>
                             <targetJdk>1.6</targetJdk>
                             <aggregate>true</aggregate>
                             <format>xml</format>
-                            <rulesets>
-                                <ruleset>pmd-rules.xml</ruleset>
-                            </rulesets>
                             <!-- CPD options -->
                             <minimumTokens>20</minimumTokens>
-                            <ignoreIdentifiers>true</ignoreIdentifiers>
+                            <!--<ignoreIdentifiers>true</ignoreIdentifiers>-->
+                            <failOnViolation>true</failOnViolation>
+                            <failurePriority>2</failurePriority>
                         </configuration>
                     </plugin>
 

From e90a926524ea36dabaafc5653b4015aa6eb71fdb Mon Sep 17 00:00:00 2001
From: John Ferguson Smart <john.smart@wakaleo.com>
Date: Sat, 29 Sep 2012 20:27:42 -0700
Subject: [PATCH 7/7] Isolate the acceptance tests from the other modules

---
 gameoflife-acceptance-tests/pom.xml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/gameoflife-acceptance-tests/pom.xml b/gameoflife-acceptance-tests/pom.xml
index 31c2391138..2a33e57db3 100644
--- a/gameoflife-acceptance-tests/pom.xml
+++ b/gameoflife-acceptance-tests/pom.xml
@@ -2,12 +2,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <artifactId>gameoflife</artifactId>
-        <groupId>com.wakaleo.gameoflife</groupId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
+    <groupId>com.wakaleo.gameoflife</groupId>
     <artifactId>gameoflife-acceptance-tests</artifactId>
+    <version>1.0-SNAPSHOT</version>
     <name>gameoflife-acceptance-tests</name>
     <properties>
         <target.version>0.9.22</target.version>