svn commit: r655238 - in /ofbiz/trunk: applications/accounting/webapp/accounting/WEB-INF/actions/chartofaccounts/ applications/accounting/webapp/accounting/WEB-INF/actions/invoice/ applications/accounting/webapp/accounting/WEB-INF/actions/payment/ appl...

[lektran]

Author: lektran
Date: Sat May 10 21:32:54 2008
New Revision: 655238

URL: http://svn.apache.org/viewvc?rev=655238&view=rev
Log:
Removed calls to the deprecated findAll GenericDelegator methods from all bsh and ftl files plus some java ones in the shark component

Modified:
    ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/chartofaccounts/FindGlobalGlAccount.bsh
    ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/chartofaccounts/TaxAuthorityGlAccounts.bsh
    ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/editInvoice.bsh
    ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/findInvoices.bsh
    ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/editPayment.bsh
    ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/findPayment.bsh
    ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/manualTx.bsh
    ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyQuestions.bsh
    ofbiz/trunk/applications/content/widget/cms/featureprep.bsh
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/viewprofile.bsh
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/requestreturn.bsh
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/editShoppingList.bsh
    ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java
    ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendar.bsh
    ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/checkinits.bsh
    ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/orderterms.bsh
    ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/findOrders.bsh
    ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/orderlist.bsh
    ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/orderview.bsh
    ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/quickReturn.bsh
    ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/returnHeader.bsh
    ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/returnItems.bsh
    ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/returnList.bsh
    ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/setup/paymentsetup.bsh
    ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/editShoppingList.bsh
    ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/getPartyInfo.bsh
    ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/viewroles.bsh
    ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java
    ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/config/FindProductConfigItems.bsh
    ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/feature/EditFeatureCategoryFeatures.bsh
    ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/feature/EditFeatureGroups.bsh
    ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/feature/QuickAddProductFeatures.bsh
    ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/find/advancedsearchoptions.bsh
    ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/find/keywordsearch.bsh
    ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/find/sidecatalogs.bsh
    ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/price/EditProductPriceRules.bsh
    ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/price/FindProductPriceRule.bsh
    ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/ApplyFeaturesFromCategory.bsh
    ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductAssoc.bsh
    ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductFeatures.bsh
    ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductInventoryItems.bsh
    ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductQuickAdmin.bsh
    ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStoreRoles.bsh
    ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStoreSurveys.bsh
    ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/thesaurus/EditKeywordThesaurus.bsh
    ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/EditFacility.bsh
    ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/TransferInventoryItem.bsh
    ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/receiveInventory.bsh
    ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/returns/receiveReturn.bsh
    ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipment.bsh
    ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPackages.bsh
    ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentRouteSegments.bsh
    ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/FindShipment.bsh
    ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ReceiveInventoryAgainstPurchaseOrder.bsh
    ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/find/WorkEffortSearchOptions.bsh
    ofbiz/trunk/framework/shark/src/org/ofbiz/shark/instance/EntityPersistentMgr.java
    ofbiz/trunk/framework/shark/src/org/ofbiz/shark/mapping/EntityApplicationMappingMgr.java
    ofbiz/trunk/framework/shark/src/org/ofbiz/shark/mapping/EntityParticipantMappingMgr.java
    ofbiz/trunk/framework/shark/src/org/ofbiz/shark/user/GenericUserGroupMgr.java
    ofbiz/trunk/framework/shark/src/org/ofbiz/shark/user/PartyUserGroupMgr.java
    ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/period/EditCustomTimePeriod.bsh
    ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/facilities.bsh
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListTimeSheetByDateRange.bsh
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/EditTimeEntry.ftl
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editProjectskills.ftl
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittasklist.ftl
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskskills.ftl

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/chartofaccounts/FindGlobalGlAccount.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/chartofaccounts/FindGlobalGlAccount.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/chartofaccounts/FindGlobalGlAccount.bsh (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/chartofaccounts/FindGlobalGlAccount.bsh Sat May 10 21:32:54 2008
@@ -29,5 +29,5 @@
     context.put("hasPermission", Boolean.FALSE);
 }
 
