Skip to main content
Pentaho Documentation

Merge Your DI Server Configuration

Overview

Explains how to merge files.

A few configuration files have changed between Pentaho 5.0 and Pentaho 5.1.

If you have customized any of these files, you will have to manually merge them to successfully complete the upgrade. The Merge Custom DI Configuration Files reference contains instructions on how to do this for each file that you have customized. 

If you have not customized any of these configuration files, you are ready to go on to the migration section.

This table has a list of the files that you might need to merge between versions 5.0.6 and 5.1.

Tool/Misc. Configuration Files  System Configuration Files
/mondrian/mondrian.properties applicationContext-pentaho-security-jdbc.xml
/jackrabbit/repository.xml (for MySQL only) applicationContext-spring-security-ldap.xml
/WEB-INF/web.xml applicationContext-spring-security.xml
/WEB-INF/classes/ehcache.xml pentaho.xml
  pentahoObjects.spring.xml
  pentahoServices.spring.xml
  repository.spring.properties
  repository.spring.xml
  systemListeners.xml
Note: These files can all be found in the either /pentaho-solutions/system directory or subdirectory, or in the/server.../WEB-INF directory.

After you've copied all of these files to the proper locations in your new pentaho-solutions directory, continue on to the next sections to learn how to merge the other files. If you have any custom default-content bundles, you will need to copy them over in the next section.