You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ofbiz.apache.org by Ashish Vijaywargiya <vi...@gmail.com> on 2010/04/28 05:09:32 UTC

Re: svn commit: r938446 - in /ofbiz/trunk: applications/accounting/data/ applications/content/data/ applications/marketing/data/ applications/order/servicedef/ applications/party/data/ applications/party/script/org/ofbiz/party/test/ debian/ framework

Hello Scott,

I agree from you but I would prefer to have this gmail account
settings as it is because I(or someone else) can test mail fetching by
enabling only JavaMail container settings in ofbiz-containers.xml. One
more important thing I can't test anything sent on test@example.com
but can do on gmail.com.

For few days lets keep this settings as it is then if we see some
problems then we will change it in future.
Thanks for your comments!

--
Ashish


On Tue, Apr 27, 2010 at 6:58 PM, Scott Gray <sc...@hotwaxmedia.com> wrote:
> Personally I would prefer it if we used test@example.com
> The example.com domain exists exactly for this sort of thing and the emails don't bounce (I believe).
>
> Regards
> Scott
>
> HotWax Media
> http://www.hotwaxmedia.com
>
> On 28/04/2010, at 1:17 AM, ashish@apache.org wrote:
>
>> Author: ashish
>> Date: Tue Apr 27 13:17:45 2010
>> New Revision: 938446
>>
>> URL: http://svn.apache.org/viewvc?rev=938446&view=rev
>> Log:
>> Changing email address ofbiztest@yahoo.com -> ofbiztesting@gmail.com - this was creating too much problem since long in development effort.
>>
>> Following points were there in my mind before doing this change.
>>
>> -- AFAIK ofbiztest@yahoo.com email doesn't exists.
>> -- Bounce email issue if you have enabled Javamail container. This drastically slow down your system performance.
>> -- Now anyone can use ofbiztesting@gmail.com account settings for Sendmail, Javamail container etc.
>> -- Send mail service triggered again and again with failure message on console if any of the email not found bccAddress inside ProductStoreEmailSettings entity. Again slow speed of your development machine.
>> -- Please let me know where to share the password of this account? Dev list?
>>
>> Modified:
>>    ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml
>>    ofbiz/trunk/applications/content/data/UsersDemoData.xml
>>    ofbiz/trunk/applications/marketing/data/sfaDemoData.xml
>>    ofbiz/trunk/applications/order/servicedef/orderProcessXPDL.xml
>>    ofbiz/trunk/applications/party/data/PartyDemoData.xml
>>    ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyContactMechTests.xml
>>    ofbiz/trunk/debian/TODO
>>    ofbiz/trunk/debian/override-data.xslt
>>    ofbiz/trunk/framework/common/config/general.properties
>>    ofbiz/trunk/framework/common/script/org/ofbiz/common/email/EmailServices.xml
>>    ofbiz/trunk/specialpurpose/ebaystore/data/DemoEbayStoreData.xml
>>    ofbiz/trunk/specialpurpose/ecommerce/data/DemoMarketing.xml
>>    ofbiz/trunk/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml
>>    ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml
>>    ofbiz/trunk/specialpurpose/ecommerce/data/DemoRentalProduct.xml
>>    ofbiz/trunk/specialpurpose/googlebase/data/DemoGoogleBaseData.xml
>>    ofbiz/trunk/specialpurpose/workflow/data/OrderProcessWorkflow.xml
>>
>> Modified: ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml
>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml?rev=938446&r1=938445&r2=938446&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml (original)
>> +++ ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml Tue Apr 27 13:17:45 2010
>> @@ -28,7 +28,7 @@ under the License.
>>     <ContactMech contactMechId="9000" contactMechTypeId="POSTAL_ADDRESS"/>
>>     <PartyContactMech partyId="Company" contactMechId="9000" fromDate="2000-01-01 00:00:00.000" allowSolicitation="Y"/>
>>     <PostalAddress contactMechId="9000" toName="Company XYZ" address1="2003 Open Blvd" city="Open City" postalCode="999999" countryGeoId="USA" stateProvinceGeoId="CA" geoPointId="9000"/>
>> -    <ContactMech contactMechId="Company" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>> +    <ContactMech contactMechId="Company" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>     <PartyContactMech partyId="Company" contactMechId="Company" fromDate="2000-01-01 00:00:00.000" allowSolicitation="Y"/>
>>     <PartyContactMechPurpose contactMechPurposeTypeId="PRIMARY_EMAIL" partyId="Company" contactMechId="Company" fromDate="2003-01-01 00:00:00.000"/>
>>     <PartyContactMechPurpose partyId="Company" contactMechId="9000" contactMechPurposeTypeId="BILLING_LOCATION" fromDate="2000-01-01 00:00:00.000"/>
>>
>> Modified: ofbiz/trunk/applications/content/data/UsersDemoData.xml
>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/data/UsersDemoData.xml?rev=938446&r1=938445&r2=938446&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/applications/content/data/UsersDemoData.xml (original)
>> +++ ofbiz/trunk/applications/content/data/UsersDemoData.xml Tue Apr 27 13:17:45 2010
>> @@ -47,19 +47,19 @@ under the License.
>>     <PartyRole partyId="BLOG_EDITOR" roleTypeId="CONTENT_PUBLISHER"/>
>>     <PartyRole partyId="BLOG_EDITOR" roleTypeId="_NA_"/>
>>
>> -    <ContactMech contactMechId="ADMIN_CONTACT" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>> +    <ContactMech contactMechId="ADMIN_CONTACT" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>     <PartyContactMech partyId="BLOG_ADMIN" contactMechId="ADMIN_CONTACT" fromDate="2001-05-13 12:00:00.0"/>
>>     <PartyContactMechPurpose partyId="BLOG_ADMIN" contactMechId="ADMIN_CONTACT" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2001-05-13 12:00:00.0"/>
>>
>> -    <ContactMech contactMechId="AUTHOR_CONTACT" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>> +    <ContactMech contactMechId="AUTHOR_CONTACT" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>     <PartyContactMech partyId="BLOG_AUTHOR" contactMechId="AUTHOR_CONTACT" fromDate="2001-05-13 12:00:00.0"/>
>>     <PartyContactMechPurpose partyId="BLOG_AUTHOR" contactMechId="AUTHOR_CONTACT" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2001-05-13 12:00:00.0"/>
>>
>> -    <ContactMech contactMechId="EDITOR_CONTACT" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>> +    <ContactMech contactMechId="EDITOR_CONTACT" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>     <PartyContactMech partyId="BLOG_EDITOR" contactMechId="EDITOR_CONTACT" fromDate="2001-05-13 12:00:00.0"/>
>>     <PartyContactMechPurpose partyId="BLOG_EDITOR" contactMechId="EDITOR_CONTACT" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2001-05-13 12:00:00.0"/>
>>
>> -    <ContactMech contactMechId="GUEST_CONTACT" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>> +    <ContactMech contactMechId="GUEST_CONTACT" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>     <PartyContactMech partyId="BLOG_GUEST" contactMechId="GUEST_CONTACT" fromDate="2001-05-13 12:00:00.0"/>
>>     <PartyContactMechPurpose partyId="BLOG_GUEST" contactMechId="GUEST_CONTACT" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2001-05-13 12:00:00.0"/>
>> </entity-engine-xml>
>>
>> Modified: ofbiz/trunk/applications/marketing/data/sfaDemoData.xml
>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/data/sfaDemoData.xml?rev=938446&r1=938445&r2=938446&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/applications/marketing/data/sfaDemoData.xml (original)
>> +++ ofbiz/trunk/applications/marketing/data/sfaDemoData.xml Tue Apr 27 13:17:45 2010
>> @@ -26,7 +26,7 @@
>>     <PartyRole partyId="sfa100" roleTypeId="ACCOUNT"/>
>>     <ContactMech contactMechId="sfa100" contactMechTypeId="POSTAL_ADDRESS"/>
>>     <ContactMech contactMechId="sfa101" contactMechTypeId="TELECOM_NUMBER"/>
>> -    <ContactMech contactMechId="sfa102" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>> +    <ContactMech contactMechId="sfa102" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>     <PostalAddress contactMechId="sfa100" address1="151 Madison street." city="Edison" postalCode="32451" lastUpdatedStamp="2008-05-23 11:57:40.936" lastUpdatedTxStamp="2008-05-23 11:57:39.476" createdStamp="2008-05-23 11:57:40.936" createdTxStamp="2008-05-23 11:57:39.476"/>
>>     <TelecomNumber contactMechId="sfa101" countryCode="1" areaCode="33" contactNumber="12456" lastUpdatedStamp="2008-05-23 11:57:41.179" lastUpdatedTxStamp="2008-05-23 11:57:39.476" createdStamp="2008-05-23 11:57:41.179" createdTxStamp="2008-05-23 11:57:39.476"/>
>>     <PartyContactMech partyId="sfa100" contactMechId="sfa100" fromDate="2000-01-01 00:00:00.000"/>
>>
>> Modified: ofbiz/trunk/applications/order/servicedef/orderProcessXPDL.xml
>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/servicedef/orderProcessXPDL.xml?rev=938446&r1=938445&r2=938446&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/applications/order/servicedef/orderProcessXPDL.xml (original)
>> +++ ofbiz/trunk/applications/order/servicedef/orderProcessXPDL.xml Tue Apr 27 13:17:45 2010
>> @@ -90,7 +90,7 @@ under the License.
>>                     <DataType>
>>                         <BasicType Type="STRING"/>
>>                     </DataType>
>> -                    <InitialValue>ofbiztest@yahoo.com</InitialValue>
>> +                    <InitialValue>ofbiztesting@gmail.com</InitialValue>
>>                 </DataField>
>>             </DataFields>
>>
>>
>> Modified: ofbiz/trunk/applications/party/data/PartyDemoData.xml
>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/data/PartyDemoData.xml?rev=938446&r1=938445&r2=938446&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/applications/party/data/PartyDemoData.xml (original)
>> +++ ofbiz/trunk/applications/party/data/PartyDemoData.xml Tue Apr 27 13:17:45 2010
>> @@ -29,7 +29,7 @@
>>     <PartyRole partyId="DemoEmployee" roleTypeId="EMAIL_ADMIN"/>
>>     <PartyRelationship partyIdFrom="DemoEmployee" roleTypeIdFrom="EMAIL_ADMIN" partyIdTo="Company" roleTypeIdTo="_NA_" fromDate="2000-01-01 00:00:00"/>
>>
>> -    <ContactMech contactMechId="admin" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>> +    <ContactMech contactMechId="admin" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>     <PartyContactMech partyId="admin" contactMechId="admin" fromDate="2003-01-01 00:00:00.0" allowSolicitation="Y"/>
>>     <PartyContactMechPurpose contactMechPurposeTypeId="PRIMARY_EMAIL" partyId="admin" contactMechId="admin" fromDate="2003-01-01 00:00:00.0"/>
>>
>> @@ -40,10 +40,10 @@
>>     <PartyIdentification partyId="DemoSupplier" partyIdentificationTypeId="SIRET" idValue="1234 5678 90123"/>
>>
>>     <!-- email from an unknown party -->
>> -    <CommunicationEvent communicationEventId="9000" communicationEventTypeId="EMAIL_COMMUNICATION" statusId="COM_UNKNOWN_PARTY" contactMechTypeId="EMAIL_ADDRESS" contactMechIdTo="admin" roleTypeIdFrom="_NA_" roleTypeIdTo="_NA_" partyIdTo="admin" entryDate="2008-07-28 13:55:55.827" datetimeStarted="2008-07-28 13:55:19.0" subject="Why i would use the OFBiz system" contentMimeTypeId="text/plain" content="Every time i think of you, only you...you are always on my mind......." note="Sent from: my@email.com; Sent Name from: Jo Easy User; Sent to: ofbiztest@yahoo.com; Delivered-To: ofbiztest@yahoo.com; " fromString="mailinglist@antwebsystems.com" toString="ofbiztest@yahoo.com"/>
>> +    <CommunicationEvent communicationEventId="9000" communicationEventTypeId="EMAIL_COMMUNICATION" statusId="COM_UNKNOWN_PARTY" contactMechTypeId="EMAIL_ADDRESS" contactMechIdTo="admin" roleTypeIdFrom="_NA_" roleTypeIdTo="_NA_" partyIdTo="admin" entryDate="2008-07-28 13:55:55.827" datetimeStarted="2008-07-28 13:55:19.0" subject="Why i would use the OFBiz system" contentMimeTypeId="text/plain" content="Every time i think of you, only you...you are always on my mind......." note="Sent from: my@email.com; Sent Name from: Jo Easy User; Sent to: ofbiztesting@gmail.com; Delivered-To: ofbiztesting@gmail.com; " fromString="mailinglist@antwebsystems.com" toString="ofbiztesting@gmail.com"/>
>>     <PartyRole partyId="admin" roleTypeId="ADDRESSEE"/>
>>     <CommunicationEventRole communicationEventId="9000" partyId="admin" roleTypeId="ADDRESSEE" contactMechId="admin" statusId="COM_ROLE_CREATED"/>
>>
>>     <!-- new registration notification -->
>> -    <EmailTemplateSetting emailTemplateSettingId="PARTY_REGISTER" bodyScreenLocation="component://party/widget/partymgr/PartyScreens.xml#CreateUserNotification" subject="New Account Created" bccAddress="ofbiztest@yahoo.com" fromAddress="ofbiztest@yahoo.com"/>
>> +    <EmailTemplateSetting emailTemplateSettingId="PARTY_REGISTER" bodyScreenLocation="component://party/widget/partymgr/PartyScreens.xml#CreateUserNotification" subject="New Account Created" bccAddress="ofbiztesting@gmail.com" fromAddress="ofbiztesting@gmail.com"/>
>> </entity-engine-xml>
>>
>> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyContactMechTests.xml
>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyContactMechTests.xml?rev=938446&r1=938445&r2=938446&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyContactMechTests.xml (original)
>> +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyContactMechTests.xml Tue Apr 27 13:17:45 2010
>> @@ -26,7 +26,7 @@ under the License.
>>         <set field="contactMechTypeId" value="EMAIL_ADDRESS"/>
>>         <!-- first try with just updating without changing the email address -->
>>         <set field="serviceCtx.partyId" from-field="partyId"/>
>> -        <set field="serviceCtx.emailAddress" value="ofbiztest@yahoo.com"/>
>> +        <set field="serviceCtx.emailAddress" value="ofbiztesting@gmail.com"/>
>>         <set field="serviceCtx.contactMechId" value="9026"/>
>>         <entity-one entity-name="UserLogin" value-field="userLogin">
>>             <field-map field-name="userLoginId" value="system"/>
>>
>> Modified: ofbiz/trunk/debian/TODO
>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/debian/TODO?rev=938446&r1=938445&r2=938446&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/debian/TODO (original)
>> +++ ofbiz/trunk/debian/TODO Tue Apr 27 13:17:45 2010
>> @@ -19,7 +19,7 @@
>> * debian/copyright
>> - Prompt for:
>>   - ofbiz admin password(s)
>> -  - default email(ofbiztest@yahoo.com)
>> +  - default email(ofbiztesting@gmail.com)
>>   - install of demo or just seed data
>> * Auto-generate admin key/port
>> * Move demo data into separate package?
>>
>> Modified: ofbiz/trunk/debian/override-data.xslt
>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/debian/override-data.xslt?rev=938446&r1=938445&r2=938446&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/debian/override-data.xslt (original)
>> +++ ofbiz/trunk/debian/override-data.xslt Tue Apr 27 13:17:45 2010
>> @@ -108,13 +108,13 @@ under the License.
>>
>>  <xsl:template mode="data" match="
>>   ProductStoreEmailSetting[
>> -   @bccAddress='ofbiztest@yahoo.com' or
>> -   @fromAddress='ofbiztest@yahoo.com']|ContactList[
>> -   @verifyEmailFrom='ofbiztest@yahoo.com'
>> +   @bccAddress='ofbiztesting@gmail.com' or
>> +   @fromAddress='ofbiztesting@gmail.com']|ContactList[
>> +   @verifyEmailFrom='ofbiztesting@gmail.com'
>>   ]|ContactMech[
>> -   @infoString='ofbiztest@yahoo.com'
>> +   @infoString='ofbiztesting@gmail.com'
>>   ]|WorkflowDataField[
>> -   @initialValue='ofbiztest@yahoo.com'
>> +   @initialValue='ofbiztesting@gmail.com'
>>   ]|UserLogin[
>>    @currentPassword='47ca69ebb4bdc9ae0adec130880165d2cc05db1a'
>>   ]">
>> @@ -126,7 +126,7 @@ under the License.
>>  <xsl:template mode="match" match="ProductStoreEmailSetting/@bccAddress|ProductStoreEmailSetting/@fromAddress|ProductStoreEmailSetting/@verifyEmailFrom|ContactMech/@infoString|ContactList/@verifyEmailFrom|WorkflowDataField/@initialValue">
>>   <xsl:attribute name="{name()}">
>>    <xsl:choose>
>> -    <xsl:when test=". = 'ofbiztest@yahoo.com'"><xsl:value-of select="$fromemail"/></xsl:when>
>> +    <xsl:when test=". = 'ofbiztesting@gmail.com'"><xsl:value-of select="$fromemail"/></xsl:when>
>>     <xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
>>    </xsl:choose>
>>   </xsl:attribute>
>>
>> Modified: ofbiz/trunk/framework/common/config/general.properties
>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/general.properties?rev=938446&r1=938445&r2=938446&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/framework/common/config/general.properties (original)
>> +++ ofbiz/trunk/framework/common/config/general.properties Tue Apr 27 13:17:45 2010
>> @@ -64,7 +64,7 @@ partner.trackingCodeId.default=
>> usps.address.match=(^.*?p[\\. ]*o[\\. ]*box.*$)|(^.*?post.*?office.*?box.*$)|((^|(^.*? ))r[\\. ]*r[\\. ]*(( +)|([0-9#]+)).*$)|(^.*?rural.*?route.*$)
>>
>> # -- general default 'fromEmailAddress' can be overridden in: EmailTemplateSetting
>> -defaultFromEmailAddress=ofbiztest@yahoo.com
>> +defaultFromEmailAddress=ofbiztesting@gmail.com
>>
>> # -- The default domainname used in the notification emails links
>> # as 'baseUrl' and 'baseSecureUrl' are set in the url.properties file.
>>
>> Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/email/EmailServices.xml
>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/email/EmailServices.xml?rev=938446&r1=938445&r2=938446&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/framework/common/script/org/ofbiz/common/email/EmailServices.xml (original)
>> +++ ofbiz/trunk/framework/common/script/org/ofbiz/common/email/EmailServices.xml Tue Apr 27 13:17:45 2010
>> @@ -50,7 +50,7 @@ under the License.
>>             <if-not-empty field="emailTemplateSetting.fromAddress">
>>                 <set field="emailParams.sendFrom" from-field="emailTemplateSetting.fromAddress"/>
>>                 <else>
>> -                    <property-to-field resource="general" property="defaultFromEmailAddress" field="emailParams.sendFrom" default="ofbiztest@yahoo.com"/>
>> +                    <property-to-field resource="general" property="defaultFromEmailAddress" field="emailParams.sendFrom" default="ofbiztesting@gmail.com"/>
>>                 </else>
>>             </if-not-empty>
>>             <set field="emailParams.sendCc" from-field="emailTemplateSetting.ccAddress"/>
>>
>> Modified: ofbiz/trunk/specialpurpose/ebaystore/data/DemoEbayStoreData.xml
>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/data/DemoEbayStoreData.xml?rev=938446&r1=938445&r2=938446&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/specialpurpose/ebaystore/data/DemoEbayStoreData.xml (original)
>> +++ ofbiz/trunk/specialpurpose/ebaystore/data/DemoEbayStoreData.xml Tue Apr 27 13:17:45 2010
>> @@ -92,9 +92,9 @@
>>     <Content contentId="EBAY_ITEM_DISPATCH" contentTypeId="DOCUMENT" dataResourceId="EBAY_ITEM_DISPATCH" ownerContentId="EBAY_ITEM_DISPATCH" statusId="CTNT_IN_PROGRESS"/>
>>     <ContentRole contentId="EBAY_ITEM_DISPATCH" partyId="DemoEbayAccount" roleTypeId="OWNER" fromDate="2010-01-01 00:00:00.000"/>
>>
>> -    <ProductStoreEmailSetting productStoreId="90100" emailType="EBAY_WIN_BUYER_NOTI" bccAddress="ofbiztest@yahoo.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#WinnigBuyerNotification" fromAddress="ofbiztest@yahoo.com" subject="OFBiz Demo - Winnig Buyer Notification #${buyerUserId}" xslfoAttachScreenLocation=""/>
>> -    <ProductStoreEmailSetting productStoreId="90100" emailType="EBAY_PAY_RECIEVED" bccAddress="ofbiztest@yahoo.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#PaymentRecieved" fromAddress="ofbiztest@yahoo.com" subject="OFBiz Demo - PaymentRecieved #${buyerUserId}" xslfoAttachScreenLocation=""/>
>> -    <ProductStoreEmailSetting productStoreId="90100" emailType="EBAY_FEEBACK_REMIN" bccAddress="ofbiztest@yahoo.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#FeedbackReminder" fromAddress="ofbiztest@yahoo.com" subject="OFBiz Demo - Feedback Reminder #${buyerUserId}" xslfoAttachScreenLocation=""/>
>> -    <ProductStoreEmailSetting productStoreId="90100" emailType="EBAY_ITEM_DISPATCH" bccAddress="ofbiztest@yahoo.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#EbayEmailTemplate" fromAddress="ofbiztest@yahoo.com" subject="OFBiz Demo - Item Dispatched Notification #${buyerUserId}" xslfoAttachScreenLocation=""/>
>> +    <ProductStoreEmailSetting productStoreId="90100" emailType="EBAY_WIN_BUYER_NOTI" bccAddress="ofbiztesting@gmail.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#WinnigBuyerNotification" fromAddress="ofbiztesting@gmail.com" subject="OFBiz Demo - Winnig Buyer Notification #${buyerUserId}" xslfoAttachScreenLocation=""/>
>> +    <ProductStoreEmailSetting productStoreId="90100" emailType="EBAY_PAY_RECIEVED" bccAddress="ofbiztesting@gmail.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#PaymentRecieved" fromAddress="ofbiztesting@gmail.com" subject="OFBiz Demo - PaymentRecieved #${buyerUserId}" xslfoAttachScreenLocation=""/>
>> +    <ProductStoreEmailSetting productStoreId="90100" emailType="EBAY_FEEBACK_REMIN" bccAddress="ofbiztesting@gmail.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#FeedbackReminder" fromAddress="ofbiztesting@gmail.com" subject="OFBiz Demo - Feedback Reminder #${buyerUserId}" xslfoAttachScreenLocation=""/>
>> +    <ProductStoreEmailSetting productStoreId="90100" emailType="EBAY_ITEM_DISPATCH" bccAddress="ofbiztesting@gmail.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#EbayEmailTemplate" fromAddress="ofbiztesting@gmail.com" subject="OFBiz Demo - Item Dispatched Notification #${buyerUserId}" xslfoAttachScreenLocation=""/>
>>
>> </entity-engine-xml>
>>
>> Modified: ofbiz/trunk/specialpurpose/ecommerce/data/DemoMarketing.xml
>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/DemoMarketing.xml?rev=938446&r1=938445&r2=938446&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/specialpurpose/ecommerce/data/DemoMarketing.xml (original)
>> +++ ofbiz/trunk/specialpurpose/ecommerce/data/DemoMarketing.xml Tue Apr 27 13:17:45 2010
>> @@ -23,11 +23,11 @@ under the License.
>>
>>     <ContactList contactListId="9000" contactListTypeId="ANNOUNCEMENT" contactMechTypeId="EMAIL_ADDRESS" marketingCampaignId="9000"
>>         contactListName="New Product Announcements" description="New Product Announcements Mailing List (email)" comments="" isPublic="Y" ownerPartyId="Company"
>> -        verifyEmailFrom="ofbiztest@yahoo.com" verifyEmailScreen="component://ecommerce/widget/EmailContactListScreens.xml#ContactListVerifyEmail"
>> +        verifyEmailFrom="ofbiztesting@gmail.com" verifyEmailScreen="component://ecommerce/widget/EmailContactListScreens.xml#ContactListVerifyEmail"
>>         verifyEmailSubject="Subscription Verify Email" verifyEmailWebSiteId="WebStore"/>
>>     <ContactList contactListId="9010" contactListTypeId="NEWSLETTER" contactMechTypeId="EMAIL_ADDRESS" marketingCampaignId="9000"
>>         contactListName="Product Tips Newsletter" description="Product Tips Newsletter Mailing List (email)" comments="" isPublic="Y" ownerPartyId="Company"
>> -        verifyEmailFrom="ofbiztest@yahoo.com" verifyEmailScreen="component://ecommerce/widget/EmailContactListScreens.xml#ContactListVerifyEmail"
>> +        verifyEmailFrom="ofbiztesting@gmail.com" verifyEmailScreen="component://ecommerce/widget/EmailContactListScreens.xml#ContactListVerifyEmail"
>>         verifyEmailSubject="Subscription Verify Email" verifyEmailWebSiteId="WebStore"/>
>>
>>     <ContactListParty contactListId="9000" partyId="DemoCustCompany" preferredContactMechId="9021" statusId="CLPT_ACCEPTED" fromDate="2001-05-13 00:00:00"/>
>>
>> Modified: ofbiz/trunk/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml
>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml?rev=938446&r1=938445&r2=938446&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml (original)
>> +++ ofbiz/trunk/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml Tue Apr 27 13:17:45 2010
>> @@ -78,7 +78,7 @@ under the License.
>>     <TelecomNumber contactMechId="9020" areaCode="801" contactNumber="555-5555"/>
>>     <PartyContactMech partyId="DemoCustCompany" contactMechId="9020" fromDate="2001-05-13 00:00:00.000" allowSolicitation="Y"/>
>>     <PartyContactMechPurpose partyId="DemoCustCompany" contactMechId="9020" contactMechPurposeTypeId="PHONE_WORK" fromDate="2001-05-13 00:00:00.000"/>
>> -    <ContactMech contactMechId="9021" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>> +    <ContactMech contactMechId="9021" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>     <PartyContactMech partyId="DemoCustCompany" contactMechId="9021" fromDate="2001-05-13 00:00:00.000" allowSolicitation="Y"/>
>>     <PartyContactMechPurpose partyId="DemoCustCompany" contactMechId="9021" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2001-05-13 00:00:00.000"/>
>>
>> @@ -104,7 +104,7 @@ under the License.
>>     <TelecomNumber contactMechId="9022" areaCode="801" contactNumber="555-5555"/>
>>     <PartyContactMech partyId="DemoCustAgent" contactMechId="9022" fromDate="2001-05-13 00:00:00.000" allowSolicitation="Y"/>
>>     <PartyContactMechPurpose partyId="DemoCustAgent" contactMechId="9022" contactMechPurposeTypeId="PHONE_WORK" fromDate="2001-05-13 00:00:00.000"/>
>> -    <ContactMech contactMechId="9023" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>> +    <ContactMech contactMechId="9023" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>     <PartyContactMech partyId="DemoCustAgent" contactMechId="9023" fromDate="2001-05-13 00:00:00.000" allowSolicitation="Y"/>
>>     <PartyContactMechPurpose partyId="DemoCustAgent" contactMechId="9023" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2001-05-13 00:00:00.000"/>
>>
>> @@ -139,7 +139,7 @@ under the License.
>>     <PartyContactMechPurpose partyId="DemoCustomer" contactMechId="9025" contactMechPurposeTypeId="PHONE_HOME" fromDate="2001-05-13 00:00:00.000"/>
>>     <PartyContactMechPurpose partyId="DemoCustomer" contactMechId="9025" contactMechPurposeTypeId="PHONE_SHIPPING" fromDate="2001-05-13 00:00:00.000"/>
>>     <PartyContactMechPurpose partyId="DemoCustomer" contactMechId="9027" contactMechPurposeTypeId="PHONE_BILLING" fromDate="2001-05-13 00:00:00.000"/>
>> -    <ContactMech contactMechId="9026" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>> +    <ContactMech contactMechId="9026" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>     <PartyContactMech partyId="DemoCustomer" contactMechId="9026" fromDate="2001-05-13 00:00:00.000" allowSolicitation="Y"/>
>>     <PartyContactMechPurpose partyId="DemoCustomer" contactMechId="9026" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2001-05-13 00:00:00.000"/>
>>
>> @@ -165,7 +165,7 @@ under the License.
>>     <PartyContactMechPurpose partyId="EuroCustomer" contactMechId="EUROCUSTOMER" contactMechPurposeTypeId="BILLING_LOCATION" fromDate="2001-05-13 00:00:00.000"/>
>>     <PartyContactMechPurpose partyId="EuroCustomer" contactMechId="EUROCUSTOMER" contactMechPurposeTypeId="SHIPPING_LOCATION" fromDate="2001-05-13 00:00:00.000"/>
>>     <PartyContactMechPurpose partyId="EuroCustomer" contactMechId="EUROCUSTOMER" contactMechPurposeTypeId="GENERAL_LOCATION" fromDate="2001-05-13 00:00:00.000"/>
>> -    <ContactMech contactMechId="EURO01" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>> +    <ContactMech contactMechId="EURO01" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>     <PartyContactMech partyId="EuroCustomer" contactMechId="EURO01" fromDate="2001-05-13 00:00:00.000" allowSolicitation="Y"/>
>>     <PartyContactMechPurpose partyId="EuroCustomer" contactMechId="EURO01" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2001-05-13 00:00:00.000"/>
>>
>> @@ -191,7 +191,7 @@ under the License.
>>     <PartyContactMechPurpose partyId="FrenchCustomer" contactMechId="FRENCHCUSTOMER" contactMechPurposeTypeId="BILLING_LOCATION" fromDate="2009-01-09 00:00:00.000"/>
>>     <PartyContactMechPurpose partyId="FrenchCustomer" contactMechId="FRENCHCUSTOMER" contactMechPurposeTypeId="SHIPPING_LOCATION" fromDate="2009-01-09 00:00:00.000"/>
>>     <PartyContactMechPurpose partyId="FrenchCustomer" contactMechId="FRENCHCUSTOMER" contactMechPurposeTypeId="GENERAL_LOCATION" fromDate="2009-01-09 00:00:00.000"/>
>> -    <ContactMech contactMechId="FRA01" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>> +    <ContactMech contactMechId="FRA01" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>     <PartyContactMech partyId="FrenchCustomer" contactMechId="FRA01" fromDate="2009-01-09 00:00:00.000" allowSolicitation="Y"/>
>>     <PartyContactMechPurpose partyId="FrenchCustomer" contactMechId="FRA01" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2009-01-09 00:00:00.000"/>
>>
>>
>> Modified: ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml
>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml?rev=938446&r1=938445&r2=938446&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml (original)
>> +++ ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml Tue Apr 27 13:17:45 2010
>> @@ -23,7 +23,7 @@ under the License.
>>
>>     <ContactMech contactMechId="9200" contactMechTypeId="POSTAL_ADDRESS"/>
>>     <ContactMech contactMechId="9201" contactMechTypeId="TELECOM_NUMBER"/>
>> -    <ContactMech contactMechId="9202" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>> +    <ContactMech contactMechId="9202" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>     <PostalAddress contactMechId="9200" toName="Company XYZ" attnName="ZJAA" address1="2003 Open Blvd" city="Orem" postalCode="84058" countryGeoId="USA" stateProvinceGeoId="UT" geoPointId="9000"/>
>>     <TelecomNumber contactMechId="9201" areaCode="801" contactNumber="555-5555"/>
>>     <FacilityContactMech facilityId="WebStoreWarehouse" contactMechId="9200" fromDate="2001-05-13 12:00:00.0"/>
>> @@ -97,34 +97,34 @@ under the License.
>>     <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="EXT_COD" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService="" paymentCustomMethodId=""/>
>>     <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="EXT_BILLACT" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService="" paymentCustomMethodId=""/>
>>
>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_CONFIRM" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNotice" xslfoAttachScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNoticePdf" subject="OFBiz Demo - Order Confirmation #${orderId}" bccAddress="ofbiztest@yahoo.com" fromAddress="ofbiztest@yahoo.com"/>
>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderCompleteNotice" subject="OFBiz Demo - Your Order Is Complete #${orderId}" fromAddress="ofbiztest@yahoo.com"/>
>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_BACKORDER" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#BackorderNotice" subject="OFBiz Demo - Backorder Notification #${orderId}" fromAddress="ofbiztest@yahoo.com"/>
>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_CHANGE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderChangeNotice" subject="OFBiz Demo - Order Change Notification #${orderId}" fromAddress="ofbiztest@yahoo.com"/>
>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_PAYRETRY" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#PaymentRetryNotice" subject="OFBiz Demo - Order Payment Notification #${orderId}" fromAddress="ofbiztest@yahoo.com"/>
>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_SHIP_COMPLT" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#ShipmentCompleteNotice" subject="OFBiz Demo - Shipment Complete Notification #${orderId}" fromAddress="ofbiztest@yahoo.com"/>
>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_CONFIRM" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNotice" xslfoAttachScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNoticePdf" subject="OFBiz Demo - Order Confirmation #${orderId}" bccAddress="ofbiztesting@gmail.com" fromAddress="ofbiztesting@gmail.com"/>
>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderCompleteNotice" subject="OFBiz Demo - Your Order Is Complete #${orderId}" fromAddress="ofbiztesting@gmail.com"/>
>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_BACKORDER" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#BackorderNotice" subject="OFBiz Demo - Backorder Notification #${orderId}" fromAddress="ofbiztesting@gmail.com"/>
>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_CHANGE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderChangeNotice" subject="OFBiz Demo - Order Change Notification #${orderId}" fromAddress="ofbiztesting@gmail.com"/>
>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_PAYRETRY" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#PaymentRetryNotice" subject="OFBiz Demo - Order Payment Notification #${orderId}" fromAddress="ofbiztesting@gmail.com"/>
>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_SHIP_COMPLT" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#ShipmentCompleteNotice" subject="OFBiz Demo - Shipment Complete Notification #${orderId}" fromAddress="ofbiztesting@gmail.com"/>
>>
>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_RTN_ACCEPT" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnAccept" subject="OFBiz Demo - Return Accepted #${returnHeader.returnId}" fromAddress="ofbiztest@yahoo.com"/>
>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_RTN_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnComplete" subject="OFBiz Demo - Return Completed #${returnHeader.returnId}" fromAddress="ofbiztest@yahoo.com"/>
>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_RTN_CANCEL" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnCancel" subject="OFBiz Demo - Return Cancelled #${returnHeader.returnId}" fromAddress="ofbiztest@yahoo.com"/>
>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_RTN_ACCEPT" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnAccept" subject="OFBiz Demo - Return Accepted #${returnHeader.returnId}" fromAddress="ofbiztesting@gmail.com"/>
>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_RTN_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnComplete" subject="OFBiz Demo - Return Completed #${returnHeader.returnId}" fromAddress="ofbiztesting@gmail.com"/>
>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_RTN_CANCEL" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnCancel" subject="OFBiz Demo - Return Cancelled #${returnHeader.returnId}" fromAddress="ofbiztesting@gmail.com"/>
>>
>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_GC_PURCHASE" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardPurchase" fromAddress="ofbiztest@yahoo.com" subject="A Gift From ${senderName}!"/>
>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_GC_RELOAD" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardReload" fromAddress="ofbiztest@yahoo.com" subject="Gift Card Reload Results"/>
>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_GC_PURCHASE" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardPurchase" fromAddress="ofbiztesting@gmail.com" subject="A Gift From ${senderName}!"/>
>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_GC_RELOAD" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardReload" fromAddress="ofbiztesting@gmail.com" subject="Gift Card Reload Results"/>
>>
>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_TELL_FRIEND" bodyScreenLocation="component://ecommerce/widget/EmailProductScreens.xml#TellFriend" subject="${sendFrom} has sent you a link!" fromAddress="ofbiztest@yahoo.com"/>
>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_TELL_FRIEND" bodyScreenLocation="component://ecommerce/widget/EmailProductScreens.xml#TellFriend" subject="${sendFrom} has sent you a link!" fromAddress="ofbiztesting@gmail.com"/>
>>
>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_PWD_RETRIEVE" bodyScreenLocation="component://securityext/widget/EmailSecurityScreens.xml#PasswordEmail" subject="OFBiz Demo - Password Reminder (${userLogin.userLoginId})" fromAddress="ofbiztest@yahoo.com"/>
>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_PWD_RETRIEVE" bodyScreenLocation="component://securityext/widget/EmailSecurityScreens.xml#PasswordEmail" subject="OFBiz Demo - Password Reminder (${userLogin.userLoginId})" fromAddress="ofbiztesting@gmail.com"/>
>>
>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_QUO_CONFIRM" bodyScreenLocation="component://order/widget/ordermgr/QuoteScreens.xml#ViewQuoteSimple" xslfoAttachScreenLocation="component://order/widget/ordermgr/QuoteScreens.xml#QuoteReport" subject="OFBiz Demo - Quote Confirmation #${quoteId}" bccAddress="ofbiztest@yahoo.com" fromAddress="ofbiztest@yahoo.com"/>
>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_QUO_CONFIRM" bodyScreenLocation="component://order/widget/ordermgr/QuoteScreens.xml#ViewQuoteSimple" xslfoAttachScreenLocation="component://order/widget/ordermgr/QuoteScreens.xml#QuoteReport" subject="OFBiz Demo - Quote Confirmation #${quoteId}" bccAddress="ofbiztesting@gmail.com" fromAddress="ofbiztesting@gmail.com"/>
>>
>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PARTY_REGIS_CONFIRM" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#CreatePartyNotification" subject="New Account Created" bccAddress="ofbiztest@yahoo.com" fromAddress="ofbiztest@yahoo.com"/>
>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_CUST_REGISTER" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#CreatePartyNotification" subject="New Account Created" bccAddress="ofbiztest@yahoo.com" fromAddress="ofbiztest@yahoo.com"/>
>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="UPD_PRSNL_INF_CNFRM" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#ChangePersonalInfoNotification" subject="Personal Information Updated" bccAddress="ofbiztest@yahoo.com" fromAddress="ofbiztest@yahoo.com"/>
>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_EMAIL_VERIFY" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#VerifyEmailAddressNotification" subject="Email Address Verification" bccAddress="ofbiztest@yahoo.com" fromAddress="ofbiztest@yahoo.com"/>
>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PARTY_REGIS_CONFIRM" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#CreatePartyNotification" subject="New Account Created" bccAddress="ofbiztesting@gmail.com" fromAddress="ofbiztesting@gmail.com"/>
>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_CUST_REGISTER" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#CreatePartyNotification" subject="New Account Created" bccAddress="ofbiztesting@gmail.com" fromAddress="ofbiztesting@gmail.com"/>
>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="UPD_PRSNL_INF_CNFRM" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#ChangePersonalInfoNotification" subject="Personal Information Updated" bccAddress="ofbiztesting@gmail.com" fromAddress="ofbiztesting@gmail.com"/>
>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_EMAIL_VERIFY" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#VerifyEmailAddressNotification" subject="Email Address Verification" bccAddress="ofbiztesting@gmail.com" fromAddress="ofbiztesting@gmail.com"/>
>>
>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="CONT_NOTI_EMAIL" bodyScreenLocation="component://ecommerce/widget/EmailContactListScreens.xml#ContactUsEmailNotification" subject="Contact-us Information Notification" fromAddress="ofbiztest@yahoo.com" />
>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="CONT_NOTI_EMAIL" bodyScreenLocation="component://ecommerce/widget/EmailContactListScreens.xml#ContactUsEmailNotification" subject="Contact-us Information Notification" fromAddress="ofbiztesting@gmail.com" />
>>
>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="UNSUB_CONT_LIST_NOTI" bodyScreenLocation="component://ecommerce/widget/EmailContactListScreens.xml#ContactListUnsubscribeEmail" subject="Unsubscribe Contact List" fromAddress="ofbiztest@yahoo.com"/>
>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="UNSUB_CONT_LIST_NOTI" bodyScreenLocation="component://ecommerce/widget/EmailContactListScreens.xml#ContactListUnsubscribeEmail" subject="Unsubscribe Contact List" fromAddress="ofbiztesting@gmail.com"/>
>>
>>     <WebAnalyticsConfig productStoreId="9000" webAnalyticsTypeId="GOOGLE_ANALYTICS" webAnalyticsCode="123456" isEnabled="Y" description="This is code provided from google analytics" contentId="GOOGLE_ANA_CNT"/>
>>     <WebAnalyticsConfig productStoreId="9000" webAnalyticsTypeId="BING_ANALYTICS" webAnalyticsCode="123456" isEnabled="Y" description="This is code provided from bing analytics" contentId="BING_ANA_CNT"/>
>>
>> Modified: ofbiz/trunk/specialpurpose/ecommerce/data/DemoRentalProduct.xml
>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/DemoRentalProduct.xml?rev=938446&r1=938445&r2=938446&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/specialpurpose/ecommerce/data/DemoRentalProduct.xml (original)
>> +++ ofbiz/trunk/specialpurpose/ecommerce/data/DemoRentalProduct.xml Tue Apr 27 13:17:45 2010
>> @@ -45,22 +45,22 @@ headerLogo="/images/opentravelsystem_log
>>     <ProductStorePaymentSetting productStoreId="RentalStore" paymentMethodTypeId="EXT_PAYPAL" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService="" paymentCustomMethodId="" paymentGatewayConfigId="PAYPAL_CONFIG"/>
>>     <ProductStorePaymentSetting productStoreId="RentalStore" paymentMethodTypeId="EXT_WORLDPAY" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService="" paymentCustomMethodId="" paymentGatewayConfigId="WORLDPAY_CONFIG"/>
>>
>> -    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_CONFIRM" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNotice" xslfoAttachScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNoticePdf" subject="OFBiz Demo - Order Confirmation #${orderId}" bccAddress="ofbiztest@yahoo.com" fromAddress="ofbiztest@yahoo.com"/>
>> -    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderCompleteNotice" subject="OFBiz Demo - Your Order Is Complete #${orderId}" fromAddress="ofbiztest@yahoo.com"/>
>> -    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_BACKORDER" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#BackorderNotice" subject="OFBiz Demo - Backorder Notification #${orderId}" fromAddress="ofbiztest@yahoo.com"/>
>> -    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_CHANGE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderChangeNotice" subject="OFBiz Demo - Order Change Notification #${orderId}" fromAddress="ofbiztest@yahoo.com"/>
>> -    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_PAYRETRY" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#PaymentRetryNotice" subject="OFBiz Demo - Order Payment Notification #${orderId}" fromAddress="ofbiztest@yahoo.com"/>
>> -
>> -    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_RTN_ACCEPT" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnAccept" subject="OFBiz Demo - Return Accepted #${returnHeader.returnId}" fromAddress="ofbiztest@yahoo.com"/>
>> -    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_RTN_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnComplete" subject="OFBiz Demo - Return Completed #${returnHeader.returnId}" fromAddress="ofbiztest@yahoo.com"/>
>> -    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_RTN_CANCEL" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnCancel" subject="OFBiz Demo - Return Cancelled #${returnHeader.returnId}" fromAddress="ofbiztest@yahoo.com"/>
>> +    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_CONFIRM" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNotice" xslfoAttachScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNoticePdf" subject="OFBiz Demo - Order Confirmation #${orderId}" bccAddress="ofbiztesting@gmail.com" fromAddress="ofbiztesting@gmail.com"/>
>> +    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderCompleteNotice" subject="OFBiz Demo - Your Order Is Complete #${orderId}" fromAddress="ofbiztesting@gmail.com"/>
>> +    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_BACKORDER" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#BackorderNotice" subject="OFBiz Demo - Backorder Notification #${orderId}" fromAddress="ofbiztesting@gmail.com"/>
>> +    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_CHANGE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderChangeNotice" subject="OFBiz Demo - Order Change Notification #${orderId}" fromAddress="ofbiztesting@gmail.com"/>
>> +    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_PAYRETRY" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#PaymentRetryNotice" subject="OFBiz Demo - Order Payment Notification #${orderId}" fromAddress="ofbiztesting@gmail.com"/>
>> +
>> +    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_RTN_ACCEPT" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnAccept" subject="OFBiz Demo - Return Accepted #${returnHeader.returnId}" fromAddress="ofbiztesting@gmail.com"/>
>> +    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_RTN_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnComplete" subject="OFBiz Demo - Return Completed #${returnHeader.returnId}" fromAddress="ofbiztesting@gmail.com"/>
>> +    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_RTN_CANCEL" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnCancel" subject="OFBiz Demo - Return Cancelled #${returnHeader.returnId}" fromAddress="ofbiztesting@gmail.com"/>
>>
>> -    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_GC_PURCHASE" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardPurchase" fromAddress="ofbiztest@yahoo.com" subject="A Gift From ${senderName}!"/>
>> -    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_GC_RELOAD" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardReload" fromAddress="ofbiztest@yahoo.com" subject="Gift Card Reload Results"/>
>> +    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_GC_PURCHASE" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardPurchase" fromAddress="ofbiztesting@gmail.com" subject="A Gift From ${senderName}!"/>
>> +    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_GC_RELOAD" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardReload" fromAddress="ofbiztesting@gmail.com" subject="Gift Card Reload Results"/>
>>
>> -    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_TELL_FRIEND" bodyScreenLocation="component://ecommerce/widget/EmailProductScreens.xml#TellFriend" subject="${sendFrom} has sent you a link!" fromAddress="ofbiztest@yahoo.com"/>
>> +    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_TELL_FRIEND" bodyScreenLocation="component://ecommerce/widget/EmailProductScreens.xml#TellFriend" subject="${sendFrom} has sent you a link!" fromAddress="ofbiztesting@gmail.com"/>
>>
>> -    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_PWD_RETRIEVE" bodyScreenLocation="component://securityext/widget/EmailSecurityScreens.xml#PasswordEmail" subject="OFBiz Demo - Password Reminder (${userLoginId})" fromAddress="ofbiztest@yahoo.com"/>
>> +    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_PWD_RETRIEVE" bodyScreenLocation="component://securityext/widget/EmailSecurityScreens.xml#PasswordEmail" subject="OFBiz Demo - Password Reminder (${userLoginId})" fromAddress="ofbiztesting@gmail.com"/>
>>
>>     <ProductStoreFacility productStoreId="RentalStore" facilityId="WebStoreWarehouse" fromDate="2001-05-13 12:00:00.0"/>
>>     <ProductStoreRole partyId="admin" roleTypeId="SALES_REP" productStoreId="RentalStore" fromDate="2001-05-13 12:00:00.0"/>
>>
>> Modified: ofbiz/trunk/specialpurpose/googlebase/data/DemoGoogleBaseData.xml
>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/data/DemoGoogleBaseData.xml?rev=938446&r1=938445&r2=938446&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/specialpurpose/googlebase/data/DemoGoogleBaseData.xml (original)
>> +++ ofbiz/trunk/specialpurpose/googlebase/data/DemoGoogleBaseData.xml Tue Apr 27 13:17:45 2010
>> @@ -20,5 +20,5 @@ under the License.
>>
>> <entity-engine-xml>
>>     <WebSite webSiteId="GOOGLEBASE" standardContentPrefix="http://demo.ofbiz.org" productStoreId="9000" />
>> -    <GoogleBaseConfig productStoreId="9000" developerKey="HKLh9khgVieditoO0b4JR2fnBT2yXp_ZAY8_yft3CFXhHIE1NvwkxQ1pZ4qyVEGh_FtRe5KtJPTKDorNP" authenticationUrl="https://www.google.com/accounts/ClientLogin" accountEmail="ofbiztest@yahoo.com" accountPassword="47ca69ebb4bdc9ae0adec130880165d2cc05db1a" postItemsUrl="http://www.google.com/base/feeds/items/batch" webSiteId="GOOGLEBASE"/>
>> +    <GoogleBaseConfig productStoreId="9000" developerKey="HKLh9khgVieditoO0b4JR2fnBT2yXp_ZAY8_yft3CFXhHIE1NvwkxQ1pZ4qyVEGh_FtRe5KtJPTKDorNP" authenticationUrl="https://www.google.com/accounts/ClientLogin" accountEmail="ofbiztesting@gmail.com" accountPassword="47ca69ebb4bdc9ae0adec130880165d2cc05db1a" postItemsUrl="http://www.google.com/base/feeds/items/batch" webSiteId="GOOGLEBASE"/>
>> </entity-engine-xml>
>> \ No newline at end of file
>>
>> Modified: ofbiz/trunk/specialpurpose/workflow/data/OrderProcessWorkflow.xml
>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/data/OrderProcessWorkflow.xml?rev=938446&r1=938445&r2=938446&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/specialpurpose/workflow/data/OrderProcessWorkflow.xml (original)
>> +++ ofbiz/trunk/specialpurpose/workflow/data/OrderProcessWorkflow.xml Tue Apr 27 13:17:45 2010
>> @@ -23,7 +23,7 @@ under the License.
>>     <WorkflowPackage packageId="org.ofbiz.order" packageVersion="20030730144901" packageName="" description="Demo Order Processing Workflow" specificationVersion="0.03" specificationId="XPDL" sourceVendorInfo="OFBiz.org" creationDateTime="2002-12-03 00:00:00.0" author="Andy Zeneski" publicationStatusId="WPS_UNDER_REVISION" graphConformanceEnumId="WGC_FULL_BLOCKED" priorityUomId="P" costUomId="USD" responsibleListId="10002" documentationUrl="None"/>
>>     <WorkflowProcess packageId="org.ofbiz.order" packageVersion="20030730144901" processId="ProcessOrder" processVersion="20030730144901" objectName="Processes incoming orders" objectPriority="5" description="Order Processing Workflow" creationDateTime="2002-12-01 12:00:00.0" author="OFBiz" publicationStatusId="WPS_UNDER_REVISION" timeLimit="12.0" validFromDate="2002-12-01 12:00:00.0" validToDate="2012-12-01 12:00:00.0" responsibleListId="10003" durationUomId="h" duration="3.0" waitingTime="2.0" defaultStartActivityId="receiveOrder" sourceReferenceField="orderId"/>
>>
>> -    <WorkflowDataField packageId="org.ofbiz.order" packageVersion="20030730144901" processId="ProcessOrder" processVersion="20030730144901" dataFieldId="adminEmailList" dataFieldName="adminEmailList" initialValue="ofbiztest@yahoo.com" dataTypeEnumId="WDT_STRING" isArray="N"/>
>> +    <WorkflowDataField packageId="org.ofbiz.order" packageVersion="20030730144901" processId="ProcessOrder" processVersion="20030730144901" dataFieldId="adminEmailList" dataFieldName="adminEmailList" initialValue="ofbiztesting@gmail.com" dataTypeEnumId="WDT_STRING" isArray="N"/>
>>     <WorkflowFormalParam packageId="org.ofbiz.order" packageVersion="20030730144901" processId="ProcessOrder" processVersion="20030730144901" applicationId="_NA_" formalParamId="orderId" indexNumber="1" modeEnumId="WPM_IN" description="The order number" dataTypeEnumId="WDT_STRING"/>
>>
>>     <WorkflowParticipant packageId="org.ofbiz.order" packageVersion="20030730144901" processId="_NA_" processVersion="_NA_" participantId="BUYER" participantName="Purchase Order Approval Role" description="Reviews and approves/rejects orders" participantTypeId="ROLE"/>
>>
>>
>
>

Re: svn commit: r938446 - in /ofbiz/trunk: applications/accounting/data/ applications/content/data/ applications/marketing/data/ applications/order/servicedef/ applications/party/data/ applications/party/script/org/ofbiz/party/test/ debian/ framework

Posted by Tim Ruppert <ti...@hotwaxmedia.com>.
Agreed - having actual accounts in there is really something to avoid.

Cheers,
Ruppert

On Apr 27, 2010, at 10:25 PM, Scott Gray wrote:

> The only thing that makes me uncomfortable about it is that partially complete implementations could accidentally send emails to the address and result in the people who are in control of the account perhaps knowing about implementations that are supposed to be private.  I don't doubt for a second that this wouldn't happen on a regular basis.
> 
> Regards
> Scott
> 
> On 28/04/2010, at 3:09 PM, Ashish Vijaywargiya wrote:
> 
>> Hello Scott,
>> 
>> I agree from you but I would prefer to have this gmail account
>> settings as it is because I(or someone else) can test mail fetching by
>> enabling only JavaMail container settings in ofbiz-containers.xml. One
>> more important thing I can't test anything sent on test@example.com
>> but can do on gmail.com.
>> 
>> For few days lets keep this settings as it is then if we see some
>> problems then we will change it in future.
>> Thanks for your comments!
>> 
>> --
>> Ashish
>> 
>> 
>> On Tue, Apr 27, 2010 at 6:58 PM, Scott Gray <sc...@hotwaxmedia.com> wrote:
>>> Personally I would prefer it if we used test@example.com
>>> The example.com domain exists exactly for this sort of thing and the emails don't bounce (I believe).
>>> 
>>> Regards
>>> Scott
>>> 
>>> HotWax Media
>>> http://www.hotwaxmedia.com
>>> 
>>> On 28/04/2010, at 1:17 AM, ashish@apache.org wrote:
>>> 
>>>> Author: ashish
>>>> Date: Tue Apr 27 13:17:45 2010
>>>> New Revision: 938446
>>>> 
>>>> URL: http://svn.apache.org/viewvc?rev=938446&view=rev
>>>> Log:
>>>> Changing email address ofbiztest@yahoo.com -> ofbiztesting@gmail.com - this was creating too much problem since long in development effort.
>>>> 
>>>> Following points were there in my mind before doing this change.
>>>> 
>>>> -- AFAIK ofbiztest@yahoo.com email doesn't exists.
>>>> -- Bounce email issue if you have enabled Javamail container. This drastically slow down your system performance.
>>>> -- Now anyone can use ofbiztesting@gmail.com account settings for Sendmail, Javamail container etc.
>>>> -- Send mail service triggered again and again with failure message on console if any of the email not found bccAddress inside ProductStoreEmailSettings entity. Again slow speed of your development machine.
>>>> -- Please let me know where to share the password of this account? Dev list?
>>>> 
>>>> Modified:
>>>>   ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml
>>>>   ofbiz/trunk/applications/content/data/UsersDemoData.xml
>>>>   ofbiz/trunk/applications/marketing/data/sfaDemoData.xml
>>>>   ofbiz/trunk/applications/order/servicedef/orderProcessXPDL.xml
>>>>   ofbiz/trunk/applications/party/data/PartyDemoData.xml
>>>>   ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyContactMechTests.xml
>>>>   ofbiz/trunk/debian/TODO
>>>>   ofbiz/trunk/debian/override-data.xslt
>>>>   ofbiz/trunk/framework/common/config/general.properties
>>>>   ofbiz/trunk/framework/common/script/org/ofbiz/common/email/EmailServices.xml
>>>>   ofbiz/trunk/specialpurpose/ebaystore/data/DemoEbayStoreData.xml
>>>>   ofbiz/trunk/specialpurpose/ecommerce/data/DemoMarketing.xml
>>>>   ofbiz/trunk/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml
>>>>   ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml
>>>>   ofbiz/trunk/specialpurpose/ecommerce/data/DemoRentalProduct.xml
>>>>   ofbiz/trunk/specialpurpose/googlebase/data/DemoGoogleBaseData.xml
>>>>   ofbiz/trunk/specialpurpose/workflow/data/OrderProcessWorkflow.xml
>>>> 
>>>> Modified: ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml
>>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml?rev=938446&r1=938445&r2=938446&view=diff
>>>> ==============================================================================
>>>> --- ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml (original)
>>>> +++ ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml Tue Apr 27 13:17:45 2010
>>>> @@ -28,7 +28,7 @@ under the License.
>>>>    <ContactMech contactMechId="9000" contactMechTypeId="POSTAL_ADDRESS"/>
>>>>    <PartyContactMech partyId="Company" contactMechId="9000" fromDate="2000-01-01 00:00:00.000" allowSolicitation="Y"/>
>>>>    <PostalAddress contactMechId="9000" toName="Company XYZ" address1="2003 Open Blvd" city="Open City" postalCode="999999" countryGeoId="USA" stateProvinceGeoId="CA" geoPointId="9000"/>
>>>> -    <ContactMech contactMechId="Company" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>>>> +    <ContactMech contactMechId="Company" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>>>    <PartyContactMech partyId="Company" contactMechId="Company" fromDate="2000-01-01 00:00:00.000" allowSolicitation="Y"/>
>>>>    <PartyContactMechPurpose contactMechPurposeTypeId="PRIMARY_EMAIL" partyId="Company" contactMechId="Company" fromDate="2003-01-01 00:00:00.000"/>
>>>>    <PartyContactMechPurpose partyId="Company" contactMechId="9000" contactMechPurposeTypeId="BILLING_LOCATION" fromDate="2000-01-01 00:00:00.000"/>
>>>> 
>>>> Modified: ofbiz/trunk/applications/content/data/UsersDemoData.xml
>>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/data/UsersDemoData.xml?rev=938446&r1=938445&r2=938446&view=diff
>>>> ==============================================================================
>>>> --- ofbiz/trunk/applications/content/data/UsersDemoData.xml (original)
>>>> +++ ofbiz/trunk/applications/content/data/UsersDemoData.xml Tue Apr 27 13:17:45 2010
>>>> @@ -47,19 +47,19 @@ under the License.
>>>>    <PartyRole partyId="BLOG_EDITOR" roleTypeId="CONTENT_PUBLISHER"/>
>>>>    <PartyRole partyId="BLOG_EDITOR" roleTypeId="_NA_"/>
>>>> 
>>>> -    <ContactMech contactMechId="ADMIN_CONTACT" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>>>> +    <ContactMech contactMechId="ADMIN_CONTACT" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>>>    <PartyContactMech partyId="BLOG_ADMIN" contactMechId="ADMIN_CONTACT" fromDate="2001-05-13 12:00:00.0"/>
>>>>    <PartyContactMechPurpose partyId="BLOG_ADMIN" contactMechId="ADMIN_CONTACT" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2001-05-13 12:00:00.0"/>
>>>> 
>>>> -    <ContactMech contactMechId="AUTHOR_CONTACT" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>>>> +    <ContactMech contactMechId="AUTHOR_CONTACT" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>>>    <PartyContactMech partyId="BLOG_AUTHOR" contactMechId="AUTHOR_CONTACT" fromDate="2001-05-13 12:00:00.0"/>
>>>>    <PartyContactMechPurpose partyId="BLOG_AUTHOR" contactMechId="AUTHOR_CONTACT" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2001-05-13 12:00:00.0"/>
>>>> 
>>>> -    <ContactMech contactMechId="EDITOR_CONTACT" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>>>> +    <ContactMech contactMechId="EDITOR_CONTACT" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>>>    <PartyContactMech partyId="BLOG_EDITOR" contactMechId="EDITOR_CONTACT" fromDate="2001-05-13 12:00:00.0"/>
>>>>    <PartyContactMechPurpose partyId="BLOG_EDITOR" contactMechId="EDITOR_CONTACT" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2001-05-13 12:00:00.0"/>
>>>> 
>>>> -    <ContactMech contactMechId="GUEST_CONTACT" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>>>> +    <ContactMech contactMechId="GUEST_CONTACT" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>>>    <PartyContactMech partyId="BLOG_GUEST" contactMechId="GUEST_CONTACT" fromDate="2001-05-13 12:00:00.0"/>
>>>>    <PartyContactMechPurpose partyId="BLOG_GUEST" contactMechId="GUEST_CONTACT" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2001-05-13 12:00:00.0"/>
>>>> </entity-engine-xml>
>>>> 
>>>> Modified: ofbiz/trunk/applications/marketing/data/sfaDemoData.xml
>>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/data/sfaDemoData.xml?rev=938446&r1=938445&r2=938446&view=diff
>>>> ==============================================================================
>>>> --- ofbiz/trunk/applications/marketing/data/sfaDemoData.xml (original)
>>>> +++ ofbiz/trunk/applications/marketing/data/sfaDemoData.xml Tue Apr 27 13:17:45 2010
>>>> @@ -26,7 +26,7 @@
>>>>    <PartyRole partyId="sfa100" roleTypeId="ACCOUNT"/>
>>>>    <ContactMech contactMechId="sfa100" contactMechTypeId="POSTAL_ADDRESS"/>
>>>>    <ContactMech contactMechId="sfa101" contactMechTypeId="TELECOM_NUMBER"/>
>>>> -    <ContactMech contactMechId="sfa102" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>>>> +    <ContactMech contactMechId="sfa102" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>>>    <PostalAddress contactMechId="sfa100" address1="151 Madison street." city="Edison" postalCode="32451" lastUpdatedStamp="2008-05-23 11:57:40.936" lastUpdatedTxStamp="2008-05-23 11:57:39.476" createdStamp="2008-05-23 11:57:40.936" createdTxStamp="2008-05-23 11:57:39.476"/>
>>>>    <TelecomNumber contactMechId="sfa101" countryCode="1" areaCode="33" contactNumber="12456" lastUpdatedStamp="2008-05-23 11:57:41.179" lastUpdatedTxStamp="2008-05-23 11:57:39.476" createdStamp="2008-05-23 11:57:41.179" createdTxStamp="2008-05-23 11:57:39.476"/>
>>>>    <PartyContactMech partyId="sfa100" contactMechId="sfa100" fromDate="2000-01-01 00:00:00.000"/>
>>>> 
>>>> Modified: ofbiz/trunk/applications/order/servicedef/orderProcessXPDL.xml
>>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/servicedef/orderProcessXPDL.xml?rev=938446&r1=938445&r2=938446&view=diff
>>>> ==============================================================================
>>>> --- ofbiz/trunk/applications/order/servicedef/orderProcessXPDL.xml (original)
>>>> +++ ofbiz/trunk/applications/order/servicedef/orderProcessXPDL.xml Tue Apr 27 13:17:45 2010
>>>> @@ -90,7 +90,7 @@ under the License.
>>>>                    <DataType>
>>>>                        <BasicType Type="STRING"/>
>>>>                    </DataType>
>>>> -                    <InitialValue>ofbiztest@yahoo.com</InitialValue>
>>>> +                    <InitialValue>ofbiztesting@gmail.com</InitialValue>
>>>>                </DataField>
>>>>            </DataFields>
>>>> 
>>>> 
>>>> Modified: ofbiz/trunk/applications/party/data/PartyDemoData.xml
>>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/data/PartyDemoData.xml?rev=938446&r1=938445&r2=938446&view=diff
>>>> ==============================================================================
>>>> --- ofbiz/trunk/applications/party/data/PartyDemoData.xml (original)
>>>> +++ ofbiz/trunk/applications/party/data/PartyDemoData.xml Tue Apr 27 13:17:45 2010
>>>> @@ -29,7 +29,7 @@
>>>>    <PartyRole partyId="DemoEmployee" roleTypeId="EMAIL_ADMIN"/>
>>>>    <PartyRelationship partyIdFrom="DemoEmployee" roleTypeIdFrom="EMAIL_ADMIN" partyIdTo="Company" roleTypeIdTo="_NA_" fromDate="2000-01-01 00:00:00"/>
>>>> 
>>>> -    <ContactMech contactMechId="admin" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>>>> +    <ContactMech contactMechId="admin" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>>>    <PartyContactMech partyId="admin" contactMechId="admin" fromDate="2003-01-01 00:00:00.0" allowSolicitation="Y"/>
>>>>    <PartyContactMechPurpose contactMechPurposeTypeId="PRIMARY_EMAIL" partyId="admin" contactMechId="admin" fromDate="2003-01-01 00:00:00.0"/>
>>>> 
>>>> @@ -40,10 +40,10 @@
>>>>    <PartyIdentification partyId="DemoSupplier" partyIdentificationTypeId="SIRET" idValue="1234 5678 90123"/>
>>>> 
>>>>    <!-- email from an unknown party -->
>>>> -    <CommunicationEvent communicationEventId="9000" communicationEventTypeId="EMAIL_COMMUNICATION" statusId="COM_UNKNOWN_PARTY" contactMechTypeId="EMAIL_ADDRESS" contactMechIdTo="admin" roleTypeIdFrom="_NA_" roleTypeIdTo="_NA_" partyIdTo="admin" entryDate="2008-07-28 13:55:55.827" datetimeStarted="2008-07-28 13:55:19.0" subject="Why i would use the OFBiz system" contentMimeTypeId="text/plain" content="Every time i think of you, only you...you are always on my mind......." note="Sent from: my@email.com; Sent Name from: Jo Easy User; Sent to: ofbiztest@yahoo.com; Delivered-To: ofbiztest@yahoo.com; " fromString="mailinglist@antwebsystems.com" toString="ofbiztest@yahoo.com"/>
>>>> +    <CommunicationEvent communicationEventId="9000" communicationEventTypeId="EMAIL_COMMUNICATION" statusId="COM_UNKNOWN_PARTY" contactMechTypeId="EMAIL_ADDRESS" contactMechIdTo="admin" roleTypeIdFrom="_NA_" roleTypeIdTo="_NA_" partyIdTo="admin" entryDate="2008-07-28 13:55:55.827" datetimeStarted="2008-07-28 13:55:19.0" subject="Why i would use the OFBiz system" contentMimeTypeId="text/plain" content="Every time i think of you, only you...you are always on my mind......." note="Sent from: my@email.com; Sent Name from: Jo Easy User; Sent to: ofbiztesting@gmail.com; Delivered-To: ofbiztesting@gmail.com; " fromString="mailinglist@antwebsystems.com" toString="ofbiztesting@gmail.com"/>
>>>>    <PartyRole partyId="admin" roleTypeId="ADDRESSEE"/>
>>>>    <CommunicationEventRole communicationEventId="9000" partyId="admin" roleTypeId="ADDRESSEE" contactMechId="admin" statusId="COM_ROLE_CREATED"/>
>>>> 
>>>>    <!-- new registration notification -->
>>>> -    <EmailTemplateSetting emailTemplateSettingId="PARTY_REGISTER" bodyScreenLocation="component://party/widget/partymgr/PartyScreens.xml#CreateUserNotification" subject="New Account Created" bccAddress="ofbiztest@yahoo.com" fromAddress="ofbiztest@yahoo.com"/>
>>>> +    <EmailTemplateSetting emailTemplateSettingId="PARTY_REGISTER" bodyScreenLocation="component://party/widget/partymgr/PartyScreens.xml#CreateUserNotification" subject="New Account Created" bccAddress="ofbiztesting@gmail.com" fromAddress="ofbiztesting@gmail.com"/>
>>>> </entity-engine-xml>
>>>> 
>>>> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyContactMechTests.xml
>>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyContactMechTests.xml?rev=938446&r1=938445&r2=938446&view=diff
>>>> ==============================================================================
>>>> --- ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyContactMechTests.xml (original)
>>>> +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyContactMechTests.xml Tue Apr 27 13:17:45 2010
>>>> @@ -26,7 +26,7 @@ under the License.
>>>>        <set field="contactMechTypeId" value="EMAIL_ADDRESS"/>
>>>>        <!-- first try with just updating without changing the email address -->
>>>>        <set field="serviceCtx.partyId" from-field="partyId"/>
>>>> -        <set field="serviceCtx.emailAddress" value="ofbiztest@yahoo.com"/>
>>>> +        <set field="serviceCtx.emailAddress" value="ofbiztesting@gmail.com"/>
>>>>        <set field="serviceCtx.contactMechId" value="9026"/>
>>>>        <entity-one entity-name="UserLogin" value-field="userLogin">
>>>>            <field-map field-name="userLoginId" value="system"/>
>>>> 
>>>> Modified: ofbiz/trunk/debian/TODO
>>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/debian/TODO?rev=938446&r1=938445&r2=938446&view=diff
>>>> ==============================================================================
>>>> --- ofbiz/trunk/debian/TODO (original)
>>>> +++ ofbiz/trunk/debian/TODO Tue Apr 27 13:17:45 2010
>>>> @@ -19,7 +19,7 @@
>>>> * debian/copyright
>>>> - Prompt for:
>>>>  - ofbiz admin password(s)
>>>> -  - default email(ofbiztest@yahoo.com)
>>>> +  - default email(ofbiztesting@gmail.com)
>>>>  - install of demo or just seed data
>>>> * Auto-generate admin key/port
>>>> * Move demo data into separate package?
>>>> 
>>>> Modified: ofbiz/trunk/debian/override-data.xslt
>>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/debian/override-data.xslt?rev=938446&r1=938445&r2=938446&view=diff
>>>> ==============================================================================
>>>> --- ofbiz/trunk/debian/override-data.xslt (original)
>>>> +++ ofbiz/trunk/debian/override-data.xslt Tue Apr 27 13:17:45 2010
>>>> @@ -108,13 +108,13 @@ under the License.
>>>> 
>>>> <xsl:template mode="data" match="
>>>>  ProductStoreEmailSetting[
>>>> -   @bccAddress='ofbiztest@yahoo.com' or
>>>> -   @fromAddress='ofbiztest@yahoo.com']|ContactList[
>>>> -   @verifyEmailFrom='ofbiztest@yahoo.com'
>>>> +   @bccAddress='ofbiztesting@gmail.com' or
>>>> +   @fromAddress='ofbiztesting@gmail.com']|ContactList[
>>>> +   @verifyEmailFrom='ofbiztesting@gmail.com'
>>>>  ]|ContactMech[
>>>> -   @infoString='ofbiztest@yahoo.com'
>>>> +   @infoString='ofbiztesting@gmail.com'
>>>>  ]|WorkflowDataField[
>>>> -   @initialValue='ofbiztest@yahoo.com'
>>>> +   @initialValue='ofbiztesting@gmail.com'
>>>>  ]|UserLogin[
>>>>   @currentPassword='47ca69ebb4bdc9ae0adec130880165d2cc05db1a'
>>>>  ]">
>>>> @@ -126,7 +126,7 @@ under the License.
>>>> <xsl:template mode="match" match="ProductStoreEmailSetting/@bccAddress|ProductStoreEmailSetting/@fromAddress|ProductStoreEmailSetting/@verifyEmailFrom|ContactMech/@infoString|ContactList/@verifyEmailFrom|WorkflowDataField/@initialValue">
>>>>  <xsl:attribute name="{name()}">
>>>>   <xsl:choose>
>>>> -    <xsl:when test=". = 'ofbiztest@yahoo.com'"><xsl:value-of select="$fromemail"/></xsl:when>
>>>> +    <xsl:when test=". = 'ofbiztesting@gmail.com'"><xsl:value-of select="$fromemail"/></xsl:when>
>>>>    <xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
>>>>   </xsl:choose>
>>>>  </xsl:attribute>
>>>> 
>>>> Modified: ofbiz/trunk/framework/common/config/general.properties
>>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/general.properties?rev=938446&r1=938445&r2=938446&view=diff
>>>> ==============================================================================
>>>> --- ofbiz/trunk/framework/common/config/general.properties (original)
>>>> +++ ofbiz/trunk/framework/common/config/general.properties Tue Apr 27 13:17:45 2010
>>>> @@ -64,7 +64,7 @@ partner.trackingCodeId.default=
>>>> usps.address.match=(^.*?p[\\. ]*o[\\. ]*box.*$)|(^.*?post.*?office.*?box.*$)|((^|(^.*? ))r[\\. ]*r[\\. ]*(( +)|([0-9#]+)).*$)|(^.*?rural.*?route.*$)
>>>> 
>>>> # -- general default 'fromEmailAddress' can be overridden in: EmailTemplateSetting
>>>> -defaultFromEmailAddress=ofbiztest@yahoo.com
>>>> +defaultFromEmailAddress=ofbiztesting@gmail.com
>>>> 
>>>> # -- The default domainname used in the notification emails links
>>>> # as 'baseUrl' and 'baseSecureUrl' are set in the url.properties file.
>>>> 
>>>> Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/email/EmailServices.xml
>>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/email/EmailServices.xml?rev=938446&r1=938445&r2=938446&view=diff
>>>> ==============================================================================
>>>> --- ofbiz/trunk/framework/common/script/org/ofbiz/common/email/EmailServices.xml (original)
>>>> +++ ofbiz/trunk/framework/common/script/org/ofbiz/common/email/EmailServices.xml Tue Apr 27 13:17:45 2010
>>>> @@ -50,7 +50,7 @@ under the License.
>>>>            <if-not-empty field="emailTemplateSetting.fromAddress">
>>>>                <set field="emailParams.sendFrom" from-field="emailTemplateSetting.fromAddress"/>
>>>>                <else>
>>>> -                    <property-to-field resource="general" property="defaultFromEmailAddress" field="emailParams.sendFrom" default="ofbiztest@yahoo.com"/>
>>>> +                    <property-to-field resource="general" property="defaultFromEmailAddress" field="emailParams.sendFrom" default="ofbiztesting@gmail.com"/>
>>>>                </else>
>>>>            </if-not-empty>
>>>>            <set field="emailParams.sendCc" from-field="emailTemplateSetting.ccAddress"/>
>>>> 
>>>> Modified: ofbiz/trunk/specialpurpose/ebaystore/data/DemoEbayStoreData.xml
>>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/data/DemoEbayStoreData.xml?rev=938446&r1=938445&r2=938446&view=diff
>>>> ==============================================================================
>>>> --- ofbiz/trunk/specialpurpose/ebaystore/data/DemoEbayStoreData.xml (original)
>>>> +++ ofbiz/trunk/specialpurpose/ebaystore/data/DemoEbayStoreData.xml Tue Apr 27 13:17:45 2010
>>>> @@ -92,9 +92,9 @@
>>>>    <Content contentId="EBAY_ITEM_DISPATCH" contentTypeId="DOCUMENT" dataResourceId="EBAY_ITEM_DISPATCH" ownerContentId="EBAY_ITEM_DISPATCH" statusId="CTNT_IN_PROGRESS"/>
>>>>    <ContentRole contentId="EBAY_ITEM_DISPATCH" partyId="DemoEbayAccount" roleTypeId="OWNER" fromDate="2010-01-01 00:00:00.000"/>
>>>> 
>>>> -    <ProductStoreEmailSetting productStoreId="90100" emailType="EBAY_WIN_BUYER_NOTI" bccAddress="ofbiztest@yahoo.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#WinnigBuyerNotification" fromAddress="ofbiztest@yahoo.com" subject="OFBiz Demo - Winnig Buyer Notification #${buyerUserId}" xslfoAttachScreenLocation=""/>
>>>> -    <ProductStoreEmailSetting productStoreId="90100" emailType="EBAY_PAY_RECIEVED" bccAddress="ofbiztest@yahoo.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#PaymentRecieved" fromAddress="ofbiztest@yahoo.com" subject="OFBiz Demo - PaymentRecieved #${buyerUserId}" xslfoAttachScreenLocation=""/>
>>>> -    <ProductStoreEmailSetting productStoreId="90100" emailType="EBAY_FEEBACK_REMIN" bccAddress="ofbiztest@yahoo.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#FeedbackReminder" fromAddress="ofbiztest@yahoo.com" subject="OFBiz Demo - Feedback Reminder #${buyerUserId}" xslfoAttachScreenLocation=""/>
>>>> -    <ProductStoreEmailSetting productStoreId="90100" emailType="EBAY_ITEM_DISPATCH" bccAddress="ofbiztest@yahoo.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#EbayEmailTemplate" fromAddress="ofbiztest@yahoo.com" subject="OFBiz Demo - Item Dispatched Notification #${buyerUserId}" xslfoAttachScreenLocation=""/>
>>>> +    <ProductStoreEmailSetting productStoreId="90100" emailType="EBAY_WIN_BUYER_NOTI" bccAddress="ofbiztesting@gmail.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#WinnigBuyerNotification" fromAddress="ofbiztesting@gmail.com" subject="OFBiz Demo - Winnig Buyer Notification #${buyerUserId}" xslfoAttachScreenLocation=""/>
>>>> +    <ProductStoreEmailSetting productStoreId="90100" emailType="EBAY_PAY_RECIEVED" bccAddress="ofbiztesting@gmail.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#PaymentRecieved" fromAddress="ofbiztesting@gmail.com" subject="OFBiz Demo - PaymentRecieved #${buyerUserId}" xslfoAttachScreenLocation=""/>
>>>> +    <ProductStoreEmailSetting productStoreId="90100" emailType="EBAY_FEEBACK_REMIN" bccAddress="ofbiztesting@gmail.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#FeedbackReminder" fromAddress="ofbiztesting@gmail.com" subject="OFBiz Demo - Feedback Reminder #${buyerUserId}" xslfoAttachScreenLocation=""/>
>>>> +    <ProductStoreEmailSetting productStoreId="90100" emailType="EBAY_ITEM_DISPATCH" bccAddress="ofbiztesting@gmail.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#EbayEmailTemplate" fromAddress="ofbiztesting@gmail.com" subject="OFBiz Demo - Item Dispatched Notification #${buyerUserId}" xslfoAttachScreenLocation=""/>
>>>> 
>>>> </entity-engine-xml>
>>>> 
>>>> Modified: ofbiz/trunk/specialpurpose/ecommerce/data/DemoMarketing.xml
>>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/DemoMarketing.xml?rev=938446&r1=938445&r2=938446&view=diff
>>>> ==============================================================================
>>>> --- ofbiz/trunk/specialpurpose/ecommerce/data/DemoMarketing.xml (original)
>>>> +++ ofbiz/trunk/specialpurpose/ecommerce/data/DemoMarketing.xml Tue Apr 27 13:17:45 2010
>>>> @@ -23,11 +23,11 @@ under the License.
>>>> 
>>>>    <ContactList contactListId="9000" contactListTypeId="ANNOUNCEMENT" contactMechTypeId="EMAIL_ADDRESS" marketingCampaignId="9000"
>>>>        contactListName="New Product Announcements" description="New Product Announcements Mailing List (email)" comments="" isPublic="Y" ownerPartyId="Company"
>>>> -        verifyEmailFrom="ofbiztest@yahoo.com" verifyEmailScreen="component://ecommerce/widget/EmailContactListScreens.xml#ContactListVerifyEmail"
>>>> +        verifyEmailFrom="ofbiztesting@gmail.com" verifyEmailScreen="component://ecommerce/widget/EmailContactListScreens.xml#ContactListVerifyEmail"
>>>>        verifyEmailSubject="Subscription Verify Email" verifyEmailWebSiteId="WebStore"/>
>>>>    <ContactList contactListId="9010" contactListTypeId="NEWSLETTER" contactMechTypeId="EMAIL_ADDRESS" marketingCampaignId="9000"
>>>>        contactListName="Product Tips Newsletter" description="Product Tips Newsletter Mailing List (email)" comments="" isPublic="Y" ownerPartyId="Company"
>>>> -        verifyEmailFrom="ofbiztest@yahoo.com" verifyEmailScreen="component://ecommerce/widget/EmailContactListScreens.xml#ContactListVerifyEmail"
>>>> +        verifyEmailFrom="ofbiztesting@gmail.com" verifyEmailScreen="component://ecommerce/widget/EmailContactListScreens.xml#ContactListVerifyEmail"
>>>>        verifyEmailSubject="Subscription Verify Email" verifyEmailWebSiteId="WebStore"/>
>>>> 
>>>>    <ContactListParty contactListId="9000" partyId="DemoCustCompany" preferredContactMechId="9021" statusId="CLPT_ACCEPTED" fromDate="2001-05-13 00:00:00"/>
>>>> 
>>>> Modified: ofbiz/trunk/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml
>>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml?rev=938446&r1=938445&r2=938446&view=diff
>>>> ==============================================================================
>>>> --- ofbiz/trunk/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml (original)
>>>> +++ ofbiz/trunk/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml Tue Apr 27 13:17:45 2010
>>>> @@ -78,7 +78,7 @@ under the License.
>>>>    <TelecomNumber contactMechId="9020" areaCode="801" contactNumber="555-5555"/>
>>>>    <PartyContactMech partyId="DemoCustCompany" contactMechId="9020" fromDate="2001-05-13 00:00:00.000" allowSolicitation="Y"/>
>>>>    <PartyContactMechPurpose partyId="DemoCustCompany" contactMechId="9020" contactMechPurposeTypeId="PHONE_WORK" fromDate="2001-05-13 00:00:00.000"/>
>>>> -    <ContactMech contactMechId="9021" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>>>> +    <ContactMech contactMechId="9021" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>>>    <PartyContactMech partyId="DemoCustCompany" contactMechId="9021" fromDate="2001-05-13 00:00:00.000" allowSolicitation="Y"/>
>>>>    <PartyContactMechPurpose partyId="DemoCustCompany" contactMechId="9021" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2001-05-13 00:00:00.000"/>
>>>> 
>>>> @@ -104,7 +104,7 @@ under the License.
>>>>    <TelecomNumber contactMechId="9022" areaCode="801" contactNumber="555-5555"/>
>>>>    <PartyContactMech partyId="DemoCustAgent" contactMechId="9022" fromDate="2001-05-13 00:00:00.000" allowSolicitation="Y"/>
>>>>    <PartyContactMechPurpose partyId="DemoCustAgent" contactMechId="9022" contactMechPurposeTypeId="PHONE_WORK" fromDate="2001-05-13 00:00:00.000"/>
>>>> -    <ContactMech contactMechId="9023" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>>>> +    <ContactMech contactMechId="9023" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>>>    <PartyContactMech partyId="DemoCustAgent" contactMechId="9023" fromDate="2001-05-13 00:00:00.000" allowSolicitation="Y"/>
>>>>    <PartyContactMechPurpose partyId="DemoCustAgent" contactMechId="9023" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2001-05-13 00:00:00.000"/>
>>>> 
>>>> @@ -139,7 +139,7 @@ under the License.
>>>>    <PartyContactMechPurpose partyId="DemoCustomer" contactMechId="9025" contactMechPurposeTypeId="PHONE_HOME" fromDate="2001-05-13 00:00:00.000"/>
>>>>    <PartyContactMechPurpose partyId="DemoCustomer" contactMechId="9025" contactMechPurposeTypeId="PHONE_SHIPPING" fromDate="2001-05-13 00:00:00.000"/>
>>>>    <PartyContactMechPurpose partyId="DemoCustomer" contactMechId="9027" contactMechPurposeTypeId="PHONE_BILLING" fromDate="2001-05-13 00:00:00.000"/>
>>>> -    <ContactMech contactMechId="9026" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>>>> +    <ContactMech contactMechId="9026" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>>>    <PartyContactMech partyId="DemoCustomer" contactMechId="9026" fromDate="2001-05-13 00:00:00.000" allowSolicitation="Y"/>
>>>>    <PartyContactMechPurpose partyId="DemoCustomer" contactMechId="9026" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2001-05-13 00:00:00.000"/>
>>>> 
>>>> @@ -165,7 +165,7 @@ under the License.
>>>>    <PartyContactMechPurpose partyId="EuroCustomer" contactMechId="EUROCUSTOMER" contactMechPurposeTypeId="BILLING_LOCATION" fromDate="2001-05-13 00:00:00.000"/>
>>>>    <PartyContactMechPurpose partyId="EuroCustomer" contactMechId="EUROCUSTOMER" contactMechPurposeTypeId="SHIPPING_LOCATION" fromDate="2001-05-13 00:00:00.000"/>
>>>>    <PartyContactMechPurpose partyId="EuroCustomer" contactMechId="EUROCUSTOMER" contactMechPurposeTypeId="GENERAL_LOCATION" fromDate="2001-05-13 00:00:00.000"/>
>>>> -    <ContactMech contactMechId="EURO01" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>>>> +    <ContactMech contactMechId="EURO01" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>>>    <PartyContactMech partyId="EuroCustomer" contactMechId="EURO01" fromDate="2001-05-13 00:00:00.000" allowSolicitation="Y"/>
>>>>    <PartyContactMechPurpose partyId="EuroCustomer" contactMechId="EURO01" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2001-05-13 00:00:00.000"/>
>>>> 
>>>> @@ -191,7 +191,7 @@ under the License.
>>>>    <PartyContactMechPurpose partyId="FrenchCustomer" contactMechId="FRENCHCUSTOMER" contactMechPurposeTypeId="BILLING_LOCATION" fromDate="2009-01-09 00:00:00.000"/>
>>>>    <PartyContactMechPurpose partyId="FrenchCustomer" contactMechId="FRENCHCUSTOMER" contactMechPurposeTypeId="SHIPPING_LOCATION" fromDate="2009-01-09 00:00:00.000"/>
>>>>    <PartyContactMechPurpose partyId="FrenchCustomer" contactMechId="FRENCHCUSTOMER" contactMechPurposeTypeId="GENERAL_LOCATION" fromDate="2009-01-09 00:00:00.000"/>
>>>> -    <ContactMech contactMechId="FRA01" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>>>> +    <ContactMech contactMechId="FRA01" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>>>    <PartyContactMech partyId="FrenchCustomer" contactMechId="FRA01" fromDate="2009-01-09 00:00:00.000" allowSolicitation="Y"/>
>>>>    <PartyContactMechPurpose partyId="FrenchCustomer" contactMechId="FRA01" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2009-01-09 00:00:00.000"/>
>>>> 
>>>> 
>>>> Modified: ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml
>>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml?rev=938446&r1=938445&r2=938446&view=diff
>>>> ==============================================================================
>>>> --- ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml (original)
>>>> +++ ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml Tue Apr 27 13:17:45 2010
>>>> @@ -23,7 +23,7 @@ under the License.
>>>> 
>>>>    <ContactMech contactMechId="9200" contactMechTypeId="POSTAL_ADDRESS"/>
>>>>    <ContactMech contactMechId="9201" contactMechTypeId="TELECOM_NUMBER"/>
>>>> -    <ContactMech contactMechId="9202" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>>>> +    <ContactMech contactMechId="9202" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>>>    <PostalAddress contactMechId="9200" toName="Company XYZ" attnName="ZJAA" address1="2003 Open Blvd" city="Orem" postalCode="84058" countryGeoId="USA" stateProvinceGeoId="UT" geoPointId="9000"/>
>>>>    <TelecomNumber contactMechId="9201" areaCode="801" contactNumber="555-5555"/>
>>>>    <FacilityContactMech facilityId="WebStoreWarehouse" contactMechId="9200" fromDate="2001-05-13 12:00:00.0"/>
>>>> @@ -97,34 +97,34 @@ under the License.
>>>>    <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="EXT_COD" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService="" paymentCustomMethodId=""/>
>>>>    <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="EXT_BILLACT" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService="" paymentCustomMethodId=""/>
>>>> 
>>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_CONFIRM" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNotice" xslfoAttachScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNoticePdf" subject="OFBiz Demo - Order Confirmation #${orderId}" bccAddress="ofbiztest@yahoo.com" fromAddress="ofbiztest@yahoo.com"/>
>>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderCompleteNotice" subject="OFBiz Demo - Your Order Is Complete #${orderId}" fromAddress="ofbiztest@yahoo.com"/>
>>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_BACKORDER" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#BackorderNotice" subject="OFBiz Demo - Backorder Notification #${orderId}" fromAddress="ofbiztest@yahoo.com"/>
>>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_CHANGE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderChangeNotice" subject="OFBiz Demo - Order Change Notification #${orderId}" fromAddress="ofbiztest@yahoo.com"/>
>>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_PAYRETRY" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#PaymentRetryNotice" subject="OFBiz Demo - Order Payment Notification #${orderId}" fromAddress="ofbiztest@yahoo.com"/>
>>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_SHIP_COMPLT" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#ShipmentCompleteNotice" subject="OFBiz Demo - Shipment Complete Notification #${orderId}" fromAddress="ofbiztest@yahoo.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_CONFIRM" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNotice" xslfoAttachScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNoticePdf" subject="OFBiz Demo - Order Confirmation #${orderId}" bccAddress="ofbiztesting@gmail.com" fromAddress="ofbiztesting@gmail.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderCompleteNotice" subject="OFBiz Demo - Your Order Is Complete #${orderId}" fromAddress="ofbiztesting@gmail.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_BACKORDER" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#BackorderNotice" subject="OFBiz Demo - Backorder Notification #${orderId}" fromAddress="ofbiztesting@gmail.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_CHANGE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderChangeNotice" subject="OFBiz Demo - Order Change Notification #${orderId}" fromAddress="ofbiztesting@gmail.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_PAYRETRY" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#PaymentRetryNotice" subject="OFBiz Demo - Order Payment Notification #${orderId}" fromAddress="ofbiztesting@gmail.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_SHIP_COMPLT" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#ShipmentCompleteNotice" subject="OFBiz Demo - Shipment Complete Notification #${orderId}" fromAddress="ofbiztesting@gmail.com"/>
>>>> 
>>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_RTN_ACCEPT" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnAccept" subject="OFBiz Demo - Return Accepted #${returnHeader.returnId}" fromAddress="ofbiztest@yahoo.com"/>
>>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_RTN_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnComplete" subject="OFBiz Demo - Return Completed #${returnHeader.returnId}" fromAddress="ofbiztest@yahoo.com"/>
>>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_RTN_CANCEL" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnCancel" subject="OFBiz Demo - Return Cancelled #${returnHeader.returnId}" fromAddress="ofbiztest@yahoo.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_RTN_ACCEPT" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnAccept" subject="OFBiz Demo - Return Accepted #${returnHeader.returnId}" fromAddress="ofbiztesting@gmail.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_RTN_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnComplete" subject="OFBiz Demo - Return Completed #${returnHeader.returnId}" fromAddress="ofbiztesting@gmail.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_RTN_CANCEL" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnCancel" subject="OFBiz Demo - Return Cancelled #${returnHeader.returnId}" fromAddress="ofbiztesting@gmail.com"/>
>>>> 
>>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_GC_PURCHASE" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardPurchase" fromAddress="ofbiztest@yahoo.com" subject="A Gift From ${senderName}!"/>
>>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_GC_RELOAD" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardReload" fromAddress="ofbiztest@yahoo.com" subject="Gift Card Reload Results"/>
>>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_GC_PURCHASE" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardPurchase" fromAddress="ofbiztesting@gmail.com" subject="A Gift From ${senderName}!"/>
>>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_GC_RELOAD" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardReload" fromAddress="ofbiztesting@gmail.com" subject="Gift Card Reload Results"/>
>>>> 
>>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_TELL_FRIEND" bodyScreenLocation="component://ecommerce/widget/EmailProductScreens.xml#TellFriend" subject="${sendFrom} has sent you a link!" fromAddress="ofbiztest@yahoo.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_TELL_FRIEND" bodyScreenLocation="component://ecommerce/widget/EmailProductScreens.xml#TellFriend" subject="${sendFrom} has sent you a link!" fromAddress="ofbiztesting@gmail.com"/>
>>>> 
>>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_PWD_RETRIEVE" bodyScreenLocation="component://securityext/widget/EmailSecurityScreens.xml#PasswordEmail" subject="OFBiz Demo - Password Reminder (${userLogin.userLoginId})" fromAddress="ofbiztest@yahoo.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_PWD_RETRIEVE" bodyScreenLocation="component://securityext/widget/EmailSecurityScreens.xml#PasswordEmail" subject="OFBiz Demo - Password Reminder (${userLogin.userLoginId})" fromAddress="ofbiztesting@gmail.com"/>
>>>> 
>>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_QUO_CONFIRM" bodyScreenLocation="component://order/widget/ordermgr/QuoteScreens.xml#ViewQuoteSimple" xslfoAttachScreenLocation="component://order/widget/ordermgr/QuoteScreens.xml#QuoteReport" subject="OFBiz Demo - Quote Confirmation #${quoteId}" bccAddress="ofbiztest@yahoo.com" fromAddress="ofbiztest@yahoo.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_QUO_CONFIRM" bodyScreenLocation="component://order/widget/ordermgr/QuoteScreens.xml#ViewQuoteSimple" xslfoAttachScreenLocation="component://order/widget/ordermgr/QuoteScreens.xml#QuoteReport" subject="OFBiz Demo - Quote Confirmation #${quoteId}" bccAddress="ofbiztesting@gmail.com" fromAddress="ofbiztesting@gmail.com"/>
>>>> 
>>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PARTY_REGIS_CONFIRM" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#CreatePartyNotification" subject="New Account Created" bccAddress="ofbiztest@yahoo.com" fromAddress="ofbiztest@yahoo.com"/>
>>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_CUST_REGISTER" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#CreatePartyNotification" subject="New Account Created" bccAddress="ofbiztest@yahoo.com" fromAddress="ofbiztest@yahoo.com"/>
>>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="UPD_PRSNL_INF_CNFRM" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#ChangePersonalInfoNotification" subject="Personal Information Updated" bccAddress="ofbiztest@yahoo.com" fromAddress="ofbiztest@yahoo.com"/>
>>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_EMAIL_VERIFY" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#VerifyEmailAddressNotification" subject="Email Address Verification" bccAddress="ofbiztest@yahoo.com" fromAddress="ofbiztest@yahoo.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PARTY_REGIS_CONFIRM" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#CreatePartyNotification" subject="New Account Created" bccAddress="ofbiztesting@gmail.com" fromAddress="ofbiztesting@gmail.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_CUST_REGISTER" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#CreatePartyNotification" subject="New Account Created" bccAddress="ofbiztesting@gmail.com" fromAddress="ofbiztesting@gmail.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="UPD_PRSNL_INF_CNFRM" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#ChangePersonalInfoNotification" subject="Personal Information Updated" bccAddress="ofbiztesting@gmail.com" fromAddress="ofbiztesting@gmail.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_EMAIL_VERIFY" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#VerifyEmailAddressNotification" subject="Email Address Verification" bccAddress="ofbiztesting@gmail.com" fromAddress="ofbiztesting@gmail.com"/>
>>>> 
>>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="CONT_NOTI_EMAIL" bodyScreenLocation="component://ecommerce/widget/EmailContactListScreens.xml#ContactUsEmailNotification" subject="Contact-us Information Notification" fromAddress="ofbiztest@yahoo.com" />
>>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="CONT_NOTI_EMAIL" bodyScreenLocation="component://ecommerce/widget/EmailContactListScreens.xml#ContactUsEmailNotification" subject="Contact-us Information Notification" fromAddress="ofbiztesting@gmail.com" />
>>>> 
>>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="UNSUB_CONT_LIST_NOTI" bodyScreenLocation="component://ecommerce/widget/EmailContactListScreens.xml#ContactListUnsubscribeEmail" subject="Unsubscribe Contact List" fromAddress="ofbiztest@yahoo.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="UNSUB_CONT_LIST_NOTI" bodyScreenLocation="component://ecommerce/widget/EmailContactListScreens.xml#ContactListUnsubscribeEmail" subject="Unsubscribe Contact List" fromAddress="ofbiztesting@gmail.com"/>
>>>> 
>>>>    <WebAnalyticsConfig productStoreId="9000" webAnalyticsTypeId="GOOGLE_ANALYTICS" webAnalyticsCode="123456" isEnabled="Y" description="This is code provided from google analytics" contentId="GOOGLE_ANA_CNT"/>
>>>>    <WebAnalyticsConfig productStoreId="9000" webAnalyticsTypeId="BING_ANALYTICS" webAnalyticsCode="123456" isEnabled="Y" description="This is code provided from bing analytics" contentId="BING_ANA_CNT"/>
>>>> 
>>>> Modified: ofbiz/trunk/specialpurpose/ecommerce/data/DemoRentalProduct.xml
>>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/DemoRentalProduct.xml?rev=938446&r1=938445&r2=938446&view=diff
>>>> ==============================================================================
>>>> --- ofbiz/trunk/specialpurpose/ecommerce/data/DemoRentalProduct.xml (original)
>>>> +++ ofbiz/trunk/specialpurpose/ecommerce/data/DemoRentalProduct.xml Tue Apr 27 13:17:45 2010
>>>> @@ -45,22 +45,22 @@ headerLogo="/images/opentravelsystem_log
>>>>    <ProductStorePaymentSetting productStoreId="RentalStore" paymentMethodTypeId="EXT_PAYPAL" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService="" paymentCustomMethodId="" paymentGatewayConfigId="PAYPAL_CONFIG"/>
>>>>    <ProductStorePaymentSetting productStoreId="RentalStore" paymentMethodTypeId="EXT_WORLDPAY" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService="" paymentCustomMethodId="" paymentGatewayConfigId="WORLDPAY_CONFIG"/>
>>>> 
>>>> -    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_CONFIRM" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNotice" xslfoAttachScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNoticePdf" subject="OFBiz Demo - Order Confirmation #${orderId}" bccAddress="ofbiztest@yahoo.com" fromAddress="ofbiztest@yahoo.com"/>
>>>> -    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderCompleteNotice" subject="OFBiz Demo - Your Order Is Complete #${orderId}" fromAddress="ofbiztest@yahoo.com"/>
>>>> -    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_BACKORDER" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#BackorderNotice" subject="OFBiz Demo - Backorder Notification #${orderId}" fromAddress="ofbiztest@yahoo.com"/>
>>>> -    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_CHANGE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderChangeNotice" subject="OFBiz Demo - Order Change Notification #${orderId}" fromAddress="ofbiztest@yahoo.com"/>
>>>> -    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_PAYRETRY" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#PaymentRetryNotice" subject="OFBiz Demo - Order Payment Notification #${orderId}" fromAddress="ofbiztest@yahoo.com"/>
>>>> -
>>>> -    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_RTN_ACCEPT" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnAccept" subject="OFBiz Demo - Return Accepted #${returnHeader.returnId}" fromAddress="ofbiztest@yahoo.com"/>
>>>> -    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_RTN_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnComplete" subject="OFBiz Demo - Return Completed #${returnHeader.returnId}" fromAddress="ofbiztest@yahoo.com"/>
>>>> -    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_RTN_CANCEL" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnCancel" subject="OFBiz Demo - Return Cancelled #${returnHeader.returnId}" fromAddress="ofbiztest@yahoo.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_CONFIRM" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNotice" xslfoAttachScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNoticePdf" subject="OFBiz Demo - Order Confirmation #${orderId}" bccAddress="ofbiztesting@gmail.com" fromAddress="ofbiztesting@gmail.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderCompleteNotice" subject="OFBiz Demo - Your Order Is Complete #${orderId}" fromAddress="ofbiztesting@gmail.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_BACKORDER" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#BackorderNotice" subject="OFBiz Demo - Backorder Notification #${orderId}" fromAddress="ofbiztesting@gmail.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_CHANGE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderChangeNotice" subject="OFBiz Demo - Order Change Notification #${orderId}" fromAddress="ofbiztesting@gmail.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_PAYRETRY" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#PaymentRetryNotice" subject="OFBiz Demo - Order Payment Notification #${orderId}" fromAddress="ofbiztesting@gmail.com"/>
>>>> +
>>>> +    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_RTN_ACCEPT" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnAccept" subject="OFBiz Demo - Return Accepted #${returnHeader.returnId}" fromAddress="ofbiztesting@gmail.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_RTN_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnComplete" subject="OFBiz Demo - Return Completed #${returnHeader.returnId}" fromAddress="ofbiztesting@gmail.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_RTN_CANCEL" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnCancel" subject="OFBiz Demo - Return Cancelled #${returnHeader.returnId}" fromAddress="ofbiztesting@gmail.com"/>
>>>> 
>>>> -    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_GC_PURCHASE" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardPurchase" fromAddress="ofbiztest@yahoo.com" subject="A Gift From ${senderName}!"/>
>>>> -    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_GC_RELOAD" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardReload" fromAddress="ofbiztest@yahoo.com" subject="Gift Card Reload Results"/>
>>>> +    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_GC_PURCHASE" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardPurchase" fromAddress="ofbiztesting@gmail.com" subject="A Gift From ${senderName}!"/>
>>>> +    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_GC_RELOAD" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardReload" fromAddress="ofbiztesting@gmail.com" subject="Gift Card Reload Results"/>
>>>> 
>>>> -    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_TELL_FRIEND" bodyScreenLocation="component://ecommerce/widget/EmailProductScreens.xml#TellFriend" subject="${sendFrom} has sent you a link!" fromAddress="ofbiztest@yahoo.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_TELL_FRIEND" bodyScreenLocation="component://ecommerce/widget/EmailProductScreens.xml#TellFriend" subject="${sendFrom} has sent you a link!" fromAddress="ofbiztesting@gmail.com"/>
>>>> 
>>>> -    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_PWD_RETRIEVE" bodyScreenLocation="component://securityext/widget/EmailSecurityScreens.xml#PasswordEmail" subject="OFBiz Demo - Password Reminder (${userLoginId})" fromAddress="ofbiztest@yahoo.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_PWD_RETRIEVE" bodyScreenLocation="component://securityext/widget/EmailSecurityScreens.xml#PasswordEmail" subject="OFBiz Demo - Password Reminder (${userLoginId})" fromAddress="ofbiztesting@gmail.com"/>
>>>> 
>>>>    <ProductStoreFacility productStoreId="RentalStore" facilityId="WebStoreWarehouse" fromDate="2001-05-13 12:00:00.0"/>
>>>>    <ProductStoreRole partyId="admin" roleTypeId="SALES_REP" productStoreId="RentalStore" fromDate="2001-05-13 12:00:00.0"/>
>>>> 
>>>> Modified: ofbiz/trunk/specialpurpose/googlebase/data/DemoGoogleBaseData.xml
>>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/data/DemoGoogleBaseData.xml?rev=938446&r1=938445&r2=938446&view=diff
>>>> ==============================================================================
>>>> --- ofbiz/trunk/specialpurpose/googlebase/data/DemoGoogleBaseData.xml (original)
>>>> +++ ofbiz/trunk/specialpurpose/googlebase/data/DemoGoogleBaseData.xml Tue Apr 27 13:17:45 2010
>>>> @@ -20,5 +20,5 @@ under the License.
>>>> 
>>>> <entity-engine-xml>
>>>>    <WebSite webSiteId="GOOGLEBASE" standardContentPrefix="http://demo.ofbiz.org" productStoreId="9000" />
>>>> -    <GoogleBaseConfig productStoreId="9000" developerKey="HKLh9khgVieditoO0b4JR2fnBT2yXp_ZAY8_yft3CFXhHIE1NvwkxQ1pZ4qyVEGh_FtRe5KtJPTKDorNP" authenticationUrl="https://www.google.com/accounts/ClientLogin" accountEmail="ofbiztest@yahoo.com" accountPassword="47ca69ebb4bdc9ae0adec130880165d2cc05db1a" postItemsUrl="http://www.google.com/base/feeds/items/batch" webSiteId="GOOGLEBASE"/>
>>>> +    <GoogleBaseConfig productStoreId="9000" developerKey="HKLh9khgVieditoO0b4JR2fnBT2yXp_ZAY8_yft3CFXhHIE1NvwkxQ1pZ4qyVEGh_FtRe5KtJPTKDorNP" authenticationUrl="https://www.google.com/accounts/ClientLogin" accountEmail="ofbiztesting@gmail.com" accountPassword="47ca69ebb4bdc9ae0adec130880165d2cc05db1a" postItemsUrl="http://www.google.com/base/feeds/items/batch" webSiteId="GOOGLEBASE"/>
>>>> </entity-engine-xml>
>>>> \ No newline at end of file
>>>> 
>>>> Modified: ofbiz/trunk/specialpurpose/workflow/data/OrderProcessWorkflow.xml
>>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/data/OrderProcessWorkflow.xml?rev=938446&r1=938445&r2=938446&view=diff
>>>> ==============================================================================
>>>> --- ofbiz/trunk/specialpurpose/workflow/data/OrderProcessWorkflow.xml (original)
>>>> +++ ofbiz/trunk/specialpurpose/workflow/data/OrderProcessWorkflow.xml Tue Apr 27 13:17:45 2010
>>>> @@ -23,7 +23,7 @@ under the License.
>>>>    <WorkflowPackage packageId="org.ofbiz.order" packageVersion="20030730144901" packageName="" description="Demo Order Processing Workflow" specificationVersion="0.03" specificationId="XPDL" sourceVendorInfo="OFBiz.org" creationDateTime="2002-12-03 00:00:00.0" author="Andy Zeneski" publicationStatusId="WPS_UNDER_REVISION" graphConformanceEnumId="WGC_FULL_BLOCKED" priorityUomId="P" costUomId="USD" responsibleListId="10002" documentationUrl="None"/>
>>>>    <WorkflowProcess packageId="org.ofbiz.order" packageVersion="20030730144901" processId="ProcessOrder" processVersion="20030730144901" objectName="Processes incoming orders" objectPriority="5" description="Order Processing Workflow" creationDateTime="2002-12-01 12:00:00.0" author="OFBiz" publicationStatusId="WPS_UNDER_REVISION" timeLimit="12.0" validFromDate="2002-12-01 12:00:00.0" validToDate="2012-12-01 12:00:00.0" responsibleListId="10003" durationUomId="h" duration="3.0" waitingTime="2.0" defaultStartActivityId="receiveOrder" sourceReferenceField="orderId"/>
>>>> 
>>>> -    <WorkflowDataField packageId="org.ofbiz.order" packageVersion="20030730144901" processId="ProcessOrder" processVersion="20030730144901" dataFieldId="adminEmailList" dataFieldName="adminEmailList" initialValue="ofbiztest@yahoo.com" dataTypeEnumId="WDT_STRING" isArray="N"/>
>>>> +    <WorkflowDataField packageId="org.ofbiz.order" packageVersion="20030730144901" processId="ProcessOrder" processVersion="20030730144901" dataFieldId="adminEmailList" dataFieldName="adminEmailList" initialValue="ofbiztesting@gmail.com" dataTypeEnumId="WDT_STRING" isArray="N"/>
>>>>    <WorkflowFormalParam packageId="org.ofbiz.order" packageVersion="20030730144901" processId="ProcessOrder" processVersion="20030730144901" applicationId="_NA_" formalParamId="orderId" indexNumber="1" modeEnumId="WPM_IN" description="The order number" dataTypeEnumId="WDT_STRING"/>
>>>> 
>>>>    <WorkflowParticipant packageId="org.ofbiz.order" packageVersion="20030730144901" processId="_NA_" processVersion="_NA_" participantId="BUYER" participantName="Purchase Order Approval Role" description="Reviews and approves/rejects orders" participantTypeId="ROLE"/>
>>>> 
>>>> 
>>> 
>>> 
> 


Re: svn commit: r938446 - in /ofbiz/trunk: applications/accounting/data/ applications/content/data/ applications/marketing/data/ applications/order/servicedef/ applications/party/data/ applications/party/script/org/ofbiz/party/test/ debian/ framework

Posted by Ashish Vijaywargiya <vi...@gmail.com>.
You have very good point here - let me think about it for sometime
then I will get back to you. :-)

--
Ashish

On Wed, Apr 28, 2010 at 9:55 AM, Scott Gray <sc...@hotwaxmedia.com> wrote:
> The only thing that makes me uncomfortable about it is that partially complete implementations could accidentally send emails to the address and result in the people who are in control of the account perhaps knowing about implementations that are supposed to be private.  I don't doubt for a second that this wouldn't happen on a regular basis.
>
> Regards
> Scott
>
> On 28/04/2010, at 3:09 PM, Ashish Vijaywargiya wrote:
>
>> Hello Scott,
>>
>> I agree from you but I would prefer to have this gmail account
>> settings as it is because I(or someone else) can test mail fetching by
>> enabling only JavaMail container settings in ofbiz-containers.xml. One
>> more important thing I can't test anything sent on test@example.com
>> but can do on gmail.com.
>>
>> For few days lets keep this settings as it is then if we see some
>> problems then we will change it in future.
>> Thanks for your comments!
>>
>> --
>> Ashish
>>
>>
>> On Tue, Apr 27, 2010 at 6:58 PM, Scott Gray <sc...@hotwaxmedia.com> wrote:
>>> Personally I would prefer it if we used test@example.com
>>> The example.com domain exists exactly for this sort of thing and the emails don't bounce (I believe).
>>>
>>> Regards
>>> Scott
>>>
>>> HotWax Media
>>> http://www.hotwaxmedia.com
>>>
>>> On 28/04/2010, at 1:17 AM, ashish@apache.org wrote:
>>>
>>>> Author: ashish
>>>> Date: Tue Apr 27 13:17:45 2010
>>>> New Revision: 938446
>>>>
>>>> URL: http://svn.apache.org/viewvc?rev=938446&view=rev
>>>> Log:
>>>> Changing email address ofbiztest@yahoo.com -> ofbiztesting@gmail.com - this was creating too much problem since long in development effort.
>>>>
>>>> Following points were there in my mind before doing this change.
>>>>
>>>> -- AFAIK ofbiztest@yahoo.com email doesn't exists.
>>>> -- Bounce email issue if you have enabled Javamail container. This drastically slow down your system performance.
>>>> -- Now anyone can use ofbiztesting@gmail.com account settings for Sendmail, Javamail container etc.
>>>> -- Send mail service triggered again and again with failure message on console if any of the email not found bccAddress inside ProductStoreEmailSettings entity. Again slow speed of your development machine.
>>>> -- Please let me know where to share the password of this account? Dev list?
>>>>
>>>> Modified:
>>>>    ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml
>>>>    ofbiz/trunk/applications/content/data/UsersDemoData.xml
>>>>    ofbiz/trunk/applications/marketing/data/sfaDemoData.xml
>>>>    ofbiz/trunk/applications/order/servicedef/orderProcessXPDL.xml
>>>>    ofbiz/trunk/applications/party/data/PartyDemoData.xml
>>>>    ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyContactMechTests.xml
>>>>    ofbiz/trunk/debian/TODO
>>>>    ofbiz/trunk/debian/override-data.xslt
>>>>    ofbiz/trunk/framework/common/config/general.properties
>>>>    ofbiz/trunk/framework/common/script/org/ofbiz/common/email/EmailServices.xml
>>>>    ofbiz/trunk/specialpurpose/ebaystore/data/DemoEbayStoreData.xml
>>>>    ofbiz/trunk/specialpurpose/ecommerce/data/DemoMarketing.xml
>>>>    ofbiz/trunk/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml
>>>>    ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml
>>>>    ofbiz/trunk/specialpurpose/ecommerce/data/DemoRentalProduct.xml
>>>>    ofbiz/trunk/specialpurpose/googlebase/data/DemoGoogleBaseData.xml
>>>>    ofbiz/trunk/specialpurpose/workflow/data/OrderProcessWorkflow.xml
>>>>
>>>> Modified: ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml
>>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml?rev=938446&r1=938445&r2=938446&view=diff
>>>> ==============================================================================
>>>> --- ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml (original)
>>>> +++ ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml Tue Apr 27 13:17:45 2010
>>>> @@ -28,7 +28,7 @@ under the License.
>>>>     <ContactMech contactMechId="9000" contactMechTypeId="POSTAL_ADDRESS"/>
>>>>     <PartyContactMech partyId="Company" contactMechId="9000" fromDate="2000-01-01 00:00:00.000" allowSolicitation="Y"/>
>>>>     <PostalAddress contactMechId="9000" toName="Company XYZ" address1="2003 Open Blvd" city="Open City" postalCode="999999" countryGeoId="USA" stateProvinceGeoId="CA" geoPointId="9000"/>
>>>> -    <ContactMech contactMechId="Company" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>>>> +    <ContactMech contactMechId="Company" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>>>     <PartyContactMech partyId="Company" contactMechId="Company" fromDate="2000-01-01 00:00:00.000" allowSolicitation="Y"/>
>>>>     <PartyContactMechPurpose contactMechPurposeTypeId="PRIMARY_EMAIL" partyId="Company" contactMechId="Company" fromDate="2003-01-01 00:00:00.000"/>
>>>>     <PartyContactMechPurpose partyId="Company" contactMechId="9000" contactMechPurposeTypeId="BILLING_LOCATION" fromDate="2000-01-01 00:00:00.000"/>
>>>>
>>>> Modified: ofbiz/trunk/applications/content/data/UsersDemoData.xml
>>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/data/UsersDemoData.xml?rev=938446&r1=938445&r2=938446&view=diff
>>>> ==============================================================================
>>>> --- ofbiz/trunk/applications/content/data/UsersDemoData.xml (original)
>>>> +++ ofbiz/trunk/applications/content/data/UsersDemoData.xml Tue Apr 27 13:17:45 2010
>>>> @@ -47,19 +47,19 @@ under the License.
>>>>     <PartyRole partyId="BLOG_EDITOR" roleTypeId="CONTENT_PUBLISHER"/>
>>>>     <PartyRole partyId="BLOG_EDITOR" roleTypeId="_NA_"/>
>>>>
>>>> -    <ContactMech contactMechId="ADMIN_CONTACT" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>>>> +    <ContactMech contactMechId="ADMIN_CONTACT" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>>>     <PartyContactMech partyId="BLOG_ADMIN" contactMechId="ADMIN_CONTACT" fromDate="2001-05-13 12:00:00.0"/>
>>>>     <PartyContactMechPurpose partyId="BLOG_ADMIN" contactMechId="ADMIN_CONTACT" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2001-05-13 12:00:00.0"/>
>>>>
>>>> -    <ContactMech contactMechId="AUTHOR_CONTACT" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>>>> +    <ContactMech contactMechId="AUTHOR_CONTACT" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>>>     <PartyContactMech partyId="BLOG_AUTHOR" contactMechId="AUTHOR_CONTACT" fromDate="2001-05-13 12:00:00.0"/>
>>>>     <PartyContactMechPurpose partyId="BLOG_AUTHOR" contactMechId="AUTHOR_CONTACT" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2001-05-13 12:00:00.0"/>
>>>>
>>>> -    <ContactMech contactMechId="EDITOR_CONTACT" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>>>> +    <ContactMech contactMechId="EDITOR_CONTACT" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>>>     <PartyContactMech partyId="BLOG_EDITOR" contactMechId="EDITOR_CONTACT" fromDate="2001-05-13 12:00:00.0"/>
>>>>     <PartyContactMechPurpose partyId="BLOG_EDITOR" contactMechId="EDITOR_CONTACT" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2001-05-13 12:00:00.0"/>
>>>>
>>>> -    <ContactMech contactMechId="GUEST_CONTACT" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>>>> +    <ContactMech contactMechId="GUEST_CONTACT" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>>>     <PartyContactMech partyId="BLOG_GUEST" contactMechId="GUEST_CONTACT" fromDate="2001-05-13 12:00:00.0"/>
>>>>     <PartyContactMechPurpose partyId="BLOG_GUEST" contactMechId="GUEST_CONTACT" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2001-05-13 12:00:00.0"/>
>>>> </entity-engine-xml>
>>>>
>>>> Modified: ofbiz/trunk/applications/marketing/data/sfaDemoData.xml
>>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/data/sfaDemoData.xml?rev=938446&r1=938445&r2=938446&view=diff
>>>> ==============================================================================
>>>> --- ofbiz/trunk/applications/marketing/data/sfaDemoData.xml (original)
>>>> +++ ofbiz/trunk/applications/marketing/data/sfaDemoData.xml Tue Apr 27 13:17:45 2010
>>>> @@ -26,7 +26,7 @@
>>>>     <PartyRole partyId="sfa100" roleTypeId="ACCOUNT"/>
>>>>     <ContactMech contactMechId="sfa100" contactMechTypeId="POSTAL_ADDRESS"/>
>>>>     <ContactMech contactMechId="sfa101" contactMechTypeId="TELECOM_NUMBER"/>
>>>> -    <ContactMech contactMechId="sfa102" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>>>> +    <ContactMech contactMechId="sfa102" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>>>     <PostalAddress contactMechId="sfa100" address1="151 Madison street." city="Edison" postalCode="32451" lastUpdatedStamp="2008-05-23 11:57:40.936" lastUpdatedTxStamp="2008-05-23 11:57:39.476" createdStamp="2008-05-23 11:57:40.936" createdTxStamp="2008-05-23 11:57:39.476"/>
>>>>     <TelecomNumber contactMechId="sfa101" countryCode="1" areaCode="33" contactNumber="12456" lastUpdatedStamp="2008-05-23 11:57:41.179" lastUpdatedTxStamp="2008-05-23 11:57:39.476" createdStamp="2008-05-23 11:57:41.179" createdTxStamp="2008-05-23 11:57:39.476"/>
>>>>     <PartyContactMech partyId="sfa100" contactMechId="sfa100" fromDate="2000-01-01 00:00:00.000"/>
>>>>
>>>> Modified: ofbiz/trunk/applications/order/servicedef/orderProcessXPDL.xml
>>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/servicedef/orderProcessXPDL.xml?rev=938446&r1=938445&r2=938446&view=diff
>>>> ==============================================================================
>>>> --- ofbiz/trunk/applications/order/servicedef/orderProcessXPDL.xml (original)
>>>> +++ ofbiz/trunk/applications/order/servicedef/orderProcessXPDL.xml Tue Apr 27 13:17:45 2010
>>>> @@ -90,7 +90,7 @@ under the License.
>>>>                     <DataType>
>>>>                         <BasicType Type="STRING"/>
>>>>                     </DataType>
>>>> -                    <InitialValue>ofbiztest@yahoo.com</InitialValue>
>>>> +                    <InitialValue>ofbiztesting@gmail.com</InitialValue>
>>>>                 </DataField>
>>>>             </DataFields>
>>>>
>>>>
>>>> Modified: ofbiz/trunk/applications/party/data/PartyDemoData.xml
>>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/data/PartyDemoData.xml?rev=938446&r1=938445&r2=938446&view=diff
>>>> ==============================================================================
>>>> --- ofbiz/trunk/applications/party/data/PartyDemoData.xml (original)
>>>> +++ ofbiz/trunk/applications/party/data/PartyDemoData.xml Tue Apr 27 13:17:45 2010
>>>> @@ -29,7 +29,7 @@
>>>>     <PartyRole partyId="DemoEmployee" roleTypeId="EMAIL_ADMIN"/>
>>>>     <PartyRelationship partyIdFrom="DemoEmployee" roleTypeIdFrom="EMAIL_ADMIN" partyIdTo="Company" roleTypeIdTo="_NA_" fromDate="2000-01-01 00:00:00"/>
>>>>
>>>> -    <ContactMech contactMechId="admin" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>>>> +    <ContactMech contactMechId="admin" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>>>     <PartyContactMech partyId="admin" contactMechId="admin" fromDate="2003-01-01 00:00:00.0" allowSolicitation="Y"/>
>>>>     <PartyContactMechPurpose contactMechPurposeTypeId="PRIMARY_EMAIL" partyId="admin" contactMechId="admin" fromDate="2003-01-01 00:00:00.0"/>
>>>>
>>>> @@ -40,10 +40,10 @@
>>>>     <PartyIdentification partyId="DemoSupplier" partyIdentificationTypeId="SIRET" idValue="1234 5678 90123"/>
>>>>
>>>>     <!-- email from an unknown party -->
>>>> -    <CommunicationEvent communicationEventId="9000" communicationEventTypeId="EMAIL_COMMUNICATION" statusId="COM_UNKNOWN_PARTY" contactMechTypeId="EMAIL_ADDRESS" contactMechIdTo="admin" roleTypeIdFrom="_NA_" roleTypeIdTo="_NA_" partyIdTo="admin" entryDate="2008-07-28 13:55:55.827" datetimeStarted="2008-07-28 13:55:19.0" subject="Why i would use the OFBiz system" contentMimeTypeId="text/plain" content="Every time i think of you, only you...you are always on my mind......." note="Sent from: my@email.com; Sent Name from: Jo Easy User; Sent to: ofbiztest@yahoo.com; Delivered-To: ofbiztest@yahoo.com; " fromString="mailinglist@antwebsystems.com" toString="ofbiztest@yahoo.com"/>
>>>> +    <CommunicationEvent communicationEventId="9000" communicationEventTypeId="EMAIL_COMMUNICATION" statusId="COM_UNKNOWN_PARTY" contactMechTypeId="EMAIL_ADDRESS" contactMechIdTo="admin" roleTypeIdFrom="_NA_" roleTypeIdTo="_NA_" partyIdTo="admin" entryDate="2008-07-28 13:55:55.827" datetimeStarted="2008-07-28 13:55:19.0" subject="Why i would use the OFBiz system" contentMimeTypeId="text/plain" content="Every time i think of you, only you...you are always on my mind......." note="Sent from: my@email.com; Sent Name from: Jo Easy User; Sent to: ofbiztesting@gmail.com; Delivered-To: ofbiztesting@gmail.com; " fromString="mailinglist@antwebsystems.com" toString="ofbiztesting@gmail.com"/>
>>>>     <PartyRole partyId="admin" roleTypeId="ADDRESSEE"/>
>>>>     <CommunicationEventRole communicationEventId="9000" partyId="admin" roleTypeId="ADDRESSEE" contactMechId="admin" statusId="COM_ROLE_CREATED"/>
>>>>
>>>>     <!-- new registration notification -->
>>>> -    <EmailTemplateSetting emailTemplateSettingId="PARTY_REGISTER" bodyScreenLocation="component://party/widget/partymgr/PartyScreens.xml#CreateUserNotification" subject="New Account Created" bccAddress="ofbiztest@yahoo.com" fromAddress="ofbiztest@yahoo.com"/>
>>>> +    <EmailTemplateSetting emailTemplateSettingId="PARTY_REGISTER" bodyScreenLocation="component://party/widget/partymgr/PartyScreens.xml#CreateUserNotification" subject="New Account Created" bccAddress="ofbiztesting@gmail.com" fromAddress="ofbiztesting@gmail.com"/>
>>>> </entity-engine-xml>
>>>>
>>>> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyContactMechTests.xml
>>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyContactMechTests.xml?rev=938446&r1=938445&r2=938446&view=diff
>>>> ==============================================================================
>>>> --- ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyContactMechTests.xml (original)
>>>> +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyContactMechTests.xml Tue Apr 27 13:17:45 2010
>>>> @@ -26,7 +26,7 @@ under the License.
>>>>         <set field="contactMechTypeId" value="EMAIL_ADDRESS"/>
>>>>         <!-- first try with just updating without changing the email address -->
>>>>         <set field="serviceCtx.partyId" from-field="partyId"/>
>>>> -        <set field="serviceCtx.emailAddress" value="ofbiztest@yahoo.com"/>
>>>> +        <set field="serviceCtx.emailAddress" value="ofbiztesting@gmail.com"/>
>>>>         <set field="serviceCtx.contactMechId" value="9026"/>
>>>>         <entity-one entity-name="UserLogin" value-field="userLogin">
>>>>             <field-map field-name="userLoginId" value="system"/>
>>>>
>>>> Modified: ofbiz/trunk/debian/TODO
>>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/debian/TODO?rev=938446&r1=938445&r2=938446&view=diff
>>>> ==============================================================================
>>>> --- ofbiz/trunk/debian/TODO (original)
>>>> +++ ofbiz/trunk/debian/TODO Tue Apr 27 13:17:45 2010
>>>> @@ -19,7 +19,7 @@
>>>> * debian/copyright
>>>> - Prompt for:
>>>>   - ofbiz admin password(s)
>>>> -  - default email(ofbiztest@yahoo.com)
>>>> +  - default email(ofbiztesting@gmail.com)
>>>>   - install of demo or just seed data
>>>> * Auto-generate admin key/port
>>>> * Move demo data into separate package?
>>>>
>>>> Modified: ofbiz/trunk/debian/override-data.xslt
>>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/debian/override-data.xslt?rev=938446&r1=938445&r2=938446&view=diff
>>>> ==============================================================================
>>>> --- ofbiz/trunk/debian/override-data.xslt (original)
>>>> +++ ofbiz/trunk/debian/override-data.xslt Tue Apr 27 13:17:45 2010
>>>> @@ -108,13 +108,13 @@ under the License.
>>>>
>>>>  <xsl:template mode="data" match="
>>>>   ProductStoreEmailSetting[
>>>> -   @bccAddress='ofbiztest@yahoo.com' or
>>>> -   @fromAddress='ofbiztest@yahoo.com']|ContactList[
>>>> -   @verifyEmailFrom='ofbiztest@yahoo.com'
>>>> +   @bccAddress='ofbiztesting@gmail.com' or
>>>> +   @fromAddress='ofbiztesting@gmail.com']|ContactList[
>>>> +   @verifyEmailFrom='ofbiztesting@gmail.com'
>>>>   ]|ContactMech[
>>>> -   @infoString='ofbiztest@yahoo.com'
>>>> +   @infoString='ofbiztesting@gmail.com'
>>>>   ]|WorkflowDataField[
>>>> -   @initialValue='ofbiztest@yahoo.com'
>>>> +   @initialValue='ofbiztesting@gmail.com'
>>>>   ]|UserLogin[
>>>>    @currentPassword='47ca69ebb4bdc9ae0adec130880165d2cc05db1a'
>>>>   ]">
>>>> @@ -126,7 +126,7 @@ under the License.
>>>>  <xsl:template mode="match" match="ProductStoreEmailSetting/@bccAddress|ProductStoreEmailSetting/@fromAddress|ProductStoreEmailSetting/@verifyEmailFrom|ContactMech/@infoString|ContactList/@verifyEmailFrom|WorkflowDataField/@initialValue">
>>>>   <xsl:attribute name="{name()}">
>>>>    <xsl:choose>
>>>> -    <xsl:when test=". = 'ofbiztest@yahoo.com'"><xsl:value-of select="$fromemail"/></xsl:when>
>>>> +    <xsl:when test=". = 'ofbiztesting@gmail.com'"><xsl:value-of select="$fromemail"/></xsl:when>
>>>>     <xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
>>>>    </xsl:choose>
>>>>   </xsl:attribute>
>>>>
>>>> Modified: ofbiz/trunk/framework/common/config/general.properties
>>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/general.properties?rev=938446&r1=938445&r2=938446&view=diff
>>>> ==============================================================================
>>>> --- ofbiz/trunk/framework/common/config/general.properties (original)
>>>> +++ ofbiz/trunk/framework/common/config/general.properties Tue Apr 27 13:17:45 2010
>>>> @@ -64,7 +64,7 @@ partner.trackingCodeId.default=
>>>> usps.address.match=(^.*?p[\\. ]*o[\\. ]*box.*$)|(^.*?post.*?office.*?box.*$)|((^|(^.*? ))r[\\. ]*r[\\. ]*(( +)|([0-9#]+)).*$)|(^.*?rural.*?route.*$)
>>>>
>>>> # -- general default 'fromEmailAddress' can be overridden in: EmailTemplateSetting
>>>> -defaultFromEmailAddress=ofbiztest@yahoo.com
>>>> +defaultFromEmailAddress=ofbiztesting@gmail.com
>>>>
>>>> # -- The default domainname used in the notification emails links
>>>> # as 'baseUrl' and 'baseSecureUrl' are set in the url.properties file.
>>>>
>>>> Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/email/EmailServices.xml
>>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/email/EmailServices.xml?rev=938446&r1=938445&r2=938446&view=diff
>>>> ==============================================================================
>>>> --- ofbiz/trunk/framework/common/script/org/ofbiz/common/email/EmailServices.xml (original)
>>>> +++ ofbiz/trunk/framework/common/script/org/ofbiz/common/email/EmailServices.xml Tue Apr 27 13:17:45 2010
>>>> @@ -50,7 +50,7 @@ under the License.
>>>>             <if-not-empty field="emailTemplateSetting.fromAddress">
>>>>                 <set field="emailParams.sendFrom" from-field="emailTemplateSetting.fromAddress"/>
>>>>                 <else>
>>>> -                    <property-to-field resource="general" property="defaultFromEmailAddress" field="emailParams.sendFrom" default="ofbiztest@yahoo.com"/>
>>>> +                    <property-to-field resource="general" property="defaultFromEmailAddress" field="emailParams.sendFrom" default="ofbiztesting@gmail.com"/>
>>>>                 </else>
>>>>             </if-not-empty>
>>>>             <set field="emailParams.sendCc" from-field="emailTemplateSetting.ccAddress"/>
>>>>
>>>> Modified: ofbiz/trunk/specialpurpose/ebaystore/data/DemoEbayStoreData.xml
>>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/data/DemoEbayStoreData.xml?rev=938446&r1=938445&r2=938446&view=diff
>>>> ==============================================================================
>>>> --- ofbiz/trunk/specialpurpose/ebaystore/data/DemoEbayStoreData.xml (original)
>>>> +++ ofbiz/trunk/specialpurpose/ebaystore/data/DemoEbayStoreData.xml Tue Apr 27 13:17:45 2010
>>>> @@ -92,9 +92,9 @@
>>>>     <Content contentId="EBAY_ITEM_DISPATCH" contentTypeId="DOCUMENT" dataResourceId="EBAY_ITEM_DISPATCH" ownerContentId="EBAY_ITEM_DISPATCH" statusId="CTNT_IN_PROGRESS"/>
>>>>     <ContentRole contentId="EBAY_ITEM_DISPATCH" partyId="DemoEbayAccount" roleTypeId="OWNER" fromDate="2010-01-01 00:00:00.000"/>
>>>>
>>>> -    <ProductStoreEmailSetting productStoreId="90100" emailType="EBAY_WIN_BUYER_NOTI" bccAddress="ofbiztest@yahoo.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#WinnigBuyerNotification" fromAddress="ofbiztest@yahoo.com" subject="OFBiz Demo - Winnig Buyer Notification #${buyerUserId}" xslfoAttachScreenLocation=""/>
>>>> -    <ProductStoreEmailSetting productStoreId="90100" emailType="EBAY_PAY_RECIEVED" bccAddress="ofbiztest@yahoo.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#PaymentRecieved" fromAddress="ofbiztest@yahoo.com" subject="OFBiz Demo - PaymentRecieved #${buyerUserId}" xslfoAttachScreenLocation=""/>
>>>> -    <ProductStoreEmailSetting productStoreId="90100" emailType="EBAY_FEEBACK_REMIN" bccAddress="ofbiztest@yahoo.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#FeedbackReminder" fromAddress="ofbiztest@yahoo.com" subject="OFBiz Demo - Feedback Reminder #${buyerUserId}" xslfoAttachScreenLocation=""/>
>>>> -    <ProductStoreEmailSetting productStoreId="90100" emailType="EBAY_ITEM_DISPATCH" bccAddress="ofbiztest@yahoo.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#EbayEmailTemplate" fromAddress="ofbiztest@yahoo.com" subject="OFBiz Demo - Item Dispatched Notification #${buyerUserId}" xslfoAttachScreenLocation=""/>
>>>> +    <ProductStoreEmailSetting productStoreId="90100" emailType="EBAY_WIN_BUYER_NOTI" bccAddress="ofbiztesting@gmail.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#WinnigBuyerNotification" fromAddress="ofbiztesting@gmail.com" subject="OFBiz Demo - Winnig Buyer Notification #${buyerUserId}" xslfoAttachScreenLocation=""/>
>>>> +    <ProductStoreEmailSetting productStoreId="90100" emailType="EBAY_PAY_RECIEVED" bccAddress="ofbiztesting@gmail.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#PaymentRecieved" fromAddress="ofbiztesting@gmail.com" subject="OFBiz Demo - PaymentRecieved #${buyerUserId}" xslfoAttachScreenLocation=""/>
>>>> +    <ProductStoreEmailSetting productStoreId="90100" emailType="EBAY_FEEBACK_REMIN" bccAddress="ofbiztesting@gmail.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#FeedbackReminder" fromAddress="ofbiztesting@gmail.com" subject="OFBiz Demo - Feedback Reminder #${buyerUserId}" xslfoAttachScreenLocation=""/>
>>>> +    <ProductStoreEmailSetting productStoreId="90100" emailType="EBAY_ITEM_DISPATCH" bccAddress="ofbiztesting@gmail.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#EbayEmailTemplate" fromAddress="ofbiztesting@gmail.com" subject="OFBiz Demo - Item Dispatched Notification #${buyerUserId}" xslfoAttachScreenLocation=""/>
>>>>
>>>> </entity-engine-xml>
>>>>
>>>> Modified: ofbiz/trunk/specialpurpose/ecommerce/data/DemoMarketing.xml
>>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/DemoMarketing.xml?rev=938446&r1=938445&r2=938446&view=diff
>>>> ==============================================================================
>>>> --- ofbiz/trunk/specialpurpose/ecommerce/data/DemoMarketing.xml (original)
>>>> +++ ofbiz/trunk/specialpurpose/ecommerce/data/DemoMarketing.xml Tue Apr 27 13:17:45 2010
>>>> @@ -23,11 +23,11 @@ under the License.
>>>>
>>>>     <ContactList contactListId="9000" contactListTypeId="ANNOUNCEMENT" contactMechTypeId="EMAIL_ADDRESS" marketingCampaignId="9000"
>>>>         contactListName="New Product Announcements" description="New Product Announcements Mailing List (email)" comments="" isPublic="Y" ownerPartyId="Company"
>>>> -        verifyEmailFrom="ofbiztest@yahoo.com" verifyEmailScreen="component://ecommerce/widget/EmailContactListScreens.xml#ContactListVerifyEmail"
>>>> +        verifyEmailFrom="ofbiztesting@gmail.com" verifyEmailScreen="component://ecommerce/widget/EmailContactListScreens.xml#ContactListVerifyEmail"
>>>>         verifyEmailSubject="Subscription Verify Email" verifyEmailWebSiteId="WebStore"/>
>>>>     <ContactList contactListId="9010" contactListTypeId="NEWSLETTER" contactMechTypeId="EMAIL_ADDRESS" marketingCampaignId="9000"
>>>>         contactListName="Product Tips Newsletter" description="Product Tips Newsletter Mailing List (email)" comments="" isPublic="Y" ownerPartyId="Company"
>>>> -        verifyEmailFrom="ofbiztest@yahoo.com" verifyEmailScreen="component://ecommerce/widget/EmailContactListScreens.xml#ContactListVerifyEmail"
>>>> +        verifyEmailFrom="ofbiztesting@gmail.com" verifyEmailScreen="component://ecommerce/widget/EmailContactListScreens.xml#ContactListVerifyEmail"
>>>>         verifyEmailSubject="Subscription Verify Email" verifyEmailWebSiteId="WebStore"/>
>>>>
>>>>     <ContactListParty contactListId="9000" partyId="DemoCustCompany" preferredContactMechId="9021" statusId="CLPT_ACCEPTED" fromDate="2001-05-13 00:00:00"/>
>>>>
>>>> Modified: ofbiz/trunk/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml
>>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml?rev=938446&r1=938445&r2=938446&view=diff
>>>> ==============================================================================
>>>> --- ofbiz/trunk/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml (original)
>>>> +++ ofbiz/trunk/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml Tue Apr 27 13:17:45 2010
>>>> @@ -78,7 +78,7 @@ under the License.
>>>>     <TelecomNumber contactMechId="9020" areaCode="801" contactNumber="555-5555"/>
>>>>     <PartyContactMech partyId="DemoCustCompany" contactMechId="9020" fromDate="2001-05-13 00:00:00.000" allowSolicitation="Y"/>
>>>>     <PartyContactMechPurpose partyId="DemoCustCompany" contactMechId="9020" contactMechPurposeTypeId="PHONE_WORK" fromDate="2001-05-13 00:00:00.000"/>
>>>> -    <ContactMech contactMechId="9021" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>>>> +    <ContactMech contactMechId="9021" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>>>     <PartyContactMech partyId="DemoCustCompany" contactMechId="9021" fromDate="2001-05-13 00:00:00.000" allowSolicitation="Y"/>
>>>>     <PartyContactMechPurpose partyId="DemoCustCompany" contactMechId="9021" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2001-05-13 00:00:00.000"/>
>>>>
>>>> @@ -104,7 +104,7 @@ under the License.
>>>>     <TelecomNumber contactMechId="9022" areaCode="801" contactNumber="555-5555"/>
>>>>     <PartyContactMech partyId="DemoCustAgent" contactMechId="9022" fromDate="2001-05-13 00:00:00.000" allowSolicitation="Y"/>
>>>>     <PartyContactMechPurpose partyId="DemoCustAgent" contactMechId="9022" contactMechPurposeTypeId="PHONE_WORK" fromDate="2001-05-13 00:00:00.000"/>
>>>> -    <ContactMech contactMechId="9023" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>>>> +    <ContactMech contactMechId="9023" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>>>     <PartyContactMech partyId="DemoCustAgent" contactMechId="9023" fromDate="2001-05-13 00:00:00.000" allowSolicitation="Y"/>
>>>>     <PartyContactMechPurpose partyId="DemoCustAgent" contactMechId="9023" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2001-05-13 00:00:00.000"/>
>>>>
>>>> @@ -139,7 +139,7 @@ under the License.
>>>>     <PartyContactMechPurpose partyId="DemoCustomer" contactMechId="9025" contactMechPurposeTypeId="PHONE_HOME" fromDate="2001-05-13 00:00:00.000"/>
>>>>     <PartyContactMechPurpose partyId="DemoCustomer" contactMechId="9025" contactMechPurposeTypeId="PHONE_SHIPPING" fromDate="2001-05-13 00:00:00.000"/>
>>>>     <PartyContactMechPurpose partyId="DemoCustomer" contactMechId="9027" contactMechPurposeTypeId="PHONE_BILLING" fromDate="2001-05-13 00:00:00.000"/>
>>>> -    <ContactMech contactMechId="9026" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>>>> +    <ContactMech contactMechId="9026" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>>>     <PartyContactMech partyId="DemoCustomer" contactMechId="9026" fromDate="2001-05-13 00:00:00.000" allowSolicitation="Y"/>
>>>>     <PartyContactMechPurpose partyId="DemoCustomer" contactMechId="9026" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2001-05-13 00:00:00.000"/>
>>>>
>>>> @@ -165,7 +165,7 @@ under the License.
>>>>     <PartyContactMechPurpose partyId="EuroCustomer" contactMechId="EUROCUSTOMER" contactMechPurposeTypeId="BILLING_LOCATION" fromDate="2001-05-13 00:00:00.000"/>
>>>>     <PartyContactMechPurpose partyId="EuroCustomer" contactMechId="EUROCUSTOMER" contactMechPurposeTypeId="SHIPPING_LOCATION" fromDate="2001-05-13 00:00:00.000"/>
>>>>     <PartyContactMechPurpose partyId="EuroCustomer" contactMechId="EUROCUSTOMER" contactMechPurposeTypeId="GENERAL_LOCATION" fromDate="2001-05-13 00:00:00.000"/>
>>>> -    <ContactMech contactMechId="EURO01" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>>>> +    <ContactMech contactMechId="EURO01" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>>>     <PartyContactMech partyId="EuroCustomer" contactMechId="EURO01" fromDate="2001-05-13 00:00:00.000" allowSolicitation="Y"/>
>>>>     <PartyContactMechPurpose partyId="EuroCustomer" contactMechId="EURO01" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2001-05-13 00:00:00.000"/>
>>>>
>>>> @@ -191,7 +191,7 @@ under the License.
>>>>     <PartyContactMechPurpose partyId="FrenchCustomer" contactMechId="FRENCHCUSTOMER" contactMechPurposeTypeId="BILLING_LOCATION" fromDate="2009-01-09 00:00:00.000"/>
>>>>     <PartyContactMechPurpose partyId="FrenchCustomer" contactMechId="FRENCHCUSTOMER" contactMechPurposeTypeId="SHIPPING_LOCATION" fromDate="2009-01-09 00:00:00.000"/>
>>>>     <PartyContactMechPurpose partyId="FrenchCustomer" contactMechId="FRENCHCUSTOMER" contactMechPurposeTypeId="GENERAL_LOCATION" fromDate="2009-01-09 00:00:00.000"/>
>>>> -    <ContactMech contactMechId="FRA01" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>>>> +    <ContactMech contactMechId="FRA01" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>>>     <PartyContactMech partyId="FrenchCustomer" contactMechId="FRA01" fromDate="2009-01-09 00:00:00.000" allowSolicitation="Y"/>
>>>>     <PartyContactMechPurpose partyId="FrenchCustomer" contactMechId="FRA01" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2009-01-09 00:00:00.000"/>
>>>>
>>>>
>>>> Modified: ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml
>>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml?rev=938446&r1=938445&r2=938446&view=diff
>>>> ==============================================================================
>>>> --- ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml (original)
>>>> +++ ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml Tue Apr 27 13:17:45 2010
>>>> @@ -23,7 +23,7 @@ under the License.
>>>>
>>>>     <ContactMech contactMechId="9200" contactMechTypeId="POSTAL_ADDRESS"/>
>>>>     <ContactMech contactMechId="9201" contactMechTypeId="TELECOM_NUMBER"/>
>>>> -    <ContactMech contactMechId="9202" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>>>> +    <ContactMech contactMechId="9202" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>>>     <PostalAddress contactMechId="9200" toName="Company XYZ" attnName="ZJAA" address1="2003 Open Blvd" city="Orem" postalCode="84058" countryGeoId="USA" stateProvinceGeoId="UT" geoPointId="9000"/>
>>>>     <TelecomNumber contactMechId="9201" areaCode="801" contactNumber="555-5555"/>
>>>>     <FacilityContactMech facilityId="WebStoreWarehouse" contactMechId="9200" fromDate="2001-05-13 12:00:00.0"/>
>>>> @@ -97,34 +97,34 @@ under the License.
>>>>     <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="EXT_COD" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService="" paymentCustomMethodId=""/>
>>>>     <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="EXT_BILLACT" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService="" paymentCustomMethodId=""/>
>>>>
>>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_CONFIRM" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNotice" xslfoAttachScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNoticePdf" subject="OFBiz Demo - Order Confirmation #${orderId}" bccAddress="ofbiztest@yahoo.com" fromAddress="ofbiztest@yahoo.com"/>
>>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderCompleteNotice" subject="OFBiz Demo - Your Order Is Complete #${orderId}" fromAddress="ofbiztest@yahoo.com"/>
>>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_BACKORDER" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#BackorderNotice" subject="OFBiz Demo - Backorder Notification #${orderId}" fromAddress="ofbiztest@yahoo.com"/>
>>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_CHANGE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderChangeNotice" subject="OFBiz Demo - Order Change Notification #${orderId}" fromAddress="ofbiztest@yahoo.com"/>
>>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_PAYRETRY" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#PaymentRetryNotice" subject="OFBiz Demo - Order Payment Notification #${orderId}" fromAddress="ofbiztest@yahoo.com"/>
>>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_SHIP_COMPLT" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#ShipmentCompleteNotice" subject="OFBiz Demo - Shipment Complete Notification #${orderId}" fromAddress="ofbiztest@yahoo.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_CONFIRM" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNotice" xslfoAttachScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNoticePdf" subject="OFBiz Demo - Order Confirmation #${orderId}" bccAddress="ofbiztesting@gmail.com" fromAddress="ofbiztesting@gmail.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderCompleteNotice" subject="OFBiz Demo - Your Order Is Complete #${orderId}" fromAddress="ofbiztesting@gmail.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_BACKORDER" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#BackorderNotice" subject="OFBiz Demo - Backorder Notification #${orderId}" fromAddress="ofbiztesting@gmail.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_CHANGE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderChangeNotice" subject="OFBiz Demo - Order Change Notification #${orderId}" fromAddress="ofbiztesting@gmail.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_PAYRETRY" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#PaymentRetryNotice" subject="OFBiz Demo - Order Payment Notification #${orderId}" fromAddress="ofbiztesting@gmail.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_SHIP_COMPLT" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#ShipmentCompleteNotice" subject="OFBiz Demo - Shipment Complete Notification #${orderId}" fromAddress="ofbiztesting@gmail.com"/>
>>>>
>>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_RTN_ACCEPT" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnAccept" subject="OFBiz Demo - Return Accepted #${returnHeader.returnId}" fromAddress="ofbiztest@yahoo.com"/>
>>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_RTN_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnComplete" subject="OFBiz Demo - Return Completed #${returnHeader.returnId}" fromAddress="ofbiztest@yahoo.com"/>
>>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_RTN_CANCEL" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnCancel" subject="OFBiz Demo - Return Cancelled #${returnHeader.returnId}" fromAddress="ofbiztest@yahoo.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_RTN_ACCEPT" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnAccept" subject="OFBiz Demo - Return Accepted #${returnHeader.returnId}" fromAddress="ofbiztesting@gmail.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_RTN_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnComplete" subject="OFBiz Demo - Return Completed #${returnHeader.returnId}" fromAddress="ofbiztesting@gmail.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_RTN_CANCEL" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnCancel" subject="OFBiz Demo - Return Cancelled #${returnHeader.returnId}" fromAddress="ofbiztesting@gmail.com"/>
>>>>
>>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_GC_PURCHASE" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardPurchase" fromAddress="ofbiztest@yahoo.com" subject="A Gift From ${senderName}!"/>
>>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_GC_RELOAD" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardReload" fromAddress="ofbiztest@yahoo.com" subject="Gift Card Reload Results"/>
>>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_GC_PURCHASE" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardPurchase" fromAddress="ofbiztesting@gmail.com" subject="A Gift From ${senderName}!"/>
>>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_GC_RELOAD" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardReload" fromAddress="ofbiztesting@gmail.com" subject="Gift Card Reload Results"/>
>>>>
>>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_TELL_FRIEND" bodyScreenLocation="component://ecommerce/widget/EmailProductScreens.xml#TellFriend" subject="${sendFrom} has sent you a link!" fromAddress="ofbiztest@yahoo.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_TELL_FRIEND" bodyScreenLocation="component://ecommerce/widget/EmailProductScreens.xml#TellFriend" subject="${sendFrom} has sent you a link!" fromAddress="ofbiztesting@gmail.com"/>
>>>>
>>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_PWD_RETRIEVE" bodyScreenLocation="component://securityext/widget/EmailSecurityScreens.xml#PasswordEmail" subject="OFBiz Demo - Password Reminder (${userLogin.userLoginId})" fromAddress="ofbiztest@yahoo.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_PWD_RETRIEVE" bodyScreenLocation="component://securityext/widget/EmailSecurityScreens.xml#PasswordEmail" subject="OFBiz Demo - Password Reminder (${userLogin.userLoginId})" fromAddress="ofbiztesting@gmail.com"/>
>>>>
>>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_QUO_CONFIRM" bodyScreenLocation="component://order/widget/ordermgr/QuoteScreens.xml#ViewQuoteSimple" xslfoAttachScreenLocation="component://order/widget/ordermgr/QuoteScreens.xml#QuoteReport" subject="OFBiz Demo - Quote Confirmation #${quoteId}" bccAddress="ofbiztest@yahoo.com" fromAddress="ofbiztest@yahoo.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_QUO_CONFIRM" bodyScreenLocation="component://order/widget/ordermgr/QuoteScreens.xml#ViewQuoteSimple" xslfoAttachScreenLocation="component://order/widget/ordermgr/QuoteScreens.xml#QuoteReport" subject="OFBiz Demo - Quote Confirmation #${quoteId}" bccAddress="ofbiztesting@gmail.com" fromAddress="ofbiztesting@gmail.com"/>
>>>>
>>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PARTY_REGIS_CONFIRM" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#CreatePartyNotification" subject="New Account Created" bccAddress="ofbiztest@yahoo.com" fromAddress="ofbiztest@yahoo.com"/>
>>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_CUST_REGISTER" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#CreatePartyNotification" subject="New Account Created" bccAddress="ofbiztest@yahoo.com" fromAddress="ofbiztest@yahoo.com"/>
>>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="UPD_PRSNL_INF_CNFRM" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#ChangePersonalInfoNotification" subject="Personal Information Updated" bccAddress="ofbiztest@yahoo.com" fromAddress="ofbiztest@yahoo.com"/>
>>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_EMAIL_VERIFY" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#VerifyEmailAddressNotification" subject="Email Address Verification" bccAddress="ofbiztest@yahoo.com" fromAddress="ofbiztest@yahoo.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PARTY_REGIS_CONFIRM" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#CreatePartyNotification" subject="New Account Created" bccAddress="ofbiztesting@gmail.com" fromAddress="ofbiztesting@gmail.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_CUST_REGISTER" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#CreatePartyNotification" subject="New Account Created" bccAddress="ofbiztesting@gmail.com" fromAddress="ofbiztesting@gmail.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="UPD_PRSNL_INF_CNFRM" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#ChangePersonalInfoNotification" subject="Personal Information Updated" bccAddress="ofbiztesting@gmail.com" fromAddress="ofbiztesting@gmail.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_EMAIL_VERIFY" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#VerifyEmailAddressNotification" subject="Email Address Verification" bccAddress="ofbiztesting@gmail.com" fromAddress="ofbiztesting@gmail.com"/>
>>>>
>>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="CONT_NOTI_EMAIL" bodyScreenLocation="component://ecommerce/widget/EmailContactListScreens.xml#ContactUsEmailNotification" subject="Contact-us Information Notification" fromAddress="ofbiztest@yahoo.com" />
>>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="CONT_NOTI_EMAIL" bodyScreenLocation="component://ecommerce/widget/EmailContactListScreens.xml#ContactUsEmailNotification" subject="Contact-us Information Notification" fromAddress="ofbiztesting@gmail.com" />
>>>>
>>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="UNSUB_CONT_LIST_NOTI" bodyScreenLocation="component://ecommerce/widget/EmailContactListScreens.xml#ContactListUnsubscribeEmail" subject="Unsubscribe Contact List" fromAddress="ofbiztest@yahoo.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="UNSUB_CONT_LIST_NOTI" bodyScreenLocation="component://ecommerce/widget/EmailContactListScreens.xml#ContactListUnsubscribeEmail" subject="Unsubscribe Contact List" fromAddress="ofbiztesting@gmail.com"/>
>>>>
>>>>     <WebAnalyticsConfig productStoreId="9000" webAnalyticsTypeId="GOOGLE_ANALYTICS" webAnalyticsCode="123456" isEnabled="Y" description="This is code provided from google analytics" contentId="GOOGLE_ANA_CNT"/>
>>>>     <WebAnalyticsConfig productStoreId="9000" webAnalyticsTypeId="BING_ANALYTICS" webAnalyticsCode="123456" isEnabled="Y" description="This is code provided from bing analytics" contentId="BING_ANA_CNT"/>
>>>>
>>>> Modified: ofbiz/trunk/specialpurpose/ecommerce/data/DemoRentalProduct.xml
>>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/DemoRentalProduct.xml?rev=938446&r1=938445&r2=938446&view=diff
>>>> ==============================================================================
>>>> --- ofbiz/trunk/specialpurpose/ecommerce/data/DemoRentalProduct.xml (original)
>>>> +++ ofbiz/trunk/specialpurpose/ecommerce/data/DemoRentalProduct.xml Tue Apr 27 13:17:45 2010
>>>> @@ -45,22 +45,22 @@ headerLogo="/images/opentravelsystem_log
>>>>     <ProductStorePaymentSetting productStoreId="RentalStore" paymentMethodTypeId="EXT_PAYPAL" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService="" paymentCustomMethodId="" paymentGatewayConfigId="PAYPAL_CONFIG"/>
>>>>     <ProductStorePaymentSetting productStoreId="RentalStore" paymentMethodTypeId="EXT_WORLDPAY" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService="" paymentCustomMethodId="" paymentGatewayConfigId="WORLDPAY_CONFIG"/>
>>>>
>>>> -    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_CONFIRM" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNotice" xslfoAttachScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNoticePdf" subject="OFBiz Demo - Order Confirmation #${orderId}" bccAddress="ofbiztest@yahoo.com" fromAddress="ofbiztest@yahoo.com"/>
>>>> -    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderCompleteNotice" subject="OFBiz Demo - Your Order Is Complete #${orderId}" fromAddress="ofbiztest@yahoo.com"/>
>>>> -    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_BACKORDER" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#BackorderNotice" subject="OFBiz Demo - Backorder Notification #${orderId}" fromAddress="ofbiztest@yahoo.com"/>
>>>> -    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_CHANGE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderChangeNotice" subject="OFBiz Demo - Order Change Notification #${orderId}" fromAddress="ofbiztest@yahoo.com"/>
>>>> -    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_PAYRETRY" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#PaymentRetryNotice" subject="OFBiz Demo - Order Payment Notification #${orderId}" fromAddress="ofbiztest@yahoo.com"/>
>>>> -
>>>> -    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_RTN_ACCEPT" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnAccept" subject="OFBiz Demo - Return Accepted #${returnHeader.returnId}" fromAddress="ofbiztest@yahoo.com"/>
>>>> -    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_RTN_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnComplete" subject="OFBiz Demo - Return Completed #${returnHeader.returnId}" fromAddress="ofbiztest@yahoo.com"/>
>>>> -    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_RTN_CANCEL" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnCancel" subject="OFBiz Demo - Return Cancelled #${returnHeader.returnId}" fromAddress="ofbiztest@yahoo.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_CONFIRM" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNotice" xslfoAttachScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNoticePdf" subject="OFBiz Demo - Order Confirmation #${orderId}" bccAddress="ofbiztesting@gmail.com" fromAddress="ofbiztesting@gmail.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderCompleteNotice" subject="OFBiz Demo - Your Order Is Complete #${orderId}" fromAddress="ofbiztesting@gmail.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_BACKORDER" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#BackorderNotice" subject="OFBiz Demo - Backorder Notification #${orderId}" fromAddress="ofbiztesting@gmail.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_CHANGE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderChangeNotice" subject="OFBiz Demo - Order Change Notification #${orderId}" fromAddress="ofbiztesting@gmail.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_PAYRETRY" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#PaymentRetryNotice" subject="OFBiz Demo - Order Payment Notification #${orderId}" fromAddress="ofbiztesting@gmail.com"/>
>>>> +
>>>> +    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_RTN_ACCEPT" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnAccept" subject="OFBiz Demo - Return Accepted #${returnHeader.returnId}" fromAddress="ofbiztesting@gmail.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_RTN_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnComplete" subject="OFBiz Demo - Return Completed #${returnHeader.returnId}" fromAddress="ofbiztesting@gmail.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_RTN_CANCEL" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnCancel" subject="OFBiz Demo - Return Cancelled #${returnHeader.returnId}" fromAddress="ofbiztesting@gmail.com"/>
>>>>
>>>> -    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_GC_PURCHASE" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardPurchase" fromAddress="ofbiztest@yahoo.com" subject="A Gift From ${senderName}!"/>
>>>> -    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_GC_RELOAD" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardReload" fromAddress="ofbiztest@yahoo.com" subject="Gift Card Reload Results"/>
>>>> +    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_GC_PURCHASE" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardPurchase" fromAddress="ofbiztesting@gmail.com" subject="A Gift From ${senderName}!"/>
>>>> +    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_GC_RELOAD" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardReload" fromAddress="ofbiztesting@gmail.com" subject="Gift Card Reload Results"/>
>>>>
>>>> -    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_TELL_FRIEND" bodyScreenLocation="component://ecommerce/widget/EmailProductScreens.xml#TellFriend" subject="${sendFrom} has sent you a link!" fromAddress="ofbiztest@yahoo.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_TELL_FRIEND" bodyScreenLocation="component://ecommerce/widget/EmailProductScreens.xml#TellFriend" subject="${sendFrom} has sent you a link!" fromAddress="ofbiztesting@gmail.com"/>
>>>>
>>>> -    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_PWD_RETRIEVE" bodyScreenLocation="component://securityext/widget/EmailSecurityScreens.xml#PasswordEmail" subject="OFBiz Demo - Password Reminder (${userLoginId})" fromAddress="ofbiztest@yahoo.com"/>
>>>> +    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_PWD_RETRIEVE" bodyScreenLocation="component://securityext/widget/EmailSecurityScreens.xml#PasswordEmail" subject="OFBiz Demo - Password Reminder (${userLoginId})" fromAddress="ofbiztesting@gmail.com"/>
>>>>
>>>>     <ProductStoreFacility productStoreId="RentalStore" facilityId="WebStoreWarehouse" fromDate="2001-05-13 12:00:00.0"/>
>>>>     <ProductStoreRole partyId="admin" roleTypeId="SALES_REP" productStoreId="RentalStore" fromDate="2001-05-13 12:00:00.0"/>
>>>>
>>>> Modified: ofbiz/trunk/specialpurpose/googlebase/data/DemoGoogleBaseData.xml
>>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/data/DemoGoogleBaseData.xml?rev=938446&r1=938445&r2=938446&view=diff
>>>> ==============================================================================
>>>> --- ofbiz/trunk/specialpurpose/googlebase/data/DemoGoogleBaseData.xml (original)
>>>> +++ ofbiz/trunk/specialpurpose/googlebase/data/DemoGoogleBaseData.xml Tue Apr 27 13:17:45 2010
>>>> @@ -20,5 +20,5 @@ under the License.
>>>>
>>>> <entity-engine-xml>
>>>>     <WebSite webSiteId="GOOGLEBASE" standardContentPrefix="http://demo.ofbiz.org" productStoreId="9000" />
>>>> -    <GoogleBaseConfig productStoreId="9000" developerKey="HKLh9khgVieditoO0b4JR2fnBT2yXp_ZAY8_yft3CFXhHIE1NvwkxQ1pZ4qyVEGh_FtRe5KtJPTKDorNP" authenticationUrl="https://www.google.com/accounts/ClientLogin" accountEmail="ofbiztest@yahoo.com" accountPassword="47ca69ebb4bdc9ae0adec130880165d2cc05db1a" postItemsUrl="http://www.google.com/base/feeds/items/batch" webSiteId="GOOGLEBASE"/>
>>>> +    <GoogleBaseConfig productStoreId="9000" developerKey="HKLh9khgVieditoO0b4JR2fnBT2yXp_ZAY8_yft3CFXhHIE1NvwkxQ1pZ4qyVEGh_FtRe5KtJPTKDorNP" authenticationUrl="https://www.google.com/accounts/ClientLogin" accountEmail="ofbiztesting@gmail.com" accountPassword="47ca69ebb4bdc9ae0adec130880165d2cc05db1a" postItemsUrl="http://www.google.com/base/feeds/items/batch" webSiteId="GOOGLEBASE"/>
>>>> </entity-engine-xml>
>>>> \ No newline at end of file
>>>>
>>>> Modified: ofbiz/trunk/specialpurpose/workflow/data/OrderProcessWorkflow.xml
>>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/data/OrderProcessWorkflow.xml?rev=938446&r1=938445&r2=938446&view=diff
>>>> ==============================================================================
>>>> --- ofbiz/trunk/specialpurpose/workflow/data/OrderProcessWorkflow.xml (original)
>>>> +++ ofbiz/trunk/specialpurpose/workflow/data/OrderProcessWorkflow.xml Tue Apr 27 13:17:45 2010
>>>> @@ -23,7 +23,7 @@ under the License.
>>>>     <WorkflowPackage packageId="org.ofbiz.order" packageVersion="20030730144901" packageName="" description="Demo Order Processing Workflow" specificationVersion="0.03" specificationId="XPDL" sourceVendorInfo="OFBiz.org" creationDateTime="2002-12-03 00:00:00.0" author="Andy Zeneski" publicationStatusId="WPS_UNDER_REVISION" graphConformanceEnumId="WGC_FULL_BLOCKED" priorityUomId="P" costUomId="USD" responsibleListId="10002" documentationUrl="None"/>
>>>>     <WorkflowProcess packageId="org.ofbiz.order" packageVersion="20030730144901" processId="ProcessOrder" processVersion="20030730144901" objectName="Processes incoming orders" objectPriority="5" description="Order Processing Workflow" creationDateTime="2002-12-01 12:00:00.0" author="OFBiz" publicationStatusId="WPS_UNDER_REVISION" timeLimit="12.0" validFromDate="2002-12-01 12:00:00.0" validToDate="2012-12-01 12:00:00.0" responsibleListId="10003" durationUomId="h" duration="3.0" waitingTime="2.0" defaultStartActivityId="receiveOrder" sourceReferenceField="orderId"/>
>>>>
>>>> -    <WorkflowDataField packageId="org.ofbiz.order" packageVersion="20030730144901" processId="ProcessOrder" processVersion="20030730144901" dataFieldId="adminEmailList" dataFieldName="adminEmailList" initialValue="ofbiztest@yahoo.com" dataTypeEnumId="WDT_STRING" isArray="N"/>
>>>> +    <WorkflowDataField packageId="org.ofbiz.order" packageVersion="20030730144901" processId="ProcessOrder" processVersion="20030730144901" dataFieldId="adminEmailList" dataFieldName="adminEmailList" initialValue="ofbiztesting@gmail.com" dataTypeEnumId="WDT_STRING" isArray="N"/>
>>>>     <WorkflowFormalParam packageId="org.ofbiz.order" packageVersion="20030730144901" processId="ProcessOrder" processVersion="20030730144901" applicationId="_NA_" formalParamId="orderId" indexNumber="1" modeEnumId="WPM_IN" description="The order number" dataTypeEnumId="WDT_STRING"/>
>>>>
>>>>     <WorkflowParticipant packageId="org.ofbiz.order" packageVersion="20030730144901" processId="_NA_" processVersion="_NA_" participantId="BUYER" participantName="Purchase Order Approval Role" description="Reviews and approves/rejects orders" participantTypeId="ROLE"/>
>>>>
>>>>
>>>
>>>
>
>

Re: svn commit: r938446 - in /ofbiz/trunk: applications/accounting/data/ applications/content/data/ applications/marketing/data/ applications/order/servicedef/ applications/party/data/ applications/party/script/org/ofbiz/party/test/ debian/ framework

Posted by Tim Ruppert <ti...@hotwaxmedia.com>.
Go for the latter - something that isn't real.

Cheers,
Ruppert

On Apr 29, 2010, at 9:48 PM, Ashish Vijaywargiya wrote:

> I am thinking to revert my commit. Actually I saw more benefit in
> keeping gmail account settings but yes I agree from your point which
> is very important.
> 
> I think it would be fine if we keep the old email address as it
> is(ofbiztest@yahoo.com) not a valid email address and no accidental
> email will be generated.
> 
> or
> 
> We are fine in changing ofbiztest@yahoo.com to test@example.com.
> 
> LMK your thoughts on this!
> Thanks!
> 
> --
> Ashish
> 
> On Wed, Apr 28, 2010 at 11:01 AM, Scott Gray <sc...@hotwaxmedia.com> wrote:
>> On 28/04/2010, at 4:50 PM, Adam Heath wrote:
>> 
>>> Scott Gray wrote:
>>>> The only thing that makes me uncomfortable about it is that partially complete implementations could accidentally send emails to the address and result in the people who are in control of the account perhaps knowing about implementations that are supposed to be private.  I don't doubt for a second that this wouldn't happen on a regular basis.
>>> 
>>> Installation of ofbiz requires doing a set of changes, to make it work
>>> with whatever deployment requirements there are.  Some features don't
>>> need to be configured, if they aren't used.  However, if you want to
>>> use email reception, then this will just have to be one of those
>>> required configurations.
>> 
>> People make mistakes, making the default a real email account of an unknown third party just increases the consequences of the mistake.
>> 
>> Besides, who gets to control this account?  The only way for it to be useful to everyone is for everyone to have access and I can't see how that would work well.
>> 
>> Regards
>> Scott
>> 
>> 


Re: svn commit: r938446 - in /ofbiz/trunk: applications/accounting/data/ applications/content/data/ applications/marketing/data/ applications/order/servicedef/ applications/party/data/ applications/party/script/org/ofbiz/party/test/ debian/ framework

Posted by Ashish Vijaywargiya <vi...@gmail.com>.
I am thinking to revert my commit. Actually I saw more benefit in
keeping gmail account settings but yes I agree from your point which
is very important.

I think it would be fine if we keep the old email address as it
is(ofbiztest@yahoo.com) not a valid email address and no accidental
email will be generated.

or

We are fine in changing ofbiztest@yahoo.com to test@example.com.

LMK your thoughts on this!
Thanks!

--
Ashish

On Wed, Apr 28, 2010 at 11:01 AM, Scott Gray <sc...@hotwaxmedia.com> wrote:
> On 28/04/2010, at 4:50 PM, Adam Heath wrote:
>
>> Scott Gray wrote:
>>> The only thing that makes me uncomfortable about it is that partially complete implementations could accidentally send emails to the address and result in the people who are in control of the account perhaps knowing about implementations that are supposed to be private.  I don't doubt for a second that this wouldn't happen on a regular basis.
>>
>> Installation of ofbiz requires doing a set of changes, to make it work
>> with whatever deployment requirements there are.  Some features don't
>> need to be configured, if they aren't used.  However, if you want to
>> use email reception, then this will just have to be one of those
>> required configurations.
>
> People make mistakes, making the default a real email account of an unknown third party just increases the consequences of the mistake.
>
> Besides, who gets to control this account?  The only way for it to be useful to everyone is for everyone to have access and I can't see how that would work well.
>
> Regards
> Scott
>
>

Re: svn commit: r938446 - in /ofbiz/trunk: applications/accounting/data/ applications/content/data/ applications/marketing/data/ applications/order/servicedef/ applications/party/data/ applications/party/script/org/ofbiz/party/test/ debian/ framework

Posted by Scott Gray <sc...@hotwaxmedia.com>.
On 28/04/2010, at 4:50 PM, Adam Heath wrote:

> Scott Gray wrote:
>> The only thing that makes me uncomfortable about it is that partially complete implementations could accidentally send emails to the address and result in the people who are in control of the account perhaps knowing about implementations that are supposed to be private.  I don't doubt for a second that this wouldn't happen on a regular basis.
> 
> Installation of ofbiz requires doing a set of changes, to make it work
> with whatever deployment requirements there are.  Some features don't
> need to be configured, if they aren't used.  However, if you want to
> use email reception, then this will just have to be one of those
> required configurations.

People make mistakes, making the default a real email account of an unknown third party just increases the consequences of the mistake.

Besides, who gets to control this account?  The only way for it to be useful to everyone is for everyone to have access and I can't see how that would work well.

Regards
Scott


Re: svn commit: r938446 - in /ofbiz/trunk: applications/accounting/data/ applications/content/data/ applications/marketing/data/ applications/order/servicedef/ applications/party/data/ applications/party/script/org/ofbiz/party/test/ debian/ framework

Posted by Adam Heath <do...@brainfood.com>.
Scott Gray wrote:
> The only thing that makes me uncomfortable about it is that partially complete implementations could accidentally send emails to the address and result in the people who are in control of the account perhaps knowing about implementations that are supposed to be private.  I don't doubt for a second that this wouldn't happen on a regular basis.

Installation of ofbiz requires doing a set of changes, to make it work
with whatever deployment requirements there are.  Some features don't
need to be configured, if they aren't used.  However, if you want to
use email reception, then this will just have to be one of those
required configurations.

Re: svn commit: r938446 - in /ofbiz/trunk: applications/accounting/data/ applications/content/data/ applications/marketing/data/ applications/order/servicedef/ applications/party/data/ applications/party/script/org/ofbiz/party/test/ debian/ framework

Posted by Scott Gray <sc...@hotwaxmedia.com>.
The only thing that makes me uncomfortable about it is that partially complete implementations could accidentally send emails to the address and result in the people who are in control of the account perhaps knowing about implementations that are supposed to be private.  I don't doubt for a second that this wouldn't happen on a regular basis.

Regards
Scott

On 28/04/2010, at 3:09 PM, Ashish Vijaywargiya wrote:

> Hello Scott,
> 
> I agree from you but I would prefer to have this gmail account
> settings as it is because I(or someone else) can test mail fetching by
> enabling only JavaMail container settings in ofbiz-containers.xml. One
> more important thing I can't test anything sent on test@example.com
> but can do on gmail.com.
> 
> For few days lets keep this settings as it is then if we see some
> problems then we will change it in future.
> Thanks for your comments!
> 
> --
> Ashish
> 
> 
> On Tue, Apr 27, 2010 at 6:58 PM, Scott Gray <sc...@hotwaxmedia.com> wrote:
>> Personally I would prefer it if we used test@example.com
>> The example.com domain exists exactly for this sort of thing and the emails don't bounce (I believe).
>> 
>> Regards
>> Scott
>> 
>> HotWax Media
>> http://www.hotwaxmedia.com
>> 
>> On 28/04/2010, at 1:17 AM, ashish@apache.org wrote:
>> 
>>> Author: ashish
>>> Date: Tue Apr 27 13:17:45 2010
>>> New Revision: 938446
>>> 
>>> URL: http://svn.apache.org/viewvc?rev=938446&view=rev
>>> Log:
>>> Changing email address ofbiztest@yahoo.com -> ofbiztesting@gmail.com - this was creating too much problem since long in development effort.
>>> 
>>> Following points were there in my mind before doing this change.
>>> 
>>> -- AFAIK ofbiztest@yahoo.com email doesn't exists.
>>> -- Bounce email issue if you have enabled Javamail container. This drastically slow down your system performance.
>>> -- Now anyone can use ofbiztesting@gmail.com account settings for Sendmail, Javamail container etc.
>>> -- Send mail service triggered again and again with failure message on console if any of the email not found bccAddress inside ProductStoreEmailSettings entity. Again slow speed of your development machine.
>>> -- Please let me know where to share the password of this account? Dev list?
>>> 
>>> Modified:
>>>    ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml
>>>    ofbiz/trunk/applications/content/data/UsersDemoData.xml
>>>    ofbiz/trunk/applications/marketing/data/sfaDemoData.xml
>>>    ofbiz/trunk/applications/order/servicedef/orderProcessXPDL.xml
>>>    ofbiz/trunk/applications/party/data/PartyDemoData.xml
>>>    ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyContactMechTests.xml
>>>    ofbiz/trunk/debian/TODO
>>>    ofbiz/trunk/debian/override-data.xslt
>>>    ofbiz/trunk/framework/common/config/general.properties
>>>    ofbiz/trunk/framework/common/script/org/ofbiz/common/email/EmailServices.xml
>>>    ofbiz/trunk/specialpurpose/ebaystore/data/DemoEbayStoreData.xml
>>>    ofbiz/trunk/specialpurpose/ecommerce/data/DemoMarketing.xml
>>>    ofbiz/trunk/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml
>>>    ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml
>>>    ofbiz/trunk/specialpurpose/ecommerce/data/DemoRentalProduct.xml
>>>    ofbiz/trunk/specialpurpose/googlebase/data/DemoGoogleBaseData.xml
>>>    ofbiz/trunk/specialpurpose/workflow/data/OrderProcessWorkflow.xml
>>> 
>>> Modified: ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml?rev=938446&r1=938445&r2=938446&view=diff
>>> ==============================================================================
>>> --- ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml (original)
>>> +++ ofbiz/trunk/applications/accounting/data/DemoOrganizationData.xml Tue Apr 27 13:17:45 2010
>>> @@ -28,7 +28,7 @@ under the License.
>>>     <ContactMech contactMechId="9000" contactMechTypeId="POSTAL_ADDRESS"/>
>>>     <PartyContactMech partyId="Company" contactMechId="9000" fromDate="2000-01-01 00:00:00.000" allowSolicitation="Y"/>
>>>     <PostalAddress contactMechId="9000" toName="Company XYZ" address1="2003 Open Blvd" city="Open City" postalCode="999999" countryGeoId="USA" stateProvinceGeoId="CA" geoPointId="9000"/>
>>> -    <ContactMech contactMechId="Company" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>>> +    <ContactMech contactMechId="Company" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>>     <PartyContactMech partyId="Company" contactMechId="Company" fromDate="2000-01-01 00:00:00.000" allowSolicitation="Y"/>
>>>     <PartyContactMechPurpose contactMechPurposeTypeId="PRIMARY_EMAIL" partyId="Company" contactMechId="Company" fromDate="2003-01-01 00:00:00.000"/>
>>>     <PartyContactMechPurpose partyId="Company" contactMechId="9000" contactMechPurposeTypeId="BILLING_LOCATION" fromDate="2000-01-01 00:00:00.000"/>
>>> 
>>> Modified: ofbiz/trunk/applications/content/data/UsersDemoData.xml
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/data/UsersDemoData.xml?rev=938446&r1=938445&r2=938446&view=diff
>>> ==============================================================================
>>> --- ofbiz/trunk/applications/content/data/UsersDemoData.xml (original)
>>> +++ ofbiz/trunk/applications/content/data/UsersDemoData.xml Tue Apr 27 13:17:45 2010
>>> @@ -47,19 +47,19 @@ under the License.
>>>     <PartyRole partyId="BLOG_EDITOR" roleTypeId="CONTENT_PUBLISHER"/>
>>>     <PartyRole partyId="BLOG_EDITOR" roleTypeId="_NA_"/>
>>> 
>>> -    <ContactMech contactMechId="ADMIN_CONTACT" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>>> +    <ContactMech contactMechId="ADMIN_CONTACT" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>>     <PartyContactMech partyId="BLOG_ADMIN" contactMechId="ADMIN_CONTACT" fromDate="2001-05-13 12:00:00.0"/>
>>>     <PartyContactMechPurpose partyId="BLOG_ADMIN" contactMechId="ADMIN_CONTACT" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2001-05-13 12:00:00.0"/>
>>> 
>>> -    <ContactMech contactMechId="AUTHOR_CONTACT" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>>> +    <ContactMech contactMechId="AUTHOR_CONTACT" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>>     <PartyContactMech partyId="BLOG_AUTHOR" contactMechId="AUTHOR_CONTACT" fromDate="2001-05-13 12:00:00.0"/>
>>>     <PartyContactMechPurpose partyId="BLOG_AUTHOR" contactMechId="AUTHOR_CONTACT" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2001-05-13 12:00:00.0"/>
>>> 
>>> -    <ContactMech contactMechId="EDITOR_CONTACT" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>>> +    <ContactMech contactMechId="EDITOR_CONTACT" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>>     <PartyContactMech partyId="BLOG_EDITOR" contactMechId="EDITOR_CONTACT" fromDate="2001-05-13 12:00:00.0"/>
>>>     <PartyContactMechPurpose partyId="BLOG_EDITOR" contactMechId="EDITOR_CONTACT" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2001-05-13 12:00:00.0"/>
>>> 
>>> -    <ContactMech contactMechId="GUEST_CONTACT" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>>> +    <ContactMech contactMechId="GUEST_CONTACT" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>>     <PartyContactMech partyId="BLOG_GUEST" contactMechId="GUEST_CONTACT" fromDate="2001-05-13 12:00:00.0"/>
>>>     <PartyContactMechPurpose partyId="BLOG_GUEST" contactMechId="GUEST_CONTACT" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2001-05-13 12:00:00.0"/>
>>> </entity-engine-xml>
>>> 
>>> Modified: ofbiz/trunk/applications/marketing/data/sfaDemoData.xml
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/data/sfaDemoData.xml?rev=938446&r1=938445&r2=938446&view=diff
>>> ==============================================================================
>>> --- ofbiz/trunk/applications/marketing/data/sfaDemoData.xml (original)
>>> +++ ofbiz/trunk/applications/marketing/data/sfaDemoData.xml Tue Apr 27 13:17:45 2010
>>> @@ -26,7 +26,7 @@
>>>     <PartyRole partyId="sfa100" roleTypeId="ACCOUNT"/>
>>>     <ContactMech contactMechId="sfa100" contactMechTypeId="POSTAL_ADDRESS"/>
>>>     <ContactMech contactMechId="sfa101" contactMechTypeId="TELECOM_NUMBER"/>
>>> -    <ContactMech contactMechId="sfa102" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>>> +    <ContactMech contactMechId="sfa102" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>>     <PostalAddress contactMechId="sfa100" address1="151 Madison street." city="Edison" postalCode="32451" lastUpdatedStamp="2008-05-23 11:57:40.936" lastUpdatedTxStamp="2008-05-23 11:57:39.476" createdStamp="2008-05-23 11:57:40.936" createdTxStamp="2008-05-23 11:57:39.476"/>
>>>     <TelecomNumber contactMechId="sfa101" countryCode="1" areaCode="33" contactNumber="12456" lastUpdatedStamp="2008-05-23 11:57:41.179" lastUpdatedTxStamp="2008-05-23 11:57:39.476" createdStamp="2008-05-23 11:57:41.179" createdTxStamp="2008-05-23 11:57:39.476"/>
>>>     <PartyContactMech partyId="sfa100" contactMechId="sfa100" fromDate="2000-01-01 00:00:00.000"/>
>>> 
>>> Modified: ofbiz/trunk/applications/order/servicedef/orderProcessXPDL.xml
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/servicedef/orderProcessXPDL.xml?rev=938446&r1=938445&r2=938446&view=diff
>>> ==============================================================================
>>> --- ofbiz/trunk/applications/order/servicedef/orderProcessXPDL.xml (original)
>>> +++ ofbiz/trunk/applications/order/servicedef/orderProcessXPDL.xml Tue Apr 27 13:17:45 2010
>>> @@ -90,7 +90,7 @@ under the License.
>>>                     <DataType>
>>>                         <BasicType Type="STRING"/>
>>>                     </DataType>
>>> -                    <InitialValue>ofbiztest@yahoo.com</InitialValue>
>>> +                    <InitialValue>ofbiztesting@gmail.com</InitialValue>
>>>                 </DataField>
>>>             </DataFields>
>>> 
>>> 
>>> Modified: ofbiz/trunk/applications/party/data/PartyDemoData.xml
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/data/PartyDemoData.xml?rev=938446&r1=938445&r2=938446&view=diff
>>> ==============================================================================
>>> --- ofbiz/trunk/applications/party/data/PartyDemoData.xml (original)
>>> +++ ofbiz/trunk/applications/party/data/PartyDemoData.xml Tue Apr 27 13:17:45 2010
>>> @@ -29,7 +29,7 @@
>>>     <PartyRole partyId="DemoEmployee" roleTypeId="EMAIL_ADMIN"/>
>>>     <PartyRelationship partyIdFrom="DemoEmployee" roleTypeIdFrom="EMAIL_ADMIN" partyIdTo="Company" roleTypeIdTo="_NA_" fromDate="2000-01-01 00:00:00"/>
>>> 
>>> -    <ContactMech contactMechId="admin" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>>> +    <ContactMech contactMechId="admin" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>>     <PartyContactMech partyId="admin" contactMechId="admin" fromDate="2003-01-01 00:00:00.0" allowSolicitation="Y"/>
>>>     <PartyContactMechPurpose contactMechPurposeTypeId="PRIMARY_EMAIL" partyId="admin" contactMechId="admin" fromDate="2003-01-01 00:00:00.0"/>
>>> 
>>> @@ -40,10 +40,10 @@
>>>     <PartyIdentification partyId="DemoSupplier" partyIdentificationTypeId="SIRET" idValue="1234 5678 90123"/>
>>> 
>>>     <!-- email from an unknown party -->
>>> -    <CommunicationEvent communicationEventId="9000" communicationEventTypeId="EMAIL_COMMUNICATION" statusId="COM_UNKNOWN_PARTY" contactMechTypeId="EMAIL_ADDRESS" contactMechIdTo="admin" roleTypeIdFrom="_NA_" roleTypeIdTo="_NA_" partyIdTo="admin" entryDate="2008-07-28 13:55:55.827" datetimeStarted="2008-07-28 13:55:19.0" subject="Why i would use the OFBiz system" contentMimeTypeId="text/plain" content="Every time i think of you, only you...you are always on my mind......." note="Sent from: my@email.com; Sent Name from: Jo Easy User; Sent to: ofbiztest@yahoo.com; Delivered-To: ofbiztest@yahoo.com; " fromString="mailinglist@antwebsystems.com" toString="ofbiztest@yahoo.com"/>
>>> +    <CommunicationEvent communicationEventId="9000" communicationEventTypeId="EMAIL_COMMUNICATION" statusId="COM_UNKNOWN_PARTY" contactMechTypeId="EMAIL_ADDRESS" contactMechIdTo="admin" roleTypeIdFrom="_NA_" roleTypeIdTo="_NA_" partyIdTo="admin" entryDate="2008-07-28 13:55:55.827" datetimeStarted="2008-07-28 13:55:19.0" subject="Why i would use the OFBiz system" contentMimeTypeId="text/plain" content="Every time i think of you, only you...you are always on my mind......." note="Sent from: my@email.com; Sent Name from: Jo Easy User; Sent to: ofbiztesting@gmail.com; Delivered-To: ofbiztesting@gmail.com; " fromString="mailinglist@antwebsystems.com" toString="ofbiztesting@gmail.com"/>
>>>     <PartyRole partyId="admin" roleTypeId="ADDRESSEE"/>
>>>     <CommunicationEventRole communicationEventId="9000" partyId="admin" roleTypeId="ADDRESSEE" contactMechId="admin" statusId="COM_ROLE_CREATED"/>
>>> 
>>>     <!-- new registration notification -->
>>> -    <EmailTemplateSetting emailTemplateSettingId="PARTY_REGISTER" bodyScreenLocation="component://party/widget/partymgr/PartyScreens.xml#CreateUserNotification" subject="New Account Created" bccAddress="ofbiztest@yahoo.com" fromAddress="ofbiztest@yahoo.com"/>
>>> +    <EmailTemplateSetting emailTemplateSettingId="PARTY_REGISTER" bodyScreenLocation="component://party/widget/partymgr/PartyScreens.xml#CreateUserNotification" subject="New Account Created" bccAddress="ofbiztesting@gmail.com" fromAddress="ofbiztesting@gmail.com"/>
>>> </entity-engine-xml>
>>> 
>>> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyContactMechTests.xml
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyContactMechTests.xml?rev=938446&r1=938445&r2=938446&view=diff
>>> ==============================================================================
>>> --- ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyContactMechTests.xml (original)
>>> +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/test/PartyContactMechTests.xml Tue Apr 27 13:17:45 2010
>>> @@ -26,7 +26,7 @@ under the License.
>>>         <set field="contactMechTypeId" value="EMAIL_ADDRESS"/>
>>>         <!-- first try with just updating without changing the email address -->
>>>         <set field="serviceCtx.partyId" from-field="partyId"/>
>>> -        <set field="serviceCtx.emailAddress" value="ofbiztest@yahoo.com"/>
>>> +        <set field="serviceCtx.emailAddress" value="ofbiztesting@gmail.com"/>
>>>         <set field="serviceCtx.contactMechId" value="9026"/>
>>>         <entity-one entity-name="UserLogin" value-field="userLogin">
>>>             <field-map field-name="userLoginId" value="system"/>
>>> 
>>> Modified: ofbiz/trunk/debian/TODO
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/debian/TODO?rev=938446&r1=938445&r2=938446&view=diff
>>> ==============================================================================
>>> --- ofbiz/trunk/debian/TODO (original)
>>> +++ ofbiz/trunk/debian/TODO Tue Apr 27 13:17:45 2010
>>> @@ -19,7 +19,7 @@
>>> * debian/copyright
>>> - Prompt for:
>>>   - ofbiz admin password(s)
>>> -  - default email(ofbiztest@yahoo.com)
>>> +  - default email(ofbiztesting@gmail.com)
>>>   - install of demo or just seed data
>>> * Auto-generate admin key/port
>>> * Move demo data into separate package?
>>> 
>>> Modified: ofbiz/trunk/debian/override-data.xslt
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/debian/override-data.xslt?rev=938446&r1=938445&r2=938446&view=diff
>>> ==============================================================================
>>> --- ofbiz/trunk/debian/override-data.xslt (original)
>>> +++ ofbiz/trunk/debian/override-data.xslt Tue Apr 27 13:17:45 2010
>>> @@ -108,13 +108,13 @@ under the License.
>>> 
>>>  <xsl:template mode="data" match="
>>>   ProductStoreEmailSetting[
>>> -   @bccAddress='ofbiztest@yahoo.com' or
>>> -   @fromAddress='ofbiztest@yahoo.com']|ContactList[
>>> -   @verifyEmailFrom='ofbiztest@yahoo.com'
>>> +   @bccAddress='ofbiztesting@gmail.com' or
>>> +   @fromAddress='ofbiztesting@gmail.com']|ContactList[
>>> +   @verifyEmailFrom='ofbiztesting@gmail.com'
>>>   ]|ContactMech[
>>> -   @infoString='ofbiztest@yahoo.com'
>>> +   @infoString='ofbiztesting@gmail.com'
>>>   ]|WorkflowDataField[
>>> -   @initialValue='ofbiztest@yahoo.com'
>>> +   @initialValue='ofbiztesting@gmail.com'
>>>   ]|UserLogin[
>>>    @currentPassword='47ca69ebb4bdc9ae0adec130880165d2cc05db1a'
>>>   ]">
>>> @@ -126,7 +126,7 @@ under the License.
>>>  <xsl:template mode="match" match="ProductStoreEmailSetting/@bccAddress|ProductStoreEmailSetting/@fromAddress|ProductStoreEmailSetting/@verifyEmailFrom|ContactMech/@infoString|ContactList/@verifyEmailFrom|WorkflowDataField/@initialValue">
>>>   <xsl:attribute name="{name()}">
>>>    <xsl:choose>
>>> -    <xsl:when test=". = 'ofbiztest@yahoo.com'"><xsl:value-of select="$fromemail"/></xsl:when>
>>> +    <xsl:when test=". = 'ofbiztesting@gmail.com'"><xsl:value-of select="$fromemail"/></xsl:when>
>>>     <xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
>>>    </xsl:choose>
>>>   </xsl:attribute>
>>> 
>>> Modified: ofbiz/trunk/framework/common/config/general.properties
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/general.properties?rev=938446&r1=938445&r2=938446&view=diff
>>> ==============================================================================
>>> --- ofbiz/trunk/framework/common/config/general.properties (original)
>>> +++ ofbiz/trunk/framework/common/config/general.properties Tue Apr 27 13:17:45 2010
>>> @@ -64,7 +64,7 @@ partner.trackingCodeId.default=
>>> usps.address.match=(^.*?p[\\. ]*o[\\. ]*box.*$)|(^.*?post.*?office.*?box.*$)|((^|(^.*? ))r[\\. ]*r[\\. ]*(( +)|([0-9#]+)).*$)|(^.*?rural.*?route.*$)
>>> 
>>> # -- general default 'fromEmailAddress' can be overridden in: EmailTemplateSetting
>>> -defaultFromEmailAddress=ofbiztest@yahoo.com
>>> +defaultFromEmailAddress=ofbiztesting@gmail.com
>>> 
>>> # -- The default domainname used in the notification emails links
>>> # as 'baseUrl' and 'baseSecureUrl' are set in the url.properties file.
>>> 
>>> Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/email/EmailServices.xml
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/email/EmailServices.xml?rev=938446&r1=938445&r2=938446&view=diff
>>> ==============================================================================
>>> --- ofbiz/trunk/framework/common/script/org/ofbiz/common/email/EmailServices.xml (original)
>>> +++ ofbiz/trunk/framework/common/script/org/ofbiz/common/email/EmailServices.xml Tue Apr 27 13:17:45 2010
>>> @@ -50,7 +50,7 @@ under the License.
>>>             <if-not-empty field="emailTemplateSetting.fromAddress">
>>>                 <set field="emailParams.sendFrom" from-field="emailTemplateSetting.fromAddress"/>
>>>                 <else>
>>> -                    <property-to-field resource="general" property="defaultFromEmailAddress" field="emailParams.sendFrom" default="ofbiztest@yahoo.com"/>
>>> +                    <property-to-field resource="general" property="defaultFromEmailAddress" field="emailParams.sendFrom" default="ofbiztesting@gmail.com"/>
>>>                 </else>
>>>             </if-not-empty>
>>>             <set field="emailParams.sendCc" from-field="emailTemplateSetting.ccAddress"/>
>>> 
>>> Modified: ofbiz/trunk/specialpurpose/ebaystore/data/DemoEbayStoreData.xml
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/data/DemoEbayStoreData.xml?rev=938446&r1=938445&r2=938446&view=diff
>>> ==============================================================================
>>> --- ofbiz/trunk/specialpurpose/ebaystore/data/DemoEbayStoreData.xml (original)
>>> +++ ofbiz/trunk/specialpurpose/ebaystore/data/DemoEbayStoreData.xml Tue Apr 27 13:17:45 2010
>>> @@ -92,9 +92,9 @@
>>>     <Content contentId="EBAY_ITEM_DISPATCH" contentTypeId="DOCUMENT" dataResourceId="EBAY_ITEM_DISPATCH" ownerContentId="EBAY_ITEM_DISPATCH" statusId="CTNT_IN_PROGRESS"/>
>>>     <ContentRole contentId="EBAY_ITEM_DISPATCH" partyId="DemoEbayAccount" roleTypeId="OWNER" fromDate="2010-01-01 00:00:00.000"/>
>>> 
>>> -    <ProductStoreEmailSetting productStoreId="90100" emailType="EBAY_WIN_BUYER_NOTI" bccAddress="ofbiztest@yahoo.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#WinnigBuyerNotification" fromAddress="ofbiztest@yahoo.com" subject="OFBiz Demo - Winnig Buyer Notification #${buyerUserId}" xslfoAttachScreenLocation=""/>
>>> -    <ProductStoreEmailSetting productStoreId="90100" emailType="EBAY_PAY_RECIEVED" bccAddress="ofbiztest@yahoo.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#PaymentRecieved" fromAddress="ofbiztest@yahoo.com" subject="OFBiz Demo - PaymentRecieved #${buyerUserId}" xslfoAttachScreenLocation=""/>
>>> -    <ProductStoreEmailSetting productStoreId="90100" emailType="EBAY_FEEBACK_REMIN" bccAddress="ofbiztest@yahoo.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#FeedbackReminder" fromAddress="ofbiztest@yahoo.com" subject="OFBiz Demo - Feedback Reminder #${buyerUserId}" xslfoAttachScreenLocation=""/>
>>> -    <ProductStoreEmailSetting productStoreId="90100" emailType="EBAY_ITEM_DISPATCH" bccAddress="ofbiztest@yahoo.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#EbayEmailTemplate" fromAddress="ofbiztest@yahoo.com" subject="OFBiz Demo - Item Dispatched Notification #${buyerUserId}" xslfoAttachScreenLocation=""/>
>>> +    <ProductStoreEmailSetting productStoreId="90100" emailType="EBAY_WIN_BUYER_NOTI" bccAddress="ofbiztesting@gmail.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#WinnigBuyerNotification" fromAddress="ofbiztesting@gmail.com" subject="OFBiz Demo - Winnig Buyer Notification #${buyerUserId}" xslfoAttachScreenLocation=""/>
>>> +    <ProductStoreEmailSetting productStoreId="90100" emailType="EBAY_PAY_RECIEVED" bccAddress="ofbiztesting@gmail.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#PaymentRecieved" fromAddress="ofbiztesting@gmail.com" subject="OFBiz Demo - PaymentRecieved #${buyerUserId}" xslfoAttachScreenLocation=""/>
>>> +    <ProductStoreEmailSetting productStoreId="90100" emailType="EBAY_FEEBACK_REMIN" bccAddress="ofbiztesting@gmail.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#FeedbackReminder" fromAddress="ofbiztesting@gmail.com" subject="OFBiz Demo - Feedback Reminder #${buyerUserId}" xslfoAttachScreenLocation=""/>
>>> +    <ProductStoreEmailSetting productStoreId="90100" emailType="EBAY_ITEM_DISPATCH" bccAddress="ofbiztesting@gmail.com" bodyScreenLocation="component://ebaystore/widget/EbayEmailScreens.xml#EbayEmailTemplate" fromAddress="ofbiztesting@gmail.com" subject="OFBiz Demo - Item Dispatched Notification #${buyerUserId}" xslfoAttachScreenLocation=""/>
>>> 
>>> </entity-engine-xml>
>>> 
>>> Modified: ofbiz/trunk/specialpurpose/ecommerce/data/DemoMarketing.xml
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/DemoMarketing.xml?rev=938446&r1=938445&r2=938446&view=diff
>>> ==============================================================================
>>> --- ofbiz/trunk/specialpurpose/ecommerce/data/DemoMarketing.xml (original)
>>> +++ ofbiz/trunk/specialpurpose/ecommerce/data/DemoMarketing.xml Tue Apr 27 13:17:45 2010
>>> @@ -23,11 +23,11 @@ under the License.
>>> 
>>>     <ContactList contactListId="9000" contactListTypeId="ANNOUNCEMENT" contactMechTypeId="EMAIL_ADDRESS" marketingCampaignId="9000"
>>>         contactListName="New Product Announcements" description="New Product Announcements Mailing List (email)" comments="" isPublic="Y" ownerPartyId="Company"
>>> -        verifyEmailFrom="ofbiztest@yahoo.com" verifyEmailScreen="component://ecommerce/widget/EmailContactListScreens.xml#ContactListVerifyEmail"
>>> +        verifyEmailFrom="ofbiztesting@gmail.com" verifyEmailScreen="component://ecommerce/widget/EmailContactListScreens.xml#ContactListVerifyEmail"
>>>         verifyEmailSubject="Subscription Verify Email" verifyEmailWebSiteId="WebStore"/>
>>>     <ContactList contactListId="9010" contactListTypeId="NEWSLETTER" contactMechTypeId="EMAIL_ADDRESS" marketingCampaignId="9000"
>>>         contactListName="Product Tips Newsletter" description="Product Tips Newsletter Mailing List (email)" comments="" isPublic="Y" ownerPartyId="Company"
>>> -        verifyEmailFrom="ofbiztest@yahoo.com" verifyEmailScreen="component://ecommerce/widget/EmailContactListScreens.xml#ContactListVerifyEmail"
>>> +        verifyEmailFrom="ofbiztesting@gmail.com" verifyEmailScreen="component://ecommerce/widget/EmailContactListScreens.xml#ContactListVerifyEmail"
>>>         verifyEmailSubject="Subscription Verify Email" verifyEmailWebSiteId="WebStore"/>
>>> 
>>>     <ContactListParty contactListId="9000" partyId="DemoCustCompany" preferredContactMechId="9021" statusId="CLPT_ACCEPTED" fromDate="2001-05-13 00:00:00"/>
>>> 
>>> Modified: ofbiz/trunk/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml?rev=938446&r1=938445&r2=938446&view=diff
>>> ==============================================================================
>>> --- ofbiz/trunk/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml (original)
>>> +++ ofbiz/trunk/specialpurpose/ecommerce/data/DemoOrderPeopleData.xml Tue Apr 27 13:17:45 2010
>>> @@ -78,7 +78,7 @@ under the License.
>>>     <TelecomNumber contactMechId="9020" areaCode="801" contactNumber="555-5555"/>
>>>     <PartyContactMech partyId="DemoCustCompany" contactMechId="9020" fromDate="2001-05-13 00:00:00.000" allowSolicitation="Y"/>
>>>     <PartyContactMechPurpose partyId="DemoCustCompany" contactMechId="9020" contactMechPurposeTypeId="PHONE_WORK" fromDate="2001-05-13 00:00:00.000"/>
>>> -    <ContactMech contactMechId="9021" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>>> +    <ContactMech contactMechId="9021" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>>     <PartyContactMech partyId="DemoCustCompany" contactMechId="9021" fromDate="2001-05-13 00:00:00.000" allowSolicitation="Y"/>
>>>     <PartyContactMechPurpose partyId="DemoCustCompany" contactMechId="9021" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2001-05-13 00:00:00.000"/>
>>> 
>>> @@ -104,7 +104,7 @@ under the License.
>>>     <TelecomNumber contactMechId="9022" areaCode="801" contactNumber="555-5555"/>
>>>     <PartyContactMech partyId="DemoCustAgent" contactMechId="9022" fromDate="2001-05-13 00:00:00.000" allowSolicitation="Y"/>
>>>     <PartyContactMechPurpose partyId="DemoCustAgent" contactMechId="9022" contactMechPurposeTypeId="PHONE_WORK" fromDate="2001-05-13 00:00:00.000"/>
>>> -    <ContactMech contactMechId="9023" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>>> +    <ContactMech contactMechId="9023" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>>     <PartyContactMech partyId="DemoCustAgent" contactMechId="9023" fromDate="2001-05-13 00:00:00.000" allowSolicitation="Y"/>
>>>     <PartyContactMechPurpose partyId="DemoCustAgent" contactMechId="9023" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2001-05-13 00:00:00.000"/>
>>> 
>>> @@ -139,7 +139,7 @@ under the License.
>>>     <PartyContactMechPurpose partyId="DemoCustomer" contactMechId="9025" contactMechPurposeTypeId="PHONE_HOME" fromDate="2001-05-13 00:00:00.000"/>
>>>     <PartyContactMechPurpose partyId="DemoCustomer" contactMechId="9025" contactMechPurposeTypeId="PHONE_SHIPPING" fromDate="2001-05-13 00:00:00.000"/>
>>>     <PartyContactMechPurpose partyId="DemoCustomer" contactMechId="9027" contactMechPurposeTypeId="PHONE_BILLING" fromDate="2001-05-13 00:00:00.000"/>
>>> -    <ContactMech contactMechId="9026" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>>> +    <ContactMech contactMechId="9026" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>>     <PartyContactMech partyId="DemoCustomer" contactMechId="9026" fromDate="2001-05-13 00:00:00.000" allowSolicitation="Y"/>
>>>     <PartyContactMechPurpose partyId="DemoCustomer" contactMechId="9026" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2001-05-13 00:00:00.000"/>
>>> 
>>> @@ -165,7 +165,7 @@ under the License.
>>>     <PartyContactMechPurpose partyId="EuroCustomer" contactMechId="EUROCUSTOMER" contactMechPurposeTypeId="BILLING_LOCATION" fromDate="2001-05-13 00:00:00.000"/>
>>>     <PartyContactMechPurpose partyId="EuroCustomer" contactMechId="EUROCUSTOMER" contactMechPurposeTypeId="SHIPPING_LOCATION" fromDate="2001-05-13 00:00:00.000"/>
>>>     <PartyContactMechPurpose partyId="EuroCustomer" contactMechId="EUROCUSTOMER" contactMechPurposeTypeId="GENERAL_LOCATION" fromDate="2001-05-13 00:00:00.000"/>
>>> -    <ContactMech contactMechId="EURO01" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>>> +    <ContactMech contactMechId="EURO01" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>>     <PartyContactMech partyId="EuroCustomer" contactMechId="EURO01" fromDate="2001-05-13 00:00:00.000" allowSolicitation="Y"/>
>>>     <PartyContactMechPurpose partyId="EuroCustomer" contactMechId="EURO01" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2001-05-13 00:00:00.000"/>
>>> 
>>> @@ -191,7 +191,7 @@ under the License.
>>>     <PartyContactMechPurpose partyId="FrenchCustomer" contactMechId="FRENCHCUSTOMER" contactMechPurposeTypeId="BILLING_LOCATION" fromDate="2009-01-09 00:00:00.000"/>
>>>     <PartyContactMechPurpose partyId="FrenchCustomer" contactMechId="FRENCHCUSTOMER" contactMechPurposeTypeId="SHIPPING_LOCATION" fromDate="2009-01-09 00:00:00.000"/>
>>>     <PartyContactMechPurpose partyId="FrenchCustomer" contactMechId="FRENCHCUSTOMER" contactMechPurposeTypeId="GENERAL_LOCATION" fromDate="2009-01-09 00:00:00.000"/>
>>> -    <ContactMech contactMechId="FRA01" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>>> +    <ContactMech contactMechId="FRA01" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>>     <PartyContactMech partyId="FrenchCustomer" contactMechId="FRA01" fromDate="2009-01-09 00:00:00.000" allowSolicitation="Y"/>
>>>     <PartyContactMechPurpose partyId="FrenchCustomer" contactMechId="FRA01" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2009-01-09 00:00:00.000"/>
>>> 
>>> 
>>> Modified: ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml?rev=938446&r1=938445&r2=938446&view=diff
>>> ==============================================================================
>>> --- ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml (original)
>>> +++ ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml Tue Apr 27 13:17:45 2010
>>> @@ -23,7 +23,7 @@ under the License.
>>> 
>>>     <ContactMech contactMechId="9200" contactMechTypeId="POSTAL_ADDRESS"/>
>>>     <ContactMech contactMechId="9201" contactMechTypeId="TELECOM_NUMBER"/>
>>> -    <ContactMech contactMechId="9202" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztest@yahoo.com"/>
>>> +    <ContactMech contactMechId="9202" contactMechTypeId="EMAIL_ADDRESS" infoString="ofbiztesting@gmail.com"/>
>>>     <PostalAddress contactMechId="9200" toName="Company XYZ" attnName="ZJAA" address1="2003 Open Blvd" city="Orem" postalCode="84058" countryGeoId="USA" stateProvinceGeoId="UT" geoPointId="9000"/>
>>>     <TelecomNumber contactMechId="9201" areaCode="801" contactNumber="555-5555"/>
>>>     <FacilityContactMech facilityId="WebStoreWarehouse" contactMechId="9200" fromDate="2001-05-13 12:00:00.0"/>
>>> @@ -97,34 +97,34 @@ under the License.
>>>     <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="EXT_COD" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService="" paymentCustomMethodId=""/>
>>>     <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="EXT_BILLACT" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService="" paymentCustomMethodId=""/>
>>> 
>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_CONFIRM" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNotice" xslfoAttachScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNoticePdf" subject="OFBiz Demo - Order Confirmation #${orderId}" bccAddress="ofbiztest@yahoo.com" fromAddress="ofbiztest@yahoo.com"/>
>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderCompleteNotice" subject="OFBiz Demo - Your Order Is Complete #${orderId}" fromAddress="ofbiztest@yahoo.com"/>
>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_BACKORDER" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#BackorderNotice" subject="OFBiz Demo - Backorder Notification #${orderId}" fromAddress="ofbiztest@yahoo.com"/>
>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_CHANGE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderChangeNotice" subject="OFBiz Demo - Order Change Notification #${orderId}" fromAddress="ofbiztest@yahoo.com"/>
>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_PAYRETRY" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#PaymentRetryNotice" subject="OFBiz Demo - Order Payment Notification #${orderId}" fromAddress="ofbiztest@yahoo.com"/>
>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_SHIP_COMPLT" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#ShipmentCompleteNotice" subject="OFBiz Demo - Shipment Complete Notification #${orderId}" fromAddress="ofbiztest@yahoo.com"/>
>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_CONFIRM" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNotice" xslfoAttachScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNoticePdf" subject="OFBiz Demo - Order Confirmation #${orderId}" bccAddress="ofbiztesting@gmail.com" fromAddress="ofbiztesting@gmail.com"/>
>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderCompleteNotice" subject="OFBiz Demo - Your Order Is Complete #${orderId}" fromAddress="ofbiztesting@gmail.com"/>
>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_BACKORDER" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#BackorderNotice" subject="OFBiz Demo - Backorder Notification #${orderId}" fromAddress="ofbiztesting@gmail.com"/>
>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_CHANGE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderChangeNotice" subject="OFBiz Demo - Order Change Notification #${orderId}" fromAddress="ofbiztesting@gmail.com"/>
>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_PAYRETRY" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#PaymentRetryNotice" subject="OFBiz Demo - Order Payment Notification #${orderId}" fromAddress="ofbiztesting@gmail.com"/>
>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_SHIP_COMPLT" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#ShipmentCompleteNotice" subject="OFBiz Demo - Shipment Complete Notification #${orderId}" fromAddress="ofbiztesting@gmail.com"/>
>>> 
>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_RTN_ACCEPT" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnAccept" subject="OFBiz Demo - Return Accepted #${returnHeader.returnId}" fromAddress="ofbiztest@yahoo.com"/>
>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_RTN_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnComplete" subject="OFBiz Demo - Return Completed #${returnHeader.returnId}" fromAddress="ofbiztest@yahoo.com"/>
>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_RTN_CANCEL" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnCancel" subject="OFBiz Demo - Return Cancelled #${returnHeader.returnId}" fromAddress="ofbiztest@yahoo.com"/>
>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_RTN_ACCEPT" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnAccept" subject="OFBiz Demo - Return Accepted #${returnHeader.returnId}" fromAddress="ofbiztesting@gmail.com"/>
>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_RTN_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnComplete" subject="OFBiz Demo - Return Completed #${returnHeader.returnId}" fromAddress="ofbiztesting@gmail.com"/>
>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_RTN_CANCEL" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnCancel" subject="OFBiz Demo - Return Cancelled #${returnHeader.returnId}" fromAddress="ofbiztesting@gmail.com"/>
>>> 
>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_GC_PURCHASE" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardPurchase" fromAddress="ofbiztest@yahoo.com" subject="A Gift From ${senderName}!"/>
>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_GC_RELOAD" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardReload" fromAddress="ofbiztest@yahoo.com" subject="Gift Card Reload Results"/>
>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_GC_PURCHASE" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardPurchase" fromAddress="ofbiztesting@gmail.com" subject="A Gift From ${senderName}!"/>
>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_GC_RELOAD" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardReload" fromAddress="ofbiztesting@gmail.com" subject="Gift Card Reload Results"/>
>>> 
>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_TELL_FRIEND" bodyScreenLocation="component://ecommerce/widget/EmailProductScreens.xml#TellFriend" subject="${sendFrom} has sent you a link!" fromAddress="ofbiztest@yahoo.com"/>
>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_TELL_FRIEND" bodyScreenLocation="component://ecommerce/widget/EmailProductScreens.xml#TellFriend" subject="${sendFrom} has sent you a link!" fromAddress="ofbiztesting@gmail.com"/>
>>> 
>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_PWD_RETRIEVE" bodyScreenLocation="component://securityext/widget/EmailSecurityScreens.xml#PasswordEmail" subject="OFBiz Demo - Password Reminder (${userLogin.userLoginId})" fromAddress="ofbiztest@yahoo.com"/>
>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_PWD_RETRIEVE" bodyScreenLocation="component://securityext/widget/EmailSecurityScreens.xml#PasswordEmail" subject="OFBiz Demo - Password Reminder (${userLogin.userLoginId})" fromAddress="ofbiztesting@gmail.com"/>
>>> 
>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_QUO_CONFIRM" bodyScreenLocation="component://order/widget/ordermgr/QuoteScreens.xml#ViewQuoteSimple" xslfoAttachScreenLocation="component://order/widget/ordermgr/QuoteScreens.xml#QuoteReport" subject="OFBiz Demo - Quote Confirmation #${quoteId}" bccAddress="ofbiztest@yahoo.com" fromAddress="ofbiztest@yahoo.com"/>
>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_QUO_CONFIRM" bodyScreenLocation="component://order/widget/ordermgr/QuoteScreens.xml#ViewQuoteSimple" xslfoAttachScreenLocation="component://order/widget/ordermgr/QuoteScreens.xml#QuoteReport" subject="OFBiz Demo - Quote Confirmation #${quoteId}" bccAddress="ofbiztesting@gmail.com" fromAddress="ofbiztesting@gmail.com"/>
>>> 
>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PARTY_REGIS_CONFIRM" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#CreatePartyNotification" subject="New Account Created" bccAddress="ofbiztest@yahoo.com" fromAddress="ofbiztest@yahoo.com"/>
>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_CUST_REGISTER" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#CreatePartyNotification" subject="New Account Created" bccAddress="ofbiztest@yahoo.com" fromAddress="ofbiztest@yahoo.com"/>
>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="UPD_PRSNL_INF_CNFRM" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#ChangePersonalInfoNotification" subject="Personal Information Updated" bccAddress="ofbiztest@yahoo.com" fromAddress="ofbiztest@yahoo.com"/>
>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_EMAIL_VERIFY" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#VerifyEmailAddressNotification" subject="Email Address Verification" bccAddress="ofbiztest@yahoo.com" fromAddress="ofbiztest@yahoo.com"/>
>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PARTY_REGIS_CONFIRM" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#CreatePartyNotification" subject="New Account Created" bccAddress="ofbiztesting@gmail.com" fromAddress="ofbiztesting@gmail.com"/>
>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_CUST_REGISTER" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#CreatePartyNotification" subject="New Account Created" bccAddress="ofbiztesting@gmail.com" fromAddress="ofbiztesting@gmail.com"/>
>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="UPD_PRSNL_INF_CNFRM" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#ChangePersonalInfoNotification" subject="Personal Information Updated" bccAddress="ofbiztesting@gmail.com" fromAddress="ofbiztesting@gmail.com"/>
>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_EMAIL_VERIFY" bodyScreenLocation="component://party/widget/partymgr/EmailPartyScreens.xml#VerifyEmailAddressNotification" subject="Email Address Verification" bccAddress="ofbiztesting@gmail.com" fromAddress="ofbiztesting@gmail.com"/>
>>> 
>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="CONT_NOTI_EMAIL" bodyScreenLocation="component://ecommerce/widget/EmailContactListScreens.xml#ContactUsEmailNotification" subject="Contact-us Information Notification" fromAddress="ofbiztest@yahoo.com" />
>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="CONT_NOTI_EMAIL" bodyScreenLocation="component://ecommerce/widget/EmailContactListScreens.xml#ContactUsEmailNotification" subject="Contact-us Information Notification" fromAddress="ofbiztesting@gmail.com" />
>>> 
>>> -    <ProductStoreEmailSetting productStoreId="9000" emailType="UNSUB_CONT_LIST_NOTI" bodyScreenLocation="component://ecommerce/widget/EmailContactListScreens.xml#ContactListUnsubscribeEmail" subject="Unsubscribe Contact List" fromAddress="ofbiztest@yahoo.com"/>
>>> +    <ProductStoreEmailSetting productStoreId="9000" emailType="UNSUB_CONT_LIST_NOTI" bodyScreenLocation="component://ecommerce/widget/EmailContactListScreens.xml#ContactListUnsubscribeEmail" subject="Unsubscribe Contact List" fromAddress="ofbiztesting@gmail.com"/>
>>> 
>>>     <WebAnalyticsConfig productStoreId="9000" webAnalyticsTypeId="GOOGLE_ANALYTICS" webAnalyticsCode="123456" isEnabled="Y" description="This is code provided from google analytics" contentId="GOOGLE_ANA_CNT"/>
>>>     <WebAnalyticsConfig productStoreId="9000" webAnalyticsTypeId="BING_ANALYTICS" webAnalyticsCode="123456" isEnabled="Y" description="This is code provided from bing analytics" contentId="BING_ANA_CNT"/>
>>> 
>>> Modified: ofbiz/trunk/specialpurpose/ecommerce/data/DemoRentalProduct.xml
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/DemoRentalProduct.xml?rev=938446&r1=938445&r2=938446&view=diff
>>> ==============================================================================
>>> --- ofbiz/trunk/specialpurpose/ecommerce/data/DemoRentalProduct.xml (original)
>>> +++ ofbiz/trunk/specialpurpose/ecommerce/data/DemoRentalProduct.xml Tue Apr 27 13:17:45 2010
>>> @@ -45,22 +45,22 @@ headerLogo="/images/opentravelsystem_log
>>>     <ProductStorePaymentSetting productStoreId="RentalStore" paymentMethodTypeId="EXT_PAYPAL" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService="" paymentCustomMethodId="" paymentGatewayConfigId="PAYPAL_CONFIG"/>
>>>     <ProductStorePaymentSetting productStoreId="RentalStore" paymentMethodTypeId="EXT_WORLDPAY" paymentServiceTypeEnumId="PRDS_PAY_EXTERNAL" paymentService="" paymentCustomMethodId="" paymentGatewayConfigId="WORLDPAY_CONFIG"/>
>>> 
>>> -    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_CONFIRM" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNotice" xslfoAttachScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNoticePdf" subject="OFBiz Demo - Order Confirmation #${orderId}" bccAddress="ofbiztest@yahoo.com" fromAddress="ofbiztest@yahoo.com"/>
>>> -    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderCompleteNotice" subject="OFBiz Demo - Your Order Is Complete #${orderId}" fromAddress="ofbiztest@yahoo.com"/>
>>> -    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_BACKORDER" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#BackorderNotice" subject="OFBiz Demo - Backorder Notification #${orderId}" fromAddress="ofbiztest@yahoo.com"/>
>>> -    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_CHANGE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderChangeNotice" subject="OFBiz Demo - Order Change Notification #${orderId}" fromAddress="ofbiztest@yahoo.com"/>
>>> -    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_PAYRETRY" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#PaymentRetryNotice" subject="OFBiz Demo - Order Payment Notification #${orderId}" fromAddress="ofbiztest@yahoo.com"/>
>>> -
>>> -    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_RTN_ACCEPT" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnAccept" subject="OFBiz Demo - Return Accepted #${returnHeader.returnId}" fromAddress="ofbiztest@yahoo.com"/>
>>> -    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_RTN_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnComplete" subject="OFBiz Demo - Return Completed #${returnHeader.returnId}" fromAddress="ofbiztest@yahoo.com"/>
>>> -    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_RTN_CANCEL" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnCancel" subject="OFBiz Demo - Return Cancelled #${returnHeader.returnId}" fromAddress="ofbiztest@yahoo.com"/>
>>> +    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_CONFIRM" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNotice" xslfoAttachScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderConfirmNoticePdf" subject="OFBiz Demo - Order Confirmation #${orderId}" bccAddress="ofbiztesting@gmail.com" fromAddress="ofbiztesting@gmail.com"/>
>>> +    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderCompleteNotice" subject="OFBiz Demo - Your Order Is Complete #${orderId}" fromAddress="ofbiztesting@gmail.com"/>
>>> +    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_BACKORDER" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#BackorderNotice" subject="OFBiz Demo - Backorder Notification #${orderId}" fromAddress="ofbiztesting@gmail.com"/>
>>> +    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_CHANGE" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#OrderChangeNotice" subject="OFBiz Demo - Order Change Notification #${orderId}" fromAddress="ofbiztesting@gmail.com"/>
>>> +    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_ODR_PAYRETRY" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#PaymentRetryNotice" subject="OFBiz Demo - Order Payment Notification #${orderId}" fromAddress="ofbiztesting@gmail.com"/>
>>> +
>>> +    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_RTN_ACCEPT" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnAccept" subject="OFBiz Demo - Return Accepted #${returnHeader.returnId}" fromAddress="ofbiztesting@gmail.com"/>
>>> +    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_RTN_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnComplete" subject="OFBiz Demo - Return Completed #${returnHeader.returnId}" fromAddress="ofbiztesting@gmail.com"/>
>>> +    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_RTN_CANCEL" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnCancel" subject="OFBiz Demo - Return Cancelled #${returnHeader.returnId}" fromAddress="ofbiztesting@gmail.com"/>
>>> 
>>> -    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_GC_PURCHASE" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardPurchase" fromAddress="ofbiztest@yahoo.com" subject="A Gift From ${senderName}!"/>
>>> -    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_GC_RELOAD" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardReload" fromAddress="ofbiztest@yahoo.com" subject="Gift Card Reload Results"/>
>>> +    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_GC_PURCHASE" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardPurchase" fromAddress="ofbiztesting@gmail.com" subject="A Gift From ${senderName}!"/>
>>> +    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_GC_RELOAD" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardReload" fromAddress="ofbiztesting@gmail.com" subject="Gift Card Reload Results"/>
>>> 
>>> -    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_TELL_FRIEND" bodyScreenLocation="component://ecommerce/widget/EmailProductScreens.xml#TellFriend" subject="${sendFrom} has sent you a link!" fromAddress="ofbiztest@yahoo.com"/>
>>> +    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_TELL_FRIEND" bodyScreenLocation="component://ecommerce/widget/EmailProductScreens.xml#TellFriend" subject="${sendFrom} has sent you a link!" fromAddress="ofbiztesting@gmail.com"/>
>>> 
>>> -    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_PWD_RETRIEVE" bodyScreenLocation="component://securityext/widget/EmailSecurityScreens.xml#PasswordEmail" subject="OFBiz Demo - Password Reminder (${userLoginId})" fromAddress="ofbiztest@yahoo.com"/>
>>> +    <ProductStoreEmailSetting productStoreId="RentalStore" emailType="PRDS_PWD_RETRIEVE" bodyScreenLocation="component://securityext/widget/EmailSecurityScreens.xml#PasswordEmail" subject="OFBiz Demo - Password Reminder (${userLoginId})" fromAddress="ofbiztesting@gmail.com"/>
>>> 
>>>     <ProductStoreFacility productStoreId="RentalStore" facilityId="WebStoreWarehouse" fromDate="2001-05-13 12:00:00.0"/>
>>>     <ProductStoreRole partyId="admin" roleTypeId="SALES_REP" productStoreId="RentalStore" fromDate="2001-05-13 12:00:00.0"/>
>>> 
>>> Modified: ofbiz/trunk/specialpurpose/googlebase/data/DemoGoogleBaseData.xml
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/data/DemoGoogleBaseData.xml?rev=938446&r1=938445&r2=938446&view=diff
>>> ==============================================================================
>>> --- ofbiz/trunk/specialpurpose/googlebase/data/DemoGoogleBaseData.xml (original)
>>> +++ ofbiz/trunk/specialpurpose/googlebase/data/DemoGoogleBaseData.xml Tue Apr 27 13:17:45 2010
>>> @@ -20,5 +20,5 @@ under the License.
>>> 
>>> <entity-engine-xml>
>>>     <WebSite webSiteId="GOOGLEBASE" standardContentPrefix="http://demo.ofbiz.org" productStoreId="9000" />
>>> -    <GoogleBaseConfig productStoreId="9000" developerKey="HKLh9khgVieditoO0b4JR2fnBT2yXp_ZAY8_yft3CFXhHIE1NvwkxQ1pZ4qyVEGh_FtRe5KtJPTKDorNP" authenticationUrl="https://www.google.com/accounts/ClientLogin" accountEmail="ofbiztest@yahoo.com" accountPassword="47ca69ebb4bdc9ae0adec130880165d2cc05db1a" postItemsUrl="http://www.google.com/base/feeds/items/batch" webSiteId="GOOGLEBASE"/>
>>> +    <GoogleBaseConfig productStoreId="9000" developerKey="HKLh9khgVieditoO0b4JR2fnBT2yXp_ZAY8_yft3CFXhHIE1NvwkxQ1pZ4qyVEGh_FtRe5KtJPTKDorNP" authenticationUrl="https://www.google.com/accounts/ClientLogin" accountEmail="ofbiztesting@gmail.com" accountPassword="47ca69ebb4bdc9ae0adec130880165d2cc05db1a" postItemsUrl="http://www.google.com/base/feeds/items/batch" webSiteId="GOOGLEBASE"/>
>>> </entity-engine-xml>
>>> \ No newline at end of file
>>> 
>>> Modified: ofbiz/trunk/specialpurpose/workflow/data/OrderProcessWorkflow.xml
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/data/OrderProcessWorkflow.xml?rev=938446&r1=938445&r2=938446&view=diff
>>> ==============================================================================
>>> --- ofbiz/trunk/specialpurpose/workflow/data/OrderProcessWorkflow.xml (original)
>>> +++ ofbiz/trunk/specialpurpose/workflow/data/OrderProcessWorkflow.xml Tue Apr 27 13:17:45 2010
>>> @@ -23,7 +23,7 @@ under the License.
>>>     <WorkflowPackage packageId="org.ofbiz.order" packageVersion="20030730144901" packageName="" description="Demo Order Processing Workflow" specificationVersion="0.03" specificationId="XPDL" sourceVendorInfo="OFBiz.org" creationDateTime="2002-12-03 00:00:00.0" author="Andy Zeneski" publicationStatusId="WPS_UNDER_REVISION" graphConformanceEnumId="WGC_FULL_BLOCKED" priorityUomId="P" costUomId="USD" responsibleListId="10002" documentationUrl="None"/>
>>>     <WorkflowProcess packageId="org.ofbiz.order" packageVersion="20030730144901" processId="ProcessOrder" processVersion="20030730144901" objectName="Processes incoming orders" objectPriority="5" description="Order Processing Workflow" creationDateTime="2002-12-01 12:00:00.0" author="OFBiz" publicationStatusId="WPS_UNDER_REVISION" timeLimit="12.0" validFromDate="2002-12-01 12:00:00.0" validToDate="2012-12-01 12:00:00.0" responsibleListId="10003" durationUomId="h" duration="3.0" waitingTime="2.0" defaultStartActivityId="receiveOrder" sourceReferenceField="orderId"/>
>>> 
>>> -    <WorkflowDataField packageId="org.ofbiz.order" packageVersion="20030730144901" processId="ProcessOrder" processVersion="20030730144901" dataFieldId="adminEmailList" dataFieldName="adminEmailList" initialValue="ofbiztest@yahoo.com" dataTypeEnumId="WDT_STRING" isArray="N"/>
>>> +    <WorkflowDataField packageId="org.ofbiz.order" packageVersion="20030730144901" processId="ProcessOrder" processVersion="20030730144901" dataFieldId="adminEmailList" dataFieldName="adminEmailList" initialValue="ofbiztesting@gmail.com" dataTypeEnumId="WDT_STRING" isArray="N"/>
>>>     <WorkflowFormalParam packageId="org.ofbiz.order" packageVersion="20030730144901" processId="ProcessOrder" processVersion="20030730144901" applicationId="_NA_" formalParamId="orderId" indexNumber="1" modeEnumId="WPM_IN" description="The order number" dataTypeEnumId="WDT_STRING"/>
>>> 
>>>     <WorkflowParticipant packageId="org.ofbiz.order" packageVersion="20030730144901" processId="_NA_" processVersion="_NA_" participantId="BUYER" participantName="Purchase Order Approval Role" description="Reviews and approves/rejects orders" participantTypeId="ROLE"/>
>>> 
>>> 
>> 
>>