You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by he...@apache.org on 2012/03/05 16:49:00 UTC

svn commit: r1297095 - /incubator/airavata/trunk/modules/registry-migrator/src/main/java/org/apache/airavata/migrator/registry/XRegistryMigrationManager.java

Author: heshan
Date: Mon Mar  5 15:49:00 2012
New Revision: 1297095

URL: http://svn.apache.org/viewvc?rev=1297095&view=rev
Log:
AIRAVATA-309 Moving the deployserviceonhost logic.

Modified:
    incubator/airavata/trunk/modules/registry-migrator/src/main/java/org/apache/airavata/migrator/registry/XRegistryMigrationManager.java

Modified: incubator/airavata/trunk/modules/registry-migrator/src/main/java/org/apache/airavata/migrator/registry/XRegistryMigrationManager.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/registry-migrator/src/main/java/org/apache/airavata/migrator/registry/XRegistryMigrationManager.java?rev=1297095&r1=1297094&r2=1297095&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/registry-migrator/src/main/java/org/apache/airavata/migrator/registry/XRegistryMigrationManager.java (original)
+++ incubator/airavata/trunk/modules/registry-migrator/src/main/java/org/apache/airavata/migrator/registry/XRegistryMigrationManager.java Mon Mar  5 15:49:00 2012
@@ -187,11 +187,7 @@ public class XRegistryMigrationManager {
                 service = MigrationUtil.createServiceDescription(serviceBean);
                 try {
                     jcrRegistry.saveServiceDescription(service);
-                    ApplicationBean appBean = saveApplicationDescriptionWithName(client, applicationName, service);
-                    // TODO : should look into this
-                    if (appBean != null){
-                        jcrRegistry.deployServiceOnHost(service.getType().getName(), appBean.getHostName());
-                    }
+                    saveApplicationDescriptionWithName(client, applicationName, service);
                 } catch (RegistryException e) {
                     e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
                 }
@@ -210,7 +206,7 @@ public class XRegistryMigrationManager {
      * @return ApplicationBean
      * @throws XRegistryClientException XRegistryClientException
      */
-    private static ApplicationBean saveApplicationDescriptionWithName(XRegistryClient client, String applicationName, ServiceDescription service) throws XRegistryClientException {
+    private static void saveApplicationDescriptionWithName(XRegistryClient client, String applicationName, ServiceDescription service) throws XRegistryClientException {
         ApplicationDeploymentDescription app = null;
         FindAppDescResponseDocument.FindAppDescResponse.AppData[] appDatas = client.findAppDesc(applicationName);
         Map<QName, FindAppDescResponseDocument.FindAppDescResponse.AppData> val2 =
@@ -234,6 +230,8 @@ public class XRegistryMigrationManager {
                     ApplicationDeploymentDescription appDepDesc = jcrRegistry.getDeploymentDescription(service.getType().getName(), appBean.getHostName());
                     if(appDepDesc == null) {
                         jcrRegistry.saveDeploymentDescription(service.getType().getName(), appBean.getHostName(), app);
+                        // TODO : should look into this
+                        jcrRegistry.deployServiceOnHost(service.getType().getName(), appBean.getHostName());
                     } else {
                         System.out.println("Application Deployment Description named " + service.getType().getName() +
                         " with host " + appBean.getHostName() + " exists in the registry. Therefore, not saving it.");
@@ -247,7 +245,6 @@ public class XRegistryMigrationManager {
 
         }
 
-        return appBean;
     }
 
     /**