Repository: airavata Updated Branches: refs/heads/master e9468ca5b -> 9385c4eb0
change persistent_data to experiment_catalog Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/9385c4eb Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/9385c4eb Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/9385c4eb Branch: refs/heads/master Commit: 9385c4eb0ad9df573e62657bacecc552fdeb97bb Parents: e9468ca Author: Chathuri Wimalasena <[email protected]> Authored: Fri Mar 6 14:20:18 2015 -0500 Committer: Chathuri Wimalasena <[email protected]> Committed: Fri Mar 6 14:20:18 2015 -0500 ---------------------------------------------------------------------- .../org/apache/airavata/common/utils/DatabaseTestCases.java | 2 +- .../client/src/main/resources/airavata-client.properties | 2 +- .../server/src/main/resources/airavata-server.properties | 6 +++--- .../credential/store/store/impl/db/SSHCredentialTest.java | 2 +- .../src/main/resources/airavata-server.properties | 4 ++-- modules/security/src/test/resources/jdbc-authenticator.xml | 2 +- modules/security/src/test/resources/session-authenticator.xml | 2 +- tools/registry-tool/README | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/9385c4eb/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/DatabaseTestCases.java ---------------------------------------------------------------------- diff --git a/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/DatabaseTestCases.java b/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/DatabaseTestCases.java index 019a53c..6ff528d 100644 --- a/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/DatabaseTestCases.java +++ b/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/DatabaseTestCases.java @@ -62,7 +62,7 @@ public class DatabaseTestCases { public static String getJDBCUrl() { return new StringBuilder().append("jdbc:derby://").append(getHostAddress()).append(":").append(getPort()) - .append("/persistent_data;create=true;user=").append(getUserName()).append(";password=") + .append("/experiment_catalog;create=true;user=").append(getUserName()).append(";password=") .append(getPassword()).toString(); } http://git-wip-us.apache.org/repos/asf/airavata/blob/9385c4eb/modules/configuration/client/src/main/resources/airavata-client.properties ---------------------------------------------------------------------- diff --git a/modules/configuration/client/src/main/resources/airavata-client.properties b/modules/configuration/client/src/main/resources/airavata-client.properties index 98972cd..70f2bae 100644 --- a/modules/configuration/client/src/main/resources/airavata-client.properties +++ b/modules/configuration/client/src/main/resources/airavata-client.properties @@ -39,7 +39,7 @@ #for derby [AiravataJPARegistry] registry.jdbc.driver=org.apache.derby.jdbc.ClientDriver -registry.jdbc.url=jdbc:derby://localhost:1527/persistent_data;create=true;user=airavata;password=airavata +registry.jdbc.url=jdbc:derby://localhost:1527/experiment_catalog;create=true;user=airavata;password=airavata registry.jdbc.user=airavata registry.jdbc.password=airavata start.derby.server.mode=true http://git-wip-us.apache.org/repos/asf/airavata/blob/9385c4eb/modules/configuration/server/src/main/resources/airavata-server.properties ---------------------------------------------------------------------- diff --git a/modules/configuration/server/src/main/resources/airavata-server.properties b/modules/configuration/server/src/main/resources/airavata-server.properties index c493752..55fbba6 100644 --- a/modules/configuration/server/src/main/resources/airavata-server.properties +++ b/modules/configuration/server/src/main/resources/airavata-server.properties @@ -31,10 +31,10 @@ #for derby [AiravataJPARegistry] registry.jdbc.driver=org.apache.derby.jdbc.ClientDriver -registry.jdbc.url=jdbc:derby://localhost:1527/persistent_data;create=true;user=airavata;password=airavata +registry.jdbc.url=jdbc:derby://localhost:1527/experiment_catalog;create=true;user=airavata;password=airavata # MySql database configuration #registry.jdbc.driver=com.mysql.jdbc.Driver -#registry.jdbc.url=jdbc:mysql://localhost:3306/persistent_data +#registry.jdbc.url=jdbc:mysql://localhost:3306/experiment_catalog registry.jdbc.user=airavata registry.jdbc.password=airavata start.derby.server.mode=true @@ -100,7 +100,7 @@ start.credential.store=false credential.store.keystore.url=/Users/chathuri/dev/airavata/credential-store/oa4mp/airavata_sym.jks credential.store.keystore.alias=airavata credential.store.keystore.password=airavata -credential.store.jdbc.url=jdbc:derby://localhost:1527/persistent_data;create=true;user=airavata;password=airavata +credential.store.jdbc.url=jdbc:derby://localhost:1527/experiment_catalog;create=true;user=airavata;password=airavata credential.store.jdbc.user=airavata credential.store.jdbc.password=airavata credential.store.jdbc.driver=org.apache.derby.jdbc.ClientDriver http://git-wip-us.apache.org/repos/asf/airavata/blob/9385c4eb/modules/credential-store/credential-store-service/src/test/java/org/apache/airavata/credential/store/store/impl/db/SSHCredentialTest.java ---------------------------------------------------------------------- diff --git a/modules/credential-store/credential-store-service/src/test/java/org/apache/airavata/credential/store/store/impl/db/SSHCredentialTest.java b/modules/credential-store/credential-store-service/src/test/java/org/apache/airavata/credential/store/store/impl/db/SSHCredentialTest.java index 7f44125..84b6bd3 100644 --- a/modules/credential-store/credential-store-service/src/test/java/org/apache/airavata/credential/store/store/impl/db/SSHCredentialTest.java +++ b/modules/credential-store/credential-store-service/src/test/java/org/apache/airavata/credential/store/store/impl/db/SSHCredentialTest.java @@ -38,7 +38,7 @@ import java.io.IOException; public class SSHCredentialTest { public static void main(String[] args) { - String jdbcURL = "jdbc:derby://localhost:1527/persistent_data;create=true;user=airavata;password=airavata"; + String jdbcURL = "jdbc:derby://localhost:1527/experiment_catalog;create=true;user=airavata;password=airavata"; String jdbcDriver = "org.apache.derby.jdbc.ClientDriver"; String userName = "airavata"; String password = "airavata"; http://git-wip-us.apache.org/repos/asf/airavata/blob/9385c4eb/modules/credential-store/credential-store-webapp/src/main/resources/airavata-server.properties ---------------------------------------------------------------------- diff --git a/modules/credential-store/credential-store-webapp/src/main/resources/airavata-server.properties b/modules/credential-store/credential-store-webapp/src/main/resources/airavata-server.properties index fb02901..badf28d 100644 --- a/modules/credential-store/credential-store-webapp/src/main/resources/airavata-server.properties +++ b/modules/credential-store/credential-store-webapp/src/main/resources/airavata-server.properties @@ -31,7 +31,7 @@ #for derby [AiravataJPARegistry] registry.jdbc.driver=org.apache.derby.jdbc.ClientDriver -registry.jdbc.url=jdbc:derby://localhost:1527/persistent_data;create=true;user=airavata;password=airavata +registry.jdbc.url=jdbc:derby://localhost:1527/experiment_catalog;create=true;user=airavata;password=airavata # MySql database configuration #registry.jdbc.driver=com.mysql.jdbc.Driver #registry.jdbc.url=jdbc:mysql://localhost:3306/persistent_data @@ -89,7 +89,7 @@ orchestrator.server.min.threads=50 credential.store.keystore.url=/Users/lahirugunathilake/Downloads/airavata_sym.jks credential.store.keystore.alias=airavata credential.store.keystore.password=airavata -credential.store.jdbc.url=jdbc:derby://localhost:1527/persistent_data;create=true;user=airavata;password=airavata +credential.store.jdbc.url=jdbc:derby://localhost:1527/experiment_catalog;create=true;user=airavata;password=airavata credential.store.jdbc.user=airavata credential.store.jdbc.password=airavata credential.store.jdbc.driver=org.apache.derby.jdbc.ClientDriver http://git-wip-us.apache.org/repos/asf/airavata/blob/9385c4eb/modules/security/src/test/resources/jdbc-authenticator.xml ---------------------------------------------------------------------- diff --git a/modules/security/src/test/resources/jdbc-authenticator.xml b/modules/security/src/test/resources/jdbc-authenticator.xml index c27b60f..fccf8b8 100644 --- a/modules/security/src/test/resources/jdbc-authenticator.xml +++ b/modules/security/src/test/resources/jdbc-authenticator.xml @@ -26,7 +26,7 @@ <specificConfigurations> <database> <!--jdbcUrl>jdbc:h2:modules/commons/airavata-registry-rest/src/test/resources/testdb/test</jdbcUrl--> - <jdbcUrl>jdbc:derby://localhost:20000/persistent_data;create=true</jdbcUrl> + <jdbcUrl>jdbc:derby://localhost:20000/experiment_catalog;create=true</jdbcUrl> <userName>admin</userName> <password>admin</password> <databaseDriver>org.apache.derby.jdbc.ClientDriver</databaseDriver> http://git-wip-us.apache.org/repos/asf/airavata/blob/9385c4eb/modules/security/src/test/resources/session-authenticator.xml ---------------------------------------------------------------------- diff --git a/modules/security/src/test/resources/session-authenticator.xml b/modules/security/src/test/resources/session-authenticator.xml index 670913e..2c3fd2e 100644 --- a/modules/security/src/test/resources/session-authenticator.xml +++ b/modules/security/src/test/resources/session-authenticator.xml @@ -28,7 +28,7 @@ <database> <!--jdbcUrl>jdbc:h2:modules/commons/airavata-registry-rest/src/test/resources/testdb/test</jdbcUrl--> <!-- Points to /Users/thejaka/development/apache/airavata/trunk/modules/commons/airavata-registry-rest/target/tomcat6x/. --> - <jdbcUrl>jdbc:derby://localhost:20000/persistent_data;create=true</jdbcUrl> + <jdbcUrl>jdbc:derby://localhost:20000/experiment_catalog;create=true</jdbcUrl> <!--jdbcUrl>jdbc:h2:modules/security/src/test/resources/testdb/test</jdbcUrl--> http://git-wip-us.apache.org/repos/asf/airavata/blob/9385c4eb/tools/registry-tool/README ---------------------------------------------------------------------- diff --git a/tools/registry-tool/README b/tools/registry-tool/README index d21be0f..40a8e65 100644 --- a/tools/registry-tool/README +++ b/tools/registry-tool/README @@ -6,4 +6,4 @@ 3. Copy db-migrate.sh file to <AIRAVATA_HOME>/bin 4. Make sure previous version of airavata database is up and running 5. Run db-migrate.sh script file - ./db-migrate.sh -url jdbc:mysql://localhost:3306/persistent_data -user airavata -pwd airavata -v 0.7 \ No newline at end of file + ./db-migrate.sh -url jdbc:mysql://localhost:3306/experiment_catalog -user airavata -pwd airavata -v 0.7 \ No newline at end of file
