Author: sergeyb Date: Thu Nov 18 10:53:20 2010 New Revision: 1036395 URL: http://svn.apache.org/viewvc?rev=1036395&view=rev Log: Merged revisions 1036394 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.3.x-fixes
................ r1036394 | sergeyb | 2010-11-18 10:50:35 +0000 (Thu, 18 Nov 2010) | 9 lines Merged revisions 1036391 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1036391 | sergeyb | 2010-11-18 10:45:00 +0000 (Thu, 18 Nov 2010) | 1 line Removing @Override annotations for Hudson builds to succeed ........ ................ Modified: cxf/branches/2.2.x-fixes/ (props changed) cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/GenericRestServiceImpl.java Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Nov 18 10:53:20 2010 @@ -1,2 +1,2 @@ -/cxf/branches/2.3.x-fixes:1036007,1036260 -/cxf/trunk:1036004,1036258 +/cxf/branches/2.3.x-fixes:1036007,1036260,1036394 +/cxf/trunk:1036004,1036258,1036391 Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/GenericRestServiceImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/GenericRestServiceImpl.java?rev=1036395&r1=1036394&r2=1036395&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/GenericRestServiceImpl.java (original) +++ cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/GenericRestServiceImpl.java Thu Nov 18 10:53:20 2010 @@ -26,12 +26,10 @@ public class GenericRestServiceImpl<T ex private Map entities = new HashMap(); - @Override public T getById(PK id) { return (T)entities.get((Long)id); } - @Override public PK postEntity(T instance) { entities.put(1L, instance); return (PK)entities.keySet().iterator().next();
