LPS-44239 reduces classpath string by using relative paths. This fixes the issues with open office conversion and Websphere 8.5.

[ghost]

No description provided.

[hhuijser]

Feels like we can simplify this a lot. Especially your logic in _calculateRelativePath can be done much easier using StringUtil.startsWithWeight?

[ghost]

I wouldn't say so. The equivalent code with StringUtil.startsWithWeight is:

    private static String _calculateRelativePath(
            String baseDir, String targetPath) {

        if (!baseDir.endsWith(File.separator)) {
            baseDir = baseDir.concat(File.separator);
        }

        int commonLength = StringUtil.startsWithWeight(baseDir, targetPath);

        if (commonLength <= 1) {
            return targetPath;
        }

        int index;

        if (commonLength < baseDir.length()) {
            index = baseDir.lastIndexOf(File.separatorChar, commonLength - 1);

            index++;
        }
        else {
            index = commonLength;
        }

        int dirsUp = 0;

        for (int i = commonLength; i < baseDir.length(); i++) {
            if (baseDir.charAt(i) == File.separatorChar) {
                dirsUp++;
            }
        }

        int targetLength = targetPath.length();

        StringBuilder relative = new StringBuilder(
            dirsUp * 3 + targetLength - commonLength + 1);

        for (int i = 0; i < dirsUp; i++) {
            relative.append("..").append(File.separatorChar);
        }

        if (commonLength < targetLength) {
            relative.append(targetPath.substring(index));
        }

        return relative.toString();
    }

Anyhow, if this is easier I will commit and push it back, just please let me know.

[hhuijser]

See email... sent to Jonathan McCann to look at this: jonathanmccann#301