svn commit: r655293 - in /ofbiz/trunk: applications/accounting/webapp/accounting/WEB-INF/actions/invoice/ applications/accounting/webapp/accounting/WEB-INF/actions/payment/ applications/accounting/webapp/accounting/WEB-INF/actions/reports/ applications...

[lektran]

Author: lektran
Date: Sun May 11 03:26:59 2008
New Revision: 655293

URL: http://svn.apache.org/viewvc?rev=655293&view=rev
Log:
Removed calls to deprecated findByCondition GenericDelegator methods from all bsh files

Modified:
    ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/findInvoices.bsh
    ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/getInvoiceItemTypes.bsh
    ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/listNotAppliedPayments.bsh
    ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/findPayment.bsh
    ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/listNotAppliedPayments.bsh
    ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TransactionTotals.bsh
    ofbiz/trunk/applications/content/widget/cms/mostrecentprep.bsh
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/cart/showcart.bsh
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/viewprofile.bsh
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/orderstatus.bsh
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/shipmentstatus.bsh
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/editShoppingList.bsh
    ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/mrp/findInventoryEventPlan.bsh
    ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/actions/reports/MarketingCampaignReport.bsh
    ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/actions/reports/TrackingCodeReport.bsh
    ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/LookupBulkAddProducts.bsh
    ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/LookupBulkAddSupplierProducts.bsh
    ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/productdetail.bsh
    ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/orderview.bsh
    ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/OpenOrderItemsReport.bsh
    ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/task/ordertasklist.bsh
    ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/find/keywordsearch.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/facility/WEB-INF/actions/shipment/ReceiveInventoryAgainstPurchaseOrder.bsh
    ofbiz/trunk/specialpurpose/bi/webapp/bi/WEB-INF/actions/reportbuilder/runStarSchemaQuery.bsh
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/FindProject.bsh
    ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/MyTasks.bsh

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=655293&r1=655292&r2=655293&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 Sun May 11 03:26:59 2008
@@ -124,7 +124,7 @@
     
     if (lookupErrorMessage == null && mainCond != null) {
         // do the lookup
-        invoiceList = delegator.findByCondition(entityName, mainCond, null, UtilMisc.toList("-invoiceDate"));            
+        invoiceList = delegator.findList(entityName, mainCond, null, UtilMisc.toList("-invoiceDate"), null, false);            
     }
     
     context.put("invoiceList", invoiceList);

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/getInvoiceItemTypes.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/getInvoiceItemTypes.bsh?rev=655293&r1=655292&r2=655293&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/getInvoiceItemTypes.bsh (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/getInvoiceItemTypes.bsh Sun May 11 03:26:59 2008
@@ -34,7 +34,7 @@
     parentTypes.add(new EntityExpr("parentTypeId", EntityOperator.EQUALS, "INVOICE_ITM_ADJ"));
     parentTypes.add(new EntityExpr("parentTypeId", EntityOperator.EQUALS, "INV_PROD_ITEM"));
     parentTypesCond = new EntityConditionList(parentTypes, EntityOperator.OR);
-    invoiceItemTypes = delegator.findByCondition("InvoiceItemType", parentTypesCond, null, UtilMisc.toList("parentTypeId", "invoiceItemTypeId"));
+    invoiceItemTypes = delegator.findList("InvoiceItemType", parentTypesCond, null, UtilMisc.toList("parentTypeId", "invoiceItemTypeId"), null, false);
     glAccountOrganizationAndClassList = delegator.findByAnd("GlAccountOrganizationAndClass", UtilMisc.toMap("organizationPartyId", invoice.get("partyIdFrom")));
 } else if ("PURCHASE_INVOICE".equals(invoice.get("invoiceTypeId"))) {
     List parentTypes = FastList.newInstance();
@@ -42,7 +42,7 @@
     parentTypes.add(new EntityExpr("parentTypeId", EntityOperator.EQUALS, "PINVOICE_ITM_ADJ"));
     parentTypes.add(new EntityExpr("parentTypeId", EntityOperator.EQUALS, "PINV_PROD_ITEM"));
     parentTypesCond = new EntityConditionList(parentTypes, EntityOperator.OR);
-    invoiceItemTypes = delegator.findByCondition("InvoiceItemType", parentTypesCond, null, UtilMisc.toList("parentTypeId", "invoiceItemTypeId"));
+    invoiceItemTypes = delegator.findList("InvoiceItemType", parentTypesCond, null, UtilMisc.toList("parentTypeId", "invoiceItemTypeId"), null, false);
     glAccountOrganizationAndClassList = delegator.findByAnd("GlAccountOrganizationAndClass", UtilMisc.toMap("organizationPartyId", invoice.get("partyId")));
 } else {
     map = delegator.findByAndCache("InvoiceItemTypeMap", UtilMisc.toMap("invoiceTypeId", invoice.get("invoiceTypeId")));

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/listNotAppliedPayments.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/listNotAppliedPayments.bsh?rev=655293&r1=655292&r2=655293&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/listNotAppliedPayments.bsh (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/listNotAppliedPayments.bsh Sun May 11 03:26:59 2008
@@ -63,7 +63,7 @@
 
 topCond = new EntityConditionList(exprList, EntityOperator.AND);
 
-payments = delegator.findByCondition("Payment", topCond, null, UtilMisc.toList("effectiveDate"));
+payments = delegator.findList("Payment", topCond, null, UtilMisc.toList("effectiveDate"), null, false);
 if (payments != null && payments.size() > 0)    {
     List paymentApplications = null;
     GenericValue paymentApplication = null;

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=655293&r1=655292&r2=655293&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 Sun May 11 03:26:59 2008
@@ -151,7 +151,7 @@
     
     if (lookupErrorMessage == null && mainCond != null) {
         // do the lookup
-        paymentList = delegator.findByCondition(entityName, mainCond, null, UtilMisc.toList("-effectiveDate"));
+        paymentList = delegator.findList(entityName, mainCond, null, UtilMisc.toList("-effectiveDate"), null, false);
         Debug.log("" + paymentList);        
     }
     

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/listNotAppliedPayments.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/listNotAppliedPayments.bsh?rev=655293&r1=655292&r2=655293&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/listNotAppliedPayments.bsh (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/listNotAppliedPayments.bsh Sun May 11 03:26:59 2008
@@ -64,7 +64,7 @@
 
 topCond = new EntityConditionList(exprList, EntityOperator.AND);
 
-payments = delegator.findByCondition("Payment", topCond, null, UtilMisc.toList("effectiveDate"));
+payments = delegator.findList("Payment", topCond, null, UtilMisc.toList("effectiveDate"), null, false);
     
 if (payments != null && payments.size() > 0)    {
     BigDecimal basePaymentApplied = PaymentWorker.getPaymentAppliedBd(basePayment);

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TransactionTotals.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TransactionTotals.bsh?rev=655293&r1=655292&r2=655293&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TransactionTotals.bsh (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TransactionTotals.bsh Sun May 11 03:26:59 2008
@@ -39,11 +39,11 @@
 List postedExprs = FastList.newInstance();
 postedExprs.add(new EntityExpr("isPosted", EntityOperator.EQUALS, "Y"));
 postedExprs.addAll(exprs);
-fieldsToSelect = UtilMisc.toList("glAccountId", "debitCreditFlag", "totalAmount");
+fieldsToSelect = UtilMisc.toSet("glAccountId", "debitCreditFlag", "totalAmount");
 orderBy = UtilMisc.toList("glAccountId");
 
 List postedTransTotalList = FastList.newInstance();
-List postedTrans = delegator.findByCondition("GlAccOrgAndAcctgTransAndEntry", new EntityConditionList(postedExprs, EntityOperator.AND), fieldsToSelect, orderBy);
+List postedTrans = delegator.findList("GlAccOrgAndAcctgTransAndEntry", new EntityConditionList(postedExprs, EntityOperator.AND), fieldsToSelect, orderBy, null, false);
 if (UtilValidate.isNotEmpty(postedTrans)) {
     iter = postedTrans.iterator();
     while (iter.hasNext()) {
@@ -67,7 +67,7 @@
 unpostedExprs.addAll(exprs);
 
 List unpostedTransTotalList = FastList.newInstance();
-List unpostedTrans = delegator.findByCondition("GlAccOrgAndAcctgTransAndEntry", new EntityConditionList(unpostedExprs, EntityOperator.AND), fieldsToSelect, orderBy);
+List unpostedTrans = delegator.findList("GlAccOrgAndAcctgTransAndEntry", new EntityConditionList(unpostedExprs, EntityOperator.AND), fieldsToSelect, orderBy, null, false);
 if (UtilValidate.isNotEmpty(unpostedTrans)) {
     iter = unpostedTrans.iterator();
     while (iter.hasNext()) {

Modified: ofbiz/trunk/applications/content/widget/cms/mostrecentprep.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/cms/mostrecentprep.bsh?rev=655293&r1=655292&r2=655293&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/cms/mostrecentprep.bsh (original)
+++ ofbiz/trunk/applications/content/widget/cms/mostrecentprep.bsh Sun May 11 03:26:59 2008
@@ -73,7 +73,7 @@
     contentIdToExpr = new EntityExpr("caContentIdTo", EntityOperator.EQUALS, forumId);
     exprList.add(contentIdToExpr);
     expr = new EntityConditionList(exprList, EntityOperator.AND);
-    entityList = delegator.findByCondition("ContentAssocViewFrom", expr, null, UtilMisc.toList("-caFromDate"));
+    entityList = delegator.findList("ContentAssocViewFrom", expr, null, UtilMisc.toList("-caFromDate"), null, false);
     
     Debug.logInfo("in mostrecentprep(1), entityList.size():" + entityList.size(),"");
     Debug.logInfo("in mostrecentprep(1), entityList:" + entityList,"");

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/cart/showcart.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/cart/showcart.bsh?rev=655293&r1=655292&r2=655293&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/cart/showcart.bsh (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/cart/showcart.bsh Sun May 11 03:26:59 2008
@@ -50,7 +50,7 @@
     exprList = UtilMisc.toList(new EntityExpr("partyId", EntityOperator.EQUALS, userLogin.getString("partyId")),
         new EntityExpr("listName", EntityOperator.NOT_EQUAL, "auto-save"));
     condition = new EntityConditionList(exprList, EntityOperator.AND);
-    allShoppingLists = delegator.findByCondition("ShoppingList", condition, null, UtilMisc.toList("listName"));
+    allShoppingLists = delegator.findList("ShoppingList", condition, null, UtilMisc.toList("listName"), null, false);
     context.put("shoppingLists", allShoppingLists);
 }
 

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=655293&r1=655292&r2=655293&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 Sun May 11 03:26:59 2008
@@ -61,7 +61,7 @@
     exprs = UtilMisc.toList(new EntityExpr("partyIdTo", EntityOperator.EQUALS, partyId));
     exprs.add(new EntityExpr("statusId", EntityOperator.NOT_EQUAL, "COM_READ"));
     condition = new EntityConditionList(exprs, EntityOperator.AND);
-    messages = delegator.findByCondition("CommunicationEvent", condition, null, null, orderBy, findOpts);
+    messages = delegator.findList("CommunicationEvent", condition, null, orderBy, findOpts, false);
     context.put("messages", messages);
     context.put("profileMessages", true);
 

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/orderstatus.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/orderstatus.bsh?rev=655293&r1=655292&r2=655293&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/orderstatus.bsh (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/orderstatus.bsh Sun May 11 03:26:59 2008
@@ -129,12 +129,12 @@
     // get Shipment tracking info
     osisCond = new EntityFieldMap(UtilMisc.toMap("orderId", orderId), EntityOperator.AND);
     osisOrder = UtilMisc.toList("shipmentId", "shipmentRouteSegmentId", "shipmentPackageSeqId");
-    osisFields = UtilMisc.toList("shipmentId", "shipmentRouteSegmentId", "carrierPartyId", "shipmentMethodTypeId");
+    osisFields = UtilMisc.toSet("shipmentId", "shipmentRouteSegmentId", "carrierPartyId", "shipmentMethodTypeId");
     osisFields.add("shipmentPackageSeqId");
     osisFields.add("trackingCode");
     osisFields.add("boxNumber");
     osisFindOptions = new EntityFindOptions(); osisFindOptions.setDistinct(true);
-    orderShipmentInfoSummaryList = delegator.findByCondition("OrderShipmentInfoSummary", osisCond, null, osisFields, osisOrder, osisFindOptions);
+    orderShipmentInfoSummaryList = delegator.findList("OrderShipmentInfoSummary", osisCond, osisFields, osisOrder, osisFindOptions, false);
 
     customerPoNumberSet = new TreeSet();
     orderItemPoIter = UtilMisc.toIterator(orderItems);

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/shipmentstatus.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/shipmentstatus.bsh?rev=655293&r1=655292&r2=655293&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/shipmentstatus.bsh (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/order/shipmentstatus.bsh Sun May 11 03:26:59 2008
@@ -31,10 +31,10 @@
     // get Shipment tracking info
     osisCond = new EntityFieldMap(UtilMisc.toMap("shipmentId", shipmentId), EntityOperator.AND);
     osisOrder = UtilMisc.toList("shipmentId", "shipmentRouteSegmentId", "shipmentPackageSeqId");
-    osisFields = UtilMisc.toList("shipmentId", "shipmentRouteSegmentId", "shipmentPackageSeqId", "carrierPartyId", "trackingCode");
+    osisFields = UtilMisc.toSet("shipmentId", "shipmentRouteSegmentId", "shipmentPackageSeqId", "carrierPartyId", "trackingCode");
     osisFindOptions = new EntityFindOptions();
     osisFindOptions.setDistinct(true);
-    orderShipmentInfoSummaryList = delegator.findByCondition("OrderShipmentInfoSummary", osisCond, null, osisFields, osisOrder, osisFindOptions);
+    orderShipmentInfoSummaryList = delegator.findList("OrderShipmentInfoSummary", osisCond, osisFields, osisOrder, osisFindOptions, false);
 
     context.put("shipment", shipment);
     context.put("shipmentItems", shipmentItems);

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=655293&r1=655292&r2=655293&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 Sun May 11 03:26:59 2008
@@ -49,7 +49,7 @@
 exprList = UtilMisc.toList(new EntityExpr("partyId", EntityOperator.EQUALS, userLogin.getString("partyId")),
         new EntityExpr("listName", EntityOperator.NOT_EQUAL, "auto-save"));
 condition = new EntityConditionList(exprList, EntityOperator.AND);
-allShoppingLists = delegator.findByCondition("ShoppingList", condition, null, UtilMisc.toList("listName"));
+allShoppingLists = delegator.findList("ShoppingList", condition, null, UtilMisc.toList("listName"), null, false);
 shoppingLists = EntityUtil.filterByAnd(allShoppingLists, UtilMisc.toMap("parentShoppingListId", null));
 context.put("allShoppingLists", allShoppingLists);
 context.put("shoppingLists", shoppingLists);

Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/mrp/findInventoryEventPlan.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/mrp/findInventoryEventPlan.bsh?rev=655293&r1=655292&r2=655293&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/mrp/findInventoryEventPlan.bsh (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/mrp/findInventoryEventPlan.bsh Sun May 11 03:26:59 2008
@@ -72,7 +72,7 @@
     
     if ( mainCond != null) {
     // do the lookup
-        inventoryList = delegator.findByCondition("MrpEvent", mainCond, null, UtilMisc.toList("productId", "eventDate"));
+        inventoryList = delegator.findList("MrpEvent", mainCond, null, UtilMisc.toList("productId", "eventDate"), null, false);
     }
     
     context.put("inventoryList", inventoryList);

Modified: ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/actions/reports/MarketingCampaignReport.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/actions/reports/MarketingCampaignReport.bsh?rev=655293&r1=655292&r2=655293&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/actions/reports/MarketingCampaignReport.bsh (original)
+++ ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/actions/reports/MarketingCampaignReport.bsh Sun May 11 03:26:59 2008
@@ -53,8 +53,8 @@
 visitConditions = new EntityConditionList(visitConditionList, EntityOperator.AND);
 orderConditions = new EntityConditionList(orderConditionList, EntityOperator.AND);
 
-visits = delegator.findByCondition("MarketingCampaignAndVisit", visitConditions, UtilMisc.toList("marketingCampaignId", "visitId"),UtilMisc.toList("marketingCampaignId"));
-orders = delegator.findByCondition("MarketingCampaignAndOrderHeader", orderConditions, UtilMisc.toList("marketingCampaignId", "orderId", "grandTotal"), UtilMisc.toList("marketingCampaignId"));
+visits = delegator.findList("MarketingCampaignAndVisit", visitConditions, UtilMisc.toSet("marketingCampaignId", "visitId"), UtilMisc.toList("marketingCampaignId"), null, false);
+orders = delegator.findList("MarketingCampaignAndOrderHeader", orderConditions, UtilMisc.toSet("marketingCampaignId", "orderId", "grandTotal"), UtilMisc.toList("marketingCampaignId"), null, false);
 
 //use this helper to build a List of visits, orders, order totals, and conversion rates
 marketingCampaignVisitAndOrders = ReportHelper.calcConversionRates(visits, orders, "marketingCampaignId");

Modified: ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/actions/reports/TrackingCodeReport.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/actions/reports/TrackingCodeReport.bsh?rev=655293&r1=655292&r2=655293&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/actions/reports/TrackingCodeReport.bsh (original)
+++ ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/actions/reports/TrackingCodeReport.bsh Sun May 11 03:26:59 2008
@@ -53,8 +53,8 @@
 visitConditions = new EntityConditionList(visitConditionList, EntityOperator.AND);
 orderConditions = new EntityConditionList(orderConditionList, EntityOperator.AND);
 
-visits = delegator.findByCondition("TrackingCodeAndVisit", visitConditions, UtilMisc.toList("trackingCodeId", "visitId"),UtilMisc.toList("trackingCodeId"));
-orders = delegator.findByCondition("TrackingCodeAndOrderHeader", orderConditions, UtilMisc.toList("trackingCodeId", "orderId", "grandTotal"), UtilMisc.toList("trackingCodeId"));
+visits = delegator.findList("TrackingCodeAndVisit", visitConditions, UtilMisc.toSet("trackingCodeId", "visitId"), UtilMisc.toList("trackingCodeId"), null, false);
+orders = delegator.findList("TrackingCodeAndOrderHeader", orderConditions, UtilMisc.toSet("trackingCodeId", "orderId", "grandTotal"), UtilMisc.toList("trackingCodeId"), null, false);
 
 // use this helper to build a List of visits, orders, order totals, and conversion rates
 trackingCodeVisitAndOrders = ReportHelper.calcConversionRates(visits, orders, "trackingCodeId");

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/LookupBulkAddProducts.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/LookupBulkAddProducts.bsh?rev=655293&r1=655292&r2=655293&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/LookupBulkAddProducts.bsh (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/LookupBulkAddProducts.bsh Sun May 11 03:26:59 2008
@@ -53,6 +53,6 @@
 mainConditionList.add(conditions);
 mainConditions = new EntityConditionList(mainConditionList, EntityOperator.AND);
 
-productList = delegator.findByCondition("Product", mainConditions, UtilMisc.toList("productId", "brandName", "internalName"), UtilMisc.toList("productId"));
-context.put("productList",productList);
+productList = delegator.findList("Product", mainConditions, UtilMisc.toSet("productId", "brandName", "internalName"), UtilMisc.toList("productId"), null, false);
+context.put("productList", productList);
 

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/LookupBulkAddSupplierProducts.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/LookupBulkAddSupplierProducts.bsh?rev=655293&r1=655292&r2=655293&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/LookupBulkAddSupplierProducts.bsh (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/LookupBulkAddSupplierProducts.bsh Sun May 11 03:26:59 2008
@@ -45,9 +45,9 @@
 conditionList.add(new EntityExpr("currencyUomId", EntityOperator.EQUALS, shoppingCart.getCurrency()));
 conditions = new EntityConditionList(conditionList, EntityOperator.AND);
 
-List selectedFields = UtilMisc.toList("productId", "supplierProductId", "supplierProductName", "lastPrice", "minimumOrderQuantity");
+List selectedFields = UtilMisc.toSet("productId", "supplierProductId", "supplierProductName", "lastPrice", "minimumOrderQuantity");
 selectedFields.add("availableFromDate");
 selectedFields.add("availableThruDate");
-productList = delegator.findByCondition("SupplierProduct", conditions, selectedFields, UtilMisc.toList("productId"));
+productList = delegator.findList("SupplierProduct", conditions, selectedFields, UtilMisc.toList("productId"), null, false);
 productList = EntityUtil.filterByDate(productList, UtilDateTime.nowTimestamp(), "availableFromDate", "availableThruDate", true);
 context.put("productList", productList);

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/productdetail.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/productdetail.bsh?rev=655293&r1=655292&r2=655293&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/productdetail.bsh (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/productdetail.bsh Sun May 11 03:26:59 2008
@@ -84,7 +84,7 @@
     exprList = UtilMisc.toList(new EntityExpr("partyId", EntityOperator.EQUALS, userLogin.getString("partyId")),
         new EntityExpr("listName", EntityOperator.NOT_EQUAL, "auto-save"));
     condition = new EntityConditionList(exprList, EntityOperator.AND);
-    allShoppingLists = delegator.findByCondition("ShoppingList", condition, null, UtilMisc.toList("listName"));        
+    allShoppingLists = delegator.findList("ShoppingList", condition, null, UtilMisc.toList("listName"), null, false);        
     context.put("shoppingLists", allShoppingLists);
 }
 

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=655293&r1=655292&r2=655293&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 Sun May 11 03:26:59 2008
@@ -182,10 +182,10 @@
     // get Shipment tracking info
     osisCond = new EntityFieldMap(UtilMisc.toMap("orderId", orderId), EntityOperator.AND);
     osisOrder = UtilMisc.toList("shipmentId", "shipmentRouteSegmentId", "shipmentPackageSeqId");
-    osisFields = UtilMisc.toList("shipGroupSeqId", "shipmentId", "shipmentRouteSegmentId", "carrierPartyId", "shipmentMethodTypeId");
+    osisFields = UtilMisc.toSet("shipGroupSeqId", "shipmentId", "shipmentRouteSegmentId", "carrierPartyId", "shipmentMethodTypeId");
     osisFields.add("shipmentPackageSeqId"); osisFields.add("trackingCode"); osisFields.add("boxNumber");
     osisFindOptions = new EntityFindOptions(); osisFindOptions.setDistinct(true);
-    orderShipmentInfoSummaryList = delegator.findByCondition("OrderShipmentInfoSummary", osisCond, null, osisFields, osisOrder, osisFindOptions);
+    orderShipmentInfoSummaryList = delegator.findList("OrderShipmentInfoSummary", osisCond, osisFields, osisOrder, osisFindOptions, false);
     context.put("orderShipmentInfoSummaryList", orderShipmentInfoSummaryList);
 
     customerPoNumber = null;

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/OpenOrderItemsReport.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/OpenOrderItemsReport.bsh?rev=655293&r1=655292&r2=655293&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/OpenOrderItemsReport.bsh (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/OpenOrderItemsReport.bsh Sun May 11 03:26:59 2008
@@ -99,10 +99,10 @@
     itemDescription = listValue.get("itemDescription");
     shipAfterDate = listValue.get("shipAfterDate");
     shipBeforeDate = listValue.get("shipBeforeDate");    
-    fieldsToSelect = UtilMisc.toList("price","productPriceTypeId");
+    fieldsToSelect = UtilMisc.toSet("price","productPriceTypeId");
     productIdCondExpr =  UtilMisc.toList(new EntityExpr("productId", EntityOperator.EQUALS, productId));    
     prodPriceCond = new EntityConditionList(productIdCondExpr, EntityOperator.AND);    
-    productPrices = delegator.findByCondition("ProductPrice", prodPriceCond, fieldsToSelect, null);    
+    productPrices = delegator.findList("ProductPrice", prodPriceCond, fieldsToSelect, null, null, false);    
     Double costPrice = new Double(0.0);
     Double retailPrice = new Double(0.0);
     Double listPrice = new Double(0.0);

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/task/ordertasklist.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/task/ordertasklist.bsh?rev=655293&r1=655292&r2=655293&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/task/ordertasklist.bsh (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/task/ordertasklist.bsh Sun May 11 03:26:59 2008
@@ -45,7 +45,7 @@
 partyRole = UtilMisc.toList(new EntityExpr("orderRoleTypeId", EntityOperator.EQUALS, "PLACING_CUSTOMER"), new EntityExpr("orderRoleTypeId", EntityOperator.EQUALS, "SUPPLIER_AGENT"));
 partyExpr = UtilMisc.toList(new EntityConditionList(partyBase, EntityOperator.AND), new EntityConditionList(partyRole, EntityOperator.OR));
 partyCond = new EntityConditionList(partyExpr, EntityOperator.AND);
-partyTasks = delegator.findByCondition("OrderTaskList", partyCond, null, sortOrder);
+partyTasks = delegator.findList("OrderTaskList", partyCond, null, sortOrder, null, false);
 
 if (partyTasks != null) partyTasks = EntityUtil.filterByDate(partyTasks);
 context.put("partyTasks", partyTasks);
@@ -80,7 +80,7 @@
 conditions = new EntityConditionList(expressions, EntityOperator.AND);
     
 // invoke the query
-roleTasks = delegator.findByCondition("OrderTaskList", conditions, null, sortOrder);    
+roleTasks = delegator.findList("OrderTaskList", conditions, null, sortOrder, null, false);    
 if (roleTasks != null) roleTasks = EntityUtil.filterByAnd(roleTasks, baseList);
 if (roleTasks != null) roleTasks = EntityUtil.filterByDate(roleTasks);  
 context.put("roleTasks", roleTasks);

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=655293&r1=655292&r2=655293&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 Sun May 11 03:26:59 2008
@@ -37,7 +37,7 @@
 expr = new EntityExpr(new EntityExpr("showInSelect", EntityOperator.EQUALS, null),
         EntityOperator.OR,
         new EntityExpr("showInSelect", EntityOperator.NOT_EQUAL, "N"));
-productCategories = delegator.findByCondition("ProductCategory", expr, null, UtilMisc.toList("description"));
+productCategories = delegator.findList("ProductCategory", expr, null, UtilMisc.toList("description"), null, false);
 
 context.put("applicationTypes", applicationTypes);
 context.put("productCategories", productCategories);

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=655293&r1=655292&r2=655293&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 Sun May 11 03:26:59 2008
@@ -123,7 +123,7 @@
     findIncomingShipmentsConds.add(new EntityConditionList(findIncomingShipmentsStatusConds, EntityOperator.AND));
 
     findIncomingShipmentsStatusCondition = new EntityConditionList(findIncomingShipmentsConds, EntityOperator.AND);
-    incomingShipmentAndItems = delegator.findByCondition("ShipmentAndItem", findIncomingShipmentsStatusCondition, null, UtilMisc.toList("-estimatedArrivalDate"));
+    incomingShipmentAndItems = delegator.findList("ShipmentAndItem", findIncomingShipmentsStatusCondition, null, UtilMisc.toList("-estimatedArrivalDate"), null, false);
     incomingShipmentAndItemIter = incomingShipmentAndItems.iterator();
     while (incomingShipmentAndItemIter.hasNext()) {
         incomingShipmentAndItem = incomingShipmentAndItemIter.next();

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=655293&r1=655292&r2=655293&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 Sun May 11 03:26:59 2008
@@ -112,9 +112,9 @@
     context.put("product", product);
 
     // get categories
-    List allCategories = delegator.findByCondition("ProductCategory",
+    List allCategories = delegator.findList("ProductCategory",
             new EntityExpr(new EntityExpr("showInSelect", EntityOperator.EQUALS, null), EntityOperator.OR, new EntityExpr("showInSelect", EntityOperator.NOT_EQUAL, "N")),
-            null, UtilMisc.toList("description"));
+            null, UtilMisc.toList("description"), null, false);
 
     List categoryMembers = product.getRelated("ProductCategoryMember");
     categoryMembers = EntityUtil.filterByDate(categoryMembers);

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=655293&r1=655292&r2=655293&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 Sun May 11 03:26:59 2008
@@ -174,7 +174,7 @@
     // Retrieve the backordered quantity
     // TODO: limit to a facility? The shipment destination facility is not necessarily the same facility as the inventory
     conditions = UtilMisc.toList(new EntityExpr("productId", EntityOperator.EQUALS, product.get("productId")), new EntityExpr("availableToPromiseTotal", EntityOperator.LESS_THAN, new Double(0)));
-    negativeInventoryItems = delegator.findByCondition("InventoryItem",  new EntityConditionList(conditions, EntityOperator.AND), null, null);
+    negativeInventoryItems = delegator.findList("InventoryItem",  new EntityConditionList(conditions, EntityOperator.AND), null, null, null, false);
     backOrderedQuantity = 0;
     niit = negativeInventoryItems.iterator();
     while (niit.hasNext()) {

Modified: ofbiz/trunk/specialpurpose/bi/webapp/bi/WEB-INF/actions/reportbuilder/runStarSchemaQuery.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/bi/webapp/bi/WEB-INF/actions/reportbuilder/runStarSchemaQuery.bsh?rev=655293&r1=655292&r2=655293&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/bi/webapp/bi/WEB-INF/actions/reportbuilder/runStarSchemaQuery.bsh (original)
+++ ofbiz/trunk/specialpurpose/bi/webapp/bi/WEB-INF/actions/reportbuilder/runStarSchemaQuery.bsh Sun May 11 03:26:59 2008
@@ -38,25 +38,20 @@
 
 List conditionList = null;
 EntityConditionList condition =  null;
-List selectFields = null;
+List selectFields = UtilMisc.toSetArray(selectedFields);
 List orderByFields = null;
 EntityFindOptions findOptions = null;
 
-List selectFields = FastList.newInstance();
 List records = FastList.newInstance();
 
 //conditionList.add(...);
 //condition =  new EntityConditionList(conditionList, EntityOperator.AND);
 
-for (int i = 0; i < selectedFields.length; i++) {
-    selectFields.add(selectedFields[i]);
-}
-
 orderByFields = null;
 
 findOptions = new EntityFindOptions();
 findOptions.setDistinct(false);
 
-records = delegator.findByCondition(starSchemaName, condition, null, selectFields, orderByFields, findOptions);
+records = delegator.findList(starSchemaName, condition, selectFields, orderByFields, findOptions, false);
 
 context.put("records", records);

Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/FindProject.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/FindProject.bsh?rev=655293&r1=655292&r2=655293&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/FindProject.bsh (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/FindProject.bsh Sun May 11 03:26:59 2008
@@ -66,7 +66,7 @@
     new EntityExpr("workEffortTypeId", EntityOperator.EQUALS, "PROJECT"));
 if (UtilValidate.isNotEmpty(entryCondition)) exprList.addAll(entryCondition);
 condition = new EntityConditionList(exprList, EntityOperator.AND);
-projectIds = delegator.findByCondition("WorkEffort", condition, UtilMisc.toList("workEffortId", "workEffortName"), UtilMisc.toList("workEffortName DESC"));
+projectIds = delegator.findList("WorkEffort", condition, UtilMisc.toSet("workEffortId", "workEffortName"), UtilMisc.toList("workEffortName DESC"), null, false);
 
 // retrieve all project data with the service
 projects = new LinkedList();    

Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/MyTasks.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/MyTasks.bsh?rev=655293&r1=655292&r2=655293&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/MyTasks.bsh (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/MyTasks.bsh Sun May 11 03:26:59 2008
@@ -58,14 +58,14 @@
     new EntityExpr("createdByUserLogin", EntityOperator.EQUALS, userLogin.getString("userLoginId")));
 if (UtilValidate.isNotEmpty(entryCondition)) exprList.addAll(entryCondition);
 condition = new EntityConditionList(exprList, EntityOperator.AND);
-tasks = delegator.findByCondition("WorkEffort", condition, null, null);
+tasks = delegator.findList("WorkEffort", condition, null, null, null, false);
 
 // create workEffort list in a project
 exprList = UtilMisc.toList(
     new EntityExpr("createdByUserLogin", EntityOperator.EQUALS, userLogin.getString("userLoginId")));
 if (UtilValidate.isNotEmpty(entryCondition)) exprList.addAll(entryCondition);
 condition = new EntityConditionList(exprList, EntityOperator.AND);
-tasks.addAll(delegator.findByCondition("ProjectAndPhaseAndTask", condition, null, null));
+tasks.addAll(delegator.findList("ProjectAndPhaseAndTask", condition, null, null, null, false));
 
 // add the timeEntry conditions
 exprList = UtilMisc.toList(
@@ -73,7 +73,7 @@
     new EntityExpr("createdByUserLogin", EntityOperator.NOT_EQUAL, userLogin.getString("userLoginId"))); //already have these
 if (UtilValidate.isNotEmpty(entryCondition)) exprList.addAll(entryCondition);
 condition = new EntityConditionList(exprList, EntityOperator.AND);
-tasks.addAll(delegator.findByCondition("WorkEffortAndTimeEntry", condition, null, null));
+tasks.addAll(delegator.findList("WorkEffortAndTimeEntry", condition, null, null, null, false));
 
 // add fields for planned and actual hours.
 newTasks = new LinkedList();