Author: jacopoc
Date: Sat Nov 4 01:25:48 2006
New Revision: 471152
URL: http://svn.apache.org/viewvc?view=rev&rev=471152
Log:
Moved some a few bsh/ftl files that were referenced by the order component from
the ecommerce to the order component: the order component is at a lower level
than the ecommerce one and so cannot use ecommerce's resources.
Part of OFBIZ-220, but the task is not complete.
Added:
incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/checkoutoptions.bsh
- copied unchanged from r471141,
incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/checkoutoptions.bsh
incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/checkoutpayment.bsh
- copied unchanged from r471141,
incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/checkoutpayment.bsh
incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/storepaymentoptions.bsh
- copied unchanged from r471141,
incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/storepaymentoptions.bsh
incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl
- copied unchanged from r471141,
incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/checkoutoptions.ftl
incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/survey.ftl
- copied unchanged from r471141,
incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/survey.ftl
Removed:
incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/checkoutoptions.bsh
incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/checkoutpayment.bsh
incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/storepaymentoptions.bsh
incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/survey.ftl
incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/checkoutoptions.ftl
Modified:
incubator/ofbiz/trunk/applications/ecommerce/widget/CustomerScreens.xml
incubator/ofbiz/trunk/applications/ecommerce/widget/OrderScreens.xml
incubator/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml
incubator/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
Modified:
incubator/ofbiz/trunk/applications/ecommerce/widget/CustomerScreens.xml
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/widget/CustomerScreens.xml?view=diff&rev=471152&r1=471151&r2=471152
==============================================================================
--- incubator/ofbiz/trunk/applications/ecommerce/widget/CustomerScreens.xml
(original)
+++ incubator/ofbiz/trunk/applications/ecommerce/widget/CustomerScreens.xml Sat
Nov 4 01:25:48 2006
@@ -31,7 +31,7 @@
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <platform-specific><html><html-template
location="component://ecommerce/webapp/ecommerce/customer/survey.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template
location="component://order/webapp/ordermgr/entry/survey.ftl"/></html></platform-specific>
</decorator-section>
</decorator-screen>
</widgets>
Modified: incubator/ofbiz/trunk/applications/ecommerce/widget/OrderScreens.xml
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/widget/OrderScreens.xml?view=diff&rev=471152&r1=471151&r2=471152
==============================================================================
--- incubator/ofbiz/trunk/applications/ecommerce/widget/OrderScreens.xml
(original)
+++ incubator/ofbiz/trunk/applications/ecommerce/widget/OrderScreens.xml Sat
Nov 4 01:25:48 2006
@@ -64,7 +64,7 @@
<set field="titleProperty"
value="PageTitleBillingInformation"/>
<set field="anonymoustrailScreen"
value="component://ecommerce/widget/OrderScreens.xml#anonymoustrail"/>
<script
location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/billsettings.bsh"/>
- <script
location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/storepaymentoptions.bsh"/>
+ <script
location="component://order/webapp/ordermgr/WEB-INF/actions/entry/storepaymentoptions.bsh"/>
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
@@ -138,14 +138,14 @@
<actions>
<set field="titleProperty" value="PageTitleCheckoutOptions"/>
- <script
location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/checkoutpayment.bsh"/>
- <script
location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/checkoutoptions.bsh"/>
- <script
location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/storepaymentoptions.bsh"/>
+ <script
location="component://order/webapp/ordermgr/WEB-INF/actions/entry/checkoutpayment.bsh"/>
+ <script
location="component://order/webapp/ordermgr/WEB-INF/actions/entry/checkoutoptions.bsh"/>
+ <script
location="component://order/webapp/ordermgr/WEB-INF/actions/entry/storepaymentoptions.bsh"/>
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <platform-specific><html><html-template
location="component://ecommerce/webapp/ecommerce/order/checkoutoptions.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template
location="component://order/webapp/ordermgr/entry/checkoutoptions.ftl"/></html></platform-specific>
</decorator-section>
</decorator-screen>
</widgets>
@@ -194,8 +194,8 @@
<set field="MainColumnStyle" value="rightonly"/>
<set field="titleProperty" value="PageTitleCheckoutOptions"/>
- <script
location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/checkoutpayment.bsh"/>
- <script
location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/storepaymentoptions.bsh"/>
+ <script
location="component://order/webapp/ordermgr/WEB-INF/actions/entry/checkoutpayment.bsh"/>
+ <script
location="component://order/webapp/ordermgr/WEB-INF/actions/entry/storepaymentoptions.bsh"/>
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
Modified:
incubator/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml?view=diff&rev=471152&r1=471151&r2=471152
==============================================================================
---
incubator/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml
(original)
+++
incubator/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml
Sat Nov 4 01:25:48 2006
@@ -97,7 +97,7 @@
<widgets>
<decorator-screen name="CommonOrderEntryDecorator"
location="component://order/widget/ordermgr/OrderEntryCommonScreens.xml">
<decorator-section name="body">
- <platform-specific><html><html-template
location="component://ecommerce/webapp/ecommerce/customer/survey.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template
location="component://order/webapp/ordermgr/entry/survey.ftl"/></html></platform-specific>
</decorator-section>
</decorator-screen>
</widgets>
Modified:
incubator/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml?view=diff&rev=471152&r1=471151&r2=471152
==============================================================================
---
incubator/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
(original)
+++
incubator/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
Sat Nov 4 01:25:48 2006
@@ -48,9 +48,9 @@
<actions>
<set field="headerItem" value="orderentry"/>
<set field="title-property" value="PageTitleCheckoutOptions"/>
- <script
location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/checkoutpayment.bsh"/>
- <script
location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/checkoutoptions.bsh"/>
- <script
location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/storepaymentoptions.bsh"/>
+ <script
location="component://order/webapp/ordermgr/WEB-INF/actions/entry/checkoutpayment.bsh"/>
+ <script
location="component://order/webapp/ordermgr/WEB-INF/actions/entry/checkoutoptions.bsh"/>
+ <script
location="component://order/webapp/ordermgr/WEB-INF/actions/entry/storepaymentoptions.bsh"/>
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
@@ -58,7 +58,7 @@
<container>
<label style="head1"
text="${uiLabelMap.OrderQuickFinalizeOrder}"/>
</container>
- <platform-specific><html><html-template
location="component://ecommerce/webapp/ecommerce/order/checkoutoptions.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template
location="component://order/webapp/ordermgr/entry/checkoutoptions.ftl"/></html></platform-specific>
</decorator-section>
</decorator-screen>
</widgets>
