svn commit: r1209464 - in /cxf/trunk: rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/cors/ systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/ systests/jaxrs/src/test/resources/jaxrs_cors/WEB-INF/

[bimargulies]

Author: bimargulies
Date: Fri Dec  2 13:25:21 2011
New Revision: 1209464

URL: http://svn.apache.org/viewvc?rev=1209464&view=rev
Log:
CXF-3493: pass all the tests I've got so far.

Modified:
    
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/cors/CrossOriginResourceSharingFilter.java
    
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/CrossOriginSimpleTest.java
    cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_cors/WEB-INF/beans.xml

Modified: 
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/cors/CrossOriginResourceSharingFilter.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/cors/CrossOriginResourceSharingFilter.java?rev=1209464&r1=1209463&r2=1209464&view=diff
==============================================================================
--- 
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/cors/CrossOriginResourceSharingFilter.java
 (original)
+++ 
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/cors/CrossOriginResourceSharingFilter.java
 Fri Dec  2 13:25:21 2011
@@ -119,7 +119,7 @@ public class CrossOriginResourceSharingF
         // 5.1.4
         List<String> effectiveExposeHeaders = effectiveExposeHeaders(ann);
         if (effectiveExposeHeaders != null && effectiveExposeHeaders.size() != 
0) {
-            m.getExchange().put(CorsHeaderConstants.HEADER_AC_ALLOW_HEADERS, 
effectiveExposeHeaders);
+            m.getExchange().put(CorsHeaderConstants.HEADER_AC_EXPOSE_HEADERS, 
effectiveExposeHeaders);
         }
 
         // note what kind of processing we're doing.

Modified: 
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/CrossOriginSimpleTest.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/CrossOriginSimpleTest.java?rev=1209464&r1=1209463&r2=1209464&view=diff
==============================================================================
--- 
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/CrossOriginSimpleTest.java
 (original)
+++ 
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/CrossOriginSimpleTest.java
 Fri Dec  2 13:25:21 2011
@@ -22,6 +22,7 @@ package org.apache.cxf.systest.jaxrs.cor
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 import org.apache.cxf.helpers.IOUtils;
@@ -297,8 +298,8 @@ public class CrossOriginSimpleTest exten
         assertAllowCredentials(response, false);
         List<String> exposeHeadersValues 
             = 
headerValues(response.getHeaders(CorsHeaderConstants.HEADER_AC_EXPOSE_HEADERS));
-        // depend on knowing the order.
-        assertEquals(Arrays.asList(new String[] {"X-custom-3", "X-custom-4" 
}), exposeHeadersValues);
+        // preflight never returns Expose-Headers
+        assertEquals(Collections.emptyList(), exposeHeadersValues);
         List<String> allowHeadersValues 
             = 
headerValues(response.getHeaders(CorsHeaderConstants.HEADER_AC_ALLOW_HEADERS));
         assertEquals(Arrays.asList(new String[] {"X-custom-1", "X-custom-2" 
}), allowHeadersValues);

Modified: 
cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_cors/WEB-INF/beans.xml
URL: 
http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_cors/WEB-INF/beans.xml?rev=1209464&r1=1209463&r2=1209464&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_cors/WEB-INF/beans.xml 
(original)
+++ cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_cors/WEB-INF/beans.xml 
Fri Dec  2 13:25:21 2011
@@ -31,10 +31,10 @@ http://cxf.apache.org/core 
                </jaxrs:serviceBeans>
                <jaxrs:providers>
                        <ref bean="cors-filter" />
-               </jaxrs:providers>
+               </jaxrs:providers><!-- 
                <jaxrs:features>
                        <cxf:logging />
-               </jaxrs:features>
+               </jaxrs:features>-->
 
        </jaxrs:server>
        <jaxrs:server id="config-service" address="/config">