[Building Sakai] Apply SAM-756 to 2.7.1 - Where is samigo!?
Steve Swinsburg
steve.swinsburg at gmail.com
Thu Oct 7 15:10:02 PDT 2010
Hi Warwick
It's only in 2.8. On the JIRA, check the fix version and subversion commits as well.
Cheers
Steve
Sent from my iPhone
On 08/10/2010, at 8:42, Warwick Chapman <warwickchapman at gmail.com> wrote:
> Or not.
>
> Grrr! Lydia, in the comments for SAM-756 you committed the patch during January. Is that in the 2.8 tree only?
>
> -- Warwick Bruce Chapman | +27 83 7797 094 | http://warwickchapman.com
>
>
> On Thu, Oct 7, 2010 at 11:05 PM, Warwick Chapman <warwickchapman at gmail.com> wrote:
> Actually, it looks like all those patches (maybe not SAM-802?) have been applied to https://source.sakaiproject.org/svn/sam/tags/samigo-2.7.1
>
> I am building that instead and skipping the patches.
>
>
> -- Warwick Bruce Chapman | +27 83 7797 094 | http://warwickchapman.com
>
>
> On Thu, Oct 7, 2010 at 10:51 PM, Warwick Chapman <warwickchapman at gmail.com> wrote:
> Following David's instructions below, I modified my build script to delete shared/libs/samigo-* after the sakai build was completed and then patched and built the samigo source.
>
> Problem is, the patches don't seem to be right. As advised, I applied SAM-801 as well (which requires SAM-802):
>
> echo Building Samigo...
> rm $DEST/shared/lib/samigo-*
> cd $SAKAISRC/samigo/
> # Patch with SAM-756, SAM-802, SAM-801
> cat $PATCHES/SAK-16822-v3.patch | patch -p0
> cat $PATCHES/feedbackWYSIWYG.diff | patch -p0
> cat $PATCHES/SAK-17021_patch.diff | patch -p0
>
> mvn -Dmaven.tomcat.home=$DEST clean install sakai:deploy
>
> The result:
> patching file samigo-pack/src/sql/oracle/patches/SAK-16822.sql
> patching file samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/DeliveryMessages_nl.properties
> patching file samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/DeliveryMessages_es.properties
> patching file samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/DeliveryMessages_ca.properties
> patching file samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/DeliveryMessages.properties
> patching file samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/DeliveryMessages_ru.properties
> patching file samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/DeliveryMessages_zh_TW.properties
> patching file samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/DeliveryMessages_fr_FR.properties
> patching file samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/DeliveryMessages_zh_CN.properties
> patching file samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/DeliveryMessages_fr_CA.properties
> patching file samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/DeliveryMessages_pt_PT.properties
> patching file samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/DeliveryMessages_ar.properties
> patching file samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/DeliveryMessages_pt_BR.properties
> patching file samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/DeliveryMessages_ja.properties
> Hunk #1 succeeded at 371 (offset 4 lines).
> patching file samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/DeliveryMessages_eu.properties
> patching file samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/DeliveryMessages_sv.properties
> patching file samigo-app/src/webapp/jsf/delivery/item/deliverShortAnswerLink.jsp
> Hunk #1 FAILED at 41.
> Hunk #2 FAILED at 50.
> 2 out of 2 hunks FAILED -- saving rejects to file samigo-app/src/webapp/jsf/delivery/item/deliverShortAnswerLink.jsp.rej
> patching file samigo-app/src/webapp/jsf/delivery/item/deliverShortAnswer.jsp
> Hunk #1 FAILED at 41.
> Hunk #2 FAILED at 50.
> 2 out of 2 hunks FAILED -- saving rejects to file samigo-app/src/webapp/jsf/delivery/item/deliverShortAnswer.jsp.rej
> patching file samigo-app/src/webapp/jsf/author/item/fileUpload.jsp
> patching file samigo-app/src/webapp/jsf/author/item/multipleChoiceSurvey.jsp
> patching file samigo-app/src/webapp/jsf/author/item/fillInTheBlank.jsp
> patching file samigo-app/src/webapp/jsf/author/item/multipleChoice.jsp
> patching file samigo-app/src/webapp/jsf/author/item/matching.jsp
> patching file samigo-app/src/webapp/jsf/author/item/trueFalse.jsp
> patching file samigo-app/src/webapp/jsf/author/item/audioRecording.jsp
> patching file samigo-app/src/webapp/jsf/author/item/shortAnswer.jsp
> patching file samigo-app/src/webapp/jsf/author/item/fillInNumeric.jsp
> patching file tests/src/hibernate/org/sakaiproject/tool/assessment/data/dao/assessment/ItemData.hbm.xml
> patching file tests/src/hibernate/org/sakaiproject/tool/assessment/data/dao/grading/GradingData.hbm.xml
> patching file samigo-hibernate/src/java/org/sakaiproject/tool/assessment/data/dao/assessment/PublishedItemData.hbm.xml
> patching file samigo-hibernate/src/java/org/sakaiproject/tool/assessment/data/dao/assessment/ItemData.hbm.xml
> patching file samigo-hibernate/src/java/org/sakaiproject/tool/assessment/data/dao/grading/GradingData.hbm.xml
> patching file samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/evaluation/StudentScoreUpdateListener.java
> Hunk #1 succeeded at 200 (offset 6 lines).
> patching file samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/delivery/DeliveryBean.java
> Hunk #3 succeeded at 3097 (offset 3 lines).
> patching file samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/evaluation/ExportResponsesBean.java
> Hunk #1 FAILED at 418.
> 1 out of 1 hunk FAILED -- saving rejects to file samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/evaluation/ExportResponsesBean.java.rej
> patching file samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/delivery/SubmitToGradingActionListener.java
> patching file samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/delivery/DeliveryActionListener.java
> Hunk #1 succeeded at 1404 with fuzz 2 (offset -14 lines).
> patching file samigo-app/src/webapp/jsf/delivery/item/deliverShortAnswerLink.jsp
> Hunk #1 FAILED at 34.
> 1 out of 1 hunk FAILED -- saving rejects to file samigo-app/src/webapp/jsf/delivery/item/deliverShortAnswerLink.jsp.rej
> patching file samigo-app/src/webapp/jsf/delivery/item/deliverShortAnswer.jsp
>
>
> -- Warwick Bruce Chapman | +27 83 7797 094 | http://warwickchapman.com
>
>
> On Thu, Oct 7, 2010 at 10:07 AM, David Horwitz <david.horwitz at uct.ac.za> wrote:
> Simplest way to do this:
>
> 1) Delete the samigo jars in shared/lib
> 2) grab the samigo srv
> 3) patch it
> 4) mvn clean install sakai:deploy in the samigo src should do it
>
> D
>
>
> On 10/07/2010 01:28 AM, Warwick Chapman wrote:
>>
>> I need help here dude, if you can manage it. Pretty please - need to build tomorrow, be able to test dev deployment and switch over tomorrow night.
>>
>> I'm quote lost on the Samigo patch and upgrade and how it fits in with the core-deploy stuff...
>>
>> -- Warwick Bruce Chapman | +27 83 7797 094 | http://warwickchapman.com
>>
>>
>> ---------- Forwarded message ----------
>> From: Warwick Chapman <warwickchapman at gmail.com>
>> Date: Thu, Oct 7, 2010 at 12:22 AM
>> Subject: Re: [Building Sakai] Apply SAM-756 to 2.7.1 - Where is samigo!?
>> To: Lydia Li <lydial at stanford.edu>
>> Cc: Matthew Jones <jonespm at umich.edu>, sakai-dev at collab.sakaiproject.org
>>
>>
>> Yep Lydia, I saw that, read that and the link at the bottom to David's blog. What is not obvious to me is how to do this without the mvn -o local stuff which I'm not familiar with. It's late, I'm hoping to get a build out which corrects this issue for a test tomorrow and battling a little with the overall complexity here.
>>
>> Steve has suggested in an email after this one that just grabbing the source and using that will work instead of using the indie release. Is Sam's pom.xml edit implied in Steve's response below or not required?
>>
>>
>> -- Warwick Bruce Chapman | +27 83 7797 094 | http://warwickchapman.com
>>
>>
>> On Wed, Oct 6, 2010 at 11:35 PM, Lydia Li <lydial at stanford.edu> wrote:
>> You don't have to go the artifact route. Matthew's earlier email:
>>
>>
>> "Here was a doc that Nicola wrote about customizing an indie release.
>> http://confluence.sakaiproject.org/display/SAKDEV/Customizing+'indie'+releases
>> "
>>
>> includes a link to a doc about customizing an indie release, which is exactly what you wanted : download the src, patch, build and deploy.
>>
>>
>>
>> thanks,
>> Lydia
>>
>>
>>
>> On 10/6/10 1:03 PM, Warwick Chapman wrote:
>>>
>>> Do I have to go the artifact route? Can I not just download the src, patch, build and deploy?
>>>
>>> -- Warwick Bruce Chapman | +27 83 7797 094 | http://warwickchapman.com
>>>
>>>
>>> On Wed, Oct 6, 2010 at 9:36 PM, Matthew Jones <jonespm at umich.edu> wrote:
>>> As an independent release it doesn't get built, it just gets downloaded and deployed as part of the core-deploy project:
>>> https://source.sakaiproject.org/svn/sakai/trunk/core-deploy/
>>>
>>> Here was a doc that Nicola wrote about customizing an indie release.
>>> http://confluence.sakaiproject.org/display/SAKDEV/Customizing+'indie'+releases
>>>
>>> -Matthew
>>>
>>>
>>> On Wed, Oct 6, 2010 at 3:25 PM, Warwick Chapman <warwickchapman at gmail.com> wrote:
>>> Thanks Sam. How did it get built without me fetching that samigo sources myself?
>>>
>>>
>>> -- Warwick Bruce Chapman | +27 83 7797 094 | http://warwickchapman.com
>>>
>>>
>>> On Wed, Oct 6, 2010 at 9:23 PM, Sam Ottenhoff <ottenhoff at longsight.com> wrote:
>>> Samigo is now an independent release project. You need to check out a branch of the project and build manually.
>>>
>>> Along with SAM-756, I recommend SAM-801 (Allow student use of rich-text editor).
>>>
>>> Here is the 2.7.x branch:
>>>
>>> https://source.sakaiproject.org/svn/sam/branches/samigo-2.7.x/
>>>
>>> Make sure to clear all previous Samigo artifacts before deploying (webapps/samigo*, components/samigo*, shared/lib/samigo-*).
>>>
>>> --Sam
>>>
>>>
>>>
>>> On 10/6/2010 3:16 PM, Warwick Chapman wrote:
>>>> Hi All
>>>>
>>>> I want to apply http://jira.sakaiproject.org/browse/SAM-756 to Samigo so my MySQL-backed Sakai instance can take input of more than 4000 characters. I cannot find samigo in my source tree! Am I missing something?
>>>>
>>>> -- Warwick Bruce Chapman | +27 83 7797 094 | http://warwickchapman.com
>>>>
>>>> _______________________________________________
>>>> sakai-dev mailing list
>>>> sakai-dev at collab.sakaiproject.org
>>>> http://collab.sakaiproject.org/mailman/listinfo/sakai-dev
>>>>
>>>> TO UNSUBSCRIBE: send email to sakai-dev-unsubscribe at collab.sakaiproject.org with a subject of "unsubscribe"
>>>
>>> _______________________________________________
>>> sakai-dev mailing list
>>> sakai-dev at collab.sakaiproject.org
>>> http://collab.sakaiproject.org/mailman/listinfo/sakai-dev
>>>
>>> TO UNSUBSCRIBE: send email to sakai-dev-unsubscribe at collab.sakaiproject.org with a subject of "unsubscribe"
>>>
>>>
>>> _______________________________________________
>>> sakai-dev mailing list
>>> sakai-dev at collab.sakaiproject.org
>>> http://collab.sakaiproject.org/mailman/listinfo/sakai-dev
>>>
>>> TO UNSUBSCRIBE: send email to sakai-dev-unsubscribe at collab.sakaiproject.org with a subject of "unsubscribe"
>>>
>>>
>>>
>>> _______________________________________________
>>> sakai-dev mailing list
>>> sakai-dev at collab.sakaiproject.org
>>> http://collab.sakaiproject.org/mailman/listinfo/sakai-dev
>>>
>>> TO UNSUBSCRIBE: send email to sakai-dev-unsubscribe at collab.sakaiproject.org with a subject of "unsubscribe"
>>
>>
>>
>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://collab.sakaiproject.org/pipermail/sakai-dev/attachments/20101008/6fe05159/attachment.html
More information about the sakai-dev
mailing list