-glAccounts = delegator.findAll("GlAccount");
+glAccounts = delegator.findList("GlAccount", null, null, null, null, false);
 context.put("glAccounts", glAccounts);

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/chartofaccounts/TaxAuthorityGlAccounts.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/chartofaccounts/TaxAuthorityGlAccounts.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/chartofaccounts/TaxAuthorityGlAccounts.bsh (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/chartofaccounts/TaxAuthorityGlAccounts.bsh Sat May 10 21:32:54 2008
@@ -21,7 +21,7 @@
 import javolution.util.FastList;
 
 taxAuthorityHavingNoGlAccountList = FastList.newInstance();
-taxAuthorities = delegator.findAll("TaxAuthority", UtilMisc.toList("taxAuthGeoId", "taxAuthPartyId"));
+taxAuthorities = delegator.findList("TaxAuthority", null, null, UtilMisc.toList("taxAuthGeoId", "taxAuthPartyId"), null, false);
 iter = taxAuthorities.iterator();
 while (iter.hasNext()) {
     taxAuthority = iter.next();

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/editInvoice.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/editInvoice.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/editInvoice.bsh (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/editInvoice.bsh Sat May 10 21:32:54 2008
@@ -146,7 +146,7 @@
     
     edit = parameters.get("editInvoice");
     if (edit != null && edit.equalsIgnoreCase("true")) {            
-        invoiceItemTypes = delegator.findAll("InvoiceItemType");
+        invoiceItemTypes = delegator.findList("InvoiceItemType", null, null, null, null, false);
         context.put("invoiceItemTypes", invoiceItemTypes);  
         context.put("editInvoice", new Boolean(true));  
     }

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/findInvoices.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/findInvoices.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/findInvoices.bsh (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/findInvoices.bsh Sat May 10 21:32:54 2008
@@ -26,7 +26,7 @@
 delegator = request.getAttribute("delegator");
 
 // get the invoice types
-invoiceTypes = delegator.findAll("InvoiceType", UtilMisc.toList("description"));
+invoiceTypes = delegator.findList("InvoiceType", null, null, UtilMisc.toList("description"), null, false);
 context.put("invoiceTypes", invoiceTypes);
 
 // get the invoice statuses

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/editPayment.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/editPayment.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/editPayment.bsh (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/editPayment.bsh Sat May 10 21:32:54 2008
@@ -63,7 +63,7 @@
 context.put("paymentApplications", paymentApplications);
 
 // get the payment types
-paymentTypes = delegator.findAll("PaymentType", UtilMisc.toList("description"));
+paymentTypes = delegator.findList("PaymentType", null, null, UtilMisc.toList("description"), null, false);
 context.put("paymentTypes", paymentTypes);
 
 // get the payment statuses
@@ -71,6 +71,6 @@
 context.put("paymentStatuses", paymentStatuses);
 
 // get the payment method types
-paymentMethodTypes = delegator.findAll("PaymentMethodType", UtilMisc.toList("description"));
+paymentMethodTypes = delegator.findList("PaymentMethodType", null, null, UtilMisc.toList("description"), null, false);
 context.put("paymentMethodTypes", paymentMethodTypes);
 

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/findPayment.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/findPayment.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/findPayment.bsh (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/findPayment.bsh Sat May 10 21:32:54 2008
@@ -26,7 +26,7 @@
 delegator = request.getAttribute("delegator");
 
 // get the payment types
-paymentTypes = delegator.findAll("PaymentType", UtilMisc.toList("description"));
+paymentTypes = delegator.findList("PaymentType", null, null, UtilMisc.toList("description"), null, false);
 context.put("paymentTypes", paymentTypes);
 
 // get the payment statuses
@@ -34,7 +34,7 @@
 context.put("paymentStatuses", paymentStatuses);
 
 // get the payment method types
-paymentMethodTypes = delegator.findAll("PaymentMethodType", UtilMisc.toList("description"));
+paymentMethodTypes = delegator.findList("PaymentMethodType", null, null, UtilMisc.toList("description"), null, false);
 context.put("paymentMethodTypes", paymentMethodTypes);
 
 // current selected status

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/manualTx.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/manualTx.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/manualTx.bsh (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/manualTx.bsh Sat May 10 21:32:54 2008
@@ -20,7 +20,7 @@
 import org.ofbiz.base.util.*;
 
 // stores
-productStores = delegator.findAllCache("ProductStore", UtilMisc.toList("storeName"));
+productStores = delegator.findList("ProductStore", null, null, UtilMisc.toList("storeName"), null, true);
 context.put("productStores", productStores);
 
 // current store

Modified: ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyQuestions.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyQuestions.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyQuestions.bsh (original)
+++ ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyQuestions.bsh Sat May 10 21:32:54 2008
@@ -68,7 +68,7 @@
         categoryQuestions = surveyQuestionCategory.getRelated("SurveyQuestion");
     }
 }
-questionCategories = delegator.findAll("SurveyQuestionCategory", UtilMisc.toList("description"));
+questionCategories = delegator.findList("SurveyQuestionCategory", null, null, UtilMisc.toList("description"), null, false);
 
 context.put("surveyQuestion", surveyQuestion);
 

Modified: ofbiz/trunk/applications/content/widget/cms/featureprep.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/cms/featureprep.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/cms/featureprep.bsh (original)
+++ ofbiz/trunk/applications/content/widget/cms/featureprep.bsh Sat May 10 21:32:54 2008
@@ -46,7 +46,7 @@
 contentId=context.get("contentId");
 dataResourceId=context.get("dataResourceId");
 
-productFeatureList = delegator.findAllCache("ProductFeature");
+productFeatureList = delegator.findList("ProductFeature", null, null, null, null, true);
 featureList = new ArrayList();
 if (UtilValidate.isNotEmpty(dataResourceId)) {
     iter = productFeatureList.iterator();

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/viewprofile.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/viewprofile.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/viewprofile.bsh (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/viewprofile.bsh Sat May 10 21:32:54 2008
@@ -69,10 +69,10 @@
     partyContent = EntityUtil.filterByDate(partyContent);
     context.put("partyContent", partyContent);
 
-    mimeTypes = delegator.findAll("MimeType", UtilMisc.toList("description", "mimeTypeId"));
+    mimeTypes = delegator.findList("MimeType", null, null, UtilMisc.toList("description", "mimeTypeId"), null, false);
     context.put("mimeTypes", mimeTypes);
 
-    partyContentTypes = delegator.findAll("PartyContentType", UtilMisc.toList("description"));
+    partyContentTypes = delegator.findList("PartyContentType", null, null, UtilMisc.toList("description"), null, false);
     context.put("partyContentTypes", partyContentTypes);
 
     // call the getOrderedSummaryInformation service to get the sub-total of valid orders in last X months

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/requestreturn.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/requestreturn.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/requestreturn.bsh (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/requestreturn.bsh Sat May 10 21:32:54 2008
@@ -30,10 +30,10 @@
 party = userLogin.getRelatedOne("Party");
 context.put("party", party);
 
-returnTypes = delegator.findAll("ReturnType", UtilMisc.toList("sequenceId"));
+returnTypes = delegator.findList("ReturnType", null, null, UtilMisc.toList("sequenceId"), null, false);
 context.put("returnTypes", returnTypes);
 
-returnReasons = delegator.findAll("ReturnReason", UtilMisc.toList("sequenceId"));
+returnReasons = delegator.findList("ReturnReason", null, null, UtilMisc.toList("sequenceId"), null, false);
 context.put("returnReasons", returnReasons);
 
 if (orderId != null) {

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/editShoppingList.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/editShoppingList.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/editShoppingList.bsh (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/editShoppingList.bsh Sat May 10 21:32:54 2008
@@ -55,7 +55,7 @@
 context.put("shoppingLists", shoppingLists);
 
 // get all shoppingListTypes
-shoppingListTypes = delegator.findAllCache("ShoppingListType", UtilMisc.toList("description"));
+shoppingListTypes = delegator.findList("ShoppingListType", null, null, UtilMisc.toList("description"), null, true);
 context.put("shoppingListTypes", shoppingListTypes);
 
 // get the shoppingListId for this reqest

Modified: ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java (original)
+++ ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java Sat May 10 21:32:54 2008
@@ -79,7 +79,7 @@
             listResult = delegator.findList("MrpEvent", null, null, null, null, false);
             //int numOfRecordsRemoved = delegator.removeByCondition("MrpEvent", null);
         } catch(GenericEntityException e) {
-            Debug.logError(e,"Error : delegator.findAll(\"MrpEvent\")", module);
+            Debug.logError(e,"Error : delegator.findList(\"MrpEvent\", null, null, null, null, false)", module);
             return ServiceUtil.returnError("Problem, we can not find all the items of MrpEvent, for more detail look at the log");
         }
         if (listResult != null){

Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendar.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendar.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendar.bsh (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendar.bsh Sat May 10 21:32:54 2008
@@ -43,6 +43,6 @@
 if (calendarData == null) calendarData = new HashMap();
 context.put("calendarData", calendarData);
 
-List allCalendarWeek = delegator.findAll("TechDataCalendarWeek");
+List allCalendarWeek = delegator.findList("TechDataCalendarWeek", null, null, null, null, false);
 context.put("calendarWeeks", allCalendarWeek);
 

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/checkinits.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/checkinits.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/checkinits.bsh (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/checkinits.bsh Sat May 10 21:32:54 2008
@@ -50,7 +50,7 @@
 salesChannels = delegator.findByAndCache("Enumeration", UtilMisc.toMap("enumTypeId", "ORDER_SALES_CHANNEL"), UtilMisc.toList("sequenceId"));
 context.put("salesChannels", salesChannels);
 
-productStores = delegator.findAllCache("ProductStore", UtilMisc.toList("storeName"));
+productStores = delegator.findList("ProductStore", null, null, UtilMisc.toList("storeName"), null, true);
 context.put("productStores", productStores);
 
 suppliers = delegator.findByAnd("PartyRole", UtilMisc.toMap("roleTypeId", "SUPPLIER"));

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/orderterms.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/orderterms.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/orderterms.bsh (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/orderterms.bsh Sat May 10 21:32:54 2008
@@ -30,7 +30,7 @@
 orderTerms = cart.getOrderTerms();
 context.put("orderTerms",orderTerms);
 
-termTypes = delegator.findAll("TermType");
+termTypes = delegator.findList("TermType", null, null, null, null,false);
 context.put("termTypes",termTypes);
 createNew = request.getParameter("createNew");
 

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/findOrders.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/findOrders.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/findOrders.bsh (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/findOrders.bsh Sat May 10 21:32:54 2008
@@ -28,11 +28,11 @@
 security = request.getAttribute("security");
 
 // get the order types
-orderTypes = delegator.findAll("OrderType", UtilMisc.toList("description"));
+orderTypes = delegator.findList("OrderType", null, null, UtilMisc.toList("description"), null, false);
 context.put("orderTypes", orderTypes);
 
 // get the role types
-roleTypes = delegator.findAll("RoleType", UtilMisc.toList("description"));
+roleTypes = delegator.findList("RoleType", null, null, UtilMisc.toList("description"), null, false);
 context.put("roleTypes", roleTypes);
 
 // get the order statuses
@@ -40,11 +40,11 @@
 context.put("orderStatuses", orderStatuses);
 
 // get websites
-websites = delegator.findAll("WebSite", UtilMisc.toList("siteName"));
+websites = delegator.findList("WebSite", null, null, UtilMisc.toList("siteName"), null, false);
 context.put("webSites", websites);
 
 // get the stores
-stores = delegator.findAll("ProductStore", UtilMisc.toList("storeName"));
+stores = delegator.findList("ProductStore", null, null, UtilMisc.toList("storeName"), null, false);
 context.put("productStores", stores);
 
 // get the channels

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/orderlist.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/orderlist.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/orderlist.bsh (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/orderlist.bsh Sat May 10 21:32:54 2008
@@ -53,7 +53,7 @@
 locale = UtilHttp.getLocale(request);
 
 // a list of order type descriptions
-ordertypes = delegator.findAllCache("OrderType");
+ordertypes = delegator.findList("OrderType", null, null, null, null, true);
 iter = ordertypes.iterator();
 while (iter.hasNext()) {
     type = iter.next();

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/orderview.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/orderview.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/orderview.bsh (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/orderview.bsh Sat May 10 21:32:54 2008
@@ -201,7 +201,7 @@
     orderHeaderStatuses = orderReadHelper.getOrderHeaderStatuses();
     context.put("orderHeaderStatuses", orderHeaderStatuses);
 
-    adjustmentTypes = delegator.findAll("OrderAdjustmentType", UtilMisc.toList("description"));
+    adjustmentTypes = delegator.findList("OrderAdjustmentType", null, null, UtilMisc.toList("description"), null, false);
     context.put("orderAdjustmentTypes", adjustmentTypes);
 
     notes = delegator.findByAnd("OrderHeaderNoteView", UtilMisc.toMap("orderId", orderId), UtilMisc.toList("-noteDateTime"));

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/quickReturn.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/quickReturn.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/quickReturn.bsh (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/quickReturn.bsh Sat May 10 21:32:54 2008
@@ -67,10 +67,10 @@
 }
 
 
-returnTypes = delegator.findAll("ReturnType", UtilMisc.toList("sequenceId"));
+returnTypes = delegator.findList("ReturnType", null, null, UtilMisc.toList("sequenceId"), null, false);
 context.put("returnTypes", returnTypes);
 
-returnReasons = delegator.findAll("ReturnReason", UtilMisc.toList("sequenceId"));
+returnReasons = delegator.findList("ReturnReason", null, null, UtilMisc.toList("sequenceId"), null, false);
 context.put("returnReasons", returnReasons);
 
 itemStts = delegator.findByAnd("StatusItem", UtilMisc.toMap("statusTypeId", "INV_SERIALIZED_STTS"), UtilMisc.toList("sequenceId"));

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/returnHeader.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/returnHeader.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/returnHeader.bsh (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/returnHeader.bsh Sat May 10 21:32:54 2008
@@ -98,7 +98,7 @@
     }
 }
 
-facilityList = delegator.findAll("Facility", UtilMisc.toList("facilityName"));
+facilityList = delegator.findList("Facility", null, null, UtilMisc.toList("facilityName"), null, false);
 context.put("facilityList", facilityList);
 
 currentStatus = returnHeader != null ? returnHeader.getString("statusId") : null;

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/returnItems.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/returnItems.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/returnItems.bsh (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/returnItems.bsh Sat May 10 21:32:54 2008
@@ -44,14 +44,14 @@
 returnAdjustments = delegator.findByAnd("ReturnAdjustment", UtilMisc.toMap("returnId", returnId, "returnItemSeqId", "_NA_"), UtilMisc.toList("returnItemSeqId", "returnAdjustmentTypeId"));
 context.put("returnAdjustments", returnAdjustments);
 
-returnTypes = delegator.findAll("ReturnType", UtilMisc.toList("sequenceId"));
+returnTypes = delegator.findList("ReturnType", null, null, UtilMisc.toList("sequenceId"), null, false);
 context.put("returnTypes", returnTypes);
 
 itemStatus = delegator.findByAnd("StatusItem", UtilMisc.toMap("statusTypeId", "INV_SERIALIZED_STTS"),
                        UtilMisc.toList("statusId", "description"));
 context.put("itemStatus", itemStatus);
 
-returnReasons = delegator.findAll("ReturnReason", UtilMisc.toList("sequenceId"));
+returnReasons = delegator.findList("ReturnReason", null, null, UtilMisc.toList("sequenceId"), null, false);
 context.put("returnReasons", returnReasons);
 
 itemStts = delegator.findByAnd("StatusItem", UtilMisc.toMap("statusTypeId", "INV_SERIALIZED_STTS"), UtilMisc.toList("sequenceId"));

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/returnList.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/returnList.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/returnList.bsh (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/returnList.bsh Sat May 10 21:32:54 2008
@@ -23,5 +23,5 @@
 security = request.getAttribute("security");
 delegator = request.getAttribute("delegator");
 
-returnList = delegator.findAll("ReturnHeader");
+returnList = delegator.findList("ReturnHeader", null, null, null, null, false);
 context.put("returnList", returnList);

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/setup/paymentsetup.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/setup/paymentsetup.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/setup/paymentsetup.bsh (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/setup/paymentsetup.bsh Sat May 10 21:32:54 2008
@@ -22,7 +22,7 @@
 
 delegator = request.getAttribute("delegator");
 
-paymentSetup = delegator.findAll("WebSitePaymentSettingView", UtilMisc.toList("webSiteId", "paymentMethodTypeId"));
+paymentSetup = delegator.findList("WebSitePaymentSettingView", null, null, UtilMisc.toList("webSiteId", "paymentMethodTypeId"), null, false);
 context.put("paymentSetups", paymentSetup);
 
 webSiteId = request.getParameter("webSiteId");
@@ -34,10 +34,10 @@
 }
 context.put("webSitePayment", webSitePayment);
     
-webSites = delegator.findAll("WebSite", UtilMisc.toList("siteName"));
+webSites = delegator.findList("WebSite", null, null, UtilMisc.toList("siteName"), null, false);
 context.put("webSites", webSites);
 
-paymentMethodTypes = delegator.findAll("PaymentMethodType", UtilMisc.toList("description"));
+paymentMethodTypes = delegator.findList("PaymentMethodType", null, null, UtilMisc.toList("description"), null, false);
 context.put("paymentMethodTypes", paymentMethodTypes);
 
 payInfo = UtilHttp.getParameterMap(request);

Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/editShoppingList.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/editShoppingList.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/editShoppingList.bsh (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/editShoppingList.bsh Sat May 10 21:32:54 2008
@@ -60,7 +60,7 @@
 context.put("shoppingLists", shoppingLists);
 
 // get all shoppingListTypes
-shoppingListTypes = delegator.findAllCache("ShoppingListType", UtilMisc.toList("description"));
+shoppingListTypes = delegator.findList("ShoppingListType", null, null, UtilMisc.toList("description"), null, true);
 context.put("shoppingListTypes", shoppingListTypes);
 
 // no passed shopping list id default to first list

Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/getPartyInfo.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/getPartyInfo.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/getPartyInfo.bsh (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/getPartyInfo.bsh Sat May 10 21:32:54 2008
@@ -30,4 +30,4 @@
 context.put("party", otherValues.get("party"));
 context.put("lookupPerson", otherValues.get("lookupPerson"));
 context.put("lookupGroup", otherValues.get("lookupGroup"));
-context.put("custRequestTypes", delegator.findAllCache("CustRequestType"));
\ No newline at end of file
+context.put("custRequestTypes", delegator.findList("CustRequestType", null, null, null, null, true));
\ No newline at end of file

Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/viewroles.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/viewroles.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/viewroles.bsh (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/viewroles.bsh Sat May 10 21:32:54 2008
@@ -38,7 +38,7 @@
 partyRoles = delegator.findByAnd("RoleTypeAndParty", partyRoleExprs, UtilMisc.toList("description"));
 context.put("partyRoles", partyRoles);
 
-roles = delegator.findAll("RoleType", UtilMisc.toList("description", "roleTypeId"));
+roles = delegator.findList("RoleType", null, null, UtilMisc.toList("description", "roleTypeId"), null, false);
 context.put("roles", roles);
 
 party = delegator.findByPrimaryKey("Party", UtilMisc.toMap("partyId", partyId));

Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java Sat May 10 21:32:54 2008
@@ -597,7 +597,7 @@
 
     // set category descriptions from longDescriptions
     /*
-allCategories = delegator.findAll("ProductCategory");
+allCategories = delegator.findList("ProductCategory", null, null, null, null, false);
 allCatIter = allCategories.iterator();
 while (allCatIter.hasNext()) {
    cat = allCatIter.next();

Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/config/FindProductConfigItems.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/config/FindProductConfigItems.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/config/FindProductConfigItems.bsh (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/config/FindProductConfigItems.bsh Sat May 10 21:32:54 2008
@@ -21,7 +21,7 @@
 import org.ofbiz.entity.condition.*;
 import org.ofbiz.base.util.*;
 
-itemsList = delegator.findAll("ProductConfigItem", UtilMisc.toList("configItemId"));
+itemsList = delegator.findList("ProductConfigItem", null, null, UtilMisc.toList("configItemId"), null, false);
 context.put("itemsList", itemsList);
 
 // set the page parameters

Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/feature/EditFeatureCategoryFeatures.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/feature/EditFeatureCategoryFeatures.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/feature/EditFeatureCategoryFeatures.bsh (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/feature/EditFeatureCategoryFeatures.bsh Sat May 10 21:32:54 2008
@@ -49,15 +49,15 @@
 curProductFeatureCategory = delegator.findByPrimaryKey("ProductFeatureCategory", UtilMisc.toMap("productFeatureCategoryId", productFeatureCategoryId));
 context.put("curProductFeatureCategory", curProductFeatureCategory);
 
-productFeatureTypes = delegator.findAll("ProductFeatureType", UtilMisc.toList("description"));
+productFeatureTypes = delegator.findList("ProductFeatureType", null, null, UtilMisc.toList("description"), null, false);
 context.put("productFeatureTypes", productFeatureTypes);
 
-productFeatureCategories = delegator.findAll("ProductFeatureCategory", UtilMisc.toList("description"));
+productFeatureCategories = delegator.findList("ProductFeatureCategory", null, null, UtilMisc.toList("description"), null, false);
 context.put("productFeatureCategories", productFeatureCategories);
 
 //we only need these if we will be showing the apply feature to category forms
 if (productId != null && productId.length() > 0) {
-    productFeatureApplTypes = delegator.findAll("ProductFeatureApplType", UtilMisc.toList("description"));
+    productFeatureApplTypes = delegator.findList("ProductFeatureApplType", null, null, UtilMisc.toList("description"), null, false);
     context.put("productFeatureApplTypes", productFeatureApplTypes);
 }
 

Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/feature/EditFeatureGroups.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/feature/EditFeatureGroups.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/feature/EditFeatureGroups.bsh (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/feature/EditFeatureGroups.bsh Sat May 10 21:32:54 2008
@@ -29,5 +29,5 @@
     context.put("hasPermission", Boolean.FALSE);
 }
 
-productFeatureGroups = delegator.findAll("ProductFeatureGroup");
+productFeatureGroups = delegator.findList("ProductFeatureGroup", null, null, null, null, false);
 context.put("productFeatureGroups", productFeatureGroups);

Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/feature/QuickAddProductFeatures.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/feature/QuickAddProductFeatures.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/feature/QuickAddProductFeatures.bsh (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/feature/QuickAddProductFeatures.bsh Sat May 10 21:32:54 2008
@@ -19,7 +19,7 @@
 
 import org.ofbiz.base.util.UtilMisc;
 
-productFeatureTypes = delegator.findAllCache("ProductFeatureType", UtilMisc.toList("description"));
+productFeatureTypes = delegator.findList("ProductFeatureType", null, null, UtilMisc.toList("description"), null, true);
 context.put("productFeatureTypes", productFeatureTypes);
 
 featureCategory = delegator.findByPrimaryKey("ProductFeatureCategory",

Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/find/advancedsearchoptions.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/find/advancedsearchoptions.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/find/advancedsearchoptions.bsh (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/find/advancedsearchoptions.bsh Sat May 10 21:32:54 2008
@@ -48,7 +48,7 @@
 supplerPartyRoleAndPartyDetails = delegator.findByAnd("PartyRoleAndPartyDetail", UtilMisc.toMap("roleTypeId", "SUPPLIER"), UtilMisc.toList("groupName", "firstName"));
 
 // get the GoodIdentification types
-goodIdentificationTypes = delegator.findAll("GoodIdentificationType", UtilMisc.toList("description"));
+goodIdentificationTypes = delegator.findList("GoodIdentificationType", null, null, UtilMisc.toList("description"), null, false);
 
 context.put("searchCategoryId", searchCategoryId);
 context.put("searchCategory", searchCategory);

Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/find/keywordsearch.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/find/keywordsearch.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/find/keywordsearch.bsh (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/find/keywordsearch.bsh Sat May 10 21:32:54 2008
@@ -31,9 +31,9 @@
 prodCatalogId = CatalogWorker.getCurrentCatalogId(request);
 Map result = ProductSearchSession.getProductSearchResult(request, delegator, prodCatalogId);
 
-applicationTypes = delegator.findAll("ProductFeatureApplType", UtilMisc.toList("description"));
+applicationTypes = delegator.findList("ProductFeatureApplType", null, null, UtilMisc.toList("description"), null, false);
 
-//productCategories = delegator.findAll("ProductCategory", UtilMisc.toList("description"));
+//productCategories = delegator.findList("ProductCategory", null, null, UtilMisc.toList("description"), null, false);
 expr = new EntityExpr(new EntityExpr("showInSelect", EntityOperator.EQUALS, null),
         EntityOperator.OR,
         new EntityExpr("showInSelect", EntityOperator.NOT_EQUAL, "N"));

Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/find/sidecatalogs.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/find/sidecatalogs.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/find/sidecatalogs.bsh (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/find/sidecatalogs.bsh Sat May 10 21:32:54 2008
@@ -37,7 +37,7 @@
 
 //prodCatalogs
 if (isOpen) {
-    prodCatalogs = delegator.findAll("ProdCatalog");
+    prodCatalogs = delegator.findList("ProdCatalog", null, null, null, null, false);
     context.put("prodCatalogs", prodCatalogs);
 }
 

Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/price/EditProductPriceRules.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/price/EditProductPriceRules.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/price/EditProductPriceRules.bsh (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/price/EditProductPriceRules.bsh Sat May 10 21:32:54 2008
@@ -34,5 +34,5 @@
 List condOperEnums = delegator.findByAndCache("Enumeration", UtilMisc.toMap("enumTypeId", "PROD_PRICE_COND"), UtilMisc.toList("sequenceId"));
 context.put("condOperEnums", condOperEnums);
 
-List productPriceActionTypes = delegator.findAllCache("ProductPriceActionType", UtilMisc.toList("description"));
+List productPriceActionTypes = delegator.findList("ProductPriceActionType", null, null, UtilMisc.toList("description"), null, true);
 context.put("productPriceActionTypes", productPriceActionTypes);

Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/price/FindProductPriceRule.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/price/FindProductPriceRule.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/price/FindProductPriceRule.bsh (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/price/FindProductPriceRule.bsh Sat May 10 21:32:54 2008
@@ -26,6 +26,6 @@
 if ("false".equals(request.getParameter("activeOnly"))) activeOnly = false;
 context.put("activeOnly", activeOnly);
 
-List productPriceRules = delegator.findAll("ProductPriceRule");
+List productPriceRules = delegator.findList("ProductPriceRule", null, null, null, null, false);
 if (activeOnly) productPriceRules = EntityUtil.filterByDate(productPriceRules, true);
 if (productPriceRules != null && productPriceRules.size() > 0) context.put("productPriceRules", productPriceRules);

Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/ApplyFeaturesFromCategory.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/ApplyFeaturesFromCategory.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/ApplyFeaturesFromCategory.bsh (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/ApplyFeaturesFromCategory.bsh Sat May 10 21:32:54 2008
@@ -41,15 +41,15 @@
 curProductFeatureCategory = delegator.findByPrimaryKey("ProductFeatureCategory", UtilMisc.toMap("productFeatureCategoryId", productFeatureCategoryId));
 context.put("curProductFeatureCategory", curProductFeatureCategory);
 
-productFeatureTypes = delegator.findAll("ProductFeatureType", UtilMisc.toList("description"));
+productFeatureTypes = delegator.findList("ProductFeatureType", null, null, UtilMisc.toList("description"), null, false);
 context.put("productFeatureTypes", productFeatureTypes);
 
-productFeatureCategories = delegator.findAll("ProductFeatureCategory", UtilMisc.toList("description"));
+productFeatureCategories = delegator.findList("ProductFeatureCategory", null, null, UtilMisc.toList("description"), null, false);
 context.put("productFeatureCategories", productFeatureCategories);
 
 //we only need these if we will be showing the apply feature to category forms
 if (productId != null && productId.length() > 0) {
-    productFeatureApplTypes = delegator.findAll("ProductFeatureApplType", UtilMisc.toList("description"));
+    productFeatureApplTypes = delegator.findList("ProductFeatureApplType", null, null, UtilMisc.toList("description"), null, false);
     context.put("productFeatureApplTypes", productFeatureApplTypes);
 }
 

Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductAssoc.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductAssoc.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductAssoc.bsh (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductAssoc.bsh Sat May 10 21:32:54 2008
@@ -63,7 +63,7 @@
 boolean isCreate = true;
 context.put("isCreate", isCreate);
 
-Collection assocTypes = delegator.findAll("ProductAssocType", UtilMisc.toList("description"));
+Collection assocTypes = delegator.findList("ProductAssocType", null, null, UtilMisc.toList("description"), null, false);
 context.put("assocTypes", assocTypes);
 
 if (product != null) {

Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductFeatures.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductFeatures.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductFeatures.bsh (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductFeatures.bsh Sat May 10 21:32:54 2008
@@ -28,13 +28,13 @@
         UtilMisc.toList("sequenceNum", "productFeatureApplTypeId", "productFeatureTypeId", "description"));
 if (productFeatureAndAppls != null) context.put("productFeatureAndAppls", productFeatureAndAppls);
 
-Collection productFeatureCategories = delegator.findAll("ProductFeatureCategory", UtilMisc.toList("description"));
+Collection productFeatureCategories = delegator.findList("ProductFeatureCategory", null, null, UtilMisc.toList("description"), null, false);
 if (productFeatureCategories != null) context.put("productFeatureCategories", productFeatureCategories);
-Collection productFeatureApplTypes = delegator.findAll("ProductFeatureApplType", UtilMisc.toList("description"));
+Collection productFeatureApplTypes = delegator.findList("ProductFeatureApplType", null, null, UtilMisc.toList("description"), null, false);
 if (productFeatureApplTypes != null) context.put("productFeatureApplTypes", productFeatureApplTypes);
 
-productFeatureGroups = delegator.findAll("ProductFeatureGroup", UtilMisc.toList("description"));
+productFeatureGroups = delegator.findList("ProductFeatureGroup", null, null, UtilMisc.toList("description"), null, false);
 if (productFeatureGroups != null) context.put("productFeatureGroups", productFeatureGroups);
 
-Collection productFeatureTypes = delegator.findAll("ProductFeatureType", UtilMisc.toList("description"));
+Collection productFeatureTypes = delegator.findList("ProductFeatureType", null, null, UtilMisc.toList("description"), null, false);
 if (productFeatureTypes != null) context.put("productFeatureTypes", productFeatureTypes);

Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductInventoryItems.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductInventoryItems.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductInventoryItems.bsh (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductInventoryItems.bsh Sat May 10 21:32:54 2008
@@ -68,7 +68,7 @@
     // The warehouse list is selected
     showAllFacilities = parameters.get("showAllFacilities");
     if (showAllFacilities != null && showAllFacilities.equals("Y")) {
-        facilityList = delegator.findAll("Facility");
+        facilityList = delegator.findList("Facility", null, null, null, null, false);
     } else {
         facilityList = delegator.findByAnd("ProductFacility", UtilMisc.toMap("productId", productId));
     }

Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductQuickAdmin.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductQuickAdmin.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductQuickAdmin.bsh (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductQuickAdmin.bsh Sat May 10 21:32:54 2008
@@ -34,10 +34,10 @@
 String nowTimestampString = UtilDateTime.nowTimestamp().toString();
 context.put("nowTimestampString", nowTimestampString);
 
-Collection assocTypes = delegator.findAll("ProductAssocType");
+Collection assocTypes = delegator.findList("ProductAssocType", null, null, null, null, false);
 context.put("assocTypes", assocTypes);
 
-Collection featureTypes = delegator.findAll("ProductFeatureType");
+Collection featureTypes = delegator.findList("ProductFeatureType", null, null, null, null, false);
 context.put("featureTypes", featureTypes);
 
 // add/remove feature types

Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStoreRoles.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStoreRoles.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStoreRoles.bsh (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStoreRoles.bsh Sat May 10 21:32:54 2008
@@ -28,6 +28,6 @@
 }
 context.put("productStoreRoles", productStoreRoles);
 
-roleTypes = delegator.findAll("RoleType", UtilMisc.toList("description"));
+roleTypes = delegator.findList("RoleType", null, null, UtilMisc.toList("description"), null, false);
 context.put("roleTypes", roleTypes);
 

Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStoreSurveys.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStoreSurveys.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStoreSurveys.bsh (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStoreSurveys.bsh Sat May 10 21:32:54 2008
@@ -41,13 +41,13 @@
 productStoreSurveys = EntityUtil.filterByDate(productStoreSurveys);
 context.put("productStoreSurveys", productStoreSurveys);
 
-surveys = delegator.findAll("Survey", UtilMisc.toList("description"));
+surveys = delegator.findList("Survey", null, null, UtilMisc.toList("description"), null, false);
 context.put("surveys", surveys);
 
-surveyApplTypes = delegator.findAll("SurveyApplType", UtilMisc.toList("description"));
+surveyApplTypes = delegator.findList("SurveyApplType", null, null, UtilMisc.toList("description"), null, false);
 context.put("surveyApplTypes", surveyApplTypes);
 
-productCategories = delegator.findAll("ProductCategory", UtilMisc.toList("description"));
+productCategories = delegator.findList("ProductCategory", null, null, UtilMisc.toList("description"), null, false);
 context.put("productCategories", productCategories);
 
 String nowTimestampString = UtilDateTime.nowTimestamp().toString();

Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/thesaurus/EditKeywordThesaurus.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/thesaurus/EditKeywordThesaurus.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/thesaurus/EditKeywordThesaurus.bsh (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/thesaurus/EditKeywordThesaurus.bsh Sat May 10 21:32:54 2008
@@ -22,7 +22,7 @@
 
 relationshipEnums = delegator.findByAndCache("Enumeration", UtilMisc.toMap("enumTypeId", "KW_THES_REL"), UtilMisc.toList("sequenceId"));
 
-keywordThesauruses = delegator.findAll("KeywordThesaurus", UtilMisc.toList("enteredKeyword"));
+keywordThesauruses = delegator.findList("KeywordThesaurus", null, null, UtilMisc.toList("enteredKeyword"), null, false);
 
 //if no param sent in make firstLetter 'a' else use firstLetter passed in
 firstLetterString = request.getParameter("firstLetter");

Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/EditFacility.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/EditFacility.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/EditFacility.bsh (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/EditFacility.bsh Sat May 10 21:32:54 2008
@@ -40,12 +40,12 @@
 context.put("facilityId", facilityId);
 
 //Facility types
-Collection facilityTypes = delegator.findAll("FacilityType");
+Collection facilityTypes = delegator.findList("FacilityType", null, null, null, null, false);
 if (facilityTypes != null)
   context.put("facilityTypes", facilityTypes);
 
 // all possible inventory item types
-inventoryItemTypes = delegator.findAllCache("InventoryItemType", UtilMisc.toList("description"));
+inventoryItemTypes = delegator.findList("InventoryItemType", null, null, UtilMisc.toList("description"), null, true);
 context.put("inventoryItemTypes", inventoryItemTypes);
 
 // unit of measures

Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/TransferInventoryItem.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/TransferInventoryItem.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/TransferInventoryItem.bsh (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/TransferInventoryItem.bsh Sat May 10 21:32:54 2008
@@ -81,7 +81,7 @@
 }
 
 // facilities
-List facilities = delegator.findAll("Facility");
+List facilities = delegator.findList("Facility", null, null, null, null, false);
 context.put("facilities", facilities);
 
 // status items

Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/receiveInventory.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/receiveInventory.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/receiveInventory.bsh (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/receiveInventory.bsh Sat May 10 21:32:54 2008
@@ -187,13 +187,13 @@
 }
 
 // reject reasons
-rejectReasons = delegator.findAll("RejectionReason");
+rejectReasons = delegator.findList("RejectionReason", null, null, null, null, false);
 
 // inv item types
-inventoryItemTypes = delegator.findAll("InventoryItemType");
+inventoryItemTypes = delegator.findList("InventoryItemType", null, null, null, null, false);
 
 // facilities
-facilities = delegator.findAll("Facility");
+facilities = delegator.findList("Facility", null, null, null, null, false);
 
 // default per unit cost for both shipment or individual product
 standardCosts = new HashMap();

Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/returns/receiveReturn.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/returns/receiveReturn.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/returns/receiveReturn.bsh (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/returns/receiveReturn.bsh Sat May 10 21:32:54 2008
@@ -81,10 +81,10 @@
 }
 
 // facilities
-facilities = delegator.findAll("Facility");
+facilities = delegator.findList("Facility", null, null, null, null, false);
 
 //all possible inventory item types
-inventoryItemTypes = delegator.findAllCache("InventoryItemType", UtilMisc.toList("description"));
+inventoryItemTypes = delegator.findList("InventoryItemType", null, null, UtilMisc.toList("description"), null, true);
 
 context.put("facilityId", facilityId);
 context.put("facility", facility);

Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipment.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipment.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipment.bsh (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipment.bsh Sat May 10 21:32:54 2008
@@ -94,7 +94,7 @@
     
     if (primaryOrderId != null) {
         ord = delegator.findByPrimaryKey("OrderHeader", UtilMisc.toMap("orderId", primaryOrderId));
-        pfc = delegator.findAll("ProductStoreFacility");
+        pfc = delegator.findList("ProductStoreFacility", null, null, null, null, false);
         fac = delegator.findByAnd("ProductStoreFacilityByOrder", UtilMisc.toMap("orderId", primaryOrderId));
         Debug.log("" + ord);
         Debug.log("" + pfc);

Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPackages.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPackages.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPackages.bsh (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPackages.bsh Sat May 10 21:32:54 2008
@@ -52,7 +52,7 @@
     shipmentItems = shipment.getRelated("ShipmentItem", null, UtilMisc.toList("shipmentItemSeqId"));
     shipmentRouteSegments = shipment.getRelated("ShipmentRouteSegment", null, UtilMisc.toList("shipmentRouteSegmentId"));
     weightUoms = delegator.findByAnd("Uom", UtilMisc.toMap("uomTypeId", "WEIGHT_MEASURE"), UtilMisc.toList("description"));
-    boxTypes = delegator.findAll("ShipmentBoxType");
+    boxTypes = delegator.findList("ShipmentBoxType", null, null, null, null, false);
     
     context.put("shipment", shipment);
     context.put("shipmentPackageDatas", shipmentPackageDatas);

Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentRouteSegments.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentRouteSegments.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentRouteSegments.bsh (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentRouteSegments.bsh Sat May 10 21:32:54 2008
@@ -65,8 +65,8 @@
     }
     
     shipmentPackages = shipment.getRelated("ShipmentPackage", null, UtilMisc.toList("shipmentPackageSeqId"));
-    facilities = delegator.findAll("Facility", UtilMisc.toList("facilityName"));
-    shipmentMethodTypes = delegator.findAll("ShipmentMethodType", UtilMisc.toList("description"));
+    facilities = delegator.findList("Facility", null, null, UtilMisc.toList("facilityName"), null, false);
+    shipmentMethodTypes = delegator.findList("ShipmentMethodType", null, null, UtilMisc.toList("description"), null, false);
     weightUoms = delegator.findByAnd("Uom", UtilMisc.toMap("uomTypeId", "WEIGHT_MEASURE"));
     currencyUoms = delegator.findByAnd("Uom", UtilMisc.toMap("uomTypeId", "CURRENCY_MEASURE"));
     

Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/FindShipment.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/FindShipment.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/FindShipment.bsh (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/FindShipment.bsh Sat May 10 21:32:54 2008
@@ -167,10 +167,10 @@
 
 // =============== Prepare the Option Data for the Find Form =================
 
-shipmentTypes = delegator.findAll("ShipmentType", UtilMisc.toList("description"));
+shipmentTypes = delegator.findList("ShipmentType", null, null, UtilMisc.toList("description"), null, false);
 context.put("shipmentTypes", shipmentTypes);
 
-facilities = delegator.findAll("Facility", UtilMisc.toList("facilityName"));
+facilities = delegator.findList("Facility", null, null, UtilMisc.toList("facilityName"), null, false);
 context.put("facilities", facilities);
 
 // since purchase and sales shipments have different status codes, we'll need to make two separate lists

Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ReceiveInventoryAgainstPurchaseOrder.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ReceiveInventoryAgainstPurchaseOrder.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ReceiveInventoryAgainstPurchaseOrder.bsh (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ReceiveInventoryAgainstPurchaseOrder.bsh Sat May 10 21:32:54 2008
@@ -101,7 +101,7 @@
     }
 }
 
-inventoryItemTypes = delegator.findAll("InventoryItemType");
+inventoryItemTypes = delegator.findList("InventoryItemType", null, null, null, null, false);
 context.put("inventoryItemTypes", inventoryItemTypes);
 
 // Populate the tracking map with shipment and order IDs

Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/find/WorkEffortSearchOptions.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/find/WorkEffortSearchOptions.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/find/WorkEffortSearchOptions.bsh (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/find/WorkEffortSearchOptions.bsh Sat May 10 21:32:54 2008
@@ -53,8 +53,8 @@
 
 searchConstraintStrings = WorkEffortSearchSession.searchGetConstraintStrings(false, session, delegator);
 searchSortOrderString = WorkEffortSearchSession.searchGetSortOrderString(false, request);
-workEffortAssocTypes=delegator.findAll("WorkEffortAssocType");
-roleTypes=delegator.findAll("RoleType");
+workEffortAssocTypes=delegator.findList("WorkEffortAssocType", null, null, null, null, false);
+roleTypes=delegator.findList("RoleType", null, null, null, null, false);
 
 context.put("searchOperator", searchOperator);
 context.put("searchConstraintStrings", searchConstraintStrings);

Modified: ofbiz/trunk/framework/shark/src/org/ofbiz/shark/instance/EntityPersistentMgr.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/shark/src/org/ofbiz/shark/instance/EntityPersistentMgr.java?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/framework/shark/src/org/ofbiz/shark/instance/EntityPersistentMgr.java (original)
+++ ofbiz/trunk/framework/shark/src/org/ofbiz/shark/instance/EntityPersistentMgr.java Sat May 10 21:32:54 2008
@@ -357,7 +357,7 @@
         List createdList = new ArrayList();
         List lookupList = null;
         try {
-            lookupList = delegator.findAll(org.ofbiz.shark.SharkConstants.WfProcessMgr);
+            lookupList = delegator.findList(org.ofbiz.shark.SharkConstants.WfProcessMgr, null, null, null, null, false);
         } catch (GenericEntityException e) {
             Debug.logError(e, module);
             throw new PersistenceException(e);
@@ -387,7 +387,7 @@
         List createdList = new ArrayList();
         List lookupList = null;
         try {
-            lookupList = delegator.findAll(org.ofbiz.shark.SharkConstants.WfResource);
+            lookupList = delegator.findList(org.ofbiz.shark.SharkConstants.WfResource, null, null, null, null, false);
         } catch (GenericEntityException e) {
             throw new PersistenceException(e);
         }
@@ -407,7 +407,7 @@
         List createdList = new ArrayList();
         List lookupList = null;
         try {
-            lookupList = delegator.findAll(org.ofbiz.shark.SharkConstants.WfAssignment);
+            lookupList = delegator.findList(org.ofbiz.shark.SharkConstants.WfAssignment, null, null, null, null, false);
         } catch (GenericEntityException e) {
             throw new PersistenceException(e);
         }
@@ -426,7 +426,7 @@
         List createdList = new ArrayList();
         List lookupList = null;
         try {
-            lookupList = delegator.findAll(org.ofbiz.shark.SharkConstants.WfActivity);
+            lookupList = delegator.findList(org.ofbiz.shark.SharkConstants.WfActivity, null, null, null, null, false);
         } catch (GenericEntityException e) {
             throw new PersistenceException(e);
         }
@@ -1007,7 +1007,7 @@
         List createdList = new ArrayList();
         List lookupList = null;
         try {
-            lookupList = delegator.findAll(org.ofbiz.shark.SharkConstants.WfProcess);
+            lookupList = delegator.findList(org.ofbiz.shark.SharkConstants.WfProcess, null, null, null, null, false);
         } catch (GenericEntityException e) {
             throw new PersistenceException(e);
         }

Modified: ofbiz/trunk/framework/shark/src/org/ofbiz/shark/mapping/EntityApplicationMappingMgr.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/shark/src/org/ofbiz/shark/mapping/EntityApplicationMappingMgr.java?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/framework/shark/src/org/ofbiz/shark/mapping/EntityApplicationMappingMgr.java (original)
+++ ofbiz/trunk/framework/shark/src/org/ofbiz/shark/mapping/EntityApplicationMappingMgr.java Sat May 10 21:32:54 2008
@@ -66,7 +66,7 @@
         GenericDelegator delegator = SharkContainer.getDelegator();
         List lookupList = null;
         try {
-            lookupList = delegator.findAll(org.ofbiz.shark.SharkConstants.WfApplicationMap);
+            lookupList = delegator.findList(org.ofbiz.shark.SharkConstants.WfApplicationMap, null, null, null, null, false);
         } catch (GenericEntityException e) {
             throw new RootException(e);
         }

Modified: ofbiz/trunk/framework/shark/src/org/ofbiz/shark/mapping/EntityParticipantMappingMgr.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/shark/src/org/ofbiz/shark/mapping/EntityParticipantMappingMgr.java?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/framework/shark/src/org/ofbiz/shark/mapping/EntityParticipantMappingMgr.java (original)
+++ ofbiz/trunk/framework/shark/src/org/ofbiz/shark/mapping/EntityParticipantMappingMgr.java Sat May 10 21:32:54 2008
@@ -64,7 +64,7 @@
         GenericDelegator delegator = SharkContainer.getDelegator();
         List lookupList = null;
         try {
-            lookupList = delegator.findAll(org.ofbiz.shark.SharkConstants.WfParticipantMap);
+            lookupList = delegator.findList(org.ofbiz.shark.SharkConstants.WfParticipantMap, null, null, null, null, false);
         } catch (GenericEntityException e) {
             throw new RootException(e);
         }

Modified: ofbiz/trunk/framework/shark/src/org/ofbiz/shark/user/GenericUserGroupMgr.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/shark/src/org/ofbiz/shark/user/GenericUserGroupMgr.java?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/framework/shark/src/org/ofbiz/shark/user/GenericUserGroupMgr.java (original)
+++ ofbiz/trunk/framework/shark/src/org/ofbiz/shark/user/GenericUserGroupMgr.java Sat May 10 21:32:54 2008
@@ -52,7 +52,7 @@
         List groupNames = new ArrayList();
         List groups = null;
         try {
-            groups = delegator.findAll(org.ofbiz.shark.SharkConstants.SharkGroup);
+            groups = delegator.findList(org.ofbiz.shark.SharkConstants.SharkGroup, null, null, null, null, false);
         } catch (GenericEntityException e) {
             Debug.logError(e, module);
             throw new RootException(e);
@@ -72,7 +72,7 @@
         List userNames = new ArrayList();
         List users = null;
         try {
-            users = delegator.findAll(org.ofbiz.shark.SharkConstants.SharkUser);
+            users = delegator.findList(org.ofbiz.shark.SharkConstants.SharkUser, null, null, null, null, false);
         } catch (GenericEntityException e) {
             Debug.logError(e, module);
             throw new RootException(e);

Modified: ofbiz/trunk/framework/shark/src/org/ofbiz/shark/user/PartyUserGroupMgr.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/shark/src/org/ofbiz/shark/user/PartyUserGroupMgr.java?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/framework/shark/src/org/ofbiz/shark/user/PartyUserGroupMgr.java (original)
+++ ofbiz/trunk/framework/shark/src/org/ofbiz/shark/user/PartyUserGroupMgr.java Sat May 10 21:32:54 2008
@@ -53,7 +53,7 @@
         List userLogins = null;
         List allUsers = null;
         try {
-            userLogins = delegator.findAll("UserLogin", UtilMisc.toList("userLoginId"));
+            userLogins = delegator.findList("UserLogin", null, null, UtilMisc.toList("userLoginId"), null, false);
         } catch (GenericEntityException e) {
             throw new RootException(e);
         }

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/period/EditCustomTimePeriod.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/period/EditCustomTimePeriod.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/period/EditCustomTimePeriod.bsh (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/period/EditCustomTimePeriod.bsh Sat May 10 21:32:54 2008
@@ -54,12 +54,12 @@
     context.put("customTimePeriods", customTimePeriods);
 }
 
-List allCustomTimePeriods = delegator.findAll("CustomTimePeriod", UtilMisc.toList("organizationPartyId", "parentPeriodId", "periodTypeId", "periodNum", "fromDate"));
+List allCustomTimePeriods = delegator.findList("CustomTimePeriod", null, null, UtilMisc.toList("organizationPartyId", "parentPeriodId", "periodTypeId", "periodNum", "fromDate"), null, false);
 if (allCustomTimePeriods != null) {
     context.put("allCustomTimePeriods", allCustomTimePeriods);
 }
 
-List periodTypes = delegator.findAllCache("PeriodType", UtilMisc.toList("description"));
+List periodTypes = delegator.findList("PeriodType", null, null, UtilMisc.toList("description"), null, true);
 if (periodTypes != null) {
     context.put("periodTypes", periodTypes);
 }

Modified: ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/facilities.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/facilities.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/facilities.bsh (original)
+++ ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/facilities.bsh Sat May 10 21:32:54 2008
@@ -21,6 +21,6 @@
 
 delegator = request.getAttribute("delegator");
 
-facilities = delegator.findAll("Facility");
+facilities = delegator.findList("Facility", null, null, null, null, false);
 
 context.put("facilities", facilities);
\ No newline at end of file

Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListTimeSheetByDateRange.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListTimeSheetByDateRange.bsh?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListTimeSheetByDateRange.bsh (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListTimeSheetByDateRange.bsh Sat May 10 21:32:54 2008
@@ -45,7 +45,7 @@
         context.put("timeSheetList", timeSheetList);
 } else {
         if (findAll.equals("Y")) {
-            timeSheetList = delegator.findAll("Timesheet");
+            timeSheetList = delegator.findList("Timesheet", null, null, null, null, false);
             context.put("timeSheetList", timeSheetList);
         }else {
                timeSheetList = null;

Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/EditTimeEntry.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/EditTimeEntry.ftl?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/EditTimeEntry.ftl (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/EditTimeEntry.ftl Sat May 10 21:32:54 2008
@@ -55,7 +55,7 @@
         <tr>    
           <td class="label" >${uiLabelMap.TimesheetRateType}</td>
           <td>
-            <#assign rateTypes = delegator.findAll("RateType")>
+            <#assign rateTypes = delegator.findList("RateType", null, null, null, null, false)>
             <select name="rateTypeId">
               <#list rateTypes as rateType>                    
                 <option value="${rateType.rateTypeId}">${rateType.description}</option>

Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editProjectskills.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editProjectskills.ftl?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editProjectskills.ftl (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/editProjectskills.ftl Sat May 10 21:32:54 2008
@@ -33,7 +33,7 @@
         <tr>
           <td class="label">${uiLabelMap.ProjectMgrSkillType}</td>
           <td>            
-            <#assign skillTypes = delegator.findAll("SkillType")>
+            <#assign skillTypes = delegator.findList("SkillType", null, null, null, null, false)>
             <select name="skillTypeId">  
               <#list skillTypes as skillType>                    
                 <option value="${skillType.skillTypeId}">${skillType.description}</option>

Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittasklist.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittasklist.ftl?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittasklist.ftl (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittasklist.ftl Sat May 10 21:32:54 2008
@@ -61,7 +61,7 @@
                 <td class="label" >${uiLabelMap.ProjectMgrWorkEffortAssocTypeId}</td>
                 <td>
                   <select name="workEffortAssocTypeId">
-                    <#assign WorkEffortAssocTypes = delegator.findAll("WorkEffortAssocType", Static["org.ofbiz.base.util.UtilMisc"].toList("description"))>
+                    <#assign WorkEffortAssocTypes = delegator.findList("WorkEffortAssocType", null, null, Static["org.ofbiz.base.util.UtilMisc"].toList("description"), null, false)>
                     <#list WorkEffortAssocTypes as WorkEffortAssocType>
                       <option value="${WorkEffortAssocType.workEffortAssocTypeId?if_exists}">${WorkEffortAssocType.description?if_exists}</option>
                     </#list>

Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskskills.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskskills.ftl?rev=655238&r1=655237&r2=655238&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskskills.ftl (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskskills.ftl Sat May 10 21:32:54 2008
@@ -33,7 +33,7 @@
       <td class="label">${uiLabelMap.ProjectMgrSkillType}</td>
       <td>            
         <select name="skillTypeId">  
-          <#assign skillTypes = delegator.findAll("SkillType")>
+          <#assign skillTypes = delegator.findList("SkillType", null, null, null, null, false)>
           <#list skillTypes as skillType>                    
             <option value="${skillType.skillTypeId}">${skillType.description}</option>
           </#list>