> On 2011-10-29 15:23:32, Raminder Singh wrote: > > https://svn.apache.org/repos/asf/incubator/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/WidgetApiTest.java, > > line 77 > > <https://reviews.apache.org/r/2584/diff/3/?file=54334#file54334line77> > > > > Because of this conflict in 2 different versions patch is getting > > FAILED status when i am applying on latest version of the code
I applied the R3 diff to my local code and it applied fine without any SVN conflicts. Can you svn update first then apply and see if it resolves the problem? If not let me know and I can apply the patch. - Anthony ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/2584/#review2924 ----------------------------------------------------------- On 2011-10-28 18:09:46, Venkat Mahadevan wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/2584/ > ----------------------------------------------------------- > > (Updated 2011-10-28 18:09:46) > > > Review request for rave. > > > Summary > ------- > > This is the patch for RAVE-315: WidgetRating - ModelPermissionEvaluator and > Service Annotations > > > Diffs > ----- > > > https://svn.apache.org/repos/asf/incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/ModelPermissionEvaluator.java > 1190478 > > https://svn.apache.org/repos/asf/incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetRatingPermissionEvaluator.java > PRE-CREATION > > https://svn.apache.org/repos/asf/incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/RavePermissionEvaluator.java > 1190478 > > https://svn.apache.org/repos/asf/incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetRatingService.java > 1190478 > > https://svn.apache.org/repos/asf/incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetRatingService.java > 1190478 > > https://svn.apache.org/repos/asf/incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetRatingPermissionEvaluatorTest.java > PRE-CREATION > > https://svn.apache.org/repos/asf/incubator/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetRatingServiceTest.java > 1190478 > > https://svn.apache.org/repos/asf/incubator/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rest/WidgetApi.java > 1190478 > > https://svn.apache.org/repos/asf/incubator/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/WidgetApiTest.java > 1190478 > > Diff: https://reviews.apache.org/r/2584/diff > > > Testing > ------- > > > Thanks, > > Venkat > >
