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/20 04:03:24 UTC
svn commit: r1186601 - in
/incubator/airavata/trunk/modules/commons/gfac-schema: schemas/
src/main/java/org/apache/airavata/commons/gfac/type/
src/main/java/org/apache/airavata/commons/gfac/type/app/
src/main/java/org/apache/airavata/commons/gfac/type/...
Author: lahiru
Date: Thu Oct 20 02:03:23 2011
New Revision: 1186601
URL: http://svn.apache.org/viewvc?rev=1186601&view=rev
Log:
Applying patch for AIRAVATA-105.
Thanks Heshan for the contribution.
Modified:
incubator/airavata/trunk/modules/commons/gfac-schema/schemas/ApplicationDescription.xsd
incubator/airavata/trunk/modules/commons/gfac-schema/schemas/HostDescription.xsd
incubator/airavata/trunk/modules/commons/gfac-schema/schemas/ServiceMap.xsd
incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/ApplicationDeploymentDescription.java
incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/HostDescription.java
incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/Parameter.java
incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/ServiceDescription.java
incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/app/GramApplicationDeployment.java
incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/app/ShellApplicationDeployment.java
incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/host/GlobusHost.java
Modified: incubator/airavata/trunk/modules/commons/gfac-schema/schemas/ApplicationDescription.xsd
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/gfac-schema/schemas/ApplicationDescription.xsd?rev=1186601&r1=1186600&r2=1186601&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/gfac-schema/schemas/ApplicationDescription.xsd (original)
+++ incubator/airavata/trunk/modules/commons/gfac-schema/schemas/ApplicationDescription.xsd Thu Oct 20 02:03:23 2011
@@ -13,13 +13,13 @@
xmlns:gfac="http://schemas.airavata.apache.org/gfac/type" xmlns="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified">
- <element name="shellApplicationDeployment" type="gfac:shellApplicationDeployment"/>
- <element name="applicationDeploymentDescription" type="gfac:applicationDeploymentDescription"/>
- <element name="gramApplicationDeployment" type="gfac:gramApplicationDeployment"/>
+ <element name="shellApplicationDeployment" type="gfac:shellApplicationDeploymentType"/>
+ <element name="applicationDeploymentDescription" type="gfac:applicationDeploymentDescriptionType"/>
+ <element name="gramApplicationDeployment" type="gfac:gramApplicationDeploymentType"/>
- <complexType name="gramApplicationDeployment">
+ <complexType name="gramApplicationDeploymentType">
<complexContent>
- <extension base="gfac:shellApplicationDeployment">
+ <extension base="gfac:shellApplicationDeploymentType">
<sequence>
<element name="cpuCount" type="int"/>
<element minOccurs="0" name="jobType" type="string"/>
@@ -32,9 +32,9 @@
</complexContent>
</complexType>
- <complexType name="shellApplicationDeployment">
+ <complexType name="shellApplicationDeploymentType">
<complexContent>
- <extension base="gfac:applicationDeploymentDescription">
+ <extension base="gfac:applicationDeploymentDescriptionType">
<sequence>
<element name="env">
<complexType>
@@ -59,7 +59,7 @@
</complexContent>
</complexType>
- <complexType name="applicationDeploymentDescription">
+ <complexType name="applicationDeploymentDescriptionType">
<sequence>
<element minOccurs="0" name="inputDir" type="string"/>
<element minOccurs="0" name="name" type="string"/>
Modified: incubator/airavata/trunk/modules/commons/gfac-schema/schemas/HostDescription.xsd
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/gfac-schema/schemas/HostDescription.xsd?rev=1186601&r1=1186600&r2=1186601&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/gfac-schema/schemas/HostDescription.xsd (original)
+++ incubator/airavata/trunk/modules/commons/gfac-schema/schemas/HostDescription.xsd Thu Oct 20 02:03:23 2011
@@ -13,13 +13,13 @@
xmlns:gfac="http://schemas.airavata.apache.org/gfac/type" xmlns="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified">
- <element name="globusHost" type="gfac:globusHost" />
- <element name="hostDescription" type="gfac:hostDescription" />
+ <element name="globusHost" type="gfac:globusHostType" />
+ <element name="hostDescription" type="gfac:hostDescriptionType" />
<!-- Globus Host Description -->
- <complexType name="globusHost">
+ <complexType name="globusHostType">
<complexContent>
- <extension base="gfac:hostDescription">
+ <extension base="gfac:hostDescriptionType">
<sequence>
<element minOccurs="0" name="globusGateKeeperEndPoint" type="string" />
<element minOccurs="0" name="gridFTPEndPoint" type="string" />
@@ -29,9 +29,10 @@
</complexType>
<!-- Host Description -->
- <complexType name="hostDescription">
+ <complexType name="hostDescriptionType">
<sequence>
<element minOccurs="0" name="name" type="string" />
+ <element minOccurs="0" name="address" type="string" />
</sequence>
</complexType>
Modified: incubator/airavata/trunk/modules/commons/gfac-schema/schemas/ServiceMap.xsd
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/gfac-schema/schemas/ServiceMap.xsd?rev=1186601&r1=1186600&r2=1186601&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/gfac-schema/schemas/ServiceMap.xsd (original)
+++ incubator/airavata/trunk/modules/commons/gfac-schema/schemas/ServiceMap.xsd Thu Oct 20 02:03:23 2011
@@ -16,17 +16,17 @@
<include schemaLocation="gfac-parameter.xsd"/>
- <element name="serviceDescription" type="gfac:serviceDescription"/>
+ <element name="serviceDescription" type="gfac:serviceDescriptionType"/>
- <complexType name="serviceDescription">
+ <complexType name="serviceDescriptionType">
<sequence>
<element minOccurs="0" name="name" type="string"/>
- <element maxOccurs="unbounded" minOccurs="0" name="inputParameters" nillable="true" type="gfac:parameter"/>
- <element maxOccurs="unbounded" minOccurs="0" name="outputParameters" nillable="true" type="gfac:parameter"/>
+ <element maxOccurs="unbounded" minOccurs="0" name="inputParameters" nillable="true" type="gfac:parameterType"/>
+ <element maxOccurs="unbounded" minOccurs="0" name="outputParameters" nillable="true" type="gfac:parameterType"/>
</sequence>
</complexType>
- <complexType name="parameter">
+ <complexType name="parameterType">
<sequence>
<element minOccurs="0" name="description" type="string"/>
<element minOccurs="0" name="name" type="string"/>
Modified: incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/ApplicationDeploymentDescription.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/ApplicationDeploymentDescription.java?rev=1186601&r1=1186600&r2=1186601&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/ApplicationDeploymentDescription.java (original)
+++ incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/ApplicationDeploymentDescription.java Thu Oct 20 02:03:23 2011
@@ -21,51 +21,57 @@
package org.apache.airavata.commons.gfac.type;
+import org.apache.airavata.schemas.gfac.ApplicationDeploymentDescriptionType;
+
public class ApplicationDeploymentDescription implements Type {
- protected String id;
- private String tmpDir;
- private String workingDir;
- private String inputDir;
- private String outputDir;
+ private ApplicationDeploymentDescriptionType appDeploymentDescType;
+
+ public ApplicationDeploymentDescription() {
+ this.appDeploymentDescType = ApplicationDeploymentDescriptionType.Factory.newInstance();
+ }
+
+ public ApplicationDeploymentDescription(ApplicationDeploymentDescriptionType addt) {
+ this.appDeploymentDescType = addt;
+ }
public String getId() {
- return id;
+ return appDeploymentDescType.getName();
}
public void setId(String id) {
- this.id = id;
+ this.appDeploymentDescType.setName(id);
}
public String getTmpDir() {
- return tmpDir;
+ return appDeploymentDescType.getTmpDir();
}
public void setTmpDir(String tmpDir) {
- this.tmpDir = tmpDir;
+ this.appDeploymentDescType.setTmpDir(tmpDir);
}
public String getWorkingDir() {
- return workingDir;
+ return appDeploymentDescType.getWorkingDir();
}
public void setWorkingDir(String workingDir) {
- this.workingDir = workingDir;
+ this.appDeploymentDescType.setWorkingDir(workingDir);
}
public String getInputDir() {
- return inputDir;
+ return appDeploymentDescType.getInputDir();
}
public void setInputDir(String inputDir) {
- this.inputDir = inputDir;
+ this.appDeploymentDescType.setInputDir(inputDir);
}
public String getOutputDir() {
- return outputDir;
+ return appDeploymentDescType.getOutputDir();
}
public void setOutputDir(String outputDir) {
- this.outputDir = outputDir;
+ this.appDeploymentDescType.setOutputDir(outputDir);
}
}
Modified: incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/HostDescription.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/HostDescription.java?rev=1186601&r1=1186600&r2=1186601&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/HostDescription.java (original)
+++ incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/HostDescription.java Thu Oct 20 02:03:23 2011
@@ -21,25 +21,34 @@
package org.apache.airavata.commons.gfac.type;
+import org.apache.airavata.schemas.gfac.HostDescriptionType;
+
public class HostDescription implements Type {
- protected String id;
- private String address;
+ private HostDescriptionType hostDescriptionType;
+
+ public HostDescription() {
+ this.hostDescriptionType = HostDescriptionType.Factory.newInstance();
+ }
+
+ public HostDescription(HostDescriptionType hdt) {
+ this.hostDescriptionType = hdt;
+ }
public String getId() {
- return id;
+ return hostDescriptionType.getName();
}
public void setId(String id) {
- this.id = id;
+ this.hostDescriptionType.setName(id);
}
public String getAddress() {
- return address;
+ return hostDescriptionType.getAddress();
}
public void setAddress(String address) {
- this.address = address;
+ this.hostDescriptionType.setAddress(address);
}
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/Parameter.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/Parameter.java?rev=1186601&r1=1186600&r2=1186601&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/Parameter.java (original)
+++ incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/Parameter.java Thu Oct 20 02:03:23 2011
@@ -21,27 +21,37 @@
package org.apache.airavata.commons.gfac.type;
+import org.apache.airavata.schemas.gfac.ParameterType;
+
public class Parameter implements Type {
- private String name;
- private String description;
+ private ParameterType parameterType;
private DataType type;
+ public Parameter() {
+ this.parameterType = ParameterType.Factory.newInstance();
+ }
+
+ public Parameter(ParameterType pt) {
+ this.parameterType = pt;
+ }
+
public String getName() {
- return name;
+ return parameterType.getName();
}
public void setName(String name) {
- this.name = name;
+ this.parameterType.setName(name);
}
public String getDescription() {
- return description;
+ return parameterType.getDescription();
}
public void setDescription(String description) {
- this.description = description;
+ this.parameterType.setDescription(description);
}
+ // TODO
public DataType getType() {
return type;
}
Modified: incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/ServiceDescription.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/ServiceDescription.java?rev=1186601&r1=1186600&r2=1186601&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/ServiceDescription.java (original)
+++ incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/ServiceDescription.java Thu Oct 20 02:03:23 2011
@@ -21,22 +21,33 @@
package org.apache.airavata.commons.gfac.type;
+import org.apache.airavata.schemas.gfac.ServiceDescriptionType;
+
import java.util.List;
public class ServiceDescription implements Type {
- protected String id;
+ private ServiceDescriptionType serviceDescriptionType;
private List<Parameter> inputParameters;
private List<Parameter> outputParameters;
+ public ServiceDescription() {
+ this.serviceDescriptionType = ServiceDescriptionType.Factory.newInstance();
+ }
+
+ public ServiceDescription(ServiceDescriptionType sdt) {
+ this.serviceDescriptionType = sdt;
+ }
+
public String getId() {
- return id;
+ return serviceDescriptionType.getName();
}
public void setId(String id) {
- this.id = id;
+ this.serviceDescriptionType.setName(id);
}
+ // TODO
public List<Parameter> getInputParameters() {
return inputParameters;
}
Modified: incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/app/GramApplicationDeployment.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/app/GramApplicationDeployment.java?rev=1186601&r1=1186600&r2=1186601&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/app/GramApplicationDeployment.java (original)
+++ incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/app/GramApplicationDeployment.java Thu Oct 20 02:03:23 2011
@@ -21,59 +21,65 @@
package org.apache.airavata.commons.gfac.type.app;
+import org.apache.airavata.schemas.gfac.GramApplicationDeploymentType;
+
public class GramApplicationDeployment extends ShellApplicationDeployment {
- private String projectName;
- private String queueName;
- private int wallTime;
- private int nodeCount;
- private int cpuCount;
- private String jobType;
+
+ private GramApplicationDeploymentType gramApplicationDeploymentType;
+
+ private GramApplicationDeployment() {
+ this.gramApplicationDeploymentType = GramApplicationDeploymentType.Factory.newInstance();
+ }
+
+ private GramApplicationDeployment(GramApplicationDeploymentType gadt) {
+ this.gramApplicationDeploymentType = gadt;
+ }
public String getProjectName() {
- return projectName;
+ return gramApplicationDeploymentType.getProjectName();
}
public void setProjectName(String projectName) {
- this.projectName = projectName;
+ this.gramApplicationDeploymentType.setProjectName(projectName);
}
public String getQueueName() {
- return queueName;
+ return gramApplicationDeploymentType.getQueueName();
}
public void setQueueName(String queueName) {
- this.queueName = queueName;
+ this.gramApplicationDeploymentType.setQueueName(queueName);
}
public int getWallTime() {
- return wallTime;
+ return gramApplicationDeploymentType.getWallTime();
}
public void setWallTime(int wallTime) {
- this.wallTime = wallTime;
+ this.gramApplicationDeploymentType.setWallTime(wallTime);
}
public int getNodeCount() {
- return nodeCount;
+ return gramApplicationDeploymentType.getNodeCount();
}
public void setNodeCount(int nodeCount) {
- this.nodeCount = nodeCount;
+ this.gramApplicationDeploymentType.setNodeCount(nodeCount);
}
public int getCpuCount() {
- return cpuCount;
+ return gramApplicationDeploymentType.getCpuCount();
}
public void setCpuCount(int cpuCount) {
- this.cpuCount = cpuCount;
+ this.gramApplicationDeploymentType.setCpuCount(cpuCount);
}
public String getJobType() {
- return jobType;
+ return gramApplicationDeploymentType.getJobType();
}
public void setJobType(String jobType) {
- this.jobType = jobType;
+ this.gramApplicationDeploymentType.setJobType(jobType);
}
}
Modified: incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/app/ShellApplicationDeployment.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/app/ShellApplicationDeployment.java?rev=1186601&r1=1186600&r2=1186601&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/app/ShellApplicationDeployment.java (original)
+++ incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/app/ShellApplicationDeployment.java Thu Oct 20 02:03:23 2011
@@ -21,23 +21,31 @@
package org.apache.airavata.commons.gfac.type.app;
-import java.util.Map;
-
import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
+import org.apache.airavata.schemas.gfac.ShellApplicationDeploymentType;
+
+import java.util.Map;
public class ShellApplicationDeployment extends ApplicationDeploymentDescription {
- private String executable;
- private String stdOut;
- private String stdErr;
- private String stdIn;
+
+ private ShellApplicationDeploymentType shellApplicationDeploymentType;
+ // TODO
private Map<String, String> env;
+ public ShellApplicationDeployment() {
+ shellApplicationDeploymentType = ShellApplicationDeploymentType.Factory.newInstance();
+ }
+
+ public ShellApplicationDeployment(ShellApplicationDeploymentType sadt) {
+ shellApplicationDeploymentType = sadt;
+ }
+
public String getExecutable() {
- return executable;
+ return shellApplicationDeploymentType.getExecutable();
}
public void setExecutable(String executable) {
- this.executable = executable;
+ this.shellApplicationDeploymentType.setExecutable(executable);
}
public Map<String, String> getEnv() {
@@ -49,26 +57,26 @@ public class ShellApplicationDeployment
}
public String getStdOut() {
- return stdOut;
+ return shellApplicationDeploymentType.getStdOut();
}
public void setStdOut(String stdOut) {
- this.stdOut = stdOut;
+ this.shellApplicationDeploymentType.setStdOut(stdOut);
}
public String getStdErr() {
- return stdErr;
+ return shellApplicationDeploymentType.getStdErr();
}
public void setStdErr(String stderr) {
- this.stdErr = stderr;
+ this.shellApplicationDeploymentType.setStdErr(stderr);
}
public String getStdIn() {
- return stdIn;
+ return shellApplicationDeploymentType.getStdIn();
}
public void setStdIn(String stdIn) {
- this.stdIn = stdIn;
+ this.shellApplicationDeploymentType.setStdIn(stdIn);
}
}
Modified: incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/host/GlobusHost.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/host/GlobusHost.java?rev=1186601&r1=1186600&r2=1186601&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/host/GlobusHost.java (original)
+++ incubator/airavata/trunk/modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/host/GlobusHost.java Thu Oct 20 02:03:23 2011
@@ -22,24 +22,33 @@
package org.apache.airavata.commons.gfac.type.host;
import org.apache.airavata.commons.gfac.type.HostDescription;
+import org.apache.airavata.schemas.gfac.GlobusHostType;
public class GlobusHost extends HostDescription {
- private String gridFTPEndPoint;
- private String globusGateKeeperEndPoint;
+
+ private GlobusHostType globusHostType;
+
+ private GlobusHost() {
+ this.globusHostType = GlobusHostType.Factory.newInstance();
+ }
+
+ private GlobusHost(GlobusHostType ght) {
+ this.globusHostType = ght;
+ }
public String getGridFTPEndPoint() {
- return gridFTPEndPoint;
+ return globusHostType.getGridFTPEndPoint();
}
public void setGridFTPEndPoint(String gridFTPEndPoint) {
- this.gridFTPEndPoint = gridFTPEndPoint;
+ this.globusHostType.setGridFTPEndPoint(gridFTPEndPoint);
}
public String getGlobusGateKeeperEndPoint() {
- return globusGateKeeperEndPoint;
+ return globusHostType.getGlobusGateKeeperEndPoint();
}
public void setGlobusGateKeeperEndPoint(String globusGateKeeperEndPoint) {
- this.globusGateKeeperEndPoint = globusGateKeeperEndPoint;
+ this.globusHostType.setGlobusGateKeeperEndPoint(globusGateKeeperEndPoint);
}
}
\ No newline at end of file