From 40202b3d3b830961e0786a6af1f144844c403836 Mon Sep 17 00:00:00 2001 From: rk Date: Thu, 24 Jan 2002 00:39:34 +0000 Subject: [PATCH] added possibility to run postbuild-scripts --- build.sh-dist | 10 ++++++++++ source/mir/storage/DatabaseAdaptorPostgresql.java | 5 ++++- source/mir/storage/DatabaseConfig.java | 6 +++++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/build.sh-dist b/build.sh-dist index 8afa4c79..93bc2aca 100755 --- a/build.sh-dist +++ b/build.sh-dist @@ -34,3 +34,13 @@ ANT_HOME=LIB_HOME # use mir-ant # Execute ANT to perform the requested build target $JAVA_HOME/bin/java -classpath $CP:$CLASSPATH org.apache.tools.ant.Main \ -Dtomcat.home=$TOMCAT_HOME "$@" + + +# +# execute postbuild script if present + +if [ -f ./build.post ]; then + echo "Executing build.post" + sh build.post +fi + diff --git a/source/mir/storage/DatabaseAdaptorPostgresql.java b/source/mir/storage/DatabaseAdaptorPostgresql.java index 39b2a571..f00c5deb 100755 --- a/source/mir/storage/DatabaseAdaptorPostgresql.java +++ b/source/mir/storage/DatabaseAdaptorPostgresql.java @@ -12,7 +12,10 @@ import mir.misc.*; public final class DatabaseAdaptorPostgresql implements DatabaseAdaptor{ - private static String url = "jdbc:postgresql://localhost:5432/mir"; +// private static String url = "jdbc:postgresql://localhost:5432/mir"; +// just testing + + private static String url = "jdbc:postgresql://localhost:5432/mir_unstable"; private static String driver = "org.postgresql.Driver"; public String getDriver() { diff --git a/source/mir/storage/DatabaseConfig.java b/source/mir/storage/DatabaseConfig.java index 46f043f5..a9e7c3e4 100755 --- a/source/mir/storage/DatabaseConfig.java +++ b/source/mir/storage/DatabaseConfig.java @@ -31,6 +31,10 @@ public class DatabaseConfig { configHash.put("Database.poolMax", "10"); configHash.put("Database.poolLog", "/tmp/pool.log"); configHash.put("Database.poolResetTime", "1.0"); + + // just for testing + configHash.put("Database.Username", "postgres"); + configHash.put("Database.Password", ""); } public static void setUsername(String user) { @@ -52,7 +56,7 @@ public class DatabaseConfig { public static void setDefaultLimit(int limit) { configHash.put("Database.Limit", Integer.toString(limit)); } - + public static void setPoolMin(int min) { configHash.put("Database.poolMin", Integer.toString(min)); } -- 2.11.0