svn commit: r746645 - in /ofbiz/trunk: ./ applications/order/webapp/ordermgr/order/ framework/base/lib/ framework/webapp/lib/

[hansbak-2]

Author: hansbak
Date: Sun Feb 22 07:59:30 2009
New Revision: 746645

URL: http://svn.apache.org/viewvc?rev=746645&view=rev
Log:
upgrade fop 0.94 -> 0.95

Added:
    ofbiz/trunk/framework/base/lib/batik-all-1.7.jar   (with props)
    ofbiz/trunk/framework/base/lib/serializer-2.7.0.jar   (with props)
    ofbiz/trunk/framework/base/lib/xmlgraphics-commons-1.3.1.jar   (with props)
Removed:
    ofbiz/trunk/framework/webapp/lib/batik-all-1.6.jar
    ofbiz/trunk/framework/webapp/lib/xmlgraphics-commons-1.2.jar
Modified:
    ofbiz/trunk/LICENSE
    ofbiz/trunk/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl
    ofbiz/trunk/framework/base/lib/avalon-framework-4.2.0.jar

Modified: ofbiz/trunk/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/trunk/LICENSE?rev=746645&r1=746644&r2=746645&view=diff
==============================================================================
--- ofbiz/trunk/LICENSE (original)
+++ ofbiz/trunk/LICENSE Sun Feb 22 07:59:30 2009
@@ -1,4 +1,4 @@
-==========================================================================
+b==========================================================================
 The source code that makes up The Apache Open For Business Project
 (Apache OFBiz) and the majority of the libraries distributed with it are
 licensed under the Apache License Version 2.0.
@@ -15,6 +15,7 @@
 ofbiz/trunk/framework/base/lib/ant-1.7.0.jar
 ofbiz/trunk/framework/base/lib/avalon-framework-4.2.0.jar
 ofbiz/trunk/framework/base/lib/avalon-util-exception-1.0.0.jar
+ofbiz/trunk/framework/base/lib/batik-all-1.7.jar
 ofbiz/trunk/framework/base/lib/jakarta-regexp-1.5.jar
 ofbiz/trunk/framework/base/lib/jpim-0.1.jar
 ofbiz/trunk/framework/base/lib/juel-2.1.1-rc1.jar
@@ -80,10 +81,9 @@
 ofbiz/trunk/framework/service/lib/axis-ant.jar
 ofbiz/trunk/framework/service/lib/axis.jar
 ofbiz/trunk/framework/webapp/lib/barcode4j-fop-ext-0.93.jar
-ofbiz/trunk/framework/webapp/lib/batik-all-1.6.jar
 ofbiz/trunk/framework/webapp/lib/fop-0.94.jar
 ofbiz/trunk/framework/webapp/lib/velocity-1.5.jar
-ofbiz/trunk/framework/webapp/lib/xmlgraphics-commons-1.2.jar
+ofbiz/trunk/framework/webapp/lib/xmlgraphics-commons-1.3.1.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

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl?rev=746645&r1=746644&r2=746645&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/companyHeader.fo.ftl Sun Feb 22 07:59:30 2009
@@ -19,7 +19,7 @@
 <#escape x as x?xml>
 
 <fo:block text-align="left">
-    <#if logoImageUrl?string?has_content><fo:external-graphic src="<@ofbizContentUrl>${logoImageUrl}</@ofbizContentUrl>" overflow="hidden" height="40px" content-height="scale-to-fit"/></#if>
+    <#if logoImageUrl?has_content><fo:external-graphic src="<@ofbizContentUrl>${logoImageUrl}</@ofbizContentUrl>" overflow="hidden" height="40px" content-height="scale-to-fit"/></#if>
 </fo:block>
 
 <fo:block font-size="8pt">

Modified: ofbiz/trunk/framework/base/lib/avalon-framework-4.2.0.jar
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/lib/avalon-framework-4.2.0.jar?rev=746645&r1=746644&r2=746645&view=diff
==============================================================================
Binary files - no diff available.

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

Propchange: ofbiz/trunk/framework/base/lib/batik-all-1.7.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

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

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

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

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