Author: chathuri
Date: Thu Nov 29 21:54:51 2012
New Revision: 1415400
URL: http://svn.apache.org/viewvc?rev=1415400&view=rev
Log:
fixing build failure
Modified:
airavata/trunk/modules/distribution/src/main/resources/conf/airavata-server.properties
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/GFacConfiguration.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/PublishWorkflowResourceTest.java
airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/config/ConfigurationManager.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java
airavata/trunk/modules/xbaya-gui/src/main/resources/registry.properties
Modified:
airavata/trunk/modules/distribution/src/main/resources/conf/airavata-server.properties
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/src/main/resources/conf/airavata-server.properties?rev=1415400&r1=1415399&r2=1415400&view=diff
==============================================================================
---
airavata/trunk/modules/distribution/src/main/resources/conf/airavata-server.properties
(original)
+++
airavata/trunk/modules/distribution/src/main/resources/conf/airavata-server.properties
Thu Nov 29 21:54:51 2012
@@ -38,7 +38,7 @@ port=8080
# but some DHCP enables machines do not report correct ip addresses,
# in which case, the IP address can be manually specified.
-#ip=192.2.33.12
+#ip=192.2.33.12
###########################################################################
# Airavata Registry Configuration
@@ -46,7 +46,7 @@ port=8080
#registry.user=admin
#registry.password=admin
-#gateway.id=default
+gateway.id=default
#registry.jdbc.user=airavata
#registry.jdbc.password=airavata
#start.derby.server.mode=true
Modified:
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/GFacConfiguration.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/GFacConfiguration.java?rev=1415400&r1=1415399&r2=1415400&view=diff
==============================================================================
---
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/GFacConfiguration.java
(original)
+++
airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/context/GFacConfiguration.java
Thu Nov 29 21:54:51 2012
@@ -21,8 +21,6 @@
package org.apache.airavata.core.gfac.context;
import org.apache.airavata.client.api.AiravataAPI;
-import org.apache.airavata.registry.api.AiravataRegistry2;
-
public class GFacConfiguration {
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/PublishWorkflowResourceTest.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/PublishWorkflowResourceTest.java?rev=1415400&r1=1415399&r2=1415400&view=diff
==============================================================================
---
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/PublishWorkflowResourceTest.java
(original)
+++
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/PublishWorkflowResourceTest.java
Thu Nov 29 21:54:51 2012
@@ -37,7 +37,7 @@ public class PublishWorkflowResourceTest
super.setUp();
gatewayResource = super.getGatewayResource();
publishWorkflowResource =
gatewayResource.createPublishedWorkflow("workflow1");
- publishWorkflowResource.setCreatedUser("testUser");
+ publishWorkflowResource.setCreatedUser("admin");
publishWorkflowResource.setContent("testContent");
Calendar calender = Calendar.getInstance();
java.util.Date d = calender.getTime();
Modified:
airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/config/ConfigurationManager.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/config/ConfigurationManager.java?rev=1415400&r1=1415399&r2=1415400&view=diff
==============================================================================
---
airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/config/ConfigurationManager.java
(original)
+++
airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/config/ConfigurationManager.java
Thu Nov 29 21:54:51 2012
@@ -21,6 +21,7 @@
package org.apache.airavata.wsmg.commons.config;
+
import org.apache.airavata.common.exception.ServerSettingsException;
import org.apache.airavata.common.utils.ServerSettings;
Modified:
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java?rev=1415400&r1=1415399&r2=1415400&view=diff
==============================================================================
---
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java
(original)
+++
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java
Thu Nov 29 21:54:51 2012
@@ -85,14 +85,14 @@ import org.slf4j.LoggerFactory;
public class WorkflowInterpretorSkeleton implements ServiceLifeCycle {
private static final Logger log =
LoggerFactory.getLogger(WorkflowInterpretorSkeleton.class);
- public static final String PROXYSERVER = "myproxy.url";
+// public static final String PROXYSERVER = "myproxy.url";
public static final String MSGBOX = "msgbox";
public static final String GFAC = "gfac";
public static final String BROKER = "broker";
- public static final String MYPROXY_USER = "myproxy.username";
- public static final String MYPROXY_PASS = "myproxy.password";
- public static final String MYPROXY_SERVER = "myproxy.url";
- public static final String MYPROXY_LIFETIME = "myproxy.lifetime";
+ public static final String MYPROXY_USER = "myproxy.user";
+ public static final String MYPROXY_PASS = "myproxy.pass";
+ public static final String MYPROXY_SERVER = "myproxy.server";
+ public static final String MYPROXY_LIFETIME = "myproxy.life";
public static final String TRUSTED_CERT_LOCATION = "trusted.cert.location";
public static boolean provenance = false;
@@ -125,7 +125,7 @@ public class WorkflowInterpretorSkeleton
try {
systemUserName = ServerSettings.getSystemUser();
systemUserPW =
ServerSettings.getSystemUserPassword();
- gateway = ServerSettings.getDefaultGatewayId();
+ gateway = ServerSettings.getSystemUserGateway();
airavataAPI =
AiravataAPIFactory.getAPI(gateway, systemUserName);
} catch (ServerSettingsException e) {
log.error("Unable to read the properties file",
e);
@@ -242,7 +242,7 @@ public class WorkflowInterpretorSkeleton
String s = null;
try {
- s = setupAndLaunch(workflowAsString, topic,
+ s = setupAndLaunch(workflowAsString, topic,
ServerSettings.getDefaultGatewayId(),
user,inputs, configuration, runInThread,
workflowContextHeaderBuilder);
} catch (XMLStreamException e) {
log.error(e.getMessage());
@@ -254,6 +254,8 @@ public class WorkflowInterpretorSkeleton
log.error(e.getMessage());
} catch (AiravataAPIInvocationException e) {
log.error(e.getMessage());
+ } catch (ServerSettingsException e) {
+ log.error(e.getMessage());
}
return s;
}
@@ -296,7 +298,7 @@ public class WorkflowInterpretorSkeleton
return new WorkflowContextHeaderBuilder(parse.getContextHeader());
}
- private String setupAndLaunch(String workflowAsString, String topic,
String username,
+ private String setupAndLaunch(String workflowAsString, String topic,
String gatewayId, String username,
NameValue[]
inputs,Map<String,String>configurations,boolean
inNewThread,WorkflowContextHeaderBuilder builder) throws XMLStreamException,
MalformedURLException, RepositoryException, RegistryException,
AiravataAPIInvocationException {
System.err.println("Launch is called for topi:");
@@ -335,7 +337,7 @@ public class WorkflowInterpretorSkeleton
}
WorkflowInterpretorEventListener listener = null;
WorkflowInterpreter interpreter = null;
- AiravataAPI airavataAPI = AiravataAPIFactory.getAPI(gateway, username);
+ AiravataAPI airavataAPI = AiravataAPIFactory.getAPI(gatewayId,
username);
WorkflowInterpreterConfiguration
workflowInterpreterConfiguration = new
WorkflowInterpreterConfiguration(workflow,topic,conf.getMessageBoxURL(),
conf.getBrokerURL(), airavataAPI, conf, null, null);
workflowInterpreterConfiguration.setGfacEmbeddedMode(gfacEmbeddedMode);
workflowInterpreterConfiguration.setActOnProvenance(provenance);
@@ -406,7 +408,7 @@ public class WorkflowInterpretorSkeleton
configuration.setMyProxyPort(XBayaConstants.DEFAULT_MYPROXY_PORT);
//This null check will fix some test failures
if (WorkflowInterpretorSkeleton.configurationContext != null) {
- configuration.setMyProxyServer(findValue(vals, PROXYSERVER,
(String)
WorkflowInterpretorSkeleton.configurationContext.getProperty(MYPROXY_SERVER)));
+ configuration.setMyProxyServer(findValue(vals, MYPROXY_SERVER,
(String)
WorkflowInterpretorSkeleton.configurationContext.getProperty(MYPROXY_SERVER)));
configuration.setMyProxyPassphrase(findValue(vals, MYPROXY_PASS,
(String)
WorkflowInterpretorSkeleton.configurationContext.getProperty(MYPROXY_PASS)));
configuration.setMyProxyUsername(findValue(vals, MYPROXY_USER,
(String)
WorkflowInterpretorSkeleton.configurationContext.getProperty(MYPROXY_USER)));
configuration.setTrustedCertLocation(findValue(vals,
TRUSTED_CERT_LOCATION, (String)
WorkflowInterpretorSkeleton.configurationContext.getProperty(TRUSTED_CERT_LOCATION)));
Modified:
airavata/trunk/modules/xbaya-gui/src/main/resources/registry.properties
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/resources/registry.properties?rev=1415400&r1=1415399&r2=1415400&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/resources/registry.properties
(original)
+++ airavata/trunk/modules/xbaya-gui/src/main/resources/registry.properties Thu
Nov 29 21:54:51 2012
@@ -29,8 +29,8 @@
###---------------------------REGISTRY API
IMPLEMENTATION---------------------------###
+#class.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
class.registry.accessor=org.apache.airavata.rest.client.RegistryClient
-#class.registry.accessor=org.apache.airavata.rest.client.RegistryClient
###---------------------REGISTRY API IMPLEMENTATION - CUSTOM
SETTINGS----------------------###
@@ -45,5 +45,10 @@ registry.jdbc.user=airavata
registry.jdbc.password=airavata
start.derby.server.mode=true
+default.registry.user=admin
+default.registry.password=admin
+default.registry.gateway=default
+
#for rest [RegistryClient]
#registry.jdbc.url=http://localhost:9080/airavata-services
+
