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/04/10 21:16:49 UTC
svn commit: r1311936 - in /incubator/airavata/trunk/modules:
airavata-client/ airavata-client/src/test/ airavata-client/src/test/java/
airavata-client/src/test/java/org/ airavata-client/src/test/java/org/apache/
airavata-client/src/test/java/org/apache...
Author: lahiru
Date: Tue Apr 10 19:16:48 2012
New Revision: 1311936
URL: http://svn.apache.org/viewvc?rev=1311936&view=rev
Log:
fixing errors during startup.
Added:
incubator/airavata/trunk/modules/airavata-client/src/test/
incubator/airavata/trunk/modules/airavata-client/src/test/java/
incubator/airavata/trunk/modules/airavata-client/src/test/java/org/
incubator/airavata/trunk/modules/airavata-client/src/test/java/org/apache/
incubator/airavata/trunk/modules/airavata-client/src/test/java/org/apache/airavata/
incubator/airavata/trunk/modules/airavata-client/src/test/java/org/apache/airavata/client/
incubator/airavata/trunk/modules/airavata-client/src/test/java/org/apache/airavata/client/airavata/
incubator/airavata/trunk/modules/airavata-client/src/test/java/org/apache/airavata/client/airavata/AiravataClientTest.java
Modified:
incubator/airavata/trunk/modules/airavata-client/pom.xml
incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/GFacService.java
incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java
incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/GfacAPI.java
incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/GFacConfiguration.java
incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/JobContext.java
incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderTest.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java
Modified: incubator/airavata/trunk/modules/airavata-client/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/airavata-client/pom.xml?rev=1311936&r1=1311935&r2=1311936&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/airavata-client/pom.xml (original)
+++ incubator/airavata/trunk/modules/airavata-client/pom.xml Tue Apr 10 19:16:48 2012
@@ -31,8 +31,7 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-codegen</artifactId>
- <version>${axis2.version}</version>
- </dependency>
+ <version>${axis2.version}</version> </dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-adb-codegen</artifactId>
@@ -48,7 +47,7 @@
<build>
<plugins>
- <plugin>
+ <!--plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.3</version>
@@ -73,7 +72,7 @@
</configuration>
</execution>
</executions>
- </plugin>
+ </plugin-->
<!-- Set working directory to test-class directory -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Added: incubator/airavata/trunk/modules/airavata-client/src/test/java/org/apache/airavata/client/airavata/AiravataClientTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/airavata-client/src/test/java/org/apache/airavata/client/airavata/AiravataClientTest.java?rev=1311936&view=auto
==============================================================================
--- incubator/airavata/trunk/modules/airavata-client/src/test/java/org/apache/airavata/client/airavata/AiravataClientTest.java (added)
+++ incubator/airavata/trunk/modules/airavata-client/src/test/java/org/apache/airavata/client/airavata/AiravataClientTest.java Tue Apr 10 19:16:48 2012
@@ -0,0 +1,55 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+*/
+package org.apache.airavata.client.airavata;
+
+import org.apache.airavata.common.registry.api.exception.RegistryException;
+import org.apache.airavata.xbaya.clients.XBayaClient;
+import org.apache.airavata.xbaya.interpretor.NameValue;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.util.Calendar;
+import java.util.List;
+import java.util.UUID;
+
+public class AiravataClientTest {
+
+ @Test
+ public void testInvokeWorkflowString() {
+// try {
+// AiravataClient airavataClient = new AiravataClient("xbaya.properties");
+// List<String> workflowTemplateIds = airavataClient.getWorkflowTemplateIds();
+// for(String eachId:workflowTemplateIds){
+// List<WorkflowInput> workflowInputs = airavataClient.getWorkflowInputs(eachId);
+// for(WorkflowInput input:workflowInputs){
+// input.setValue("testing");
+// }
+// System.out.println(airavataClient.runWorkflow(eachId,workflowInputs));
+// }
+// } catch (RegistryException e1) {
+// e1.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+// } catch (IOException e1) {
+// e1.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+// } catch (Exception e) {
+// e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+// }
+ }
+}
Modified: incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/GFacService.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/GFacService.java?rev=1311936&r1=1311935&r2=1311936&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/GFacService.java (original)
+++ incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/GFacService.java Tue Apr 10 19:16:48 2012
@@ -141,9 +141,9 @@ public class GFacService implements Serv
+ context.getServicePath() + "/"
+ WSConstants.GFAC_SERVICE_NAME;
log.debug("GFAC_ADDRESS:" + localAddress);
-
+ context.setProperty(GFAC_URL,localAddress);
GFacConfiguration gfacConfig = new GFacConfiguration(properties.getProperty(MYPROXY_SERVER),properties.getProperty(MYPROXY_USER),
- properties.getProperty(MYPROXY_PASS),Integer.parseInt(properties.getProperty(MYPROXY_LIFE)),localAddress,registry,properties.getProperty(TRUSTED_CERT_LOCATION));
+ properties.getProperty(MYPROXY_PASS),Integer.parseInt(properties.getProperty(MYPROXY_LIFE)),registry,properties.getProperty(TRUSTED_CERT_LOCATION));
context.setProperty(GFAC_CONFIGURATION,
gfacConfig);
/*
@@ -159,7 +159,7 @@ public class GFacService implements Serv
}
public void shutDown(ConfigurationContext configctx, AxisService service) {
- AiravataRegistry registry = (AiravataJCRRegistry) configctx.getProperty(CONFIGURATION_CONTEXT_REGISTRY);
+ AiravataRegistry registry = ((GFacConfiguration)configctx.getProperty(GFAC_CONFIGURATION)).getRegistry();
String gfacURL = (String) configctx.getProperty(GFAC_URL);
try {
registry.deleteGFacDescriptor(gfacURL);
@@ -185,7 +185,7 @@ public class GFacService implements Serv
try {
while (true) {
try {
- AiravataRegistry registry = (AiravataRegistry) this.context.getProperty(CONFIGURATION_CONTEXT_REGISTRY);
+ AiravataRegistry registry = ((GFacConfiguration)context.getProperty(GFAC_CONFIGURATION)).getRegistry();
String localAddress = (String) this.context.getProperty(GFAC_URL);
registry.saveGFacDescriptor(localAddress);
log.info("Updated the GFac URL in to Repository");
Modified: incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java?rev=1311936&r1=1311935&r2=1311936&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java (original)
+++ incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java Tue Apr 10 19:16:48 2012
@@ -180,7 +180,7 @@ public class GFacMessageReciever impleme
actualParameters.put(parameter, GfacUtils.getInputActualParameter(parameter, element));
}
DefaultInvocationContext invocationContext = null;
- JobContext jobContext = new JobContext(actualParameters,topic,serviceName);
+ JobContext jobContext = new JobContext(actualParameters,topic,serviceName,brokerURL);
if(document.getContextHeader().getSecurityContext().getAmazonWebservices() != null){
// invocationContext.getExecutionContext().setSecurityContextHeader(header);
//todo if there's amazoneWebServices context we need to set that value, this will refer in EC2Provider
Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/GfacAPI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/GfacAPI.java?rev=1311936&r1=1311935&r2=1311936&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/GfacAPI.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/GfacAPI.java Tue Apr 10 19:16:48 2012
@@ -47,7 +47,7 @@ public class GfacAPI {
public static final String REPOSITORY_PROPERTIES = "repository.properties";
public DefaultInvocationContext gridJobSubmit(JobContext jobContext,GFacConfiguration gfacConfig) throws Exception {
- WorkflowTrackingNotification workflowNotification = new WorkflowTrackingNotification(gfacConfig.getBrokerURL(), jobContext.getTopic());
+ WorkflowTrackingNotification workflowNotification = new WorkflowTrackingNotification(jobContext.getBrokerURL(), jobContext.getTopic());
LoggingNotification loggingNotification = new LoggingNotification();
DefaultInvocationContext invocationContext = new DefaultInvocationContext();
invocationContext.setExecutionContext(new DefaultExecutionContext());
Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/GFacConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/GFacConfiguration.java?rev=1311936&r1=1311935&r2=1311936&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/GFacConfiguration.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/GFacConfiguration.java Tue Apr 10 19:16:48 2012
@@ -33,18 +33,16 @@ public class GFacConfiguration {
private int myProxyLifeCycle;
- private String brokerURL;
private AiravataRegistry registry;
private String trustedCertLocation;
- public GFacConfiguration(String myProxyServer, String myProxyUser, String myProxyPassphrase, int myProxyLifeCycle, String brokerURL, AiravataRegistry axis2Registry, String trustedCertLocation) {
+ public GFacConfiguration(String myProxyServer, String myProxyUser, String myProxyPassphrase, int myProxyLifeCycle, AiravataRegistry axis2Registry, String trustedCertLocation) {
this.myProxyServer = myProxyServer;
this.myProxyUser = myProxyUser;
this.myProxyPassphrase = myProxyPassphrase;
this.myProxyLifeCycle = myProxyLifeCycle;
- this.brokerURL = brokerURL;
this.registry = axis2Registry;
this.trustedCertLocation = trustedCertLocation;
}
@@ -65,10 +63,6 @@ public class GFacConfiguration {
return myProxyLifeCycle;
}
- public String getBrokerURL() {
- return brokerURL;
- }
-
public AiravataRegistry getRegistry() {
return registry;
}
Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/JobContext.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/JobContext.java?rev=1311936&r1=1311935&r2=1311936&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/JobContext.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/JobContext.java Tue Apr 10 19:16:48 2012
@@ -34,10 +34,13 @@ public class JobContext {
private String serviceName;
- public JobContext(Map<Parameter, ActualParameter> parameters, String topic, String serviceName) {
+ private String brokerURL;
+
+ public JobContext(Map<Parameter, ActualParameter> parameters, String topic, String serviceName,String brokerURL) {
this.parameters = parameters;
this.topic = topic;
this.serviceName = serviceName;
+ this.brokerURL = brokerURL;
}
public Map<Parameter, ActualParameter> getParameters() {
@@ -51,4 +54,12 @@ public class JobContext {
public String getServiceName() {
return serviceName;
}
+
+ public String getBrokerURL() {
+ return brokerURL;
+ }
+
+ public void setBrokerURL(String brokerURL) {
+ this.brokerURL = brokerURL;
+ }
}
Modified: incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderTest.java?rev=1311936&r1=1311935&r2=1311936&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderTest.java (original)
+++ incubator/airavata/trunk/modules/test-suite/src/test/java/org/apache/airavata/test/suite/gfac/GramProviderTest.java Tue Apr 10 19:16:48 2012
@@ -88,7 +88,8 @@ public class GramProviderTest {
app.setCpuCount(1);
ProjectAccountType projectAccountType = ((GramApplicationDeploymentType) appDesc.getType()).addNewProjectAccount();
projectAccountType.setProjectAccountNumber(properties.getProperty("project.name"));
-
+ QueueType queueType = app.addNewQueue();
+ queueType.setQueueName("development");
/*
* Service
*/
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java?rev=1311936&r1=1311935&r2=1311936&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java Tue Apr 10 19:16:48 2012
@@ -263,11 +263,12 @@ public class EmbeddedGFacInvoker impleme
@SuppressWarnings("boxing")
public Boolean call() {
try {
- JobContext jobContext = new JobContext(actualParameters,EmbeddedGFacInvoker.this.topic,EmbeddedGFacInvoker.this.serviceName);
+ JobContext jobContext = new JobContext(actualParameters,EmbeddedGFacInvoker.this.topic,
+ EmbeddedGFacInvoker.this.serviceName,EmbeddedGFacInvoker.this.gfacURL);
GFacConfiguration gFacConfiguration = new GFacConfiguration(EmbeddedGFacInvoker.this.configuration.getMyProxyServer(),
EmbeddedGFacInvoker.this.configuration.getMyProxyUsername(),
EmbeddedGFacInvoker.this.configuration.getMyProxyPassphrase(),EmbeddedGFacInvoker.this.configuration.getMyProxyLifetime(),
- EmbeddedGFacInvoker.this.gfacURL, EmbeddedGFacInvoker.this.registry, EmbeddedGFacInvoker.this.configuration.getTrustedCertLocation());
+ EmbeddedGFacInvoker.this.registry, EmbeddedGFacInvoker.this.configuration.getTrustedCertLocation());
GfacAPI gfacAPI1 = new GfacAPI();
InvocationContext defaultInvocationContext = gfacAPI1.gridJobSubmit(jobContext, gFacConfiguration);