svn commit: r1148680 - in /ofbiz/trunk: applications/marketing/script/org/ofbiz/marketing/contact/ applications/marketing/servicedef/ applications/marketing/src/org/ofbiz/marketing/marketing/ specialpurpose/ecommerce/templates/email/ specialpurpose/eco...

[hansbak-2]

Author: hansbak
Date: Wed Jul 20 10:11:20 2011
New Revision: 1148680

URL: http://svn.apache.org/viewvc?rev=1148680&view=rev
Log:
change baselocation to baseLocation, a suggestion from Nicolas

Modified:
    ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml
    ofbiz/trunk/applications/marketing/servicedef/services.xml
    ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/marketing/MarketingServices.java
    ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListSubscribeEmail.ftl
    ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListVerifyEmail.ftl
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl
    ofbiz/trunk/specialpurpose/ecommerce/widget/EmailContactListScreens.xml

Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml?rev=1148680&r1=1148679&r2=1148680&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml (original)
+++ ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml Wed Jul 20 10:11:20 2011
@@ -131,9 +131,9 @@ under the License.
         <if-empty field="newEntity.fromDate"><now-timestamp field="newEntity.fromDate"/></if-empty>
 
         <create-value value-field="newEntity"/>
-        <set field="newEntity.baselocation" from-field="parameters.baselocation"/>
+        
         <set-service-fields service-name="createContactListPartyStatus" map="newEntity" to-map="createContactListPartyStatusMap"/>
-        <set field="createContactListPartyStatusMap.baselocation" from-field="parameters.baselocation"/>
+        <set field="createContactListPartyStatusMap.baseLocation" from-field="parameters.baseLocation"/>
         <call-service service-name="createContactListPartyStatus" in-map-name="createContactListPartyStatusMap"/>
     </simple-method>
     <simple-method method-name="updateContactListParty" short-description="Update Add Party To ContactList">
@@ -197,7 +197,7 @@ under the License.
                 <field-map field-name="userLoginId" value="system"/>
             </entity-one>
             <set field="updateContactListPartyMap.userLogin" from-field="systemUserLogin"/>
-            <set field="updateContactListPartyMap.baselocation" from-field="parameters.baselocation"/>
+            <set field="updateContactListPartyMap.baseLocation" from-field="parameters.baseLocation"/>
             <call-service service-name="updateContactListParty" in-map-name="updateContactListPartyMap"/>
             <else>
                 <add-error><fail-message message="Invalid verify code for the ${contactList.contactListName}"/></add-error>
@@ -236,7 +236,7 @@ under the License.
             <set field="updateContactListPartyMap.preferredContactMechId" from-field="partyContactWithPurposes[0].contactMechId"/>
             <set field="updateContactListPartyMap.statusId" value="CLPT_UNSUBS_PENDING"/>
             <set field="updateContactListPartyMap.userLogin" from-field="userLogin"/>
-            <set field="updateContactListPartyMap.baselocation" from-field="parameters.baselocation"/>
+            <set field="updateContactListPartyMap.baseLocation" from-field="parameters.baseLocation"/>
             <call-service service-name="updateContactListParty" in-map-name="updateContactListPartyMap"/>
             <else>
                 <add-error><fail-message message="The email address (${parameters.email}) does not have the Other Email Address as contact purpose."/></add-error>
@@ -389,7 +389,7 @@ under the License.
                 <set from-field="contactList" field="sendMailFromScreenMap.bodyParameters.contactList"/>
                 <set from-field="contactListParty" field="sendMailFromScreenMap.bodyParameters.contactListParty"/>
                 <set from-field="contactListPartyStatus" field="sendMailFromScreenMap.bodyParameters.contactListPartyStatus"/>
-                <set from-field="parameters.baselocation" field="sendMailFromScreenMap.bodyParameters.baselocation"/>
+                <set from-field="parameters.baseLocation" field="sendMailFromScreenMap.bodyParameters.baseLocation"/>
                 
                 <call-service service-name="sendMailFromScreen" in-map-name="sendMailFromScreenMap"/>
             </then>
@@ -495,7 +495,7 @@ under the License.
             <set field="bodyParameters.contactList" from-field="contactList"/>
             <set field="bodyParameters.contactListParty" from-field="contactListParty"/>
             <set field="bodyParameters.contactListPartyStatus" from-field="contactListPartyStatus"/>
