Author: samindaw
Date: Wed Aug 28 20:48:55 2013
New Revision: 1518380
URL: http://svn.apache.org/r1518380
Log:
giving buffer time for registry service startup + moving the code of adding
gateway+user data at db creation time
Modified:
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java
airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/RegistryService.java
Modified:
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java?rev=1518380&r1=1518379&r2=1518380&view=diff
==============================================================================
---
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java
(original)
+++
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/AiravataClient.java
Wed Aug 28 20:48:55 2013
@@ -121,22 +121,22 @@ public class AiravataClient extends Obse
URI uri = registryObject.getEventingServiceURI();
config.put(
AiravataClient.BROKER,
- uri == null ?
"http://localhost:8080/axis2/services/EventingService";
+ uri == null ?
"http://localhost:8080/airavata-server/services/EventingService";
: uri.toString());
uri = registryObject.getMessageBoxURI();
config.put(
AiravataClient.MSGBOX,
- uri == null ?
"http://localhost:8080/axis2/services/MsgBoxService";
+ uri == null ?
"http://localhost:8080/airavata-server/services/MsgBoxService";
: uri.toString());
List<URI> URLList =
registryObject.getWorkflowInterpreterURIs();
config.put(
AiravataClient.WORKFLOWSERVICEURL,
- URLList == null || URLList.size() == 0
? "http://localhost:8080/axis2/services/WorkflowInterpretor?wsdl";
+ URLList == null || URLList.size() == 0
? "http://localhost:8080/airavata-server/services/WorkflowInterpretor?wsdl";
:
URLList.get(0).toString());
List<URI> urlList = registryObject.getGFacURIs();
config.put(
AiravataClient.GFAC,
- urlList == null || urlList.size() == 0
? "http://localhost:8080/axis2/services/GFacService";
+ urlList == null || urlList.size() == 0
? "http://localhost:8080/airavata-server/services/GFacService";
:
urlList.get(0).toString());
config.put(AiravataClient.WITHLISTENER, "true");
}
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java?rev=1518380&r1=1518379&r2=1518380&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java
(original)
+++
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java
Wed Aug 28 20:48:55 2013
@@ -163,6 +163,10 @@ public class AiravataJPARegistry extends
try {
tries++;
registryVersion =
getConfiguration("registry.version").toString();
+ if
(System.getProperty("registry.initialized")==null){
+ //lets wait a few seconds for the
initialization to complete
+ Thread.sleep(CONNECT_FAIL_WAIT_TIME*3);
+ }
break;
} catch (Exception e) {
ResourceUtils.reset();
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=1518380&r1=1518379&r2=1518380&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 Aug 28 20:48:55 2013
@@ -20,8 +20,11 @@
*/
package org.apache.airavata.registry.services;
-import org.apache.airavata.common.exception.ApplicationSettingsException;
-import org.apache.airavata.common.utils.ServerSettings;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.sql.Connection;
+import java.sql.SQLException;
+
import org.apache.airavata.persistance.registry.jpa.ResourceType;
import org.apache.airavata.persistance.registry.jpa.resources.GatewayResource;
import org.apache.airavata.persistance.registry.jpa.resources.UserResource;
@@ -38,13 +41,6 @@ import org.apache.derby.drda.NetworkServ
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.URL;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.Properties;
-
public class RegistryService implements ServiceLifeCycle {
private static final Logger logger =
LoggerFactory.getLogger(RegistryService.class);
@@ -120,6 +116,21 @@ public class RegistryService implements
conn = db.connect();
if (!DatabaseCreator.isDatabaseStructureCreated(PERSISTANT_DATA,
conn)) {
DatabaseCreator.createRegistryDatabase(conn);
+ try{
+ GatewayResource gatewayResource = new GatewayResource();
+
gatewayResource.setGatewayName(RegistrySettings.getSetting(REGISTRY_DEFAULT_GATEWAY_ID));
+
gatewayResource.setOwner(RegistrySettings.getSetting(REGISTRY_DEFAULT_GATEWAY_ID));
+ gatewayResource.save();
+ UserResource userResource = (UserResource)
gatewayResource.create(ResourceType.USER);
+
userResource.setUserName(RegistrySettings.getSetting(REGISTRY_DEFAULT_USER));
+
userResource.setPassword(RegistrySettings.getSetting(REGISTRY_DEFAULT_USER_PASSWORD));
+ userResource.save();
+ WorkerResource workerResource = (WorkerResource)
gatewayResource.create(ResourceType.GATEWAY_WORKER);
+ workerResource.setUser(userResource.getUserName());
+ workerResource.save();
+ } catch (RegistrySettingsException e) {
+ logger.error("Unable to read properties", e);
+ }
logger.info("New Database created for Registry");
} else {
logger.info("Database already created for Registry!");
@@ -139,22 +150,7 @@ public class RegistryService implements
e.printStackTrace(); //To change body of catch statement use
File | Settings | File Templates.
}
}
- try{
- GatewayResource gatewayResource = new GatewayResource();
-
gatewayResource.setGatewayName(RegistrySettings.getSetting(REGISTRY_DEFAULT_GATEWAY_ID));
-
gatewayResource.setOwner(RegistrySettings.getSetting(REGISTRY_DEFAULT_GATEWAY_ID));
- gatewayResource.save();
- UserResource userResource = (UserResource)
gatewayResource.create(ResourceType.USER);
-
userResource.setUserName(RegistrySettings.getSetting(REGISTRY_DEFAULT_USER));
-
userResource.setPassword(RegistrySettings.getSetting(REGISTRY_DEFAULT_USER_PASSWORD));
- userResource.save();
- WorkerResource workerResource = (WorkerResource)
gatewayResource.create(ResourceType.GATEWAY_WORKER);
- workerResource.setUser(userResource.getUserName());
- workerResource.save();
- } catch (RegistrySettingsException e) {
- logger.error("Unable to read properties", e);
- }
-
+ System.setProperty("registry.initialized", "1");
}
public boolean isRegistryServiceStarted() {
