Database: temporary-ish db build fixes

Author: jayaddison

dbs/autochef/build.xml

@@ -1,19 +1,16 @@
 <project default="create">
 
-  <property file="../../www/autochef/etc/autochef.properties" />
-
-  <path id="compile.classpath">
-    <fileset dir="../../www/autochef/src/lib" />
-  </path>
+  <property file="../../www/autochef/src/main/resources/autochef.properties" />
+  <property name="jdbc.classpath" value="/usr/share/java/postgresql.jar" />
 
   <target name="clean">
     <sql
         driver="org.postgresql.Driver"
-        classpathref="compile.classpath"
+        classpath="${jdbc.classpath}"
         url="jdbc:postgresql://${database.hostname}/postgres"
         userid="${database.username}"
         password="${database.password}"
-        autocommit="true"
+	autocommit="true"
     >
     drop database if exists autochef;
     </sql>
@@ -22,41 +19,41 @@
   <target name="create" depends="clean">
     <sql
         driver="org.postgresql.Driver"
-        classpathref="compile.classpath"
+        classpath="${jdbc.classpath}"
         url="jdbc:postgresql://${database.hostname}/postgres"
         userid="${database.username}"
         password="${database.password}"
-        autocommit="true"
+	autocommit="true"
     >
     create database autochef;
     </sql>
     <sql
         driver="org.postgresql.Driver"
-        classpathref="compile.classpath"
+        classpath="${jdbc.classpath}"
         url="jdbc:postgresql://${database.hostname}/${database.catalog}"
         userid="${database.username}"
         password="${database.password}"
         src="scripts/create.sql"
     />
     <sql
         driver="org.postgresql.Driver"
-        classpathref="compile.classpath"
+        classpath="${jdbc.classpath}"
         url="jdbc:postgresql://${database.hostname}/${database.catalog}"
         userid="${database.username}"
         password="${database.password}"
         src="scripts/data/base-environment.sql"
     />
     <sql
         driver="org.postgresql.Driver"
-        classpathref="compile.classpath"
+        classpath="${jdbc.classpath}"
         url="jdbc:postgresql://${database.hostname}/${database.catalog}"
         userid="${database.username}"
         password="${database.password}"
         src="scripts/data/base-ingredients.sql"
     />
     <sql
         driver="org.postgresql.Driver"
-        classpathref="compile.classpath"
+        classpath="${jdbc.classpath}"
         url="jdbc:postgresql://${database.hostname}/${database.catalog}"
         userid="${database.username}"
         password="${database.password}">
@@ -68,7 +65,7 @@
     </sql>
     <sql
         driver="org.postgresql.Driver"
-        classpathref="compile.classpath"
+        classpath="${jdbc.classpath}"
         url="jdbc:postgresql://${database.hostname}/${database.catalog}"
         userid="${database.username}"
         password="${database.password}"

dbs/autochef/scripts/data/base-recipes/beef-burritos.sql

@@ -4,13 +4,6 @@ insert into tbmeals (ingredientid) values (currval('tbingredients_ingredientid_s
 insert into tbingredienttranslations (ingredientid, languageid, name, instructions) values (currval('tbingredients_ingredientid_seq'), 'en', 'Beef Burritos', '');
 
 -- Required Ingredients
-insert into tbingredients (duration) values ('0'::interval);
-insert into tbproducts (ingredientid, supplierid) values (currval('tbingredients_ingredientid_seq'), '');
-insert into tbingredienttranslations (ingredientid, languageid, name, instructions) values (currval('tbingredients_ingredientid_seq'), 'en', 'Beef', '');
-
-insert into tbingredients (duration) values ('5 minutes'::interval);
-insert into tbproducts (ingredientid, supplierid) values (currval('tbingredients_ingredientid_seq'), '');
-insert into tbingredienttranslations (ingredientid, languageid, name, instructions) values (currval('tbingredients_ingredientid_seq'), 'en', 'Minced Beef', '');
 
 -- Intermediate Steps
 

dbs/autochef/scripts/data/base-recipes/beef-stew.sql

@@ -4,9 +4,6 @@ insert into tbmeals (ingredientid) values (currval('tbingredients_ingredientid_s
 insert into tbingredienttranslations (ingredientid, languageid, name, instructions) values (currval('tbingredients_ingredientid_seq'), 'en', 'Beef Stew', '');
 
 -- Required Ingredients
-insert into tbingredients (duration) values ('0'::interval);
-insert into tbproducts (ingredientid, supplierid) values (currval('tbingredients_ingredientid_seq'), '');
-insert into tbingredienttranslations (ingredientid, languageid, name, instructions) values (currval('tbingredients_ingredientid_seq'), 'en', 'Beef', '');
 
 -- Intermediate Steps
 

dbs/logstore/build.xml

@@ -1,15 +1,12 @@
-<project default="createdb">
+<project default="create">
 
-  <property file="../../www/autochef/etc/logstore.properties" />
-
-  <path id="compile.classpath">
-    <fileset dir="../../www/autochef/src/lib" />
-  </path>
+  <property file="../../www/autochef/src/main/resources/logstore.properties" />
+  <property name="jdbc.classpath" value="/usr/share/java/postgresql.jar" />
 
   <target name="clean">
     <sql
         driver="org.postgresql.Driver"
-        classpathref="compile.classpath"
+        classpath="${jdbc.classpath}"
         url="jdbc:postgresql://${database.hostname}/postgres"
         userid="${database.username}"
         password="${database.password}"
@@ -19,10 +16,10 @@
     </sql>
   </target>
 
-  <target name="createdb" depends="clean">
+  <target name="create" depends="clean">
     <sql
         driver="org.postgresql.Driver"
-        classpathref="compile.classpath"
+        classpath="${jdbc.classpath}"
         url="jdbc:postgresql://${database.hostname}/postgres"
         userid="${database.username}"
         password="${database.password}"
@@ -32,15 +29,15 @@
     </sql>
     <sql
         driver="org.postgresql.Driver"
-        classpathref="compile.classpath"
+        classpath="${jdbc.classpath}"
         url="jdbc:postgresql://${database.hostname}/${database.catalog}"
         userid="${database.username}"
         password="${database.password}"
         src="scripts/create.sql"
     />
     <sql
         driver="org.postgresql.Driver"
-        classpathref="compile.classpath"
+        classpath="${jdbc.classpath}"
         url="jdbc:postgresql://${database.hostname}/${database.catalog}"
         userid="${database.username}"
         password="${database.password}"