svn commit: r1463345 - in /airavata/trunk/modules: distribution/airavata-server/src/main/assembly/ rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/

[heshan]

Author: heshan
Date: Tue Apr  2 01:00:57 2013
New Revision: 1463345

URL: http://svn.apache.org/r1463345
Log:
AIRAVATA-803 Fixing Run time NoClassDefFound exception. 

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

Modified: 
airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
URL: 
http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml?rev=1463345&r1=1463344&r2=1463345&view=diff
==============================================================================
--- 
airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
 (original)
+++ 
airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
 Tue Apr  2 01:00:57 2013
@@ -290,6 +290,8 @@
                                <include>net.schmizz:sshj</include>
                                <include>j2ssh:j2ssh-core</include>
                                <include>j2ssh:j2ssh-common</include>
+                <include>org.apache.httpcomponents:httpcore:jar:4.1</include>
+                <include>org.apache.httpcomponents:httpclient:jar:4.1</include>
             </includes>
         </dependencySet>
         <dependencySet>

Modified: 
airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/ApplicationDescriptorTypes.java
URL: 
http://svn.apache.org/viewvc/airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/ApplicationDescriptorTypes.java?rev=1463345&r1=1463344&r2=1463345&view=diff
==============================================================================
--- 
airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/ApplicationDescriptorTypes.java
 (original)
+++ 
airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/ApplicationDescriptorTypes.java
 Tue Apr  2 01:00:57 2013
@@ -25,4 +25,5 @@ public class ApplicationDescriptorTypes 
     public static final String APP_DEP_DESC_TYPE = "Default";
     public static final String HPC_APP_DEP_DESC_TYPE = "HPC";
     public static final String HADOOP_APP_DEP_DESC_TYPE = "Hadoop";
+    public static final String EC2_APP_DEP_DESC_TYPE = "Amazon EC2";
 }

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=1463345&r1=1463344&r2=1463345&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 Apr  2 01:00:57 2013
@@ -21,10 +21,6 @@
 
 package org.apache.airavata.rest.mappings.utils;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
 import org.apache.airavata.commons.gfac.type.ApplicationDescription;
 import org.apache.airavata.commons.gfac.type.HostDescription;
 import org.apache.airavata.commons.gfac.type.ServiceDescription;
@@ -32,22 +28,11 @@ import org.apache.airavata.rest.mappings
 import org.apache.airavata.rest.mappings.resourcemappings.HostDescriptor;
 import org.apache.airavata.rest.mappings.resourcemappings.ServiceDescriptor;
 import org.apache.airavata.rest.mappings.resourcemappings.ServiceParameters;
-import org.apache.airavata.schemas.gfac.ApplicationDeploymentDescriptionType;
-import org.apache.airavata.schemas.gfac.DataType;
-import org.apache.airavata.schemas.gfac.Ec2HostType;
-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.HpcApplicationDeploymentType;
-import org.apache.airavata.schemas.gfac.InputParameterType;
-import org.apache.airavata.schemas.gfac.JobTypeType;
-import org.apache.airavata.schemas.gfac.NameValuePairType;
-import org.apache.airavata.schemas.gfac.OutputParameterType;
-import org.apache.airavata.schemas.gfac.ParameterType;
-import org.apache.airavata.schemas.gfac.ProjectAccountType;
-import org.apache.airavata.schemas.gfac.QueueType;
-import org.apache.airavata.schemas.gfac.SSHHostType;
-import org.apache.airavata.schemas.gfac.UnicoreHostType;
+import org.apache.airavata.schemas.gfac.*;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
 
 public class DescriptorUtil {
 
@@ -472,6 +457,8 @@ public class DescriptorUtil {
                     }
                     
applicationDescriptor.setProcessorsPerNode(gramApplicationDeploymentType.getProcessorsPerNode());
                 }
+            } else if (applicationDescription.getType() instanceof 
Ec2ApplicationDeploymentType) {
+                
applicationDescriptor.setApplicationDescType(ApplicationDescriptorTypes.EC2_APP_DEP_DESC_TYPE);
             }
         }