You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sa...@apache.org on 2012/09/07 22:27:31 UTC

svn commit: r1382160 - in /incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa: Resource.java ResourceUtils.java resources/ConfigurationResource.java

Author: samindaw
Date: Fri Sep  7 20:27:31 2012
New Revision: 1382160

URL: http://svn.apache.org/viewvc?rev=1382160&view=rev
Log:
removing the save overload & adding remove function to config remove

Modified:
    incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/Resource.java
    incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/ResourceUtils.java
    incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ConfigurationResource.java

Modified: incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/Resource.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/Resource.java?rev=1382160&r1=1382159&r2=1382160&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/Resource.java (original)
+++ incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/Resource.java Fri Sep  7 20:27:31 2012
@@ -43,8 +43,6 @@ public interface Resource {
 
     void save();
     
-    void save(boolean overwrite);
-
     boolean isExists(ResourceType type, Object name);
 
 }

Modified: incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/ResourceUtils.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/ResourceUtils.java?rev=1382160&r1=1382159&r2=1382160&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/ResourceUtils.java (original)
+++ incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/ResourceUtils.java Fri Sep  7 20:27:31 2012
@@ -159,7 +159,7 @@ public class ResourceUtils {
 	private static ConfigurationResource createConfigurationResourceObject(
 			Object result) {
 		Configuration configuration = (Configuration) result;
-		ConfigurationResource configurationResource = new ConfigurationResource();
+		ConfigurationResource configurationResource = new ConfigurationResource(configuration.getConfig_ID());
 		configurationResource.setConfigKey(configuration.getConfig_key());
 		configurationResource.setConfigVal(configuration.getConfig_val());
 		configurationResource.setExpireDate(configuration.getExpire_date());
@@ -169,4 +169,8 @@ public class ResourceUtils {
     public static void removeConfiguration(String configkey, String configValue){
 
     }
+    
+    public static void removeConfiguration(String configkey){
+
+    }
 }

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=1382160&r1=1382159&r2=1382160&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 20:27:31 2012
@@ -20,15 +20,16 @@
 */
 package org.apache.airavata.persistance.registry.jpa.resources;
 
-import org.apache.airavata.persistance.registry.jpa.Resource;
-import org.apache.airavata.persistance.registry.jpa.ResourceType;
-import org.apache.airavata.persistance.registry.jpa.model.Configuration;
-
-import javax.persistence.Query;
 import java.sql.Date;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.persistence.Query;
+
+import org.apache.airavata.persistance.registry.jpa.Resource;
+import org.apache.airavata.persistance.registry.jpa.ResourceType;
+import org.apache.airavata.persistance.registry.jpa.model.Configuration;
+
 public class ConfigurationResource extends AbstractResource {
     private int configID = -1;
     private String configKey;