Source Code Management sakai_2-4-x-HEAD-prod

2008-06-03 : Release sakai_2-4-x-HEAD-prod-021 : FND=45460 : UCD=????

• Externals sakai_2-4-x-HEAD-prod-021
• Using https://mware.ucdavis.edu/svn/ucd-sakai/patches/branches/sakai_2-4-x-HEAD-prod/ @ R ????
• Sakai Properties
• JIRAs:

  • sak-1574
    gb post_2-4-0
    3986
    4016
    4795
    4881
    4890
    
    sak-1605
    ucd-ent.
    4327
    4328
    gb post_2-4-0
    4326
    
    sak-1843
    ucd-ent.
    4776
    4777
    4778
    4779
    
    
    sak-1914
    gb post-2-4
    4912
    4934
    4935
    4945
    4946
    4952
    4961
    4967
    4968
    
    
    sak-1924:
    gb post-2-4
    4953
    4954
    4956
    4957 **
    
    
    gb post_2-4-0
    svn merge -c 3986 https://mware.ucdavis.edu/svn/ucd-sakai/gradebook/branches/post_2-4-0/ .
    svn merge -c 4016 https://mware.ucdavis.edu/svn/ucd-sakai/gradebook/branches/post_2-4-0/ .
    svn merge -c 4326 https://mware.ucdavis.edu/svn/ucd-sakai/gradebook/branches/post_2-4-0/ .
    svn merge -c 4795 https://mware.ucdavis.edu/svn/ucd-sakai/gradebook/branches/post_2-4-0/ .
    svn merge -c 4881 https://mware.ucdavis.edu/svn/ucd-sakai/gradebook/branches/post_2-4-0/ .
    svn merge -c 4890 https://mware.ucdavis.edu/svn/ucd-sakai/gradebook/branches/post_2-4-0/ .
    svn merge -c 4912 https://mware.ucdavis.edu/svn/ucd-sakai/gradebook/branches/post_2-4-0/ .
    svn merge -c 4934 https://mware.ucdavis.edu/svn/ucd-sakai/gradebook/branches/post_2-4-0/ .
    svn merge -c 4935 https://mware.ucdavis.edu/svn/ucd-sakai/gradebook/branches/post_2-4-0/ .
    svn merge -c 4945 https://mware.ucdavis.edu/svn/ucd-sakai/gradebook/branches/post_2-4-0/ .
    svn merge -c 4946 https://mware.ucdavis.edu/svn/ucd-sakai/gradebook/branches/post_2-4-0/ .
    svn merge -c 4952 https://mware.ucdavis.edu/svn/ucd-sakai/gradebook/branches/post_2-4-0/ .
    svn merge -c 4953 https://mware.ucdavis.edu/svn/ucd-sakai/gradebook/branches/post_2-4-0/ .
    svn merge -c 4954 https://mware.ucdavis.edu/svn/ucd-sakai/gradebook/branches/post_2-4-0/ .
    svn merge -c 4956 https://mware.ucdavis.edu/svn/ucd-sakai/gradebook/branches/post_2-4-0/ .
    svn merge -c 4957 https://mware.ucdavis.edu/svn/ucd-sakai/gradebook/branches/post_2-4-0/ .
    svn merge -c 4961 https://mware.ucdavis.edu/svn/ucd-sakai/gradebook/branches/post_2-4-0/ .
    svn merge -c 4967 https://mware.ucdavis.edu/svn/ucd-sakai/gradebook/branches/post_2-4-0/ .
    svn merge -c 4968 https://mware.ucdavis.edu/svn/ucd-sakai/gradebook/branches/post_2-4-0/ .
    
    
    
    ucd-ent:
    svn merge -c 4327 https://mware.ucdavis.edu/svn/ucd-sakai/ucd-enterprise-data-service/branches/sakai_2-4-x-HEAD .
    svn merge -c 4328 https://mware.ucdavis.edu/svn/ucd-sakai/ucd-enterprise-data-service/branches/sakai_2-4-x-HEAD .
    svn merge -c 4776 https://mware.ucdavis.edu/svn/ucd-sakai/ucd-enterprise-data-service/branches/sakai_2-4-x-HEAD .
    svn merge -c 4777 https://mware.ucdavis.edu/svn/ucd-sakai/ucd-enterprise-data-service/branches/sakai_2-4-x-HEAD .
    svn merge -c 4778 https://mware.ucdavis.edu/svn/ucd-sakai/ucd-enterprise-data-service/branches/sakai_2-4-x-HEAD .
    svn merge -c 4779 https://mware.ucdavis.edu/svn/ucd-sakai/ucd-enterprise-data-service/branches/sakai_2-4-x-HEAD .
    

2008-05-12 : Release sakai_2-4-x-HEAD-prod-020 : FND=45460 : UCD=4863

• Externals sakai_2-4-x-HEAD-prod-020
• Using https://mware.ucdavis.edu/svn/ucd-sakai/patches/branches/sakai_2-4-x-HEAD-prod/ @ R 4863
• Sakai Properties
• JIRAs:

  • SAK-1882
    properties changes checked in at revision 4796
    
    SAK-1895
    permission changes in the UI. This was completed before 5pm on 5-12-08
    
    SAK-1812
    database built from scripts will be put into production with HAMMER db server rollout
    
    SAK-1490
    database built from scripts (which includes the new mothra pkg) will be put into production with HAMMER db server rollout
    
    

