[doxia-sitetools] 32/37: Made RenderingContext in sitetools extend RenderingContext in doxia to preserve the backward compatibility

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository doxia-sitetools.

commit fe0b9a2519f5c0fd8872c8ade5bcb20000f29b5b
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jul 28 13:13:23 2017 +0200

    Made RenderingContext in sitetools extend RenderingContext in doxia to preserve the backward compatibility
---
 debian/changelog                                   |  2 +
 .../0003-rendering-context-compatibility.patch     | 46 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 49 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9f739e0..52da07d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ doxia-sitetools (1.7.4-1) UNRELEASED; urgency=medium
     - Build the new doxia-skin-model module
     - Ignore the new doxia-integration-tools module
     - Depend on libplexus-utils2-java instead of libplexus-utils-java
+    - Made RenderingContext in sitetools to extend RenderingContext in doxia
+      in order to preserve the backward compatibility.
   * Depend on libmaven-parent-java and inherit the modello configuration
   * Standards-Version updated to 4.0.0
   * Switch to debhelper level 10
diff --git a/debian/patches/0003-rendering-context-compatibility.patch b/debian/patches/0003-rendering-context-compatibility.patch
new file mode 100644
index 0000000..044a3cd
--- /dev/null
+++ b/debian/patches/0003-rendering-context-compatibility.patch
@@ -0,0 +1,46 @@
+Description: Make RenderingContext in sitetools extend RenderingContext in doxia
+ to preserve the backward compatibility. This patch can be removed once no code
+ in Debian imports org.apache.maven.doxia.sink.render.RenderingContext.
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/RenderingContext.java
++++ b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/RenderingContext.java
+@@ -33,7 +33,7 @@
+  * @version $Id: RenderingContext.java 1720929 2015-12-19 14:09:41Z hboutemy $
+  * @since 1.5 (was since 1.1 in o.a.m.d.sink.render)
+  */
+-public class RenderingContext
++public class RenderingContext extends org.apache.maven.doxia.sink.render.RenderingContext
+ {
+     private final File basedir;
+ 
+@@ -76,6 +76,7 @@
+      */
+     public RenderingContext( File basedir, String document, String parserId, String extension )
+     {
++        super( basedir, document, parserId, extension );
+         this.basedir = basedir;
+         this.extension = extension;
+         this.inputName = document;
+--- a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/sink/SiteRendererSink.java
++++ b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/sink/SiteRendererSink.java
+@@ -31,7 +31,7 @@
+ import org.apache.maven.doxia.module.xhtml.XhtmlSink;
+ import org.apache.maven.doxia.sink.Sink;
+ import org.apache.maven.doxia.sink.SinkEventAttributes;
+-import org.apache.maven.doxia.siterenderer.RenderingContext;
++import org.apache.maven.doxia.sink.render.RenderingContext;
+ import org.apache.maven.doxia.util.HtmlTools;
+ import org.codehaus.plexus.util.StringUtils;
+ 
+--- a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
++++ b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
+@@ -524,7 +524,7 @@
+      * @param siteRenderingContext the site rendering context
+      * @return
+      */
+-    protected Context createDocumentVelocityContext( RenderingContext renderingContext,
++    protected Context createDocumentVelocityContext( org.apache.maven.doxia.sink.render.RenderingContext renderingContext,
+                                                      SiteRenderingContext siteRenderingContext )
+     {
+         Context context = createToolManagedVelocityContext( siteRenderingContext );
diff --git a/debian/patches/series b/debian/patches/series
index 68e88e8..cba8250 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-fix-for-lastModified.patch
+0003-rendering-context-compatibility.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/doxia-sitetools.git