svn commit: r1580328 - in /ofbiz/branches/OFBIZ-5312-ofb
Locked
svn commit: r1580328 - in /ofbiz/branches/OFBIZ-5312-ofb
 
|
Author: jleroux
Date: Sat Mar 22 21:17:58 2014 New Revision: 1580328 URL: http://svn.apache.org/r1580328 Log: Merges trunk HEAD in SEO branch Added: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/runtime/patches/ - copied from r1578944, ofbiz/trunk/runtime/patches/ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/src/org/ofbiz/birt/report/servlet/ViewerServletRequest.java - copied unchanged from r1580327, ofbiz/trunk/specialpurpose/birt/src/org/ofbiz/birt/report/servlet/ViewerServletRequest.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/webapp/birt/webcontent/ - copied from r1580327, ofbiz/trunk/specialpurpose/birt/webapp/birt/webcontent/ Removed: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/src/org/ofbiz/birt/report/context/BirtViewerAttributeBean.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/src/org/ofbiz/birt/report/context/OFBizBirtContext.java Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/ (props changed) ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/NOTICE ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/product/ProductWorker.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/build.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/common.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/UtilMisc.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/data/CurrencyData.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/script/org/ofbiz/common/CommonServices.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/LICENSE ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/src/org/ofbiz/birt/container/BirtContainer.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/src/org/ofbiz/birt/report/servlet/BirtEngineServlet.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/src/org/ofbiz/birt/report/servlet/BirtViewerServlet.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/webapp/birt/WEB-INF/web.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/build.xml Propchange: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/ ------------------------------------------------------------------------------ Merged /ofbiz/trunk:r1577888-1580327 Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/NOTICE URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/NOTICE?rev=1580328&r1=1580327&r2=1580328&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/NOTICE (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/NOTICE Sat Mar 22 21:17:58 2014 @@ -4,7 +4,7 @@ ========================================================================= The Apache Open For Business Project (Apache OFBiz) -Copyright 2001-2011 The Apache Software Foundation +Copyright 2001-2014 The Apache Software Foundation ========================================================================= == Apache General Notice (Covers OFBiz and all ASF libraries) == Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml?rev=1580328&r1=1580327&r2=1580328&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml Sat Mar 22 21:17:58 2014 @@ -183,34 +183,36 @@ under the License. <if-not-empty field="parameters.invoiceId"> <!-- get the invoice and do some further validation against it --> <entity-one entity-name="Invoice" value-field="invoice"/> - <!-- check the currencies if they are compatible --> - <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/> + <!-- check the currencies if they are compatible --> <if> <condition> - <or> - <if-compare-field field="invoice.currencyUomId" operator="equals" to-field="defaultCurrencyUomId"/> - <and> - <if-compare-field field="invoice.currencyUomId" operator="not-equals" to-field="defaultCurrencyUomId"/> - <if-compare-field field="invoice.currencyUomId" operator="equals" to-field="payment.actualCurrencyUomId"/> - </and> - </or> + <and> + <if-compare-field field="invoice.currencyUomId" operator="not-equals" to-field="payment.currencyUomId"/> + <if-compare-field field="invoice.currencyUomId" operator="not-equals" to-field="payment.actualCurrencyUomId"/> + </and> </condition> - <then><!-- if required get the payment amount in foreign currency (local we already have) --> - <if-compare-field field="invoice.currencyUomId" operator="not-equals" to-field="defaultCurrencyUomId"> - <set field="actual" value="true" type="Boolean"/> - <call-class-method method-name="getPaymentNotApplied" class-name="org.ofbiz.accounting.payment.PaymentWorker" ret-field="notAppliedPayment"> - <field field="payment" type="GenericValue"/> - <field field="actual" type="Boolean"/> - </call-class-method> - </if-compare-field> - </then> - <else> + <then> <add-error> <fail-property resource="AccountingUiLabels" property="AccountingCurrenciesOfInvoiceAndPaymentNotCompatible"/> </add-error> - </else> + </then> </if> <check-errors/> + <if> + <condition> + <and> + <if-compare-field field="invoice.currencyUomId" operator="not-equals" to-field="payment.currencyUomId"/> + <if-compare-field field="invoice.currencyUomId" operator="equals" to-field="payment.actualCurrencyUomId"/> + </and> + </condition> + <then><!-- if required get the payment amount in foreign currency (local we already have) --> + <set field="actual" value="true" type="Boolean"/> + <call-class-method method-name="getPaymentNotApplied" class-name="org.ofbiz.accounting.payment.PaymentWorker" ret-field="notAppliedPayment"> + <field field="payment" type="GenericValue"/> + <field field="actual" type="Boolean"/> + </call-class-method> + </then> + </if> <!-- get the amount that has not been applied yet for the invoice (outstanding amount) --> <call-class-method method-name="getInvoiceNotApplied" class-name="org.ofbiz.accounting.invoice.InvoiceWorker" ret-field="notAppliedInvoice"> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/product/ProductWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/product/ProductWorker.java?rev=1580328&r1=1580327&r2=1580328&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/product/ProductWorker.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/product/ProductWorker.java Sat Mar 22 21:17:58 2014 @@ -1174,18 +1174,18 @@ nextProd: /** * worker to test if product can be order with a decimal quantity * @param delegator : access to DB - * @param poductId : ref. of product + * @param productId : ref. of product * * @param productStoreId : ref. of store * @return true if it can be ordered by decimal quantity * @throws GenericEntityException to catch */ - public static Boolean isDecimalQuantityOrderAllowed(Delegator delegator, String poductId, String productStoreId) throws GenericEntityException{ + public static Boolean isDecimalQuantityOrderAllowed(Delegator delegator, String productId, String productStoreId) throws GenericEntityException{ //sometime productStoreId may be null (ie PO), then return default value which is TRUE if(UtilValidate.isEmpty(productStoreId)){ return Boolean.TRUE; } String allowDecimalStore = delegator.findOne("ProductStore", Boolean.TRUE, UtilMisc.toMap("productStoreId", productStoreId)).getString("orderDecimalQuantity"); - String allowDecimalProduct = delegator.findOne("Product", Boolean.TRUE, UtilMisc.toMap("productId", poductId)).getString("orderDecimalQuantity"); + String allowDecimalProduct = delegator.findOne("Product", Boolean.TRUE, UtilMisc.toMap("productId", productId)).getString("orderDecimalQuantity"); if("N".equals(allowDecimalProduct) || (UtilValidate.isEmpty(allowDecimalProduct) && "N".equals(allowDecimalStore))){ return Boolean.FALSE; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/build.xml?rev=1580328&r1=1580327&r2=1580328&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/build.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/build.xml Sat Mar 22 21:17:58 2014 @@ -219,9 +219,68 @@ under the License. </target> <!-- ================================================================== --> - <!-- Build Components --> + <!-- Apply patches where needed --> <!-- ================================================================== --> + <target name="build-dev" + description="Patch and build all sources in a dev environment. This includes patching OFBiz using patches in runtime/patches. On Windows you need to have patch.exe in the path and patch files must all be in dos format (CR+LF)"> + <!-- patch task can't handle a fileset => create a global patch --> + <concat destfile="${basedir}/runtime/patches/dev.patch" encoding="UTF-8" outputencoding="UTF-8"> + <fileset dir="${basedir}/runtime/patches" casesensitive="no"> + <exclude name="dev.patch"/> <!-- exclude the patch itself in case it's still there --> + <include name="*.patch"/> + </fileset> + </concat> + <if> + <resourceexists> + <file file="${basedir}/runtime/patches/dev.patch"/> + </resourceexists> + <then> + <patch strip="0" patchfile="${basedir}/runtime/patches/dev.patch" dir="${basedir}"/> + <delete> + <fileset dir="${basedir}/runtime/patches" includes="dev.patch"/> + </delete> + </then> + </if> + </target> + + <target name="build-test" + description="Patch and build all sources for use in a test environment. On Windows you need to have patch.exe in the path and patch files must all be in dos format (CR+LF)"> + <subant inheritall="false" target="prepare-to-build-test"> + <fileset dir="${basedir}/hot-deploy" casesensitive="no"> + <exclude name="disabled/**"/> + <include name="*/build.xml"/> + </fileset> + </subant> + <antcall target="build"/> + </target> + + <target name="build-qa" + description="Patch and build all sources for use in a qa environment. On Windows you need to have patch.exe in the path and patch files must all be in dos format (CR+LF)"> + <subant inheritall="false" target="prepare-to-build-qa"> + <fileset dir="${basedir}/hot-deploy" casesensitive="no"> + <exclude name="disabled/**"/> + <include name="*/build.xml"/> + </fileset> + </subant> + <antcall target="build"/> + </target> + + <target name="build-production" + description="Patch and build all sources for use in a live environment. On Windows you need to have patch.exe in the path and patch files must all be in dos format (CR+LF)"> + <subant inheritall="false" target="prepare-to-build-production"> + <fileset dir="${basedir}/hot-deploy" casesensitive="no"> + <exclude name="disabled/**"/> + <include name="*/build.xml"/> + </fileset> + </subant> + <antcall target="build"/> + </target> + + <!-- ================================================================== --> + <!-- Build Components --> + <!-- ================================================================== --> + <target name="build" depends="ofbiz-init"> <echo message="[build] ========== Start Building (Compile) =========="/> @@ -1178,6 +1237,7 @@ under the License. <echo>======================================================</echo> <echo>Please check that this version is appropriate for you!</echo> </target> + <mkdir dir="${basedir}/hot-deploy/${component-name}/patches/qa"/> <target name="download-sonar-ant-task" description="Download sonar related files"> <ivy:retrieve pattern="framework/base/lib/[artifact]-[revision].[ext]" conf="sonar-ant-task"/> @@ -1248,7 +1308,7 @@ under the License. <mkdir dir="${basedir}/hot-deploy/${component-name}/entitydef"/> <mkdir dir="${basedir}/hot-deploy/${component-name}/lib"/> <mkdir dir="${basedir}/hot-deploy/${component-name}/patches"/> - <mkdir dir="${basedir}/hot-deploy/${component-name}/patches/staging"/> + <mkdir dir="${basedir}/hot-deploy/${component-name}/patches/test"/> <mkdir dir="${basedir}/hot-deploy/${component-name}/patches/qa"/> <mkdir dir="${basedir}/hot-deploy/${component-name}/patches/production"/> <mkdir dir="${basedir}/hot-deploy/${component-name}/script"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/common.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/common.xml?rev=1580328&r1=1580327&r2=1580328&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/common.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/common.xml Sat Mar 22 21:17:58 2014 @@ -164,4 +164,71 @@ under the License. </target> <target name="all" depends="jar,docs"/> + + <!-- ================================================================== --> + <!-- Apply patches if exist --> + <!-- ================================================================== --> + <!-- + This macro applies all patches found in ./patches/@{deployment} relative to ${ofbiz.home.dir} + and stops the build process if patches fail (to save time deleting all the rejects) + --> + <macrodef name="apply-patches"> + <attribute name="deployment" default="dev" /> + + <sequential> + <!-- patch task can't handle a fileset => create a global patch --> + <if> + <available file="patches"/> + <then> + <concat destfile="patches/@{deployment}.patch" encoding="UTF-8" outputencoding="UTF-8"> + <!-- exclude the patch itself in case it's still there --> + <fileset dir="patches" includes="@{deployment}/*.patch"/> + </concat> + + <patch strip="0" patchfile="patches/@{deployment}.patch" dir="${ofbiz.home.dir}"/> + + <delete> + <fileset dir="patches" includes="@{deployment}.patch"/> + </delete> + </then> + </if> + </sequential> + </macrodef> + + <target name="prepare-to-build-dev" + description="Does everything needed to get you a ready to start building OFBiz for development. This include generic patches for OFBiz itself, not only hot-deploy components"> + <apply-patches deployment="dev" /> + </target> + + <target name="prepare-to-build-test" + description="Does everything needed to get you a ready to start building OFBiz for integration testing"> + <apply-patches deployment="test" /> + </target> + + <target name="prepare-to-build-qa" + description="Does everything needed to get you a ready to start building OFBiz in QA-Environment"> + <apply-patches deployment="qa" /> + + <!-- need to use flatten here as qa dir might not exist and thus can't be included in "dir" --> + <copy toDir="config/" overwrite="true" flatten="true"> + <fileset dir="patches" includes="qa/*.properties"/> + </copy> + </target> + + <target name="prepare-to-build-production" + description="Does everything needed to get you a ready to start building OFBiz in production"> + <apply-patches deployment="production" /> + + <!-- need to use flatten here as production dir might not exist and thus can't be included in "dir" --> + <copy toDir="config/" overwrite="true" flatten="true"> + <fileset dir="patches" includes="production/*.properties"/> + </copy> + <!-- Some files might need to be deleted in production, notably some specific script files --> + <!--exec executable="svn" dir="${ofbiz.home.dir}"> + <arg value="delete"/> + <arg value="filename.sh"/> + </exec--> + </target> + + </project> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/UtilMisc.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/UtilMisc.java?rev=1580328&r1=1580327&r2=1580328&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/UtilMisc.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/UtilMisc.java Sat Mar 22 21:17:58 2014 @@ -790,7 +790,7 @@ public class UtilMisc { } public static int getViewLastIndex(int listSize, int viewSize) { - return (int)Math.ceil(listSize / viewSize) - 1; + return (int)Math.ceil(listSize / (float) viewSize) - 1; } } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/data/CurrencyData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/data/CurrencyData.xml?rev=1580328&r1=1580327&r2=1580328&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/data/CurrencyData.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/data/CurrencyData.xml Sat Mar 22 21:17:58 2014 @@ -84,7 +84,6 @@ under the License. <Uom abbreviation="HTG" description="Haitian Gourde" uomId="HTG" uomTypeId="CURRENCY_MEASURE"/> <Uom abbreviation="HUF" description="Hungarian forint" uomId="HUF" uomTypeId="CURRENCY_MEASURE"/> <Uom abbreviation="IDR" description="Indeonesian Rupiah" uomId="IDR" uomTypeId="CURRENCY_MEASURE"/> - <Uom abbreviation="ILS" description="Israeli Scheckel" uomId="ILS" uomTypeId="CURRENCY_MEASURE"/> <Uom abbreviation="INR" description="Indian Rupee" uomId="INR" uomTypeId="CURRENCY_MEASURE"/> <Uom abbreviation="IQD" description="Iraqui Dinar" uomId="IQD" uomTypeId="CURRENCY_MEASURE"/> <Uom abbreviation="IRR" description="Iranian Rial" uomId="IRR" uomTypeId="CURRENCY_MEASURE"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/script/org/ofbiz/common/CommonServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/script/org/ofbiz/common/CommonServices.xml?rev=1580328&r1=1580327&r2=1580328&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/script/org/ofbiz/common/CommonServices.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/script/org/ofbiz/common/CommonServices.xml Sat Mar 22 21:17:58 2014 @@ -247,7 +247,7 @@ under the License. </simple-method> <simple-method method-name="getCountryList" short-description="Returns a list of country" login-required="false"> - <call-class-method method-name="get CountryList" class-name="org.ofbiz.common.CommonWorkers" ret-field="geoList"> + <call-class-method method-name="getCountryList" class-name="org.ofbiz.common.CommonWorkers" ret-field="geoList"> <field field="delegator" type="org.ofbiz.entity.Delegator"/> </call-class-method> <iterate list="geoList" entry="countryGeo"> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java?rev=1580328&r1=1580327&r2=1580328&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java Sat Mar 22 21:17:58 2014 @@ -158,7 +158,7 @@ public class TestRunContainer implements Debug.logInfo("[JUNIT] Results for test suite: " + suite.getName(), module); Debug.logInfo("[JUNIT] Pass: " + results.wasSuccessful() + " | # Tests: " + results.runCount() + " | # Failed: " + results.failureCount() + " # Errors: " + results.errorCount(), module); - if (Debug.importantOn()) { + if (Debug.importantOn() && !results.wasSuccessful()) { Debug.logInfo("[JUNIT] ----------------------------- ERRORS ----------------------------- [JUNIT]", module); Enumeration<?> err = results.errors(); if (!err.hasMoreElements()) { Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java?rev=1580328&r1=1580327&r2=1580328&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java Sat Mar 22 21:17:58 2014 @@ -871,8 +871,7 @@ public class RequestHandler { // attempt to override the default view with a call back into the control servlet, // so just get the target view name and use that String servletName = req.getServletPath(); - if (UtilValidate.isNotEmpty(servletName) && servletName.length() > 1 - || servletName.startsWith("/")) { + if (UtilValidate.isNotEmpty(servletName) && servletName.length() > 1 || servletName.startsWith("/")) { servletName = servletName.substring(1); } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/LICENSE URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/LICENSE?rev=1580328&r1=1580327&r2=1580328&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/LICENSE (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/LICENSE Sat Mar 22 21:17:58 2014 @@ -1366,8 +1366,8 @@ Please contact the Open Applications Gro questions or comments regarding the usage of this material. ========================================================================= -The following libraries distributed with Apache OFBiz are licensed under the -Eclipse Public License - v 1.0: +The following libraries and files distributed with Apache OFBiz are +licensed under the Eclipse Public License - v 1.0: specialpurpose/birt/lib/flute.jar specialpurpose/birt/lib/jaxrpc.jar specialpurpose/birt/lib/js.jar @@ -1399,6 +1399,7 @@ specialpurpose/birt/lib/org.w3c.dom.svg_ specialpurpose/birt/lib/saaj.jar specialpurpose/birt/lib/Tidy.jar specialpurpose/birt/lib/viewservlets.jar +specialpurpose/birt/webapp/birt/webcontent/birt/* specialpurpose/jetty/lib/jetty-ajp-8.1.2.v20120308.jar specialpurpose/jetty/lib/jetty-continuation-8.1.2.v20120308.jar specialpurpose/jetty/lib/jetty-http-8.1.2.v20120308.jar @@ -1410,6 +1411,7 @@ specialpurpose/jetty/lib/jetty-util-8.1. specialpurpose/jetty/lib/jetty-webapp-8.1.2.v20120308.jar specialpurpose/jetty/lib/jetty-xml-8.1.2.v20120308.jar specialpurpose/jetty/lib/org.eclipse.jdt.core-3.7.1.jar + ========================================================================= Eclipse Public License - v 1.0 Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/src/org/ofbiz/birt/container/BirtContainer.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/src/org/ofbiz/birt/container/BirtContainer.java?rev=1580328&r1=1580327&r2=1580328&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/src/org/ofbiz/birt/container/BirtContainer.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/src/org/ofbiz/birt/container/BirtContainer.java Sat Mar 22 21:17:58 2014 @@ -23,6 +23,7 @@ import java.util.logging.Level; import org.eclipse.birt.core.exception.BirtException; import org.eclipse.birt.core.framework.Platform; +import org.eclipse.birt.report.IBirtConstants; import org.eclipse.birt.report.engine.api.EngineConfig; import org.eclipse.birt.report.engine.api.IReportEngine; import org.eclipse.birt.report.engine.api.IReportEngineFactory; @@ -67,6 +68,9 @@ public class BirtContainer implements Co config.setTempDir(ofbizHome + File.separatorChar + "runtime" + File.separatorChar + "tempfiles"); config.setLogConfig(ofbizHome + File.separatorChar + "runtime" + File.separatorChar + "logs", Level.ALL); + // set system properties + System.setProperty(IBirtConstants.SYS_PROP_WORKING_PATH, config.getTempDir()); + // startup platform try { Debug.logInfo("Startup BIRT platform", module); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/src/org/ofbiz/birt/report/servlet/BirtEngineServlet.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/src/org/ofbiz/birt/report/servlet/BirtEngineServlet.java?rev=1580328&r1=1580327&r2=1580328&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/src/org/ofbiz/birt/report/servlet/BirtEngineServlet.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/src/org/ofbiz/birt/report/servlet/BirtEngineServlet.java Sat Mar 22 21:17:58 2014 @@ -24,12 +24,13 @@ import javax.servlet.http.HttpServletReq import javax.servlet.http.HttpServletResponse; import org.eclipse.birt.core.exception.BirtException; +import org.eclipse.birt.report.context.BirtContext; import org.eclipse.birt.report.context.IContext; import org.eclipse.birt.report.service.BirtReportServiceFactory; import org.eclipse.birt.report.service.ReportEngineService; +import org.eclipse.birt.report.utility.ParameterAccessor; import org.ofbiz.base.util.UtilGenerics; import org.ofbiz.birt.BirtWorker; -import org.ofbiz.birt.report.context.OFBizBirtContext; @SuppressWarnings("serial") public class BirtEngineServlet extends org.eclipse.birt.report.servlet.BirtEngineServlet { @@ -44,6 +45,7 @@ public class BirtEngineServlet extends o Map<String, Object> appContext = UtilGenerics.cast(ReportEngineService.getInstance().getEngineConfig().getAppContext()); BirtWorker.setWebContextObjects(appContext, request, response); - return new OFBizBirtContext( request, response ); + return new BirtContext(new ViewerServletRequest(ParameterAccessor.getParameter(request, ParameterAccessor.PARAM_REPORT) + , request), response); } } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/src/org/ofbiz/birt/report/servlet/BirtViewerServlet.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/src/org/ofbiz/birt/report/servlet/BirtViewerServlet.java?rev=1580328&r1=1580327&r2=1580328&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/src/org/ofbiz/birt/report/servlet/BirtViewerServlet.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/src/org/ofbiz/birt/report/servlet/BirtViewerServlet.java Sat Mar 22 21:17:58 2014 @@ -24,13 +24,14 @@ import javax.servlet.http.HttpServletReq import javax.servlet.http.HttpServletResponse; import org.eclipse.birt.core.exception.BirtException; +import org.eclipse.birt.report.context.BirtContext; import org.eclipse.birt.report.context.IContext; import org.eclipse.birt.report.service.BirtReportServiceFactory; import org.eclipse.birt.report.service.ReportEngineService; import org.eclipse.birt.report.servlet.ViewerServlet; +import org.eclipse.birt.report.utility.ParameterAccessor; import org.ofbiz.base.util.UtilGenerics; import org.ofbiz.birt.BirtWorker; -import org.ofbiz.birt.report.context.OFBizBirtContext; @SuppressWarnings("serial") public class BirtViewerServlet extends ViewerServlet { @@ -45,6 +46,7 @@ public class BirtViewerServlet extends V Map<String, Object> appContext = UtilGenerics.cast(ReportEngineService.getInstance().getEngineConfig().getAppContext()); BirtWorker.setWebContextObjects(appContext, request, response); - return new OFBizBirtContext( request, response ); + return new BirtContext(new ViewerServletRequest(ParameterAccessor.getParameter(request, ParameterAccessor.PARAM_REPORT) + , request), response); } } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/webapp/birt/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/webapp/birt/WEB-INF/web.xml?rev=1580328&r1=1580327&r2=1580328&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/webapp/birt/WEB-INF/web.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/webapp/birt/WEB-INF/web.xml Sat Mar 22 21:17:58 2014 @@ -85,7 +85,7 @@ under the License. --> <context-param> <param-name>WORKING_FOLDER_ACCESS_ONLY</param-name> - <param-value>true</param-value> + <param-value>false</param-value> </context-param> <!-- @@ -227,12 +227,10 @@ under the License. <load-on-startup>1</load-on-startup> </servlet> <!-- Viewer Servlet, Supports SOAP --> - <!-- <servlet> <servlet-name>ViewerServlet</servlet-name> <servlet-class>org.ofbiz.birt.report.servlet.BirtViewerServlet</servlet-class> </servlet> - --> <!-- Engine Servlet --> <servlet> <servlet-name>EngineServlet</servlet-name> @@ -240,7 +238,6 @@ under the License. </servlet> <servlet-mapping><servlet-name>ControlServlet</servlet-name><url-pattern>/control/*</url-pattern></servlet-mapping> - <!-- <servlet-mapping> <servlet-name>ViewerServlet</servlet-name> <url-pattern>/frameset</url-pattern> @@ -250,7 +247,6 @@ under the License. <servlet-name>ViewerServlet</servlet-name> <url-pattern>/run</url-pattern> </servlet-mapping> - --> <servlet-mapping> <servlet-name>EngineServlet</servlet-name> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/build.xml?rev=1580328&r1=1580327&r2=1580328&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/build.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/build.xml Sat Mar 22 21:17:58 2014 @@ -22,22 +22,23 @@ <filelist id="specialpurpose-builds" dir="specialpurpose" files=" appserver/build.xml, - jetty/build.xml, - lucene/build.xml, - ecommerce/build.xml, - pos/build.xml, - hhfacility/build.xml, assetmaint/build.xml, - oagis/build.xml, - googlebase/build.xml, + birt/build.xml, ebay/build.xml, ebaystore/build.xml, + ecommerce/build.xml, + example/build.xml, + googlebase/build.xml, + googlecheckout/build.xml, + hhfacility/build.xml, + jetty/build.xml, + ldap/build.xml, + lucene/build.xml, + oagis/build.xml, + pos/build.xml, projectmgr/build.xml, scrum/build.xml, - ldap/build.xml, webpos/build.xml - googlecheckout/build.xml, - birt/build.xml, - example/build.xml "/> + <!-- crowd/build.xml, --> </project> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |