Repository: airavata Updated Branches: refs/heads/master d8d294565 -> 4932605ec
fixing AIRAVATA-1062 Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/4932605e Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/4932605e Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/4932605e Branch: refs/heads/master Commit: 4932605ec94c3978fe51586df4f1d9e4b2771ae6 Parents: d8d2945 Author: chathuri <[email protected]> Authored: Fri Mar 7 13:55:36 2014 -0500 Committer: chathuri <[email protected]> Committed: Fri Mar 7 13:55:36 2014 -0500 ---------------------------------------------------------------------- airavata-api/airavata-client-sdks/java-client-samples/pom.xml | 6 +++++- .../utils/src/test/resources/airavata-server.properties | 2 +- .../src/main/resources/conf/airavata-client.properties | 2 +- .../gfac-core/src/test/resources/airavata-server.properties | 2 +- .../gfac-ec2/src/test/resources/airavata-server.properties | 2 +- .../src/main/resources/airavata-server.properties | 2 +- .../src/test/resources/airavata-server.properties | 2 +- .../src/main/resources/airavata-client.properties | 2 +- .../src/main/resources/airavata-server.properties | 2 +- .../src/test/resources/airavata-server.properties | 2 +- .../persistance/registry/jpa/impl/ExperimentRegistry.java | 2 +- .../src/test/resources/airavata-client.properties | 2 +- modules/server/src/main/resources/airavata-server.properties | 2 +- 13 files changed, 17 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/4932605e/airavata-api/airavata-client-sdks/java-client-samples/pom.xml ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/java-client-samples/pom.xml b/airavata-api/airavata-client-sdks/java-client-samples/pom.xml index f5e543b..b5f2631 100644 --- a/airavata-api/airavata-client-sdks/java-client-samples/pom.xml +++ b/airavata-api/airavata-client-sdks/java-client-samples/pom.xml @@ -72,7 +72,11 @@ <artifactId>slf4j-log4j12</artifactId> <version>${org.slf4j.version}</version> </dependency> - + <!--<dependency>--> + <!--<groupId>mysql</groupId>--> + <!--<artifactId>mysql-connector-java</artifactId>--> + <!--<version>5.1.17</version>--> + <!--</dependency>--> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/airavata/blob/4932605e/modules/commons/utils/src/test/resources/airavata-server.properties ---------------------------------------------------------------------- diff --git a/modules/commons/utils/src/test/resources/airavata-server.properties b/modules/commons/utils/src/test/resources/airavata-server.properties index cf74dfa..1c2cc83 100755 --- a/modules/commons/utils/src/test/resources/airavata-server.properties +++ b/modules/commons/utils/src/test/resources/airavata-server.properties @@ -64,7 +64,7 @@ default.registry.user=admin default.registry.password=admin default.registry.password.hash.method=SHA default.registry.gateway=default -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 #for rest [RegistryClient] #registry.jdbc.url=http://localhost:9080/airavata-services http://git-wip-us.apache.org/repos/asf/airavata/blob/4932605e/modules/distribution/airavata-client/src/main/resources/conf/airavata-client.properties ---------------------------------------------------------------------- diff --git a/modules/distribution/airavata-client/src/main/resources/conf/airavata-client.properties b/modules/distribution/airavata-client/src/main/resources/conf/airavata-client.properties index ff4de88..2a463b1 100644 --- a/modules/distribution/airavata-client/src/main/resources/conf/airavata-client.properties +++ b/modules/distribution/airavata-client/src/main/resources/conf/airavata-client.properties @@ -45,7 +45,7 @@ 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 defauly.registry.user=admin default.registry.password=admin http://git-wip-us.apache.org/repos/asf/airavata/blob/4932605e/modules/gfac/gfac-core/src/test/resources/airavata-server.properties ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/test/resources/airavata-server.properties b/modules/gfac/gfac-core/src/test/resources/airavata-server.properties index 452ff52..03a43f6 100644 --- a/modules/gfac/gfac-core/src/test/resources/airavata-server.properties +++ b/modules/gfac/gfac-core/src/test/resources/airavata-server.properties @@ -64,7 +64,7 @@ default.registry.user=admin default.registry.password=admin default.registry.password.hash.method=SHA default.registry.gateway=default -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 #for rest [RegistryClient] #registry.jdbc.url=http://localhost:9080/airavata-services http://git-wip-us.apache.org/repos/asf/airavata/blob/4932605e/modules/gfac/gfac-ec2/src/test/resources/airavata-server.properties ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-ec2/src/test/resources/airavata-server.properties b/modules/gfac/gfac-ec2/src/test/resources/airavata-server.properties index 452ff52..03a43f6 100644 --- a/modules/gfac/gfac-ec2/src/test/resources/airavata-server.properties +++ b/modules/gfac/gfac-ec2/src/test/resources/airavata-server.properties @@ -64,7 +64,7 @@ default.registry.user=admin default.registry.password=admin default.registry.password.hash.method=SHA default.registry.gateway=default -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 #for rest [RegistryClient] #registry.jdbc.url=http://localhost:9080/airavata-services http://git-wip-us.apache.org/repos/asf/airavata/blob/4932605e/modules/orchestrator/airavata-orchestrator-service/src/main/resources/airavata-server.properties ---------------------------------------------------------------------- diff --git a/modules/orchestrator/airavata-orchestrator-service/src/main/resources/airavata-server.properties b/modules/orchestrator/airavata-orchestrator-service/src/main/resources/airavata-server.properties index ee67de3..672c7c9 100644 --- a/modules/orchestrator/airavata-orchestrator-service/src/main/resources/airavata-server.properties +++ b/modules/orchestrator/airavata-orchestrator-service/src/main/resources/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 http://git-wip-us.apache.org/repos/asf/airavata/blob/4932605e/modules/orchestrator/airavata-orchestrator-service/src/test/resources/airavata-server.properties ---------------------------------------------------------------------- diff --git a/modules/orchestrator/airavata-orchestrator-service/src/test/resources/airavata-server.properties b/modules/orchestrator/airavata-orchestrator-service/src/test/resources/airavata-server.properties index dff7feb..0526808 100644 --- a/modules/orchestrator/airavata-orchestrator-service/src/test/resources/airavata-server.properties +++ b/modules/orchestrator/airavata-orchestrator-service/src/test/resources/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 http://git-wip-us.apache.org/repos/asf/airavata/blob/4932605e/modules/orchestrator/orchestrator-client-sdks/src/main/resources/airavata-client.properties ---------------------------------------------------------------------- diff --git a/modules/orchestrator/orchestrator-client-sdks/src/main/resources/airavata-client.properties b/modules/orchestrator/orchestrator-client-sdks/src/main/resources/airavata-client.properties index ff4de88..2a463b1 100644 --- a/modules/orchestrator/orchestrator-client-sdks/src/main/resources/airavata-client.properties +++ b/modules/orchestrator/orchestrator-client-sdks/src/main/resources/airavata-client.properties @@ -45,7 +45,7 @@ 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 defauly.registry.user=admin default.registry.password=admin http://git-wip-us.apache.org/repos/asf/airavata/blob/4932605e/modules/orchestrator/orchestrator-core/src/main/resources/airavata-server.properties ---------------------------------------------------------------------- diff --git a/modules/orchestrator/orchestrator-core/src/main/resources/airavata-server.properties b/modules/orchestrator/orchestrator-core/src/main/resources/airavata-server.properties index 86195aa..ed563a6 100644 --- a/modules/orchestrator/orchestrator-core/src/main/resources/airavata-server.properties +++ b/modules/orchestrator/orchestrator-core/src/main/resources/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 http://git-wip-us.apache.org/repos/asf/airavata/blob/4932605e/modules/orchestrator/orchestrator-core/src/test/resources/airavata-server.properties ---------------------------------------------------------------------- diff --git a/modules/orchestrator/orchestrator-core/src/test/resources/airavata-server.properties b/modules/orchestrator/orchestrator-core/src/test/resources/airavata-server.properties index bfd50a0..bf2a468 100644 --- a/modules/orchestrator/orchestrator-core/src/test/resources/airavata-server.properties +++ b/modules/orchestrator/orchestrator-core/src/test/resources/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 http://git-wip-us.apache.org/repos/asf/airavata/blob/4932605e/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java index 60de192..26de4c0 100644 --- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java +++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java @@ -2485,7 +2485,7 @@ public class ExperimentRegistry { } public Timestamp getTime(long time) { - if (time == 0){ + if (time == 0 || time < 0){ return getCurrentTimestamp(); } return new Timestamp(time); http://git-wip-us.apache.org/repos/asf/airavata/blob/4932605e/modules/registry/airavata-jpa-registry/src/test/resources/airavata-client.properties ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-jpa-registry/src/test/resources/airavata-client.properties b/modules/registry/airavata-jpa-registry/src/test/resources/airavata-client.properties index 6092f01..48130b7 100644 --- a/modules/registry/airavata-jpa-registry/src/test/resources/airavata-client.properties +++ b/modules/registry/airavata-jpa-registry/src/test/resources/airavata-client.properties @@ -42,7 +42,7 @@ registry.jdbc.url=jdbc:derby://localhost:20000/jpa_test;create=true;user=airavat registry.jdbc.user=airavata registry.jdbc.password=airavata start.derby.server.mode=true -validationQuery=SELECT 1 from Configuration +validationQuery=SELECT 1 from CONFIGURATION default.registry.user=admin default.registry.password=admin http://git-wip-us.apache.org/repos/asf/airavata/blob/4932605e/modules/server/src/main/resources/airavata-server.properties ---------------------------------------------------------------------- diff --git a/modules/server/src/main/resources/airavata-server.properties b/modules/server/src/main/resources/airavata-server.properties index ee67de3..672c7c9 100644 --- a/modules/server/src/main/resources/airavata-server.properties +++ b/modules/server/src/main/resources/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