2008-05-02 : Release sakai_2-4-x-HEAD-prod-019 : FND=45460 : UCD=4790

• Externals sakai_2-4-x-HEAD-prod-019
• Using https://mware.ucdavis.edu/svn/ucd-sakai/patches/sakai_2-4-x-HEAD-prod/ @ R 4790
• Sakai Properties
• JIRAs:

  • SAK-1814
    
    svn merge -c 4584 https://mware.ucdavis.edu/svn/ucd-sakai/portal/branches/sakai_2-4-x-HEAD portal
    U    portal/portal-util/util/src/java/org/sakaiproject/portal/util/ErrorReporter.java
    Committed revision 4782.
    
    
    svn merge -c 4588 https://mware.ucdavis.edu/svn/ucd-sakai/reference/branches/sakai_2-4-x-HEAD reference
    U    reference/library/src/webapp/skin/tool_base.css
    Committed revision 4783.
    
    
    svn merge -c 4594 https://mware.ucdavis.edu/svn/ucd-sakai/sam/branches/sakai_2-4-x-HEAD sam
    U    sam/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/delivery/DeliveryBean.java
    U    sam/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/select/SelectActionListener.java
    U    sam/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/evaluation/SubmissionStatusListener.java
    U    sam/samigo-services/src/java/org/sakaiproject/tool/assessment/facade/AssessmentGradingFacadeQueries.java
    Committed revision 4784.
    
    
    svn merge -c 4605 https://mware.ucdavis.edu/svn/ucd-sakai/dav/branches/sakai_2-4-x-HEAD dav
    U    dav/dav/src/java/org/sakaiproject/dav/DavServlet.java
    Committed revision 4785.
    

  • SAK-1365
    
    Source code changes are included in SAK-1814's Vendor Drop
    

  • SAK-1451
    
    Applied patch and committed it.
    Committed revision 4786.
    

2008-04-18 : Release sakai_2-4-x-HEAD-prod-018 : FND=41066 : UCD=4627

• Externals sakai_2-4-x-HEAD-prod-018
• Using https://mware.ucdavis.edu/svn/ucd-sakai/patches/sakai_2-4-x-HEAD-prod/ @ R 4627
• Sakai Properties
• JIRAs:

  • SAK-1504
    
    svn merge -c 3758 https://mware.ucdavis.edu/svn/ucd-sakai/portal/branches/sakai_2-4-x-HEAD portal/
    U    portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/CharonPortal.java
    U    portal/portal-util/util/src/java/org/sakaiproject/portal/util/PortalSiteHelper.java
    Committed revision 4624.
    
    

2008-04-09 : Release sakai_2-4-x-HEAD-prod-017 : FND=41066 : UCD=4510

• Externals sakai_2-4-x-HEAD-prod-017
• Using https://mware.ucdavis.edu/svn/ucd-sakai/patches/sakai_2-4-x-HEAD-prod/ @ R 4510
• Sakai Properties
• JIRAs:
  • 

    SAK-798
    
    Redoing this merge since I mistakenly committed patch SAK-1305
    svn merge -r 4474:4473 https://mware.ucdavis.edu/svn/ucd-sakai/site-manage/branches/sakai_2-4-x-HEAD-prod site-manage/
    U    site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
    U    site-manage/site-manage-util/.classpath
    Committed revision 4491.
    
    svn merge -c 3980 https://mware.ucdavis.edu/svn/ucd-sakai/site-manage/branches/sakai_2-4-x-HEAD site-manage
    U    site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
    svn merge -c 4490 https://mware.ucdavis.edu/svn/ucd-sakai/site-manage/branches/sakai_2-4-x-HEAD site-manage
    G    site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
    U    site-manage/site-manage-util/.classpath
    Committed revision 4492.
    

  • SAK-1746
    
    svn merge -c 4417 https://mware.ucdavis.edu/svn/ucd-sakai/gradebook/branches/post_2-4-0 gradebook/
    U    gradebook/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/EnrollmentTableBean.java
    Committed revision 4507.
    
    

2008-04-04 : Release sakai_2-4-x-HEAD-prod-016 : FND=41066 : UCD=4477

• Externals sakai_2-4-x-HEAD-prod-016
• Using https://mware.ucdavis.edu/svn/ucd-sakai/patches/sakai_2-4-x-HEAD-prod/ @ R 4477
• Sakai Properties
• JIRAs:

  • SAK-798
    
    svn merge -c 3980 https://mware.ucdavis.edu/svn/ucd-sakai/site-manage/branches/sakai_2-4-x-HEAD site-manage
    U    site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
    svn merge -c 4425 https://mware.ucdavis.edu/svn/ucd-sakai/site-manage/branches/sakai_2-4-x-HEAD site-manage
    G    site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
    U    site-manage/site-manage-util/.classpath
    Committed revision 4474
    

  • SAK-1562
    
    svn merge -c 4427 https://mware.ucdavis.edu/svn/ucd-sakai/authz/branches/sakai_2-4-x-HEAD authz
    U    authz/authz-impl/impl/src/java/org/sakaiproject/authz/impl/UCDavisDbAuthzGroupService.java
    Committed revision 4475
    