-            <set field="bodyParameters.baselocation" from-field="parameters.baselocation"/>
+            <set field="bodyParameters.baseLocation" from-field="parameters.baseLocation"/>
             
             <set field="emailParams.bodyParameters" from-field="bodyParameters"/>
             <set field="emailParams.userLogin" from-field="userLogin"/>
@@ -571,7 +571,7 @@ under the License.
             <set field="bodyParameters.contactList" from-field="contactList"/>
             <set field="bodyParameters.contactListParty" from-field="contactListParty"/>
             <set field="bodyParameters.contactListPartyStatus" from-field="contactListPartyStatus"/>
-            <set field="bodyParameters.baselocation" from-field="parameters.baselocation"/>
+            <set field="bodyParameters.baseLocation" from-field="parameters.baseLocation"/>
             
             <set field="emailParams.webSiteId" from-field="contactList.verifyEmailWebSiteId"/>
             <set field="emailParams.bodyParameters" from-field="bodyParameters"/>

Modified: ofbiz/trunk/applications/marketing/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/servicedef/services.xml?rev=1148680&r1=1148679&r2=1148680&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/marketing/servicedef/services.xml Wed Jul 20 10:11:20 2011
@@ -77,7 +77,7 @@ under the License.
         <attribute name="contactListId" type="String" mode="IN" optional="false"/>
         <attribute name="email" type="String" mode="IN" optional="false"/>
         <attribute name="partyId" type="String" mode="IN" optional="true"/>
-        <attribute name="baselocation" type="String" mode="IN" optional="true"/>
+        <attribute name="baseLocation" type="String" mode="IN" optional="true"/>
     </service>
     <service name="unsubscribeContactListParty" engine="simple"
             location="component://marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml" invoke="unsubscribeContactListParty" auth="false">
@@ -86,7 +86,7 @@ under the License.
         <attribute name="contactListId" type="String" mode="IN" optional="false"/>
         <attribute name="email" type="String" mode="IN" optional="false"/>
         <attribute name="partyId" type="String" mode="IN" optional="true"/>
-        <attribute name="baselocation" type="String" mode="IN" optional="true"/>
+        <attribute name="baseLocation" type="String" mode="IN" optional="true"/>
     </service>
 
     <!-- MarketingCampaignRole Services -->
@@ -146,7 +146,7 @@ under the License.
         <description>Add Party to ContactList</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
-        <attribute name="baselocation" type="String" mode="IN" optional="true"/>
+        <attribute name="baseLocation" type="String" mode="IN" optional="true"/>
         <override name="fromDate" optional="true"/>
         <override name="statusId" optional="false"/>
     </service>
@@ -158,7 +158,7 @@ under the License.
         <attribute name="productStoreId" type="String" mode="INOUT" optional="true"/>
         <attribute name="contactListId" type="String" mode="INOUT" optional="true"/>
         <attribute name="optInVerifyCode" type="String" mode="IN" optional="true"/>
-        <attribute name="baselocation" type="String" mode="IN" optional="true"/>
+        <attribute name="baseLocation" type="String" mode="IN" optional="true"/>
         <override name="fromDate" optional="true"/>
     </service>
     <service name="updateContactListPartyNoUserLogin" default-entity-name="ContactListParty" engine="simple"
@@ -171,7 +171,7 @@ under the License.
         <attribute name="contactListId" type="String" mode="INOUT" optional="true"/>
         <attribute name="optInVerifyCode" type="String" mode="IN" optional="true"/>
         <attribute name="email" type="String" mode="IN" optional="true"/>
-        <attribute name="baselocation" type="String" mode="IN" optional="true"/>
+        <attribute name="baseLocation" type="String" mode="IN" optional="true"/>
         <override name="partyId" optional="true"/>
         <override name="fromDate" optional="true"/>
     </service>
@@ -195,7 +195,7 @@ under the License.
         <auto-attributes include="nonpk" mode="IN" optional="true">
             <exclude field-name="setByUserLoginId"/>
         </auto-attributes>
-        <attribute name="baselocation" type="String" mode="IN" optional="true"/>
+        <attribute name="baseLocation" type="String" mode="IN" optional="true"/>
         <attribute name="preferredContactMechId" mode="IN" type="String" optional="false"/>
         <override name="statusId" optional="false"/>
         <override name="fromDate" optional="true"/>
