You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ri...@apache.org on 2018/04/30 10:52:55 UTC
svn commit: r1830545 [1/7] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/data/ applications/commonext/data/ applications/content/data/ applications/datamodel/data/demo/ applications/datamodel/data/seed/ applications/order/data/ application...

Author: rishi
Date: Mon Apr 30 10:52:55 2018
New Revision: 1830545

URL: http://svn.apache.org/viewvc?rev=1830545&view=rev
Log:
Improved: Remove empty field values from xml data files so that it will not override existing data with empty values. Removed all empty data fields from data files.
(OFBIZ-10282)
Thanks to Arun Patidar for reporting and review.
Thanks to Suraj Khurana for providing patch for the improvement.
Thanks to Jacques for discussion and finalizing the work.

Modified:
    ofbiz/ofbiz-framework/trunk/applications/accounting/data/AccountingScheduledServiceData.xml
    ofbiz/ofbiz-framework/trunk/applications/commonext/data/ProductStoreData.xml
    ofbiz/ofbiz-framework/trunk/applications/content/data/ContentHelpData.xml
    ofbiz/ofbiz-framework/trunk/applications/datamodel/data/demo/AccountingDemoData.xml
    ofbiz/ofbiz-framework/trunk/applications/datamodel/data/demo/ContentDemoData.xml
    ofbiz/ofbiz-framework/trunk/applications/datamodel/data/demo/MarketingDemoData.xml
    ofbiz/ofbiz-framework/trunk/applications/datamodel/data/demo/OrderDemoData.xml
    ofbiz/ofbiz-framework/trunk/applications/datamodel/data/demo/SecurityExtDemoData.xml
    ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/AccountingSeedData.xml
    ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/ContentSeedData.xml
    ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/HumanResSeedData.xml
    ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/ManufacturingSeedData.xml
    ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/MarketingSeedData.xml
    ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/OrderSeedData.xml
    ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/PartySeedData.xml
    ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/ProductSeedData.xml
    ofbiz/ofbiz-framework/trunk/applications/datamodel/data/seed/WorkEffortSeedData.xml
    ofbiz/ofbiz-framework/trunk/applications/order/data/OrderPortletData.xml
    ofbiz/ofbiz-framework/trunk/applications/order/data/OrderTypeData.xml
    ofbiz/ofbiz-framework/trunk/applications/order/testdef/data/OrderTestData.xml
    ofbiz/ofbiz-framework/trunk/applications/party/data/PartyPortletData.xml
    ofbiz/ofbiz-framework/trunk/applications/party/data/PartyTypeData.xml
    ofbiz/ofbiz-framework/trunk/applications/product/testdef/data/IssuanceTestData.xml
    ofbiz/ofbiz-framework/trunk/applications/product/testdef/data/ProductPriceTestData.xml
    ofbiz/ofbiz-framework/trunk/applications/workeffort/data/WorkEffortTypeData.xml
    ofbiz/ofbiz-framework/trunk/framework/common/data/CommonPortletData.xml
    ofbiz/ofbiz-framework/trunk/framework/common/data/CommonSystemPropertyData.xml
    ofbiz/ofbiz-framework/trunk/framework/common/data/CommonTypeData.xml
    ofbiz/ofbiz-framework/trunk/framework/common/data/CountryCodeData.xml
    ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData.xml
    ofbiz/ofbiz-framework/trunk/framework/common/data/GeoData_IL.xml
    ofbiz/ofbiz-framework/trunk/framework/entityext/data/EntityExtTypeData.xml
    ofbiz/ofbiz-framework/trunk/framework/security/data/PasswordSecurityDemoData.xml
    ofbiz/ofbiz-framework/trunk/framework/security/data/SecurityTypeDemoData.xml
    ofbiz/ofbiz-framework/trunk/framework/service/data/ScheduledServiceData.xml

Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/data/AccountingScheduledServiceData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/data/AccountingScheduledServiceData.xml?rev=1830545&r1=1830544&r2=1830545&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/accounting/data/AccountingScheduledServiceData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/accounting/data/AccountingScheduledServiceData.xml Mon Apr 30 10:52:55 2018
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <entity-engine-xml>
-    <RecurrenceRule recurrenceRuleId="400" untilDateTime="" frequency="MONTHLY" intervalNumber="1" countNumber="-1"/>
+    <RecurrenceRule recurrenceRuleId="400" frequency="MONTHLY" intervalNumber="1" countNumber="-1"/>
     <RecurrenceInfo recurrenceInfoId="400" startDateTime="2008-05-14 22:00:00.000" recurrenceRuleId="400" recurrenceCount="0"/>
     <RuntimeData runtimeDataId="8501">
         <runtimeInfo><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
