Hi Raminder, sure I'll apply the patch. FYI - I patched it through my IDE (Netbeans)
Tony --- Anthony Carlucci | SW App Dev Eng, Sr. | R501 / KW App Development & Maint e: [email protected] | v: 781.271.2432 | f: 781.271.3299 The MITRE Corporation | 202 Burlington Rd | Bedford, MA 01730-1420 -----Original Message----- From: Raminderjeet Singh [mailto:[email protected]] Sent: Monday, October 31, 2011 10:50 AM To: [email protected] Cc: Mahadevan, Venkat; Carlucci, Tony Subject: Re: Review Request: RAVE-315 WidgetRating - ModelPermissionEvaluator and Service Annotations Anthony, I checked out latest code from trunk into a new directory and then tried to apply the patch and i am getting following error using patch command. If it works for you please go ahead and apply the patch. patch -p0 -i RAVE-315-2.patch patching file rave-components/rave-core/src/main/java/org/apache/rave/portal/security/ModelPermissionEvaluator.java patching file rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetRatingPermissionEvaluator.java patching file rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/RavePermissionEvaluator.java patching file rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetRatingService.java patching file rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetRatingService.java patching file rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetRatingPermissionEvaluatorTest.java patching file rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetRatingServiceTest.java patching file rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rest/WidgetApi.java Hunk #1 FAILED at 19. Hunk #2 FAILED at 72. 2 out of 2 hunks FAILED -- saving rejects to file rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rest/WidgetApi.java.rej patching file rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/WidgetApiTest.java Hunk #1 FAILED at 20. Hunk #2 FAILED at 27. Hunk #3 FAILED at 69. 3 out of 3 hunks FAILED -- saving rejects to file rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/WidgetApiTest.java.rej Thanks Raminder On Oct 31, 2011, at 10:05 AM, Anthony Carlucci wrote: > > >> 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 >> >> >
