ATLAS-1154 Errors in Eclipse with web.xml (davidrad via dkantor) (cherry picked from commit 4b2e6ba9e81bc5d1c1c2e12d1a6bedb27bdf2f0e)
Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/120e4b97 Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/120e4b97 Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/120e4b97 Branch: refs/heads/0.7-incubating Commit: 120e4b975d18b27de482603e6e7eaa0b85fe53d1 Parents: edfa009 Author: Dave Kantor <[email protected]> Authored: Wed Sep 7 02:53:56 2016 +0100 Committer: Madhan Neethiraj <[email protected]> Committed: Thu Dec 22 15:27:47 2016 -0800 ---------------------------------------------------------------------- release-log.txt | 3 ++- webapp/src/main/webapp/WEB-INF/web.xml | 14 +++++++------- webapp/src/test/webapp/WEB-INF/web.xml | 12 ++++++------ 3 files changed, 15 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/120e4b97/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index bb43cc5..ea4ce9b 100644 --- a/release-log.txt +++ b/release-log.txt @@ -4,7 +4,7 @@ Apache Atlas Release Notes --Release 0.7-incubating INCOMPATIBLE CHANGES: ATLAS-674 Falcon Hook should use timestamps instead of long(ayubkhan via sumasai) -ATLAS-675 Storm Hook should use timetsamps as Date type instead of Long (ayubkhan via sumasai) +ATLAS-675 Storm Hook should use timestamps as Date type instead of Long (ayubkhan via sumasai) ATLAS-1122 Change trait edge labels to have trait name alone (sumasai) ATLAS-1060 Add composite indexes for exact match performance improvements for all attributes (sumasai via shwethags) ATLAS-822 Type updates - don't allow updating supertypes ( shwethags via sumasai ) @@ -31,6 +31,7 @@ ATLAS-409 Atlas will not import avro tables with schema read from a file (dosset ATLAS-379 Create sqoop and falcon metadata addons (venkatnrangan,bvellanki,sowmyaramesh via shwethags) ALL CHANGES: +ATLAS-1154 Errors in Eclipse with web.xml (davidrad via dkantor) ATLAS-1147 UI: column name doesn't show up in schema tab for hive table (Kalyanikashikar via kevalbhatt) ATLAS-772 Ordering of columns is not maintained in schema query response, where as hive table entity response maintains the ordering ([email protected] via kevalbhatt) ATLAS-1140 All the tag's attributes are not seen while applying a tag to entity (kevalbhatt) http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/120e4b97/webapp/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/webapp/src/main/webapp/WEB-INF/web.xml b/webapp/src/main/webapp/WEB-INF/web.xml index 2e36b94..e2a85e9 100755 --- a/webapp/src/main/webapp/WEB-INF/web.xml +++ b/webapp/src/main/webapp/WEB-INF/web.xml @@ -46,17 +46,17 @@ <filter-name>springSecurityFilterChain</filter-name> <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class> </filter> - - <filter-mapping> - <filter-name>springSecurityFilterChain</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - + <filter> <filter-name>guiceFilter</filter-name> <filter-class>com.google.inject.servlet.GuiceFilter</filter-class> </filter> - + + <filter-mapping> + <filter-name>springSecurityFilterChain</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + <filter-mapping> <filter-name>guiceFilter</filter-name> <url-pattern>/*</url-pattern> http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/120e4b97/webapp/src/test/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/webapp/src/test/webapp/WEB-INF/web.xml b/webapp/src/test/webapp/WEB-INF/web.xml index 05d7ebb..1b152ee 100755 --- a/webapp/src/test/webapp/WEB-INF/web.xml +++ b/webapp/src/test/webapp/WEB-INF/web.xml @@ -41,18 +41,18 @@ <filter-name>springSecurityFilterChain</filter-name> <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class> </filter> - - <filter-mapping> - <filter-name>springSecurityFilterChain</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - + <filter> <filter-name>guiceFilter</filter-name> <filter-class>com.google.inject.servlet.GuiceFilter</filter-class> </filter> <filter-mapping> + <filter-name>springSecurityFilterChain</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <filter-mapping> <filter-name>guiceFilter</filter-name> <url-pattern>/*</url-pattern> </filter-mapping>
