Author: dkulp Date: Fri Feb 17 15:43:21 2012 New Revision: 1245620 URL: http://svn.apache.org/viewvc?rev=1245620&view=rev Log: Merged revisions 1244548 via svn merge from https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes
........ r1244548 | dkulp | 2012-02-15 10:51:04 -0500 (Wed, 15 Feb 2012) | 17 lines 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.3.x-fixes/ (props changed) cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyAnnotationTest.java Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyAnnotationTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyAnnotationTest.java?rev=1245620&r1=1245619&r2=1245620&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyAnnotationTest.java (original) +++ cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyAnnotationTest.java Fri Feb 17 15:43:21 2012 @@ -160,7 +160,7 @@ public class PolicyAnnotationTest extend @Policies({ - @Policy(uri = "annotationpolicies/TestImplPolicy.xml"), + @Policy(uri = "annotationpolicies/TestImplPolicy.xml") } ) @WebService()