@@ -39,7 +39,7 @@ under the License.
     </RuntimeData>
     <JobSandbox jobId="8500" jobName="Generate Invoice template" runTime="2008-05-14 00:00:00.000" serviceName="autoGenerateInvoiceFromExistingInvoice" runtimeDataId="8501" poolId="pool" runAsUser="system" recurrenceInfoId="400"/>
     
-    <RecurrenceRule recurrenceRuleId="9000" untilDateTime="" frequency="DAILY" intervalNumber="5" countNumber="-1"/>
+    <RecurrenceRule recurrenceRuleId="9000" frequency="DAILY" intervalNumber="5" countNumber="-1"/>
     <RecurrenceInfo recurrenceInfoId="9000" startDateTime="2000-01-01 00:00:00.000" recurrenceRuleId="9000" recurrenceCount="0"/>
     <JobSandbox jobId="9000" jobName="Auto Reconcile Financial Account" runTime="2000-01-01 00:00:00.000" serviceName="autoFinAccountReconciliation" poolId="pool" runAsUser="system" recurrenceInfoId="9000"/>
     

Modified: ofbiz/ofbiz-framework/trunk/applications/commonext/data/ProductStoreData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/commonext/data/ProductStoreData.xml?rev=1830545&r1=1830544&r2=1830545&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/commonext/data/ProductStoreData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/commonext/data/ProductStoreData.xml Mon Apr 30 10:52:55 2018
@@ -21,10 +21,10 @@
 <entity-engine-xml>
     <!-- Payment Gateway Config -->
     <PaymentGatewayConfig paymentGatewayConfigId="PAYPAL_CONFIG" paymentGatewayConfigTypeId="PAY_GATWY_PAYPAL" description="PayPal Config"/>
-    <PaymentGatewayPayPal paymentGatewayConfigId="PAYPAL_CONFIG" businessEmail="" apiUserName="" apiPassword="" apiSignature="" apiEnvironment="" notifyUrl="" returnUrl="" cancelReturnUrl="" imageUrl="" confirmTemplate="/order/emailconfirmation.ftl" redirectUrl="https://www.sandbox.paypal.com/webscr" confirmUrl="https://www.sandbox.paypal.com/us/cgi-bin/webscr" shippingCallbackUrl="" requireConfirmedShipping="N"/>
+    <PaymentGatewayPayPal paymentGatewayConfigId="PAYPAL_CONFIG" confirmTemplate="/order/emailconfirmation.ftl" redirectUrl="https://www.sandbox.paypal.com/webscr" confirmUrl="https://www.sandbox.paypal.com/us/cgi-bin/webscr" requireConfirmedShipping="N"/>
 
     <PaymentGatewayConfig paymentGatewayConfigId="WORLDPAY_CONFIG" paymentGatewayConfigTypeId="PAY_GATWY_WORLDPAY" description="RBS WorldPay Config"/>
-    <PaymentGatewayWorldPay paymentGatewayConfigId="WORLDPAY_CONFIG" redirectUrl="https://select-test.worldpay.com/wcc/purchase" instId="" authMode="A" fixContact="N" hideContact="N" hideCurrency="N" langId="" noLanguageMenu="N" withDelivery="N" testMode="100"/>
+    <PaymentGatewayWorldPay paymentGatewayConfigId="WORLDPAY_CONFIG" redirectUrl="https://select-test.worldpay.com/wcc/purchase" authMode="A" fixContact="N" hideContact="N" hideCurrency="N" noLanguageMenu="N" withDelivery="N" testMode="100"/>
     
     <ProductStorePaymentSetting productStoreId="${productStoreId}" paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_AUTH" paymentService="alwaysApproveCCProcessor" paymentCustomMethodId="CC_AUTH_ALWAYSAPPROV"/>
     <ProductStorePaymentSetting productStoreId="${productStoreId}" paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_RELEASE" paymentService="testCCRelease" paymentCustomMethodId="CC_RELEASE_TEST"/>
