svn commit: r966662 - in /ofbiz/trunk: ./ framework/base/lib/ framework/webapp/config/ framework/webapp/src/org/ofbiz/webapp/view/

[erwan]

Author: erwan
Date: Thu Jul 22 14:02:39 2010
New Revision: 966662

URL: http://svn.apache.org/viewvc?rev=966662&view=rev
Log:
Finally adding Apache FOP 1.0, barcode generation is now working

Added:
    ofbiz/trunk/framework/base/lib/fop-1.0.jar   (with props)
    ofbiz/trunk/framework/base/lib/xmlgraphics-commons-1.4.jar   (with props)
Removed:
    ofbiz/trunk/framework/base/lib/fop-0.95.jar
    ofbiz/trunk/framework/base/lib/xmlgraphics-commons-1.3.1.jar
Modified:
    ofbiz/trunk/.classpath
    ofbiz/trunk/LICENSE
    ofbiz/trunk/framework/webapp/config/fop.xconf
    ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopWorker.java

Modified: ofbiz/trunk/.classpath
URL: http://svn.apache.org/viewvc/ofbiz/trunk/.classpath?rev=966662&r1=966661&r2=966662&view=diff
==============================================================================
--- ofbiz/trunk/.classpath (original)
+++ ofbiz/trunk/.classpath Thu Jul 22 14:02:39 2010
@@ -17,7 +17,7 @@
     <classpathentry kind="lib" path="framework/base/lib/batik-all-1.7.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/clhm-release-1.0-lru.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/hamcrest-all-1.2.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/fop-0.95.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/fop-1.0.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/freemarker-2.3.15.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/httpclient-4.0.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/httpcore-4.0.1.jar"/>
@@ -48,7 +48,7 @@
 
     <classpathentry kind="lib" path="framework/base/lib/xml-apis-2.9.1.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/xml-apis-ext-1.3.04.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/xmlgraphics-commons-1.3.1.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/xmlgraphics-commons-1.4.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/xmlrpc-client-3.1.2.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/xmlrpc-common-3.1.2.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/xmlrpc-server-3.1.2.jar"/>

Modified: ofbiz/trunk/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/trunk/LICENSE?rev=966662&r1=966661&r2=966662&view=diff
==============================================================================
--- ofbiz/trunk/LICENSE (original)
+++ ofbiz/trunk/LICENSE Thu Jul 22 14:02:39 2010
@@ -101,9 +101,9 @@ ofbiz/trunk/framework/service/lib/common
 ofbiz/trunk/framework/service/lib/neethi-2.0.4.jar
 ofbiz/trunk/framework/service/lib/XmlSchema-1.4.3.jar
 ofbiz/trunk/framework/testtools/lib/selenium-java-client-driver.jar
-ofbiz/trunk/framework/webapp/lib/fop-0.95.jar
+ofbiz/trunk/framework/webapp/lib/fop-1.0.jar
 ofbiz/trunk/framework/webapp/lib/velocity-1.6.1.jar
-ofbiz/trunk/framework/webapp/lib/xmlgraphics-commons-1.3.1.jar
+ofbiz/trunk/framework/webapp/lib/xmlgraphics-commons-1.4.jar
 ofbiz/trunk/framework/webapp/lib/json-lib-2.2.3-jdk15.jar
 ofbiz/trunk/framework/webapp/lib/ezmorph-0.9.1.jar
 ofbiz/trunk/framework/webapp/lib/rome-0.9.jar

Added: ofbiz/trunk/framework/base/lib/fop-1.0.jar
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/lib/fop-1.0.jar?rev=966662&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/trunk/framework/base/lib/fop-1.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ofbiz/trunk/framework/base/lib/xmlgraphics-commons-1.4.jar
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/lib/xmlgraphics-commons-1.4.jar?rev=966662&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/trunk/framework/base/lib/xmlgraphics-commons-1.4.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: ofbiz/trunk/framework/webapp/config/fop.xconf
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/config/fop.xconf?rev=966662&r1=966661&r2=966662&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/config/fop.xconf (original)
+++ ofbiz/trunk/framework/webapp/config/fop.xconf Thu Jul 22 14:02:39 2010
@@ -42,6 +42,8 @@ the location of this file.
        value is specified as auto -->
   <default-page-settings height="11in" width="8.26in"/>
 
+  <prefer-renderer>true</prefer-renderer>
+
   <!-- Information for specific renderers -->
   <!-- Uses renderer mime type for renderers -->
   <renderers>

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=966662&r1=966661&r2=966662&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 Thu Jul 22 14:02:39 2010
@@ -82,10 +82,10 @@ public class ApacheFopWorker {
                     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();
+                    String fopFontBaseUrl = fopFactory.getBaseURL();
                     if (fopFontBaseUrl == null) {
                         fopFontBaseUrl = UtilProperties.getPropertyValue("fop.properties", "fop.font.base.url", "file:///" + ofbizHome + "/framework/webapp/config/");
-                        fopFactory.setFontBaseURL(fopFontBaseUrl);
+                        fopFactory.setBaseURL(fopFontBaseUrl);
                     }
                     Debug.logInfo("FOP-FontBaseURL: " + fopFontBaseUrl, module);
                 } catch (Exception e) {