Abstract: A system includes a display, a processor executing an application program for displaying an annotation file, and memory storing program instructions of the application program. The processor associates an annotation with a programming module of a baseline file to display, in an unsegmented window of a graphical user interface, the baseline file as a hierarchical structure having nodes. Each node represents a programming module of the baseline file. Displayed is an annotation in the unsegmented window of the GUI proximate to the node that represents the programming module with which the annotation is associated. The displayed annotation includes selectable messages displayed proximate to each other to facilitate visual comparison. Each selectable message describes a modification made to the baseline file by a different contributor. The annotation indicates that the modifications produce a conflict. The conflict is resolvable within the unsegmented window by a selection of one of the selectable messages.

Abstract: Computer method, apparatus and system for merging software configurations. The invention system and method includes a workspace providing a work environment in which to perform operations on a subject software configuration. The workspace identifies a change set of current changes being made to the subject software configuration. A merge tool is coupled to perform software configuration merges in the workspace. The workspace accumulates change sets in a merge of each artifact forming the subject software configuration and passes the accumulated change sets to the merge tool. Consequently, artifact merges are made in the context of substantially all previous merge decisions. The workspace also tracks deferred change sets and the system enables a user to re-invoke the merge tool with respect to artifacts having deferred change sets.

Abstract: A system and method for processing meta-models defined in accordance with Meta Object Facility (MOF). A system is provided that includes: a version control system for checking meta-models in and out of a model repository; a system for merging two versions of a meta-model that are based on a common ancestor version and were worked on in parallel; and an alignment system for aligning the two versions and the common ancestor whenever a profile has been applied differently to any of the two versions and common ancestor version.

Abstract: A system includes a display, a processor executing an application program for displaying an annotation file, and memory storing program instructions of the application program. The processor associates an annotation with a programming module of a baseline file to display, in an unsegmented window of a graphical user interface, the baseline file as a hierarchical structure having nodes. Each node represents a programming module of the baseline file. Displayed is an annotation in the unsegmented window of the GUI proximate to the node that represents the programming module with which the annotation is associated. The displayed annotation includes selectable messages displayed proximate to each other to facilitate visual comparison. Each selectable message describes a modification made to the baseline file by a different contributor. The annotation indicates that the modifications produce a conflict. The conflict is resolvable within the unsegmented window by a selection of one of the selectable messages.

Abstract: A method and system for displaying an annotated file are described. The method includes associating an annotation with a programming module of a baseline file and displaying in a window of a graphical user interface the baseline file as a tree structure having a plurality of nodes. Each node represents a programming module of the baseline file. The method also includes displaying the annotation proximate to the node that represents the programming module with which the annotation is associated. The annotation includes at least one message indicative of a modification made to the baseline file by a contributor.

Abstract: A system and method for processing meta-models defined in accordance with Meta Object Facility (MOF). A system is provided that includes: a version control system for checking meta-models in and out of a model repository; a system for merging two versions of a meta-model that are based on a common ancestor version and were worked on in parallel; and an alignment system for aligning the two versions and the common ancestor whenever a profile has been applied differently to any of the two versions and common ancestor version.

Abstract: Computer method, apparatus and system for merging software configurations. The invention system and method includes a workspace providing a work environment in which to perform operations on a subject software configuration. The workspace identifies a change set of current changes being made to the subject software configuration. A merge tool is coupled to perform software configuration merges in the workspace. The workspace accumulates change sets in a merge of each artifact forming the subject software configuration and passes the accumulated change sets to the merge tool. Consequently, artifact merges are made in the context of substantially all previous merge decisions. The workspace also tracks deferred change sets and the system enables a user to re-invoke the merge tool with respect to artifacts having deferred change sets.

Abstract: Embodiments of the present invention address deficiencies of the art in respect to comparing artifacts and provide a novel and non-obvious method, system and computer program product for multi-contextual navigation of deltas in a hierarchy. In one embodiment of the invention, a method for multi-contextual navigation can include rendering objects for an artifact utilizing a default contextual view of the objects, selecting an object in the default contextual view and directing an inward navigation to a different object in the default contextual view. Notably, responsive to the directing of the inward navigation to the different object, a different contextual view can be provided for at least a portion of the objects defined by the different object.

Abstract: Embodiments of the present invention address deficiencies of the art in respect to merging artifacts in a version control system and provide a novel and non-obvious method, system and computer program product for compositing deltas when merging artifacts in a version control system. In one embodiment, a method for compositing deltas for artifacts can be provided. The method can include generating deltas for a contributor artifact of an ancestor artifact, identifying interrelated ones of the deltas and grouping the interrelated ones of the deltas into a composited set of deltas. The method further can include rendering the composited set of deltas in a hierarchical view of a compare view for a version control data processing system in a development platform.

Abstract: A method and system for displaying an annotated file are described. The method includes associating an annotation with a programming module of a baseline file and displaying in a window of a graphical user interface the baseline file as a tree structure having a plurality of nodes. Each node represents a programming module of the baseline file. The method also includes displaying the annotation proximate to the node that represents the programming module with which the annotation is associated. The annotation includes at least one message indicative of a modification made to the baseline file by a contributor.

Abstract: A portable annotated merge model and methods of generating and using the same are provided. The portable annotated merge model can be a copy of a baseline file having annotation associated with items of the baseline file. The annotation can be deltas and/or conflicts. The portable annotated merge model is transferable and suspendable to facilitate collaboration among multiple reviewers of the merge model.

Abstract: The first step in isolating a soft fault within a transparent network is to determine which OMS trail is causing the fault. This can be accomplished by forcing regeneration at a flexibility point, which permits the estimation of the signal quality using a BER measurement. The preferred mechanism for segmenting Och faults to an OMS/trail is eavesdropping, using dedicated tunable filters and receivers or spare test tunable filters and receivers at network flexibility sites. Once the fault has been isolated to a specific OMS trail, analog tools are used to further isolate the fault down to a single replaceable module or fiber, using rapid measurement and correlation of relevant measured and pre-calculated expected performance data. In case of hard faults, to avoid superfluous alarm reports at connection termination points, the optical channel fault detector provides fault indications to downstream nodes using Forward Defect Indications (FDI) over the optical supervisory channel (OSC).