Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.
Comment: Migrated to Confluence 5.3

...

src https://svn.rsmart.com/svn/customizations/ucd/tags/2.6.2.13
patches https://svn.ucdavis.edu/svn/ucd-sakai/patches/tags/rsmart_2.6.2.13_a2
gradebook2 https://source.sakaiproject.org/contrib/gradebook2/tags/1.3.0-a2h4

ON TEST26 HEAD NODE

cd ~/config-staging
mv sakai.properties sakai.properties.previous
mv local.properties.base local.properties.base.previous
svn export https://svn.ucdavis.edu/svn/ucd-sakai/sakai-properties/tags/rsmart_2.6.2.13_a2/sakai.properties
svn export https://svn.ucdavis.edu/svn/ucd-sakai/sakai-properties/tags/rsmart_2.6.2.13_a2/local.properties.base

...

No Format
--------------------UCD SAKAI PATCH MAKER--------------------

Applying all patches for this working copy: 

Applying SAK-3145.patch to gradebook:
|	patching file service/hibernate/src/hibernate/org/sakaiproject/tool/gradebook/GradableObject.hbm.xml
|	Reversed (or previously applied) patch detected!  Skipping patch.
|	2 out of 2 hunks ignored -- saving rejects to file service/hibernate/src/hibernate/org/sakaiproject/tool/gradebook/GradableObject.hbm.xml.rej
|	patching file service/hibernate/src/java/org/sakaiproject/tool/gradebook/Assignment.java
|	Reversed (or previously applied) patch detected!  Skipping patch.
|	3 out of 3 hunks ignored -- saving rejects to file service/hibernate/src/java/org/sakaiproject/tool/gradebook/Assignment.java.rej
|	patching file service/hibernate/src/java/org/sakaiproject/tool/gradebook/Category.java
|	Reversed (or previously applied) patch detected!  Skipping patch.
|	1 out of 1 hunk ignored -- saving rejects to file service/hibernate/src/java/org/sakaiproject/tool/gradebook/Category.java.rej
|	patching file service/hibernate/src/java/org/sakaiproject/tool/gradebook/GradableObject.java
|	Reversed (or previously applied) patch detected!  Skipping patch.
|	3 out of 3 hunks ignored -- saving rejects to file service/hibernate/src/java/org/sakaiproject/tool/gradebook/GradableObject.java.rej
Applying GB2-osiv.patch to gradebook2:
|	patching file war/WEB-INF/web.xml
|	Hunk #1 FAILED at 19.
|	1 out of 1 hunk FAILED -- saving rejects to file war/WEB-INF/web.xml.rej
Applying GRBK-559.patch to gradebook2:
|	patching file war/WEB-INF/web.xml

NOTE:

  • I adjusted the patch script to run GRBK-559.patch instead of GB2-osiv.patch. This is committed now!!
  • SAK-3163.patch was disabled, applied it manually. This is committed now

~/config-staging/tomcatclean.sh
cd ~/src/rsmart_2.6.2.13_a2/src/cle

...