Merging changed files

The installer does not perform upgrade operations on cobrand specific files or data. After the upgrade you may need to merge the new login portlets with each cobrand’s login portlet to access the new functionality provided. In addition, any files you copied from onepage into your co-brand must be manually merged with the changes provided in the corresponding files with the upgrade to 6.0.

NoteYou only need to perform this procedure if you want to preserve settings or customizations from a previous EP installation.

After the upgrade completes successfully, you may see a list of files that you must merge manually. These files were changed by you after you installed EP 5.0, 5.0.1, or 5.1.1, and modified by Sybase for Enterprise Portal 6.0.

The changes you made have been preserved in the backup WAR file located in $SYBASE/PortalStudio/update-EP6_0/backups/onepage.war_XX.

The files that have been changed by both you and Sybase are written to:

XX is a date/time stamp in the format “YYYYMMDDhhmm” that indicates when you ran the upgrade or when the file was generated. If you run the upgrade more than once, there are multiple copies of these files—use the earliest version for your changes.

NoteThe XX in the onepage-both-chgs_XX.lst and search-both-chgs_XX.lst files and the back up WAR files correspond to each other. The files with the same date/time stamp should be used together.

StepsMerging changed files

  1. Expand the backed up WAR file into a temporary directory.

    1. Select an existing temporary folder—for example, /tmp/—or create a new temporary folder.

    2. Because the jar utility expands the file to the directory in which you are located, change to the temporary directory where you want to expand the WAR file. In a terminal window, enter:

      cd /tmp/
      
      jar xvf $SYBASE/PortalStudio/update-EP6_0/
           backups/onepage.war_XX
      

    XX is a date/time stamp in the format “YYYYMMDDhhmm” that indicates when you ran the upgrade or when the file was generated. If you run the upgrade more than once, there are multiple copies of these files—use the earliest version for your changes.

  2. For each file in the onepage-both-chgs_XX.lst file, use a file merge utility to reintegrate your 5.0, 5.0.x, 5.1. or 5.1.1 portal changes into your new 6.0 portal.

    NoteIf you do not own a file merge utility, perform an Internet search for “file merge utility”. The search results let you access dozens of file merge utilities, many of which are shareware.

    For example, if you made changes to the login.jsp file, you could enter the following using filemerge (a Solaris file merge utility):

    cd $SYBASE/EAServer/Repository/WebApplication/onepage
    
    filemerge fw/baseApps/fwlogin/login.jsp /tmp/fw/baseApps/
          fwlogin/login.jsp
    

    After saving and testing the merge, copy the new file to:

    $SYBASE/EAServer/Repository/WebApplication/onepage/fw/baseApps/
          fwlogin/login.jsp
    
  3. Shut down and restart EAServer. See “Starting and stopping EAServer”.