svn commit: r655456 - in /ofbiz/trunk: applications/accounting/webapp/accounting/WEB-INF/actions/reports/ applications/order/webapp/ordermgr/WEB-INF/actions/reports/ applications/order/webapp/ordermgr/WEB-INF/actions/requirement/ applications/order/web...

[lektran]

Author: lektran
Date: Mon May 12 03:03:50 2008
New Revision: 655456

URL: http://svn.apache.org/viewvc?rev=655456&view=rev
Log:
Removed calls to the following deprecated GenericDelegator methods from all bsh files:
findCountByAnd
findCountByCondition
findListIteratorByCondition

Modified:
    ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/SalesInvoiceByProductCategorySummary.bsh
    ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/reports/OpenOrderItemsReport.bsh
    ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/requirement/ApprovedProductRequirementsByVendor.bsh
    ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrderReportPrepare.bsh
    ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/communication/pendingCommunications.bsh
    ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/visit/showvisits.bsh
    ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/FastLoadCache.bsh
    ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/feature/EditFeatureCategoryFeatures.bsh
    ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/ApplyFeaturesFromCategory.bsh
    ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.bsh
    ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/countFacilityInventoryByProduct.bsh
    ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/findInventoryItemsByLabels.bsh
    ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryItemTotals.bsh
    ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/FindShipment.bsh
    ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/PackingSlip.bsh
    ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/FindGeneric.bsh
    ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/xmldsdump.bsh

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/SalesInvoiceByProductCategorySummary.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/SalesInvoiceByProductCategorySummary.bsh?rev=655456&r1=655455&r2=655456&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/SalesInvoiceByProductCategorySummary.bsh (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/SalesInvoiceByProductCategorySummary.bsh Mon May 12 03:03:50 2008
@@ -59,7 +59,7 @@
     productCategoryIdSet.add(categoryRollup.get("productCategoryId"));
 }
 
-productFieldsToSelect = UtilMisc.toList("productId", "quantityTotal", "amountTotal");
+productFieldsToSelect = UtilMisc.toSet("productId", "quantityTotal", "amountTotal");
 
 //NOTE: tax, etc also have productId on them, so restrict by type INV_PROD_ITEM, INV_FPROD_ITEM, INV_DPROD_ITEM, others?
 baseProductAndExprs = FastList.newInstance();
@@ -69,7 +69,7 @@
 if (UtilValidate.isNotEmpty(organizationPartyId)) baseProductAndExprs.add(new EntityExpr("partyIdFrom", EntityOperator.EQUALS, organizationPartyId));
 if (UtilValidate.isNotEmpty(currencyUomId)) baseProductAndExprs.add(new EntityExpr("currencyUomId", EntityOperator.EQUALS, currencyUomId));
 
-categoryFieldsToSelect = UtilMisc.toList("productCategoryId", "quantityTotal", "amountTotal");
+categoryFieldsToSelect = UtilMisc.toSet("productCategoryId", "quantityTotal", "amountTotal");
 
 baseCategoryAndExprs = FastList.newInstance();
 baseCategoryAndExprs.add(new EntityExpr("invoiceTypeId", EntityOperator.EQUALS, "SALES_INVOICE"));
@@ -117,7 +117,7 @@
     productAndExprs.add(new EntityExpr("invoiceDate", EntityOperator.GREATER_THAN_EQUAL_TO, currentDayBegin));
     productAndExprs.add(new EntityExpr("invoiceDate", EntityOperator.LESS_THAN, nextDayBegin));
     