2008-03-27 : Release sakai_2-4-x-HEAD-prod-015 : FND=41066 : UCD=4069

• Externals sakai_2-4-x-HEAD-prod-015
• Using https://mware.ucdavis.edu/svn/ucd-sakai/patches/sakai_2-4-x-HEAD-prod/ @ R 4442
• Sakai Properties
• JIRAs:

  • SAK-1191
    
    svn copy
      https://mware.ucdavis.edu/svn/ucd-sakai/patches/sakai_2-4-x-HEAD/SAK-1191.patch
      https://mware.ucdavis.edu/svn/ucd-sakai/patches/sakai_2-4-x-HEAD-prod/SAK-1191.patch
    Committed revision 4441.
    
    Adding patch command to apply-patches.sh
    Committed revision 4442.
    

2008-02-22 : Release sakai_2-4-x-HEAD-prod-014 : FND=41066 : UCD=4069

• Externals sakai_2-4-x-HEAD-prod-014
• Using https://mware.ucdavis.edu/svn/ucd-sakai/patches/sakai_2-4-x-HEAD-prod/ @ R 4069
• Sakai Properties
• JIRAs:

  • SAK-1568
    
    svn merge -c 3976 https://mware.ucdavis.edu/svn/ucd-sakai/site-manage/branches/sakai_2-4-x-HEAD site-manage/
    U    site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
    Committed revision 4064.
    

  • SAK-1515
    
    svn copy
      https://mware.ucdavis.edu/svn/ucd-sakai/patches/sakai_2-4-x-HEAD/SAK-1515.patch
      https://mware.ucdavis.edu/svn/ucd-sakai/patches/sakai_2-4-x-HEAD-prod/SAK-1515.patch
    Committed revision 4065.
    
    Adding patch command to apply-patches.sh
    Committed revision 4066.
    

2008-03-02 : Release sakai_2-4-x-HEAD-prod-013 : FND=41066 : UCD=4006

• Externals sakai_2-4-x-HEAD-prod-013
• Using https://mware.ucdavis.edu/svn/ucd-sakai/patches/sakai_2-4-x-HEAD-prod/ @ R 4006
• Sakai Properties
• JIRAs:

  • SAK-1546
    
    svn merge -c 3884 https://mware.ucdavis.edu/svn/ucd-sakai/site/branches/sakai_2-4-x-HEAD site/
    U    site/site-impl/impl/src/java/org/sakaiproject/site/impl/DbSiteService.java
    Committed revision 3993.
    

  • SAK-1525
    
    svn merge -c 3896 https://mware.ucdavis.edu/svn/ucd-sakai/authz/branches/sakai_2-4-x-HEAD authz/
    U    authz/authz-tool/.classpath
    U    authz/authz-tool/tool/project.xml
    U    authz/authz-tool/tool/src/java/org/sakaiproject/authz/tool/RealmsAction.java
    U    authz/authz-tool/tool/src/bundle/authz-tool.properties
    U    authz/authz-tool/tool/pom.xml
    Committed revision 3996.
    
    ====
    
    svn merge -c 3906 https://mware.ucdavis.edu/svn/ucd-sakai/portal/branches/sakai_2-4-x-HEAD portal/
    U    portal/portal-impl/impl/src/bundle/sitenav_nl.properties
    U    portal/portal-util/util/src/bundle/portal-util_nl.properties
    Committed revision 3997.
    
    ====
    
    svn merge -c 3910 https://mware.ucdavis.edu/svn/ucd-sakai/reference/branches/sakai_2-4-x-HEAD reference/
    U    reference/library/src/webapp/content/webcontent_instructions.html
    U    reference/library/src/webapp/content/webdav_instructions.html
    U    reference/library/src/webapp/content/myworkspace_info.html
    U    reference/library/src/webapp/content/server_info.html
    U    reference/docs/sakai.properties
    A    reference/docs/conversion/sakai_2_4_0-2_4_x_mysql_conversion_005.sql
    A    reference/docs/conversion/sakai_2_4_0-2_4_x_oracle_conversion_005.sql
    Committed revision 3998.
    
    ====
    
    svn merge -c 3914 https://mware.ucdavis.edu/svn/ucd-sakai/sam/branches/sakai_2-4-x-HEAD sam
    U    sam/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/EvaluationMessages_nl.properties
    U    sam/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/TemplateMessages_nl.properties
    U    sam/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/QuestionPoolMessages_nl.properties
    U    sam/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/AssessmentSettingsMessages_nl.properties
    U    sam/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/AuthorMessages_nl.properties
    U    sam/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/DeliveryMessages_nl.properties
    U    sam/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/AuthorFrontDoorMessages_nl.properties
    U    sam/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/evaluation/HistogramListener.java
    Committed revision 3999.
    
    ====
    
    svn merge -c 3917 https://mware.ucdavis.edu/svn/ucd-sakai/site/branches/sakai_2-4-x-HEAD site/
    U    site/site-tool/tool/src/bundle/admin_nl.properties
    Committed revision 4000.
    
    ====
    
    svn merge -c 3921 https://mware.ucdavis.edu/svn/ucd-sakai/tool/branches/sakai_2-4-x-HEAD tool/
    A    tool/tool-impl/impl/src/bundle/tools_nl.properties
    Committed revision 4001.
    
    ====
    
    svn merge -c 3924 https://mware.ucdavis.edu/svn/ucd-sakai/user/branches/sakai_2-4-x-HEAD user/
    U    user/user-tool/tool/src/bundle/admin_nl.properties
    Committed revision 4002.
    

  • SAK-1586
    
    svn merge -c 4019 https://mware.ucdavis.edu/svn/ucd-sakai/site-manage/branches/sakai_2-4-x-HEAD site-manage
    U    site-manage/site-manage-tool/tool/src/bundle/membership.properties
    Committed revision 4031.
    
    

