Repository: airavata Updated Branches: refs/heads/master 880003b67 -> 59cc938b6
Fixed the table name. AIRAVATA-1062 Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/59cc938b Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/59cc938b Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/59cc938b Branch: refs/heads/master Commit: 59cc938b617435016de116df10c01462c5a5575d Parents: 880003b Author: raminder <[email protected]> Authored: Thu Mar 6 14:06:49 2014 -0500 Committer: raminder <[email protected]> Committed: Thu Mar 6 14:06:49 2014 -0500 ---------------------------------------------------------------------- .../java/org/apache/airavata/api/server/util/RegistryInitUtil.java | 2 +- .../src/main/resources/airavata-server.properties | 2 +- .../src/main/resources/conf/airavata-server.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/59cc938b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/RegistryInitUtil.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/RegistryInitUtil.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/RegistryInitUtil.java index 2cb9c78..70978b5 100644 --- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/RegistryInitUtil.java +++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/RegistryInitUtil.java @@ -41,7 +41,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class RegistryInitUtil { - public static final String CONFIGURATION_TABLE = "Configuration"; + public static final String CONFIGURATION_TABLE = "CONFIGURATION"; private static final Logger logger = LoggerFactory.getLogger(RegistryInitUtil.class); public static final String REGISTRY_JDBC_DRIVER = "registry.jdbc.driver"; public static final String REGISTRY_JDBC_URL = "registry.jdbc.url"; http://git-wip-us.apache.org/repos/asf/airavata/blob/59cc938b/airavata-api/airavata-api-server/src/main/resources/airavata-server.properties ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-api-server/src/main/resources/airavata-server.properties b/airavata-api/airavata-api-server/src/main/resources/airavata-server.properties index 2dbc50f..f6caac7 100644 --- a/airavata-api/airavata-api-server/src/main/resources/airavata-server.properties +++ b/airavata-api/airavata-api-server/src/main/resources/airavata-server.properties @@ -47,7 +47,7 @@ registry.jdbc.url=jdbc:derby://localhost:1527/persistent_data;create=true;user=a registry.jdbc.user=airavata registry.jdbc.password=airavata start.derby.server.mode=true -validationQuery=SELECT 1 from Configuration +validationQuery=SELECT 1 from CONFIGURATION jpa.connection.properties=MaxActive=10,MaxIdle=5,MinIdle=2,MaxWait=60000,testWhileIdle=true,testOnBorrow=true # Properties to setup registry service default.registry.user=admin http://git-wip-us.apache.org/repos/asf/airavata/blob/59cc938b/modules/distribution/airavata-server/src/main/resources/conf/airavata-server.properties ---------------------------------------------------------------------- diff --git a/modules/distribution/airavata-server/src/main/resources/conf/airavata-server.properties b/modules/distribution/airavata-server/src/main/resources/conf/airavata-server.properties index ee67de3..672c7c9 100644 --- a/modules/distribution/airavata-server/src/main/resources/conf/airavata-server.properties +++ b/modules/distribution/airavata-server/src/main/resources/conf/airavata-server.properties @@ -62,7 +62,7 @@ registry.jdbc.url=jdbc:derby://localhost:1527/persistent_data;create=true;user=a registry.jdbc.user=airavata registry.jdbc.password=airavata start.derby.server.mode=true -validationQuery=SELECT 1 from Configuration +validationQuery=SELECT 1 from CONFIGURATION jpa.connection.properties=MaxActive=10,MaxIdle=5,MinIdle=2,MaxWait=60000,testWhileIdle=true,testOnBorrow=true # Properties to setup registry service default.registry.user=admin
