You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2012/12/05 20:42:19 UTC
svn commit: r1417607 - in /airavata/trunk: ./
modules/commons/utils/src/main/java/org/apache/airavata/common/utils/
modules/distribution/airavata-server/
modules/distribution/airavata-server/src/main/assembly/
modules/rest/mappings/src/main/java/org/ap...
Author: chathuri
Date: Wed Dec 5 19:42:18 2012
New Revision: 1417607
URL: http://svn.apache.org/viewvc?rev=1417607&view=rev
Log:
adding constants
Added:
airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/Constants.java
Modified:
airavata/trunk/modules/distribution/airavata-server/pom.xml
airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/RegPoolUtils.java
airavata/trunk/pom.xml
Added: airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/Constants.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/Constants.java?rev=1417607&view=auto
==============================================================================
--- airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/Constants.java (added)
+++ airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/Constants.java Wed Dec 5 19:42:18 2012
@@ -0,0 +1,10 @@
+package org.apache.airavata.common.utils;
+
+/**
+ * Constants used in Airavata should go here.
+ */
+public final class Constants {
+
+ public static final String USER_IN_SESSION = "userName";
+ public static final String GATEWAY_NAME = "gateway_id";
+}
Modified: airavata/trunk/modules/distribution/airavata-server/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-server/pom.xml?rev=1417607&r1=1417606&r2=1417607&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/airavata-server/pom.xml (original)
+++ airavata/trunk/modules/distribution/airavata-server/pom.xml Wed Dec 5 19:42:18 2012
@@ -486,6 +486,11 @@
<artifactId>jackson-core-asl</artifactId>
<version>1.9.2</version>
</dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.9.1</version>
+ </dependency>
</dependencies>
<properties>
<jersey.version>1.13</jersey.version>
Modified: airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml?rev=1417607&r1=1417606&r2=1417607&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml (original)
+++ airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml Wed Dec 5 19:42:18 2012
@@ -45,6 +45,7 @@
<excludes>
<exclude>commons-logging*.jar</exclude>
<exclude>xom*.jar</exclude>
+ <exclude>xercesImpl</exclude>
</excludes>
</fileSet>
<fileSet>
@@ -279,6 +280,7 @@
<include>org.codehaus.jackson:jackson-core-asl</include>
<include>org.codehaus.jackson:jackson-mapper-asl</include>
<include>org.codehaus.jackson:jackson-xc</include>
+ <include>xerces:xercesImpl:jar:2.9.1</include>
</includes>
</dependencySet>
<dependencySet>
Modified: airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/RegPoolUtils.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/RegPoolUtils.java?rev=1417607&r1=1417606&r2=1417607&view=diff
==============================================================================
--- airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/RegPoolUtils.java (original)
+++ airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/utils/RegPoolUtils.java Wed Dec 5 19:42:18 2012
@@ -21,7 +21,6 @@
package org.apache.airavata.rest.mappings.utils;
-import org.apache.airavata.common.context.RequestContext;
import org.apache.airavata.common.context.WorkflowContext;
import org.apache.airavata.common.exception.AiravataConfigurationException;
import org.apache.airavata.registry.api.AiravataRegistry2;
@@ -34,7 +33,6 @@ import org.apache.airavata.registry.api.
import org.apache.airavata.registry.api.exception.RegistryAccessorUndefinedException;
import javax.servlet.ServletContext;
-import javax.ws.rs.core.Context;
import java.util.Map;
@@ -42,12 +40,9 @@ public class RegPoolUtils {
public static AiravataRegistry2 acquireRegistry(ServletContext context) {
AiravataRegistry2 airavataRegistry=null;
- RequestContext requestContext = WorkflowContext.get();
- String user = (String)context.getAttribute(RestServicesConstants.AIRAVATA_USER);
- if(requestContext != null){
- user = requestContext.getUserIdentity();
- }
- Gateway gateway = (Gateway)context.getAttribute(RestServicesConstants.GATEWAY);
+ String user = WorkflowContext.getRequestUser();
+ String gatewayId = WorkflowContext.getGatewayId();
+ Gateway gateway = new Gateway(gatewayId);
AiravataUser airavataUser = new AiravataUser(user);
RegistryInstancesPool registryInstancesPool =
Modified: airavata/trunk/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/pom.xml?rev=1417607&r1=1417606&r2=1417607&view=diff
==============================================================================
--- airavata/trunk/pom.xml (original)
+++ airavata/trunk/pom.xml Wed Dec 5 19:42:18 2012
@@ -597,8 +597,8 @@
<module>samples/simple-math-service</module>
<module>samples/complex-math-service</module>
<module>samples/levenshtein-distance-service</module>
- <module>modules/server</module>
- <module>modules/distribution</module>
+ <module>modules/server</module>
+ <!--module>modules/distribution</module-->
<module>modules/test-suite</module>
</modules>
</profile>