You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2013/01/21 16:39:53 UTC
svn commit: r1436425 - in /airavata/trunk/modules:
commons/utils/src/main/java/org/apache/airavata/common/utils/
distribution/airavata-server/src/main/resources/conf/
gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/
gfac-core/src/main/...
Author: lahiru
Date: Mon Jan 21 15:39:53 2013
New Revision: 1436425
URL: http://svn.apache.org/viewvc?rev=1436425&view=rev
Log:
fixing unwanted properties.
Modified:
airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ServerSettings.java
airavata/trunk/modules/distribution/airavata-server/src/main/resources/conf/airavata-server.properties
airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/GFacService.java
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImpl.java
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistryConstants.java
airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistryUtils.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/NewRegistryUserDialog.java
Modified: airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ServerSettings.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ServerSettings.java?rev=1436425&r1=1436424&r2=1436425&view=diff
==============================================================================
--- airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ServerSettings.java (original)
+++ airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ServerSettings.java Mon Jan 21 15:39:53 2013
@@ -38,7 +38,7 @@ import org.apache.coyote.http11.Http11Ni
import org.apache.coyote.http11.Http11Protocol;
public class ServerSettings extends ApplicationSettings{
- private static final String DEFAULT_GATEWAY_ID="gateway.id";
+ private static final String DEFAULT_GATEWAY_ID="default.registry.gateway";
private static final String SYSTEM_USER="system.user";
private static final String SYSTEM_USER_PASSWORD="system.password";
private static final String SYSTEM_USER_GATEWAY="system.gateway";
Modified: airavata/trunk/modules/distribution/airavata-server/src/main/resources/conf/airavata-server.properties
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-server/src/main/resources/conf/airavata-server.properties?rev=1436425&r1=1436424&r2=1436425&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/airavata-server/src/main/resources/conf/airavata-server.properties (original)
+++ airavata/trunk/modules/distribution/airavata-server/src/main/resources/conf/airavata-server.properties Mon Jan 21 15:39:53 2013
@@ -43,25 +43,32 @@ port=8080
###########################################################################
# Airavata Registry Configuration
###########################################################################
-
-#registry.user=admin
-#registry.password=admin
-gateway.id=default
-#registry.jdbc.user=airavata
-#registry.jdbc.password=airavata
-#start.derby.server.mode=true
-
system.gateway=default
system.user=admin
system.password=admin
-
-#for mysql
- #registry.jdbc.driver=com.mysql.jdbc.Driver
+#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
+# MySql database configuration
+#registry.jdbc.driver=com.mysql.jdbc.Driver
#registry.jdbc.url=jdbc:mysql://localhost:3306/persistent_data
+registry.jdbc.user=airavata
+registry.jdbc.password=airavata
+start.derby.server.mode=true
+default.registry.user=admin
+default.registry.password=admin
+default.registry.password.hash.method=SHA
+default.registry.gateway=default
+#for rest [RegistryClient]
+#registry.jdbc.url=http://localhost:9080/airavata-services
-#for derby
-#registry.jdbc.driver=org.apache.derby.jdbc.ClientDriver
-#registry.jdbc.url=jdbc:derby://localhost:1527/persistent_data;create=true;user=airavata;password=airavata
+#user defined registry accessor classes
+#class.provenance.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
+#class.configuration.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
+#class.descriptor.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
+#class.project.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
+#class.user.workflow.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
+#class.published.workflow.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
###########################################################################
# Airavata Workflow Interpreter Configurations
@@ -202,32 +209,5 @@ messagePerservationIntervalMinutes=0
class.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
#class.registry.accessor=org.apache.airavata.rest.client.RegistryClient
-###---------------------REGISTRY API IMPLEMENTATION - CUSTOM SETTINGS----------------------###
-#for mysql [AiravataJPARegistry]
-#registry.jdbc.driver=com.mysql.jdbc.Driver
-#registry.jdbc.url=jdbc:mysql://localhost:3306/persistent_data
-
-#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.user=airavata
-registry.jdbc.password=airavata
-start.derby.server.mode=true
-
-default.registry.user=admin
-default.registry.password=admin
-default.registry.password.hash.method=SHA
-default.registry.gateway=default
-
-#for rest [RegistryClient]
-#registry.jdbc.url=http://localhost:9080/airavata-services
-
-#user defined registry accessor classes
-#class.provenance.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
-#class.configuration.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
-#class.descriptor.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
-#class.project.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
-#class.user.workflow.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
-#class.published.workflow.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
Modified: airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/GFacService.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/GFacService.java?rev=1436425&r1=1436424&r2=1436425&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/GFacService.java (original)
+++ airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/GFacService.java Mon Jan 21 15:39:53 2013
@@ -73,9 +73,6 @@ public class GFacService implements Serv
public static final String MYPROXY_PASS = "myproxy.pass";
public static final String MYPROXY_LIFE = "myproxy.life";
public static final String GFAC_CONFIGURATION = "gfacConfiguration";
- public static final String SYSTEM_GATEWAY = "system.gateway";
- public static final String SYSTEM_PASSWORD = "system.password";
-// public static final String REGISTRY_URL = "registry.jdbc.url";
/*
* Heart beat thread
Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImpl.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImpl.java?rev=1436425&r1=1436424&r2=1436425&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImpl.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImpl.java Mon Jan 21 15:39:53 2013
@@ -106,7 +106,7 @@ public class PropertiesBasedServiceImpl
public static final String REGISTRY_PASSWORD = "registry.password";
public static final String REGISTRY_USER = "registry.user";
public static final String REGISTRY_URL = "registry.jdbc.url";
- public static final String GATEWAY_ID = "gateway.id";
+ public static final String GATEWAY_ID = "default.registry.gateway";
private Scheduler scheduler;
private PreExecuteChain[] preChain;
Modified: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistryConstants.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistryConstants.java?rev=1436425&r1=1436424&r2=1436425&view=diff
==============================================================================
--- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistryConstants.java (original)
+++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistryConstants.java Mon Jan 21 15:39:53 2013
@@ -22,7 +22,7 @@
package org.apache.airavata.registry.api.util;
public class RegistryConstants {
- public static final String KEY_DEFAULT_GATEWAY_ID = "gateway.id";
+ public static final String KEY_DEFAULT_GATEWAY_ID = "default.registry.gateway";
public static final String KEY_DEFAULT_REGISTRY_USER = "registry.user";
public static final String KEY_DEFAULT_REGISTRY_URL = "registry.jdbc.url";
public static final String CONFIGURATION_REGISTRY_ACCESSOR_CLASS = "class.configuration.registry.accessor";
Modified: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistryUtils.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistryUtils.java?rev=1436425&r1=1436424&r2=1436425&view=diff
==============================================================================
--- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistryUtils.java (original)
+++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistryUtils.java Mon Jan 21 15:39:53 2013
@@ -43,10 +43,6 @@ import org.slf4j.LoggerFactory;
public class RegistryUtils {
private static final Logger log = LoggerFactory.getLogger(RegistryUtils.class);
- public static final String GATEWAY_ID = "gateway.id";
-
- public static final String REGISTRY_USER = "registry.user";
-
public static String validateAxisService(String urlString)throws RegistryException {
if(!urlString.endsWith("?wsdl")){
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/NewRegistryUserDialog.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/NewRegistryUserDialog.java?rev=1436425&r1=1436424&r2=1436425&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/NewRegistryUserDialog.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/NewRegistryUserDialog.java Mon Jan 21 15:39:53 2013
@@ -63,7 +63,7 @@ public class NewRegistryUserDialog {
private JButton okButton;
private boolean userCreated = false;
-// public static final String GATEWAY_ID = "gateway.id";
+// public static final String GATEWAY_ID = "default.registry.gateway";
public NewRegistryUserDialog(XBayaEngine engine) {
this(engine, null, null);