2008-02-10 : Release sakai_2-4-x-HEAD-prod-012 : FND=39636 : UCD=3870

• Externals sakai_2-4-x-HEAD-prod-012
• Using https://mware.ucdavis.edu/svn/ucd-sakai/patches/sakai_2-4-x-HEAD-prod/ @ R 3870
• Sakai Properties
• JIRAs:

  • SAK-1451
    
    svn copy
       https://mware.ucdavis.edu/svn/ucd-sakai/patches/sakai_2-4-x-HEAD/SAK-1451.patch
       https://mware.ucdavis.edu/svn/ucd-sakai/patches/sakai_2-4-x-HEAD-prod/SAK-1451.patch
    Committed revision 3865.
    
    Modified /patches/sakai_2-4-x-HEAD-prod/apply-patches.sh
    Committed revision 3866.
    

  • SAK-969
    
    svn merge -c 3725 https://mware.ucdavis.edu/svn/ucd-sakai/portal/branches/sakai_2-4-x-HEAD portal/
    U    portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/handlers/ContactUsHandler.java
    svn merge -c 3726 https://mware.ucdavis.edu/svn/ucd-sakai/configuration/branches/sakai_2-4-x-HEAD configuration/
    U    configuration/configuration-impl/pack/src/webapp/WEB-INF/components.xml
    Committed revision 3867.
    

2008-01-25 : Release sakai_2-4-x-HEAD-prod-011 : FND=39636 : UCD=3741

• Externals sakai_2-4-x-HEAD-prod-011
• Using https://mware.ucdavis.edu/svn/ucd-sakai/patches/sakai_2-4-x-HEAD-prod/ @ R 3741
• Sakai Properties
• JIRAs:

  • SAK-1464
    svn merge -c 3701 https://mware.ucdavis.edu/svn/ucd-sakai/site/branches/sakai_2-4-x-HEAD site/
    U    site/site-impl/.classpath
    U    site/site-impl/impl/project.xml
    U    site/site-impl/impl/src/java/org/sakaiproject/site/impl/UCDavisSiteService.java
    U    site/site-impl/pack/src/webapp/WEB-INF/components.xml
    Committed revision 3732
    
    svn merge -c 3701 https://mware.ucdavis.edu/svn/ucd-sakai/configuration/branches/sakai_2-4-x-HEAD configuration/
    U    configuration/configuration-impl/pack/src/webapp/WEB-INF/components.xml
    Committed revision 3756
    

  • SAK-1460
    svn merge -c 3703 https://mware.ucdavis.edu/svn/ucd-sakai/portal/branches/sakai_2-4-x-HEAD portal/
    U    portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/SkinnableCharonPortal.java
    Committed revision 3733
    

  • SAK-1452
    https://mware.ucdavis.edu/svn/ucd-sakai/maintenance/sakai_2.4.x/SAK-1452.sql
    

  • SAK-1442
    svn merge -c 3631 https://mware.ucdavis.edu/svn/ucd-sakai/site-manage/branches/sakai_2-4-x-HEAD site-manage/
    U    site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
    Committed revision 3734
    

  • SAK-1404
    svn merge -c 3609 https://mware.ucdavis.edu/svn/ucd-sakai/sam/branches/sakai_2-4-x-HEAD sam/
    U    sam/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/delivery/LinearAccessDeliveryActionListener.java
    U    sam/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/delivery/DeliveryActionListener.java
    Committed revision 3735
    

  • SAK-1378
    https://mware.ucdavis.edu/svn/ucd-sakai/maintenance/sakai_2.4.x/SAK-1378.sql
    

  • SAK-1350
    svn merge -c 3672 https://mware.ucdavis.edu/svn/ucd-sakai/ucd-db/branches/sakai_2-4-x-HEAD ucd-db/
    U    ucd-db/ucd-db-impl/impl/src/java/edu/ucdavis/springframework/orm/hibernate/impl/NoRollbackTransactionManager.java
    Committed revision 3736
    
    

  • SAK-1349
    svn merge -c 3624 https://mware.ucdavis.edu/svn/ucd-sakai/authz/branches/sakai_2-4-x-HEAD authz/
    U    authz/authz-impl/.classpath
    U    authz/authz-impl/impl/src/java/org/sakaiproject/authz/impl/UCDavisDbAuthzGroupService.java
    Committed revision 3737
    

–

SAK-1031
https://mware.ucdavis.edu/svn/ucd-sakai/maintenance/sakai_2.4.x/SAK-1031_term.sql
https://mware.ucdavis.edu/svn/ucd-sakai/maintenance/sakai_2.4.x/SAK-1031_term_eid.sql

–

SAK-913
svn merge -c 3639 https://mware.ucdavis.edu/svn/ucd-sakai/site-manage/branches/sakai_2-4-x-HEAD site-manage/
U    site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
Committed revision 3738

