Author: juanpablo
Date: Thu Sep 6 21:23:43 2012
New Revision: 1381762
URL: http://svn.apache.org/viewvc?rev=1381762&view=rev
Log:
* 2.9.0-incubating-11
* upgraded jrcs-diff to 0.4.2, as part of JSPWIKI-746
Modified:
incubator/jspwiki/trunk/.classpath
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/build.xml
incubator/jspwiki/trunk/src/org/apache/wiki/Release.java
incubator/jspwiki/trunk/src/org/apache/wiki/diff/ContextualDiffProvider.java
incubator/jspwiki/trunk/src/org/apache/wiki/diff/TraditionalDiffProvider.java
incubator/jspwiki/trunk/src/org/apache/wiki/filters/SpamFilter.java
Modified: incubator/jspwiki/trunk/.classpath
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/.classpath?rev=1381762&r1=1381761&r2=1381762&view=diff
==============================================================================
--- incubator/jspwiki/trunk/.classpath (original)
+++ incubator/jspwiki/trunk/.classpath Thu Sep 6 21:23:43 2012
@@ -10,7 +10,7 @@
<classpathentry kind="lib" path="lib/akismet-java-1.02.jar"/>
<classpathentry kind="lib" path="lib/jsonrpc-1.0.jar"
sourcepath="/Users/jalkanen/Java/json-rpc-java-1.0/src"/>
<classpathentry kind="lib" path="lib/xmlrpc-2.0.1.jar"
sourcepath="/Users/jalkanen/Java/xmlrpc-2.0.1/xmlrpc-2.0.1-sources.jar"/>
- <classpathentry kind="lib" path="lib/jrcs-diff-0.2.jar"/>
+ <classpathentry kind="lib" path="lib/jrcs-diff-0.4.2.jar"/>
<classpathentry kind="lib" path="tests/lib/xercesImpl-2.6.2.jar"/>
<classpathentry kind="lib" path="lib/sandler-0.5.jar"/>
<classpathentry kind="lib" path="lib/oscache-2.3.jar"
sourcepath="/Users/jalkanen/Java/oscache-2.3/src/java"/>
Modified: incubator/jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1381762&r1=1381761&r2=1381762&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Thu Sep 6 21:23:43 2012
@@ -1,6 +1,8 @@
2012-09-06 Juan Pablo Santos (juanpablo AT apache DOT org)
- * no version bump
+ * 2.9.0-incubating-11
+
+ * upgraded jrcs-diff to 0.4.2, as part of JSPWIKI-746
* JSPWIKI-747: Dependencies currently unavailable at Central repo
Modified: incubator/jspwiki/trunk/build.xml
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=1381762&r1=1381761&r2=1381762&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.xml (original)
+++ incubator/jspwiki/trunk/build.xml Thu Sep 6 21:23:43 2012
@@ -240,7 +240,8 @@
<get-element to-file="${libs.main}/jstl-1.1.2.jar"
url="${central.url}/jstl/jstl/1.1.2/jstl-1.1.2.jar" />
<get-element to-file="${libs.main}/jaxen-1.1-beta-6.jar"
url="${central.url}/jaxen/jaxen/1.1-beta-6/jaxen-1.1-beta-6.jar" />
<get-element to-file="${libs.main}/jdom-1.0.jar"
url="${central.url}/jdom/jdom/1.0/jdom-1.0.jar" />
- <get-element to-file="${libs.main}/jrcs-diff-0.2.jar"
url="${svn.repository}/libs/${libs.main}/jrcs-diff-0.2.jar" />
+ <get-element to-file="${libs.main}/jrcs-diff-0.4.2.jar"
+
url="${central.url}/org/jvnet/hudson/org.suigeneris.jrcs.diff/0.4.2/org.suigeneris.jrcs.diff-0.4.2.jar"
/>
<get-element to-file="${libs.main}/jsonrpc-1.0.jar"
url="${central.url}/com/metaparadigm/json-rpc/1.0/json-rpc-1.0.jar" />
<get-element to-file="${libs.main}/jsp-api-2.0.jar"
url="${central.url}/javax/servlet/jsp/jsp-api/2.0/jsp-api-2.0.jar" />
<get-element to-file="${libs.main}/log4j-1.2.14.jar"
url="${central.url}/log4j/log4j/1.2.14/log4j-1.2.14.jar" />
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/Release.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/Release.java?rev=1381762&r1=1381761&r2=1381762&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/Release.java Thu Sep 6
21:23:43 2012
@@ -77,7 +77,7 @@ public final class Release
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "10";
+ public static final String BUILD = "11";
/**
* This is the generic version string you should use
Modified:
incubator/jspwiki/trunk/src/org/apache/wiki/diff/ContextualDiffProvider.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/diff/ContextualDiffProvider.java?rev=1381762&r1=1381761&r2=1381762&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/org/apache/wiki/diff/ContextualDiffProvider.java
(original)
+++
incubator/jspwiki/trunk/src/org/apache/wiki/diff/ContextualDiffProvider.java
Thu Sep 6 21:23:43 2012
@@ -27,14 +27,17 @@ import java.util.List;
import java.util.Properties;
import java.util.StringTokenizer;
-import org.apache.commons.jrcs.diff.*;
-import org.apache.commons.jrcs.diff.myers.MyersDiff;
import org.apache.log4j.Logger;
-
import org.apache.wiki.NoRequiredPropertyException;
import org.apache.wiki.TextUtil;
import org.apache.wiki.WikiContext;
import org.apache.wiki.WikiEngine;
+import org.suigeneris.jrcs.diff.Diff;
+import org.suigeneris.jrcs.diff.DifferentiationFailedException;
+import org.suigeneris.jrcs.diff.Revision;
+import org.suigeneris.jrcs.diff.RevisionVisitor;
+import org.suigeneris.jrcs.diff.delta.*;
+import org.suigeneris.jrcs.diff.myers.MyersDiff;
/**
* A seriously better diff provider, which highlights changes word-by-word
using
Modified:
incubator/jspwiki/trunk/src/org/apache/wiki/diff/TraditionalDiffProvider.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/diff/TraditionalDiffProvider.java?rev=1381762&r1=1381761&r2=1381762&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/org/apache/wiki/diff/TraditionalDiffProvider.java
(original)
+++
incubator/jspwiki/trunk/src/org/apache/wiki/diff/TraditionalDiffProvider.java
Thu Sep 6 21:23:43 2012
@@ -29,15 +29,21 @@ import java.text.NumberFormat;
import java.util.Properties;
import java.util.ResourceBundle;
-import org.apache.commons.jrcs.diff.*;
-import org.apache.commons.jrcs.diff.myers.MyersDiff;
import org.apache.log4j.Logger;
-
import org.apache.wiki.NoRequiredPropertyException;
import org.apache.wiki.TextUtil;
import org.apache.wiki.WikiContext;
import org.apache.wiki.WikiEngine;
import org.apache.wiki.i18n.InternationalizationManager;
+import org.suigeneris.jrcs.diff.Diff;
+import org.suigeneris.jrcs.diff.DifferentiationFailedException;
+import org.suigeneris.jrcs.diff.Revision;
+import org.suigeneris.jrcs.diff.RevisionVisitor;
+import org.suigeneris.jrcs.diff.delta.AddDelta;
+import org.suigeneris.jrcs.diff.delta.ChangeDelta;
+import org.suigeneris.jrcs.diff.delta.Chunk;
+import org.suigeneris.jrcs.diff.delta.DeleteDelta;
+import org.suigeneris.jrcs.diff.myers.MyersDiff;
/**
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/filters/SpamFilter.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/filters/SpamFilter.java?rev=1381762&r1=1381761&r2=1381762&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/filters/SpamFilter.java
(original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/filters/SpamFilter.java Thu Sep
6 21:23:43 2012
@@ -29,17 +29,22 @@ import javax.servlet.jsp.PageContext;
import net.sf.akismet.Akismet;
-import org.apache.commons.jrcs.diff.*;
-import org.apache.commons.jrcs.diff.myers.MyersDiff;
import org.apache.commons.lang.time.StopWatch;
import org.apache.log4j.Logger;
import org.apache.oro.text.regex.*;
-
import org.apache.wiki.*;
import org.apache.wiki.attachment.Attachment;
import org.apache.wiki.auth.user.UserProfile;
import org.apache.wiki.providers.ProviderException;
import org.apache.wiki.ui.EditorManager;
+import org.suigeneris.jrcs.diff.Diff;
+import org.suigeneris.jrcs.diff.DifferentiationFailedException;
+import org.suigeneris.jrcs.diff.Revision;
+import org.suigeneris.jrcs.diff.delta.AddDelta;
+import org.suigeneris.jrcs.diff.delta.ChangeDelta;
+import org.suigeneris.jrcs.diff.delta.DeleteDelta;
+import org.suigeneris.jrcs.diff.delta.Delta;
+import org.suigeneris.jrcs.diff.myers.MyersDiff;
/**
* This is Herb, the JSPWiki spamfilter that can also do choke modifications.
