You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ofbiz.apache.org by Hans Bakker <ma...@antwebsystems.com> on 2009/02/22 09:50:37 UTC
Re: svn commit: r746645 - in /ofbiz/trunk: ./
applications/order/webapp/ordermgr/order/ framework/base/lib/
framework/webapp/lib/
correction: fop is not yet updated, because could not get it to work
yet, however i updated the supporting libraries which made the pdf
working again....
On Sun, 2009-02-22 at 07:59 +0000, hansbak@apache.org wrote:
> 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="<@o...@ofbizContentUrl>" overflow="hidden" height="40px" content-height="scale-to-fit"/></#if>
> + <#if logoImageUrl?has_content><fo:external-graphic src="<@o...@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
>
>
--
Antwebsystems.com: Quality OFBiz services for competitive rates
Re: svn commit: r746645 - in /ofbiz/trunk: ./ applications/order/webapp/ordermgr/order/ framework/base/lib/ framework/webapp/lib/
Posted by Jacopo Cappellato <ja...@hotwaxmedia.com>.
Hi Hans,
please double check this commit, I think that there are some issues.
The main one I see is that the jar file "serializer-2.7.0.jar" is
already in the framework/webapp component... now we have two of them
in the classpath.
The information in the following page may be useful:
http://docs.ofbiz.org/display/OFBADMIN/Libraries+Included+in+OFBiz
Jacopo
On Feb 22, 2009, at 9:50 AM, Hans Bakker wrote:
> correction: fop is not yet updated, because could not get it to work
> yet, however i updated the supporting libraries which made the pdf
> working again....
>
> On Sun, 2009-02-22 at 07:59 +0000, hansbak@apache.org wrote:
>> 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="<@o...@ofbizContentUrl>"
>> overflow="hidden" height="40px" content-height="scale-to-fit"/></#if>
>> + <#if logoImageUrl?has_content><fo:external-graphic
>> src="<@o...@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
>>
>>
> --
> Antwebsystems.com: Quality OFBiz services for competitive rates
>