2008-01-14 : Release sakai_2-4-x-HEAD-prod-010 : FND=39636 : UCD=3685

• Externals sakai_2-4-x-HEAD-prod-010
• Using https://mware.ucdavis.edu/svn/ucd-sakai/patches/sakai_2-4-x-HEAD-prod/ @ R 3685
• Sakai Properties
• JIRAs:

  • SAK-636
    
    svn merge -c 3660 https://mware.ucdavis.edu/svn/ucd-sakai/ucd-form-based-distauth/branches/sakai_2-4-x-HEAD ucd-form-based-distauth
    U    ucd-form-based-distauth/impl/src/java/edu/ucdavis/security/distauth/AuthenticationFilter.java
    Committed revision 3685.
    
    

  • SAK-1064
    
    svn merge -c 3039 https://mware.ucdavis.edu/svn/ucd-sakai/ucd-form-based-distauth/branches/sakai_2-4-x-HEAD ucd-form-based-distauth
    U    ucd-form-based-distauth/impl/src/java/edu/ucdavis/security/distauth/DA1Cookie.java
    U    ucd-form-based-distauth/impl/src/java/edu/ucdavis/security/distauth/AuthenticationFilter.java
    U    ucd-form-based-distauth/impl/src/java/edu/ucdavis/security/distauth/AuthUserCookie.java
    Committed revision 3684.
    

  • SAK-1348
    
    svn merge -c 3511 https://mware.ucdavis.edu/svn/ucd-sakai/gradebook/branches/post_2-4-0 gradebook
    U    gradebook/app/ui/src/webapp/courseGradeDetails.jsp
    Committed revision 3681.
    

  • SAK-1362
    
    svn merge -c 3539 https://mware.ucdavis.edu/svn/ucd-sakai/gradebook/branches/post_2-4-0 gradebook
    U    gradebook/service/hibernate/src/java/org/sakaiproject/tool/gradebook/Category.java
    Committed revision 3682.
    

2008-01-04 : Release sakai_2-4-x-HEAD-prod-009 : FND=39636 : UCD=3606

• Externals sakai_2-4-x-HEAD-prod-009
• Using https://mware.ucdavis.edu/svn/ucd-sakai/patches/sakai_2-4-x-HEAD-prod/ @ R 3606
• Sakai Properties
• JIRAs:

  • SAK-1389
    
    Vendor Drop: Sakai FND @ R39636 from 2-4-x-HEAD into 2-4-x-HEAD-prod
    login:
    svn merge -c 3566 https://mware.ucdavis.edu/svn/ucd-sakai/login/branches/sakai_2-4-x-HEAD/ login/
    U    login/login-tool/tool/src/java/org/sakaiproject/login/tool/LoginTool.java
    Committed revision 3599.
    
    reference:
    svn merge -c 3572 https://mware.ucdavis.edu/svn/ucd-sakai/reference/branches/sakai_2-4-x-HEAD/ reference/
    U    reference/library/src/webapp/content/webdav_instructions.html
    A    reference/docs/conversion/sakai_2_4_0-2_4_x_mysql_conversion_004.sql
    A    reference/docs/conversion/sakai_2_4_0-2_4_x_oracle_conversion_004.sql
    Committed revision 3600.
    
    patches:
    svn merge -c 3587 https://mware.ucdavis.edu/svn/ucd-sakai/patches/sakai_2-4-x-HEAD/ .
    U    SAK-1169.patch
    Committed revision 3601.
    

2007-12-14 : Release sakai_2-4-x-HEAD-prod-008 : FND=38143 : UCD=3504 : Syllabus=38783

• Externals sakai_2-4-x-HEAD-prod-008
• Using https://mware.ucdavis.edu/svn/ucd-sakai/patches/sakai_2-4-x-HEAD-prod/ @ R 3504
• Sakai Properties
• JIRAs:

  • SAK-1336
    
    patch: https://mware.ucdavis.edu/svn/ucd-sakai/patches/sakai_2-4-x-HEAD-prod/SAK-1336.patch
    ====
    Revisions ==> 3470, 3471
    

  • SAK-1319
    
    Vendor Drop: Sakai FND @ R38143 from 2-4-x-HEAD into 2-4-x-HEAD-prod
    authz        R3337 --> R3475
    gradebook    R3368 --> R3476
    
    jobscheduler R3343 --> R3477
    portal       R3348 --> R3478
    reference    R3352 --> R3479
    rwiki        R3355 --> R3480
    sam          R3358 --> R3481
    
    Because of the chat and jobscheduler changes, I needed to adjust a couple of patches:
    svn merge -c 3371
    https://mware.ucdavis.edu/svn/ucd-sakai/patches/sakai_2-4-x-HEAD/ .
    U    SAK-1051.patch
    
    svn merge -c 3378
    https://mware.ucdavis.edu/svn/ucd-sakai/patches/sakai_2-4-x-HEAD/ .
    U    SAK-784.patch
    ====
    Revision ==> 3482
    

  • SAK-1245
    
    svn merge -c 3238
    https://mware.ucdavis.edu/svn/ucd-sakai/portal/branches/sakai_2-4-x-HEAD
    portal
    
    U    portal/portal-impl/.classpath
    U    portal/portal-impl/impl/project.xml
    U    portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/SkinnableCharonPortal.java
    
    svn merge -c 3322
    https://mware.ucdavis.edu/svn/ucd-sakai/portal/branches/sakai_2-4-x-HEAD
    portal
    
    G    portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/SkinnableCharonPortal.java
    
    svn merge -c 3328
    https://mware.ucdavis.edu/svn/ucd-sakai/portal/branches/sakai_2-4-x-HEAD
    portal
    
    G    portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/SkinnableCharonPortal.java
    ====
    Revision ==> 3500
    
    svn merge -c 3422
    https://mware.ucdavis.edu/svn/ucd-sakai/reference/branches/sakai_2-4-x-HEAD
    reference/
    
    U    reference/library/src/webapp/skin/smartsite/portal.css
    ====
    Revision ==> 3501
    

  • SAK-1335
    
    svn merge -c 3437
    https://mware.ucdavis.edu/svn/ucd-sakai/portal/branches/sakai_2-4-x-HEAD
    portal
    
    U    portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/SkinnableCharonPortal.java
    ====
    Revision ==> 3502
    

