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/21 20:09:57 UTC
svn commit: r1388594 - in
/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac:
FileBreedGramTest.java GramProviderMPIRangerTest.java
GramProviderPwscfRangerTest.java GramProviderTest.java
Author: samindaw
Date: Fri Sep 21 18:09:56 2012
New Revision: 1388594
URL: http://svn.apache.org/viewvc?rev=1388594&view=rev
Log:
fixing compilation errors
Modified:
airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/FileBreedGramTest.java
airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderMPIRangerTest.java
airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderPwscfRangerTest.java
airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderTest.java
Modified: airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/FileBreedGramTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/FileBreedGramTest.java?rev=1388594&r1=1388593&r2=1388594&view=diff
==============================================================================
--- airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/FileBreedGramTest.java (original)
+++ airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/FileBreedGramTest.java Fri Sep 21 18:09:56 2012
@@ -20,6 +20,15 @@
*/
package org.apache.airavata.test.suite.gfac;
+import static org.junit.Assert.fail;
+
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
import org.apache.airavata.commons.gfac.type.ActualParameter;
import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
import org.apache.airavata.commons.gfac.type.HostDescription;
@@ -30,23 +39,29 @@ import org.apache.airavata.core.gfac.con
import org.apache.airavata.core.gfac.context.security.impl.GSISecurityContext;
import org.apache.airavata.core.gfac.notification.impl.LoggingNotification;
import org.apache.airavata.core.gfac.services.impl.PropertiesBasedServiceImpl;
-import org.apache.airavata.registry.api.impl.AiravataJCRRegistry;
-import org.apache.airavata.schemas.gfac.*;
+import org.apache.airavata.registry.api.AiravataRegistry2;
+import org.apache.airavata.registry.api.AiravataRegistryFactory;
+import org.apache.airavata.registry.api.AiravataUser;
+import org.apache.airavata.registry.api.Gateway;
+import org.apache.airavata.schemas.gfac.ApplicationDeploymentDescriptionType;
+import org.apache.airavata.schemas.gfac.DataType;
+import org.apache.airavata.schemas.gfac.GlobusHostType;
+import org.apache.airavata.schemas.gfac.GramApplicationDeploymentType;
+import org.apache.airavata.schemas.gfac.InputParameterType;
+import org.apache.airavata.schemas.gfac.OutputParameterType;
+import org.apache.airavata.schemas.gfac.ParameterType;
+import org.apache.airavata.schemas.gfac.ProjectAccountType;
+import org.apache.airavata.schemas.gfac.QueueType;
+import org.apache.airavata.schemas.gfac.URIParameterType;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import java.net.URI;
-import java.net.URL;
-import java.util.*;
-
-import static org.junit.Assert.fail;
-
public class FileBreedGramTest {
public static final String MYPROXY = "myproxy";
public static final String GRAM_PROPERTIES = "gram.properties";
- private AiravataJCRRegistry jcrRegistry = null;
+ private AiravataRegistry2 jcrRegistry = null;
@Before
public void setUp() throws Exception {
@@ -57,9 +72,9 @@ public class FileBreedGramTest {
Map<String,String> config = new HashMap<String,String>();
- jcrRegistry = new AiravataJCRRegistry(null,
- "org.apache.jackrabbit.core.RepositoryFactoryImpl", "admin",
- "admin", config); config.put("org.apache.jackrabbit.repository.home","target");
+ jcrRegistry = AiravataRegistryFactory.getRegistry(new Gateway("default"), new AiravataUser("admin"));
+ config.put("org.apache.jackrabbit.repository.home","target");
+
/*
* Host Description Document
*/
@@ -123,10 +138,10 @@ public class FileBreedGramTest {
/*
* Save deployment descriptions to registry
*/
- jcrRegistry.saveHostDescription(host);
- jcrRegistry.saveDeploymentDescription(serv.getType().getName(), host.getType().getHostName(), appDesc);
- jcrRegistry.saveServiceDescription(serv);
- jcrRegistry.deployServiceOnHost(serv.getType().getName(), host.getType().getHostName());
+ jcrRegistry.addHostDescriptor(host);
+ jcrRegistry.addApplicationDescriptor(serv.getType().getName(), host.getType().getHostName(), appDesc);
+ jcrRegistry.addServiceDescriptor(serv);
+// jcrRegistry.deployServiceOnHost(serv.getType().getName(), host.getType().getHostName());
}
@Test
Modified: airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderMPIRangerTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderMPIRangerTest.java?rev=1388594&r1=1388593&r2=1388594&view=diff
==============================================================================
--- airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderMPIRangerTest.java (original)
+++ airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderMPIRangerTest.java Fri Sep 21 18:09:56 2012
@@ -20,6 +20,15 @@
*/
package org.apache.airavata.test.suite.gfac;
+import static org.junit.Assert.fail;
+
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
import org.apache.airavata.commons.gfac.type.ActualParameter;
import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
import org.apache.airavata.commons.gfac.type.HostDescription;
@@ -30,31 +39,36 @@ import org.apache.airavata.core.gfac.con
import org.apache.airavata.core.gfac.context.security.impl.GSISecurityContext;
import org.apache.airavata.core.gfac.notification.impl.LoggingNotification;
import org.apache.airavata.core.gfac.services.impl.PropertiesBasedServiceImpl;
-import org.apache.airavata.registry.api.impl.AiravataJCRRegistry;
-import org.apache.airavata.schemas.gfac.*;
+import org.apache.airavata.registry.api.AiravataRegistry2;
+import org.apache.airavata.registry.api.AiravataRegistryFactory;
+import org.apache.airavata.registry.api.AiravataUser;
+import org.apache.airavata.registry.api.Gateway;
+import org.apache.airavata.schemas.gfac.ApplicationDeploymentDescriptionType;
+import org.apache.airavata.schemas.gfac.GlobusHostType;
+import org.apache.airavata.schemas.gfac.GramApplicationDeploymentType;
+import org.apache.airavata.schemas.gfac.InputParameterType;
+import org.apache.airavata.schemas.gfac.JobTypeType;
+import org.apache.airavata.schemas.gfac.OutputParameterType;
+import org.apache.airavata.schemas.gfac.ParameterType;
+import org.apache.airavata.schemas.gfac.ProjectAccountType;
+import org.apache.airavata.schemas.gfac.StringParameterType;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import java.net.URL;
-import java.util.*;
-
-import static org.junit.Assert.fail;
-
public class GramProviderMPIRangerTest {
public static final String MYPROXY = "myproxy";
public static final String GRAM_PROPERTIES = "gram-ranger.properties";
- private AiravataJCRRegistry jcrRegistry = null;
+ private AiravataRegistry2 jcrRegistry = null;
@Before
public void setUp() throws Exception {
Map<String,String> config = new HashMap<String,String>();
config.put("org.apache.jackrabbit.repository.home","target");
- jcrRegistry = new AiravataJCRRegistry(null,
- "org.apache.jackrabbit.core.RepositoryFactoryImpl", "admin",
- "admin", config);
+ jcrRegistry = AiravataRegistryFactory.getRegistry(new Gateway("default"), new AiravataUser("admin"));
+
// Host
URL url = this.getClass().getClassLoader().getResource(GRAM_PROPERTIES);
@@ -105,10 +119,10 @@ public class GramProviderMPIRangerTest {
serv.getType().setOutputParametersArray(outputParamList);
/* Save to Registry */
- jcrRegistry.saveHostDescription(host);
- jcrRegistry.saveDeploymentDescription(serv.getType().getName(), host.getType().getHostName(), appDesc);
- jcrRegistry.saveServiceDescription(serv);
- jcrRegistry.deployServiceOnHost(serv.getType().getName(), host.getType().getHostName());
+ jcrRegistry.addHostDescriptor(host);
+ jcrRegistry.addApplicationDescriptor(serv.getType().getName(), host.getType().getHostName(), appDesc);
+ jcrRegistry.addServiceDescriptor(serv);
+// jcrRegistry.deployServiceOnHost(serv.getType().getName(), host.getType().getHostName());
}
@Test
Modified: airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderPwscfRangerTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderPwscfRangerTest.java?rev=1388594&r1=1388593&r2=1388594&view=diff
==============================================================================
--- airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderPwscfRangerTest.java (original)
+++ airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderPwscfRangerTest.java Fri Sep 21 18:09:56 2012
@@ -21,6 +21,15 @@
package org.apache.airavata.test.suite.gfac;
+import static org.junit.Assert.fail;
+
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
import org.apache.airavata.commons.gfac.type.ActualParameter;
import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
import org.apache.airavata.commons.gfac.type.HostDescription;
@@ -31,30 +40,34 @@ import org.apache.airavata.core.gfac.con
import org.apache.airavata.core.gfac.context.security.impl.GSISecurityContext;
import org.apache.airavata.core.gfac.notification.impl.LoggingNotification;
import org.apache.airavata.core.gfac.services.impl.PropertiesBasedServiceImpl;
-import org.apache.airavata.registry.api.impl.AiravataJCRRegistry;
-import org.apache.airavata.schemas.gfac.*;
-import org.junit.Assert;
+import org.apache.airavata.registry.api.AiravataRegistry2;
+import org.apache.airavata.registry.api.AiravataRegistryFactory;
+import org.apache.airavata.registry.api.AiravataUser;
+import org.apache.airavata.registry.api.Gateway;
+import org.apache.airavata.schemas.gfac.ApplicationDeploymentDescriptionType;
+import org.apache.airavata.schemas.gfac.GlobusHostType;
+import org.apache.airavata.schemas.gfac.GramApplicationDeploymentType;
+import org.apache.airavata.schemas.gfac.InputParameterType;
+import org.apache.airavata.schemas.gfac.JobTypeType;
+import org.apache.airavata.schemas.gfac.OutputParameterType;
+import org.apache.airavata.schemas.gfac.ParameterType;
+import org.apache.airavata.schemas.gfac.ProjectAccountType;
+import org.apache.airavata.schemas.gfac.StringParameterType;
import org.junit.Before;
import org.junit.Test;
-import java.net.URL;
-import java.util.*;
-
-import static org.junit.Assert.fail;
-
public class GramProviderPwscfRangerTest {
public static final String MYPROXY = "myproxy";
public static final String GRAM_PROPERTIES = "gram-ranger.properties";
- private AiravataJCRRegistry jcrRegistry = null;
+ private AiravataRegistry2 jcrRegistry = null;
@Before
public void setUp() throws Exception {
Map<String,String> config = new HashMap<String,String>();
config.put("org.apache.jackrabbit.repository.home","target");
- jcrRegistry = new AiravataJCRRegistry(null,
- "org.apache.jackrabbit.core.RepositoryFactoryImpl", "admin",
- "admin", config);
+ jcrRegistry = AiravataRegistryFactory.getRegistry(new Gateway("default"), new AiravataUser("admin"));
+
// Host
URL url = this.getClass().getClassLoader().getResource(GRAM_PROPERTIES);
@@ -105,10 +118,10 @@ public class GramProviderPwscfRangerTest
serv.getType().setOutputParametersArray(outputParamList);
/* Save to Registry */
- jcrRegistry.saveHostDescription(host);
- jcrRegistry.saveDeploymentDescription(serv.getType().getName(), host.getType().getHostName(), appDesc);
- jcrRegistry.saveServiceDescription(serv);
- jcrRegistry.deployServiceOnHost(serv.getType().getName(), host.getType().getHostName());
+ jcrRegistry.addHostDescriptor(host);
+ jcrRegistry.addApplicationDescriptor(serv.getType().getName(), host.getType().getHostName(), appDesc);
+ jcrRegistry.addServiceDescriptor(serv);
+// jcrRegistry.deployServiceOnHost(serv.getType().getName(), host.getType().getHostName());
}
@Test
Modified: airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderTest.java?rev=1388594&r1=1388593&r2=1388594&view=diff
==============================================================================
--- airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderTest.java (original)
+++ airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderTest.java Fri Sep 21 18:09:56 2012
@@ -20,6 +20,15 @@
*/
package org.apache.airavata.test.suite.gfac;
+import static org.junit.Assert.fail;
+
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
import org.apache.airavata.commons.gfac.type.ActualParameter;
import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
import org.apache.airavata.commons.gfac.type.HostDescription;
@@ -30,22 +39,28 @@ import org.apache.airavata.core.gfac.con
import org.apache.airavata.core.gfac.context.security.impl.GSISecurityContext;
import org.apache.airavata.core.gfac.notification.impl.LoggingNotification;
import org.apache.airavata.core.gfac.services.impl.PropertiesBasedServiceImpl;
-import org.apache.airavata.registry.api.impl.AiravataJCRRegistry;
-import org.apache.airavata.schemas.gfac.*;
+import org.apache.airavata.registry.api.AiravataRegistry2;
+import org.apache.airavata.registry.api.AiravataRegistryFactory;
+import org.apache.airavata.registry.api.AiravataUser;
+import org.apache.airavata.registry.api.Gateway;
+import org.apache.airavata.schemas.gfac.ApplicationDeploymentDescriptionType;
+import org.apache.airavata.schemas.gfac.GlobusHostType;
+import org.apache.airavata.schemas.gfac.GramApplicationDeploymentType;
+import org.apache.airavata.schemas.gfac.InputParameterType;
+import org.apache.airavata.schemas.gfac.OutputParameterType;
+import org.apache.airavata.schemas.gfac.ParameterType;
+import org.apache.airavata.schemas.gfac.ProjectAccountType;
+import org.apache.airavata.schemas.gfac.QueueType;
+import org.apache.airavata.schemas.gfac.StringParameterType;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import java.net.URL;
-import java.util.*;
-
-import static org.junit.Assert.fail;
-
public class GramProviderTest {
public static final String MYPROXY = "myproxy";
public static final String GRAM_PROPERTIES = "gram.properties";
- private AiravataJCRRegistry jcrRegistry = null;
+ private AiravataRegistry2 jcrRegistry = null;
@Before
public void setUp() throws Exception {
@@ -55,9 +70,8 @@ public class GramProviderTest {
Map<String,String> config = new HashMap<String,String>();
config.put("org.apache.jackrabbit.repository.home","target");
- jcrRegistry = new AiravataJCRRegistry(null,
- "org.apache.jackrabbit.core.RepositoryFactoryImpl", "admin",
- "admin", config);
+ jcrRegistry = AiravataRegistryFactory.getRegistry(new Gateway("default"), new AiravataUser("admin"));
+
/*
* Host
@@ -119,10 +133,10 @@ public class GramProviderTest {
/*
* Save to registry
*/
- jcrRegistry.saveHostDescription(host);
- jcrRegistry.saveDeploymentDescription(serv.getType().getName(), host.getType().getHostName(), appDesc);
- jcrRegistry.saveServiceDescription(serv);
- jcrRegistry.deployServiceOnHost(serv.getType().getName(), host.getType().getHostName());
+ jcrRegistry.addHostDescriptor(host);
+ jcrRegistry.addApplicationDescriptor(serv.getType().getName(), host.getType().getHostName(), appDesc);
+ jcrRegistry.addServiceDescriptor(serv);
+// jcrRegistry.deployServiceOnHost(serv.getType().getName(), host.getType().getHostName());
}
@Test