Author: samindaw
Date: Sun Mar 31 21:38:48 2013
New Revision: 1463059
URL: http://svn.apache.org/r1463059
Log:
updating ec2 host descriptor mapping in rest mappings
Modified:
airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/DescriptorUtil.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorEditorDialog.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDescriptionDialog.java
Modified:
airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/DescriptorUtil.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/DescriptorUtil.java?rev=1463059&r1=1463058&r2=1463059&view=diff
==============================================================================
---
airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/DescriptorUtil.java
(original)
+++
airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/DescriptorUtil.java
Sun Mar 31 21:38:48 2013
@@ -170,8 +170,9 @@ public class DescriptorUtil {
for (int i = 0; i < gridFTPEndPointArray.length ; i++){
gridFTPEndPoint.add(gridFTPEndPointArray[i]);
}
- }
- else {
+ } else if (hostDescriptionType instanceof Ec2HostType) {
+ hostType.add(HostTypes.EC2_HOST_TYPE);
+ } else {
hostType.add(HostTypes.HOST_DESCRIPTION_TYPE);
}
hostDescriptor.setGateKeeperEndPoint(gateKeeperEndPoint);
Modified:
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorEditorDialog.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorEditorDialog.java?rev=1463059&r1=1463058&r2=1463059&view=diff
==============================================================================
---
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorEditorDialog.java
(original)
+++
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorEditorDialog.java
Sun Mar 31 21:38:48 2013
@@ -222,7 +222,7 @@ public class DescriptorEditorDialog exte
break;
case SERVICE:
ServiceDescription d = (ServiceDescription)
getSelected();
- DeploymentDescriptionDialog serviceDescriptionDialog =
new DeploymentDescriptionDialog(getRegistry(),false,d, null);
+ DeploymentDescriptionDialog serviceDescriptionDialog =
new DeploymentDescriptionDialog(getAPI(),false,d, null);
serviceDescriptionDialog.open();
// ServiceDescriptionDialog serviceDescriptionDialog = new
ServiceDescriptionDialog(getRegistry(),false,d);
// serviceDescriptionDialog.open();
@@ -253,7 +253,7 @@ public class DescriptorEditorDialog exte
}
break;
case SERVICE:
- DeploymentDescriptionDialog serviceDescriptionDialog =
new DeploymentDescriptionDialog(null, getRegistry());
+ DeploymentDescriptionDialog serviceDescriptionDialog =
new DeploymentDescriptionDialog(null, getAPI());
serviceDescriptionDialog.open();
// ServiceDescriptionDialog serviceDescriptionDialog = new
ServiceDescriptionDialog(getRegistry());
// serviceDescriptionDialog.open();
@@ -308,18 +308,18 @@ public class DescriptorEditorDialog exte
switch (descriptorType){
case HOST:
HostDescription h = (HostDescription)
getSelected();
-
getRegistry().getApplicationManager().deleteHostDescription(h.getType().getHostName());
+
getAPI().getApplicationManager().deleteHostDescription(h.getType().getHostName());
loadDescriptors();
break;
case SERVICE:
ServiceDescription d = (ServiceDescription)
getSelected();
-
getRegistry().getApplicationManager().deleteServiceDescription(d.getType().getName());
+
getAPI().getApplicationManager().deleteServiceDescription(d.getType().getName());
loadDescriptors();
break;
case APPLICATION:
ApplicationDescription a =
(ApplicationDescription) getSelected();
String[] s = dlist.get(a).split("\\$");
-
getRegistry().getApplicationManager().deleteApplicationDescription(s[0], s[1],
a.getType().getApplicationName().getStringValue());
+
getAPI().getApplicationManager().deleteApplicationDescription(s[0], s[1],
a.getType().getApplicationName().getStringValue());
loadDescriptors();
break;
}
@@ -339,13 +339,13 @@ public class DescriptorEditorDialog exte
List<?> descriptors=null;
switch (descriptorType){
case HOST:
- descriptors =
getRegistry().getApplicationManager().getAllHostDescriptions();
+ descriptors =
getAPI().getApplicationManager().getAllHostDescriptions();
break;
case SERVICE:
- descriptors =
getRegistry().getApplicationManager().getAllServiceDescriptions();
+ descriptors =
getAPI().getApplicationManager().getAllServiceDescriptions();
break;
case APPLICATION:
- Map<String,ApplicationDescription> temp
=getRegistry().getApplicationManager().getApplicationDescriptors(null);
+ Map<String,ApplicationDescription> temp
=getAPI().getApplicationManager().getApplicationDescriptors(null);
for(String value:temp.keySet()) {
dlist.put(temp.get(value), value);
@@ -388,7 +388,7 @@ public class DescriptorEditorDialog exte
}
}
- public AiravataAPI getRegistry() {
+ public AiravataAPI getAPI() {
return registry;
}
Modified:
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDescriptionDialog.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDescriptionDialog.java?rev=1463059&r1=1463058&r2=1463059&view=diff
==============================================================================
---
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDescriptionDialog.java
(original)
+++
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDescriptionDialog.java
Sun Mar 31 21:38:48 2013
@@ -40,6 +40,7 @@ import javax.swing.SwingConstants;
import org.apache.airavata.client.api.AiravataAPI;
import org.apache.airavata.client.api.AiravataAPIInvocationException;
+import org.apache.airavata.client.api.DescriptorRecordAlreadyExistsException;
import org.apache.airavata.common.utils.SwingUtil;
import org.apache.airavata.commons.gfac.type.HostDescription;
import org.apache.airavata.schemas.gfac.Ec2HostType;
@@ -420,14 +421,16 @@ public class HostDescriptionDialog exten
if
(getRegistry().getApplicationManager().isHostDescriptorExists(desc.getType().getHostName())){
getRegistry().getApplicationManager().updateHostDescriptor(desc);
}else{
-
getRegistry().getApplicationManager().saveHostDescription(desc);
+
getRegistry().getApplicationManager().addHostDescription(desc);
}
setHostCreated(true);
} catch (AiravataAPIInvocationException e) {
// TODO Auto-generated catch block
e.printStackTrace();
+ }catch (DescriptorRecordAlreadyExistsException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
}
-// setHostCreated(false);
}
public AiravataAPI getRegistry() {