2007-11-19 : Release sakai_2-4-x-HEAD-prod-007 : FND=34826 : UCD=3402 : Assignment=35942

• Externals sakai_2-4-x-HEAD-prod-007
• Using https://mware.ucdavis.edu/svn/ucd-sakai/patches/sakai_2-4-x-HEAD-prod/ @ R 3402
• Sakai Properties
• JIRAs:

  • SAK-1029
    
    svn merge -c 3304
    https://mware.ucdavis.edu/svn/ucd-sakai/site-manage/branches/sakai_2-4-x-HEAD/site-manage-tool/
    site-manage/site-manage-tool/
    
    U    site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
    ====
    Revision ==> 3398
    

  • SAK-1257
    
    svn merge -c 3320
    https://mware.ucdavis.edu/svn/ucd-sakai/site-manage/branches/sakai_2-4-x-HEAD/site-manage-tool/
    site-manage/site-manage-tool/
    
    U    site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
    U    site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric.properties
    U    site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-newSiteCourseManual.vm
    U    site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-findCourse.vm
    U    site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-siteInfo-editClass.vm
    U    site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-newSiteCourse.vm
    ====
    Revision ==> 3399
    

  • SAK-1298
    
    svn merge -c 3321
    https://mware.ucdavis.edu/svn/ucd-sakai/site-manage/branches/sakai_2-4-x-HEAD/site-manage-tool/
    site-manage/site-manage-tool/
    
    U   site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
    ====
    Revision ==> 3400
    

2007-11-05 : Release sakai_2-4-x-HEAD-prod-006 : FND=34826 : UCD=3317 : Assignment=35942

• Externals sakai_2-4-x-HEAD-prod-006
• Using https://mware.ucdavis.edu/svn/ucd-sakai/patches/sakai_2-4-x-HEAD-prod/ @ R 3317
• Sakai Properties
• JIRAs:

  • SAK-968
    
    patch: https://mware.ucdavis.edu/svn/ucd-sakai/patches/sakai_2-4-x-HEAD-prod/SAK-965.patch 
    

  • SAK-1015
    
    svn merge -c 3024
    https://mware.ucdavis.edu/svn/ucd-sakai/site/branches/sakai_2-4-x-HEAD/
    site/
    
    U    site/site-impl/.classpath
    A    site/site-impl/impl/src/sql/mysql/sakai_site_2_4_ucd.sql
    A    site/site-impl/impl/src/sql/oracle/sakai_site_2_4_ucd.sql
    U    site/site-impl/impl/src/java/org/sakaiproject/site/impl/UCDavisSiteService.java
    ====
    
    svn merge -c 3232
    https://mware.ucdavis.edu/svn/ucd-sakai/site/branches/sakai_2-4-x-HEAD/ 
    site/
    
    G    site/site-impl/impl/src/java/org/sakaiproject/site/impl/UCDavisSiteService.java
    ====
    
    Revision ==> 3308
    

  • SAK-1246
    
    svn merge -c 3244
    https://mware.ucdavis.edu/svn/ucd-sakai/configuration/branches/sakai_2-4-x-HEAD/
    configuration/
    
    U    configuration/configuration-impl/impl/src/java/org/sakaiproject/configuration/service/impl/DynamicServerConfigurationServiceImpl.java
    ====
    
    Revision ==> 3309
    

  • SAK-1254
    
    svn merge -c 3283
    https://mware.ucdavis.edu/svn/ucd-sakai/site-manage/branches/sakai_2-4-x-HEAD/site-manage-tool/
    site-manage/site-manage-tool/
    
    U    site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
    U    site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-newSiteCourseManual.vm
    ====
    
    Revision ==> 3310
    

  • SAK-1255
    
    svn merge -c 3286
    https://mware.ucdavis.edu/svn/ucd-sakai/site-manage/branches/sakai_2-4-x-HEAD/site-manage-impl/
    site-manage/site-manage-impl/
    
    U    site-manage/site-manage-impl/impl/src/java/org/sakaiproject/sitemanage/impl/SectionFieldManagerImpl.java
    ====
    
    Revision ==> 3311
    

  • SAK-1256
    
    svn merge -c 3287
    https://mware.ucdavis.edu/svn/ucd-sakai/site-manage/branches/sakai_2-4-x-HEAD/site-manage-tool/
    site-manage/site-manage-tool/
    
    U    site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
    ====
    
    Revision ==> 3312
    

