Commit a2eca47e by Shwetha GS

ATLAS-1226 Servlet init-params in web.xml are unused (mneethiraj via shwethags)

parent 5b7945ee
...@@ -404,7 +404,6 @@ ...@@ -404,7 +404,6 @@
<slf4j.version>1.7.7</slf4j.version> <slf4j.version>1.7.7</slf4j.version>
<jetty.version>9.2.12.v20150709</jetty.version> <jetty.version>9.2.12.v20150709</jetty.version>
<jersey.version>1.19</jersey.version> <jersey.version>1.19</jersey.version>
<jackson.version>1.8.3</jackson.version>
<tinkerpop.version>2.6.0</tinkerpop.version> <tinkerpop.version>2.6.0</tinkerpop.version>
<titan.version>0.5.4</titan.version> <titan.version>0.5.4</titan.version>
<hadoop.version>2.7.1</hadoop.version> <hadoop.version>2.7.1</hadoop.version>
...@@ -852,13 +851,13 @@ ...@@ -852,13 +851,13 @@
<dependency> <dependency>
<groupId>org.codehaus.jackson</groupId> <groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId> <artifactId>jackson-core-asl</artifactId>
<version>${jackson.version}</version> <version>${codehaus.jackson.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.jackson</groupId> <groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId> <artifactId>jackson-mapper-asl</artifactId>
<version>${jackson.version}</version> <version>${codehaus.jackson.version}</version>
</dependency> </dependency>
<dependency> <dependency>
......
...@@ -9,6 +9,7 @@ ATLAS-1060 Add composite indexes for exact match performance improvements for al ...@@ -9,6 +9,7 @@ ATLAS-1060 Add composite indexes for exact match performance improvements for al
ATLAS-1127 Modify creation and modification timestamps to Date instead of Long(sumasai) ATLAS-1127 Modify creation and modification timestamps to Date instead of Long(sumasai)
ALL CHANGES: ALL CHANGES:
ATLAS-1226 Servlet init-params in web.xml are unused (mneethiraj via shwethags)
ATLAS-1224 Minor fixes for hive and falcon bridge twiki (ayubkhan via sumasai) ATLAS-1224 Minor fixes for hive and falcon bridge twiki (ayubkhan via sumasai)
ATLAS-1223 Type REST API v2 implementation (apoorvnaik via sumasai) ATLAS-1223 Type REST API v2 implementation (apoorvnaik via sumasai)
ATLAS-1210 patch file to add "position" attribute to hive_column type (sarath.kum4r@gmail.com via sumasai) ATLAS-1210 patch file to add "position" attribute to hive_column type (sarath.kum4r@gmail.com via sumasai)
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
package org.apache.atlas.web.listeners; package org.apache.atlas.web.listeners;
import java.util.Enumeration;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
...@@ -36,6 +37,7 @@ import org.apache.atlas.web.filters.ActiveServerFilter; ...@@ -36,6 +37,7 @@ import org.apache.atlas.web.filters.ActiveServerFilter;
import org.apache.atlas.web.filters.AuditFilter; import org.apache.atlas.web.filters.AuditFilter;
import org.apache.atlas.web.service.ActiveInstanceElectorModule; import org.apache.atlas.web.service.ActiveInstanceElectorModule;
import org.apache.atlas.web.service.ServiceModule; import org.apache.atlas.web.service.ServiceModule;
import org.apache.commons.collections.iterators.EnumerationIterator;
import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.Configuration;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
...@@ -93,13 +95,23 @@ public class GuiceServletConfig extends GuiceServletContextListener { ...@@ -93,13 +95,23 @@ public class GuiceServletConfig extends GuiceServletContextListener {
filter("/*").through(AuditFilter.class); filter("/*").through(AuditFilter.class);
configureActiveServerFilterIfNecessary(); configureActiveServerFilterIfNecessary();
String packages = getServletContext().getInitParameter(GUICE_CTX_PARAM); Map<String, String> initParams = new HashMap<>();
Enumeration<String> initParamNames = getServletContext().getInitParameterNames();
LOG.info("Jersey loading from packages: " + packages); while (initParamNames.hasMoreElements()) {
String initParamName = initParamNames.nextElement();
String initParamValue = getServletContext().getInitParameter(initParamName);
Map<String, String> params = new HashMap<>(); if (GUICE_CTX_PARAM.equals(initParamName)) {
params.put(PackagesResourceConfig.PROPERTY_PACKAGES, packages); LOG.info("Jersey loading from packages: " + initParamValue);
serve("/" + AtlasClient.BASE_URI + "*").with(GuiceContainer.class, params);
initParams.put(PackagesResourceConfig.PROPERTY_PACKAGES, initParamValue);
} else {
initParams.put(initParamName, initParamValue);
}
}
serve("/" + AtlasClient.BASE_URI + "*").with(GuiceContainer.class, initParams);
} }
private void configureActiveServerFilterIfNecessary() { private void configureActiveServerFilterIfNecessary() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment