Author: lahiru
Date: Wed Oct 9 12:54:52 2013
New Revision: 1530590
URL: http://svn.apache.org/r1530590
Log:
fixing the build.
Modified:
airavata/trunk/modules/commons/gfac-schema/src/main/resources/schemas/HostDescription.xsd
airavata/trunk/modules/distribution/airavata-server/src/main/resources/conf/gfac-config.xml
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/Constants.java
airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/DescriptorUtil.java
Modified:
airavata/trunk/modules/commons/gfac-schema/src/main/resources/schemas/HostDescription.xsd
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/commons/gfac-schema/src/main/resources/schemas/HostDescription.xsd?rev=1530590&r1=1530589&r2=1530590&view=diff
==============================================================================
---
airavata/trunk/modules/commons/gfac-schema/src/main/resources/schemas/HostDescription.xsd
(original)
+++
airavata/trunk/modules/commons/gfac-schema/src/main/resources/schemas/HostDescription.xsd
Wed Oct 9 12:54:52 2013
@@ -107,8 +107,8 @@
<extension base="gfac:hostDescriptionType">
<sequence>
<element name="exports" type="gfac:exportProperties"
minOccurs="0" maxOccurs="1"/>
- <element name="preJobCommands"
type="gfac:exportProperties" minOccurs="0" maxOccurs="1"/>
- <element name="postJobCommands"
type="gfac:exportProperties" minOccurs="0" maxOccurs="1"/>
+ <element name="preJobCommands" type="xsd:string"
minOccurs="0" maxOccurs="unbounded"/>
+ <element name="postJobCommands" type="xsd:string"
minOccurs="0" maxOccurs="unbounded"/>
</sequence>
</extension>
</complexContent>
Modified:
airavata/trunk/modules/distribution/airavata-server/src/main/resources/conf/gfac-config.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-server/src/main/resources/conf/gfac-config.xml?rev=1530590&r1=1530589&r2=1530590&view=diff
==============================================================================
---
airavata/trunk/modules/distribution/airavata-server/src/main/resources/conf/gfac-config.xml
(original)
+++
airavata/trunk/modules/distribution/airavata-server/src/main/resources/conf/gfac-config.xml
Wed Oct 9 12:54:52 2013
@@ -84,7 +84,7 @@
<Handler class="org.apache.airavata.gfac.handler.SCPInputHandler"/>
</InHandlers>
<OutHandlers>
- <!--Handler
class="org.apache.airavata.gfac.handler.SCPOutputHandler"/-->
+ <Handler
class="org.apache.airavata.gfac.handler.SCPOutputHandler"/>
</OutHandlers>
</Provider>
</GFac>
\ No newline at end of file
Modified:
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/Constants.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/Constants.java?rev=1530590&r1=1530589&r2=1530590&view=diff
==============================================================================
---
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/Constants.java
(original)
+++
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/Constants.java
Wed Oct 9 12:54:52 2013
@@ -63,9 +63,11 @@ public class Constants {
/*
* SSH properties
*/
- public static final String SSH_PRIVATE_KEY = "ssh.key";
+ public static final String SSH_PRIVATE_KEY = "private.ssh.key";
+ public static final String SSH_PUBLIC_KEY = "public.ssh.key";
public static final String SSH_PRIVATE_KEY_PASS = "ssh.keypass";
public static final String SSH_USER_NAME = "ssh.username";
+ public static final String SSH_PASSWORD = "ssh.password";
public static final String PROPERTY = "property";
public static final String NAME = "name";
public static final String VALUE = "value";
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=1530590&r1=1530589&r2=1530590&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
Wed Oct 9 12:54:52 2013
@@ -134,13 +134,7 @@ public class DescriptorUtil {
gridFTPEndPoint.add(gridFTPEndPointArray[i]);
}
}else if (hostDescriptionType instanceof GsisshHostType){
- GsisshHostType gsisshHostType = (GsisshHostType)
hostDescriptionType;
hostType.add(HostTypes.GSISSH_HOST_TYPE);
-
- String[] gridFTPEndPointArray =
gsisshHostType.getGridFTPEndPointArray();
- for (int i = 0; i < gridFTPEndPointArray.length ; i++){
- gridFTPEndPoint.add(gridFTPEndPointArray[i]);
- }
} else if (hostDescriptionType instanceof SSHHostType) {
hostType.add(HostTypes.SSH_HOST_TYPE);
} else if (hostDescriptionType instanceof UnicoreHostType) {
@@ -185,10 +179,6 @@ public class DescriptorUtil {
} else if
(hostDescriptor.getHostType().get(0).equals(HostTypes.GSISSH_HOST_TYPE)) {
hostDescription.getType().changeType(GsisshHostType.type);
- if (!hostDescriptor.getGridFTPEndPoint().isEmpty() &&
hostDescriptor.getGridFTPEndPoint() != null){
- ((GsisshHostType)
hostDescription).addGridFTPEndPoint(hostDescriptor.getGridFTPEndPoint().get(0));
- }
-
} else if
(hostDescriptor.getHostType().get(0).equals(HostTypes.EC2_HOST_TYPE)) {
hostDescription.getType().changeType(Ec2HostType.type);
if (!hostDescriptor.getImageID().isEmpty() &&
hostDescriptor.getImageID() != null ){
