Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/EmailOrderScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/EmailOrderScreens.xml?rev=1633087&r1=1633086&r2=1633087&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/EmailOrderScreens.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/EmailOrderScreens.xml Mon Oct 20 09:51:54 2014 @@ -105,7 +105,7 @@ under the License. <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> <set field="title" value="${uiLabelMap.PageTitleOrderCompleteNotice}"/> - <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/> + <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control"/> <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy"/> </actions> <widgets> @@ -119,7 +119,7 @@ under the License. <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> <set field="title" value="${uiLabelMap.PageTitleOrderBackorderNotice}"/> - <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/> + <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control"/> <set field="allowAnonymousView" value="Y"/> <!-- this field will instruction OrderStatus.groovy to allow an anonymous order to be viewed by anybody, so the email confirmation screen will work --> <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy"/> </actions> @@ -134,7 +134,7 @@ under the License. <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> <set field="title" value="${uiLabelMap.PageTitleOrderChangeNotice}"/> - <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/> + <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control"/> <set field="allowAnonymousView" value="Y"/> <!-- this field will instruction OrderStatus.groovy to allow an anonymous order to be viewed by anybody, so the email confirmation screen will work --> <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy"/> </actions> @@ -150,7 +150,7 @@ under the License. <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> <set field="title" value="${uiLabelMap.PageTitleOrderPaymentRetryNotice}"/> - <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/> + <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control"/> <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy"/> </actions> <widgets> @@ -165,7 +165,7 @@ under the License. <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> <set field="title" value="${uiLabelMap.PageTitleShipmentCompleteNotice}"/> - <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/> + <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control"/> <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/ShipmentStatus.groovy"/> </actions> <widgets>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/EmailProductScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/EmailProductScreens.xml?rev=1633087&r1=1633086&r2=1633087&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/EmailProductScreens.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/EmailProductScreens.xml Mon Oct 20 09:51:54 2014 @@ -23,7 +23,7 @@ under the License. <screen name="TellFriend"> <section> <actions> - <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/> + <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control"/> <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/> </actions> <widgets> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/EmailReturnScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/EmailReturnScreens.xml?rev=1633087&r1=1633086&r2=1633087&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/EmailReturnScreens.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/EmailReturnScreens.xml Mon Oct 20 09:51:54 2014 @@ -25,7 +25,7 @@ under the License. <section> <actions> <!-- <set field="title" value="Order Confirmation Notice"/> --> - <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/> + <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control"/> <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/> <!-- <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy"/> --> </actions> @@ -37,7 +37,7 @@ under the License. <screen name="ReturnCancel"> <section> <actions> - <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/> + <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control"/> <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/> </actions> <widgets> @@ -48,7 +48,7 @@ under the License. <screen name="ReturnComplete"> <section> <actions> - <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/> + <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control"/> <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/> </actions> <widgets> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/tools/demo-backup/check-svn-update.sh URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/tools/demo-backup/check-svn-update.sh?rev=1633087&r1=1633086&r2=1633087&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/tools/demo-backup/check-svn-update.sh (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/tools/demo-backup/check-svn-update.sh Mon Oct 20 09:51:54 2014 @@ -1,11 +1,11 @@ #!/bin/sh -# check trunk for updates +# check trunk for updates finally no longer done, restart all demos each morning at 3 cd /home/ofbizDemo/trunk -svn st -u | grep '*' +#svn st -u | grep '*' -if [ $? = 0 ]; then +#if [ $? = 0 ]; then svn up ./ant stop ./ant clean-all @@ -13,14 +13,14 @@ if [ $? = 0 ]; then ./ant svninfo #./ant start > console.log ./ant start-batch -fi +#fi # check branch for updates cd /home/ofbizDemo/branch13.7 -svn st -u | grep '*' +#svn st -u | grep '*' -if [ $? = 0 ]; then +#if [ $? = 0 ]; then svn up ./ant stop -Dportoffset=10000 ./ant clean-all @@ -28,12 +28,12 @@ if [ $? = 0 ]; then ./ant svninfo #./ant start -Dportoffset=10000 > console.log ./ant start-batch -Dportoffset=10000 -fi +#fi cd /home/ofbizDemo/branch12.4 -svn st -u | grep '*' +#svn st -u | grep '*' -if [ $? = 0 ]; then +#if [ $? = 0 ]; then svn up tools/stopofbiz.sh sleep 10 @@ -46,4 +46,4 @@ if [ $? = 0 ]; then ./ant svninfo sleep 10 nohup tools/startofbiz.sh & -fi +#fi
