You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2015/03/04 14:12:43 UTC
svn commit: r1663980 - in /ofbiz/branches/release14.12: ./
framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java
Author: jleroux
Date: Wed Mar 4 13:12:42 2015
New Revision: 1663980
URL: http://svn.apache.org/r1663980
Log:
"Applied fix from trunk for revision: 1663979 "
------------------------------------------------------------------------
r1663979 | jleroux | 2015-03-04 14:11:41 +0100 (mer., 04 mars 2015) | 13 lines
An improved patch from Christian Carlow for "Allow FOP to support <fo:external-graphic></fo:external> for -Dportoffset" https://issues.apache.org/jira/browse/OFBIZ-6120
FOP <fo:external-graphic/> images do not appear when portoffset used:
2015-02-28 18:12:12,249 |http-bio-8445-exec-4 |ApacheFopWorker |I| FOP FontBaseURL: file:/home/anon/workspace/ofbiz/framework/webapp/config/
2015-02-28 18:12:12,254 |http-bio-8445-exec-4 |FOP |D| target-resolution set to: 72.0dpi (px2mm=0.35277778)
2015-02-28 18:12:12,593 |http-bio-8445-exec-4 |FOP |E| Error with opening URL 'http://localhost:8080/content/control/stream?contentId=10004': Connection refused
2015-02-28 18:12:12,616 |http-bio-8445-exec-4 |FOUserAgent |E| Image not found. URI: /content/control/stream?contentId=10004. (See position 40:158)
In framework/webapp/config/fop.xconf <base>http://localhost:8080</base> is hardcoded
This patch employs FopFactory.setBaseUrl() along with the portOffset from Start class.
A better solution might be to extract the port from the baseUrl of fop.xconf and then apply the offset to that but I don't have time to implement that yet.
jleroux: I followed Christian's tip to complete his patch
------------------------------------------------------------------------
Modified:
ofbiz/branches/release14.12/ (props changed)
ofbiz/branches/release14.12/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java
Propchange: ofbiz/branches/release14.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 4 13:12:42 2015
@@ -8,4 +8,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912
+/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979
Modified: ofbiz/branches/release14.12/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java?rev=1663980&r1=1663979&r2=1663980&view=diff
==============================================================================
--- ofbiz/branches/release14.12/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java (original)
+++ ofbiz/branches/release14.12/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java Wed Mar 4 13:12:42 2015
@@ -41,6 +41,7 @@ import org.apache.fop.apps.Fop;
import org.apache.fop.apps.FopFactory;
import org.apache.fop.apps.MimeConstants;
import org.ofbiz.base.location.FlexibleLocation;
+import org.ofbiz.base.start.Start;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.FileUtil;
import org.ofbiz.base.util.UtilProperties;
@@ -82,6 +83,10 @@ public class ApacheFopWorker {
File userConfigFile = FileUtil.getFile(ofbizHome + fopPath + "/fop.xconf");
if (userConfigFile.exists()) {
fopFactory.setUserConfig(userConfigFile);
+ URL baseUrl = new URL(fopFactory.getBaseURL());
+ Integer baseport = baseUrl.getPort();
+ Integer port = baseport + Start.getInstance().getConfig().portOffset;
+ fopFactory.setBaseURL("http://localhost:" + port);
} else {
Debug.logWarning("FOP configuration file not found: " + userConfigFile, module);
}