2007-10-29 : Release sakai_2-4-x-HEAD-prod-005 : FND=34826 : UCD=3289 : Assignment=35942

• Externals sakai_2-4-x-HEAD-prod-005
• Using https://mware.ucdavis.edu/svn/ucd-sakai/patches/sakai_2-4-x-HEAD-prod/ @ R 3289
• Sakai Properties
• JIRAs:

  • SAK-1139
    
    svn merge -c 3008
    https://mware.ucdavis.edu/svn/ucd-sakai/site-manage/branches/sakai_2-4-x-HEAD/site-manage-tool/
    site-manage/site-manage-tool
    
    U    site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
    ====
    
    svn merge -c 3009
    https://mware.ucdavis.edu/svn/ucd-sakai/providers/branches/sakai_2-4-x-HEAD/
    providers/
    
    U    providers/ucd-providers/src/java/org/sakaiproject/provider/ucd/impl/UserDirectoryProviderImpl.java
    ====
    
    Revision == > 3270 and 3271
    

  • SAK-1140
    
    svn merge -c 3010
    https://mware.ucdavis.edu/svn/ucd-sakai/site-manage/branches/sakai_2-4-x-HEAD/site-manage-tool site-manage/site-manage-tool/
    
    U    site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
    ====
    
    svn merge -c 3011
    https://mware.ucdavis.edu/svn/ucd-sakai/site-manage/branches/sakai_2-4-x-HEAD/site-manage-tool site-manage/site-manage-tool/
    
    G    site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
    ====
    
    Revision ==> 3272
    

  • SAK-1142
    
    svn merge -c 3012
    https://mware.ucdavis.edu/svn/ucd-sakai/cm-ucd-impl/branches/sakai_2-4-x-HEAD/
    cm-ucd-impl/
    
    U    cm-ucd-impl/hibernate-impl/model/src/hibernate/org/sakaiproject/coursemanagement/impl/EnrollmentCmImpl.hbm.xml
    U    cm-ucd-impl/hibernate-impl/model/src/java/org/sakaiproject/coursemanagement/impl/EnrollmentCmImpl.java
    ====
    
    svn merge -c 3014
    https://mware.ucdavis.edu/svn/ucd-sakai/site-manage/branches/sakai_2-4-x-HEAD/site-manage-tool/ site-manage/site-manage-tool/
    
    U    site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
    ====
    
    Revision ==> 3273 and 3274
    

  • SAK-1146
    
    svn merge -c 3023
    https://mware.ucdavis.edu/svn/ucd-sakai/site-manage/branches/sakai_2-4-x-HEAD/site-manage-tool/ site-manage/site-manage-tool/
    
    U    site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
    ====
    svn merge -c 3012
    https://mware.ucdavis.edu/svn/ucd-sakai/course-management/branches/sakai_2-4-x-HEAD/
    course-management/ 
    
    A    course-management/cm-api/api/src/java/org/sakaiproject/coursemanagement/api/UserInfoAware.java
    
    Revision ==> 3275 and 3288
    

  • SAK-1193
    
    svn merge -c 3124
    https://mware.ucdavis.edu/svn/ucd-sakai/site-manage/branches/sakai_2-4-x-HEAD/site-manage-impl
    site-manage/site-manage-impl
    
    U    site-manage/site-manage-impl/impl/src/bundle/SectionFields.properties
    ====
    
    svn merge -c 3125
    https://mware.ucdavis.edu/svn/ucd-sakai/site-manage/branches/sakai_2-4-x-HEAD/site-manage-tool
    site-manage/site-manage-tool/
    
    U    site-manage/site-manage-tool/.classpath
    U    site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
    ====
    
    svn merge -c 3140
    https://mware.ucdavis.edu/svn/ucd-sakai/site-manage/branches/sakai_2-4-x-HEAD/site-manage-tool
    site-manage/site-manage-tool/
    
    G    site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
    ====
    
    Revision ==> 3264 and 3265 (first try)
    Revision ==> 3268 and 3269 (reversed previous merges because of out of sequence conflicts)
    Revision ==> 3276 and 3277 (reapplied initial merges)
    

2007-10-22 : Release sakai_2-4-x-HEAD-prod-004 : FND=34826 : UCD=3229 : Assignment=35942

• Externals sakai_2-4-x-HEAD-prod-004
• Using https://mware.ucdavis.edu/svn/ucd-sakai/patches/sakai_2-4-x-HEAD-prod/ @ R 3229
• Sakai Properties
• JIRAs:

  • SAK-1175
    
    svn merge -c 3053
    https://mware.ucdavis.edu/svn/ucd-sakai/login/branches/sakai_2-4-x-HEAD/
    login/
    
    U    login/login-tool/tool/src/java/org/sakaiproject/login/tool/ContainerLogin.java
    
    Revision ==> 3225
    

  • SAK-1182
    
    svn merge -c 3058
    https://mware.ucdavis.edu/svn/ucd-sakai/tool/branches/sakai_2-4-x-HEAD/
    tool/
    
    U    tool/tool-tool/su/src/java/org/sakaiproject/tool/su/SuTool.java
    U    tool/tool-tool/su/src/bundle/tool-tool-su.properties
    
    Revision ==> 3228
    

