airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chath...@apache.org
Subject svn commit: r1429081 - in /airavata/trunk/modules: distribution/airavata-client/pom.xml distribution/airavata-client/src/main/assembly/bin-assembly.xml rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/DescriptorUtil.java
Date Fri, 04 Jan 2013 20:09:52 GMT
Author: chathuri
Date: Fri Jan  4 20:09:51 2013
New Revision: 1429081

URL: http://svn.apache.org/viewvc?rev=1429081&view=rev
Log:
fixing AIRAVATA-705

Modified:
    airavata/trunk/modules/distribution/airavata-client/pom.xml
    airavata/trunk/modules/distribution/airavata-client/src/main/assembly/bin-assembly.xml
    airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/DescriptorUtil.java

Modified: airavata/trunk/modules/distribution/airavata-client/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-client/pom.xml?rev=1429081&r1=1429080&r2=1429081&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/airavata-client/pom.xml (original)
+++ airavata/trunk/modules/distribution/airavata-client/pom.xml Fri Jan  4 20:09:51 2013
@@ -323,6 +323,31 @@
             <artifactId>derbyclient</artifactId>
             <version>${derby.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.sun.jersey.contribs</groupId>
+            <artifactId>jersey-multipart</artifactId>
+            <version>${jersey.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-mapper-asl</artifactId>
+            <version>1.9.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-xc</artifactId>
+            <version>1.9.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-jaxrs</artifactId>
+            <version>1.9.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-core-asl</artifactId>
+            <version>1.9.2</version>
+        </dependency>
 
     </dependencies>
     <properties>

Modified: airavata/trunk/modules/distribution/airavata-client/src/main/assembly/bin-assembly.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-client/src/main/assembly/bin-assembly.xml?rev=1429081&r1=1429080&r2=1429081&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/airavata-client/src/main/assembly/bin-assembly.xml
(original)
+++ airavata/trunk/modules/distribution/airavata-client/src/main/assembly/bin-assembly.xml
Fri Jan  4 20:09:51 2013
@@ -160,6 +160,15 @@
                 <include>org.apache.airavata:airavata-rest-client:jar</include>
 				<include>org.apache.openjpa:openjpa-all:jar</include>
                 <include>xerces:xercesImpl:jar:2.9.1</include>
+                <include>com.sun.jersey:jersey-json</include>
+                <include>com.sun.jersey.contribs:jersey-multipart</include>
+                <include>org.codehaus.jackson:jackson-jaxrs</include>
+                <include>org.codehaus.jackson:jackson-core-asl</include>
+                <include>org.codehaus.jackson:jackson-mapper-asl</include>
+                <include>org.codehaus.jackson:jackson-xc</include>
+                <include>com.sun.jersey:jersey-core:jar</include>
+                <include>com.sun.jersey:jersey-client:jar</include>
+                <include>org.apache.airavata:airavata-rest-mappings:jar</include>
 			</includes>
 		</dependencySet>
 	</dependencySets>

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=1429081&r1=1429080&r2=1429081&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
Fri Jan  4 20:09:51 2013
@@ -167,15 +167,28 @@ public class DescriptorUtil {
         if (hostDescriptor.getHostType() != null && !hostDescriptor.getHostType().isEmpty())
{
             if (hostDescriptor.getHostType().get(0).equals(HostTypes.GLOBUS_HOST_TYPE)) {
                 hostDescription.getType().changeType(GlobusHostType.type);
-                ((GlobusHostType) hostDescription.getType()).addGlobusGateKeeperEndPoint(hostDescriptor.getGlobusGateKeeperEndPoint().get(0));
-                ((GlobusHostType) hostDescription.getType()).addGridFTPEndPoint(hostDescriptor.getGridFTPEndPoint().get(0));
+                if (!hostDescriptor.getGlobusGateKeeperEndPoint().isEmpty() && hostDescriptor.getGlobusGateKeeperEndPoint()
!= null){
+                    ((GlobusHostType) hostDescription.getType()).addGlobusGateKeeperEndPoint(hostDescriptor.getGlobusGateKeeperEndPoint().get(0));
+                }
+                if (!hostDescriptor.getGridFTPEndPoint().isEmpty() && hostDescriptor.getGridFTPEndPoint()
!= null){
+                    ((GlobusHostType) hostDescription.getType()).addGridFTPEndPoint(hostDescriptor.getGridFTPEndPoint().get(0));
+                }
+
             } else if (hostDescriptor.getHostType().get(0).equals(HostTypes.GSISSH_HOST_TYPE))
{
                 hostDescription.getType().changeType(GsisshHostType.type);
-                ((GsisshHostType) hostDescription).addGridFTPEndPoint(hostDescriptor.getGridFTPEndPoint().get(0));
+                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);
-                ((Ec2HostType) hostDescription).addImageID(hostDescriptor.getImageID().get(0));
-                ((Ec2HostType) hostDescription).addInstanceID(hostDescriptor.getInstanceID().get(0));
+                if (!hostDescriptor.getImageID().isEmpty() && hostDescriptor.getImageID()
!= null ){
+                    ((Ec2HostType) hostDescription).addImageID(hostDescriptor.getImageID().get(0));
+                }
+                if (!hostDescriptor.getInstanceID().isEmpty() && hostDescriptor.getInstanceID()
!= null){
+                    ((Ec2HostType) hostDescription).addInstanceID(hostDescriptor.getInstanceID().get(0));
+                }
+
             }
         }
 



Mime
View raw message