Framework for automatically merging customizations to structured code that has been refactored

• US 8,321,834 B2
• Filed: 09/25/2008
• Issued: 11/27/2012
• Est. Priority Date: 09/25/2008
• Status: Expired due to Fees

• Current Assignee: International Business Machines Corporation
• Original Assignee: International Business Machines Corporation
• Inventors: Ng, Walfrey, Song, Chenfei, Yuan, Yu, Baker, Bruce R
• Primary Examiner(s): KENDALL, CHUCK O
• Application Number:
  US12/238,135
• Publication Number:
  US 20100077380A1
• Time in Patent Office: 1,524 Days
• Field of Search: None
• US Class Current: 717/107
• CPC Class Codes: G06F 8/71 Version control security arrangements therefor G06F21/57; Configuration management
• CPC Class Codes: G06F 8/72 Code refactoring

Abstract

A method of generating a tool for merging customizations made to a first version of a software artifact when migrating to a second version includes instantiating a mapping element for each top-level element in a first code set that does not have a complementary element in a second code set; requesting and receiving merge instructions for each top-level element for which merge instructions are not provided in the corresponding mapping element; determining whether the merge instructions for each top-level element for which merge instructions are provided require that customizations be merged into the second code set; determining whether the merge instructions for each top-level element set that requires customizations to be merged are valid; requesting and receiving merge instructions for each top-level element for which the merge instructions are not valid; and storing the merge instructions received for each top-level element in the corresponding mapping element.

Claims

1. A method of generating a tool for merging customizations made to a first version of a software artifact when migrating to a second version of the software artifact, the method comprising:

instantiating a mapping information element in a first data store for each top-level data element in a first code set for the first version that does not have a complementary data element in a second code set for the second version;

requesting merge instructions for each top-level data element in the first code set for which merge instructions are not provided in the corresponding mapping information element for the top-level data element;

receiving merge instructions for each top-level data element in the first code set for which merge instructions are not provided;

determining whether the merge instructions for each top-level data element in the first code set for which merge instructions are provided require that customizations made to the top-level data element be merged into the second code set;

determining whether the merge instructions for each top-level data element in the first code set that requires customizations made to the top-level data element to be merged are valid;

requesting merge instructions for each top-level data element in the first code set for which the merge instructions are not determined to be valid;

receiving merge instructions for each top-level data element in the first code set for which the merge instructions are not determined to be valid; and

storing the merge instructions received for each top-level data element in the first code set in the corresponding mapping information element in the first data store.

2. The method of claim 1, further comprising generating a mapping information element in the first data store for each descendent data element of each top-level data element in the first code set that does not have a complementary data element in the code set for the second version.

3. The method of claim 2, further comprising generating merge instructions for each descendent data element of each top-level data element in the first code set that does not require customizations made to the top-level data element to be merged specifying that customizations made to the descendent data element do not need to be merged, and storing the merge instructions generating for each descendent data element of each top-level data element in the first code set that does not require customizations made to the top-level data element to be merged.

4. The method of claim 2, further comprising storing the merge instructions for each top-level data element in the first code set for which the merge instructions are determined to be valid in the corresponding mapping information element in the first data store.

5. The method of claim 4, further comprising generating merge instructions for each child data element of each top-level data element in the first code set for which the merge instructions are determined to be valid, determining whether the merge instructions for each child data element of each top-level data element in the first code set for which the merge instructions are determined to be valid, requesting merge instructions for each child data element of each top-level data element in the first code set for which the merge instructions are not determined to be valid, receiving merge instructions for each child data element of each top-level data element in the first code set for which the merge instructions are not determined to be valid, storing the merge instructions received for each child data element of each top-level data element in the first code set for which the merge instructions are not determined to be valid in the corresponding mapping information element in the first data store, and storing the merge instructions for each child data element of each top-level data element in the first code set for which the merge instructions are determined to be valid in the corresponding mapping information element in the first data store.

6. The method of claim 5, further comprising generating merge instructions for each descendent data element of each top-level data element in the first code set that does not require customizations made to the top-level data element to be merged specifying that customizations made to the descendent data element do not need to be merged, and storing the merge instructions for each descendent data element of each top-level data element in the first code set that does not require customizations made to the top-level data element to be merged.

7. The method of claim 6, further comprising wrapping the mapping information elements in the first data store in an application programming interface to provide functionality that can be accessed when migrating the first code set to the second code set to merge customizations made to each data element in the first code set that does not have a complementary data element in the second code set according to the corresponding mapping information element for the data element.

