You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@jspwiki.apache.org by "Jan Spitalnik (JIRA)" <ji...@apache.org> on 2008/07/18 13:54:33 UTC
[jira] Created: (JSPWIKI-317) ExternalDiffProvider
ExternalDiffProvider
--------------------
Key: JSPWIKI-317
URL: https://issues.apache.org/jira/browse/JSPWIKI-317
Project: JSPWiki
Issue Type: Bug
Components: Plugins
Affects Versions: 2.6.3
Environment: Solaris 10 Update 4, Sun Webserver 7.0u1, sun4v
Reporter: Jan Spitalnik
Priority: Minor
Fix For: 2.6.3
Setting diff provider to ExternaDiff provider in properties file:
jspwiki.diffProvider = ExternalDiffProvider
jspwiki.diffCommand = /usr/bin/diff -u %s1 %s2
will not return the diff but "Invalid diff - probably something wrong with server setup." instead. The problem is in src/com/ecyrd/jspwiki/diff/ExternalDiffProvider.java file in makeDiffHtml() method.
if (m_traditionalColorization) //FIXME, see comment near declaration...
diff = colorizeDiff(diff);
else
diff = htmlWikiDiff;
diff is initialized to null, then we call 'diff = colorizeDiff(diff)'. At this point diff was never changed and is still null. colorizeDiff() will return above mentioned message. The fix is simple,
instead of passing diff to colorizeDiff we should pass htmlWikiDiff. As that variable contains the actuall diff.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
[jira] Resolved: (JSPWIKI-317) ExternalDiffProvider
Posted by "Harry Metske (JIRA)" <ji...@apache.org>.
[ https://issues.apache.org/jira/browse/JSPWIKI-317?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
Harry Metske resolved JSPWIKI-317.
----------------------------------
Resolution: Fixed
Fix Version/s: (was: 2.6.3)
2.7.x
Fixed in 2.7.0-alpha-6
> ExternalDiffProvider
> --------------------
>
> Key: JSPWIKI-317
> URL: https://issues.apache.org/jira/browse/JSPWIKI-317
> Project: JSPWiki
> Issue Type: Bug
> Components: Plugins
> Affects Versions: 2.6.3
> Environment: Solaris 10 Update 4, Sun Webserver 7.0u1, sun4v
> Reporter: Jan Spitalnik
> Priority: Minor
> Fix For: 2.7.x
>
> Attachments: JSPWiki-317.patch
>
>
> Setting diff provider to ExternaDiff provider in properties file:
> jspwiki.diffProvider = ExternalDiffProvider
> jspwiki.diffCommand = /usr/bin/diff -u %s1 %s2
> will not return the diff but "Invalid diff - probably something wrong with server setup." instead. The problem is in src/com/ecyrd/jspwiki/diff/ExternalDiffProvider.java file in makeDiffHtml() method.
> if (m_traditionalColorization) //FIXME, see comment near declaration...
> diff = colorizeDiff(diff);
> else
> diff = htmlWikiDiff;
> diff is initialized to null, then we call 'diff = colorizeDiff(diff)'. At this point diff was never changed and is still null. colorizeDiff() will return above mentioned message. The fix is simple,
> instead of passing diff to colorizeDiff we should pass htmlWikiDiff. As that variable contains the actuall diff.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
[jira] Updated: (JSPWIKI-317) ExternalDiffProvider
Posted by "Harry Metske (JIRA)" <ji...@apache.org>.
[ https://issues.apache.org/jira/browse/JSPWIKI-317?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
Harry Metske updated JSPWIKI-317:
---------------------------------
Attachment: JSPWiki-317.patch
Suggestion tested and patch attached.
I'll commit it when my ASF account has been established.
> ExternalDiffProvider
> --------------------
>
> Key: JSPWIKI-317
> URL: https://issues.apache.org/jira/browse/JSPWIKI-317
> Project: JSPWiki
> Issue Type: Bug
> Components: Plugins
> Affects Versions: 2.6.3
> Environment: Solaris 10 Update 4, Sun Webserver 7.0u1, sun4v
> Reporter: Jan Spitalnik
> Priority: Minor
> Fix For: 2.6.3
>
> Attachments: JSPWiki-317.patch
>
>
> Setting diff provider to ExternaDiff provider in properties file:
> jspwiki.diffProvider = ExternalDiffProvider
> jspwiki.diffCommand = /usr/bin/diff -u %s1 %s2
> will not return the diff but "Invalid diff - probably something wrong with server setup." instead. The problem is in src/com/ecyrd/jspwiki/diff/ExternalDiffProvider.java file in makeDiffHtml() method.
> if (m_traditionalColorization) //FIXME, see comment near declaration...
> diff = colorizeDiff(diff);
> else
> diff = htmlWikiDiff;
> diff is initialized to null, then we call 'diff = colorizeDiff(diff)'. At this point diff was never changed and is still null. colorizeDiff() will return above mentioned message. The fix is simple,
> instead of passing diff to colorizeDiff we should pass htmlWikiDiff. As that variable contains the actuall diff.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.