svn commit: r1339131 - in /incubator/stanbol/trunk/commons/web/base/src: main/java/org/apache/stanbol/commons/web/base/CorsHelper.java test/java/org/apache/stanbol/commons/web/base/CorsAccessControlAllowMethodTest.java

[rwesten]

Author: rwesten
Date: Wed May 16 12:20:49 2012
New Revision: 1339131

URL: http://svn.apache.org/viewvc?rev=1339131&view=rev
Log:
fixes STANBOL-616: Updated "Access-Control-Allow-Method" -> 
"Access-Control-Allow-Methods". See comment to the issue for details

Modified:
    
incubator/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/CorsHelper.java
    
incubator/stanbol/trunk/commons/web/base/src/test/java/org/apache/stanbol/commons/web/base/CorsAccessControlAllowMethodTest.java

Modified: 
incubator/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/CorsHelper.java
URL: 
http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/CorsHelper.java?rev=1339131&r1=1339130&r2=1339131&view=diff
==============================================================================
--- 
incubator/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/CorsHelper.java
 (original)
+++ 
incubator/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/CorsHelper.java
 Wed May 16 12:20:49 2012
@@ -52,7 +52,7 @@ public final class CorsHelper {
     /**
      * The "Access-Control-Request-Method" header
      */
-    public static final String REQUEST_METHOD = 
"Access-Control-Request-Method";
+    public static final String REQUEST_METHODS = 
"Access-Control-Request-Methods";
 
     /**
      * The "Access-Control-Request-Headers" header
@@ -67,7 +67,7 @@ public final class CorsHelper {
     /**
      * The "Access-Control-Allow-Method" header
      */
-    public static final String ALLOW_METHOD = "Access-Control-Allow-Method";
+    public static final String ALLOW_METHODS = "Access-Control-Allow-Methods";
 
     /**
      * The default methods for the Access-Control-Request-Method header field.
@@ -179,7 +179,7 @@ public final class CorsHelper {
             if(!added){
                 methods.append(CorsHelper.DEFAULT_REQUEST_METHODS);
             }
-            responseBuilder.header(CorsHelper.ALLOW_METHOD, 
methods.toString());
+            responseBuilder.header(CorsHelper.ALLOW_METHODS, 
methods.toString());
             //third replay parsed "Access-Control-Request-Headers" values
             //currently there is no need to restrict such headers so the 
simplest
             //way is to return them as they are parsed

Modified: 
incubator/stanbol/trunk/commons/web/base/src/test/java/org/apache/stanbol/commons/web/base/CorsAccessControlAllowMethodTest.java
URL: 
http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/web/base/src/test/java/org/apache/stanbol/commons/web/base/CorsAccessControlAllowMethodTest.java?rev=1339131&r1=1339130&r2=1339131&view=diff
==============================================================================
--- 
incubator/stanbol/trunk/commons/web/base/src/test/java/org/apache/stanbol/commons/web/base/CorsAccessControlAllowMethodTest.java
 (original)
+++ 
incubator/stanbol/trunk/commons/web/base/src/test/java/org/apache/stanbol/commons/web/base/CorsAccessControlAllowMethodTest.java
 Wed May 16 12:20:49 2012
@@ -56,7 +56,7 @@ public class CorsAccessControlAllowMetho
         MultivaluedMap<String,String> header = new MultivaluedMapImpl();
         header.add("Origin", 
"https://issues.apache.org/jira/browse/STANBOL-616";);
         header.put("Access-Control-Request-Headers", Arrays.asList("Origin", 
"Content-Type", "Accept"));
-        header.add("Access-Control-Request-Method", "PUT");
+        header.add("Access-Control-Request-Methods", "PUT");
         HttpHeaders requestHeaders = new MockHttpHeaders(header);
 
         
@@ -71,9 +71,9 @@ public class CorsAccessControlAllowMetho
         Assert.assertTrue("'Access-Control-Allow-Origin' expected", 
metadata.containsKey("Access-Control-Allow-Origin"));
         Assert.assertEquals("'Access-Control-Allow-Origin' does not have the 
expected value '*'",
             "*", metadata.getFirst("Access-Control-Allow-Origin"));
-        Assert.assertTrue("'Access-Control-Allow-Method' expected", 
metadata.containsKey("Access-Control-Allow-Method"));
-        value = (String)metadata.getFirst("Access-Control-Allow-Method");
-        Assert.assertTrue("'Access-Control-Allow-Method' does not contain the 
expected values", 
+        Assert.assertTrue("'Access-Control-Allow-Methods' expected", 
metadata.containsKey("Access-Control-Allow-Methods"));
+        value = (String)metadata.getFirst("Access-Control-Allow-Methods");
+        Assert.assertTrue("'Access-Control-Allow-Methods' does not contain the 
expected values", 
             value.contains(OPTIONS) && value.contains(GET) && 
value.contains(POST) && value.contains(PUT));
     }