@@ -204,7 +204,7 @@ under the License.
         location="component://marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml" invoke="sendContactListPartyVerifyEmail" auth="true">
         <description>Send ContactListParty Verify Email</description>
         <auto-attributes entity-name="ContactListParty" include="pk" mode="IN" optional="false"/>
-        <attribute name="baselocation" type="String" mode="IN" optional="true"/>
+        <attribute name="baseLocation" type="String" mode="IN" optional="true"/>
     </service>
     <service name="optOutOfListFromCommEvent" engine="simple"
             location="component://marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml" invoke="optOutOfListFromCommEvent" auth="false">
@@ -220,7 +220,7 @@ under the License.
         <attribute name="preferredContactMechId" mode="IN" type="String" optional="false"/>
         <attribute name="fromDate" mode="IN" type="Timestamp" optional="true"/>
         <attribute name="statusId" mode="IN" type="String" optional="true"/>
-        <attribute name="baselocation" type="String" mode="IN" optional="true"/>
+        <attribute name="baseLocation" type="String" mode="IN" optional="true"/>
     </service>
     <service name="sendContactListPartyUnSubscribeVerifyEmail" engine="simple"
         location="component://marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml" invoke="sendContactListPartyUnSubscribeVerifyEmail" auth="false">
@@ -230,7 +230,7 @@ under the License.
         <attribute name="preferredContactMechId" mode="IN" type="String" optional="false"/>
         <attribute name="fromDate" mode="IN" type="Timestamp" optional="true"/>
         <attribute name="statusId" mode="IN" type="String" optional="true"/>
-        <attribute name="baselocation" type="String" mode="IN" optional="true"/>
+        <attribute name="baseLocation" type="String" mode="IN" optional="true"/>
     </service>
     <service name="sendContactListPartyUnSubscribeEmail" engine="simple"
         location="component://marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml" invoke="sendContactListPartyUnSubscribeEmail" auth="false">

Modified: ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/marketing/MarketingServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/marketing/MarketingServices.java?rev=1148680&r1=1148679&r2=1148680&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/marketing/MarketingServices.java (original)
+++ ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/marketing/MarketingServices.java Wed Jul 20 10:11:20 2011
@@ -101,7 +101,7 @@ public class MarketingServices {
             String contactMechId = (String) serviceResults.get("contactMechId");
             // create a new association at this fromDate to the anonymous party with status accepted
             input = UtilMisc.toMap("userLogin", userLogin, "contactListId", contactList.get("contactListId"),
-                    "partyId", partyId, "fromDate", fromDate, "statusId", "CLPT_PENDING", "preferredContactMechId", contactMechId, "baselocation", context.get("baselocation"));
+                    "partyId", partyId, "fromDate", fromDate, "statusId", "CLPT_PENDING", "preferredContactMechId", contactMechId, "baseLocation", context.get("baseLocation"));
             serviceResults = dispatcher.runSync("createContactListParty", input);
             if (ServiceUtil.isError(serviceResults)) {
                 throw new GenericServiceException(ServiceUtil.getErrorMessage(serviceResults));

Modified: ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListSubscribeEmail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListSubscribeEmail.ftl?rev=1148680&r1=1148679&r2=1148680&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListSubscribeEmail.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListSubscribeEmail.ftl Wed Jul 20 10:11:20 2011
@@ -29,7 +29,7 @@ under the License.
         <input type="hidden" name="fromDate" value="${contactListParty.fromDate}" />
         <input type="hidden" name="statusId" value="CLPT_UNSUBS_PENDING" />
         <input type="hidden" name="optInVerifyCode" value="${contactListPartyStatus.optInVerifyCode?if_exists}" />
-        <input type="hidden" name="baselocation" value="${baselocation?if_exists}" />
+        <input type="hidden" name="baseLocation" value="${baseLocation?if_exists}" />
         <input type="submit" name="submitButton" value="Click here to unsubscribe your newsletter subscription." />
       </fieldset>
     </form>

Modified: ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListVerifyEmail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListVerifyEmail.ftl?rev=1148680&r1=1148679&r2=1148680&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListVerifyEmail.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListVerifyEmail.ftl Wed Jul 20 10:11:20 2011
@@ -44,7 +44,7 @@ under the License.
     <input type="hidden" name="fromDate" value="${contactListParty.fromDate}" />
     <input type="hidden" name="statusId" value="CLPT_ACCEPTED" />
     <input type="hidden" name="optInVerifyCode" value="${contactListPartyStatus.optInVerifyCode?if_exists}" />
-    <input type="hidden" name="baselocation" value="${baselocation?if_exists}" />
+    <input type="hidden" name="baseLocation" value="${baseLocation?if_exists}" />
     <input type="submit" name="submitButton" value="Please click here to verify your newsletter subscription." />
   </fieldset>
 </form>

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl?rev=1148680&r1=1148679&r2=1148680&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl Wed Jul 20 10:11:20 2011
@@ -51,7 +51,7 @@ under the License.
       <form method="post" action="<@ofbizUrl>createContactListParty</@ofbizUrl>" name="signUpForContactListForm" id="signUpForContactListForm">
         <fieldset>
           <#assign contextPath = request.getContextPath()>
-          <input type="hidden" name="baselocation" value="${contextPath}"/>
+          <input type="hidden" name="baseLocation" value="${contextPath}"/>
           <input type="hidden" name="partyId" value="${partyId}"/>
           <input type="hidden" id="statusId" name="statusId" value="CLPT_PENDING"/>
           <p>${uiLabelMap.EcommerceSignUpForContactListComments}</p>
@@ -82,7 +82,7 @@ under the License.
     <form method="post" action="<@ofbizUrl>signUpForContactList</@ofbizUrl>" name="signUpForContactListForm" id="signUpForContactListForm">
       <fieldset>
         <#assign contextPath = request.getContextPath()>
-        <input type="hidden" name="baselocation" value="${contextPath}"/>
+        <input type="hidden" name="baseLocation" value="${contextPath}"/>
         <input type="hidden" id="statusId" name="statusId"/>
         <div>
           <label>${uiLabelMap.EcommerceSignUpForContactListComments}</label>

Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/EmailContactListScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/EmailContactListScreens.xml?rev=1148680&r1=1148679&r2=1148680&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/EmailContactListScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/EmailContactListScreens.xml Wed Jul 20 10:11:20 2011
@@ -26,7 +26,7 @@ under the License.
             <actions>
                 <set field="titleProperty" value="EcommerceSubscriptionVerifyEmail"/>
                 <!--<set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/>-->
-                <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}${baselocation}/control/"/>
+                <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}${baseLocation}/control/"/>
                 <entity-one entity-name="PartyNameView" value-field="partyName" auto-field-map="false">
                     <field-map field-name="partyId" from-field="contactListParty.partyId"/>
                 </entity-one>
