You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2014/06/29 16:41:54 UTC
[5/8] git commit: updating app catalog data models
updating app catalog data models
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/e0f21e45
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/e0f21e45
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/e0f21e45
Branch: refs/heads/master
Commit: e0f21e4553970db777cb5aacbea780a83635db07
Parents: a1bf439
Author: Suresh Marru <sm...@apache.org>
Authored: Sun Jun 29 10:14:52 2014 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Sun Jun 29 10:14:52 2014 -0400
----------------------------------------------------------------------
.../org/apache/airavata/api/server/ApplicationCatalogServer.java | 4 +++-
.../airavata/api/server/handler/ApplicationCatalogHandler.java | 4 +++-
airavata-api/generate-thrift-files.sh | 2 +-
.../aiaravata/application/catalog/data/model/GSISSHExport.java | 2 +-
.../application/catalog/data/model/GSISSHPostJobCommand.java | 2 +-
.../application/catalog/data/model/GSISSHPreJobCommand.java | 2 +-
6 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/e0f21e45/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/ApplicationCatalogServer.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/ApplicationCatalogServer.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/ApplicationCatalogServer.java
index 9267bdc..6c80a32 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/ApplicationCatalogServer.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/ApplicationCatalogServer.java
@@ -17,7 +17,8 @@
* specific language governing permissions and limitations
* under the License.
*
- */
+ *//*
+
package org.apache.airavata.api.server;
@@ -160,3 +161,4 @@ public class ApplicationCatalogServer implements IServer{
}
}
+*/
http://git-wip-us.apache.org/repos/asf/airavata/blob/e0f21e45/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/ApplicationCatalogHandler.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/ApplicationCatalogHandler.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/ApplicationCatalogHandler.java
index efec768..d66f682 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/ApplicationCatalogHandler.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/ApplicationCatalogHandler.java
@@ -17,7 +17,8 @@
* specific language governing permissions and limitations
* under the License.
*
- */
+ *//*
+
package org.apache.airavata.api.server.handler;
@@ -583,3 +584,4 @@ public class ApplicationCatalogHandler implements Iface {
}
}
+*/
http://git-wip-us.apache.org/repos/asf/airavata/blob/e0f21e45/airavata-api/generate-thrift-files.sh
----------------------------------------------------------------------
diff --git a/airavata-api/generate-thrift-files.sh b/airavata-api/generate-thrift-files.sh
index 4682e0d..ed989c4 100755
--- a/airavata-api/generate-thrift-files.sh
+++ b/airavata-api/generate-thrift-files.sh
@@ -123,7 +123,7 @@ rm -rf ${JAVA_BEAN_GEN_DIR}
# The airavataDataModel.thrift includes rest of data models.
thrift ${THRIFT_ARGS} --gen java:beans ${THRIFT_IDL_DIR}/airavataDataModel.thrift || fail unable to generate java bean thrift classes on base data model
-thrift ${THRIFT_ARGS} --gen java:beans ${THRIFT_IDL_DIR}/computeHostModel.thrift || fail unable to generate java bean thrift classes on app catalog data model
+thrift ${THRIFT_ARGS} --gen java:beans ${THRIFT_IDL_DIR}/appCatalogModels.thrift || fail unable to generate java bean thrift classes on app catalog data models
# For the generated java beans add the ASF V2 License header
add_license_header ${JAVA_BEAN_GEN_DIR}
http://git-wip-us.apache.org/repos/asf/airavata/blob/e0f21e45/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/GSISSHExport.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/GSISSHExport.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/GSISSHExport.java
index e91e86a..1113859 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/GSISSHExport.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/GSISSHExport.java
@@ -21,7 +21,7 @@
package org.apache.aiaravata.application.catalog.data.model;
-import org.apache.airavata.model.appcatalog.GSISSHJobSubmission;
+import org.apache.airavata.model.computehost.GSISSHJobSubmission;
import javax.persistence.*;
import java.io.Serializable;
http://git-wip-us.apache.org/repos/asf/airavata/blob/e0f21e45/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/GSISSHPostJobCommand.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/GSISSHPostJobCommand.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/GSISSHPostJobCommand.java
index 7c2c754..75185f1 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/GSISSHPostJobCommand.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/GSISSHPostJobCommand.java
@@ -21,7 +21,7 @@
package org.apache.aiaravata.application.catalog.data.model;
-import org.apache.airavata.model.appcatalog.GSISSHJobSubmission;
+import org.apache.airavata.model.computehost.GSISSHJobSubmission;
import javax.persistence.*;
import java.io.Serializable;
http://git-wip-us.apache.org/repos/asf/airavata/blob/e0f21e45/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/GSISSHPreJobCommand.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/GSISSHPreJobCommand.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/GSISSHPreJobCommand.java
index 3c1b77d..87c71a6 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/GSISSHPreJobCommand.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/GSISSHPreJobCommand.java
@@ -21,7 +21,7 @@
package org.apache.aiaravata.application.catalog.data.model;
-import org.apache.airavata.model.appcatalog.GSISSHJobSubmission;
+import org.apache.airavata.model.computehost.GSISSHJobSubmission;
import javax.persistence.*;
import java.io.Serializable;