You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by dk...@apache.org on 2016/09/07 13:53:59 UTC

incubator-atlas git commit: ATLAS-1154 Errors in Eclipse with web.xml (davidrad via dkantor)

Repository: incubator-atlas
Updated Branches:
  refs/heads/master f54325f1c -> 4b2e6ba9e


ATLAS-1154 Errors in Eclipse with web.xml (davidrad via dkantor)


Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/4b2e6ba9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/4b2e6ba9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/4b2e6ba9

Branch: refs/heads/master
Commit: 4b2e6ba9e81bc5d1c1c2e12d1a6bedb27bdf2f0e
Parents: f54325f
Author: Dave Kantor <dk...@us.ibm.com>
Authored: Wed Sep 7 02:53:56 2016 +0100
Committer: Dave Kantor <dk...@us.ibm.com>
Committed: Wed Sep 7 02:53:56 2016 +0100

----------------------------------------------------------------------
 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/4b2e6ba9/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index e4b6fe1..10765f9 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -4,12 +4,13 @@ Apache Atlas Release Notes
 --trunk - unreleased
 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-1127 Modify creation and modification timestamps to Date instead of Long(sumasai)
 
 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 (sarath.kum4r@gmail.com 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/4b2e6ba9/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/4b2e6ba9/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>