svn commit: r1830546 [1/2] - in /ofbiz/ofbiz-plugins/trunk: birt/data/ birt/data/example/ cmssite/data/ ebay/data/ ebaystore/data/ ecommerce/data/ example/data/ passport/data/ pricat/data/ projectmgr/data/ scrum/data/ webpos/data/

rishi Mon, 30 Apr 2018 03:57:08 -0700

Author: rishi
Date: Mon Apr 30 10:56:31 2018
New Revision: 1830546

URL: http://svn.apache.org/viewvc?rev=1830546&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 plugins components.
(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-plugins/trunk/birt/data/BirtHelpData.xml
    ofbiz/ofbiz-plugins/trunk/birt/data/OrderPortletData.xml
    ofbiz/ofbiz-plugins/trunk/birt/data/example/ExampleDemoData.xml
    ofbiz/ofbiz-plugins/trunk/cmssite/data/CmsSiteDemoData.xml
    ofbiz/ofbiz-plugins/trunk/ebay/data/EbayTypeData.xml
    ofbiz/ofbiz-plugins/trunk/ebaystore/data/DemoEbayStoreData.xml
    ofbiz/ofbiz-plugins/trunk/ebaystore/data/EbayStoreTypeData.xml
    ofbiz/ofbiz-plugins/trunk/ecommerce/data/DemoTestSurveyData.xml
    ofbiz/ofbiz-plugins/trunk/ecommerce/data/DemoWebSitePublishPointData.xml
    ofbiz/ofbiz-plugins/trunk/example/data/ExampleDemoData.xml
    ofbiz/ofbiz-plugins/trunk/passport/data/OAuth2CommonSeedData.xml
    ofbiz/ofbiz-plugins/trunk/passport/data/OAuth2GitHubSeedData.xml
    ofbiz/ofbiz-plugins/trunk/passport/data/OAuth2LinkedInSeedData.xml
    ofbiz/ofbiz-plugins/trunk/pricat/data/PricatData.xml
    ofbiz/ofbiz-plugins/trunk/projectmgr/data/ProjectMgrDemoPasswordData.xml
    ofbiz/ofbiz-plugins/trunk/projectmgr/data/ProjectMgrTypeData.xml
    ofbiz/ofbiz-plugins/trunk/scrum/data/scrumDemoData.xml
    ofbiz/ofbiz-plugins/trunk/scrum/data/scrumTypeData.xml
    ofbiz/ofbiz-plugins/trunk/webpos/data/DemoPosData.xml
    ofbiz/ofbiz-plugins/trunk/webpos/data/PosTypeData.xml

Modified: ofbiz/ofbiz-plugins/trunk/birt/data/BirtHelpData.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/birt/data/BirtHelpData.xml?rev=1830546&r1=1830545&r2=1830546&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/birt/data/BirtHelpData.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/birt/data/BirtHelpData.xml Mon Apr 30 10:56:31 
2018
@@ -24,5 +24,5 @@
                   dataResourceName="BIRT" mimeTypeId="text/xml" isPublic="Y" />
     <Content contentId="HELP_BIRT" contentTypeId="DOCUMENT" contentName="BIRT 
Overview" templateDataResourceId="HELP_TEMPL"
              dataResourceId="HELP_BIRT" statusId="CTNT_IN_PROGRESS" 
mimeTypeId="text/html"/>
-    <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_BIRT" 
contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="" 
mapKey="BIRT_main"/>
+    <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_BIRT" 
contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" 
mapKey="BIRT_main"/>
 </entity-engine-xml>

Modified: ofbiz/ofbiz-plugins/trunk/birt/data/OrderPortletData.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/birt/data/OrderPortletData.xml?rev=1830546&r1=1830545&r2=1830546&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/birt/data/OrderPortletData.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/birt/data/OrderPortletData.xml Mon Apr 30 
10:56:31 2018
@@ -22,7 +22,7 @@
                    portletName="Sale Orders by Channel"
                    screenName="SaleOrdersByChannelReport"
                    
screenLocation="component://birt/widget/order/OrderScreens.xml"
-                   description=""/>
+                  />
     <PortletPortletCategory portalPortletId="OrderByChannel" 
portletCategoryId="REPORT"/>
     <PortalPagePortlet portalPageId="OrderReportPage" 
portalPortletId="OrderByChannel" portletSeqId="00001" columnSeqId="00001" 
sequenceNum="6"/>
 
@@ -30,7 +30,7 @@
                    portletName="Orders with discount code"
                    screenName="SaleOrderDiscountCodeReport"
                    
screenLocation="component://birt/widget/order/OrderScreens.xml"
-                   description=""/>
+                  />
     <PortletPortletCategory portalPortletId="OrderDiscountCode" 
portletCategoryId="REPORT"/>
     <PortalPagePortlet portalPageId="OrderReportPage" 
portalPortletId="OrderDiscountCode" portletSeqId="00001" columnSeqId="00001" 
sequenceNum="7"/>
 
@@ -38,7 +38,7 @@
                    portletName="Last 3 Months Sales Report"
                    screenName="Last3MonthsSalesReport"
                    
screenLocation="component://birt/widget/order/OrderScreens.xml"
-                   description=""/>
+                  />
     <PortletPortletCategory portalPortletId="Last3MSalesReport" 
portletCategoryId="REPORT"/>
     <PortalPagePortlet portalPageId="OrderReportPage" 
portalPortletId="Last3MSalesReport" portletSeqId="00001" columnSeqId="00002" 
sequenceNum="8"/>
 
@@ -46,7 +46,7 @@
                    portletName="Coupon Sales Report"
                    screenName="CouponSalesReport"
                    
screenLocation="component://birt/widget/order/OrderScreens.xml"
-                   description=""/>
+                  />
     <PortletPortletCategory portalPortletId="CouponSalesReport" 
portletCategoryId="REPORT"/>
     <PortalPagePortlet portalPageId="OrderReportPage" 
portalPortletId="CouponSalesReport" portletSeqId="00001" columnSeqId="00002" 
sequenceNum="9"/>
 
@@ -54,7 +54,7 @@
                    portletName="Sales Report"
                    screenName="SalesReport"
                    
screenLocation="component://birt/widget/order/OrderScreens.xml"
-                   description=""/>
+                  />
     <PortletPortletCategory portalPortletId="SalesReport" 
portletCategoryId="REPORT"/>
     <PortalPagePortlet portalPageId="OrderReportPage" 
portalPortletId="SalesReport" portletSeqId="00001" columnSeqId="00002" 
sequenceNum="10"/>
 
@@ -62,7 +62,7 @@
                    portletName="Product Demand Report"
                    screenName="ProductDemandReport"
                    
screenLocation="component://birt/widget/order/OrderScreens.xml"
-                   description=""/>
+                  />
     <PortletPortletCategory portalPortletId="PDR_Report" 
portletCategoryId="REPORT"/>
     <PortalPagePortlet portalPageId="OrderReportPage" 
portalPortletId="PDR_Report" portletSeqId="00001" columnSeqId="00002" 
sequenceNum="12"/>
 </entity-engine-xml>
\ No newline at end of file

Modified: ofbiz/ofbiz-plugins/trunk/birt/data/example/ExampleDemoData.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/birt/data/example/ExampleDemoData.xml?rev=1830546&r1=1830545&r2=1830546&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/birt/data/example/ExampleDemoData.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/birt/data/example/ExampleDemoData.xml Mon Apr 30 
10:56:31 2018
@@ -18,16 +18,16 @@ specific language governing permissions
 under the License.
 -->
 <entity-engine-xml>
-    <ExampleType exampleTypeId="REAL_WORLD" description="Real World" 
parentTypeId=""/>
-    <ExampleType exampleTypeId="MADE_UP" description="Made Up" 
parentTypeId=""/>
+    <ExampleType exampleTypeId="REAL_WORLD" description="Real World"/>
+    <ExampleType exampleTypeId="MADE_UP" description="Made Up"/>
     <ExampleType exampleTypeId="CONTRIVED" description="Contrived" 
parentTypeId="MADE_UP"/>
     <ExampleType exampleTypeId="INSPIRED" description="Inspired" 
parentTypeId="MADE_UP"/>
 
-    <ExampleFeatureApplType exampleFeatureApplTypeId="REQUIRED" 
description="Required" parentTypeId=""/>
-    <ExampleFeatureApplType exampleFeatureApplTypeId="DESIRED" 
description="Desired" parentTypeId=""/>
-    <ExampleFeatureApplType exampleFeatureApplTypeId="NOT_ALLOWED" 
description="Not Allowed" parentTypeId=""/>
+    <ExampleFeatureApplType exampleFeatureApplTypeId="REQUIRED" 
description="Required"/>
+    <ExampleFeatureApplType exampleFeatureApplTypeId="DESIRED" 
description="Desired"/>
+    <ExampleFeatureApplType exampleFeatureApplTypeId="NOT_ALLOWED" 
description="Not Allowed"/>
 
-    <StatusType description="Example" statusTypeId="EXAMPLE_STATUS" 
hasTable="N" parentTypeId=""/>
+    <StatusType description="Example" statusTypeId="EXAMPLE_STATUS" 
hasTable="N"/>
     <StatusItem description="In Design" sequenceId="01" statusCode="IN_DESIGN" 
statusId="EXST_IN_DESIGN" statusTypeId="EXAMPLE_STATUS"/>
     <StatusItem description="Defined" sequenceId="02" statusCode="DEFINED" 
statusId="EXST_DEFINED" statusTypeId="EXAMPLE_STATUS"/>
     <StatusItem description="Approved" sequenceId="03" statusCode="APPROVED" 
statusId="EXST_APPROVED" statusTypeId="EXAMPLE_STATUS"/>
@@ -46,7 +46,7 @@ under the License.
     <StatusValidChange statusId="EXST_IMPLEMENTED" statusIdTo="EXST_CANCELLED" 
transitionName="Cancel Example"/>
     <StatusValidChange statusId="EXST_TESTED" statusIdTo="EXST_CANCELLED" 
transitionName="Cancel Example"/>
 
-    <EnumerationType description="Example Feature Source" 
enumTypeId="EXMPL_FEAT_SOURCE" hasTable="N" parentTypeId=""/>
+    <EnumerationType description="Example Feature Source" 
enumTypeId="EXMPL_FEAT_SOURCE" hasTable="N"/>
     <Enumeration description="Customer" enumCode="CUSTOMER" 
enumId="EXFTSRC_CUSTOMER" sequenceId="01" enumTypeId="EXMPL_FEAT_SOURCE"/>
     <Enumeration description="Partner" enumCode="PARTNER" 
enumId="EXFTSRC_PARTNER" sequenceId="02" enumTypeId="EXMPL_FEAT_SOURCE"/>
     <Enumeration description="Employee" enumCode="EMPLOYEE" 
enumId="EXFTSRC_EMPLOYEE" sequenceId="03" enumTypeId="EXMPL_FEAT_SOURCE"/>

Modified: ofbiz/ofbiz-plugins/trunk/cmssite/data/CmsSiteDemoData.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/cmssite/data/CmsSiteDemoData.xml?rev=1830546&r1=1830545&r2=1830546&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/cmssite/data/CmsSiteDemoData.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/cmssite/data/CmsSiteDemoData.xml Mon Apr 30 
10:56:31 2018
@@ -21,7 +21,7 @@ under the License.
 <entity-engine-xml>
     <!-- Making the CmsSite as a default site in multisite setup -->
     <WebSite webSiteId="CmsSite" siteName="CMS Web Site" 
hostedPathAlias="cmssite" isDefault="Y"/>
-    <Content contentId="CMSS_PPOINT" contentTypeId="WEB_SITE_PUB_PT" 
contentName="CMS Site Publish Point" description=""/>
+    <Content contentId="CMSS_PPOINT" contentTypeId="WEB_SITE_PUB_PT" 
contentName="CMS Site Publish Point"/>
     <WebSiteContent webSiteId="CmsSite" contentId="CMSS_PPOINT" 
webSiteContentTypeId="PUBLISH_POINT" fromDate="2001-01-01 00:00:00"/>
 
     <!-- Main Decorator -->
@@ -217,7 +217,7 @@ under the License.
 
 <!-- =========================official OFBiz website 
============================================ -->
     <WebSite webSiteId="OfbizSite" siteName="OFBiz Web Site"/>
-    <Content contentId="OFBIZ_PPOINT" contentTypeId="WEB_SITE_PUB_PT" 
contentName="OFBiz Site Publish Point" description=""/>
+    <Content contentId="OFBIZ_PPOINT" contentTypeId="WEB_SITE_PUB_PT" 
contentName="OFBiz Site Publish Point"/>
     <WebSiteContent webSiteId="OfbizSite" contentId="OFBIZ_PPOINT" 
webSiteContentTypeId="PUBLISH_POINT" fromDate="2001-01-01 00:00:00"/>
     <DataResource dataResourceId="OFBIZ_HOME" 
dataResourceTypeId="URL_RESOURCE" dataTemplateTypeId="SCREEN_COMBINED"
         objectInfo="component://cmssite/widget/OfbizsiteScreens.xml#main"/>
@@ -234,17 +234,17 @@ under the License.
 
     <DataResource dataResourceId="APACHE_OFBIZ" localeString="en" 
dataResourceTypeId="OFBIZ_FILE" 
objectInfo="plugins/cmssite/documents/ApacheOfbiz.xml" 
dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Apache 
OFBiz document" mimeTypeId="text/xml" isPublic="Y" />
     <Content contentId="APACHE_OFBIZ_HTML" contentTypeId="DOCUMENT" 
templateDataResourceId="DOCBOOK_HTML_TEMPL" dataResourceId="APACHE_OFBIZ" 
localeString="en" statusId="CTNT_IN_PROGRESS" contentName="The User &amp; 
Technical Apache OFBiz document in one page HTML" mimeTypeId="text/html"/>
-    <ContentAssoc contentId="DOCUMENTS" contentIdTo="APACHE_OFBIZ_HTML" 
contentAssocTypeId="SUB_CONTENT" fromDate="2006-01-12 01:01:01" sequenceNum=""/>
+    <ContentAssoc contentId="DOCUMENTS" contentIdTo="APACHE_OFBIZ_HTML" 
contentAssocTypeId="SUB_CONTENT" fromDate="2006-01-12 01:01:01"/>/>
 
     <Content contentId="APACHE_OFBIZ_PDF" contentTypeId="DOCUMENT" 
templateDataResourceId="DOCBOOK_PDF_TEMPL" dataResourceId="APACHE_OFBIZ" 
localeString="en" statusId="CTNT_IN_PROGRESS" contentName="The general Apache 
document in PDF format" mimeTypeId="application/pdf"/>
-    <ContentAssoc contentId="DOCUMENTS" contentIdTo="APACHE_OFBIZ_PDF" 
contentAssocTypeId="SUB_CONTENT" fromDate="2006-01-12 01:01:01" sequenceNum=""/>
+    <ContentAssoc contentId="DOCUMENTS" contentIdTo="APACHE_OFBIZ_PDF" 
contentAssocTypeId="SUB_CONTENT" fromDate="2006-01-12 01:01:01"/>/>
 
     <DataResource dataResourceId="APACHE_OFBIZ_TECH" localeString="en" 
dataResourceTypeId="OFBIZ_FILE" 
objectInfo="plugins/cmssite/documents/ApacheOfbizTechnical.xml" 
dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Apache 
OFBiz document" mimeTypeId="text/xml" isPublic="Y" />
     <Content contentId="APACHE_OFBIZ_T_HTML" contentTypeId="DOCUMENT" 
templateDataResourceId="DOCBOOK_HTML_TEMPL" dataResourceId="APACHE_OFBIZ_TECH" 
localeString="en" statusId="CTNT_IN_PROGRESS" contentName="The Apache OFBiz 
Technical Guide in one page HTML" mimeTypeId="text/html"/>
-    <ContentAssoc contentId="DOCUMENTS" contentIdTo="APACHE_OFBIZ_T_HTML" 
contentAssocTypeId="SUB_CONTENT" fromDate="2006-01-12 01:01:01" sequenceNum=""/>
+    <ContentAssoc contentId="DOCUMENTS" contentIdTo="APACHE_OFBIZ_T_HTML" 
contentAssocTypeId="SUB_CONTENT" fromDate="2006-01-12 01:01:01"/>/>
     <DataResource dataResourceId="APACHE_OFBIZ_USER" localeString="en" 
dataResourceTypeId="OFBIZ_FILE" 
objectInfo="plugins/cmssite/documents/ApacheOfbizUser.xml" 
dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Apache 
OFBiz User document" mimeTypeId="text/xml" isPublic="Y" />
     <Content contentId="APACHE_OFBIZ_U_HTML" contentTypeId="DOCUMENT" 
templateDataResourceId="DOCBOOK_HTML_TEMPL" dataResourceId="APACHE_OFBIZ_USER" 
localeString="en" statusId="CTNT_IN_PROGRESS" contentName="The Apache OFBizUser 
Guide in one page HTML" mimeTypeId="text/html"/>
-    <ContentAssoc contentId="DOCUMENTS" contentIdTo="APACHE_OFBIZ_U_HTML" 
contentAssocTypeId="SUB_CONTENT" fromDate="2006-01-12 01:01:01" sequenceNum=""/>
+    <ContentAssoc contentId="DOCUMENTS" contentIdTo="APACHE_OFBIZ_U_HTML" 
contentAssocTypeId="SUB_CONTENT" fromDate="2006-01-12 01:01:01"/>/>
 
 
     <ContentAssoc contentId="CMSS_PPOINT" contentIdTo="PUBLIC_DOCS" 
contentAssocTypeId="SUB_CONTENT" fromDate="2001-01-01 00:00:00"/>

Modified: ofbiz/ofbiz-plugins/trunk/ebay/data/EbayTypeData.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ebay/data/EbayTypeData.xml?rev=1830546&r1=1830545&r2=1830546&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ebay/data/EbayTypeData.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/ebay/data/EbayTypeData.xml Mon Apr 30 10:56:31 
2018
@@ -20,9 +20,9 @@ under the License.
 
 <entity-engine-xml>
     <ProductPricePurpose productPricePurposeId="EBAY" description="eBay 
Auction"/>
-    <ProductCategoryType productCategoryTypeId="EBAY_CATEGORY" 
description="eBay" hasTable="N" parentTypeId=""/>
+    <ProductCategoryType productCategoryTypeId="EBAY_CATEGORY" 
description="eBay" hasTable="N"/>
     <ProductContentType productContentTypeId="EBAY_DESCRIPTION" 
description="Detail Page for eBay Auctions"/>
 
-    <EnumerationType description="Ebay Ship Types" enumTypeId="EBAY_SHIP_TYPE" 
hasTable="N" parentTypeId=""/>
+    <EnumerationType description="Ebay Ship Types" enumTypeId="EBAY_SHIP_TYPE" 
hasTable="N"/>
     <Enumeration description="Flat Rate Shipping" enumCode="FLAT_RATE" 
enumId="EBAY_FLAT_RATE" sequenceId="01" enumTypeId="EBAY_SHIP_TYPE"/>    
 </entity-engine-xml>

Modified: ofbiz/ofbiz-plugins/trunk/ebaystore/data/DemoEbayStoreData.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ebaystore/data/DemoEbayStoreData.xml?rev=1830546&r1=1830545&r2=1830546&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ebaystore/data/DemoEbayStoreData.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/ebaystore/data/DemoEbayStoreData.xml Mon Apr 30 
10:56:31 2018
@@ -95,10 +95,10 @@
     <Content contentId="EBAY_ITEM_DISPATCH1" contentTypeId="DOCUMENT" 
dataResourceId="EBAY_ITEM_DISPATCH1" statusId="CTNT_IN_PROGRESS"/>
     <ContentRole contentId="EBAY_ITEM_DISPATCH1" partyId="DemoEbayAccount1" 
roleTypeId="OWNER" fromDate="2010-01-01 00:00:00.000"/>
 
-    <ProductStoreEmailSetting productStoreId="90101" 
emailType="EBAY_WIN_BUYER_NOTI" bccAddress="[email protected]" 
bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#WinnigBuyerNotification"
 fromAddress="[email protected]" subject="OFBiz Demo - Winnig Buyer 
Notification #${buyerUserId}" xslfoAttachScreenLocation=""/>
-    <ProductStoreEmailSetting productStoreId="90101" 
emailType="EBAY_PAY_RECIEVED" bccAddress="[email protected]" 
bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#PaymentRecieved"
 fromAddress="[email protected]" subject="OFBiz Demo - PaymentRecieved 
#${buyerUserId}" xslfoAttachScreenLocation=""/>
-    <ProductStoreEmailSetting productStoreId="90101" 
emailType="EBAY_FEEBACK_REMIN" bccAddress="[email protected]" 
bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#FeedbackReminder"
 fromAddress="[email protected]" subject="OFBiz Demo - Feedback Reminder 
#${buyerUserId}" xslfoAttachScreenLocation=""/>
-    <ProductStoreEmailSetting productStoreId="90101" 
emailType="EBAY_ITEM_DISPATCH" bccAddress="[email protected]" 
bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#EbayEmailTemplate"
 fromAddress="[email protected]" subject="OFBiz Demo - Item Dispatched 
Notification #${buyerUserId}" xslfoAttachScreenLocation=""/>
+    <ProductStoreEmailSetting productStoreId="90101" 
emailType="EBAY_WIN_BUYER_NOTI" bccAddress="[email protected]" 
bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#WinnigBuyerNotification"
 fromAddress="[email protected]" subject="OFBiz Demo - Winnig Buyer 
Notification #${buyerUserId}"/>
+    <ProductStoreEmailSetting productStoreId="90101" 
emailType="EBAY_PAY_RECIEVED" bccAddress="[email protected]" 
bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#PaymentRecieved"
 fromAddress="[email protected]" subject="OFBiz Demo - PaymentRecieved 
#${buyerUserId}"/>
+    <ProductStoreEmailSetting productStoreId="90101" 
emailType="EBAY_FEEBACK_REMIN" bccAddress="[email protected]" 
bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#FeedbackReminder"
 fromAddress="[email protected]" subject="OFBiz Demo - Feedback Reminder 
#${buyerUserId}"/>
+    <ProductStoreEmailSetting productStoreId="90101" 
emailType="EBAY_ITEM_DISPATCH" bccAddress="[email protected]" 
bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#EbayEmailTemplate"
 fromAddress="[email protected]" subject="OFBiz Demo - Item Dispatched 
Notification #${buyerUserId}"/>
 
     <!-- ===================== -->
     <!-- Ebay Store Demo2 Data -->
@@ -176,8 +176,8 @@
     <Content contentId="EBAY_ITEM_DISPATCH2" contentTypeId="DOCUMENT" 
dataResourceId="EBAY_ITEM_DISPATCH2" statusId="CTNT_IN_PROGRESS"/>
     <ContentRole contentId="EBAY_ITEM_DISPATCH2" partyId="DemoEbayAccount2" 
roleTypeId="OWNER" fromDate="2010-01-01 00:00:00.000"/>
 
-    <ProductStoreEmailSetting productStoreId="90102" 
emailType="EBAY_WIN_BUYER_NOTI" bccAddress="[email protected]" 
bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#WinnigBuyerNotification"
 fromAddress="[email protected]" subject="OFBiz Demo - Winnig Buyer 
Notification #${buyerUserId}" xslfoAttachScreenLocation=""/>
-    <ProductStoreEmailSetting productStoreId="90102" 
emailType="EBAY_PAY_RECIEVED" bccAddress="[email protected]" 
bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#PaymentRecieved"
 fromAddress="[email protected]" subject="OFBiz Demo - PaymentRecieved 
#${buyerUserId}" xslfoAttachScreenLocation=""/>
-    <ProductStoreEmailSetting productStoreId="90102" 
emailType="EBAY_FEEBACK_REMIN" bccAddress="[email protected]" 
bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#FeedbackReminder"
 fromAddress="[email protected]" subject="OFBiz Demo - Feedback Reminder 
#${buyerUserId}" xslfoAttachScreenLocation=""/>
-    <ProductStoreEmailSetting productStoreId="90102" 
emailType="EBAY_ITEM_DISPATCH" bccAddress="[email protected]" 
bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#EbayEmailTemplate"
 fromAddress="[email protected]" subject="OFBiz Demo - Item Dispatched 
Notification #${buyerUserId}" xslfoAttachScreenLocation=""/>
+    <ProductStoreEmailSetting productStoreId="90102" 
emailType="EBAY_WIN_BUYER_NOTI" bccAddress="[email protected]" 
bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#WinnigBuyerNotification"
 fromAddress="[email protected]" subject="OFBiz Demo - Winnig Buyer 
Notification #${buyerUserId}"/>
+    <ProductStoreEmailSetting productStoreId="90102" 
emailType="EBAY_PAY_RECIEVED" bccAddress="[email protected]" 
bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#PaymentRecieved"
 fromAddress="[email protected]" subject="OFBiz Demo - PaymentRecieved 
#${buyerUserId}"/>
+    <ProductStoreEmailSetting productStoreId="90102" 
emailType="EBAY_FEEBACK_REMIN" bccAddress="[email protected]" 
bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#FeedbackReminder"
 fromAddress="[email protected]" subject="OFBiz Demo - Feedback Reminder 
#${buyerUserId}"/>
+    <ProductStoreEmailSetting productStoreId="90102" 
emailType="EBAY_ITEM_DISPATCH" bccAddress="[email protected]" 
bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#EbayEmailTemplate"
 fromAddress="[email protected]" subject="OFBiz Demo - Item Dispatched 
Notification #${buyerUserId}"/>
 </entity-engine-xml>

Modified: ofbiz/ofbiz-plugins/trunk/ebaystore/data/EbayStoreTypeData.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ebaystore/data/EbayStoreTypeData.xml?rev=1830546&r1=1830545&r2=1830546&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ebaystore/data/EbayStoreTypeData.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/ebaystore/data/EbayStoreTypeData.xml Mon Apr 30 
10:56:31 2018
@@ -22,10 +22,10 @@ under the License.
     <RoleType roleTypeId="EBAY_ACCOUNT" hasTable="N" description="eBay 
Account"/>
     <RoleType roleTypeId="COMMENTATOR" hasTable="N" description="Commentator"/>
 
-    <EnumerationType description="Inventory Reservation For Ebay Store" 
enumTypeId="EBAY_INV_RESERVE" hasTable="N" parentTypeId=""/>
+    <EnumerationType description="Inventory Reservation For Ebay Store" 
enumTypeId="EBAY_INV_RESERVE" hasTable="N"/>
     <Enumeration description="ebay inventory reserve" enumCode="EBAY_INV" 
enumId="EBAY_INV_RES" sequenceId="01" enumTypeId="EBAY_INV_RESERVE"/>
 
-    <EnumerationType description="Ebay setting auto preferences" 
enumTypeId="EBAY_AUTO_PREF" hasTable="N" parentTypeId=""/>
+    <EnumerationType description="Ebay setting auto preferences" 
enumTypeId="EBAY_AUTO_PREF" hasTable="N"/>
     
     <!-- Automation Preference -->
     <Enumeration enumId="EBAY_AUTO_DISPUTE1" description="Automatic Dispute 
not complete" enumTypeId="EBAY_AUTO_PREF"/>
@@ -39,7 +39,7 @@ under the License.
     <Enumeration enumId="EBAY_AUTO_BLK_ITEM" description="Automatic block item 
that out of stock" enumTypeId="EBAY_AUTO_PREF"/>
     <Enumeration enumId="EBAY_AUTO_BEST_OFFER" description="Automatic best 
offer enable" enumTypeId="EBAY_AUTO_PREF"/>
     <!-- Ebay Automation Price -->
-    <EnumerationType description="Ebay setting auto price" 
enumTypeId="EBAY_AUTO_PRICE" hasTable="N" parentTypeId=""/>
+    <EnumerationType description="Ebay setting auto price" 
enumTypeId="EBAY_AUTO_PRICE" hasTable="N"/>
     <Enumeration enumId="REFAIL_PRICE" description="Refail Price" 
enumTypeId="EBAY_AUTO_PRICE"/>
     <Enumeration enumId="START_PRICE" description="Start Price" 
enumTypeId="EBAY_AUTO_PRICE"/>
     <Enumeration enumId="RESERVE_PRICE" description="Reserve Price" 
enumTypeId="EBAY_AUTO_PRICE"/>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/data/DemoTestSurveyData.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/data/DemoTestSurveyData.xml?rev=1830546&r1=1830545&r2=1830546&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/data/DemoTestSurveyData.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/data/DemoTestSurveyData.xml Mon Apr 30 
10:56:31 2018
@@ -50,131 +50,131 @@ under the License.
     <ProductStoreSurveyAppl productStoreSurveyId="2101" productStoreId="9000" 
surveyApplTypeId="TEST_SURVEY" surveyId="2101" 
surveyTemplate="/applications/content/template/survey/GenericSurvey.ftl"/>
     
     <!--CHECKOUT PAGE-->
-    <SurveyQuestion surveyQuestionId="1401" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does clicking on the 
checkout link in minicart if the user is anonymous then page is displayed 
https://localhost:8443/ecommerce/control/checkoutoptions"/>
-    <SurveyQuestion surveyQuestionId="1402" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does clicking on the 
onePagecheckout link in Top navigator or minicart if the user is anonymous then 
page is displayed https://localhost:8443/ecommerce/control/onePageCheckout"/>
-    <SurveyQuestion surveyQuestionId="1403" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does clicking on the 
quickcheckout link in Top navigator or minicart if the user is anonymous then 
page is displayed https://localhost:8443/ecommerce/control/quickcheckout"/>
-    <SurveyQuestion surveyQuestionId="1404" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does clicking on the 
onePagecheckout link on the login page,if the user is anonymous it takes you to 
url https://localhost:8443/ecommerce/control/anonOnePageCheckout"/>
-    <SurveyQuestion surveyQuestionId="1405" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does clicking on the 
quickCheckout link on the login page,if the user is anonymous it takes you to 
url https://localhost:8443/ecommerce/control/quickAnonCheckout"/>
-    <SurveyQuestion surveyQuestionId="1406" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does clicking on the 
checkout link on the login page,if the user is anonymous it takes you to url 
https://localhost:8443/ecommerce/control/setCustomer"/>
-    <SurveyQuestion surveyQuestionId="1407" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does clicking on the 
checkout link in minicart if user is Registered then it takes you to url 
https://localhost:8443/ecommerce/control/checkoutoptions"/>
-    <SurveyQuestion surveyQuestionId="1408" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does clicking on the 
onPagecheckout link in Top navigator ro minicart if user is Registered then it 
takes you to url https://localhost:8443/ecommerce/control/onePageCheckout"/>
-    <SurveyQuestion surveyQuestionId="1409" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does clicking on the 
quickCheckout link in Top navigator or minicart if user is Registered then it 
takes you to url https://localhost:8443/ecommerce/control/quickcheckout"/>
-    <SurveyQuestion surveyQuestionId="1410" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does the oneCheckout 
page displays the panels Shopping Cart,Shipping,Shipping Options,Billing,Submit 
order ?"/>
-    <SurveyQuestion surveyQuestionId="1411" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does all the products 
of the cart appear on the list with accurate quantity, unit price,Item total 
and remove link and the quantity of product is editable ?"/>
-    <SurveyQuestion surveyQuestionId="1412" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does on changing the 
quantity of product the item total, cart sub total and grand total also changed 
?"/>
-    <SurveyQuestion surveyQuestionId="1413" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does on clicking the 
remove link the product is removed from the shopping cart and also from the 
product list on UI?"/>
-    <SurveyQuestion surveyQuestionId="1414" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does on entering the 
promotion code it is applied to all the products and if it is not valid then 
does it displays error message ?"/>
-    <SurveyQuestion surveyQuestionId="1415" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does on clicking the 
'continue to step 2' button the Edit panel disappears and the Cart summary page 
appears ?"/>
-    <SurveyQuestion surveyQuestionId="1416" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does on summary panel 
'click here to edit' link is appear and it disappear when panel is in edit form 
?"/>
-    <SurveyQuestion surveyQuestionId="1417" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does all the fields in 
the shipping panel have their values already filled in editable form if user is 
logged in and only email address is non editable?"/>
-    <SurveyQuestion surveyQuestionId="1418" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" description="" question="If user is anonymous 
then all the fields of shipping panel are blank and editable ?"/>
-    <SurveyQuestion surveyQuestionId="1419" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does the Continue to 
next step button visible on the panel?"/>
-    <SurveyQuestion surveyQuestionId="1420" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" description="" question="If you leave mandatory 
fields blank then message displayed of required ?"/>
-    <SurveyQuestion surveyQuestionId="1421" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does state drop down is 
showing state list of selected country if that country have states ?"/>
-    <SurveyQuestion surveyQuestionId="1422" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does state drop down 
disappeares when selected country does not have state list ?"/>
-    <SurveyQuestion surveyQuestionId="1423" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does click here to edit 
link is appeared when summary of every panel is shown ?"/>
-    <SurveyQuestion surveyQuestionId="1424" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does shipping methods 
are appearing into drop down with respective price ?"/>
-    <SurveyQuestion surveyQuestionId="1425" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does first name and 
last name fields are taking any inputs other than alphabets ?"/>
-    <SurveyQuestion surveyQuestionId="1426" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does on checking the 
option Billing address same as shipping,all the values of shipping address 
copied to the billing address fields. And the Billing address fields gets 
disappeared And billing address is created same as shipping address ?  "/>
-    <SurveyQuestion surveyQuestionId="1427" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does on unchecking the 
checkbox Billing address same as shipping,the billing address fields are 
appeared to the user and the billing address created separately?"/>
-    <SurveyQuestion surveyQuestionId="1428" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" description="" question="On clicking submit 
order Does it shows message of 'Please Wait Processing Order' ?"/>
-    <SurveyQuestion surveyQuestionId="1429" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" description="" question="On submission of order 
successfully Does you are redirected to Order Detail page ?"/>
+    <SurveyQuestion surveyQuestionId="1401" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" question="Does clicking on the checkout link in 
minicart if the user is anonymous then page is displayed 
https://localhost:8443/ecommerce/control/checkoutoptions"/>
+    <SurveyQuestion surveyQuestionId="1402" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" question="Does clicking on the onePagecheckout 
link in Top navigator or minicart if the user is anonymous then page is 
displayed https://localhost:8443/ecommerce/control/onePageCheckout"/>
+    <SurveyQuestion surveyQuestionId="1403" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" question="Does clicking on the quickcheckout 
link in Top navigator or minicart if the user is anonymous then page is 
displayed https://localhost:8443/ecommerce/control/quickcheckout"/>
+    <SurveyQuestion surveyQuestionId="1404" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" question="Does clicking on the onePagecheckout 
link on the login page,if the user is anonymous it takes you to url 
https://localhost:8443/ecommerce/control/anonOnePageCheckout"/>
+    <SurveyQuestion surveyQuestionId="1405" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" question="Does clicking on the quickCheckout 
link on the login page,if the user is anonymous it takes you to url 
https://localhost:8443/ecommerce/control/quickAnonCheckout"/>
+    <SurveyQuestion surveyQuestionId="1406" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" question="Does clicking on the checkout link on 
the login page,if the user is anonymous it takes you to url 
https://localhost:8443/ecommerce/control/setCustomer"/>
+    <SurveyQuestion surveyQuestionId="1407" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" question="Does clicking on the checkout link in 
minicart if user is Registered then it takes you to url 
https://localhost:8443/ecommerce/control/checkoutoptions"/>
+    <SurveyQuestion surveyQuestionId="1408" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" question="Does clicking on the onPagecheckout 
link in Top navigator ro minicart if user is Registered then it takes you to 
url https://localhost:8443/ecommerce/control/onePageCheckout"/>
+    <SurveyQuestion surveyQuestionId="1409" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" question="Does clicking on the quickCheckout 
link in Top navigator or minicart if user is Registered then it takes you to 
url https://localhost:8443/ecommerce/control/quickcheckout"/>
+    <SurveyQuestion surveyQuestionId="1410" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" question="Does the oneCheckout page displays the 
panels Shopping Cart,Shipping,Shipping Options,Billing,Submit order ?"/>
+    <SurveyQuestion surveyQuestionId="1411" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" question="Does all the products of the cart 
appear on the list with accurate quantity, unit price,Item total and remove 
link and the quantity of product is editable ?"/>
+    <SurveyQuestion surveyQuestionId="1412" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" question="Does on changing the quantity of 
product the item total, cart sub total and grand total also changed ?"/>
+    <SurveyQuestion surveyQuestionId="1413" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" question="Does on clicking the remove link the 
product is removed from the shopping cart and also from the product list on 
UI?"/>
+    <SurveyQuestion surveyQuestionId="1414" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" question="Does on entering the promotion code it 
is applied to all the products and if it is not valid then does it displays 
error message ?"/>
+    <SurveyQuestion surveyQuestionId="1415" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" question="Does on clicking the 'continue to step 
2' button the Edit panel disappears and the Cart summary page appears ?"/>
+    <SurveyQuestion surveyQuestionId="1416" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" question="Does on summary panel 'click here to 
edit' link is appear and it disappear when panel is in edit form ?"/>
+    <SurveyQuestion surveyQuestionId="1417" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" question="Does all the fields in the shipping 
panel have their values already filled in editable form if user is logged in 
and only email address is non editable?"/>
+    <SurveyQuestion surveyQuestionId="1418" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" question="If user is anonymous then all the 
fields of shipping panel are blank and editable ?"/>
+    <SurveyQuestion surveyQuestionId="1419" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" question="Does the Continue to next step button 
visible on the panel?"/>
+    <SurveyQuestion surveyQuestionId="1420" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" question="If you leave mandatory fields blank 
then message displayed of required ?"/>
+    <SurveyQuestion surveyQuestionId="1421" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" question="Does state drop down is showing state 
list of selected country if that country have states ?"/>
+    <SurveyQuestion surveyQuestionId="1422" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" question="Does state drop down disappeares when 
selected country does not have state list ?"/>
+    <SurveyQuestion surveyQuestionId="1423" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" question="Does click here to edit link is 
appeared when summary of every panel is shown ?"/>
+    <SurveyQuestion surveyQuestionId="1424" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" question="Does shipping methods are appearing 
into drop down with respective price ?"/>
+    <SurveyQuestion surveyQuestionId="1425" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" question="Does first name and last name fields 
are taking any inputs other than alphabets ?"/>
+    <SurveyQuestion surveyQuestionId="1426" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" question="Does on checking the option Billing 
address same as shipping,all the values of shipping address copied to the 
billing address fields. And the Billing address fields gets disappeared And 
billing address is created same as shipping address ?  "/>
+    <SurveyQuestion surveyQuestionId="1427" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" question="Does on unchecking the checkbox 
Billing address same as shipping,the billing address fields are appeared to the 
user and the billing address created separately?"/>
+    <SurveyQuestion surveyQuestionId="1428" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" question="On clicking submit order Does it shows 
message of 'Please Wait Processing Order' ?"/>
+    <SurveyQuestion surveyQuestionId="1429" surveyQuestionCategoryId="1401" 
surveyQuestionTypeId="BOOLEAN" question="On submission of order successfully 
Does you are redirected to Order Detail page ?"/>
     
     <!--NEW CUSTOMER PAGE-->    
-    <SurveyQuestion surveyQuestionId="1501" surveyQuestionCategoryId="1501" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does clicking on Create 
on Login page redirects you to following url 
https://localhost:8443/ecommerce/control/newcustomer"/>
-    <SurveyQuestion surveyQuestionId="1502" surveyQuestionCategoryId="1501" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does all the UiLabels 
are showing proper ?"/>
-    <SurveyQuestion surveyQuestionId="1503" surveyQuestionCategoryId="1501" 
surveyQuestionTypeId="BOOLEAN" description="" question="On leaving * fields 
blank Does they showing message of 'Required' ?"/>
-    <SurveyQuestion surveyQuestionId="1504" surveyQuestionCategoryId="1501" 
surveyQuestionTypeId="BOOLEAN" description="" question="On submitting blank 
form, Are you able to submit it ?"/>
-    <SurveyQuestion surveyQuestionId="1505" surveyQuestionCategoryId="1501" 
surveyQuestionTypeId="BOOLEAN" description="" question="Is the First name and 
Last name taking character other than Alphabet ?"/>
-    <SurveyQuestion surveyQuestionId="1506" surveyQuestionCategoryId="1501" 
surveyQuestionTypeId="BOOLEAN" description="" question="Is the username field 
taking any character other than email address ?"/>
-    <SurveyQuestion surveyQuestionId="1507" surveyQuestionCategoryId="1501" 
surveyQuestionTypeId="BOOLEAN" description="" question="Is password and confirm 
password taking same inputs ?"/>
-    <SurveyQuestion surveyQuestionId="1508" surveyQuestionCategoryId="1501" 
surveyQuestionTypeId="BOOLEAN" description="" question="Is country drop down 
showing only limited country ?"/>
-    <SurveyQuestion surveyQuestionId="1509" surveyQuestionCategoryId="1501" 
surveyQuestionTypeId="BOOLEAN" description="" question="Is state drop down is 
showing only the state list of selected country if country have states ?"/>
-    <SurveyQuestion surveyQuestionId="1510" surveyQuestionCategoryId="1501" 
surveyQuestionTypeId="BOOLEAN" description="" question="Is state drop down is 
disappear when a country has no state ?"/>
-    <SurveyQuestion surveyQuestionId="1511" surveyQuestionCategoryId="1501" 
surveyQuestionTypeId="BOOLEAN" description="" question="Is use shipping address 
for billing address checkbox is working and copies data from fields ?"/>
-    <SurveyQuestion surveyQuestionId="1512" surveyQuestionCategoryId="1501" 
surveyQuestionTypeId="BOOLEAN" description="" question="If user is creates 
account successfully then he is able to login by his user Id ?"/>
+    <SurveyQuestion surveyQuestionId="1501" surveyQuestionCategoryId="1501" 
surveyQuestionTypeId="BOOLEAN" question="Does clicking on Create on Login page 
redirects you to following url 
https://localhost:8443/ecommerce/control/newcustomer"/>
+    <SurveyQuestion surveyQuestionId="1502" surveyQuestionCategoryId="1501" 
surveyQuestionTypeId="BOOLEAN" question="Does all the UiLabels are showing 
proper ?"/>
+    <SurveyQuestion surveyQuestionId="1503" surveyQuestionCategoryId="1501" 
surveyQuestionTypeId="BOOLEAN" question="On leaving * fields blank Does they 
showing message of 'Required' ?"/>
+    <SurveyQuestion surveyQuestionId="1504" surveyQuestionCategoryId="1501" 
surveyQuestionTypeId="BOOLEAN" question="On submitting blank form, Are you able 
to submit it ?"/>
+    <SurveyQuestion surveyQuestionId="1505" surveyQuestionCategoryId="1501" 
surveyQuestionTypeId="BOOLEAN" question="Is the First name and Last name taking 
character other than Alphabet ?"/>
+    <SurveyQuestion surveyQuestionId="1506" surveyQuestionCategoryId="1501" 
surveyQuestionTypeId="BOOLEAN" question="Is the username field taking any 
character other than email address ?"/>
+    <SurveyQuestion surveyQuestionId="1507" surveyQuestionCategoryId="1501" 
surveyQuestionTypeId="BOOLEAN" question="Is password and confirm password 
taking same inputs ?"/>
+    <SurveyQuestion surveyQuestionId="1508" surveyQuestionCategoryId="1501" 
surveyQuestionTypeId="BOOLEAN" question="Is country drop down showing only 
limited country ?"/>
+    <SurveyQuestion surveyQuestionId="1509" surveyQuestionCategoryId="1501" 
surveyQuestionTypeId="BOOLEAN" question="Is state drop down is showing only the 
state list of selected country if country have states ?"/>
+    <SurveyQuestion surveyQuestionId="1510" surveyQuestionCategoryId="1501" 
surveyQuestionTypeId="BOOLEAN" question="Is state drop down is disappear when a 
country has no state ?"/>
+    <SurveyQuestion surveyQuestionId="1511" surveyQuestionCategoryId="1501" 
surveyQuestionTypeId="BOOLEAN" question="Is use shipping address for billing 
address checkbox is working and copies data from fields ?"/>
+    <SurveyQuestion surveyQuestionId="1512" surveyQuestionCategoryId="1501" 
surveyQuestionTypeId="BOOLEAN" question="If user is creates account 
successfully then he is able to login by his user Id ?"/>
     
     <!--VIEW / EDIT PROFILE PAGE-->
-    <SurveyQuestion surveyQuestionId="1601" surveyQuestionCategoryId="1601" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does clicking on 
Profile link it takes to https://localhost:8443/ecommerce/control/viewprofile 
page in case the user is logged in ?"/>
-    <SurveyQuestion surveyQuestionId="1602" surveyQuestionCategoryId="1601" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does My Accounts 
section displays the name and email of the user corectly as entered?"/>
-    <SurveyQuestion surveyQuestionId="1603" surveyQuestionCategoryId="1601" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does the EDIT link 
redirects to the page https://localhost:8443/ecommerce/control/editProfile"/>
-    <SurveyQuestion surveyQuestionId="1604" surveyQuestionCategoryId="1601" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does the Billing and 
shipping address of user displayed correctly?"/>
-    <SurveyQuestion surveyQuestionId="1605" surveyQuestionCategoryId="1601" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does the Manage Address 
link redirects user to manage addresses page 
https://localhost:8443/ecommerce/control/manageAddress?"/>
-    <SurveyQuestion surveyQuestionId="1606" surveyQuestionCategoryId="1601" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does Quick add takes to 
the page https://localhost:8443/ecommerce/control/quickadd"/>
-    <SurveyQuestion surveyQuestionId="1607" surveyQuestionCategoryId="1601" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does the 'Order 
History' redirects to order detail page. 
https://localhost:8443/ecommerce/control/orderhistory"/>
-    <SurveyQuestion surveyQuestionId="1608" surveyQuestionCategoryId="1601" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does Shopping List link 
redirects to page https://localhost:8443/ecommerce/control/editShoppingList"/>
-    <SurveyQuestion surveyQuestionId="1609" surveyQuestionCategoryId="1601" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does List quotes link 
redirects to page https://localhost:8443/ecommerce/control/ListQuotes"/>
-    <SurveyQuestion surveyQuestionId="1610" surveyQuestionCategoryId="1601" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does List Requests link 
redirects to page https://localhost:8443/ecommerce/control/ListRequests"/>
-    <SurveyQuestion surveyQuestionId="1611" surveyQuestionCategoryId="1601" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does on changing the 
email address the username changed ?"/>
-    <SurveyQuestion surveyQuestionId="1612" surveyQuestionCategoryId="1601" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does the form gets 
submitted successfully if all the fields are validated properly?"/>
+    <SurveyQuestion surveyQuestionId="1601" surveyQuestionCategoryId="1601" 
surveyQuestionTypeId="BOOLEAN" question="Does clicking on Profile link it takes 
to https://localhost:8443/ecommerce/control/viewprofile page in case the user 
is logged in ?"/>
+    <SurveyQuestion surveyQuestionId="1602" surveyQuestionCategoryId="1601" 
surveyQuestionTypeId="BOOLEAN" question="Does My Accounts section displays the 
name and email of the user corectly as entered?"/>
+    <SurveyQuestion surveyQuestionId="1603" surveyQuestionCategoryId="1601" 
surveyQuestionTypeId="BOOLEAN" question="Does the EDIT link redirects to the 
page https://localhost:8443/ecommerce/control/editProfile"/>
+    <SurveyQuestion surveyQuestionId="1604" surveyQuestionCategoryId="1601" 
surveyQuestionTypeId="BOOLEAN" question="Does the Billing and shipping address 
of user displayed correctly?"/>
+    <SurveyQuestion surveyQuestionId="1605" surveyQuestionCategoryId="1601" 
surveyQuestionTypeId="BOOLEAN" question="Does the Manage Address link redirects 
user to manage addresses page 
https://localhost:8443/ecommerce/control/manageAddress?"/>
+    <SurveyQuestion surveyQuestionId="1606" surveyQuestionCategoryId="1601" 
surveyQuestionTypeId="BOOLEAN" question="Does Quick add takes to the page 
https://localhost:8443/ecommerce/control/quickadd"/>
+    <SurveyQuestion surveyQuestionId="1607" surveyQuestionCategoryId="1601" 
surveyQuestionTypeId="BOOLEAN" question="Does the 'Order History' redirects to 
order detail page. https://localhost:8443/ecommerce/control/orderhistory"/>
+    <SurveyQuestion surveyQuestionId="1608" surveyQuestionCategoryId="1601" 
surveyQuestionTypeId="BOOLEAN" question="Does Shopping List link redirects to 
page https://localhost:8443/ecommerce/control/editShoppingList"/>
+    <SurveyQuestion surveyQuestionId="1609" surveyQuestionCategoryId="1601" 
surveyQuestionTypeId="BOOLEAN" question="Does List quotes link redirects to 
page https://localhost:8443/ecommerce/control/ListQuotes"/>
+    <SurveyQuestion surveyQuestionId="1610" surveyQuestionCategoryId="1601" 
surveyQuestionTypeId="BOOLEAN" question="Does List Requests link redirects to 
page https://localhost:8443/ecommerce/control/ListRequests"/>
+    <SurveyQuestion surveyQuestionId="1611" surveyQuestionCategoryId="1601" 
surveyQuestionTypeId="BOOLEAN" question="Does on changing the email address the 
username changed ?"/>
+    <SurveyQuestion surveyQuestionId="1612" surveyQuestionCategoryId="1601" 
surveyQuestionTypeId="BOOLEAN" question="Does the form gets submitted 
successfully if all the fields are validated properly?"/>
     
     <!--MANAGE ADDRESS PAGE-->
-    <SurveyQuestion surveyQuestionId="1701" surveyQuestionCategoryId="1701" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does clicking on MANAGE 
ADDRESS redirects you to following 
https://localhost:8443/ecommerce/control/manageAddress"/>
-    <SurveyQuestion surveyQuestionId="1702" surveyQuestionCategoryId="1701" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does it displays the 
three sections namely : Default address which have Billing and Shipping 
Addresses and Additional Addresses ?"/>
-    <SurveyQuestion surveyQuestionId="1703" surveyQuestionCategoryId="1701" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does it diplays the Add 
New Address link and on click it opens a popup form for making new address ?"/>
-    <SurveyQuestion surveyQuestionId="1704" surveyQuestionCategoryId="1701" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does Billing Address 
displays the correct Billing Address as entered by the user?"/>
-    <SurveyQuestion surveyQuestionId="1705" surveyQuestionCategoryId="1701" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does on clicking the 
Change Billing Address link opens a pop up form for editing billing address ?"/>
-    <SurveyQuestion surveyQuestionId="1706" surveyQuestionCategoryId="1701" 
surveyQuestionTypeId="BOOLEAN" description="" question="If the checkbox in 
Billing Address section is checked then it creates a shipping address same as 
billing address and expires the previous shipping address and vice-versa ?"/>
-    <SurveyQuestion surveyQuestionId="1707" surveyQuestionCategoryId="1701" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does Additional 
Addresses section diplays the addresses associated with the Login user without 
any purpose,if any available ?"/>
-    <SurveyQuestion surveyQuestionId="1708" surveyQuestionCategoryId="1701" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does on clicking the 
Edit Address link opens a pop up for editing address ?"/>
-    <SurveyQuestion surveyQuestionId="1709" surveyQuestionCategoryId="1701" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does on checking the 
option 'Make this My default Shipping address' sets the address as Default 
Shipping Address and vice-versa?"/>
-    <SurveyQuestion surveyQuestionId="1710" surveyQuestionCategoryId="1701" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does the form gets 
submitted successfully if it passes all the validations successfuly?"/>
-    <SurveyQuestion surveyQuestionId="1711" surveyQuestionCategoryId="1701" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does the delete address 
button works properly,on clicking removes the address from the page?"/>
-    <SurveyQuestion surveyQuestionId="1712" surveyQuestionCategoryId="1701" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does on clicking the 
Add Address link opens a pop up for adding new address ?"/>
-    <SurveyQuestion surveyQuestionId="1713" surveyQuestionCategoryId="1701" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does on clicking cancel 
button will the form gets disappear?"/>
-    <SurveyQuestion surveyQuestionId="1714" surveyQuestionCategoryId="1701" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does the updated 
address displayed correctly on manage address form?"/>
+    <SurveyQuestion surveyQuestionId="1701" surveyQuestionCategoryId="1701" 
surveyQuestionTypeId="BOOLEAN" question="Does clicking on MANAGE ADDRESS 
redirects you to following 
https://localhost:8443/ecommerce/control/manageAddress"/>
+    <SurveyQuestion surveyQuestionId="1702" surveyQuestionCategoryId="1701" 
surveyQuestionTypeId="BOOLEAN" question="Does it displays the three sections 
namely : Default address which have Billing and Shipping Addresses and 
Additional Addresses ?"/>
+    <SurveyQuestion surveyQuestionId="1703" surveyQuestionCategoryId="1701" 
surveyQuestionTypeId="BOOLEAN" question="Does it diplays the Add New Address 
link and on click it opens a popup form for making new address ?"/>
+    <SurveyQuestion surveyQuestionId="1704" surveyQuestionCategoryId="1701" 
surveyQuestionTypeId="BOOLEAN" question="Does Billing Address displays the 
correct Billing Address as entered by the user?"/>
+    <SurveyQuestion surveyQuestionId="1705" surveyQuestionCategoryId="1701" 
surveyQuestionTypeId="BOOLEAN" question="Does on clicking the Change Billing 
Address link opens a pop up form for editing billing address ?"/>
+    <SurveyQuestion surveyQuestionId="1706" surveyQuestionCategoryId="1701" 
surveyQuestionTypeId="BOOLEAN" question="If the checkbox in Billing Address 
section is checked then it creates a shipping address same as billing address 
and expires the previous shipping address and vice-versa ?"/>
+    <SurveyQuestion surveyQuestionId="1707" surveyQuestionCategoryId="1701" 
surveyQuestionTypeId="BOOLEAN" question="Does Additional Addresses section 
diplays the addresses associated with the Login user without any purpose,if any 
available ?"/>
+    <SurveyQuestion surveyQuestionId="1708" surveyQuestionCategoryId="1701" 
surveyQuestionTypeId="BOOLEAN" question="Does on clicking the Edit Address link 
opens a pop up for editing address ?"/>
+    <SurveyQuestion surveyQuestionId="1709" surveyQuestionCategoryId="1701" 
surveyQuestionTypeId="BOOLEAN" question="Does on checking the option 'Make this 
My default Shipping address' sets the address as Default Shipping Address and 
vice-versa?"/>
+    <SurveyQuestion surveyQuestionId="1710" surveyQuestionCategoryId="1701" 
surveyQuestionTypeId="BOOLEAN" question="Does the form gets submitted 
successfully if it passes all the validations successfuly?"/>
+    <SurveyQuestion surveyQuestionId="1711" surveyQuestionCategoryId="1701" 
surveyQuestionTypeId="BOOLEAN" question="Does the delete address button works 
properly,on clicking removes the address from the page?"/>
+    <SurveyQuestion surveyQuestionId="1712" surveyQuestionCategoryId="1701" 
surveyQuestionTypeId="BOOLEAN" question="Does on clicking the Add Address link 
opens a pop up for adding new address ?"/>
+    <SurveyQuestion surveyQuestionId="1713" surveyQuestionCategoryId="1701" 
surveyQuestionTypeId="BOOLEAN" question="Does on clicking cancel button will 
the form gets disappear?"/>
+    <SurveyQuestion surveyQuestionId="1714" surveyQuestionCategoryId="1701" 
surveyQuestionTypeId="BOOLEAN" question="Does the updated address displayed 
correctly on manage address form?"/>
     
     <!--CATEGORY DETAIL PAGE-->
-    <SurveyQuestion surveyQuestionId="1801" surveyQuestionCategoryId="1801" 
surveyQuestionTypeId="BOOLEAN" description="" question="Are breadcrumbs visible 
on the page and on clicking them, Are they working proper and takes you to 
clicked page ?"/>
-    <SurveyQuestion surveyQuestionId="1802" surveyQuestionCategoryId="1801" 
surveyQuestionTypeId="BOOLEAN" description="" question="Is the mincart visible 
and does it displays all the details it contains?"/>
-    <SurveyQuestion surveyQuestionId="1803" surveyQuestionCategoryId="1801" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does the page contains 
the quantity and Add to cart option that on Clicking adds the Product to the 
Shopping cart?"/>
-    <SurveyQuestion surveyQuestionId="1804" surveyQuestionCategoryId="1801" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does it contains the 
Search in Category options that takes to the Advance Search page 
https://localhost:8443/ecommerce/control/advancedsearch"/>
-    <SurveyQuestion surveyQuestionId="1805" surveyQuestionCategoryId="1801" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does the page display 
the different product list with their names and images if available ?"/>
-    <SurveyQuestion surveyQuestionId="1806" surveyQuestionCategoryId="1801" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does on clicking onto 
the product image this redirects you to that specified product detail page ?"/>
+    <SurveyQuestion surveyQuestionId="1801" surveyQuestionCategoryId="1801" 
surveyQuestionTypeId="BOOLEAN" question="Are breadcrumbs visible on the page 
and on clicking them, Are they working proper and takes you to clicked page ?"/>
+    <SurveyQuestion surveyQuestionId="1802" surveyQuestionCategoryId="1801" 
surveyQuestionTypeId="BOOLEAN" question="Is the mincart visible and does it 
displays all the details it contains?"/>
+    <SurveyQuestion surveyQuestionId="1803" surveyQuestionCategoryId="1801" 
surveyQuestionTypeId="BOOLEAN" question="Does the page contains the quantity 
and Add to cart option that on Clicking adds the Product to the Shopping 
cart?"/>
+    <SurveyQuestion surveyQuestionId="1804" surveyQuestionCategoryId="1801" 
surveyQuestionTypeId="BOOLEAN" question="Does it contains the Search in 
Category options that takes to the Advance Search page 
https://localhost:8443/ecommerce/control/advancedsearch"/>
+    <SurveyQuestion surveyQuestionId="1805" surveyQuestionCategoryId="1801" 
surveyQuestionTypeId="BOOLEAN" question="Does the page display the different 
product list with their names and images if available ?"/>
+    <SurveyQuestion surveyQuestionId="1806" surveyQuestionCategoryId="1801" 
surveyQuestionTypeId="BOOLEAN" question="Does on clicking onto the product 
image this redirects you to that specified product detail page ?"/>
     
     <!--PRODUCT DETAIL PAGE-->
-    <SurveyQuestion surveyQuestionId="1901" surveyQuestionCategoryId="1901" 
surveyQuestionTypeId="BOOLEAN" description="" question="Are the breadcrumbs 
visible on the page and on clicking them, are they working proper and takes you 
to clicked page ?"/>
-    <SurveyQuestion surveyQuestionId="1902" surveyQuestionCategoryId="1901" 
surveyQuestionTypeId="BOOLEAN" description="" question="Is the Minicart visible 
and are all the links in Minicart are working properly ?"/>
-    <SurveyQuestion surveyQuestionId="1903" surveyQuestionCategoryId="1901" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does it contains a 
Quantity text box and Add to Cart link that adds the Product into the Shopping 
Cart?"/>
-    <SurveyQuestion surveyQuestionId="1904" surveyQuestionCategoryId="1901" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does it displays all 
the details of the Product and feature options if the product is configurable 
?"/>
-    <SurveyQuestion surveyQuestionId="1905" surveyQuestionCategoryId="1901" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does the Previous and 
next navigate properly to target pages ?"/>
-    <SurveyQuestion surveyQuestionId="1906" surveyQuestionCategoryId="1901" 
surveyQuestionTypeId="BOOLEAN" description="" question="Is the quantity is 
editable if required features are selected ?"/>
-    <SurveyQuestion surveyQuestionId="1907" surveyQuestionCategoryId="1901" 
surveyQuestionTypeId="BOOLEAN" description="" question="Are you able to add the 
product into the cart without selecting any feature ?"/>
-    <SurveyQuestion surveyQuestionId="1908" surveyQuestionCategoryId="1901" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does it displays the 
links Tell a friend that takes to the respective target page?"/>
-    <SurveyQuestion surveyQuestionId="1909" surveyQuestionCategoryId="1901" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does it displays the 
message with link Login You Must Login  To Add Selected Items To Shopping List 
if the user is not logged in."/>
-    <SurveyQuestion surveyQuestionId="1910" surveyQuestionCategoryId="1901" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does Review the Product 
First link working and takes to the page 
https://localhost:8443/ecommerce/control/reviewProduct?"/>
+    <SurveyQuestion surveyQuestionId="1901" surveyQuestionCategoryId="1901" 
surveyQuestionTypeId="BOOLEAN" question="Are the breadcrumbs visible on the 
page and on clicking them, are they working proper and takes you to clicked 
page ?"/>
+    <SurveyQuestion surveyQuestionId="1902" surveyQuestionCategoryId="1901" 
surveyQuestionTypeId="BOOLEAN" question="Is the Minicart visible and are all 
the links in Minicart are working properly ?"/>
+    <SurveyQuestion surveyQuestionId="1903" surveyQuestionCategoryId="1901" 
surveyQuestionTypeId="BOOLEAN" question="Does it contains a Quantity text box 
and Add to Cart link that adds the Product into the Shopping Cart?"/>
+    <SurveyQuestion surveyQuestionId="1904" surveyQuestionCategoryId="1901" 
surveyQuestionTypeId="BOOLEAN" question="Does it displays all the details of 
the Product and feature options if the product is configurable ?"/>
+    <SurveyQuestion surveyQuestionId="1905" surveyQuestionCategoryId="1901" 
surveyQuestionTypeId="BOOLEAN" question="Does the Previous and next navigate 
properly to target pages ?"/>
+    <SurveyQuestion surveyQuestionId="1906" surveyQuestionCategoryId="1901" 
surveyQuestionTypeId="BOOLEAN" question="Is the quantity is editable if 
required features are selected ?"/>
+    <SurveyQuestion surveyQuestionId="1907" surveyQuestionCategoryId="1901" 
surveyQuestionTypeId="BOOLEAN" question="Are you able to add the product into 
the cart without selecting any feature ?"/>
+    <SurveyQuestion surveyQuestionId="1908" surveyQuestionCategoryId="1901" 
surveyQuestionTypeId="BOOLEAN" question="Does it displays the links Tell a 
friend that takes to the respective target page?"/>
+    <SurveyQuestion surveyQuestionId="1909" surveyQuestionCategoryId="1901" 
surveyQuestionTypeId="BOOLEAN" question="Does it displays the message with link 
Login You Must Login  To Add Selected Items To Shopping List if the user is not 
logged in."/>
+    <SurveyQuestion surveyQuestionId="1910" surveyQuestionCategoryId="1901" 
surveyQuestionTypeId="BOOLEAN" question="Does Review the Product First link 
working and takes to the page 
https://localhost:8443/ecommerce/control/reviewProduct?"/>
     
     <!--MINI CART PAGE-->
-    <SurveyQuestion surveyQuestionId="2001" surveyQuestionCategoryId="2001" 
surveyQuestionTypeId="BOOLEAN" description="" question="Is the minicart 
displayed on the all the pages except profile and checkout page ?"/>
-    <SurveyQuestion surveyQuestionId="2002" surveyQuestionCategoryId="2001" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does it displays the 
View Cart,Checkout,onePageCheckOut,quickCheckoutlink on the mini Cart"/>
-    <SurveyQuestion surveyQuestionId="2003" surveyQuestionCategoryId="2001" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does on clicking to the 
checkout link in case the user is anonymous takes to login page and one 
clicking again to checkout link takes to 
https://localhost:8443/ecommerce/control/setCustomer"/>
-    <SurveyQuestion surveyQuestionId="2004" surveyQuestionCategoryId="2001" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does on clicking to the 
checkout link in case the user is anonymous takes to login page and one 
clicking again to quickCheckout link takes to 
https://localhost:8443/ecommerce/control/quickAnonCheckout"/>
-    <SurveyQuestion surveyQuestionId="2005" surveyQuestionCategoryId="2001" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does on clicking to the 
checkout link in case the user is anonymous takes to login page and one 
clicking again to onePageCheckout link takes to 
https://localhost:8443/ecommerce/control/anonOnePageCheckout"/>
-    <SurveyQuestion surveyQuestionId="2006" surveyQuestionCategoryId="2001" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does on clicking to the 
checkout link in case the user is registered,takes to 
https://localhost:8443/ecommerce/control/checkoutoptions"/>
-    <SurveyQuestion surveyQuestionId="2007" surveyQuestionCategoryId="2001" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does on clicking to the 
quickCheckout link in case the user is registered,takes to 
https://localhost:8443/ecommerce/control/quickcheckout"/>
-    <SurveyQuestion surveyQuestionId="2008" surveyQuestionCategoryId="2001" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does on clicking to the 
quickCheckout link in case the user is registered,takes to 
https://localhost:8443/ecommerce/control/onePageCheckout"/>
-    <SurveyQuestion surveyQuestionId="2009" surveyQuestionCategoryId="2001" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does on clicking 
ViewCart link will redirect to the show cart page at this url 
https://localhost:8443/ecommerce/control/view/showcart"/>
-    <SurveyQuestion surveyQuestionId="2010" surveyQuestionCategoryId="2001" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does the mini cart 
displays the Quantity,Product and its price and total details correctly ?"/>
-    <SurveyQuestion surveyQuestionId="2011" surveyQuestionCategoryId="2001" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does the Format of 
amount on mini cart have currency format like $00.00 ?"/>
+    <SurveyQuestion surveyQuestionId="2001" surveyQuestionCategoryId="2001" 
surveyQuestionTypeId="BOOLEAN" question="Is the minicart displayed on the all 
the pages except profile and checkout page ?"/>
+    <SurveyQuestion surveyQuestionId="2002" surveyQuestionCategoryId="2001" 
surveyQuestionTypeId="BOOLEAN" question="Does it displays the View 
Cart,Checkout,onePageCheckOut,quickCheckoutlink on the mini Cart"/>
+    <SurveyQuestion surveyQuestionId="2003" surveyQuestionCategoryId="2001" 
surveyQuestionTypeId="BOOLEAN" question="Does on clicking to the checkout link 
in case the user is anonymous takes to login page and one clicking again to 
checkout link takes to https://localhost:8443/ecommerce/control/setCustomer"/>
+    <SurveyQuestion surveyQuestionId="2004" surveyQuestionCategoryId="2001" 
surveyQuestionTypeId="BOOLEAN" question="Does on clicking to the checkout link 
in case the user is anonymous takes to login page and one clicking again to 
quickCheckout link takes to 
https://localhost:8443/ecommerce/control/quickAnonCheckout"/>
+    <SurveyQuestion surveyQuestionId="2005" surveyQuestionCategoryId="2001" 
surveyQuestionTypeId="BOOLEAN" question="Does on clicking to the checkout link 
in case the user is anonymous takes to login page and one clicking again to 
onePageCheckout link takes to 
https://localhost:8443/ecommerce/control/anonOnePageCheckout"/>
+    <SurveyQuestion surveyQuestionId="2006" surveyQuestionCategoryId="2001" 
surveyQuestionTypeId="BOOLEAN" question="Does on clicking to the checkout link 
in case the user is registered,takes to 
https://localhost:8443/ecommerce/control/checkoutoptions"/>
+    <SurveyQuestion surveyQuestionId="2007" surveyQuestionCategoryId="2001" 
surveyQuestionTypeId="BOOLEAN" question="Does on clicking to the quickCheckout 
link in case the user is registered,takes to 
https://localhost:8443/ecommerce/control/quickcheckout"/>
+    <SurveyQuestion surveyQuestionId="2008" surveyQuestionCategoryId="2001" 
surveyQuestionTypeId="BOOLEAN" question="Does on clicking to the quickCheckout 
link in case the user is registered,takes to 
https://localhost:8443/ecommerce/control/onePageCheckout"/>
+    <SurveyQuestion surveyQuestionId="2009" surveyQuestionCategoryId="2001" 
surveyQuestionTypeId="BOOLEAN" question="Does on clicking ViewCart link will 
redirect to the show cart page at this url 
https://localhost:8443/ecommerce/control/view/showcart"/>
+    <SurveyQuestion surveyQuestionId="2010" surveyQuestionCategoryId="2001" 
surveyQuestionTypeId="BOOLEAN" question="Does the mini cart displays the 
Quantity,Product and its price and total details correctly ?"/>
+    <SurveyQuestion surveyQuestionId="2011" surveyQuestionCategoryId="2001" 
surveyQuestionTypeId="BOOLEAN" question="Does the Format of amount on mini cart 
have currency format like $00.00 ?"/>
     
     <!--SHOW CART PAGE-->
-    <SurveyQuestion surveyQuestionId="2101" surveyQuestionCategoryId="2101" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does the Cart link on 
click takes to the https://localhost:8443/ecommerce/control/view/showcart?"/>
-    <SurveyQuestion surveyQuestionId="2102" surveyQuestionCategoryId="2101" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does it diplays the 
panels Quick add,shopping cart,promotion coupon code,Special offers,you might 
interested in,Promotion information on the ViewCart Page"/>
-    <SurveyQuestion surveyQuestionId="2103" surveyQuestionCategoryId="2101" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does the Cart displays 
the all the cart details ?"/>
-    <SurveyQuestion surveyQuestionId="2104" surveyQuestionCategoryId="2101" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does the cart displays 
the images of the products it has or not and does those product images on 
clicking takes to the target page ?"/>
-    <SurveyQuestion surveyQuestionId="2105" surveyQuestionCategoryId="2101" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does the product link 
displayed under SKU takes you to the specified product detail page ?"/>
-    <SurveyQuestion surveyQuestionId="2106" surveyQuestionCategoryId="2101" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does the delete link is 
displayed and removes successfully the corresponding item from the cart ?"/>
-    <SurveyQuestion surveyQuestionId="2107" surveyQuestionCategoryId="2101" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does the Promotion code 
text box is displayed and it applies the code successfully ?"/>
-    <SurveyQuestion surveyQuestionId="2108" surveyQuestionCategoryId="2101" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does the 
subtotal,Discount, shipping, and total displayed on the page?"/>
-    <SurveyQuestion surveyQuestionId="2109" surveyQuestionCategoryId="2101" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does it shows the 
message To save cart you must Login in case if not logged in?"/>
-    <SurveyQuestion surveyQuestionId="2110" surveyQuestionCategoryId="2101" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does it displays the 
Update,Continue shopping and checkout link ?"/>
-    <SurveyQuestion surveyQuestionId="2111" surveyQuestionCategoryId="2101" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does it on clicking the 
Continue shopping takes to last product detail page ?"/>
-    <SurveyQuestion surveyQuestionId="2112" surveyQuestionCategoryId="2101" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does it on clicking the 
Details link on Special offers panel takes to 
https://localhost:8443/ecommerce/control/showPromotionDetails"/>
-    <SurveyQuestion surveyQuestionId="2113" surveyQuestionCategoryId="2101" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does the shopping cart 
display the links create request for Quote and create new Quote from cart?"/>
-    <SurveyQuestion surveyQuestionId="2114" surveyQuestionCategoryId="2101" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does You might 
interested in link contain Add to cart link that adds the product to the 
shopping cart"/>
-    <SurveyQuestion surveyQuestionId="2115" surveyQuestionCategoryId="2101" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does You might 
interested in link contain Product link that 
https://localhost:8443/ecommerce/control/product"/>
-    <SurveyQuestion surveyQuestionId="2116" surveyQuestionCategoryId="2101" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does Shopping cart 
contains the Recalculate Cart,Empty Cart,Remove Selected and Checkout link on 
the title Bar that takes to their respaective target page?"/>
-    <SurveyQuestion surveyQuestionId="2117" surveyQuestionCategoryId="2101" 
surveyQuestionTypeId="BOOLEAN" description="" question="Does Quick Add panel 
containing the Add to cart linnk adds the product to the shopping cart 
successfully on entering the ProductId"/>
+    <SurveyQuestion surveyQuestionId="2101" surveyQuestionCategoryId="2101" 
surveyQuestionTypeId="BOOLEAN" question="Does the Cart link on click takes to 
the https://localhost:8443/ecommerce/control/view/showcart?"/>
+    <SurveyQuestion surveyQuestionId="2102" surveyQuestionCategoryId="2101" 
surveyQuestionTypeId="BOOLEAN" question="Does it diplays the panels Quick 
add,shopping cart,promotion coupon code,Special offers,you might interested 
in,Promotion information on the ViewCart Page"/>
+    <SurveyQuestion surveyQuestionId="2103" surveyQuestionCategoryId="2101" 
surveyQuestionTypeId="BOOLEAN" question="Does the Cart displays the all the 
cart details ?"/>
+    <SurveyQuestion surveyQuestionId="2104" surveyQuestionCategoryId="2101" 
surveyQuestionTypeId="BOOLEAN" question="Does the cart displays the images of 
the products it has or not and does those product images on clicking takes to 
the target page ?"/>
+    <SurveyQuestion surveyQuestionId="2105" surveyQuestionCategoryId="2101" 
surveyQuestionTypeId="BOOLEAN" question="Does the product link displayed under 
SKU takes you to the specified product detail page ?"/>
+    <SurveyQuestion surveyQuestionId="2106" surveyQuestionCategoryId="2101" 
surveyQuestionTypeId="BOOLEAN" question="Does the delete link is displayed and 
removes successfully the corresponding item from the cart ?"/>
+    <SurveyQuestion surveyQuestionId="2107" surveyQuestionCategoryId="2101" 
surveyQuestionTypeId="BOOLEAN" question="Does the Promotion code text box is 
displayed and it applies the code successfully ?"/>
+    <SurveyQuestion surveyQuestionId="2108" surveyQuestionCategoryId="2101" 
surveyQuestionTypeId="BOOLEAN" question="Does the subtotal,Discount, shipping, 
and total displayed on the page?"/>
+    <SurveyQuestion surveyQuestionId="2109" surveyQuestionCategoryId="2101" 
surveyQuestionTypeId="BOOLEAN" question="Does it shows the message To save cart 
you must Login in case if not logged in?"/>
+    <SurveyQuestion surveyQuestionId="2110" surveyQuestionCategoryId="2101" 
surveyQuestionTypeId="BOOLEAN" question="Does it displays the Update,Continue 
shopping and checkout link ?"/>
+    <SurveyQuestion surveyQuestionId="2111" surveyQuestionCategoryId="2101" 
surveyQuestionTypeId="BOOLEAN" question="Does it on clicking the Continue 
shopping takes to last product detail page ?"/>
+    <SurveyQuestion surveyQuestionId="2112" surveyQuestionCategoryId="2101" 
surveyQuestionTypeId="BOOLEAN" question="Does it on clicking the Details link 
on Special offers panel takes to 
https://localhost:8443/ecommerce/control/showPromotionDetails"/>
+    <SurveyQuestion surveyQuestionId="2113" surveyQuestionCategoryId="2101" 
surveyQuestionTypeId="BOOLEAN" question="Does the shopping cart display the 
links create request for Quote and create new Quote from cart?"/>
+    <SurveyQuestion surveyQuestionId="2114" surveyQuestionCategoryId="2101" 
surveyQuestionTypeId="BOOLEAN" question="Does You might interested in link 
contain Add to cart link that adds the product to the shopping cart"/>
+    <SurveyQuestion surveyQuestionId="2115" surveyQuestionCategoryId="2101" 
surveyQuestionTypeId="BOOLEAN" question="Does You might interested in link 
contain Product link that https://localhost:8443/ecommerce/control/product"/>
+    <SurveyQuestion surveyQuestionId="2116" surveyQuestionCategoryId="2101" 
surveyQuestionTypeId="BOOLEAN" question="Does Shopping cart contains the 
Recalculate Cart,Empty Cart,Remove Selected and Checkout link on the title Bar 
that takes to their respaective target page?"/>
+    <SurveyQuestion surveyQuestionId="2117" surveyQuestionCategoryId="2101" 
surveyQuestionTypeId="BOOLEAN" question="Does Quick Add panel containing the 
Add to cart linnk adds the product to the shopping cart successfully on 
entering the ProductId"/>
     
     <!--CHECKOUT PAGE  -->
     <SurveyQuestionAppl surveyId="1401" surveyQuestionId="1401" 
fromDate="2001-01-01 00:00:00.001" requiredField="N" sequenceNum="01"/>

Modified: 
ofbiz/ofbiz-plugins/trunk/ecommerce/data/DemoWebSitePublishPointData.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/data/DemoWebSitePublishPointData.xml?rev=1830546&r1=1830545&r2=1830546&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/data/DemoWebSitePublishPointData.xml 
(original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/data/DemoWebSitePublishPointData.xml 
Mon Apr 30 10:56:31 2018
@@ -60,7 +60,7 @@ under the License.
     <ContentAssoc contentId="WebStoreCONTENT" contentIdTo="POLICY" 
contentAssocTypeId="SUB_CONTENT" fromDate="2001-05-13 12:00:00.000" 
createdDate="2001-05-13 12:00:00.000" createdByUserLogin="admin"/>
     <ContentAttribute contentId="POLICY" attrName="publishOperation" 
attrValue="HAS_USER_ROLE"/>
 
-    <Content contentId="WebStoreFACTOID" contentTypeId="WEB_SITE_PUB_PT" 
ownerContentId="" contentName="Factoids" description="Factoids" 
createdDate="2004-07-05 12:00:00.000" createdByUserLogin="admin"/>
+    <Content contentId="WebStoreFACTOID" contentTypeId="WEB_SITE_PUB_PT" 
contentName="Factoids" description="Factoids" createdDate="2004-07-05 
12:00:00.000" createdByUserLogin="admin"/>
 
     <!-- An example of sub-content to be rendered by the root contentId 
(WebStoreCONTENT) and map-key (policies) -->
     <DataResource dataResourceId="STORE_POLICIES" 
dataResourceTypeId="ELECTRONIC_TEXT" mimeTypeId="text/html" 
localeString="en_US" isPublic="Y" dataResourceName="Store Policies"/>

Modified: ofbiz/ofbiz-plugins/trunk/example/data/ExampleDemoData.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/example/data/ExampleDemoData.xml?rev=1830546&r1=1830545&r2=1830546&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/example/data/ExampleDemoData.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/example/data/ExampleDemoData.xml Mon Apr 30 
10:56:31 2018
@@ -18,16 +18,16 @@ specific language governing permissions
 under the License.
 -->
 <entity-engine-xml>
-    <ExampleType exampleTypeId="REAL_WORLD" description="Real World" 
parentTypeId=""/>
-    <ExampleType exampleTypeId="MADE_UP" description="Made Up" 
parentTypeId=""/>
+    <ExampleType exampleTypeId="REAL_WORLD" description="Real World"/>
+    <ExampleType exampleTypeId="MADE_UP" description="Made Up"/>
     <ExampleType exampleTypeId="CONTRIVED" description="Contrived" 
parentTypeId="MADE_UP"/>
     <ExampleType exampleTypeId="INSPIRED" description="Inspired" 
parentTypeId="MADE_UP"/>
 
-    <ExampleFeatureApplType exampleFeatureApplTypeId="REQUIRED" 
description="Required" parentTypeId=""/>
-    <ExampleFeatureApplType exampleFeatureApplTypeId="DESIRED" 
description="Desired" parentTypeId=""/>
-    <ExampleFeatureApplType exampleFeatureApplTypeId="NOT_ALLOWED" 
description="Not Allowed" parentTypeId=""/>
+    <ExampleFeatureApplType exampleFeatureApplTypeId="REQUIRED" 
description="Required"/>
+    <ExampleFeatureApplType exampleFeatureApplTypeId="DESIRED" 
description="Desired"/>
+    <ExampleFeatureApplType exampleFeatureApplTypeId="NOT_ALLOWED" 
description="Not Allowed"/>
 
-    <StatusType description="Example" statusTypeId="EXAMPLE_STATUS" 
hasTable="N" parentTypeId=""/>
+    <StatusType description="Example" statusTypeId="EXAMPLE_STATUS" 
hasTable="N"/>
     <StatusItem description="In Design" sequenceId="01" statusCode="IN_DESIGN" 
statusId="EXST_IN_DESIGN" statusTypeId="EXAMPLE_STATUS"/>
     <StatusItem description="Defined" sequenceId="02" statusCode="DEFINED" 
statusId="EXST_DEFINED" statusTypeId="EXAMPLE_STATUS"/>
     <StatusItem description="Approved" sequenceId="03" statusCode="APPROVED" 
statusId="EXST_APPROVED" statusTypeId="EXAMPLE_STATUS"/>
@@ -46,7 +46,7 @@ under the License.
     <StatusValidChange statusId="EXST_IMPLEMENTED" statusIdTo="EXST_CANCELLED" 
transitionName="Cancel Example"/>
     <StatusValidChange statusId="EXST_TESTED" statusIdTo="EXST_CANCELLED" 
transitionName="Cancel Example"/>
 
-    <EnumerationType description="Example Feature Source" 
enumTypeId="EXMPL_FEAT_SOURCE" hasTable="N" parentTypeId=""/>
+    <EnumerationType description="Example Feature Source" 
enumTypeId="EXMPL_FEAT_SOURCE" hasTable="N"/>
     <Enumeration description="Customer" enumCode="CUSTOMER" 
enumId="EXFTSRC_CUSTOMER" sequenceId="01" enumTypeId="EXMPL_FEAT_SOURCE"/>
     <Enumeration description="Partner" enumCode="PARTNER" 
enumId="EXFTSRC_PARTNER" sequenceId="02" enumTypeId="EXMPL_FEAT_SOURCE"/>
     <Enumeration description="Employee" enumCode="EMPLOYEE" 
enumId="EXFTSRC_EMPLOYEE" sequenceId="03" enumTypeId="EXMPL_FEAT_SOURCE"/>

Modified: ofbiz/ofbiz-plugins/trunk/passport/data/OAuth2CommonSeedData.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/passport/data/OAuth2CommonSeedData.xml?rev=1830546&r1=1830545&r2=1830546&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/passport/data/OAuth2CommonSeedData.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/passport/data/OAuth2CommonSeedData.xml Mon Apr 30 
10:56:31 2018
@@ -20,8 +20,8 @@ under the License.
 
 <entity-engine-xml>
 
-    <EnumerationType description="Passport Login Method Type" 
enumTypeId="ppLoginMethType" hasTable="N" parentTypeId=""/>
-    <EnumerationType description="Passport Login Provider" 
enumTypeId="ppLoginProvider" hasTable="N" parentTypeId=""/>
+    <EnumerationType description="Passport Login Method Type" 
enumTypeId="ppLoginMethType" hasTable="N"/>
+    <EnumerationType description="Passport Login Provider" 
enumTypeId="ppLoginProvider" hasTable="N"/>
 
     <EnumerationType description="OAuth2 Login Method Type" 
enumTypeId="OAuth2" hasTable="N" parentTypeId="ppLoginMethType"/>
 

Modified: ofbiz/ofbiz-plugins/trunk/passport/data/OAuth2GitHubSeedData.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/passport/data/OAuth2GitHubSeedData.xml?rev=1830546&r1=1830545&r2=1830546&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/passport/data/OAuth2GitHubSeedData.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/passport/data/OAuth2GitHubSeedData.xml Mon Apr 30 
10:56:31 2018
@@ -22,13 +22,9 @@ under the License.
 
     <EnumerationType description="GitHub Login" enumTypeId="GitHub" 
hasTable="N" parentTypeId="ppLoginProvider"/>
 
-    <ThirdPartyLogin productStoreId="9000" loginMethTypeId="OAuth2" 
loginProviderId="GitHub" fromDate="2011-01-01 00:00:00.0" thruDate="" 
sequenceNum=""/>
+    <ThirdPartyLogin productStoreId="9000" loginMethTypeId="OAuth2" 
loginProviderId="GitHub" fromDate="2011-01-01 00:00:00.0"/>
     
-    <OAuth2GitHub productStoreId="9000" 
-                    clientId="" clientSecret=""
-                    returnUrl=""
-                    localRedirectUri="/ecomseo/gitHubRedirect" 
-                    iconUrl="/passport/images/github.png" fromDate="2011-01-01 
00:00:00.0" thruDate=""/>
+    <OAuth2GitHub productStoreId="9000" 
localRedirectUri="/ecomseo/gitHubRedirect" 
iconUrl="/passport/images/github.png" fromDate="2011-01-01 00:00:00.0"/>
     <!-- The returnUrl, i.e. 
https://yourWebSiteOrIp:8443/ecomseo/githubResponse -->
     
 </entity-engine-xml>
\ No newline at end of file

Modified: ofbiz/ofbiz-plugins/trunk/passport/data/OAuth2LinkedInSeedData.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/passport/data/OAuth2LinkedInSeedData.xml?rev=1830546&r1=1830545&r2=1830546&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/passport/data/OAuth2LinkedInSeedData.xml 
(original)
+++ ofbiz/ofbiz-plugins/trunk/passport/data/OAuth2LinkedInSeedData.xml Mon Apr 
30 10:56:31 2018
@@ -22,14 +22,11 @@ under the License.
 
     <EnumerationType description="LinkedIn Login" enumTypeId="LinkedIn" 
hasTable="N" parentTypeId="ppLoginProvider"/>
 
-    <ThirdPartyLogin productStoreId="9000" loginMethTypeId="OAuth2" 
loginProviderId="LinkedIn" fromDate="2011-01-01 00:00:00.0" thruDate="" 
sequenceNum=""/>
+    <ThirdPartyLogin productStoreId="9000" loginMethTypeId="OAuth2" 
loginProviderId="LinkedIn" fromDate="2011-01-01 00:00:00.0"/>
     
-    <OAuth2LinkedIn productStoreId="9000" 
-                    apiKey="" secretKey=""
-                    testReturnUrl="" 
-                    liveReturnUrl="" 
+    <OAuth2LinkedIn productStoreId="9000"
                     localRedirectUri="/ecomseo/linkedInRedirect" 
-                    iconUrl="/passport/images/linkedin.png" 
fromDate="2011-01-01 00:00:00.0" thruDate=""/>
+                    iconUrl="/passport/images/linkedin.png" 
fromDate="2011-01-01 00:00:00.0"/>
     <!-- The testReturnUrl, i.e. 
https://yourTestWebSiteOrIp:8443/ecomseo/linkedInResponse -->
     <!-- The liveReturnUrl, i.e. 
https://yourLiveWebSiteOrIp:8443/ecomseo/linkedInResponse -->
     

Modified: ofbiz/ofbiz-plugins/trunk/pricat/data/PricatData.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/pricat/data/PricatData.xml?rev=1830546&r1=1830545&r2=1830546&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/pricat/data/PricatData.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/pricat/data/PricatData.xml Mon Apr 30 10:56:31 
2018
@@ -19,7 +19,7 @@ under the License.
 -->
 <entity-engine-xml>
     <!-- Enumeration for thruReasonId of ExcelImportHistory entity -->
-    <EnumerationType description="Excel import thru reasons" 
enumTypeId="EXCEL_IMPORT_THRU" hasTable="N" parentTypeId=""/>
+    <EnumerationType description="Excel import thru reasons" 
enumTypeId="EXCEL_IMPORT_THRU" hasTable="N"/>
     
     <Enumeration enumId="EXCEL_IMPORT_SUCCESS" enumCode="EXCEL_IMPORT_SUCCESS" 
description="Excel Imported Successfully" sequenceId="01" 
enumTypeId="EXCEL_IMPORT_THRU"/>
     <Enumeration enumId="EXCEL_IMPORT_STOPPED" enumCode="EXCEL_IMPORT_STOPPED" 
description="Excel Imported Stopped by user" sequenceId="02" 
enumTypeId="EXCEL_IMPORT_THRU"/>
@@ -27,7 +27,7 @@ under the License.
     <Enumeration enumId="EXCEL_IMPORT_QUEST" enumCode="EXCEL_IMPORT_QUEST" 
description="Excel Imported Has Error Messages" sequenceId="04" 
enumTypeId="EXCEL_IMPORT_THRU"/>
 
     <!-- Enumeration for statusId of ExcelImportHistory entity -->
-    <EnumerationType description="Excel import status" 
enumTypeId="EXCEL_IMPORT_STATUS" hasTable="N" parentTypeId=""/>
+    <EnumerationType description="Excel import status" 
enumTypeId="EXCEL_IMPORT_STATUS" hasTable="N"/>
     
     <Enumeration enumId="EXCEL_IMPORTING" enumCode="EXCEL_IMPORTING" 
description="Excel is being imported in progress" sequenceId="01" 
enumTypeId="EXCEL_IMPORT_STATUS"/>
     <Enumeration enumId="EXCEL_IMPORTED" enumCode="EXCEL_IMPORTED" 
description="Excel has been imported" sequenceId="02" 
enumTypeId="EXCEL_IMPORT_STATUS"/>

svn commit: r1830546 [1/2] - in /ofbiz/ofbiz-plugins/trunk: birt/data/ birt/data/example/ cmssite/data/ ebay/data/ ebaystore/data/ ecommerce/data/ example/data/ passport/data/ pricat/data/ projectmgr/data/ scrum/data/ webpos/data/

Reply via email to