Ticket #85 (closed defect: fixed)

Opened 9 months ago

Last modified 9 months ago

Merge JTA Branch into trunk

Reported by: andrae Assigned to: andrae
Priority: major Milestone: JTA Support
Component: Mulgara Version: 1.1.1
Keywords: Cc:

Change History

03/16/08 20:35:05 changed by andrae

  • owner changed from pag to andrae.
  • status changed from new to assigned.

03/16/08 20:35:45 changed by andrae

(In [678]) refs #73 refs #85

svn merge -r 619:625 ../../trunk/ .

Revision 626 and 627 merged earlier by ronald.

03/16/08 21:18:26 changed by andrae

(In [679]) refs #73 refs #85

svn merge -r 627:675 ../../trunk/ .

This brings mgr-73 in sync with trunk just prior to the large log4j commit by ronald.

conflicts fixed: build.xml, common.xml - everything else merged cleanly.

03/17/08 01:12:10 changed by andrae

(In [680]) refs #73 refs #85

Fixes up some incompatibilities with updated jar-files in trunk/

Specifically trouble with the jotm upgrade, and the wsdl upgrade.

03/17/08 01:19:02 changed by andrae

(In [681]) refs #73 refs #85

svn merge -r 675:677 ../../trunk/ .

This brings the mgr-73 branch in sync with trunk.

03/17/08 18:24:19 changed by andrae

(In [688]) refs #73 refs #85

Cleanup prior to legal review.

03/18/08 00:02:25 changed by andrae

(In [690]) refs #73 refs #85

Updates copyright notices and javadocs to reflect new work.

03/18/08 02:32:14 changed by andrae

(In [691]) refs #73 refs #85

Final merge of the JTA development into trunk.

03/18/08 02:33:49 changed by andrae

  • status changed from assigned to closed.
  • resolution set to fixed.