svn commit: r1363433 - in /cxf/branches/2.6.x-fixes: ./ rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/ systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/

[sergeyb]

Author: sergeyb
Date: Thu Jul 19 17:30:14 2012
New Revision: 1363433

URL: http://svn.apache.org/viewvc?rev=1363433&view=rev
Log:
Merged revisions 1363431 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1363431 | sergeyb | 2012-07-19 18:22:39 +0100 (Thu, 19 Jul 2012) | 1 line
  
  [CXF-4433] Fixing the typo losing the correct 'allowCredentials' response 
value
........

Modified:
    cxf/branches/2.6.x-fixes/   (props changed)
    
cxf/branches/2.6.x-fixes/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java
    
cxf/branches/2.6.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/CrossOriginSimpleTest.java
    
cxf/branches/2.6.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/UnannotatedCorsServer.java

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
    svn:mergeinfo = /cxf/trunk:1363431

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.6.x-fixes/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java?rev=1363433&r1=1363432&r2=1363433&view=diff
==============================================================================
--- 
cxf/branches/2.6.x-fixes/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java
 (original)
+++ 
cxf/branches/2.6.x-fixes/rt/rs/security/cors/src/main/java/org/apache/cxf/rs/security/cors/CrossOriginResourceSharingFilter.java
 Thu Jul 19 17:30:14 2012
@@ -322,7 +322,7 @@ public class CrossOriginResourceSharingF
         rbuilder.header(CorsHeaderConstants.HEADER_AC_ALLOW_ORIGIN, 
                         
m.getExchange().get(CorsHeaderConstants.HEADER_ORIGIN));
         rbuilder.header(CorsHeaderConstants.HEADER_AC_ALLOW_CREDENTIALS,
-                        Boolean.toString(allowCredentials));
+                        
m.getExchange().get(CorsHeaderConstants.HEADER_AC_ALLOW_CREDENTIALS));
         
         if (SIMPLE_REQUEST.equals(op)) {
             /* 5.1.4 expose headers */

Modified: 
cxf/branches/2.6.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/CrossOriginSimpleTest.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/CrossOriginSimpleTest.java?rev=1363433&r1=1363432&r2=1363433&view=diff
==============================================================================
--- 
cxf/branches/2.6.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/CrossOriginSimpleTest.java
 (original)
+++ 
cxf/branches/2.6.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/CrossOriginSimpleTest.java
 Thu Jul 19 17:30:14 2012
@@ -319,7 +319,7 @@ public class CrossOriginSimpleTest exten
         HttpResponse response = httpclient.execute(http);
         assertEquals(200, response.getStatusLine().getStatusCode());
         assertOriginResponse(false, new String[]{"http://area51.mil:31415"}, 
true, response);
-        assertAllowCredentials(response, false);
+        assertAllowCredentials(response, true);
         List<String> exposeHeadersValues 
             = 
headerValues(response.getHeaders(CorsHeaderConstants.HEADER_AC_EXPOSE_HEADERS));
         // preflight never returns Expose-Headers

Modified: 
cxf/branches/2.6.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/UnannotatedCorsServer.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/UnannotatedCorsServer.java?rev=1363433&r1=1363432&r2=1363433&view=diff
==============================================================================
--- 
cxf/branches/2.6.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/UnannotatedCorsServer.java
 (original)
+++ 
cxf/branches/2.6.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/UnannotatedCorsServer.java
 Thu Jul 19 17:30:14 2012
@@ -51,7 +51,6 @@ public class UnannotatedCorsServer {
     @GET
     @CrossOriginResourceSharing(allowOrigins = {
             "http://area51.mil:31415"; }, 
-             allowCredentials = true, 
              exposeHeaders = {"X-custom-3", "X-custom-4" })
     @Produces("text/plain")
     @Path("/annotatedGet/{echo}")