Feature Pack 5 or later

Using click-to-merge to merge customized Management Center files

Beginning in Feature Pack 5, WebSphere Commerce includes the click-to-merge function to help you merge all customizations except the conflict type.

For conflict type customizations, you need to manually merge the files after you are finished using click-to-merge.
There are three ways to click-to-merge customizations:
Migrate all the deltas in all the files
You can merge all customizations simultaneously with one click. All deltas that have no conflict with the new base feature pack can be migrated. You cannot use this method to migrate the Delete File change type.
Migrate all the deltas in one file
You can merge all the customizations by clicking the menu in one file. You must repeat the action for each file, one by one, until all files are migrated. All deltas that have no conflict with the new base feature pack can be migrated.
Migrate deltas one by one
You can merge one customization at a time by clicking the menu of a delta. You need to repeat the action for each delta, one by one, until all the deltas are migrated. All deltas that have no conflict with the new base feature pack can be migrated.

Before you begin

Ensure that you complete the following steps:

Procedure

  1. Start WebSphere Commerce Developer.
    Note: If you see errors or warning messages related to the LOBTools Project in the Problem view, you take the following steps:
    1. Click Project > Clean.
    2. Select Clean projects selected below and select LOBtools.
    3. Click OK.
    4. Right-click LOBtools > Build OpenLaszlo Project.
    5. Any errors or warning messages still shown in the Problems view cannot be fixed by clicking Project > Clean. You must fix any remaining errors manually, one at a time, to avoid any unexpected results later.
  2. Start the OpenLaszlo Migration Results view.
    Note: Fix any unique ID issues before you start the OpenLaszlo Migration tool.
    1. Open the Enterprise Explorer view.
      • Feature Pack 4Feature Pack 2Feature Pack 3Feature Pack 1Right click LOBTools and select OpenLaszlo Migration > Compare Customizations .
      • Feature Pack 5 or laterRight click LOBTools and select OpenLaszlo Migration > Launch Migration Tool.
    Tip: The Compare Customizations window might open in the upper right corner. To view the contents more easily, hold and drag the title bar and move it to the bottom window.
  3. Open the Feature Pack x comparison report.
    1. Click the Delta to display icon Delta to display.
    2. Click Delta between WebSphere Commerce Version 7 FEPx base and WebSphere Commerce Version 7 FEPx customized.

    Comparison report
    Introduced in Feature Pack 3Note: One of the files that is shipped as a custom asset in Feature Pack 2 is removed in Feature Pack 3 and later version. After you enable the Management Center feature of Feature Pack 3 and later version, this Feature Pack 2 file remains. The file is:
    • \LOBTools\WebContent\config\commerce\promotion\propertiesViews\CatalogEntryAttributeRuleProperties.def
    After you enable the Management Center feature, this file displays in the Delta between Feature Pack y base and Feature Pack y current comparison view, with the following status:
    Change type=Add file
