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/11 19:22:51 UTC
svn commit: r1383484 - in
/incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src:
main/java/org/apache/airavata/persistance/registry/jpa/
main/java/org/apache/airavata/persistance/registry/jpa/resources/
test/java/org/apache/airavata/pers...
Author: lahiru
Date: Tue Sep 11 17:22:50 2012
New Revision: 1383484
URL: http://svn.apache.org/viewvc?rev=1383484&view=rev
Log:
applying patch from chathuri for AIRAVATA-562
Added:
incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/
incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/
incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/
incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GatewayResourceTest.java
Modified:
incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/Test.java
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/ExperimentResource.java
incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/GatewayResource.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
incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/WorkerResource.java
Modified: incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/Test.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/Test.java?rev=1383484&r1=1383483&r2=1383484&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/Test.java (original)
+++ incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/Test.java Tue Sep 11 17:22:50 2012
@@ -1,42 +1,53 @@
package org.apache.airavata.persistance.registry.jpa;
-import org.apache.airavata.persistance.registry.jpa.resources.GatewayResource;
-import org.apache.airavata.persistance.registry.jpa.resources.ProjectResource;
-import org.apache.airavata.persistance.registry.jpa.resources.UserResource;
+import org.apache.airavata.persistance.registry.jpa.resources.*;
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.Persistence;
public class Test {
public static void main(String[] args) {
- GatewayResource gatewayResource = new GatewayResource();
- gatewayResource.setGatewayName("abc");
-// gatewayResource.setGatewayID(1);
-
- // ProjectResource projectResource = (ProjectResource)gatewayResource.create(ResourceType.PROJECT);
- UserResource userResource = (UserResource)gatewayResource.create(ResourceType.USER);
- //PublishWorkflowResource publishWorkflowResource = (PublishWorkflowResource)gatewayResource.create(ResourceType.PUBLISHED_WORKFLOW);
- //ServiceDescriptorResource serviceDescriptorResource = (ServiceDescriptorResource) gatewayResource.create(ResourceType.SERVICE_DESCRIPTOR);
- //HostDescriptorResource hostDescriptorResource = (HostDescriptorResource) gatewayResource.create(ResourceType.HOST_DESCRIPTOR);
- //ApplicationDescriptorResource applicationDescriptorResource = (ApplicationDescriptorResource) gatewayResource.create(ResourceType.APPLICATION_DESCRIPTOR);
-
-
- userResource.setUserName("chathuri");
- userResource.setPassword("11111111");
+// String PERSISTENCE_UNIT_NAME = "airavata_data";
+// EntityManagerFactory factory;
+// EntityManager em;
+// factory = Persistence.createEntityManagerFactory(PERSISTENCE_UNIT_NAME);
+// em = factory.createEntityManager();
- // projectResource.setName("myproject");
-
- //userResource.setProjectResource(projectResource);
-
- //Date date = new Date(2012, 9, 5);
+ GatewayResource gatewayResource = new GatewayResource();
+ gatewayResource.setGatewayName("default");
+ gatewayResource.setOwner("default");
- //publishWorkflowResource.setPublishedDate(date);
- //publishWorkflowResource.setContent("mycontent");
- //publishWorkflowResource.setVersion("1");
+ gatewayResource.isExists(ResourceType.HOST_DESCRIPTOR, "Localhost");
+//
+// boolean state = gatewayResource.isExists(ResourceType.HOST_DESCRIPTOR, "Localhost");
+// System.out.println(state);
+
+ ConfigurationResource configurationResource = new ConfigurationResource();
+ ResourceUtils.removeConfiguration("messagebox.url","http://140.182.199.161:8080/axis2/services/MsgBoxService");
+
+// GatewayResource gatewayResource = new GatewayResource();
+// gatewayResource.setGatewayName("abc");
+// gatewayResource.setOwner("lahiru");
+//
+// WorkerResource workerResource = (WorkerResource)gatewayResource.create(ResourceType.GATEWAY_WORKER);
+// workerResource.setUser("aaaaa");
+// workerResource.setGateway(gatewayResource);
+//
+// UserResource userResource = (UserResource)gatewayResource.create(ResourceType.USER);
+// userResource.setUserName("aaaaa");
+// userResource.setPassword("11111111");
+//
+// ConfigurationResource configurationResource = new ConfigurationResource();
+//// configurationResource.setConfigKey();
+//
+//
+//// gatewayResource.save();
+//// userResource.save();
+// workerResource.save();
- gatewayResource.save();
- userResource.save();
- //projectResource.save();
- //publishWorkflowResource.save();
}
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=1383484&r1=1383483&r2=1383484&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 Tue Sep 11 17:22:50 2012
@@ -238,7 +238,7 @@ public class ApplicationDescriptorResour
applicationDescriptor.setApplication_descriptor_xml(content);
applicationDescriptor.setService_descriptor_ID(serviceDescName);
applicationDescriptor.setHost_descriptor_ID(hostDescName);
- em.persist(applicationDescriptor);
+ em.merge(applicationDescriptor);
end();
}
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=1383484&r1=1383483&r2=1383484&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 Tue Sep 11 17:22:50 2012
@@ -150,7 +150,7 @@ public class ExperimentResource extends
experiment.setUser(user);
experiment.setGateway(gateway);
experiment.setSubmitted_date(submittedDate);
- em.persist(experiment);
+ em.merge(experiment);
end();
}
Modified: incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/GatewayResource.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/GatewayResource.java?rev=1383484&r1=1383483&r2=1383484&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/GatewayResource.java (original)
+++ incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/GatewayResource.java Tue Sep 11 17:22:50 2012
@@ -376,7 +376,7 @@ public class GatewayResource extends Abs
Gateway gateway = new Gateway();
gateway.setGateway_name(gatewayName);
gateway.setOwner(owner);
- em.persist(gateway);
+ em.merge(gateway);
end();
}
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=1383484&r1=1383483&r2=1383484&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 Tue Sep 11 17:22:50 2012
@@ -196,7 +196,7 @@ public class HostDescriptorResource exte
hostDescriptor.setGateway(gateway);
hostDescriptor.setHost_descriptor_xml(content);
hostDescriptor.setUser(user);
- em.persist(hostDescriptor);
+ em.merge(hostDescriptor);
end();
}
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=1383484&r1=1383483&r2=1383484&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 Tue Sep 11 17:22:50 2012
@@ -182,7 +182,7 @@ public class ProjectResource extends Abs
Users user = new Users();
user.setUser_name(worker.getUser());
project.setUsers(user);
- em.persist(project);
+ em.merge(project);
end();
}
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=1383484&r1=1383483&r2=1383484&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 Tue Sep 11 17:22:50 2012
@@ -220,7 +220,7 @@ public class PublishWorkflowResource ext
Users user = new Users();
user.setUser_name(createdUser);
publishedWorkflow.setUser(user);
- em.persist(gateway);
+ em.merge(gateway);
end();
}
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=1383484&r1=1383483&r2=1383484&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 Tue Sep 11 17:22:50 2012
@@ -139,7 +139,7 @@ public class ServiceDescriptorResource e
Users user = new Users();
user.setUser_name(userName);
serviceDescriptor.setUser(user);
- em.persist(serviceDescriptor);
+ em.merge(serviceDescriptor);
end();
}
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=1383484&r1=1383483&r2=1383484&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 Tue Sep 11 17:22:50 2012
@@ -115,7 +115,7 @@ public class UserResource extends Abstra
Users user = new Users();
user.setUser_name(userName);
user.setPassword(password);
- em.persist(user);
+ em.merge(user);
end();
}
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=1383484&r1=1383483&r2=1383484&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 Tue Sep 11 17:22:50 2012
@@ -131,7 +131,7 @@ public class UserWorkflowResource extend
user.setUser_name(worker.getUser());
userWorkflow.setUser(user);
userWorkflow.setPath(path);
- em.persist(userWorkflow);
+ em.merge(userWorkflow);
end();
}
Modified: incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/WorkerResource.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/WorkerResource.java?rev=1383484&r1=1383483&r2=1383484&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/WorkerResource.java (original)
+++ incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/WorkerResource.java Tue Sep 11 17:22:50 2012
@@ -224,7 +224,7 @@ public class WorkerResource extends Abst
gatewaymodel.setGateway_name(gateway.getGatewayName());
gatewaymodel.setOwner(gateway.getOwner());
gatewayWorker.setGateway(gatewaymodel);
- em.persist(gatewayWorker);
+ em.merge(gatewayWorker);
end();
}
Added: incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GatewayResourceTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GatewayResourceTest.java?rev=1383484&view=auto
==============================================================================
--- incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GatewayResourceTest.java (added)
+++ incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GatewayResourceTest.java Tue Sep 11 17:22:50 2012
@@ -0,0 +1,56 @@
+package org.apache.airavata.persistance.registry.jpa;
+
+import junit.framework.TestCase;
+import org.apache.airavata.persistance.registry.jpa.model.Project;
+import org.apache.airavata.persistance.registry.jpa.resources.GatewayResource;
+import org.apache.airavata.persistance.registry.jpa.resources.HostDescriptorResource;
+import org.apache.airavata.persistance.registry.jpa.resources.ProjectResource;
+import org.apache.airavata.persistance.registry.jpa.resources.WorkerResource;
+
+public class GatewayResourceTest extends TestCase {
+ private GatewayResource gatewayResource;
+
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+
+ gatewayResource = new GatewayResource();
+ gatewayResource.setGatewayName("default");
+ gatewayResource.setOwner("default");
+ }
+
+ public void testSave() throws Exception {
+
+ }
+
+ public void testCreate() throws Exception {
+ boolean result;
+ HostDescriptorResource hostDescriptorResource = (HostDescriptorResource)gatewayResource.create(ResourceType.HOST_DESCRIPTOR);
+ hostDescriptorResource.setHostDescName("Localhost");
+ hostDescriptorResource.setUserName("admin");
+ hostDescriptorResource.save();
+ result = gatewayResource.isExists(ResourceType.HOST_DESCRIPTOR, "Localhost");
+ assertTrue("The result doesn't exists", result == true);
+
+ ProjectResource projectResource = (ProjectResource)gatewayResource.create(ResourceType.PROJECT);
+ projectResource.setName("project1");
+ WorkerResource workerResource = new WorkerResource();
+ workerResource.setGateway(gatewayResource);
+ workerResource.setUser("admin");
+ projectResource.setWorker(workerResource);
+ projectResource.save();
+// result = workerResource.isProjectExists("project1");
+// assertTrue("The result doesn't exists", result == true);
+
+ }
+
+ public void testIsExists() throws Exception {
+ boolean result = gatewayResource.isExists(ResourceType.HOST_DESCRIPTOR, "Localhost");
+
+ assertTrue("The result doesn't exists", result == true);
+
+// result = gatewayResource.isExists(ResourceType.USER, "admin");
+//
+// assertTrue("The result exisits", result);
+ }
+}