From 2793a32419e630bfc100bc39dcf410aa202a9421 Mon Sep 17 00:00:00 2001 From: Tuna Aksoy Date: Wed, 28 Aug 2013 10:32:20 +0000 Subject: [PATCH] Try fixing the failing rm build on the server git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@54550 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- rm-server/build.gradle | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/rm-server/build.gradle b/rm-server/build.gradle index 43e450a915..a0aecb6d8a 100644 --- a/rm-server/build.gradle +++ b/rm-server/build.gradle @@ -45,6 +45,12 @@ eclipse { } task resetDatabase << { + // Set default values if nothing was found (remember Ant props are 'first set wins') + ant.property(name: "db.name", value: "alfresco") + ant.property(name: "db.url", value: "jdbc:postgresql:alfresco") + ant.property(name: "db.master.url", value: "jdbc:postgresql:template1") + ant.property(name: "db.username", value: "alfresco") + ant.property(name: "db.password", value: "alfresco") // Loading the properties in all possible locations ant.property(file: System.properties.getProperty('DB_PROPERTIES') ) @@ -53,13 +59,6 @@ task resetDatabase << { ant.property(resource: 'alfresco/version.properties', classpath: configurations.compile.asPath ) ant.property(resource: 'alfresco/repository.properties', classpath: configurations.compile.asPath ) - // Set default values if nothing was found (remember Ant props are 'first set wins') - ant.property(name: "db.name", value: "alfresco") - ant.property(name: "db.url", value: "jdbc:postgresql:alfresco") - ant.property(name: "db.master.url", value: "jdbc:postgresql:template1") - ant.property(name: "db.username", value: "alfresco") - ant.property(name: "db.password", value: "alfresco") - println "Recreating database " + ant.getProperty("db.name") + " as user " + ant.getProperty("db.username") ant.sql(driver: 'org.postgresql.Driver', url: ant.getProperty("db.master.url"),