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 2011/10/26 01:51:25 UTC
svn commit: r1188973 - in
/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya:
appwrapper/ registrybrowser/nodes/
Author: lahiru
Date: Tue Oct 25 23:51:24 2011
New Revision: 1188973
URL: http://svn.apache.org/viewvc?rev=1188973&view=rev
Log:
https://issues.apache.org/jira/browse/AIRAVATA-148
Modified:
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ApplicationDescriptionAdvancedOptionDialog.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ApplicationDescriptionDialog.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ApplicationDescriptionRegistrationWindow.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/HostDescriptionDialog.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ServiceDescriptionDialog.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ParameterNode.java
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ApplicationDescriptionAdvancedOptionDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ApplicationDescriptionAdvancedOptionDialog.java?rev=1188973&r1=1188972&r2=1188973&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ApplicationDescriptionAdvancedOptionDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ApplicationDescriptionAdvancedOptionDialog.java Tue Oct 25 23:51:24 2011
@@ -7,7 +7,6 @@ import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
-import java.util.HashMap;
import java.util.Map;
import javax.swing.GroupLayout;
@@ -29,10 +28,9 @@ import javax.swing.event.TableModelEvent
import javax.swing.event.TableModelListener;
import javax.swing.table.DefaultTableModel;
-import org.apache.airavata.commons.gfac.type.app.ShellApplicationDeployment;
+import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
import org.apache.airavata.registry.api.Registry;
import org.apache.airavata.schemas.gfac.ShellApplicationDeploymentType;
-import org.apache.airavata.xbaya.XBayaEngine;
public class ApplicationDescriptionAdvancedOptionDialog extends JDialog {
private static final long serialVersionUID = 3920479739097405014L;
@@ -43,7 +41,7 @@ public class ApplicationDescriptionAdvan
private JTextField txtSTDOUT;
private JTextField txtSTDERR;
private JTable tblEnv;
- private ShellApplicationDeployment shellApplicationDescription;
+ private ApplicationDeploymentDescription shellApplicationDescription;
private DefaultTableModel defaultTableModel;
private boolean tableModelChanging = false;
private JButton btnDeleteVariable;
@@ -67,7 +65,7 @@ public class ApplicationDescriptionAdvan
/**
* Create the dialog.
*/
- public ApplicationDescriptionAdvancedOptionDialog(Registry registry, ShellApplicationDeployment descriptor) {
+ public ApplicationDescriptionAdvancedOptionDialog(Registry registry, ApplicationDeploymentDescription descriptor) {
addWindowListener(new WindowAdapter() {
@Override
public void windowOpened(WindowEvent arg0) {
@@ -411,11 +409,15 @@ public class ApplicationDescriptionAdvan
addNewRowIfLastIsNotEmpty();
}
- public ShellApplicationDeployment getShellApplicationDescription() {
+ public ApplicationDeploymentDescription getShellApplicationDescription() {
return shellApplicationDescription;
}
- public void setShellApplicationDescription(ShellApplicationDeployment shellApplicationDescription) {
+ public ShellApplicationDeploymentType getShellApplicationDescriptionType() {
+ return (ShellApplicationDeploymentType)shellApplicationDescription.getType();
+ }
+
+ public void setShellApplicationDescription(ApplicationDeploymentDescription shellApplicationDescription) {
this.shellApplicationDescription = shellApplicationDescription;
}
@@ -430,39 +432,39 @@ public class ApplicationDescriptionAdvan
}
private void saveApplicationDescriptionAdvancedOptions() {
- getShellApplicationDescription().setWorkingDir(txtWorkingDir.getText());
- getShellApplicationDescription().setInputDir(txtInputDir.getText());
- getShellApplicationDescription().setOutputDir(txtOutputDir.getText());
- getShellApplicationDescription().setStdIn(txtSTDIN.getText());
- getShellApplicationDescription().setStdOut(txtSTDOUT.getText());
- getShellApplicationDescription().setStdErr(txtSTDERR.getText());
+ getShellApplicationDescriptionType().setWorkingDir(txtWorkingDir.getText());
+ getShellApplicationDescriptionType().setInputDir(txtInputDir.getText());
+ getShellApplicationDescriptionType().setOutputDir(txtOutputDir.getText());
+ getShellApplicationDescriptionType().setStdIn(txtSTDIN.getText());
+ getShellApplicationDescriptionType().setStdOut(txtSTDOUT.getText());
+ getShellApplicationDescriptionType().setStdErr(txtSTDERR.getText());
- getShellApplicationDescription().setEnv(ShellApplicationDeploymentType.Factory.newInstance().getEnv());
+ getShellApplicationDescriptionType().setEnv(ShellApplicationDeploymentType.Factory.newInstance().getEnv());
for (int i = 0; i < defaultTableModel.getRowCount(); i++) {
String varName = (String) defaultTableModel.getValueAt(i, 0);
if (varName != null && !varName.equals("")) {
String varValue = (String) defaultTableModel.getValueAt(i, 1);
- getShellApplicationDescription().getEnv().addNewEntry().setKey(varName);
- getShellApplicationDescription().getEnv().addNewEntry().setValue(varValue);
+ getShellApplicationDescriptionType().getEnv().addNewEntry().setKey(varName);
+ getShellApplicationDescriptionType().getEnv().addNewEntry().setValue(varValue);
}
}
}
private void loadApplicationDescriptionAdvancedOptions() {
- txtWorkingDir.setText(getShellApplicationDescription().getWorkingDir());
- txtInputDir.setText(getShellApplicationDescription().getInputDir());
- txtOutputDir.setText(getShellApplicationDescription().getOutputDir());
- txtSTDIN.setText(getShellApplicationDescription().getStdIn());
- txtSTDOUT.setText(getShellApplicationDescription().getStdOut());
- txtSTDERR.setText(getShellApplicationDescription().getStdErr());
+ txtWorkingDir.setText(getShellApplicationDescriptionType().getWorkingDir());
+ txtInputDir.setText(getShellApplicationDescriptionType().getInputDir());
+ txtOutputDir.setText(getShellApplicationDescriptionType().getOutputDir());
+ txtSTDIN.setText(getShellApplicationDescriptionType().getStdIn());
+ txtSTDOUT.setText(getShellApplicationDescriptionType().getStdOut());
+ txtSTDERR.setText(getShellApplicationDescriptionType().getStdErr());
tableModelChanging = true;
- ShellApplicationDeploymentType.Env.Entry[] entry = getShellApplicationDescription().getEnv().getEntryArray();
+ ShellApplicationDeploymentType.Env.Entry[] entry = getShellApplicationDescriptionType().getEnv().getEntryArray();
Map<String, String> env = null;
for (int i = 0; i < entry.length; i++) {
- String key = getShellApplicationDescription().getEnv().getEntryArray(i).getKey();
- String value = getShellApplicationDescription().getEnv().getEntryArray(i).getValue();
+ String key = getShellApplicationDescriptionType().getEnv().getEntryArray(i).getKey();
+ String value = getShellApplicationDescriptionType().getEnv().getEntryArray(i).getValue();
env.put(key, value);
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ApplicationDescriptionDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ApplicationDescriptionDialog.java?rev=1188973&r1=1188972&r2=1188973&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ApplicationDescriptionDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ApplicationDescriptionDialog.java Tue Oct 25 23:51:24 2011
@@ -30,9 +30,9 @@ import javax.swing.SwingConstants;
import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
import org.apache.airavata.commons.gfac.type.HostDescription;
import org.apache.airavata.commons.gfac.type.ServiceDescription;
-import org.apache.airavata.commons.gfac.type.app.ShellApplicationDeployment;
import org.apache.airavata.registry.api.Registry;
import org.apache.airavata.registry.api.exception.RegistryException;
+import org.apache.airavata.schemas.gfac.ShellApplicationDeploymentType;
import org.apache.airavata.xbaya.gui.XBayaLinkButton;
public class ApplicationDescriptionDialog extends JDialog implements ActionListener {
@@ -45,7 +45,7 @@ public class ApplicationDescriptionDialo
private JTextField txtTempDir;
private Registry registry;
- private ShellApplicationDeployment shellApplicationDescription;
+ private ApplicationDeploymentDescription shellApplicationDescription;
private JLabel lblError;
private boolean applcationDescCreated = false;
private JButton okButton;
@@ -84,7 +84,7 @@ public class ApplicationDescriptionDialo
while (true) {
boolean notFound = true;
for (ApplicationDeploymentDescription deploymentDescription : applicationDescriptions) {
- if (deploymentDescription.getId().equals(defaultName)) {
+ if (deploymentDescription.getType().getName().equals(defaultName)) {
notFound = false;
break;
}
@@ -420,7 +420,7 @@ public class ApplicationDescriptionDialo
try {
List<ServiceDescription> serviceDescriptions = getRegistry().searchServiceDescription("");
for (ServiceDescription serviceDescription : serviceDescriptions) {
- cmbServiceName.addItem(serviceDescription.getId());
+ cmbServiceName.addItem(serviceDescription.getType().getName());
}
} catch (Exception e) {
setError(e.getLocalizedMessage());
@@ -434,10 +434,10 @@ public class ApplicationDescriptionDialo
try {
List<HostDescription> hostDescriptions = getRegistry().searchHostDescription(".*");
for (HostDescription hostDescription : hostDescriptions) {
- if (hostDescription.getId() == null) {
- cmbHostName.addItem(hostDescription.getAddress());
+ if (hostDescription.getType().getName() == null) {
+ cmbHostName.addItem(hostDescription.getType().getAddress());
} else {
- cmbHostName.addItem(hostDescription.getId());
+ cmbHostName.addItem(hostDescription.getType().getName());
}
}
} catch (Exception e) {
@@ -446,37 +446,41 @@ public class ApplicationDescriptionDialo
updateHostName();
}
- public ShellApplicationDeployment getShellApplicationDescription() {
+ public ApplicationDeploymentDescription getShellApplicationDescription() {
if (shellApplicationDescription == null) {
- shellApplicationDescription = new ShellApplicationDeployment();
+ shellApplicationDescription = new ApplicationDeploymentDescription(ShellApplicationDeploymentType.type);
}
return shellApplicationDescription;
}
+ public ShellApplicationDeploymentType getShellApplicationDescriptionType() {
+ return (ShellApplicationDeploymentType)getShellApplicationDescription().getType();
+ }
+
public String getApplicationName() {
- return getShellApplicationDescription().getId();
+ return getShellApplicationDescriptionType().getName();
}
public void setApplicationName(String applicationName) {
- getShellApplicationDescription().setId(applicationName);
+ getShellApplicationDescriptionType().setName(applicationName);
updateDialogStatus();
}
public String getExecutablePath() {
- return getShellApplicationDescription().getExecutable();
+ return getShellApplicationDescriptionType().getExecutable();
}
public void setExecutablePath(String executablePath) {
- getShellApplicationDescription().setExecutable(executablePath);
+ getShellApplicationDescriptionType().setExecutable(executablePath);
updateDialogStatus();
}
public String getTempDir() {
- return getShellApplicationDescription().getTmpDir();
+ return getShellApplicationDescriptionType().getTmpDir();
}
public void setTempDir(String tempDir) {
- getShellApplicationDescription().setTmpDir(tempDir);
+ getShellApplicationDescriptionType().setTmpDir(tempDir);
updateDialogStatus();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ApplicationDescriptionRegistrationWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ApplicationDescriptionRegistrationWindow.java?rev=1188973&r1=1188972&r2=1188973&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ApplicationDescriptionRegistrationWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ApplicationDescriptionRegistrationWindow.java Tue Oct 25 23:51:24 2011
@@ -21,8 +21,6 @@
package org.apache.airavata.xbaya.appwrapper;
-import java.util.ArrayList;
-import java.util.List;
import java.util.Map;
import javax.swing.DefaultComboBoxModel;
@@ -33,7 +31,7 @@ import javax.swing.JPanel;
import org.apache.airavata.common.utils.NameValidator;
import org.apache.airavata.common.utils.StringUtil;
-import org.apache.airavata.commons.gfac.type.app.ShellApplicationDeployment;
+import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
import org.apache.airavata.schemas.gfac.ShellApplicationDeploymentType;
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.gui.GridPanel;
@@ -319,9 +317,10 @@ public class ApplicationDescriptionRegis
if (!this.procsCountTextField.getText().equals("")) {
pCount = new Integer(Integer.parseInt(this.procsCountTextField.getText()));
}
-
- ShellApplicationDeployment shellApplicationDeployment = new ShellApplicationDeployment();
- shellApplicationDeployment.setId(StringUtil.trimSpaceInString(this.applicationNameTextField.getText()));
+ ApplicationDeploymentDescription appDesc = new ApplicationDeploymentDescription(ShellApplicationDeploymentType.type);
+
+ ShellApplicationDeploymentType shellApplicationDeployment = (ShellApplicationDeploymentType) appDesc.getType();
+ shellApplicationDeployment.setName(StringUtil.trimSpaceInString(this.applicationNameTextField.getText()));
shellApplicationDeployment.setExecutable(StringUtil.trimSpaceInString(this.executableTextField.getText()));
shellApplicationDeployment
.setWorkingDir(StringUtil.trimSpaceInString(this.workDirectoryTextField.getText()));
@@ -349,7 +348,7 @@ public class ApplicationDescriptionRegis
/*--- save to registry ---*/
this.engine.getConfiguration().getJcrComponentRegistry()
- .saveDeploymentDescription(projectName, hostName, shellApplicationDeployment);
+ .saveDeploymentDescription(projectName, hostName, appDesc);
} catch (Exception e) {
e.printStackTrace();
this.hide();
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/HostDescriptionDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/HostDescriptionDialog.java?rev=1188973&r1=1188972&r2=1188973&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/HostDescriptionDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/HostDescriptionDialog.java Tue Oct 25 23:51:24 2011
@@ -181,20 +181,20 @@ public class HostDescriptionDialog exten
}
public String getHostId() {
- return getHostDescription().getId();
+ return getHostDescription().getType().getName();
}
public void setHostId(String hostId) {
- getHostDescription().setId(hostId);
+ getHostDescription().getType().setName(hostId);
updateDialogStatus();
}
public String getHostLocation() {
- return getHostDescription().getAddress();
+ return getHostDescription().getType().getAddress();
}
public void setHostLocation(String hostLocation) {
- getHostDescription().setAddress(hostLocation);
+ getHostDescription().getType().setAddress(hostLocation);
updateDialogStatus();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ServiceDescriptionDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ServiceDescriptionDialog.java?rev=1188973&r1=1188972&r2=1188973&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ServiceDescriptionDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ServiceDescriptionDialog.java Tue Oct 25 23:51:24 2011
@@ -313,15 +313,15 @@ public class ServiceDescriptionDialog ex
}
public ServiceDescriptionType getServiceDescriptionType() {
- return getServiceDescription().getServiceDescriptionType();
+ return getServiceDescription().getType();
}
public String getServiceName() {
- return getServiceDescription().getId();
+ return getServiceDescription().getType().getName();
}
public void setServiceName(String serviceName) {
- getServiceDescription().setId(serviceName);
+ getServiceDescription().getType().setName(serviceName);
updateDialogStatus();
}
private void updateDialogStatus() {
@@ -389,38 +389,6 @@ public class ServiceDescriptionDialog ex
getDialog().setVisible(false);
}
-// public void saveServiceDescription() {
-// for (int i = 0; i < defaultTableModel.getRowCount(); i++) {
-// Parameter parameter = Parameter.Factory.newInstance();
-// String parameterName = (String) defaultTableModel.getValueAt(i, 1);
-// if (parameterName!=null && !parameterName.trim().equals("")) {
-// DataType parameterDataType = (DataType) defaultTableModel.getValueAt(i, 2);
-// String parameterDescription = (String) defaultTableModel.getValueAt(i, 3);
-// parameter.setName(parameterName);
-// parameter.setDescription(parameterDescription);
-//
-// parameter.addNewType().setType(
-// org.apache.airavata.schemas.gfac.DataType.Enum.forString(parameterDataType.toString()));
-// if (getIOStringList()[0].equals(defaultTableModel.getValueAt(i, 0))) {
-// getServiceDescriptionType().setInputParametersArray(0, parameter);
-// // getServiceDescription().getInputParameters().add(parameter);
-// } else {
-// getServiceDescriptionType().setOutputParametersArray(0, parameter);
-// // getServiceDescription().getOutputParameters().add(parameter);
-// }
-// }
-// }
-//
-// getRegistry().saveServiceDescription(getServiceDescription());
-// if (chckbxAutoGenerateWsdl.isSelected()) {
-//
-// if (getRegistry() instanceof Axis2Registry) {
-// ((Axis2Registry) getRegistry()).saveWSDL(getServiceDescription());
-// }
-// }
-// setServiceCreated(true);
-// }
-
private void setError(String errorMessage) {
if (errorMessage == null || errorMessage.trim().equals("")) {
lblError.setText("");
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ParameterNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ParameterNode.java?rev=1188973&r1=1188972&r2=1188973&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ParameterNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ParameterNode.java Tue Oct 25 23:51:24 2011
@@ -27,10 +27,10 @@ public class ParameterNode extends Abstr
@Override
public String getCaption(boolean selected, boolean expanded, boolean leaf,
boolean hasFocus) {
- if (getParameter().getValue()==null){
+ if (getParameter().getValue()!=null){
return getParameter().getName()+":"+getParameter().getValue().toString();
}else{
- return getParameter().getName()+":<"+getParameter().getType().toString()+">";
+ return getParameter().getName()+":<"+getParameter().getType().getType().toString()+">";
}
}