You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2010/04/19 17:18:36 UTC
svn commit: r935615 -
/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java
Author: jacopoc
Date: Mon Apr 19 15:18:35 2010
New Revision: 935615
URL: http://svn.apache.org/viewvc?rev=935615&view=rev
Log:
Added ofbizHome to the path to fop.xconf (user config file) for consistency with the url for font.base set later in this method.
Modified:
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java
Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java?rev=935615&r1=935614&r2=935615&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java Mon Apr 19 15:18:35 2010
@@ -78,12 +78,12 @@ public class ApacheFopWorker {
fopFactory.setStrictValidation(false);
try {
- String fopPath = UtilProperties.getPropertyValue("fop.properties", "fop.path", "framework/webapp/config");
+ String ofbizHome = System.getProperty("ofbiz.home");
+ String fopPath = UtilProperties.getPropertyValue("fop.properties", "fop.path", ofbizHome + "/framework/webapp/config");
File userConfigFile = FileUtil.getFile(fopPath + "/fop.xconf");
fopFactory.setUserConfig(userConfigFile);
String fopFontBaseUrl = fopFactory.getFontBaseURL();
if (fopFontBaseUrl == null) {
- String ofbizHome = System.getProperty("ofbiz.home");
fopFontBaseUrl = UtilProperties.getPropertyValue("fop.properties", "fop.font.base.url", "file:///" + ofbizHome + "/framework/webapp/config/");
fopFactory.setFontBaseURL(fopFontBaseUrl);
}