Status=Migrated
    If you have customized the file, you do not need do take any further action. If you did not customize the file, you can delete it manually.
  4. Migrate your customizations in one of the following three ways.
    • Migrate all the deltas in all the files.
      1. Click the Migrate icon in the upper right corner of the Open Laszlo Migration Results window.
      2. In the Confirmation window, click Yes. A report is generated.
      3. After the merging process is done, A report will be generated.
      4. Check the status of all files in the OpenLaszlo Migration Results view. If the click-to-merge operation completed successfully, the Migration Type column has a value of Auto-Migrated for each of the files. If the status of a file is Not Migrated, there was a conflict when you attempted to migrate a delta in that file. You must migrate the associated file manually. To find out more about specific conflict types, see Conflict types for the click-to-merge enhancement.
    • Migrate all the deltas in one file.
      1. Right-click the file you want to work with, and click Migrate this file in the menu. A report is generated.
      2. Check the status of the file in the OpenLaszlo Migration Results view. If the click-to-merge operation completed successfully, the file is shown in green and the Migration Type column has a value of Auto-Migrated. If the status of a file is Not Migrated, there was a conflict when you attempted to migrate a delta in that file. You must migrate the associated file manually. To find out more about specific conflict types, see Conflict types for the click-to-merge enhancement.
    • Migrate deltas one by one.
      1. Right-click the delta you want to work with, and click Migrate this delta in the menu. A report is generated.
      2. Check the status of the delta in the OpenLaszlo Migration Results view. If the click-to-merge operation completed successfully, the Migration Type column has a value of Auto-Migrated. If the status of a file is Not Migrated, there was a conflict when you attempted to migrate a delta in that file. You must migrate the associated file manually. To find out more about specific conflict types, see Conflict types for the click-to-merge enhancement.
  5. Optional: If want, you can roll back files to the base feature pack version.
    • Roll back all deltas:
      1. In the Open Laszlo Migration Results view, click the Rollback icon to roll back all the files to WebSphere Commerce Version 7 FEP y edition.
      2. In the Confirmation window, click Yes.
      3. Check the status of the files in the OpenLaszlo Migration Results view. If the rollback operation completed successfully, the names of files are displayed in red and every delta has the status Not Migrated.
    • Roll back one file:
      • Right-click the file you want to work with, and click Roll back this file to WebSphere Commerce Version 7 FEPy edition in the menu. A report is generated.
      • Check the status of the file in the OpenLaszlo Migration Results view. If the rollback operation completed successfully, the name of file is displayed in red and every delta has the status Not Migrated.
  6. Click Delta between Feature Pack x base and Feature Pack x customized . Click the refresh icon Refresh to update the reports.
    If there is a conflict, take the corresponding required action.
    Note: If a unique identifier conflict is reported, the Feature Pack x version report shows a status of Migrated. After you correct the unique identifier error, the Feature Pack x version report shows a Not Migrated status. The Feature Pack y report shows that a new element was added.
  7. Click Delta between WebSphere Commerce Version 7 FEPy base and WebSphere Commerce Version 7 FEPy current. In this view, you can see the customization on FEPy. This comparison view displays the following columns:
    Filename
    The name of the file altered by the WebSphere Commerce version 7 installation. Listed below the file name is one or more lines items represented in this format:
    Line #nn:version
    Where:
    • nn is the line number which contains a change
    • version is the feature pack version of the changed file
    Status
    A status of the file.
    Status filter Version 7 results
    All Shows all customizations related to the Management Center enablement.
    Migrated Shows customizations that are migrated to the Version 7 FEPy level.
    Not Migrated Shows customizations that are not migrated to the Version 7 FEPy level.
    New Shows new customizations made to the Version 7 FEPy level.
    Change type
    The type of change or customization on the base Version 7 FEPy file. Examples of change types are
    • Add, Modify, or Remove attribute
    • Add file. This change type indicates a new file that you created in the Version 7 Feature Pack x environment. There is no further action required on any Add file entry. If you delete any of these files from the workspace and run the comparison report again, the deleted file is removed from both the Version 7 and Feature Pack version reports.
    • Add or Delete element
    • Reorder element
    Note: If you right-click a file that does not have a change type of Add file, you see the following option:
    • Compare changes between WebSphere Commerce Version 7 FEPx and WebSphere Commerce Version 7 FEPy
    If you make additional changes to your Version 7 FEPy files, the compare editor can be run again by clicking the refresh button.
  8. If you just migrated Management Center from either Version 7 or from Version 7 Feature Pack 1 to Version 7 Feature Pack 2 or a later version, you must perform manual steps to convert some customizations.
    When the Management Center feature is enabled, customizations to methods, handlers, and some constraints in OpenLaszlo (.lzx) files cannot be converted to definition (.def) files automatically. You can check the log under WC_installer/logs/PortUtility.timestamp.log to see a detailed list of customizations that were not migrated.
    1. To recover constraints customizations, see Troubleshooting: Constraints not supported while migrating Management Center.
    2. To recover method and handler customizations, see Troubleshooting: Custom methods and handlers not supported while migrating Management Center.
  9. Compile the project:
    1. Open the Enterprise Explorer view.
    2. Right-click LOBTools > Build OpenLaszlo Project.
    This process takes several minutes to complete. When completed, resolve any compilation, validation, or other errors and warnings. Repeat step this step until all errors and warnings are resolved.

    For additional information on how to resolve compile errors, see Troubleshooting: Avoiding compile errors when using a new OpenLaszlo compiler.

  10. Start the server:
    1. Click the Servers tab.
    2. Right-click WebSphere Commerce Test Server.
    3. Click Start.
    The start process takes several minutes to complete.
  11. Complete the publish action:
    1. Right-click WebSphere Commerce Test Server.
    2. Click Publish. The publish process takes several minutes to complete.
    3. Restart the test server.
  12. Test the modified LOBTools project. Complete any other necessary modifications.
  13. Prepare the LOBTools project for deployment. See Packaging Management Center files for deployment.

What to do next