You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2012/10/17 22:24:23 UTC
svn commit: r1399417 - in /airavata/trunk/modules:
distribution/src/main/resources/conf/
registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/
registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persist...
Author: chathuri
Date: Wed Oct 17 20:24:23 2012
New Revision: 1399417
URL: http://svn.apache.org/viewvc?rev=1399417&view=rev
Log:
adding start derby property
Modified:
airavata/trunk/modules/distribution/src/main/resources/conf/airavata-server.properties
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/JPAConstants.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/RegistryService.java
airavata/trunk/modules/xbaya-gui/src/main/resources/airavata-server.properties
Modified: airavata/trunk/modules/distribution/src/main/resources/conf/airavata-server.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/src/main/resources/conf/airavata-server.properties?rev=1399417&r1=1399416&r2=1399417&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/src/main/resources/conf/airavata-server.properties (original)
+++ airavata/trunk/modules/distribution/src/main/resources/conf/airavata-server.properties Wed Oct 17 20:24:23 2012
@@ -49,6 +49,7 @@ registry.password=admin
gateway.id=default
registry.jdbc.user=airavata
registry.jdbc.password=airavata
+start.derby.server.mode=true
#for mysql
#registry.jdbc.driver=com.mysql.jdbc.Driver
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/JPAConstants.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/JPAConstants.java?rev=1399417&r1=1399416&r2=1399417&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/JPAConstants.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/JPAConstants.java Wed Oct 17 20:24:23 2012
@@ -26,4 +26,5 @@ public class JPAConstants {
public static final String KEY_JDBC_USER = "registry.jdbc.user";
public static final String KEY_JDBC_PASSWORD = "registry.jdbc.password";
public static final String KEY_JDBC_DRIVER = "registry.jdbc.driver";
+ public static final String KEY_DERBY_START_ENABLE = "start.derby.server.mode";
}
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java?rev=1399417&r1=1399416&r2=1399417&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java Wed Oct 17 20:24:23 2012
@@ -118,6 +118,19 @@ public class Utils {
}
}
+ public static boolean isDerbyStartEnabled(){
+ try {
+ String s = getProvider().getValue(JPAConstants.KEY_DERBY_START_ENABLE).toString();
+ if("true".equals(s)){
+ return true;
+ }
+ } catch (UnknownRegistryConnectionDataException e) {
+ logger.error(e.getMessage(), e);
+ return false;
+ }
+ return false;
+ }
+
private static AiravataRegistryConnectionDataProvider getProvider() {
return AiravataRegistryFactory.getRegistryConnectionDataProvider();
}
Modified: airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/RegistryService.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/RegistryService.java?rev=1399417&r1=1399416&r2=1399417&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/RegistryService.java (original)
+++ airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/RegistryService.java Wed Oct 17 20:24:23 2012
@@ -100,7 +100,7 @@ public class RegistryService implements
String jdbcPassword = properties.getProperty("registry.jdbc.password");
jdbcUrl = jdbcUrl + "?" + "user=" + jdbcUser + "&" + "password=" + jdbcPassword;
- if (Utils.getDBType().equals("derby")) {
+ if (Utils.getDBType().equals("derby") && Utils.isDerbyStartEnabled()) {
startDerbyInServerMode();
}
db = new JdbcStorage(10, 50, jdbcUrl, jdbcDriver, true);
Modified: airavata/trunk/modules/xbaya-gui/src/main/resources/airavata-server.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/resources/airavata-server.properties?rev=1399417&r1=1399416&r2=1399417&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/resources/airavata-server.properties (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/resources/airavata-server.properties Wed Oct 17 20:24:23 2012
@@ -36,6 +36,7 @@ registry.password=admin
gateway.id=default
registry.jdbc.user=airavata
registry.jdbc.password=airavata
+start.derby.server.mode=true
#for mysql
#registry.jdbc.driver=com.mysql.jdbc.Driver