You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sa...@apache.org on 2012/07/05 19:19:13 UTC
svn commit: r1357746 - in
/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya:
model/registrybrowser/ registrybrowser/nodes/ ui/dialogs/descriptors/
ui/menues/
Author: samindaw
Date: Thu Jul 5 17:19:12 2012
New Revision: 1357746
URL: http://svn.apache.org/viewvc?rev=1357746&view=rev
Log:
udpating tree node
Modified:
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ApplicationDeploymentDescriptions.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionNode.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionHostAdvancedOptionDialog.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DeploymentDescriptionDialog.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDeploymentDialog.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/ViewMenuItem.java
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ApplicationDeploymentDescriptions.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ApplicationDeploymentDescriptions.java?rev=1357746&r1=1357745&r2=1357746&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ApplicationDeploymentDescriptions.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ApplicationDeploymentDescriptions.java Thu Jul 5 17:19:12 2012
@@ -27,13 +27,20 @@ import java.util.Map;
import org.apache.airavata.common.registry.api.exception.RegistryException;
import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
+import org.apache.airavata.commons.gfac.type.HostDescription;
import org.apache.airavata.registry.api.AiravataRegistry;
public class ApplicationDeploymentDescriptions {
private AiravataRegistry registry;
-
- public ApplicationDeploymentDescriptions(AiravataRegistry registry) {
+ private String serviceName;
+
+ public ApplicationDeploymentDescriptions(AiravataRegistry registry, String serviceName) {
setRegistry(registry);
+ setServiceName(serviceName);
+ }
+
+ public ApplicationDeploymentDescriptions(AiravataRegistry registry) {
+ this(registry,null);
}
public AiravataRegistry getRegistry() {
@@ -46,13 +53,32 @@ public class ApplicationDeploymentDescri
public List<ApplicationDeploymentDescriptionWrap> getDescriptions() throws RegistryException {
List<ApplicationDeploymentDescriptionWrap> list = new ArrayList<ApplicationDeploymentDescriptionWrap>();
- Map<ApplicationDeploymentDescription, String> deploymentDescriptions = getRegistry()
- .searchDeploymentDescription();
- for (ApplicationDeploymentDescription descriptionWrap : deploymentDescriptions.keySet()) {
- String[] descDetails = deploymentDescriptions.get(descriptionWrap).split("\\$");
- list.add(new ApplicationDeploymentDescriptionWrap(getRegistry(), descriptionWrap, descDetails[0],
- descDetails[1]));
- }
- return list;
+ if (getServiceName()==null) {
+ Map<ApplicationDeploymentDescription, String> deploymentDescriptions = getRegistry()
+ .searchDeploymentDescription();
+ for (ApplicationDeploymentDescription descriptionWrap : deploymentDescriptions
+ .keySet()) {
+ String[] descDetails = deploymentDescriptions.get(
+ descriptionWrap).split("\\$");
+ list.add(new ApplicationDeploymentDescriptionWrap(
+ getRegistry(), descriptionWrap, descDetails[0],
+ descDetails[1]));
+ }
+ }else{
+ Map<HostDescription, List<ApplicationDeploymentDescription>> deploymentDescriptions = getRegistry().searchDeploymentDescription(getServiceName());
+ for (HostDescription descriptionWrap : deploymentDescriptions.keySet()) {
+ list.add(new ApplicationDeploymentDescriptionWrap(getRegistry(), deploymentDescriptions.get(descriptionWrap).get(0), getServiceName(),
+ descriptionWrap.getType().getHostName()));
+ }
+ }
+ return list;
}
+
+ public String getServiceName() {
+ return serviceName;
+ }
+
+ public void setServiceName(String serviceName) {
+ this.serviceName = serviceName;
+ }
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionNode.java?rev=1357746&r1=1357745&r2=1357746&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionNode.java Thu Jul 5 17:19:12 2012
@@ -31,9 +31,9 @@ import javax.swing.tree.TreeNode;
import org.apache.airavata.common.registry.api.exception.RegistryException;
import org.apache.airavata.commons.gfac.type.ServiceDescription;
+import org.apache.airavata.xbaya.model.registrybrowser.ApplicationDeploymentDescriptions;
import org.apache.airavata.xbaya.model.registrybrowser.InputParameters;
import org.apache.airavata.xbaya.model.registrybrowser.OutputParameters;
-import org.apache.airavata.xbaya.model.registrybrowser.ServiceParameters;
import org.apache.airavata.xbaya.ui.actions.AbstractBrowserActionItem;
import org.apache.airavata.xbaya.ui.actions.registry.browser.DeleteAction;
import org.apache.airavata.xbaya.ui.actions.registry.browser.EditAction;
@@ -49,13 +49,14 @@ public class ServiceDescriptionNode exte
@Override
protected List<TreeNode> getChildren() {
- List<ServiceParameters> parameterTypeList=new ArrayList<ServiceParameters>();
+ List<Object> parameterTypeList=new ArrayList<Object>();
if (getServiceDescription().getType().getInputParametersArray().length>0){
parameterTypeList.add(new InputParameters(getServiceDescription().getType().getInputParametersArray()));
}
if (getServiceDescription().getType().getOutputParametersArray().length>0){
parameterTypeList.add(new OutputParameters(getServiceDescription().getType().getOutputParametersArray()));
}
+ parameterTypeList.add(new ApplicationDeploymentDescriptions(getRegistry(),getServiceDescription().getType().getName()));
return getTreeNodeList(parameterTypeList.toArray(), this);
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionHostAdvancedOptionDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionHostAdvancedOptionDialog.java?rev=1357746&r1=1357745&r2=1357746&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionHostAdvancedOptionDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionHostAdvancedOptionDialog.java Thu Jul 5 17:19:12 2012
@@ -56,6 +56,8 @@ public class ApplicationDescriptionHostA
private JButton okButton;
private AiravataRegistry registry;
private ApplicationDeploymentDescription descriptor;
+ private XBayaLabel lblCpuCount;
+ private XBayaLabel lblProcessorPerNode;
/**
* Create the dialog.
@@ -121,17 +123,27 @@ public class ApplicationDescriptionHostA
txtCpuCount = new XBayaTextField();
txtProcessorsPerNode = new XBayaTextField();
- cmbJobType = new XBayaComboBox(new DefaultComboBoxModel(getJobTypesAsStrings()));
+ DefaultComboBoxModel cmbModelJobType = new DefaultComboBoxModel(getJobTypesAsStrings());
+ cmbJobType = new XBayaComboBox(cmbModelJobType);
cmbJobType.setEditable(false);
-
-
+ cmbJobType.getSwingComponent().addActionListener(new ActionListener(){
+ @Override
+ public void actionPerformed(ActionEvent arg0) {
+ boolean disabled=cmbJobType.getText().equalsIgnoreCase(JobTypeType.SERIAL.toString()) || cmbJobType.getText().equalsIgnoreCase(JobTypeType.SINGLE.toString());
+ txtCpuCount.setEnabled(!disabled);
+ txtProcessorsPerNode.setEnabled(!disabled);
+ lblCpuCount.getSwingComponent().setEnabled(!disabled);
+ lblProcessorPerNode.getSwingComponent().setEnabled(!disabled);
+ }
+ });
+
XBayaLabel lbljobType = new XBayaLabel("Job Type",cmbJobType);
XBayaLabel lblProjectAccountNumber = new XBayaLabel("Project Account Number",txtProjectAccountNumber);
XBayaLabel lblProjectAccountDescription = new XBayaLabel("Project Account Description",txtProjectAccountDescription);
XBayaLabel lblQueueType = new XBayaLabel("Queue Type",txtQueueType);
XBayaLabel lblMaxWallTime = new XBayaLabel("Max Wall Time",txtMaxWallTime);
- XBayaLabel lblCpuCount = new XBayaLabel("CPU Count",txtCpuCount);
- XBayaLabel lblProcessorPerNode = new XBayaLabel("Processor Per Node", txtProcessorsPerNode);
+ lblCpuCount = new XBayaLabel("CPU Count",txtCpuCount);
+ lblProcessorPerNode = new XBayaLabel("Processor Per Node", txtProcessorsPerNode);
XBayaLabel lblMinMemory = new XBayaLabel("Min Memory",txtMinMemory);
XBayaLabel lblMaxMemory = new XBayaLabel("Max Memory",txtMaxMemory);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DeploymentDescriptionDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DeploymentDescriptionDialog.java?rev=1357746&r1=1357745&r2=1357746&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DeploymentDescriptionDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DeploymentDescriptionDialog.java Thu Jul 5 17:19:12 2012
@@ -136,21 +136,21 @@ public class DeploymentDescriptionDialog
addWindowListener(new WindowAdapter() {
@Override
public void windowOpened(WindowEvent arg0) {
- if (isNewDescription()) {
- String baseName = "Application";
- int i;
- String defaultName;
- i = 1;
- defaultName = baseName+i;
- try {
- while (getRegistry().getServiceDescription(defaultName) != null) {
- defaultName = baseName + (++i);
- }
- } catch (Exception e) {
- }
- txtApplicationServiceName.setText(defaultName);
- setServiceName(txtApplicationServiceName.getText());
- }
+// if (isNewDescription()) {
+// String baseName = "Application";
+// int i;
+// String defaultName;
+// i = 1;
+// defaultName = baseName+i;
+// try {
+// while (getRegistry().getServiceDescription(defaultName) != null) {
+// defaultName = baseName + (++i);
+// }
+// } catch (Exception e) {
+// }
+// txtApplicationServiceName.setText(defaultName);
+// setServiceName(txtApplicationServiceName.getText());
+// }
}
});
setRegistry(registry);
@@ -235,7 +235,7 @@ public class DeploymentDescriptionDialog
panel.add(resetButton);
}
{
- okButton = new JButton("Save");
+ okButton = new JButton("Register");
if (!isNewDescription()){
okButton.setText("Update");
}
@@ -327,7 +327,7 @@ public class DeploymentDescriptionDialog
appType.addNewApplicationName();
}
HostDescriptionType hostType = deployDesc.getHostDescription().getType();
- appType.getApplicationName().setStringValue(getServiceName()+"_"+hostType.getHostName()+"_app");
+ appType.getApplicationName().setStringValue(hostType.getHostName()+"_application");
getDeployments().put(hostType.getHostName(), deployDesc);
updateDeploymentTable();
}
@@ -668,6 +668,7 @@ public class DeploymentDescriptionDialog
getRegistry().saveDeploymentDescription(getServiceName(), hostName, getDeployments().get(hostName).getApplicationDescription());
}
setServiceCreated(true);
+ JOptionPane.showMessageDialog(this,"Application '"+getServiceName()+"' is registered");
} catch (RegistryException e) {
setError(e.getMessage());
throw e;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDeploymentDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDeploymentDialog.java?rev=1357746&r1=1357745&r2=1357746&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDeploymentDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDeploymentDialog.java Thu Jul 5 17:19:12 2012
@@ -109,9 +109,9 @@ public class HostDeploymentDialog extend
private void iniGUI() {
if (isNewDescriptor()) {
- setTitle("New Host Deployment Description");
+ setTitle("New Application Deployment");
}else{
- setTitle("Update Host Deployment Description: "+getOriginalDeploymentDescription().getType().getApplicationName().getStringValue());
+ setTitle("Update Application Deployment: "+getOriginalDeploymentDescription().getType().getApplicationName().getStringValue());
}
setBounds(100, 100, 600, 620);
setModal(true);
@@ -131,7 +131,7 @@ public class HostDeploymentDialog extend
buttonPane.add(resetButton);
}
{
- okButton = new JButton("Save");
+ okButton = new JButton("Add");
if (!isNewDescriptor()){
okButton.setText("Update");
}
@@ -271,7 +271,7 @@ public class HostDeploymentDialog extend
lnkNewHost.setText("Create new host...");
lnkNewHost.setHorizontalAlignment(SwingConstants.TRAILING);
- btnHostAdvanceOptions=new JButton("Gram Configuration...");
+ btnHostAdvanceOptions=new JButton("HPC Configuration...");
btnHostAdvanceOptions.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent arg0) {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/ViewMenuItem.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/ViewMenuItem.java?rev=1357746&r1=1357745&r2=1357746&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/ViewMenuItem.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/ViewMenuItem.java Thu Jul 5 17:19:12 2012
@@ -92,7 +92,7 @@ public class ViewMenuItem {
}
private JMenuItem createShpwJCRRegistryView() {
- JMenuItem menuItem = new JMenuItem("JCR Registry");
+ JMenuItem menuItem = new JMenuItem("Airavata Registry");
menuItem.addActionListener(new AbstractAction() {
public void actionPerformed(ActionEvent e) {
engine.getGUI().viewJCRBrowserPanel();