-    productResultListIterator = delegator.findListIteratorByCondition("InvoiceItemProductSummary", new EntityConditionList(productAndExprs, EntityOperator.AND), null, productFieldsToSelect, null, findOpts);
+    productResultListIterator = delegator.find("InvoiceItemProductSummary", new EntityConditionList(productAndExprs, EntityOperator.AND), null, productFieldsToSelect, null, findOpts);
     productResultMap = FastMap.newInstance();
     while ((productResult = productResultListIterator.next()) != null) {
         productResultMap.put(productResult.get("productId"), productResult);
@@ -134,7 +134,7 @@
     categoryAndExprs.add(new EntityExpr("invoiceDate", EntityOperator.GREATER_THAN_EQUAL_TO, currentDayBegin));
     categoryAndExprs.add(new EntityExpr("invoiceDate", EntityOperator.LESS_THAN, nextDayBegin));
     
-    categoryResultListIterator = delegator.findListIteratorByCondition("InvoiceItemCategorySummary", new EntityConditionList(categoryAndExprs, EntityOperator.AND), null, categoryFieldsToSelect, null, findOpts);
+    categoryResultListIterator = delegator.find("InvoiceItemCategorySummary", new EntityConditionList(categoryAndExprs, EntityOperator.AND), null, categoryFieldsToSelect, null, findOpts);
     categoryResultMap = FastMap.newInstance();
     while ((categoryResult = categoryResultListIterator.next()) != null) {
         categoryResultMap.put(categoryResult.get("productCategoryId"), categoryResult);
@@ -151,7 +151,7 @@
     productNullAndExprs.add(new EntityExpr("productId", EntityOperator.EQUALS, null));
     productNullAndExprs.add(new EntityExpr("invoiceDate", EntityOperator.GREATER_THAN_EQUAL_TO, currentDayBegin));
     productNullAndExprs.add(new EntityExpr("invoiceDate", EntityOperator.LESS_THAN, nextDayBegin));
-    productNullResultListIterator = delegator.findListIteratorByCondition("InvoiceItemProductSummary", new EntityConditionList(productNullAndExprs, EntityOperator.AND), null, productFieldsToSelect, null, findOpts);
+    productNullResultListIterator = delegator.find("InvoiceItemProductSummary", new EntityConditionList(productNullAndExprs, EntityOperator.AND), null, productFieldsToSelect, null, findOpts);
     // should just be 1 result
     productNullResult = productNullResultListIterator.next();
     productNullResultListIterator.close();

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=655456&r1=655455&r2=655456&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 Mon May 12 03:03:50 2008
@@ -74,12 +74,12 @@
 
 // get the results as an entity list iterator
 allConditions = new EntityConditionList( conditions, EntityOperator.AND );
-fieldsToSelect = UtilMisc.toList("orderId","orderDate","productId","quantityOrdered","quantityIssued","quantityOpen");
+fieldsToSelect = UtilMisc.toSet("orderId", "orderDate", "productId", "quantityOrdered", "quantityIssued", "quantityOpen");
 fieldsToSelect.add("shipBeforeDate");
 fieldsToSelect.add("shipAfterDate");
 fieldsToSelect.add("itemDescription");
 findOptions = new EntityFindOptions(true, EntityFindOptions.TYPE_SCROLL_INSENSITIVE, EntityFindOptions.CONCUR_READ_ONLY, true);
-listIt = delegator.findListIteratorByCondition("OrderItemQuantityReportGroupByItem", allConditions, null, fieldsToSelect, UtilMisc.toList("orderDate DESC"), findOptions);
+listIt = delegator.find("OrderItemQuantityReportGroupByItem", allConditions, null, fieldsToSelect, UtilMisc.toList("orderDate DESC"), findOptions);
 List orderItemList = new ArrayList();
 Double totalCostPrice = new Double(0.0);
 Double totalListPrice = new Double(0.0);

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/requirement/ApprovedProductRequirementsByVendor.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/requirement/ApprovedProductRequirementsByVendor.bsh?rev=655456&r1=655455&r2=655456&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/requirement/ApprovedProductRequirementsByVendor.bsh (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/requirement/ApprovedProductRequirementsByVendor.bsh Mon May 12 03:03:50 2008
@@ -31,7 +31,7 @@
 
 delegator = request.getAttribute("delegator");
 
-fields = UtilMisc.toList("partyId", "productId");
+fields = UtilMisc.toSet("partyId", "productId");
 options = new EntityFindOptions(true, EntityFindOptions.TYPE_SCROLL_INSENSITIVE, EntityFindOptions.CONCUR_READ_ONLY, true);
 orderBy = UtilMisc.toList("partyId");
 conditions = new EntityConditionList( UtilMisc.toList(
@@ -40,5 +40,5 @@
             new EntityExpr("requirementTypeId", EntityOperator.EQUALS, "PRODUCT_REQUIREMENT"),
             EntityUtil.getFilterByDateExpr()
             ), EntityOperator.AND);
-requirements = delegator.findListIteratorByCondition("RequirementPartyProductCount", conditions, null, fields, orderBy, options);
+requirements = delegator.find("RequirementPartyProductCount", conditions, null, fields, orderBy, options);
 context.put("requirements", requirements);

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrderReportPrepare.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrderReportPrepare.bsh?rev=655456&r1=655455&r2=655456&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrderReportPrepare.bsh (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrderReportPrepare.bsh Mon May 12 03:03:50 2008
@@ -91,7 +91,7 @@
 entityCondition = new EntityConditionList(conditionList, EntityOperator.AND);
 orderByList = UtilMisc.toList("orderTypeId", "orderStatus");
 
-eli = delegator.findListIteratorByCondition("OrderReportView", entityCondition, null, null, orderByList, null);
+eli = delegator.find("OrderReportView", entityCondition, null, null, orderByList, null);
 jrDataSource = new JREntityListIteratorDataSource(eli);
 
 jrParameters = new HashMap();

Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/communication/pendingCommunications.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/communication/pendingCommunications.bsh?rev=655456&r1=655455&r2=655456&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/communication/pendingCommunications.bsh (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/communication/pendingCommunications.bsh Mon May 12 03:03:50 2008
@@ -117,7 +117,7 @@
     beganTransaction = TransactionUtil.begin();
 
     // obtain the ELI
-    eli = delegator.findListIteratorByCondition("CommunicationEvent", condition, null, fieldsToSelect, orderBy, findOpts);
+    eli = delegator.find("CommunicationEvent", condition, null, fieldsToSelect, orderBy, findOpts);
     
     // get the indexes for the partial list
     lowIndex = (((viewIndex - 1) * viewSize) + 1);

Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/visit/showvisits.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/visit/showvisits.bsh?rev=655456&r1=655455&r2=655456&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/visit/showvisits.bsh (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/visit/showvisits.bsh Mon May 12 03:03:50 2008
@@ -44,12 +44,12 @@
     beganTransaction = TransactionUtil.begin();
 
     if (partyId != null) {
-        visitListIt = delegator.findListIteratorByCondition("Visit", new EntityExpr("partyId", EntityOperator.EQUALS, partyId), null, null, sortList, new EntityFindOptions(true, EntityFindOptions.TYPE_SCROLL_INSENSITIVE, EntityFindOptions.CONCUR_READ_ONLY, true));    
+        visitListIt = delegator.find("Visit", new EntityExpr("partyId", EntityOperator.EQUALS, partyId), null, null, sortList, new EntityFindOptions(true, EntityFindOptions.TYPE_SCROLL_INSENSITIVE, EntityFindOptions.CONCUR_READ_ONLY, true));    
     } else if (showAll.equalsIgnoreCase("true")) {
-        visitListIt = delegator.findListIteratorByCondition("Visit", null, null, null, sortList, new EntityFindOptions(true, EntityFindOptions.TYPE_SCROLL_INSENSITIVE, EntityFindOptions.CONCUR_READ_ONLY, true));
+        visitListIt = delegator.find("Visit", null, null, null, sortList, new EntityFindOptions(true, EntityFindOptions.TYPE_SCROLL_INSENSITIVE, EntityFindOptions.CONCUR_READ_ONLY, true));
     } else {
         // show active visits      
-        visitListIt = delegator.findListIteratorByCondition("Visit", new EntityExpr("thruDate", EntityOperator.EQUALS, null), null, null, sortList, new EntityFindOptions(true, EntityFindOptions.TYPE_SCROLL_INSENSITIVE, EntityFindOptions.CONCUR_READ_ONLY, true));  
+        visitListIt = delegator.find("Visit", new EntityExpr("thruDate", EntityOperator.EQUALS, null), null, null, sortList, new EntityFindOptions(true, EntityFindOptions.TYPE_SCROLL_INSENSITIVE, EntityFindOptions.CONCUR_READ_ONLY, true));  
     }
     
     viewIndex = 1;

Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/FastLoadCache.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/FastLoadCache.bsh?rev=655456&r1=655455&r2=655456&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/FastLoadCache.bsh (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/FastLoadCache.bsh Mon May 12 03:03:50 2008
@@ -26,7 +26,7 @@
 messageList.add("Loading Categories...");
 UtilTimer ctimer = new UtilTimer();
 messageList.add(ctimer.timerString("Before category find"));
-EntityListIterator categories = delegator.findListIteratorByCondition("ProductCategory", null, null, null);
+EntityListIterator categories = delegator.find("ProductCategory", null, null, null, null, null);
 messageList.add(ctimer.timerString("Before load all categories into cache"));
 
 GenericValue category = null;
@@ -45,7 +45,7 @@
 messageList.add("Loading Products...");
 UtilTimer ptimer = new UtilTimer();
 messageList.add(ptimer.timerString("Before product find"));
-EntityListIterator products = delegator.findListIteratorByCondition("Product", null, null, null);
+EntityListIterator products = delegator.find("Product", null, null, null, null, null);
 messageList.add(ptimer.timerString("Before load all products into cache"));
 GenericValue product = null;
 long numProducts = 0;

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=655456&r1=655455&r2=655456&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 Mon May 12 03:03:50 2008
@@ -20,8 +20,7 @@
 import java.util.*;
 import java.io.*;
 import org.ofbiz.entity.*;
-import org.ofbiz.entity.condition.EntityFieldMap;
-import org.ofbiz.entity.condition.EntityOperator;
+import org.ofbiz.entity.condition.*;
 import org.ofbiz.entity.util.EntityFindOptions;
 import org.ofbiz.entity.transaction.*;
 import org.ofbiz.base.util.*;
@@ -61,7 +60,7 @@
     context.put("productFeatureApplTypes", productFeatureApplTypes);
 }
 
-productFeaturesSize = delegator.findCountByAnd("ProductFeature", UtilMisc.toMap("productFeatureCategoryId", productFeatureCategoryId));
+productFeaturesSize = delegator.findCountByCondition("ProductFeature", new EntityExpr("productFeatureCategoryId", EntityOperator.EQUALS, productFeatureCategoryId), null, null);
 
 int highIndex = 0;
 int lowIndex = 0;
@@ -92,7 +91,7 @@
 try {
     beganTransaction = TransactionUtil.begin();
 
-    productFeaturesEli = delegator.findListIteratorByCondition("ProductFeature", whereCondition, null, null, UtilMisc.toList("productFeatureTypeId", "defaultSequenceNum", "description"), efo);
+    productFeaturesEli = delegator.find("ProductFeature", whereCondition, null, null, UtilMisc.toList("productFeatureTypeId", "defaultSequenceNum", "description"), efo);
     productFeatures = productFeaturesEli.getPartialList(lowIndex + 1, highIndex - lowIndex);
     productFeaturesEli.close();
 } catch (GenericEntityException e) {

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=655456&r1=655455&r2=655456&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 Mon May 12 03:03:50 2008
@@ -20,8 +20,7 @@
 import java.util.*;
 import java.io.*;
 import org.ofbiz.entity.*;
-import org.ofbiz.entity.condition.EntityFieldMap;
-import org.ofbiz.entity.condition.EntityOperator;
+import org.ofbiz.entity.condition.*;
 import org.ofbiz.entity.util.EntityFindOptions;
 import org.ofbiz.entity.transaction.*;
 import org.ofbiz.base.util.*;
@@ -53,7 +52,7 @@
     context.put("productFeatureApplTypes", productFeatureApplTypes);
 }
 
-productFeaturesSize = delegator.findCountByAnd("ProductFeature", UtilMisc.toMap("productFeatureCategoryId", productFeatureCategoryId));
+productFeaturesSize = delegator.findCountByCondition("ProductFeature", new EntityExpr("productFeatureCategoryId", EntityOperator.EQUALS, productFeatureCategoryId), null, null);
 
 int highIndex = 0;
 int lowIndex = 0;
@@ -83,7 +82,7 @@
 try {
     beganTransaction = TransactionUtil.begin();
 
-    productFeaturesEli = delegator.findListIteratorByCondition("ProductFeature", whereCondition, null, null, UtilMisc.toList("productFeatureTypeId", "defaultSequenceNum", "description"), efo);
+    productFeaturesEli = delegator.find("ProductFeature", whereCondition, null, null, UtilMisc.toList("productFeatureTypeId", "defaultSequenceNum", "description"), efo);
     productFeatures = productFeaturesEli.getPartialList(lowIndex + 1, highIndex - lowIndex);
     productFeaturesEli.close();
 } catch (GenericEntityException e) {

Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.bsh?rev=655456&r1=655455&r2=655456&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.bsh (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.bsh Mon May 12 03:03:50 2008
@@ -132,7 +132,7 @@
     List prods = null;
     try {
         beganTransaction = TransactionUtil.begin();
-        prodsEli = delegator.findListIteratorByCondition(prodView, whereCondition, null, null, UtilMisc.toList("productId"), findOpts);
+        prodsEli = delegator.find(prodView, whereCondition, null, null, UtilMisc.toList("productId"), findOpts);
         prods = prodsEli.getCompleteList();
         prodsEli.close();
     } catch (GenericEntityException e) {

Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/countFacilityInventoryByProduct.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/countFacilityInventoryByProduct.bsh?rev=655456&r1=655455&r2=655456&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/countFacilityInventoryByProduct.bsh (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/countFacilityInventoryByProduct.bsh Mon May 12 03:03:50 2008
@@ -228,7 +228,7 @@
     List prods = null;
     try {
         beganTransaction = TransactionUtil.begin();
-        prodsEli = delegator.findListIteratorByCondition(prodView, whereCondition, null, null, orderBy, findOpts);
+        prodsEli = delegator.find(prodView, whereCondition, null, null, orderBy, findOpts);
 
         // get the indexes for the partial list
         lowIndex = ((viewIndex.intValue() * viewSize.intValue()) + 1);
@@ -268,7 +268,7 @@
             if (! UtilValidate.isEmpty(checkTime)) {
             
                 // Make a query against the sales usage view entity
-                salesUsageIt = delegator.findListIteratorByCondition(salesUsageViewEntity,
+                salesUsageIt = delegator.find(salesUsageViewEntity,
                         new EntityConditionList(
                             UtilMisc.toList(
                                 new EntityExpr("facilityId", EntityOperator.EQUALS, facilityId),
@@ -294,7 +294,7 @@
                 salesUsageIt.close();
         
                 // Make a query against the production usage view entity
-                productionUsageIt = delegator.findListIteratorByCondition(productionUsageViewEntity,
+                productionUsageIt = delegator.find(productionUsageViewEntity,
                         new EntityConditionList(
                             UtilMisc.toList(
                                 new EntityExpr("facilityId", EntityOperator.EQUALS, facilityId),

Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/findInventoryItemsByLabels.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/findInventoryItemsByLabels.bsh?rev=655456&r1=655455&r2=655456&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/findInventoryItemsByLabels.bsh (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/findInventoryItemsByLabels.bsh Mon May 12 03:03:50 2008
@@ -64,7 +64,7 @@
     try {
         EntityFindOptions findOpts = new EntityFindOptions(true, EntityFindOptions.TYPE_SCROLL_INSENSITIVE, EntityFindOptions.CONCUR_READ_ONLY, true);
         beganTransaction = TransactionUtil.begin();
-        inventoryItemsEli = delegator.findListIteratorByCondition(inventoryItemAndLabelsView, new EntityConditionList(andCondition, EntityOperator.AND), null, null, null, findOpts);
+        inventoryItemsEli = delegator.find(inventoryItemAndLabelsView, new EntityConditionList(andCondition, EntityOperator.AND), null, null, null, findOpts);
 
         // get the indexes for the partial list
         lowIndex = ((viewIndex * viewSize) + 1);

Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryItemTotals.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryItemTotals.bsh?rev=655456&r1=655455&r2=655456&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryItemTotals.bsh (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryItemTotals.bsh Mon May 12 03:03:50 2008
@@ -45,7 +45,7 @@
         // create resultMap to stop issue with the first puts in the while loop
         resultMap = new HashMap();
         beganTransaction = TransactionUtil.begin();
-        invItemListItr = delegator.findListIteratorByCondition("InventoryItem", conditionList, null, UtilMisc.toList("productId"));
+        invItemListItr = delegator.find("InventoryItem", conditionList, null, null, UtilMisc.toList("productId"), null);
         while ((inventoryItem = invItemListItr.next()) != null) {
             productId = inventoryItem.getString("productId");
             product = delegator.findByPrimaryKey("Product", UtilMisc.toMap("productId", productId));

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=655456&r1=655455&r2=655456&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 Mon May 12 03:03:50 2008
@@ -114,7 +114,7 @@
             beganTransaction = TransactionUtil.begin();
 
             // using list iterator
-            EntityListIterator orli = delegator.findListIteratorByCondition("Shipment", mainCond, null, null, orderBy, findOpts);
+            EntityListIterator orli = delegator.find("Shipment", mainCond, null, null, orderBy, findOpts);
 
             // get the indexes for the partial list
             lowIndex = (((viewIndex - 1) * viewSize) + 1);

Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/PackingSlip.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/PackingSlip.bsh?rev=655456&r1=655455&r2=655456&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/PackingSlip.bsh (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/PackingSlip.bsh Mon May 12 03:03:50 2008
@@ -49,7 +49,7 @@
 }
 
 // Add in the total of all previously shipped items
-previousShipmentIter = delegator.findListIteratorByCondition("Shipment",
+previousShipmentIter = delegator.find("Shipment",
         new EntityConditionList(
             UtilMisc.toList(
                 new EntityExpr("primaryOrderId", EntityOperator.EQUALS, shipment.getString("primaryOrderId")),

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/FindGeneric.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/FindGeneric.bsh?rev=655456&r1=655455&r2=655456&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/FindGeneric.bsh (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/FindGeneric.bsh Mon May 12 03:03:50 2008
@@ -134,7 +134,7 @@
     }
     condition = new EntityConditionList(conditionList, EntityOperator.AND);
     
-    arraySize = (int) delegator.findCountByCondition(entityName, condition, null);
+    arraySize = (int) delegator.findCountByCondition(entityName, condition, null, null);
     if (arraySize < highIndex) {
         highIndex = arraySize;
     }
@@ -147,7 +147,7 @@
             EntityFindOptions efo = new EntityFindOptions();
             efo.setResultSetType(EntityFindOptions.TYPE_SCROLL_INSENSITIVE);
             EntityListIterator resultEli = null;
-            resultEli = delegator.findListIteratorByCondition(entityName, condition, null, null, null, efo);
+            resultEli = delegator.find(entityName, condition, null, null, null, efo);
             resultPartialList = resultEli.getPartialList(lowIndex, highIndex - lowIndex + 1);
             resultEli.close();
         } catch (GenericEntityException e) {

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/xmldsdump.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/xmldsdump.bsh?rev=655456&r1=655455&r2=655456&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/xmldsdump.bsh (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/xmldsdump.bsh Mon May 12 03:03:50 2008
@@ -223,9 +223,9 @@
             ModelEntity me = reader.getModelEntity(curEntityName);
             EntityListIterator values = null;
             if (me.getNoAutoStamp() == true) {
-                values = delegator.findListIteratorByCondition(curEntityName, null, null, null, me.getPkFieldNames(), efo);
+                values = delegator.find(curEntityName, null, null, null, me.getPkFieldNames(), efo);
             } else {
-                values = delegator.findListIteratorByCondition(curEntityName, entityDateCond, null, null, UtilMisc.toList("-createdTxStamp"), efo);
+                values = delegator.find(curEntityName, entityDateCond, null, null, UtilMisc.toList("-createdTxStamp"), efo);
             }
 
             GenericValue value = null;
@@ -282,9 +282,9 @@
                     continue;
                 }
                 if (me.getNoAutoStamp() == true) {
-                    values = delegator.findListIteratorByCondition(curEntityName, null, null, null, me.getPkFieldNames(), efo);
+                    values = delegator.find(curEntityName, null, null, null, me.getPkFieldNames(), efo);
                 } else {
-                    values = delegator.findListIteratorByCondition(curEntityName, entityDateCond, null, null, me.getPkFieldNames(), efo);
+                    values = delegator.find(curEntityName, entityDateCond, null, null, me.getPkFieldNames(), efo);
                 }
                 boolean isFirst = true;
                 PrintWriter writer = null;