Author: sergeyb
Date: Wed Jan 30 22:34:49 2013
New Revision: 1440718
URL: http://svn.apache.org/viewvc?rev=1440718&view=rev
Log:
Merged revisions 1440357 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1440357 | sergeyb | 2013-01-30 11:57:58 +0000 (Wed, 30 Jan 2013) | 1 line
Minor update to JAXRS20 test to ensure that the faulty filter has at least
one matching name binding
........
Modified:
cxf/branches/2.7.x-fixes/ (props changed)
cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer20.java
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
svn:mergeinfo = /cxf/trunk:1440357
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer20.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer20.java?rev=1440718&r1=1440717&r2=1440718&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer20.java
(original)
+++
cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer20.java
Wed Jan 30 22:34:49 2013
@@ -164,6 +164,7 @@ public class BookServer20 extends Abstra
}
@Faulty
+ @CustomHeaderAdded
private static class FaultyContainerRequestFilter implements
ContainerRequestFilter {
@Override
