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 2012/09/07 23:08:56 UTC
svn commit: r1382172 -
/incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/
Author: lahiru
Date: Fri Sep 7 21:08:55 2012
New Revision: 1382172
URL: http://svn.apache.org/viewvc?rev=1382172&view=rev
Log:
adding patch from chathuri
Modified:
incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationDescriptorResource.java
incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ConfigurationResource.java
incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentResource.java
incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/HostDescriptorResource.java
incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ProjectResource.java
incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/PublishWorkflowResource.java
incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ServiceDescriptorResource.java
incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/UserResource.java
incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/UserWorkflowResource.java
Modified: incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationDescriptorResource.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationDescriptorResource.java?rev=1382172&r1=1382171&r2=1382172&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationDescriptorResource.java (original)
+++ incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ApplicationDescriptorResource.java Fri Sep 7 21:08:55 2012
@@ -164,6 +164,10 @@ public class ApplicationDescriptorResour
}
+ public void save(boolean isAppendable) {
+
+ }
+
public boolean isExists(ResourceType type, Object name) {
throw new UnsupportedOperationException();
}
Modified: incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ConfigurationResource.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ConfigurationResource.java?rev=1382172&r1=1382171&r2=1382172&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ConfigurationResource.java (original)
+++ incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ConfigurationResource.java Fri Sep 7 21:08:55 2012
@@ -119,6 +119,10 @@ public class ConfigurationResource exten
end();
}
+ public void save(boolean isAppendable) {
+
+ }
+
public boolean isExists(ResourceType type, Object name) {
throw new UnsupportedOperationException();
}
Modified: incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentResource.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentResource.java?rev=1382172&r1=1382171&r2=1382172&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentResource.java (original)
+++ incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentResource.java Fri Sep 7 21:08:55 2012
@@ -139,6 +139,10 @@ public class ExperimentResource extends
}
+ public void save(boolean isAppendable) {
+
+ }
+
public boolean isExists(ResourceType type, Object name) {
throw new UnsupportedOperationException();
}
Modified: incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/HostDescriptorResource.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/HostDescriptorResource.java?rev=1382172&r1=1382171&r2=1382172&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/HostDescriptorResource.java (original)
+++ incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/HostDescriptorResource.java Fri Sep 7 21:08:55 2012
@@ -175,6 +175,10 @@ public class HostDescriptorResource exte
}
+ public void save(boolean isAppendable) {
+
+ }
+
public boolean isExists(ResourceType type, Object name) {
if (type == ResourceType.APPLICATION_DESCRIPTOR) {
begin();
Modified: incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ProjectResource.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ProjectResource.java?rev=1382172&r1=1382171&r2=1382172&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ProjectResource.java (original)
+++ incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ProjectResource.java Fri Sep 7 21:08:55 2012
@@ -209,6 +209,10 @@ public class ProjectResource extends Abs
}
+ public void save(boolean isAppendable) {
+
+ }
+
public boolean isExists(ResourceType type, Object name) {
begin();
if (type == ResourceType.USER_WORKFLOW) {
Modified: incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/PublishWorkflowResource.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/PublishWorkflowResource.java?rev=1382172&r1=1382171&r2=1382172&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/PublishWorkflowResource.java (original)
+++ incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/PublishWorkflowResource.java Fri Sep 7 21:08:55 2012
@@ -36,6 +36,8 @@ public class PublishWorkflowResource ext
private Date publishedDate;
private String content;
private String gatewayName;
+ private String createdUser;
+ private String path;
public PublishWorkflowResource() {
}
@@ -44,6 +46,22 @@ public class PublishWorkflowResource ext
this.name = name;
}
+ public String getCreatedUser() {
+ return createdUser;
+ }
+
+ public String getPath() {
+ return path;
+ }
+
+ public void setCreatedUser(String createdUser) {
+ this.createdUser = createdUser;
+ }
+
+ public void setPath(String path) {
+ this.path = path;
+ }
+
public String getName() {
return name;
}
@@ -131,6 +149,10 @@ public class PublishWorkflowResource ext
end();
}
+ public void save(boolean isAppendable) {
+
+ }
+
public boolean isExists(ResourceType type, Object name) {
throw new UnsupportedOperationException();
}
Modified: incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ServiceDescriptorResource.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ServiceDescriptorResource.java?rev=1382172&r1=1382171&r2=1382172&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ServiceDescriptorResource.java (original)
+++ incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ServiceDescriptorResource.java Fri Sep 7 21:08:55 2012
@@ -171,6 +171,10 @@ public class ServiceDescriptorResource e
}
+ public void save(boolean isAppendable) {
+
+ }
+
public boolean isExists(ResourceType type, Object name) {
if (type == ResourceType.APPLICATION_DESCRIPTOR) {
begin();
Modified: incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/UserResource.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/UserResource.java?rev=1382172&r1=1382171&r2=1382172&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/UserResource.java (original)
+++ incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/UserResource.java Fri Sep 7 21:08:55 2012
@@ -56,7 +56,11 @@ public class UserResource extends Abstra
}
public Resource create(ResourceType type) {
- if (type == ResourceType.USER_WORKFLOW) {
+ if(type == ResourceType.PROJECT){
+ ProjectResource projectResource = new ProjectResource();
+ projectResource.setUserName(userName);
+ return projectResource;
+ }else if (type == ResourceType.USER_WORKFLOW) {
UserWorkflowResource userWorkflowResource = new UserWorkflowResource();
userWorkflowResource.setUserName(userName);
// userWorkflowResource.setProjectID();
@@ -66,7 +70,23 @@ public class UserResource extends Abstra
// experimentResource.setProjectID(id);
experimentResource.setUserName(userName);
return experimentResource;
- } else {
+ }else if(type == ResourceType.PUBLISHED_WORKFLOW){
+ PublishWorkflowResource publishWorkflowResource = new PublishWorkflowResource();
+ publishWorkflowResource.setCreatedUser(userName);
+ return publishWorkflowResource;
+ }else if(type == ResourceType.HOST_DESCRIPTOR){
+ HostDescriptorResource hostDescriptorResource = new HostDescriptorResource();
+ hostDescriptorResource.setUserName(userName);
+ return hostDescriptorResource;
+ } else if (type == ResourceType.SERVICE_DESCRIPTOR){
+ ServiceDescriptorResource serviceDescriptorResource = new ServiceDescriptorResource();
+ serviceDescriptorResource.setUserName(userName);
+ return serviceDescriptorResource;
+ } else if(type == ResourceType.APPLICATION_DESCRIPTOR){
+ ApplicationDescriptorResource applicationDescriptorResource = new ApplicationDescriptorResource();
+ applicationDescriptorResource.setUpdatedUser(userName);
+ return applicationDescriptorResource;
+ }else {
return null;
}
}
@@ -74,9 +94,10 @@ public class UserResource extends Abstra
public void remove(ResourceType type, Object name) {
begin();
if (type == ResourceType.USER_WORKFLOW) {
- Query q = em.createQuery("Delete p FROM User_Workflow p WHERE p.user_name = :usr_name and p.user_workflow_name = :usrwf_name");
- q.setParameter("user_name", userName);
+ Query q = em.createQuery("Delete p FROM User_Workflow p WHERE p.owner = :owner and p.user_workflow_name = :usrwf_name and p.gateway_name =: gate_name");
+ q.setParameter("owner", userName);
q.setParameter("usrwf_name", name);
+ q.setParameter("gate_name", gatewayName);
q.executeUpdate();
} else if (type == ResourceType.EXPERIMENT) {
Query q = em.createQuery("Delete p FROM Experiment p WHERE p.user_name = :usr_name and p.experiment_ID = :ex_name");
@@ -95,9 +116,10 @@ public class UserResource extends Abstra
public Resource get(ResourceType type, Object name) {
begin();
if (type == ResourceType.USER_WORKFLOW) {
- Query q = em.createQuery("SELECT p FROM User_Workflow p WHERE p.user_name = :usr_name and p.user_workflow_name = :usrwf_name");
+ Query q = em.createQuery("SELECT p FROM User_Workflow p WHERE p.owner = :usr_name and p.user_workflow_name = :usrwf_name and p.gateway_name =:gate_name");
q.setParameter("user_name", userName);
q.setParameter("usrwf_name", name);
+ q.setParameter("gate_name", gatewayName);
User_Workflow userWorkflow = (User_Workflow) q.getSingleResult();
UserWorkflowResource userWorkflowResource = new UserWorkflowResource(userWorkflow.getGateway().getGateway_name(), userName, userWorkflow.getTemplate_name());
userWorkflowResource.setContent(userWorkflow.getWorkflow_graph());
@@ -173,6 +195,10 @@ public class UserResource extends Abstra
end();
}
+ public void save(boolean isAppendable) {
+
+ }
+
public boolean isExists(ResourceType type, Object name) {
begin();
if (type == ResourceType.USER_WORKFLOW) {
Modified: incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/UserWorkflowResource.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/UserWorkflowResource.java?rev=1382172&r1=1382171&r2=1382172&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/UserWorkflowResource.java (original)
+++ incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/UserWorkflowResource.java Fri Sep 7 21:08:55 2012
@@ -146,6 +146,10 @@ public class UserWorkflowResource extend
end();
}
+ public void save(boolean isAppendable) {
+
+ }
+
public boolean isExists(ResourceType type, Object name) {
throw new UnsupportedOperationException();
}