svn commit: r655449 - in /ofbiz/trunk: applications/ecommerce/webapp/ecommerce/WEB-INF/actions/content/ applications/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/ applications/ecommerce/webapp/ecommerce/WEB-INF/actions/includes/ framework/webtools/...

[lektran]

Author: lektran
Date: Mon May 12 02:21:26 2008
New Revision: 655449

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

Modified:
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/content/mrv.bsh
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/currentvalprep.bsh
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/includes/mruprep.bsh
    ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/ViewGeneric.bsh

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/content/mrv.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/content/mrv.bsh?rev=655449&r1=655448&r2=655449&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/content/mrv.bsh (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/content/mrv.bsh Mon May 12 02:21:26 2008
@@ -65,7 +65,7 @@
 while (iter.hasNext()) {
     pk0 = iter.next();
     pk = pk0.getPrimaryKey();
-    gv = delegator.findByPrimaryKeyCache(pk);
+    gv = delegator.findOne(pk.getEntityName(), pk, true);
     if (gv != null) {
         String [] arr = { gv.get("contentId"), gv.get("contentName") };
         mrvList.add(arr);

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/currentvalprep.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/currentvalprep.bsh?rev=655449&r1=655448&r2=655449&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/currentvalprep.bsh (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/currentvalprep.bsh Mon May 12 02:21:26 2008
@@ -125,7 +125,7 @@
 currentEntityMap.put(currentEntityName, currentPK);
 request.setAttribute("currentPK", currentPK);
 context.put("currentPK", currentPK);
-currentValue = delegator.findByPrimaryKey(currentPK.getPrimaryKey());
+currentValue = delegator.findOne(currentPK.getPrimaryKey().getEntityName(), currentPK.getPrimaryKey(), false);
 context.put("currentValue", currentValue);
 request.setAttribute("currentValue", currentValue);
 

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/includes/mruprep.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/includes/mruprep.bsh?rev=655449&r1=655448&r2=655449&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/includes/mruprep.bsh (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/includes/mruprep.bsh Mon May 12 02:21:26 2008
@@ -85,7 +85,7 @@
 while (iter.hasNext()) {
     pk0 = iter.next();
     pk = pk0.getPrimaryKey();
-    gv = delegator.findByPrimaryKeyCache(pk);
+    gv = delegator.findOne(pk.getEntityName(), pk, true);
     if (gv != null) {
         mruList.add(gv);
     }

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/ViewGeneric.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/ViewGeneric.bsh?rev=655449&r1=655448&r2=655449&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/ViewGeneric.bsh (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/ViewGeneric.bsh Mon May 12 02:21:26 2008
@@ -81,7 +81,7 @@
 GenericValue value = null;
 //only try to find it if this is a valid primary key...
 if (findByPK.isPrimaryKey()) {
-    value = delegator.findByPrimaryKey(findByPK);
+    value = delegator.findOne(findByPK.getEntityName(), findByPK, false);
 }
 context.put("value", value);