Author: dkulp Date: Wed Feb 15 15:51:04 2012 New Revision: 1244548 URL: http://svn.apache.org/viewvc?rev=1244548&view=rev Log: Merged revisions 1244539 via svn merge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........ r1244539 | dkulp | 2012-02-15 10:34:27 -0500 (Wed, 15 Feb 2012) | 9 lines Merged revisions 1244529 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1244529 | dkulp | 2012-02-15 10:19:16 -0500 (Wed, 15 Feb 2012) | 2 lines Fix compile failure with non-eclipse compiler ........ ........ Modified: cxf/branches/2.4.x-fixes/ (props changed) cxf/branches/2.4.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyAnnotationTest.java Propchange: cxf/branches/2.4.x-fixes/ ('svn:mergeinfo' removed) Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.4.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyAnnotationTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyAnnotationTest.java?rev=1244548&r1=1244547&r2=1244548&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyAnnotationTest.java (original) +++ cxf/branches/2.4.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyAnnotationTest.java Wed Feb 15 15:51:04 2012 @@ -226,7 +226,7 @@ public class PolicyAnnotationTest extend @Policies({ - @Policy(uri = "annotationpolicies/TestImplPolicy.xml"), + @Policy(uri = "annotationpolicies/TestImplPolicy.xml") } ) @WebService(endpointInterface = "org.apache.cxf.ws.policy.PolicyAnnotationTest$TestInterface")
