Skip to end of metadata
Go to start of metadata

You are viewing an old version of this page. View the current version.

Compare with Current View Page History

Version 1 Next »

Cleanup GB2 1.3.0-a1 tag

svn copy https://source.sakaiproject.org/contrib/gradebook2/tags/trunk-67574 https://source.sakaiproject.org/contrib/gradebook2/tags/1.3.0-a1/

Cleanup ucd-gradebook2-ent 1.2.0-a1 tag

svn copy https://svn.ucdavis.edu/svn/ucd-sakai/ucd-gradebook2-ent/tags/trunk-8132 https://svn.ucdavis.edu/svn/ucd-sakai/ucd-gradebook2-ent/tags/1.2.0-a1 -m "NOJIRA : copy tag trunk-8132 to 1.2.0-a1"

Create GB2 tag

svn copy https://source.sakaiproject.org/contrib/gradebook2/trunk/ https://source.sakaiproject.org/contrib/gradebook2/tags/1.3.0-a2

Create ucd-gradebook-ent tag

svn copy https://svn.ucdavis.edu/svn/ucd-sakai/ucd-gradebook2-ent/trunk/ https://svn.ucdavis.edu/svn/ucd-sakai/ucd-gradebook2-ent/tags/1.2.0-a2 -m "NOJIRA : creating 1.2.0-a2 tag."

Prepare rsmart_2.6.2.13_a2 tag

svn copy https://svn.ucdavis.edu/svn/ucd-sakai/rsmart/trunk https://svn.ucdavis.edu/svn/ucd-sakai/rsmart/tags/rsmart_2.6.2.13_a2 -m "Initial cut of tag rsmart_2.6.2.13_a2"

svn copy https://svn.ucdavis.edu/svn/ucd-sakai/sakai-properties/branches/rsmart-sakai-properties https://svn.ucdavis.edu/svn/ucd-sakai/sakai-properties/tags/rsmart_2.6.2.13_a2 -m "Initial cut of tag rsmart_2.6.2.13_a2"

svn copy https://svn.ucdavis.edu/svn/ucd-sakai/patches/branches/rsmart_2-6-x/ https://svn.ucdavis.edu/svn/ucd-sakai/patches/tags/rsmart_2.6.2.13_a2 -m "Initial cut of tag rsmart_2.6.2.13_a2"

svn propedit svn:externals https://svn.ucdavis.edu/svn/ucd-sakai/rsmart/tags/rsmart_2.6.2.13_a2

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-a2

h4 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

cd ~/src
rm -fr <oldest tag>
svn co https://svn.ucdavis.edu/svn/ucd-sakai/rsmart/tags/rsmart_2.6.2.13_a2 | tee ~/checkout.log

cd ~/src/rsmart_2.6.2.13_a2/src/cle/custom
rm -fr ucd-gradebook2-ent
svn co https://svn.ucdavis.edu/svn/ucd-sakai/ucd-gradebook2-ent/tags/1.2.0-a2/ ucd-gradebook2-ent

cd ~/src/rsmart_2.6.2.13_a2
./scripts/cfg.pl

Results (cfg.pl)

--------------------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

mvnrsmart

deploy code

  • No labels