From e4fde9e96c8eca169d26d7a98189ba69a012e5c0 Mon Sep 17 00:00:00 2001
From: jiazhong <jiazhong@ebay.com>
Date: Tue, 6 Jan 2015 19:45:56 +0800
Subject: [PATCH] use open source  CORSfilter

---
 .../main/java/com/kylinolap/job/JobInstance.java   |  2 +-
 server/pom.xml                                     |  5 ++++
 .../com/kylinolap/rest/filter/KylinCORSFilter.java | 28 ---------------------
 server/src/main/webapp/WEB-INF/web.xml             | 29 ++++++++++++++++------
 webapp/app/js/controllers/auth.js                  |  2 --
 webapp/app/js/controllers/page.js                  |  1 +
 6 files changed, 28 insertions(+), 39 deletions(-)
 delete mode 100644 server/src/main/java/com/kylinolap/rest/filter/KylinCORSFilter.java

diff --git a/job/src/main/java/com/kylinolap/job/JobInstance.java b/job/src/main/java/com/kylinolap/job/JobInstance.java
index 0a7308a..48ad867 100644
--- a/job/src/main/java/com/kylinolap/job/JobInstance.java
+++ b/job/src/main/java/com/kylinolap/job/JobInstance.java
@@ -473,7 +473,7 @@ public int compareTo(JobStep o) {
 
     @Override
     public int compareTo(JobInstance o) {
-        return (int) (o.lastModified - this.lastModified);
+        return o.lastModified<this.lastModified?-1:o.lastModified>this.lastModified?1:0;
     }
 
 }
diff --git a/server/pom.xml b/server/pom.xml
index fea3397..94c9968 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -350,6 +350,11 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+		<dependency>
+		    <groupId>com.thetransactioncompany</groupId>
+		    <artifactId>cors-filter</artifactId>
+		    <version>1.3.2</version>
+		</dependency>        
     </dependencies>
 
     <build>
diff --git a/server/src/main/java/com/kylinolap/rest/filter/KylinCORSFilter.java b/server/src/main/java/com/kylinolap/rest/filter/KylinCORSFilter.java
deleted file mode 100644
index 7f1a144..0000000
--- a/server/src/main/java/com/kylinolap/rest/filter/KylinCORSFilter.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.kylinolap.rest.filter;
-
-import java.io.IOException;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletResponse;
-
-public class KylinCORSFilter implements Filter {
-
-    public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException, ServletException {
-        HttpServletResponse response = (HttpServletResponse) res;
-        response.setHeader("Access-Control-Allow-Origin", "*");
-        response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
-        response.setHeader("Access-Control-Max-Age", "3600");
-        response.setHeader("Access-Control-Allow-Headers", "x-requested-with");
-        chain.doFilter(req, res);
-    }
-
-    public void init(FilterConfig filterConfig) {}
-
-    public void destroy() {}
-
-}
diff --git a/server/src/main/webapp/WEB-INF/web.xml b/server/src/main/webapp/WEB-INF/web.xml
index 490d8ff..190ae0b 100644
--- a/server/src/main/webapp/WEB-INF/web.xml
+++ b/server/src/main/webapp/WEB-INF/web.xml
@@ -45,14 +45,27 @@
 		</listener-class>
 	</listener>
 	
-	<filter>
-	    <filter-name>crossDomainFilter</filter-name>
-	    <filter-class>com.kylinolap.rest.security.CrossDomainFilter</filter-class>
-	</filter>
-	<filter-mapping>
-	    <filter-name>crossDomainFilter</filter-name>
-	    <url-pattern>/*</url-pattern>
-	</filter-mapping>
+<filter>
+   <filter-name>CORS</filter-name>
+   <filter-class>com.thetransactioncompany.cors.CORSFilter</filter-class>       
+   <init-param>
+      <param-name>cors.supportedHeaders</param-name>
+      <param-value>Authorization,Origin, No-Cache, X-Requested-With, If-Modified-Since, Pragma, Last-Modified, Cache-Control, Expires, Content-Type, X-E4M-With, Accept</param-value>
+   </init-param>   
+  <init-param>
+      <param-name>cors.supportedMethods</param-name>
+      <param-value>GET, POST, PUT, DELETE, OPTIONS</param-value>
+   </init-param>     
+  <init-param>
+      <param-name>cors.supportsCredentials </param-name>
+      <param-value>true</param-value>
+   </init-param>    
+</filter>
+
+<filter-mapping>
+   <filter-name>CORS</filter-name>
+   <url-pattern>/*</url-pattern>
+</filter-mapping>
 	
 	<!--
 		Apply Spring Security Filter to all Requests 
diff --git a/webapp/app/js/controllers/auth.js b/webapp/app/js/controllers/auth.js
index 81c7db2..4976db6 100644
--- a/webapp/app/js/controllers/auth.js
+++ b/webapp/app/js/controllers/auth.js
@@ -8,9 +8,7 @@ KylinApp.controller('LoginCtrl', function ($scope, $rootScope, $location, $base6
     $scope.login = function () {
         // set the basic authentication header that will be parsed in the next request and used to authenticate
         httpHeaders.common['Authorization'] = 'Basic ' + $base64.encode($scope.username + ':' + $scope.password);
-
         $scope.loading = true;
-
         //verify project
         if($scope.project.projects.length&&!$scope.project.selectedProject){
             $scope.loading = false;
diff --git a/webapp/app/js/controllers/page.js b/webapp/app/js/controllers/page.js
index 614c47c..1c80460 100644
--- a/webapp/app/js/controllers/page.js
+++ b/webapp/app/js/controllers/page.js
@@ -231,3 +231,4 @@ var projCtrl = function ($scope, $modalInstance, ProjectService, MessageService,
     };
 
 };
+