You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2014/07/07 22:43:04 UTC
git commit: adding description to app interface
Repository: airavata
Updated Branches:
refs/heads/master d52e8f78a -> 43ee9ea21
adding description to app interface
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/43ee9ea2
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/43ee9ea2
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/43ee9ea2
Branch: refs/heads/master
Commit: 43ee9ea2120c9bfbe02b2789a671c16b667462f2
Parents: d52e8f7
Author: Chathuri Wimalasena <ka...@gmail.com>
Authored: Mon Jul 7 16:42:59 2014 -0400
Committer: Chathuri Wimalasena <ka...@gmail.com>
Committed: Mon Jul 7 16:42:59 2014 -0400
----------------------------------------------------------------------
.../catalog/data/impl/ApplicationInterfaceImpl.java | 1 +
.../catalog/data/model/ApplicationInterface.java | 10 ++++++++++
.../catalog/data/resources/AppInterfaceResource.java | 12 +++++++++++-
.../catalog/data/util/AppCatalogJPAUtils.java | 1 +
.../catalog/data/util/AppCatalogThriftConversion.java | 1 +
.../src/main/resources/appcatalog-derby.sql | 1 +
.../src/main/resources/appcatalog-mysql.sql | 1 +
.../airavata/app/catalog/test/AppInterfaceTest.java | 2 ++
.../src/test/resources/appcatalog-derby.sql | 1 +
9 files changed, 29 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/43ee9ea2/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ApplicationInterfaceImpl.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ApplicationInterfaceImpl.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ApplicationInterfaceImpl.java
index 0354c7c..89a8cbe 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ApplicationInterfaceImpl.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ApplicationInterfaceImpl.java
@@ -63,6 +63,7 @@ public class ApplicationInterfaceImpl implements ApplicationInterface {
AppInterfaceResource resource = new AppInterfaceResource();
resource.setAppName(applicationInterfaceDescription.getApplicationName());
resource.setInterfaceId(AppCatalogUtils.getID(applicationInterfaceDescription.getApplicationName()));
+ resource.setAppDescription(applicationInterfaceDescription.getApplicationDesription());
resource.save();
applicationInterfaceDescription.setApplicationInterfaceId(resource.getInterfaceId());
http://git-wip-us.apache.org/repos/asf/airavata/blob/43ee9ea2/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ApplicationInterface.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ApplicationInterface.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ApplicationInterface.java
index 3906dd8..4e46f4f 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ApplicationInterface.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ApplicationInterface.java
@@ -35,6 +35,8 @@ public class ApplicationInterface implements Serializable {
private String interfaceID;
@Column(name = "APPLICATION_NAME")
private String appName;
+ @Column(name = "APPLICATION_DESCRIPTION")
+ private String appDescription;
public String getInterfaceID() {
return interfaceID;
@@ -51,4 +53,12 @@ public class ApplicationInterface implements Serializable {
public void setAppName(String appName) {
this.appName = appName;
}
+
+ public String getAppDescription() {
+ return appDescription;
+ }
+
+ public void setAppDescription(String appDescription) {
+ this.appDescription = appDescription;
+ }
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/43ee9ea2/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppInterfaceResource.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppInterfaceResource.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppInterfaceResource.java
index ffab560..ca88764 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppInterfaceResource.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppInterfaceResource.java
@@ -39,6 +39,7 @@ public class AppInterfaceResource extends AbstractResource {
private final static Logger logger = LoggerFactory.getLogger(AppInterfaceResource.class);
private String interfaceId;
private String appName;
+ private String appDescription;
public String getInterfaceId() {
return interfaceId;
@@ -56,6 +57,14 @@ public class AppInterfaceResource extends AbstractResource {
this.appName = appName;
}
+ public String getAppDescription() {
+ return appDescription;
+ }
+
+ public void setAppDescription(String appDescription) {
+ this.appDescription = appDescription;
+ }
+
@Override
public void remove(Object identifier) throws AppCatalogException {
EntityManager em = null;
@@ -271,14 +280,15 @@ public class AppInterfaceResource extends AbstractResource {
em = AppCatalogJPAUtils.getEntityManager();
em.getTransaction().begin();
-
if (existigAppInterface != null){
existigAppInterface.setAppName(appName);
+ existigAppInterface.setAppDescription(appDescription);
em.merge(existigAppInterface);
}else {
ApplicationInterface applicationInterface = new ApplicationInterface();
applicationInterface.setInterfaceID(interfaceId);
applicationInterface.setAppName(appName);
+ applicationInterface.setAppDescription(appDescription);
em.persist(applicationInterface);
}
em.getTransaction().commit();
http://git-wip-us.apache.org/repos/asf/airavata/blob/43ee9ea2/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogJPAUtils.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogJPAUtils.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogJPAUtils.java
index 5038924..103176f 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogJPAUtils.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogJPAUtils.java
@@ -591,6 +591,7 @@ public class AppCatalogJPAUtils {
AppInterfaceResource resource = new AppInterfaceResource();
resource.setInterfaceId(o.getInterfaceID());
resource.setAppName(o.getAppName());
+ resource.setAppDescription(o.getAppDescription());
return resource;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/43ee9ea2/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java
index 0e41f43..0903ebe 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java
@@ -467,6 +467,7 @@ public class AppCatalogThriftConversion {
ApplicationInterfaceDescription description = new ApplicationInterfaceDescription();
description.setApplicationInterfaceId(resource.getInterfaceId());
description.setApplicationName(resource.getAppName());
+ description.setApplicationDesription(resource.getAppDescription());
AppModuleMappingResource appModuleMappingResource = new AppModuleMappingResource();
List<Resource> appModules = appModuleMappingResource.get(AbstractResource.AppModuleMappingConstants.INTERFACE_ID, resource.getInterfaceId());
http://git-wip-us.apache.org/repos/asf/airavata/blob/43ee9ea2/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-derby.sql
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-derby.sql b/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-derby.sql
index 6a196d7..e5cac0f 100644
--- a/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-derby.sql
+++ b/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-derby.sql
@@ -216,6 +216,7 @@ CREATE TABLE APPLICATION_INTERFACE
(
INTERFACE_ID VARCHAR(255),
APPLICATION_NAME VARCHAR(255),
+ APPLICATION_DESCRIPTION VARCHAR(255),
PRIMARY KEY(INTERFACE_ID)
);
http://git-wip-us.apache.org/repos/asf/airavata/blob/43ee9ea2/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-mysql.sql
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-mysql.sql b/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-mysql.sql
index e4e6483..ea196c2 100644
--- a/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-mysql.sql
+++ b/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-mysql.sql
@@ -209,6 +209,7 @@ CREATE TABLE APPLICATION_INTERFACE
(
INTERFACE_ID VARCHAR(255),
APPLICATION_NAME VARCHAR(255),
+ APPLICATION_DESCRIPTION VARCHAR(255),
PRIMARY KEY(INTERFACE_ID)
);
http://git-wip-us.apache.org/repos/asf/airavata/blob/43ee9ea2/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/AppInterfaceTest.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/AppInterfaceTest.java b/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/AppInterfaceTest.java
index 614ea9d..a2fdb86 100644
--- a/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/AppInterfaceTest.java
+++ b/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/AppInterfaceTest.java
@@ -88,6 +88,7 @@ public class AppInterfaceTest {
outputs.add(output1);
outputs.add(output2);
description.setApplicationName("testApplication");
+ description.setApplicationDesription("my testApplication");
description.setApplicationModules(modules);
description.setApplicationInputs(inputs);
description.setApplicationOutputs(outputs);
@@ -97,6 +98,7 @@ public class AppInterfaceTest {
if (appInterface.isApplicationInterfaceExists(appID)){
ainterface = appInterface.getApplicationInterface(appID);
System.out.println("********** application name ************* : " + ainterface.getApplicationName());
+ System.out.println("********** application description ************* : " + ainterface.getApplicationDesription());
}
ApplicationModule wrfModule = appInterface.getApplicationModule(wrfModuleId);
System.out.println("********** WRF module name ************* : " + wrfModule.getAppModuleName());
http://git-wip-us.apache.org/repos/asf/airavata/blob/43ee9ea2/modules/app-catalog/app-catalog-data/src/test/resources/appcatalog-derby.sql
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/test/resources/appcatalog-derby.sql b/modules/app-catalog/app-catalog-data/src/test/resources/appcatalog-derby.sql
index 6a196d7..e5cac0f 100644
--- a/modules/app-catalog/app-catalog-data/src/test/resources/appcatalog-derby.sql
+++ b/modules/app-catalog/app-catalog-data/src/test/resources/appcatalog-derby.sql
@@ -216,6 +216,7 @@ CREATE TABLE APPLICATION_INTERFACE
(
INTERFACE_ID VARCHAR(255),
APPLICATION_NAME VARCHAR(255),
+ APPLICATION_DESCRIPTION VARCHAR(255),
PRIMARY KEY(INTERFACE_ID)
);