Conversion scripts for Sakai 2.6.x fail

Description

I am working with a fresh checkout of gradebook 2.6.x and a fresh checkout of

https://source.sakaiproject.org/contrib//gradebook2/branches/GRBK-650/

which is a copy (with no changes) of

https://source.sakaiproject.org/contrib//gradebook2/branches/1.3.x-prod/

The readme tells me one of the first things to do is cd into the gradebook directory and execute this statement:

patch -p0 < ../gradebook2/sakai/2-6-x/gradebook-upgrade-1.1.x-to-1.2.x.patch

When I do that, it fails in several places.

Activity

Show:

Thomas Amsler August 30, 2010 at 10:10 PM

Jim,

I am not quite sure why you apply the "gradebook-upgrade-1.1.x-to-1.2.x.patch" patch. The INSTALL.TXT file in:

https://source.sakaiproject.org/contrib//gradebook2/tags/1.3.0/sakai/2-6-x/INSTALL.txt

Doesn't mention to run that patch. Let me know if it works for you if you follow the above instructions.

PS: we definitely need to cleanup the documentation. This is way to confusing.

Jim Eng August 30, 2010 at 1:37 PM

Here are the details:

$ cat service/hibernate/src/hibernate/org/sakaiproject/tool/gradebook/GradableObject.hbm.xml.rej
***************

  •  

    •  

      • 33,38 ****
        <property name="released" column="RELEASED" type="boolean"/>
        <many-to-one name="category" column="CATEGORY_ID" class="org.sakaiproject.tool.gradebook.Category" not-null="false"/>
        <property name="ungraded" column="UNGRADED" type="boolean"/>
        <property name="extraCredit" column="IS_EXTRA_CREDIT" type="boolean" not-null="false"/>
        <property name="assignmentWeighting" column="ASSIGNMENT_WEIGHTING" type="double" not-null="false"/>
        <property name="unweighted" column="IS_UNWEIGHTED" type="boolean" not-null="false"/>

      • 35,41 ----
        <property name="released" column="RELEASED" type="boolean"/>
        <many-to-one name="category" column="CATEGORY_ID" class="org.sakaiproject.tool.gradebook.Category" not-null="false"/>
        <property name="ungraded" column="UNGRADED" type="boolean"/>
        + <property name="countNullsAsZeros" column="IS_NULL_ZERO" type="boolean" not-null="false"/>
        <property name="extraCredit" column="IS_EXTRA_CREDIT" type="boolean" not-null="false"/>
        <property name="assignmentWeighting" column="ASSIGNMENT_WEIGHTING" type="double" not-null="false"/>
        <property name="unweighted" column="IS_UNWEIGHTED" type="boolean" not-null="false"/>
        $ cat service/hibernate/src/java/org/sakaiproject/tool/gradebook/Assignment.java.rej
        ***************

      • 69,74 ****
        private boolean ungraded;
        private Boolean extraCredit;
        private Double assignmentWeighting;
        private Boolean unweighted;
        private Integer itemOrder;


— 69,75 ---- private boolean ungraded;
private Boolean extraCredit;
private Double assignmentWeighting;
+ private Boolean countNullsAsZeros;
private Boolean unweighted;
private Integer itemOrder;

***************

  •  

    •  

      • 481,484 ****
        }

  • }--- 491,494 ----
    }

+

$ cat service/hibernate/src/java/org/sakaiproject/tool/gradebook/Category.java.rej
***************

  •  

    •  

      • 47,53 ****
        private Boolean unweighted;
        private Boolean equalWeightAssignments;
        private Integer categoryOrder;

  • private Boolean enforcePointWeighting;


public static Comparator nameComparator;
public static Comparator averageScoreComparator;
— 47,53 ---- private Boolean unweighted;
private Boolean equalWeightAssignments;
private Integer categoryOrder;
+ private Boolean enforcePointWeighting;

public static Comparator nameComparator;
public static Comparator averageScoreComparator;
$

Jim Eng August 30, 2010 at 1:31 PM

Here's a copy of the messages:

$ patch -p0 < ../gradebook2/sakai/2-6-x/gradebook-upgrade-1.1.x-to-1.2.x.patch
patching file service/hibernate/src/hibernate/org/sakaiproject/tool/gradebook/GradableObject.hbm.xml
Hunk #2 FAILED at 35.
1 out of 2 hunks FAILED – 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
Hunk #1 FAILED at 69.
Hunk #2 succeeded at 461 with fuzz 2 (offset -17 lines).
Hunk #3 FAILED at 491.
2 out of 3 hunks FAILED – 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
Hunk #1 FAILED at 47.
1 out of 1 hunk FAILED – 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
$

Non-Issue

Details

Assignee

Reporter

Components

Affects versions

Priority

Created August 30, 2010 at 1:30 PM
Updated August 31, 2010 at 4:24 AM
Resolved August 31, 2010 at 4:24 AM