Project

General

Profile

Bug #85

Merge JTA Branch into trunk

Added by Andrae Muys - over 12 years ago. Updated over 12 years ago.

Status:
Closed
Priority:
High
Assignee:
Category:
Mulgara
Target version:
Start date:
Due date:
% Done:

0%

Estimated time:
Resolution:
fixed

Description

Merge JTA Branch into trunk

#1

Updated by Andrae Muys - over 12 years ago

  • Status changed from New to In Progress
#2

Updated by Andrae Muys - over 12 years ago

(In r678) refs #73
refs #85

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

Revision 626 and 627 merged earlier by ronald.

#3

Updated by Andrae Muys - over 12 years ago

(In r679) 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.

#4

Updated by Andrae Muys - over 12 years ago

(In r680) refs #73
refs #85

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

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

#5

Updated by Andrae Muys - over 12 years ago

(In r681) refs #73
refs #85

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

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

#6

Updated by Andrae Muys - over 12 years ago

(In r688) refs #73
refs #85

Cleanup prior to legal review.

#7

Updated by Andrae Muys - over 12 years ago

(In r690) refs #73
refs #85

Updates copyright notices and javadocs to reflect new work.

#8

Updated by Andrae Muys - over 12 years ago

(In r691) refs #73
refs #85

Final merge of the JTA development into trunk.

#9

Updated by Andrae Muys - over 12 years ago

  • Status changed from In Progress to Closed
  • Resolution set to fixed

Also available in: Atom PDF