8. The method of claim 7, wherein the mapping information elements and the application programming interface are configured to be incorporated within a migration tool configured to perform migration of the first code set to the second code set.

9. The method of claim 1, wherein each mapping information element in the first data store includes a first field for a first name value of a first file of the first code set in which the corresponding data element is located, a second field for a first location value in the first file at which the corresponding data element is located, a third field for a key value indicative of whether customizations made to the corresponding data element in the first code set should merged into the second code set, a fourth field for a second name value of a second file of the second code set in which customizations to the corresponding data element are to be merged, and a fifth field for a second location value in the second file at which customizations to the corresponding data element are to be merged.

10. The method of claim 1, further comprising comparing the first code set with the second code set to identify each top-level data element in the first code set for the first version that does not have a complementary data element in the second code set.

11. The method of claim 9, wherein comparing the first code set with the second code set comprises deserializing the first code set into a first context object that includes a context element for each data element in the first code set identified by a unique identifier for the data element, deserializing the second code set into a second context object that includes a context element for each data element in the second code set identified by a unique identifier for the data element, and comparing each context element in the first context object with each context element in the second context object.

12. The method of claim 1, wherein the first code set and the second code set comprise documents written in a structured programming language selected from SGML, XML, HTML, WML, XHTML, DHTML, other SGML derivatives, and user interface markup languages.

13. The method of claim 12, wherein the first code set and the second code set comprise XML-language documents for which no XML schema has been provided, wherein each data element in the first code set is an XML element, and wherein each data element in the second code set is an XML element.

14. The method of claim 1, wherein the software artifact is one or more of software components, system architectures, application packages, analysis models, design models, design patterns, database schemas, and web services.

15. The method of claim 1, wherein the method of generating the tool for merging customizations is performed at regular intervals during development of the second version of the software artifact.

16. The method of claim 1, wherein code refactoring has been performed on the first code set to produce the second code set.

17. The method of claim 1, wherein requesting and receiving merge instructions for a data element comprises generating a merge instruction request via a user interface and receiving a merge instruction specification provided by user input via the user interface.

18. A computer-usable medium having computer readable instructions stored thereon for execution by a processor to perform a method of generating a tool for merging customizations made to a first version of a software artifact when migrating to a second version of the software artifact, the method comprising:

instantiating a mapping information element in a first data store for each top-level data element in a first code set for the first version that does not have a complementary data element in a second code set for the second version;

requesting merge instructions for each top-level data element in the first code set for which merge instructions are not provided in the corresponding mapping information element for the top-level data element;

receiving merge instructions for each top-level data element in the first code set for which merge instructions are not provided;

determining whether the merge instructions for each top-level data element in the first code set for which merge instructions are provided require that customizations made to the top-level data element be merged into the second code set;

determining whether the merge instructions for each top-level data element in the first code set that requires customizations made to the top-level data element to be merged are valid;

requesting merge instructions for each top-level data element in the first code set for which the merge instructions are not determined to be valid;

receiving merge instructions for each top-level data element in the first code set for which the merge instructions are not determined to be valid; and

storing the merge instructions received for each top-level data element in the first code set in the corresponding mapping information element in the first data store.

19. A data processing system comprising:

at least one processor;

a random access memory for storing data and programs for execution by the at least one processor; and

computer readable instructions stored in the random access memory for execution by the at least one processor to perform a method of generating a tool for merging customizations made to a first version of a software artifact when migrating to a second version of the software artifact, the method comprising;

instantiating a mapping information element in a first data store for each top-level data element in a first code set for the first version that does not have a complementary data element in a second code set for the second version;

requesting merge instructions for each top-level data element in the first code set for which merge instructions are not provided in the corresponding mapping information element for the top-level data element;

receiving merge instructions for each top-level data element in the first code set for which merge instructions are not provided;

determining whether the merge instructions for each top-level data element in the first code set for which merge instructions are provided require that customizations made to the top-level data element be merged into the second code set;

determining whether the merge instructions for each top-level data element in the first code set that requires customizations made to the top-level data element to be merged are valid;

requesting merge instructions for each top-level data element in the first code set for which the merge instructions are not determined to be valid;

receiving merge instructions for each top-level data element in the first code set for which the merge instructions are not determined to be valid; and

storing the merge instructions received for each top-level data element in the first code set in the corresponding mapping information element in the first data store.