@@ -68,7 +68,7 @@ under the License.
                 <entity-one entity-name="ContactList" value-field="contactList"/>
                 <entity-one entity-name="PartyNameView" value-field="partyName"/>
                 <!--<set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/>-->
-                <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}${baselocation}/control/"/>
+                <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}${baseLocation}/control/"/>
             </actions>
             <widgets>
                 <platform-specific><html><html-template location="component://ecommerce/templates/email/ContactListSubscribeEmail.ftl"/></html></platform-specific>
@@ -82,7 +82,7 @@ under the License.
                 <entity-one entity-name="ContactList" value-field="contactList"/>
                 <entity-one entity-name="PartyNameView" value-field="partyName"/>
                 <!--<set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/>-->
-                <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}${baselocation}/control/"/>
+                <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}${baseLocation}/control/"/>
             </actions>
             <widgets>
                 <platform-specific><html><html-template location="component://ecommerce/templates/email/ContactListUnsubscribeVerifyEmail.ftl"/></html></platform-specific>
@@ -96,7 +96,7 @@ under the License.
                 <entity-one entity-name="ContactList" value-field="contactList"/>
                 <entity-one entity-name="PartyNameView" value-field="partyName"/>
                 <!--<set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/>-->
-                <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}${baselocation}/control/"/>
+                <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}${baseLocation}/control/"/>
             </actions>
             <widgets>
                 <platform-specific><html><html-template location="component://ecommerce/templates/email/ContactListUnsubscribeEmail.ftl"/></html></platform-specific>
@@ -110,7 +110,7 @@ under the License.
                 <entity-one entity-name="ContactList" value-field="contactList"/>
                 <entity-one entity-name="PartyNameView" value-field="partyName"/>
                 <!--<set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/>-->
-                <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}${baselocation}/control/"/>
+                <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}${baseLocation}/control/"/>
             </actions>
             <widgets>
                 <platform-specific><html><html-template location="component://ecommerce/templates/email/ContactListEmailTemplate.ftl"/></html></platform-specific>