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/11/26 16:51:09 UTC
svn commit: r1413688 - in /airavata/trunk/modules:
commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/subscription/
rest/service/src/main/java/org/apache/airavata/services/registry/rest/security/basic/
rest/service/src/t...
Author: lahiru
Date: Mon Nov 26 15:51:08 2012
New Revision: 1413688
URL: http://svn.apache.org/viewvc?rev=1413688&view=rev
Log:
Applying amilas patch for https://issues.apache.org/jira/browse/AIRAVATA-658.
Modified:
airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/subscription/LeadNotificationHandler.java
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/security/basic/BasicAccessAuthenticator.java
airavata/trunk/modules/rest/service/src/test/resources/testdb/test.h2.db
Modified: airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/subscription/LeadNotificationHandler.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/subscription/LeadNotificationHandler.java?rev=1413688&r1=1413687&r2=1413688&view=diff
==============================================================================
--- airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/subscription/LeadNotificationHandler.java (original)
+++ airavata/trunk/modules/commons/workflow-tracking/src/main/java/org/apache/airavata/workflow/tracking/impl/subscription/LeadNotificationHandler.java Mon Nov 26 15:51:08 2012
@@ -113,7 +113,7 @@ public class LeadNotificationHandler imp
try {
widgetTopicString = widgetTopicOMEl.toStringWithConsume();
} catch (XMLStreamException e) {
- // TODO add with throws
+ // TODO add with throws Ms
e.printStackTrace();
}
String[] topicSubstrings = widgetTopicString.split(":");
Modified: airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/security/basic/BasicAccessAuthenticator.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/security/basic/BasicAccessAuthenticator.java?rev=1413688&r1=1413687&r2=1413688&view=diff
==============================================================================
--- airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/security/basic/BasicAccessAuthenticator.java (original)
+++ airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/security/basic/BasicAccessAuthenticator.java Mon Nov 26 15:51:08 2012
@@ -20,6 +20,8 @@
package org.apache.airavata.services.registry.rest.security.basic;
+import org.apache.airavata.common.context.RequestContext;
+import org.apache.airavata.common.context.WorkflowContext;
import org.apache.airavata.security.AbstractAuthenticator;
import org.apache.airavata.security.AuthenticationException;
import org.apache.airavata.security.UserStoreException;
@@ -43,7 +45,7 @@ public class BasicAccessAuthenticator ex
* Header names
*/
private static final String AUTHORISATION_HEADER_NAME = "Authorization";
- private static final String USER_IN_SESSION = "userName";
+ public static final String USER_IN_SESSION = "userName";
public BasicAccessAuthenticator() {
super(AUTHENTICATOR_NAME);
@@ -115,6 +117,12 @@ public class BasicAccessAuthenticator ex
if (servletRequest.getSession() != null) {
servletRequest.getSession().setAttribute(USER_IN_SESSION, userName);
}
+
+ // Add user to context - TODO We may need to abstract out this
+ RequestContext requestContext = new RequestContext();
+ requestContext.setUserIdentity(userName);
+
+ WorkflowContext.set(requestContext);
}
@Override
Modified: airavata/trunk/modules/rest/service/src/test/resources/testdb/test.h2.db
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/test/resources/testdb/test.h2.db?rev=1413688&r1=1413687&r2=1413688&view=diff
==============================================================================
Binary files - no diff available.