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/13 22:18:48 UTC
svn commit: r1384507 - in
/incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa:
model/Service_Descriptor.java resources/ServiceDescriptorResource.java
Author: lahiru
Date: Thu Sep 13 20:18:47 2012
New Revision: 1384507
URL: http://svn.apache.org/viewvc?rev=1384507&view=rev
Log:
fixing user not saving issue
Modified:
incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Service_Descriptor.java
incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ServiceDescriptorResource.java
Modified: incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Service_Descriptor.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Service_Descriptor.java?rev=1384507&r1=1384506&r2=1384507&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Service_Descriptor.java (original)
+++ incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Service_Descriptor.java Thu Sep 13 20:18:47 2012
@@ -30,6 +30,7 @@ public class Service_Descriptor {
@Id
private String gateway_name;
+ private String updated_user;
private String service_descriptor_xml;
@ManyToOne
@@ -79,6 +80,14 @@ public class Service_Descriptor {
public void setGateway_name(String gateway_name) {
this.gateway_name = gateway_name;
}
+
+ public String getUpdated_user() {
+ return updated_user;
+ }
+
+ public void setUpdated_user(String updated_user) {
+ this.updated_user = updated_user;
+ }
}
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=1384507&r1=1384506&r2=1384507&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 Thu Sep 13 20:18:47 2012
@@ -144,11 +144,12 @@ public class ServiceDescriptorResource e
gateway.setGateway_name(gatewayName);
serviceDescriptor.setGateway(gateway);
serviceDescriptor.setService_descriptor_xml(content);
- Users user = new Users();
- user.setUser_name(userName);
- serviceDescriptor.setUser(user);
+// Users user = new Users();
+// user.setUser_name(userName);
+// serviceDescriptor.setUser(user);
+ serviceDescriptor.setUpdated_user(userName);
if(existingServiceDesc != null) {
- existingServiceDesc.setUser(user);
+ existingServiceDesc.setUpdated_user(userName);
existingServiceDesc.setService_descriptor_xml(content);
serviceDescriptor = em.merge(existingServiceDesc);
}else {