From 1d93c3b302e9cfc0b9739e179a3f3dd616cc121b Mon Sep 17 00:00:00 2001
From: dave <dave@bould.net>
Date: Mon, 27 Mar 2017 10:42:53 +0100
Subject: [PATCH 1/7] Added build.xml for Linux Vagrant .box to go with this in
 progress

---
 build/build.xml | 74 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 build/build.xml

diff --git a/build/build.xml b/build/build.xml
new file mode 100644
index 000000000..112122105
--- /dev/null
+++ b/build/build.xml
@@ -0,0 +1,74 @@
+<project name="gpconnect" default="dist" basedir="../">
+<property file="config/gpconnect-demonstrator-api.properties"/>
+
+<target name="build" depends="sql, install-grunt, install-js-dependencies, build-java">
+</target>
+
+<target name="build-run" depends="build, run">
+</target>
+
+<property name="username" value="${legacy.datasource.username}" />
+<property name="password" value="${legacy.datasource.password}" />
+<property name="database" value="${legacy.datasource.schema}" />
+
+<target name="sql">
+	<exec executable="mysql" dir="./config/sql">
+		<arg value="-u${username}" />
+		<arg value="-p${password}" />
+		<arg value="-D${database}" />
+		<arg value="-e source create_database.sql" />
+	</exec>
+        <exec executable="mysql" dir="./config/sql">
+                <arg value="-u${username}" />
+                <arg value="-p${password}" />
+                <arg value="-D${database}" />
+                <arg value="-e source create_tables.sql" />
+        </exec>
+        
+  	<apply executable="mysql" parallel="false">
+    		<fileset dir="./config/sql" casesensitive="yes">
+      			<include name="**/*.sql"/>
+      			<exclude name="**/*create*"/>
+    		</fileset>
+		<arg value="-u${username}" />
+                <arg value="-p${password}" />
+                <arg value="-D${database}" />
+                <arg value="-e source" />
+		<targetfile />
+		<mapper type="identity" />
+  	</apply>
+</target>
+
+<target name="install-grunt">
+	<exec executable="sudo">
+		<arg line="npm install -g grunt-cli bower" />
+	</exec>
+</target>
+
+<target name="install-js-dependencies">
+	<exec executable="bower" dir="./webapp">
+		<arg line="install" />
+	</exec>
+	<exec executable="bower" dir="./webapp">
+		<arg line="update" />
+	</exec>
+	<exec executable="npm" dir="./webapp">
+		<arg line="update" />
+	</exec>
+	<exec executable="grunt" dir="./webapp">
+                <arg line="build" />
+        </exec>
+</target>
+
+<target name="build-java">
+        <exec executable="mvn">
+                <arg line="clean package" />
+        </exec>
+</target>
+
+<target name="run">
+        <exec executable="java">
+                <arg line="-jar gpconnect-demonstrator-api/target/gpconnect-demonstrator-api.war --server.port=19191 --config.path=config/" />
+        </exec>
+</target>
+</project>

From 542326706454524cd23c63690c50a44980bae894 Mon Sep 17 00:00:00 2001
From: dave <dave@bould.net>
Date: Wed, 29 Mar 2017 22:36:20 +0100
Subject: [PATCH 2/7] Fixes for build script sql import

---
 build/build.xml | 42 +++++++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index 112122105..74f299fe4 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -7,36 +7,32 @@
 <target name="build-run" depends="build, run">
 </target>
 
-<property name="username" value="${legacy.datasource.username}" />
-<property name="password" value="${legacy.datasource.password}" />
-<property name="database" value="${legacy.datasource.schema}" />
-
 <target name="sql">
 	<exec executable="mysql" dir="./config/sql">
-		<arg value="-u${username}" />
-		<arg value="-p${password}" />
-		<arg value="-D${database}" />
+		<arg value="-u${legacy.datasource.username}" />
+		<arg value="-p${legacy.datasource.password}" />
+		<arg value="-D${legacy.datasource.schema}" />
 		<arg value="-e source create_database.sql" />
 	</exec>
         <exec executable="mysql" dir="./config/sql">
-                <arg value="-u${username}" />
-                <arg value="-p${password}" />
-                <arg value="-D${database}" />
+                <arg value="-u${legacy.datasource.username}" />
+                <arg value="-p${legacy.datasource.password}" />
+                <arg value="-D${legacy.datasource.schema}" />
                 <arg value="-e source create_tables.sql" />
         </exec>