2007-10-15 : Release sakai_2-4-x-HEAD-prod-003 : FND=34826 : UCD=3065 : Assignment=35942

• Externals sakai_2-4-x-HEAD-prod-003
• Using https://mware.ucdavis.edu/svn/ucd-sakai/patches/sakai_2-4-x-HEAD-prod/ @ R 3065
• Sakai Properties
• JIRAs:

  • SAK-1132
    
    svn merge -c 3030
    https://mware.ucdavis.edu/svn/ucd-sakai/site-manage/branches/sakai_2-4-x-HEAD/site-manage-tool/
    site-manage/site-manage-tool/
    
    U    site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
    

  • SAK-1084
    
    svn merge -c 2955
    https://mware.ucdavis.edu/svn/ucd-sakai/site-manage/branches/sakai_2-4-x-HEAD/site-manage-tool/ site-manage/site-manage-tool/
    
    U    site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
    ====
    svn merge -c 3001
    https://mware.ucdavis.edu/svn/ucd-sakai/site-manage/branches/sakai_2-4-x-HEAD/site-manage-tool/ site-manage/site-manage-tool/
    
    G    site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
    U    site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-newSiteCourseManual.vm
    U    site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-findCourse.vm
    U    site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-newSiteInformation.vm
    U    site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-newSiteCourse.vm
    ====
    svn merge -c 3004
    https://mware.ucdavis.edu/svn/ucd-sakai/site-manage/branches/sakai_2-4-x-HEAD/site-manage-tool/ site-manage/site-manage-tool/
    
    G    site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
    C    site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric.properties
    G    site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-newSiteCourseManual.vm
    G    site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-findCourse.vm
    G    site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-newSiteInformation.vm
    G    site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-newSiteCourse.vm
    ====
    NOTE: I had to resolve conflict in:
    C    site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric.properties
    

  • SAK-1027
    
    svn merge -c 2882
    https://mware.ucdavis.edu/svn/ucd-sakai/site-manage/branches/sakai_2-4-x-HEAD/site-manage-tool/ site-manage/site-manage-tool/
    
    U    site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
    
    C    site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric.properties
    ====
    NOTE: I had to resolve conflict in:
    site-manage/site-manage-tool/tool/src/bundle/sitesetupgeneric.properties
    

2007-10-08 : Release sakai_2-4-x-HEAD-prod-002 : FND=34826 : UCD=2968 : Assignment=35942

• Externals sakai_2-4-x-HEAD-prod-002
• Using https://mware.ucdavis.edu/svn/ucd-sakai/patches/sakai_2-4-x-HEAD-prod/ @ R 2968
• Sakai Properties

2007-09-24 : Release sakai_2-4-x-HEAD-prod-001 : FND=34826 : UCD=2968

• Externals sakai_2-4-x-HEAD-prod-001
• Using https://mware.ucdavis.edu/svn/ucd-sakai/patches/sakai_2-4-x-HEAD-prod/ @ R 2968
• Sakai Properties

2007-09-24 : Created production branches for all of our modules from sakai_2-4-x-HEAD-test-009 at revision 2904

• Production Branches Creation sakai-2-4-x-HEAD-prod
• Had to also adjust site-manage and zhelp in groovy script to use sakai_2-4-x-HEAD-prod branch
• Also, since this branch was created from sakai_2-4-x-HEAD, there were code changes that haven't QAed yet

  • IN:
    SAK-1089 : Default Tools list for Fall Quarter - QA and programming asset
    SAK-1073 : Disable course sites from being joinable
    SAK-1062 : Error generated in Gradebook when submitting a points grade to a gb item which will not be included in the course grade.
    SAK-1055 : Adjust application logging to have more pertinent data in catalina.out
    SAK-1051 : Replace DBCP with c3po
    SAK-1020 : Dynamic configuration service excessive DB access for exists check
    SAK-1019 : Experiment with turning Presence off quickly via JMX/Jconsole
    SAK-986 : Site Info tool doesn't show any participants for courses
    SAK-1033 : Make CM provider aware of new "Open Campus" role
    
    
    
    OUT: (needs to be removed)
    SAK-1064 : Add levelone protection to auth filter (is a patch need to remove it from patches)
    SAK-1027 : Prevent sites from being created with duplicate titles (revision 2882)
    - svn merge -r 2882:2881 https://mware.ucdavis.edu/svn/ucd-sakai/site-manage/branches/sakai_2-4-x-HEAD/site-manage-tool/ site-manage/site-manage-tool/
    -- Committed revision 2964
    SAK-636 : login process stops after filter chain ends (revision 2824)
    - svn merge -r 2824:2823 https://mware.ucdavis.edu/svn/ucd-sakai/login/branches/sakai_2-4-x-HEAD/ login
    -- Committed revision 2965
    SAK-855 : Stats queries fine tunings (revisions 2616, 2645)
    - Don't revert 2645 because it just added the SQL DDL
    - svn merge -r 2616:2615 https://mware.ucdavis.edu/svn/ucd-sakai/ucd-stats/branches/sakai_2-4-x-HEAD/ ucd-stats
    -- Committed revision 2966