Author: samindaw
Date: Tue Oct 15 23:43:24 2013
New Revision: 1532595
URL: http://svn.apache.org/r1532595
Log:
issue with hosts not getting added + NPE in host desc dialog + removing unused
import + making samples optional in xbaya jar
Modified:
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/handler/SCPInputHandler.java
airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/DescriptorUtil.java
airavata/trunk/modules/xbaya-gui/pom.xml
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDescriptionDialog.java
Modified:
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/handler/SCPInputHandler.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/handler/SCPInputHandler.java?rev=1532595&r1=1532594&r2=1532595&view=diff
==============================================================================
---
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/handler/SCPInputHandler.java
(original)
+++
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/handler/SCPInputHandler.java
Tue Oct 15 23:43:24 2013
@@ -24,7 +24,6 @@ import java.io.File;
import java.io.IOException;
import java.util.*;
-import com.sun.tools.javac.util.Paths;
import net.schmizz.sshj.xfer.scp.SCPFileTransfer;
import org.apache.airavata.common.utils.StringUtil;
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=1532595&r1=1532594&r2=1532595&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
Tue Oct 15 23:43:24 2013
@@ -151,7 +151,6 @@ public class DescriptorUtil {
}
}else if (hostDescriptionType instanceof GsisshHostType) {
hostType.add(HostTypes.GSISSH_HOST_TYPE);
- GlobusHostType globusHostType = (GlobusHostType)
hostDescriptionType;
} else if (hostDescriptionType instanceof SSHHostType) {
hostType.add(HostTypes.SSH_HOST_TYPE);
SSHHostType sshHostType = (SSHHostType) hostDescriptionType;
Modified: airavata/trunk/modules/xbaya-gui/pom.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/pom.xml?rev=1532595&r1=1532594&r2=1532595&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/pom.xml (original)
+++ airavata/trunk/modules/xbaya-gui/pom.xml Tue Oct 15 23:43:24 2013
@@ -110,7 +110,8 @@
<groupId>org.apache.airavata</groupId>
<artifactId>apache-airavata-samples</artifactId>
<version>${project.version}</version>
- <type>zip</type>
+ <type>zip</type>
+ <optional>true</optional>
</dependency>
<dependency>
Modified:
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java?rev=1532595&r1=1532594&r2=1532595&view=diff
==============================================================================
---
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java
(original)
+++
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java
Tue Oct 15 23:43:24 2013
@@ -50,7 +50,6 @@ import org.apache.airavata.common.workfl
import org.apache.airavata.commons.gfac.type.HostDescription;
import org.apache.airavata.schemas.gfac.GlobusHostType;
import org.apache.airavata.schemas.gfac.GsisshHostType;
-import org.apache.airavata.schemas.gfac.HostDescriptionType;
import org.apache.airavata.schemas.gfac.SSHHostType;
import org.apache.airavata.schemas.wec.ContextHeaderDocument;
import org.apache.airavata.workflow.model.component.ComponentException;
@@ -530,8 +529,8 @@ public class WorkflowInterpretorSkeleton
StAXOMBuilder builder = new StAXOMBuilder(reader);
OMElement documentElement = builder.getDocumentElement();
Iterator<?> server = documentElement.getChildrenWithName(new
QName("server"));
- HostDescription hostDescription = new HostDescription();
while (server.hasNext()) {
+ HostDescription hostDescription = new HostDescription();
OMElement next = (OMElement) server.next();
if (next.getFirstChildWithName(new QName("gram.endpoint")) != null
&&
"globus".equals(next.getFirstChildWithName(new
QName("type")).getText())) {
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=1532595&r1=1532594&r2=1532595&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
Tue Oct 15 23:43:24 2013
@@ -418,10 +418,14 @@ public class HostDescriptionDialog exten
cmbResourceProtocol.setSelectedItem(REMOTE_PROTOCOL_STR_AMAZON_EC2);
}else if (t instanceof GsisshHostType){
cmbResourceProtocol.setSelectedItem(REMOTE_PROTOCOL_GSI_SSH);
- Name[] nameArray = ((GsisshHostType)
t).getExports().getNameArray();
List<String> arr=new ArrayList<String>();
- for (Name name : nameArray) {
-
arr.add(name.getStringValue()+"="+StringUtil.quoteString(name.getValue(),"="));
+ ExportProperties exports = ((GsisshHostType)
t).getExports();
+ if (exports!=null) {
+ Name[] nameArray = exports.getNameArray();
+ for (Name name : nameArray) {
+ arr.add(name.getStringValue() + "="
+ +
StringUtil.quoteString(name.getValue(), "="));
+ }
}
exportsTextField.setText(StringUtil.createDelimiteredString(arr.toArray(new
String[]{})));
preJobCommandsTextField.setText(StringUtil.createDelimiteredString(((GsisshHostType)
t).getPreJobCommandsArray()));
