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

« Previous Version 75 Next »

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

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

--

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.



h4. 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/ @ R 3606
- [Sakai Properties|https://mware.ucdavis.edu/svn/ucd-sakai/sakai-properties/tags/prod-sakai-2-4-x-HEAD-prod-009]
- 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.

h4. 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/ @ R 3504
- [Sakai Properties|https://mware.ucdavis.edu/svn/ucd-sakai/sakai-properties/tags/prod-sakai-2-4-x-HEAD-prod-008]
- 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

h4. 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/ @ R 3402
- [Sakai Properties|https://mware.ucdavis.edu/svn/ucd-sakai/sakai-properties/tags/prod-sakai-2-4-x-HEAD-prod-007]
- 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


h4. 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/ @ R 3317
- [Sakai Properties|https://mware.ucdavis.edu/svn/ucd-sakai/sakai-properties/tags/prod-sakai-2-4-x-HEAD-prod-006]
- 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


h4. 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/ @ R 3289
- [Sakai Properties|https://mware.ucdavis.edu/svn/ucd-sakai/sakai-properties/tags/prod-sakai-2-4-x-HEAD-prod-005]
- 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)

h4. 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/ @ R 3229
- [Sakai Properties|https://mware.ucdavis.edu/svn/ucd-sakai/sakai-properties/tags/prod-sakai-2-4-x-HEAD-prod-004]
- 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

h4. 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/ @ R 3065
- [Sakai Properties|https://mware.ucdavis.edu/svn/ucd-sakai/sakai-properties/tags/prod-sakai-2-4-x-HEAD-prod-003]
- 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

h4. 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/ @ R 2968
- [Sakai Properties|https://mware.ucdavis.edu/svn/ucd-sakai/sakai-properties/tags/prod-sakai-2-4-x-HEAD-prod-002]


h4. 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/ @ R 2968
- [Sakai Properties|https://mware.ucdavis.edu/svn/ucd-sakai/sakai-properties/tags/prod-sakai-2-4-x-HEAD-prod-001]


h3. 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)
  • No labels