Return-Path: 
 <commits-return-5217-apmail-ofbiz-commits-archive=ofbiz.apache.org@ofbiz.apache.org>
Delivered-To: apmail-ofbiz-commits-archive@www.apache.org
Received: (qmail 91722 invoked from network); 2 Nov 2007 08:12:39 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 2 Nov 2007 08:12:39 -0000
Received: (qmail 84316 invoked by uid 500); 2 Nov 2007 08:12:27 -0000
Delivered-To: apmail-ofbiz-commits-archive@ofbiz.apache.org
Received: (qmail 84208 invoked by uid 500); 2 Nov 2007 08:12:26 -0000
Mailing-List: contact commits-help@ofbiz.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@ofbiz.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@ofbiz.apache.org>
List-Post: <mailto:commits@ofbiz.apache.org>
List-Id: <commits.ofbiz.apache.org>
Reply-To: dev@ofbiz.apache.org
Delivered-To: mailing list commits@ofbiz.apache.org
Received: (qmail 84199 invoked by uid 99); 2 Nov 2007 08:12:26 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Nov 2007 01:12:26 -0700
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Nov 2007 08:12:56 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 722F31A9832; Fri,  2 Nov 2007 01:12:15 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r591256 - in /ofbiz/trunk:
 applications/order/webapp/ordermgr/WEB-INF/actions/order/companyHeader.bsh
 framework/common/widget/CommonScreens.xml framework/webapp/config/fop.xconf
Date: Fri, 02 Nov 2007 08:12:14 -0000
To: commits@ofbiz.apache.org
From: jacopoc@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20071102081215.722F31A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jacopoc
Date: Fri Nov  2 01:12:14 2007
New Revision: 591256

URL: http://svn.apache.org/viewvc?rev=591256&view=rev
Log:
Set the base url for FOP for resolving relative URLs: the default value is 'http://localhost:8080'. Issue OFBIZ-242.

Modified:
    ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/companyHeader.bsh
    ofbiz/trunk/framework/common/widget/CommonScreens.xml
    ofbiz/trunk/framework/webapp/config/fop.xconf

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/companyHeader.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/companyHeader.bsh?rev=591256&r1=591255&r2=591256&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/companyHeader.bsh (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/companyHeader.bsh Fri Nov  2 01:12:14 2007
@@ -60,7 +60,7 @@
 }
 
 // defaults:
-logoImageUrl = null; // "http://localhost:8080/images/ofbiz_powered.gif";
+logoImageUrl = null; // the default value, "/images/ofbiz_powered.gif", is set in the screen decorators
 partyId = null;
 
 // get the logo partyId from order or invoice - note that it is better to do comparisons this way in case the there are null values

Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=591256&r1=591255&r2=591256&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Fri Nov  2 01:12:14 2007
@@ -209,7 +209,7 @@
         <section>
             <actions>
                 <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
-                <set field="logoImageUrl" value="http://localhost:8080/images/ofbiz_logo.jpg"/>
+                <set field="logoImageUrl" value="/images/ofbiz_logo.jpg"/>
                 <!--<set field="defaultFontFamily" value="Arial"/>-->
             </actions>
             <widgets>
@@ -223,7 +223,7 @@
         <section>
             <actions>
                 <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
-                <set field="logoImageUrl" value="http://localhost:8080/images/ofbiz_logo.jpg"/>
+                <set field="logoImageUrl" value="/images/ofbiz_logo.jpg"/>
                 <!--<set field="defaultFontFamily" value="Arial"/>-->
             </actions>
             <widgets>
@@ -237,7 +237,7 @@
         <section>
             <actions>
                 <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
-                <set field="logoImageUrl" value="http://localhost:8080/images/ofbiz_logo.jpg"/>
+                <set field="logoImageUrl" value="/images/ofbiz_logo.jpg"/>
                 <!--<set field="defaultFontFamily" value="Arial"/>-->
             </actions>
             <widgets>

Modified: ofbiz/trunk/framework/webapp/config/fop.xconf
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/config/fop.xconf?rev=591256&r1=591255&r2=591256&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/config/fop.xconf (original)
+++ ofbiz/trunk/framework/webapp/config/fop.xconf Fri Nov  2 01:12:14 2007
@@ -31,7 +31,7 @@
 <fop version="1.0">
 
   <!-- Base URL for resolving relative URLs -->
-  <base>.</base>
+  <base>http://localhost:8080</base>
   
   <!-- Source resolution in dpi (dots/pixels per inch) for determining the size of pixels in SVG and bitmap images, default: 72dpi -->
   <source-resolution>72</source-resolution>