@@ -35,11 +35,11 @@
     <ProductStorePaymentSetting productStoreId="${productStoreId}" paymentMethodTypeId="GIFT_CARD" paymentServiceTypeEnumId="PRDS_PAY_AUTH" paymentService="alwaysApproveGCProcessor" paymentCustomMethodId="GIFT_AUTH_ALWAYSAPPR"/>
     <ProductStorePaymentSetting productStoreId="${productStoreId}" paymentMethodTypeId="GIFT_CARD" paymentServiceTypeEnumId="PRDS_PAY_RELEASE" paymentService="testGCRelease" paymentCustomMethodId="GIFT_RELEASE_TEST"/>
     
-    <ProductStorePaymentSetting productStoreId="${productStoreId}" paymentMethodTypeId="EXT_PAYPAL" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService="" paymentCustomMethodId="" paymentGatewayConfigId="PAYPAL_CONFIG"/>
-    <ProductStorePaymentSetting productStoreId="${productStoreId}" paymentMethodTypeId="EXT_WORLDPAY" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService="" paymentCustomMethodId="" paymentGatewayConfigId="WORLDPAY_CONFIG"/>
-    <ProductStorePaymentSetting productStoreId="${productStoreId}" paymentMethodTypeId="EXT_OFFLINE" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService="" paymentCustomMethodId=""/>
-    <ProductStorePaymentSetting productStoreId="${productStoreId}" paymentMethodTypeId="EXT_COD" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService="" paymentCustomMethodId=""/>
-    <ProductStorePaymentSetting productStoreId="${productStoreId}" paymentMethodTypeId="EXT_BILLACT" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService="" paymentCustomMethodId=""/>
+    <ProductStorePaymentSetting productStoreId="${productStoreId}" paymentMethodTypeId="EXT_PAYPAL" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentGatewayConfigId="PAYPAL_CONFIG"/>
+    <ProductStorePaymentSetting productStoreId="${productStoreId}" paymentMethodTypeId="EXT_WORLDPAY" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentGatewayConfigId="WORLDPAY_CONFIG"/>
+    <ProductStorePaymentSetting productStoreId="${productStoreId}" paymentMethodTypeId="EXT_OFFLINE" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL"/>
+    <ProductStorePaymentSetting productStoreId="${productStoreId}" paymentMethodTypeId="EXT_COD" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL"/>
+    <ProductStorePaymentSetting productStoreId="${productStoreId}" paymentMethodTypeId="EXT_BILLACT" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL"/>
     
     <ProductStoreShipmentMeth productStoreShipMethId="9000" productStoreId="${productStoreId}" partyId="_NA_" includeNoChargeItems="Y" allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="NO_SHIPPING" sequenceNumber="6"/>
     <ProductStoreShipmentMeth productStoreShipMethId="9001" productStoreId="${productStoreId}" partyId="UPS" includeNoChargeItems="N" allowUspsAddr="N" requireUspsAddr="N" roleTypeId="CARRIER" shipmentMethodTypeId="GROUND" sequenceNumber="3"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/content/data/ContentHelpData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/data/ContentHelpData.xml?rev=1830545&r1=1830544&r2=1830545&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/content/data/ContentHelpData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/content/data/ContentHelpData.xml Mon Apr 30 10:52:55 2018
@@ -28,8 +28,8 @@ under the License.
     <Content contentId="DOCUMENTS" contentTypeId="DOCUMENT" contentName="Documents"/>
 
     <!-- system document root used in content -> navigate -->
-    <Content contentId="TREE_ROOT" contentTypeId="DOCUMENT" contentName="ROOT" dataResourceId=""/>
-    <ContentAssoc contentId="TREE_ROOT" contentIdTo="DOCUMENTS" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum=""/>
+    <Content contentId="TREE_ROOT" contentTypeId="DOCUMENT" contentName="ROOT"/>
+    <ContentAssoc contentId="TREE_ROOT" contentIdTo="DOCUMENTS" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01"/>
 
     <!-- show help on the system document root -->
     <ContentAssoc contentId="TREE_ROOT" contentIdTo="HELP_ROOT" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01"/>