-        
-  	<apply executable="mysql" parallel="false">
-    		<fileset dir="./config/sql" casesensitive="yes">
-      			<include name="**/*.sql"/>
-      			<exclude name="**/*create*"/>
-    		</fileset>
-		<arg value="-u${username}" />
-                <arg value="-p${password}" />
-                <arg value="-D${database}" />
-                <arg value="-e source" />
-		<targetfile />
-		<mapper type="identity" />
-  	</apply>
+
+	<sql
+        driver="com.mysql.jdbc.Driver"
+    	url="jdbc:mysql://${legacy.datasource.host}/${legacy.datasource.schema}"
+    	userid="${legacy.datasource.username}"
+    	password="${legacy.datasource.password}">
+		<path>
+                <fileset dir="./config/sql" casesensitive="yes">
+                        <include name="**/*.sql"/>
+                        <exclude name="**/*create*"/>
+                </fileset>
+		</path>
+	</sql>
 </target>
 
 <target name="install-grunt">

From 6ff5b96d75a12ccad7894a5fb18772c2bd143131 Mon Sep 17 00:00:00 2001
From: dave <dave@bould.net>
Date: Mon, 3 Apr 2017 08:35:29 +0100
Subject: [PATCH 3/7] Fixes for initial build

Fixes errors from sql import when database doesn't exist
Fixes classpath not found errors for jdbc driver
---
 build/build.xml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index 74f299fe4..50da9e810 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -7,11 +7,16 @@
 <target name="build-run" depends="build, run">
 </target>
 
+<path id="classpath">
+<fileset dir="/usr/share/java">
+    <include name="*.jar" />
+</fileset>
+</path>
+
 <target name="sql">
 	<exec executable="mysql" dir="./config/sql">
 		<arg value="-u${legacy.datasource.username}" />
 		<arg value="-p${legacy.datasource.password}" />
-		<arg value="-D${legacy.datasource.schema}" />
 		<arg value="-e source create_database.sql" />
 	</exec>
         <exec executable="mysql" dir="./config/sql">
@@ -20,12 +25,12 @@
                 <arg value="-D${legacy.datasource.schema}" />
                 <arg value="-e source create_tables.sql" />
         </exec>
-
 	<sql
         driver="com.mysql.jdbc.Driver"
     	url="jdbc:mysql://${legacy.datasource.host}/${legacy.datasource.schema}"
     	userid="${legacy.datasource.username}"
-    	password="${legacy.datasource.password}">
+    	password="${legacy.datasource.password}"
+        classpathref="classpath">
 		<path>
                 <fileset dir="./config/sql" casesensitive="yes">
                         <include name="**/*.sql"/>

From 731194b185706270043d3322b6315091de85d354 Mon Sep 17 00:00:00 2001
From: dave <dave@bould.net>
Date: Wed, 12 Apr 2017 22:12:00 +0100
Subject: [PATCH 4/7] Added README for using the build script

---
 build/README.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 build/README.md

diff --git a/build/README.md b/build/README.md
new file mode 100644
index 000000000..19bba0fb9
--- /dev/null
+++ b/build/README.md
@@ -0,0 +1 @@
+There is a full environment and build process available to automate the setup of this project.  Just clone https://github.com/dbould/gpconnect-vagrant and follow the instructions

From 4d36b8f567a4c3ad2efed5d30c33dcdbc97f25e3 Mon Sep 17 00:00:00 2001
From: dave <dave@bould.net>
Date: Wed, 12 Apr 2017 22:16:04 +0100
Subject: [PATCH 5/7] Build README additions

---
 build/README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/build/README.md b/build/README.md
index 19bba0fb9..553689721 100644
--- a/build/README.md
+++ b/build/README.md
@@ -1 +1,3 @@
 There is a full environment and build process available to automate the setup of this project.  Just clone https://github.com/dbould/gpconnect-vagrant and follow the instructions
+
+This build script can be run on it's own in a Linux environment, if the README from the root directory has been followed use ```ant build``` to import the SQL and build the JS dependencies and ```ant run``` to serve the project.

