You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2011/07/26 22:36:15 UTC
svn commit: r1151231 - in /cxf/branches/2.4.x-fixes: ./
systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSJaasSecurityTest.java
Author: sergeyb
Date: Tue Jul 26 20:36:14 2011
New Revision: 1151231
URL: http://svn.apache.org/viewvc?rev=1151231&view=rev
Log:
Merged revisions 1151228 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1151228 | sergeyb | 2011-07-26 21:32:33 +0100 (Tue, 26 Jul 2011) | 1 line
[CXF-3689] Fixing test failure
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSJaasSecurityTest.java
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 26 20:36:14 2011
@@ -1 +1 @@
-/cxf/trunk:1151152
+/cxf/trunk:1151152,1151228
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSJaasSecurityTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSJaasSecurityTest.java?rev=1151231&r1=1151230&r2=1151231&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSJaasSecurityTest.java (original)
+++ cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSJaasSecurityTest.java Tue Jul 26 20:36:14 2011
@@ -86,7 +86,7 @@ public class JAXRSJaasSecurityTest exten
assertEquals(307, r.getStatus());
Object locationHeader = r.getMetadata().getFirst(HttpHeaders.LOCATION);
assertNotNull(locationHeader);
- assertEquals("http://localhost:" + PORT + "/service/login.jsp",
+ assertEquals("http://localhost:" + PORT + "/login.jsp",
locationHeader.toString());
}