You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2011/11/24 03:58:11 UTC
svn commit: r1205712 - in /camel/branches/camel-2.7.x: ./
tooling/maven/maven-html-to-pdf/src/main/java/org/apache/camel/maven/HtmlToPdfMojo.java
Author: ningjiang
Date: Thu Nov 24 02:58:11 2011
New Revision: 1205712
URL: http://svn.apache.org/viewvc?rev=1205712&view=rev
Log:
Merged revisions 1205709 via svnmerge from
https://svn.apache.org/repos/asf/camel/branches/camel-2.8.x
................
r1205709 | ningjiang | 2011-11-24 10:52:39 +0800 (Thu, 24 Nov 2011) | 9 lines
Merged revisions 1205412 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1205412 | ningjiang | 2011-11-23 22:19:36 +0800 (Wed, 23 Nov 2011) | 1 line
CAMEL-3774 write a better dummy html with thanks to Babak
........
................
Modified:
camel/branches/camel-2.7.x/ (props changed)
camel/branches/camel-2.7.x/tooling/maven/maven-html-to-pdf/src/main/java/org/apache/camel/maven/HtmlToPdfMojo.java
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 24 02:58:11 2011
@@ -1,2 +1,2 @@
-/camel/branches/camel-2.8.x:1170965,1171400,1174571,1175323,1176329,1176787,1177397,1177946,1177949,1180598,1187226,1189704,1199138,1199732,1199766,1199807,1200867,1201638-1201639,1202171,1202222,1202662,1204355
-/camel/trunk:1146608,1146903,1147216,1170956,1171396,1174565,1175321,1176274,1176781-1176782,1177394,1177945,1177948,1180597,1187221,1189693,1199137,1199703,1199739,1199804,1200861,1201623,1201637,1202167,1202215,1202659,1204338
+/camel/branches/camel-2.8.x:1170965,1171400,1174571,1175323,1176329,1176787,1177397,1177946,1177949,1180598,1187226,1189704,1199138,1199732,1199766,1199807,1200867,1201638-1201639,1202171,1202222,1202662,1204355,1205709
+/camel/trunk:1146608,1146903,1147216,1170956,1171396,1174565,1175321,1176274,1176781-1176782,1177394,1177945,1177948,1180597,1187221,1189693,1199137,1199703,1199739,1199804,1200861,1201623,1201637,1202167,1202215,1202659,1204338,1205412
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.7.x/tooling/maven/maven-html-to-pdf/src/main/java/org/apache/camel/maven/HtmlToPdfMojo.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/tooling/maven/maven-html-to-pdf/src/main/java/org/apache/camel/maven/HtmlToPdfMojo.java?rev=1205712&r1=1205711&r2=1205712&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/tooling/maven/maven-html-to-pdf/src/main/java/org/apache/camel/maven/HtmlToPdfMojo.java (original)
+++ camel/branches/camel-2.7.x/tooling/maven/maven-html-to-pdf/src/main/java/org/apache/camel/maven/HtmlToPdfMojo.java Thu Nov 24 02:58:11 2011
@@ -243,7 +243,8 @@ public class HtmlToPdfMojo extends Abstr
private void storeDummyFile() throws FileNotFoundException {
PrintWriter out = new PrintWriter(new BufferedOutputStream(new FileOutputStream(getHTMLFileName())));
out.println("<html>");
- out.println("<body>Download of " + page + " failed</body>");
+ out.println("<body>Generation of the offline PDF version of the manual failed, however you could try <a href=\"http://camel.apache.org/book-in-one-page.html\">the online HTML version</a>.</body>");
+ out.println("</html>");
out.close();
getLog().info("Stored dummy file: " + getHTMLFileName() + " since download of " + page + " failed.");
}