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 2011/12/16 16:58:19 UTC
svn commit: r1215197 - in /incubator/airavata/trunk/modules:
gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/
gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/
xbaya-gui/src/main/java/org/apache/airavata/xbaya/...
Author: samindaw
Date: Fri Dec 16 15:58:19 2011
New Revision: 1215197
URL: http://svn.apache.org/viewvc?rev=1215197&view=rev
Log:
pop up message to clean previous workflow execution
retrieve myproxy settings from the messeagereceiver context
Modified:
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/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicWorkflowRunnerWindow.java
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=1215197&r1=1215196&r2=1215197&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 Fri Dec 16 15:58:19 2011
@@ -72,7 +72,10 @@ public class GFacService implements Serv
public static final String JCR_PASS = "jcr.pass";
public static final String ORG_APACHE_JACKRABBIT_REPOSITORY_URI = "org.apache.jackrabbit.repository.uri";
public static final String TRUSTED_CERT_LOCATION = "trusted.cert.location";
-
+ public static final String MYPROXY_SERVER = "myproxy.server";
+ public static final String MYPROXY_USER = "myproxy.user";
+ public static final String MYPROXY_PASS = "myproxy.pass";
+ public static final String MYPROXY_LIFE = "myproxy.life";
/*
* Heart beat thread
*/
@@ -123,6 +126,11 @@ public class GFacService implements Serv
context.setProperty(CONFIGURATION_CONTEXT_REGISTRY, registry);
context.setProperty(GFAC_URL, localAddress);
context.setProperty(TRUSTED_CERT_LOCATION,properties.getProperty(TRUSTED_CERT_LOCATION));
+ context.setProperty(MYPROXY_USER,properties.getProperty(MYPROXY_USER));
+ context.setProperty(MYPROXY_PASS,properties.getProperty(MYPROXY_PASS));
+ context.setProperty(MYPROXY_SERVER,properties.getProperty(MYPROXY_SERVER));
+ context.setProperty(MYPROXY_LIFE,properties.getProperty(MYPROXY_LIFE));
+
/*
* Heart beat message to registry
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=1215197&r1=1215196&r2=1215197&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 Fri Dec 16 15:58:19 2011
@@ -93,6 +93,11 @@ public class GFacMessageReciever impleme
private static final Logger log = LoggerFactory.getLogger(GFacMessageReciever.class);
public static final String TRUSTED_CERT_LOCATION = "trusted.cert.location";
+ public static final String MYPROXY_SERVER = "myproxy.server";
+ public static final String MYPROXY_USER = "myproxy.user";
+ public static final String MYPROXY_PASS = "myproxy.pass";
+ public static final String MYPROXY_LIFE = "myproxy.life";
+
private GenericService service;
private Axis2Registry registry;
@@ -189,11 +194,19 @@ public class GFacMessageReciever impleme
SecurityContextDocument.Factory.parse(getHeader(messageContext).getFirstChildWithName
(new QName("http://schemas.airavata.apache.org/workflow-execution-context", "security-context")).toStringWithConsume());
SecurityContextDocument.SecurityContext.GridMyproxyRepository gridMyproxyRepository = parse.getSecurityContext().getGridMyproxyRepository();
- gssContext.setMyproxyPasswd(gridMyproxyRepository.getPassword());
- gssContext.setMyproxyUserName(gridMyproxyRepository.getUsername());
- gssContext.setMyproxyLifetime(gridMyproxyRepository.getLifeTimeInhours());
- gssContext.setMyproxyServer(gridMyproxyRepository.getMyproxyServer());
+ if (gridMyproxyRepository==null){
+ gssContext.setMyproxyPasswd((String)messageContext.getConfigurationContext().getProperty(MYPROXY_PASS));
+ gssContext.setMyproxyUserName((String)messageContext.getConfigurationContext().getProperty(MYPROXY_USER));
+ gssContext.setMyproxyLifetime(Integer.parseInt(messageContext.getConfigurationContext().getProperty(MYPROXY_LIFE).toString()));
+ gssContext.setMyproxyServer((String)messageContext.getConfigurationContext().getProperty(MYPROXY_SERVER));
+ }else{
+ gssContext.setMyproxyPasswd(gridMyproxyRepository.getPassword());
+ gssContext.setMyproxyUserName(gridMyproxyRepository.getUsername());
+ gssContext.setMyproxyLifetime(gridMyproxyRepository.getLifeTimeInhours());
+ gssContext.setMyproxyServer(gridMyproxyRepository.getMyproxyServer());
+ }
gssContext.setTrustedCertLoc((String)messageContext.getConfigurationContext().getProperty(TRUSTED_CERT_LOCATION));
+
invocationContext.addSecurityContext("myproxy",gssContext);
/*
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicWorkflowRunnerWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicWorkflowRunnerWindow.java?rev=1215197&r1=1215196&r2=1215197&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicWorkflowRunnerWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicWorkflowRunnerWindow.java Fri Dec 16 15:58:19 2011
@@ -253,7 +253,7 @@ public class DynamicWorkflowRunnerWindow
buttonPanel.add(okButton);
buttonPanel.add(cancelButton);
- this.dialog = new XBayaDialog(this.engine, "Invoke workflow", mainPanel, buttonPanel);
+ this.dialog = new XBayaDialog(this.engine, "Invoke workflow", mainPanel, buttonPanel);
this.dialog.setDefaultButton(okButton);
}