From c04758017304485d5d8b72e076dccb8b46f7fd42 Mon Sep 17 00:00:00 2001
From: dave <dave@bould.net>
Date: Wed, 12 Apr 2017 22:17:36 +0100
Subject: [PATCH 6/7] Added build.xml.  Ant script for Ubuntu environment

---
 build/build.xml | 75 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 build/build.xml

diff --git a/build/build.xml b/build/build.xml
new file mode 100644
index 000000000..a732c693f
--- /dev/null
+++ b/build/build.xml
@@ -0,0 +1,75 @@
+<project name="gpconnect" default="dist" basedir="../">
+<property file="config/gpconnect-demonstrator-api.properties"/>
+
+<target name="build" depends="sql, install-grunt, install-js-dependencies, build-java">
+</target>
+
+<target name="build-run" depends="build, run">
+</target>
+
+<path id="classpath">
+<fileset dir="/usr/share/java">
+    <include name="*.jar" />
+</fileset>
+</path>
+
+<target name="sql">
+	<exec executable="mysql" dir="./config/sql">
+		<arg value="-u${legacy.datasource.username}" />
+		<arg value="-p${legacy.datasource.password}" />
+		<arg value="-e source create_database.sql" />
+	</exec>
+        <exec executable="mysql" dir="./config/sql">
+                <arg value="-u${legacy.datasource.username}" />
+                <arg value="-p${legacy.datasource.password}" />
+                <arg value="-D${legacy.datasource.schema}" />
+                <arg value="-e source create_tables.sql" />
+        </exec>
+	<sql
+        driver="com.mysql.jdbc.Driver"
+    	url="jdbc:mysql://${legacy.datasource.host}/${legacy.datasource.schema}"
+    	userid="${legacy.datasource.username}"
+    	password="${legacy.datasource.password}"
+        classpathref="classpath">
+		<path>
+                <fileset dir="./config/sql" casesensitive="yes">
+                        <include name="**/*.sql"/>
+                        <exclude name="**/*create*"/>
+                </fileset>
+		</path>
+	</sql>
+</target>
+
+<target name="install-grunt">
+	<exec executable="sudo">
+		<arg line="npm install -g grunt-cli bower" />
+	</exec>
+</target>
+
+<target name="install-js-dependencies">
+	<exec executable="bower" dir="./webapp">
+		<arg line="install" />
+	</exec>
+	<exec executable="bower" dir="./webapp">
+		<arg line="update" />
+	</exec>
+	<exec executable="npm" dir="./webapp">
+		<arg line="update" />
+	</exec>
+	<exec executable="grunt" dir="./webapp">
+                <arg line="build --force" />
+        </exec>
+</target>
+
+<target name="build-java">
+        <exec executable="mvn">
+                <arg line="clean package" />
+        </exec>
+</target>
+
+<target name="run">
+        <exec executable="java">
+                <arg line="-jar gpconnect-demonstrator-api/target/gpconnect-demonstrator-api.war --server.port=19191 --config.path=config/" />
+        </exec>
+</target>
+</project>

From 2d289570f165e6fb6a58e1a34b21e3b48b79f2e1 Mon Sep 17 00:00:00 2001
From: Dave Bould <dave@bould.net>
Date: Thu, 13 Apr 2017 10:29:34 +0100
Subject: [PATCH 7/7] Update README.md

---
 build/README.md | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/build/README.md b/build/README.md
index 553689721..4cfbf19ef 100644
--- a/build/README.md
+++ b/build/README.md
@@ -1,3 +1,12 @@
-There is a full environment and build process available to automate the setup of this project.  Just clone https://github.com/dbould/gpconnect-vagrant and follow the instructions
+# GP Connect Ant Build Script
+There is a full environment and build process available to automate the setup of this project.  Just clone [https://github.com/dbould/gpconnect-vagrant](https://github.com/dbould/gpconnect-vagrant) and follow the instructions
 
-This build script can be run on it's own in a Linux environment, if the README from the root directory has been followed use ```ant build``` to import the SQL and build the JS dependencies and ```ant run``` to serve the project.
+This build script can be run on it's own in a Linux environment, if the README from the root directory has been followed use 
+
+```ant build``` 
+
+to import the SQL and build the JS dependencies and 
+
+```ant run``` 
+
+to serve the project.