svn commit: r1647121 - in /ofbiz/branches/release12.04: ./ framework/entity/src/org/ofbiz/entity/ framework/entity/src/org/ofbiz/entity/util/ framework/minilang/dtd/ framework/minilang/src/org/ofbiz/minilang/method/entityops/

Author: jleroux
Date: Sun Dec 21 11:10:25 2014
New Revision: 1647121

URL: http://svn.apache.org/r1647121
Log:
"Applied fix from trunk for revision: 1524704"
------------------------------------------------------------------------
r1524704 | jleroux | 2013-09-19 14:03:47 +0200 (jeu. 19 sept. 2013) | 6 lignes

A patch for "Deprecate doCacheClear in Delegator interface and class and related minilang classes" https://issues.apache.org/jira/browse/OFBIZ-5325
* Deprecates methods in Delegator interface and class
* Deprecates cache clear related variable and methods in EntitySaxReader class
* Deprecates cache clear related variables in minilang related delegator classes
* In simple-method schema annotations, marks do-cache-clear attribute as deprecated

------------------------------------------------------------------------


Modified:
    ofbiz/branches/release12.04/   (props changed)
    ofbiz/branches/release12.04/framework/entity/src/org/ofbiz/entity/Delegator.java
    ofbiz/branches/release12.04/framework/entity/src/org/ofbiz/entity/GenericDelegator.java
    ofbiz/branches/release12.04/framework/entity/src/org/ofbiz/entity/util/EntitySaxReader.java
    ofbiz/branches/release12.04/framework/minilang/dtd/simple-methods-v2.xsd
    ofbiz/branches/release12.04/framework/minilang/dtd/simple-methods.xsd
    ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/CreateValue.java
    ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/RefreshValue.java
    ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveByAnd.java
    ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveList.java
    ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveRelated.java
    ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveValue.java
    ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreList.java
    ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreValue.java

Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec 21 11:10:25 2014
@@ -3,4 +3,4 @@
 /ofbiz/branches/jackrabbit20100709:962442-1231517
 /ofbiz/branches/jquery:952958-1044489
 /ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:1332097,1333439,1333885,1334201,1334336,1334483,1335047,1335343,1335347,1335351,1335946,1336921,1337046,1337057-1337059,1337202,1337502,1337524,1337644,1337789,1337800,1338065,1338101,1338224,1338570,1338591,1338700,1338831,1338845,1338974,1339081,1339122,1340273,1340352,1340357,1340400,1340405,1340415,1340657,1340661,1340774,1340821,1340826,1340943,1341314,1341399,1342852,1342875,1342893,1342980,1343088,1345473,1345484,1345532,1345547,1345553,1347559,1347762,1351778,1351999,1353135,1353681,1355660,1355801,1355859,1355975,1358735,1359500,1359599-1359600,1360689,1361056,1361073,1361476,1361662,1361931,1361944,1361958,1364046,1364052,1364216,1364218,1366660,1366960,1369555,1369561,1377253,1377382,1377386,1377388,1379334,1379340,1379345,1381146,1384251,1384894,1387878,1387884,1388832,1389802,1392773,1393948,1394995,1395104,1395460,1395953,1396105,1399539,1399761,1400388,1400393,1400421,1402766,1403370,1406727,1407634,1408408,1413307,1421662,1422207,1423117,1425155,1425662,
 1426231,1426734,1426787,1430332,1430336,1431191,1432392,1432833,1435528,1435701,1438498,1444356,1446575,1446876,1447107,1451183,1451879,1452382,1458429,1459220,1459222,1460116,1460276,1461551,1462948,1463989,1465351,1470151,1470483,1471283-1471284,1471687,1471739,1476296,1480407,1481287,1484279,1485432,1487130,1487854,1488000,1488127,1488188,1489461,1492112,1492673,1493352,1493393,1493658,1493683,1494202,1494682,1497376,1497822,1497839,1499732,1500760,1500772,1502121,1502944,1502946,1504864,1506269,1506499,1506504,1506828,1509164,1510042,1512376,1512573,1517629,1517702,1517780,1517947,1518336,1518950,1519245,1524361,1524676,1524769,1524950,1525523,1526387,1526463,1527254,1528144,1528146,1528149,1528298,1529412,1529418,1531848,1532342,1532366,1535961,1536656,1537023,1537179,1537996,1538096,1539147,1539156,1543744,1543766,1543781,1544444,1547548,1548143,1550255,1550515,1551744,1552290,1552500,1552901,1552908,1554290,1554536,1554681,1554685,1554706,1554764,1554787,1555142,1557409-15574
 10,1557440,1557447,1557457,1557462,1557593,1558373,1559814,1560048,1560056,1560176,1560203,1560205,1560699,1561286,1561290,1561305,1561311,1561327,1561467,1562767,1563238,1563683,1563958,1564111,1564113,1564463,1564473,1564493,1566096,1566273,1569078,1569743,1571219,1573161,1573498,1573639,1574019,1575508,1576259,1576331,1576378,1576506,1576511,1576757,1576839,1577268,1579155,1579161,1579309,1580455,1581386,1581997,1582762,1583040,1583427-1583428,1583551,1583674,1583681,1583689,1583696,1584873,1585033,1585574,1585958-1585959,1586987,1587841,1587843,1588733,1589602,1589606,1589612,1589625,1589669,1592530,1592588,1592745,1592977,1593902,1593908,1593952,1597464,1598544,1598913,1603732,1603739,1604357,1604363,1604522,1604554,1605348,1605354,1605707,1607457,1608355,1608491,1608495,1608698,1609047,1609065,1609076,1609087,1609167,1609184,1609389,1609394,1609406,1609418,1609885,1610355,1610385,1610425,1610685,1610918,1610925,1611321,1612190,1612205,1613121,1614019,1614025,1614355,1614366,16
 14556,1615296-1615297,1616684,1616940,1617229,1618354,1618411,1618570,1619098,1622050,1622672,1623370,1627230,1627776,1628096,1629391,1631203,1632733,1632745,1632764,1632797,1632801,1632803,1633100,1636493,1639835,1639840-1639841,1639846,1639863,1639867,1639873,1639884,1639887,1639892,1640288,1640515,1640717,1641066,1641131,1641165,1641548,1641804,1642409,1642423,1643341,1644904,1646204,1646977,1646984
+/ofbiz/trunk:1332097,1333439,1333885,1334201,1334336,1334483,1335047,1335343,1335347,1335351,1335946,1336921,1337046,1337057-1337059,1337202,1337502,1337524,1337644,1337789,1337800,1338065,1338101,1338224,1338570,1338591,1338700,1338831,1338845,1338974,1339081,1339122,1340273,1340352,1340357,1340400,1340405,1340415,1340657,1340661,1340774,1340821,1340826,1340943,1341314,1341399,1342852,1342875,1342893,1342980,1343088,1345473,1345484,1345532,1345547,1345553,1347559,1347762,1351778,1351999,1353135,1353681,1355660,1355801,1355859,1355975,1358735,1359500,1359599-1359600,1360689,1361056,1361073,1361476,1361662,1361931,1361944,1361958,1364046,1364052,1364216,1364218,1366660,1366960,1369555,1369561,1377253,1377382,1377386,1377388,1379334,1379340,1379345,1381146,1384251,1384894,1387878,1387884,1388832,1389802,1392773,1393948,1394995,1395104,1395460,1395953,1396105,1399539,1399761,1400388,1400393,1400421,1402766,1403370,1406727,1407634,1408408,1413307,1421662,1422207,1423117,1425155,1425662,
 1426231,1426734,1426787,1430332,1430336,1431191,1432392,1432833,1435528,1435701,1438498,1444356,1446575,1446876,1447107,1451183,1451879,1452382,1458429,1459220,1459222,1460116,1460276,1461551,1462948,1463989,1465351,1470151,1470483,1471283-1471284,1471687,1471739,1476296,1480407,1481287,1484279,1485432,1487130,1487854,1488000,1488127,1488188,1489461,1492112,1492673,1493352,1493393,1493658,1493683,1494202,1494682,1497376,1497822,1497839,1499732,1500760,1500772,1502121,1502944,1502946,1504864,1506269,1506499,1506504,1506828,1509164,1510042,1512376,1512573,1517629,1517702,1517780,1517947,1518336,1518950,1519245,1524361,1524676,1524704,1524769,1524950,1525523,1526387,1526463,1527254,1528144,1528146,1528149,1528298,1529412,1529418,1531848,1532342,1532366,1535961,1536656,1537023,1537179,1537996,1538096,1539147,1539156,1543744,1543766,1543781,1544444,1547548,1548143,1550255,1550515,1551744,1552290,1552500,1552901,1552908,1554290,1554536,1554681,1554685,1554706,1554764,1554787,1555142,15574
 09-1557410,1557440,1557447,1557457,1557462,1557593,1558373,1559814,1560048,1560056,1560176,1560203,1560205,1560699,1561286,1561290,1561305,1561311,1561327,1561467,1562767,1563238,1563683,1563958,1564111,1564113,1564463,1564473,1564493,1566096,1566273,1569078,1569743,1571219,1573161,1573498,1573639,1574019,1575508,1576259,1576331,1576378,1576506,1576511,1576757,1576839,1577268,1579155,1579161,1579309,1580455,1581386,1581997,1582762,1583040,1583427-1583428,1583551,1583674,1583681,1583689,1583696,1584873,1585033,1585574,1585958-1585959,1586987,1587841,1587843,1588733,1589602,1589606,1589612,1589625,1589669,1592530,1592588,1592745,1592977,1593902,1593908,1593952,1597464,1598544,1598913,1603732,1603739,1604357,1604363,1604522,1604554,1605348,1605354,1605707,1607457,1608355,1608491,1608495,1608698,1609047,1609065,1609076,1609087,1609167,1609184,1609389,1609394,1609406,1609418,1609885,1610355,1610385,1610425,1610685,1610918,1610925,1611321,1612190,1612205,1613121,1614019,1614025,1614355,16
 14366,1614556,1615296-1615297,1616684,1616940,1617229,1618354,1618411,1618570,1619098,1622050,1622672,1623370,1627230,1627776,1628096,1629391,1631203,1632733,1632745,1632764,1632797,1632801,1632803,1633100,1636493,1639835,1639840-1639841,1639846,1639863,1639867,1639873,1639884,1639887,1639892,1640288,1640515,1640717,1641066,1641131,1641165,1641548,1641804,1642409,1642423,1643341,1644904,1646204,1646977,1646984

Modified: ofbiz/branches/release12.04/framework/entity/src/org/ofbiz/entity/Delegator.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/entity/src/org/ofbiz/entity/Delegator.java?rev=1647121&r1=1647120&r2=1647121&view=diff
==============================================================================
--- ofbiz/branches/release12.04/framework/entity/src/org/ofbiz/entity/Delegator.java (original)
+++ ofbiz/branches/release12.04/framework/entity/src/org/ofbiz/entity/Delegator.java Sun Dec 21 11:10:25 2014
@@ -161,8 +161,9 @@ public interface Delegator {
      *            cache entries related to this operation. This should always be
      *            <code>true</code> - otherwise you will lose data integrity.
      * @return GenericValue instance containing the new instance
-     * @deprecated
+     * @deprecated use {@link #create(GenericPK primaryKey)}
      */
+    @Deprecated
     public GenericValue create(GenericPK primaryKey, boolean doCacheClear) throws GenericEntityException;
 
     /**
@@ -186,8 +187,9 @@ public interface Delegator {
      *            cache entries related to this operation. This should always be
      *            <code>true</code> - otherwise you will lose data integrity.
      * @return GenericValue instance containing the new instance
-     * @deprecated
+     * @deprecated use {@link #create(GenericValue value)}
      */
+    @Deprecated
     public GenericValue create(GenericValue value, boolean doCacheClear) throws GenericEntityException;
 
     /**
@@ -227,8 +229,9 @@ public interface Delegator {
      *            cache entries related to this operation. This should always be
      *            <code>true</code> - otherwise you will lose data integrity.
      * @return GenericValue instance containing the new or updated instance
-     * @deprecated
+     * @deprecated use {@link #createOrStore(GenericValue value)}
      */
+    @Deprecated
     public GenericValue createOrStore(GenericValue value, boolean doCacheClear) throws GenericEntityException;
 
     /**
@@ -872,8 +875,9 @@ public interface Delegator {
      *            boolean that specifies whether or not to automatically clear
      *            cache entries related to this operation. This should always be
      *            <code>true</code> - otherwise you will lose data integrity.
-     * @deprecated
+     * @deprecated use {@link #refresh(GenericValue value)}
      */
+    @Deprecated
     public void refresh(GenericValue value, boolean doCacheClear) throws GenericEntityException;
 
     /**
@@ -924,8 +928,9 @@ public interface Delegator {
      *            cache entries related to this operation. This should always be
      *            <code>true</code> - otherwise you will lose data integrity.
      * @return int representing number of rows effected by this operation
-     * @deprecated
+     * @deprecated use {@link #removeAll(List<? extends GenericEntity> dummyPKs)}
      */
+    @Deprecated
     public int removeAll(List<? extends GenericEntity> dummyPKs, boolean doCacheClear) throws GenericEntityException;
 
     public int removeAll(String entityName) throws GenericEntityException;
@@ -975,8 +980,9 @@ public interface Delegator {
      *            cache entries related to this operation. This should always be
      *            <code>true</code> - otherwise you will lose data integrity.
      * @return int representing number of rows effected by this operation
-     * @deprecated
+     * @deprecated use {@link #removeByAnd(String entityName, Map<String, ? extends Object> fields)}
      */
+    @Deprecated
     public int removeByAnd(String entityName, Map<String, ? extends Object> fields, boolean doCacheClear) throws GenericEntityException;
 
     /**
@@ -1015,8 +1021,9 @@ public interface Delegator {
      *            cache entries related to this operation. This should always be
      *            <code>true</code> - otherwise you will lose data integrity.
      * @return int representing number of rows effected by this operation
-     * @deprecated
+     * @deprecated use {@link #removeByCondition(String entityName, EntityCondition condition)}
      */
+    @Deprecated
     public int removeByCondition(String entityName, EntityCondition condition, boolean doCacheClear) throws GenericEntityException;
 
     /**
@@ -1038,8 +1045,9 @@ public interface Delegator {
      *            cache entries related to this operation. This should always be
      *            <code>true</code> - otherwise you will lose data integrity.
      * @return int representing number of rows effected by this operation
-     * @deprecated
+     * @deprecated use {@link #removeByPrimaryKey(GenericPK primaryKey)}
      */
+    @Deprecated
     public int removeByPrimaryKey(GenericPK primaryKey, boolean doCacheClear) throws GenericEntityException;
 
     /**
@@ -1071,8 +1079,9 @@ public interface Delegator {
      *            cache entries related to this operation. This should always be
      *            <code>true</code> - otherwise you will lose data integrity.
      * @return int representing number of rows effected by this operation
-     * @deprecated
+     * @deprecated use {@link #removeRelated(String relationName, GenericValue value)}
      */
+    @Deprecated
     public int removeRelated(String relationName, GenericValue value, boolean doCacheClear) throws GenericEntityException;
 
     /**
@@ -1094,8 +1103,9 @@ public interface Delegator {
      *            cache entries related to this operation. This should always be
      *            <code>true</code> - otherwise you will lose data integrity.
      * @return int representing number of rows effected by this operation
-     * @deprecated
+     * @deprecated use {@link #removeValue(GenericValue value)}
      */
+    @Deprecated
     public int removeValue(GenericValue value, boolean doCacheClear) throws GenericEntityException;
 
     public void rollback();
@@ -1138,8 +1148,9 @@ public interface Delegator {
      *            cache entries related to this operation. This should always be
      *            <code>true</code> - otherwise you will lose data integrity.
      * @return int representing number of rows effected by this operation
-     * @deprecated
+     * @deprecated use {@link #store(GenericValue value)}
      */
+    @Deprecated
     public int store(GenericValue value, boolean doCacheClear) throws GenericEntityException;
 
     /**
@@ -1177,8 +1188,9 @@ public interface Delegator {
      *            cache entries related to this operation. This should always be
      *            <code>true</code> - otherwise you will lose data integrity.
      * @return int representing number of rows effected by this operation
-     * @deprecated
+     * @deprecated use {@link #storeAll(List<GenericValue> values)}
      */
+    @Deprecated
     public int storeAll(List<GenericValue> values, boolean doCacheClear) throws GenericEntityException;
 
     /**
@@ -1202,7 +1214,7 @@ public interface Delegator {
      *            boolean that specifies whether or not to automatically create
      *            "dummy" place holder FKs
      * @return int representing number of rows effected by this operation
-     * @deprecated
+     * @deprecated use {@link #storeAll(GenericValue value, boolean createDummyFks)}
      */
     public int storeAll(List<GenericValue> values, boolean doCacheClear, boolean createDummyFks) throws GenericEntityException;
 
@@ -1235,8 +1247,9 @@ public interface Delegator {
      *            <code>true</code> - otherwise you will lose data integrity.
      * @return int representing number of rows effected by this operation
      * @throws GenericEntityException
-     * @deprecated
+     * @deprecated use {@link #storeByCondition(String entityName, Map<String, ? extends Object> fieldsToSet, EntityCondition condition)}
      */
+    @Deprecated
     public int storeByCondition(String entityName, Map<String, ? extends Object> fieldsToSet, EntityCondition condition, boolean doCacheClear) throws GenericEntityException;
   
     /**

Modified: ofbiz/branches/release12.04/framework/entity/src/org/ofbiz/entity/GenericDelegator.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/entity/src/org/ofbiz/entity/GenericDelegator.java?rev=1647121&r1=1647120&r2=1647121&view=diff
==============================================================================
--- ofbiz/branches/release12.04/framework/entity/src/org/ofbiz/entity/GenericDelegator.java (original)
+++ ofbiz/branches/release12.04/framework/entity/src/org/ofbiz/entity/GenericDelegator.java Sun Dec 21 11:10:25 2014
@@ -682,7 +682,9 @@ public class GenericDelegator implements
 
     /* (non-Javadoc)
      * @see org.ofbiz.entity.Delegator#create(org.ofbiz.entity.GenericPK, boolean)
+     * @deprecated use {@link #create(GenericPK primaryKey)}
      */
+    @Deprecated
     public GenericValue create(GenericPK primaryKey, boolean doCacheClear) throws GenericEntityException {
         if (primaryKey == null) {
             throw new GenericEntityException("Cannot create from a null primaryKey");
@@ -735,6 +737,7 @@ public class GenericDelegator implements
      * @see org.ofbiz.entity.Delegator#createSetNextSeqId(org.ofbiz.entity.GenericValue)
      */
     public GenericValue createSetNextSeqId(GenericValue value) throws GenericEntityException {
+        @Deprecated
         boolean doCacheClear = true;
 
         if (value == null) {
@@ -835,7 +838,9 @@ public class GenericDelegator implements
 
     /* (non-Javadoc)
      * @see org.ofbiz.entity.Delegator#create(org.ofbiz.entity.GenericValue, boolean)
+     * @deprecated use {@link #create(GenericValue value)}
      */
+    @Deprecated
     public GenericValue create(GenericValue value, boolean doCacheClear) throws GenericEntityException {
         boolean beganTransaction = false;
         try {
@@ -901,7 +906,9 @@ public class GenericDelegator implements
 
     /* (non-Javadoc)
      * @see org.ofbiz.entity.Delegator#createOrStore(org.ofbiz.entity.GenericValue, boolean)
+     * @deprecated use {@link #createOrStore(GenericValue value)}
      */
+    @Deprecated
     public GenericValue createOrStore(GenericValue value, boolean doCacheClear) throws GenericEntityException {
         boolean beganTransaction = false;
         try {
@@ -942,7 +949,7 @@ public class GenericDelegator implements
      */
     public GenericValue createOrStore(GenericValue value) throws GenericEntityException {
         return createOrStore(value, true);
-    }
+            }
 
     protected void saveEntitySyncRemoveInfo(GenericEntity dummyPK) throws GenericEntityException {
         // don't store remove info on entities where it is disabled
@@ -983,7 +990,9 @@ public class GenericDelegator implements
 
     /* (non-Javadoc)
      * @see org.ofbiz.entity.Delegator#removeByPrimaryKey(org.ofbiz.entity.GenericPK, boolean)
+     * @deprecated use {@link #removeByPrimaryKey(GenericPK primaryKey)}
      */
+    @Deprecated
     public int removeByPrimaryKey(GenericPK primaryKey, boolean doCacheClear) throws GenericEntityException {
         boolean beganTransaction = false;
         try {
@@ -1050,7 +1059,9 @@ public class GenericDelegator implements
 
     /* (non-Javadoc)
      * @see org.ofbiz.entity.Delegator#removeValue(org.ofbiz.entity.GenericValue, boolean)
+     * @deprecated use {@link #removeValue(GenericValue value)}
      */
+    @Deprecated
     public int removeValue(GenericValue value, boolean doCacheClear) throws GenericEntityException {
         // NOTE: this does not call the GenericDelegator.removeByPrimaryKey method because it has more information to pass to the ECA rule hander
         boolean beganTransaction = false;
@@ -1129,14 +1140,18 @@ public class GenericDelegator implements
 
     /* (non-Javadoc)
      * @see org.ofbiz.entity.Delegator#removeByAnd(java.lang.String, boolean, java.lang.Object)
+     * @deprecated use {@link #removeByAnd(String entityName, Object... fields)}
      */
+    @Deprecated
     public int removeByAnd(String entityName, boolean doCacheClear, Object... fields) throws GenericEntityException {
         return removeByAnd(entityName, UtilMisc.<String, Object>toMap(fields), doCacheClear);
     }
 
     /* (non-Javadoc)
      * @see org.ofbiz.entity.Delegator#removeByAnd(java.lang.String, java.util.Map, boolean)
+     * @deprecated use {@link #removeByAnd(String entityName, Map<String, ? extends Object> fields)}}
      */
+    @Deprecated
     public int removeByAnd(String entityName, Map<String, ? extends Object> fields, boolean doCacheClear) throws GenericEntityException {
         EntityCondition ecl = EntityCondition.makeCondition(fields);
         return removeByCondition(entityName, ecl, doCacheClear);
@@ -1151,7 +1166,9 @@ public class GenericDelegator implements
 
     /* (non-Javadoc)
      * @see org.ofbiz.entity.Delegator#removeByCondition(java.lang.String, org.ofbiz.entity.condition.EntityCondition, boolean)
+     * @deprecated use {@link #removeByCondition(String entityName, EntityCondition condition)}
      */
+    @Deprecated
     public int removeByCondition(String entityName, EntityCondition condition, boolean doCacheClear) throws GenericEntityException {
         boolean beganTransaction = false;
         try {
@@ -1206,7 +1223,9 @@ public class GenericDelegator implements
 
     /* (non-Javadoc)
      * @see org.ofbiz.entity.Delegator#removeRelated(java.lang.String, org.ofbiz.entity.GenericValue, boolean)
+     * @deprecated use {@link #removeRelated(String relationName, GenericValue value)}
      */
+    @Deprecated
     public int removeRelated(String relationName, GenericValue value, boolean doCacheClear) throws GenericEntityException {
         ModelEntity modelEntity = value.getModelEntity();
         ModelRelation relation = modelEntity.getRelation(relationName);
@@ -1233,7 +1252,9 @@ public class GenericDelegator implements
 
     /* (non-Javadoc)
      * @see org.ofbiz.entity.Delegator#refresh(org.ofbiz.entity.GenericValue, boolean)
+     * @deprecated use {@link #refresh(GenericValue value)}
      */
+    @Deprecated
     public void refresh(GenericValue value, boolean doCacheClear) throws GenericEntityException {
         if (doCacheClear) {
             // always clear cache before the operation
@@ -1262,7 +1283,9 @@ public class GenericDelegator implements
 
     /* (non-Javadoc)
      * @see org.ofbiz.entity.Delegator#storeByCondition(java.lang.String, java.util.Map, org.ofbiz.entity.condition.EntityCondition, boolean)
+     * @deprecated use {@link #storeByCondition(String entityName, Map<String, ? extends Object> fieldsToSet, EntityCondition condition)}
      */
+    @Deprecated
     public int storeByCondition(String entityName, Map<String, ? extends Object> fieldsToSet, EntityCondition condition, boolean doCacheClear) throws GenericEntityException {
         boolean beganTransaction = false;
         try {
@@ -1317,7 +1340,9 @@ public class GenericDelegator implements
 
     /* (non-Javadoc)
      * @see org.ofbiz.entity.Delegator#store(org.ofbiz.entity.GenericValue, boolean)
+     * @deprecated use {@link #store(GenericValue value)}
      */
+    @Deprecated
     public int store(GenericValue value, boolean doCacheClear) throws GenericEntityException {
         boolean beganTransaction = false;
         try {
@@ -1386,13 +1411,17 @@ public class GenericDelegator implements
 
     /* (non-Javadoc)
      * @see org.ofbiz.entity.Delegator#storeAll(java.util.List, boolean)
+     * @deprecated use {@link #storeAll(List<GenericValue> values)}
+     * TODO: JLR 2013-09-19 - doCacheClear refactoring: to be removed and replaced by  storeAll(List<GenericValue> values, boolean createDummyFks)
      */
+    @Deprecated
     public int storeAll(List<GenericValue> values, boolean doCacheClear) throws GenericEntityException {
         return this.storeAll(values, doCacheClear, false);
     }
 
     /* (non-Javadoc)
      * @see org.ofbiz.entity.Delegator#storeAll(java.util.List, boolean, boolean)
+     * TODO: JLR 2013-09-19 - doCacheClear refactoring: to be changed to storeAll(List<GenericValue> values, boolean createDummyFks)
      */
     public int storeAll(List<GenericValue> values, boolean doCacheClear, boolean createDummyFks) throws GenericEntityException {
         if (values == null) {
@@ -1491,7 +1520,9 @@ public class GenericDelegator implements
 
     /* (non-Javadoc)
      * @see org.ofbiz.entity.Delegator#removeAll(java.util.List, boolean)
+     * @deprecated use {@link #removeAll(List<? extends GenericEntity> dummyPKs)}
      */
+    @Deprecated
     public int removeAll(List<? extends GenericEntity> dummyPKs, boolean doCacheClear) throws GenericEntityException {
         if (dummyPKs == null) {
             return 0;
@@ -1913,6 +1944,7 @@ public class GenericDelegator implements
 
     /* (non-Javadoc)
      * @see org.ofbiz.entity.Delegator#getRelated(java.lang.String, java.util.Map, java.util.List, org.ofbiz.entity.GenericValue)
+     * @deprecated use {@link #getRelated(String, Map, List, GenericValue, boolean)}
      */
     public List<GenericValue> getRelated(String relationName, Map<String, ? extends Object> byAndFields, List<String> orderBy, GenericValue value) throws GenericEntityException {
         ModelEntity modelEntity = value.getModelEntity();
@@ -1964,6 +1996,7 @@ public class GenericDelegator implements
 
     /* (non-Javadoc)
      * @see org.ofbiz.entity.Delegator#getRelatedCache(java.lang.String, org.ofbiz.entity.GenericValue)
+     * @deprecated use {@link #getRelated(String, Map, List, GenericValue, boolean)}
      */
     public List<GenericValue> getRelatedCache(String relationName, GenericValue value) throws GenericEntityException {
         ModelEntity modelEntity = value.getModelEntity();
@@ -1983,7 +2016,8 @@ public class GenericDelegator implements
     }
 
     /* (non-Javadoc)
-     * @see org.ofbiz.entity.Delegator#getRelatedOne(java.lang.String, org.ofbiz.entity.GenericValue)
+     * @see org.ofbiz.entity.Delegator#getRelatedOne(java.lang.String, org.ofbiz.entity.GenericValue, boolean)
+     * @deprecated use {@link #getRelatedOne(String, GenericValue, boolean)}
      */
     public GenericValue getRelatedOne(String relationName, GenericValue value) throws GenericEntityException {
         ModelRelation relation = value.getModelEntity().getRelation(relationName);
@@ -2005,7 +2039,8 @@ public class GenericDelegator implements
     }
 
     /* (non-Javadoc)
-     * @see org.ofbiz.entity.Delegator#getRelatedOneCache(java.lang.String, org.ofbiz.entity.GenericValue)
+     * @see org.ofbiz.entity.Delegator#getRelatedOneCache(java.lang.String, org.ofbiz.entity.GenericValue, boolean)
+     * @deprecated use {@link #getRelatedOne(String, GenericValue, boolean)}
      */
     public GenericValue getRelatedOneCache(String relationName, GenericValue value) throws GenericEntityException {
         ModelEntity modelEntity = value.getModelEntity();

Modified: ofbiz/branches/release12.04/framework/entity/src/org/ofbiz/entity/util/EntitySaxReader.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/entity/src/org/ofbiz/entity/util/EntitySaxReader.java?rev=1647121&r1=1647120&r2=1647121&view=diff
==============================================================================
--- ofbiz/branches/release12.04/framework/entity/src/org/ofbiz/entity/util/EntitySaxReader.java (original)
+++ ofbiz/branches/release12.04/framework/entity/src/org/ofbiz/entity/util/EntitySaxReader.java Sun Dec 21 11:10:25 2014
@@ -86,6 +86,7 @@ public class EntitySaxReader implements
     protected boolean maintainTxStamps = false;
     protected boolean createDummyFks = false;
     protected boolean checkDataOnly = false;
+    @Deprecated
     protected boolean doCacheClear = true;
     protected boolean disableEeca = false;
     protected List<Object> messageList = null;
@@ -165,10 +166,12 @@ public class EntitySaxReader implements
         this.checkDataOnly = checkDataOnly;
     }
 
+    @Deprecated
     public boolean getDoCacheClear() {
         return this.doCacheClear;
     }
 
+    @Deprecated
     public void setDoCacheClear(boolean doCacheClear) {
         this.doCacheClear = doCacheClear;
     }
@@ -477,6 +480,7 @@ public class EntitySaxReader implements
             }
 
             // check the do-cache-clear flag
+            @Deprecated
             CharSequence doCacheClear = attributes.getValue("do-cache-clear");
             if (doCacheClear != null) {
                 this.setDoCacheClear("true".equalsIgnoreCase(doCacheClear.toString()));

Modified: ofbiz/branches/release12.04/framework/minilang/dtd/simple-methods-v2.xsd
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/minilang/dtd/simple-methods-v2.xsd?rev=1647121&r1=1647120&r2=1647121&view=diff
==============================================================================
--- ofbiz/branches/release12.04/framework/minilang/dtd/simple-methods-v2.xsd (original)
+++ ofbiz/branches/release12.04/framework/minilang/dtd/simple-methods-v2.xsd Sun Dec 21 11:10:25 2014
@@ -3234,7 +3234,7 @@ under the License.
                 <xs:annotation>
                     <xs:documentation>
                         Clear the cache. Defaults to "true".
-                        
+                        Deprecated - should always be true
                         Optional. Attribute type: constant.
                     </xs:documentation>
                 </xs:annotation>
@@ -4082,7 +4082,7 @@ under the License.
                 <xs:annotation>
                     <xs:documentation>
                         Clear the cache. Defaults to "true".
-                        
+                        Deprecated - should always be true
                         Optional. Attribute type: constant, ${expression}.
                     </xs:documentation>
                 </xs:annotation>
@@ -4122,7 +4122,7 @@ under the License.
                 <xs:annotation>
                     <xs:documentation>
                         Clear the cache. Defaults to "true".
-                        
+                        Deprecated - should always be true
                         Optional. Attribute type: constant, ${expression}.
                     </xs:documentation>
                 </xs:annotation>
@@ -4153,7 +4153,7 @@ under the License.
                 <xs:annotation>
                     <xs:documentation>
                         Clear the cache. Defaults to "true".
-                        
+                        Deprecated - should always be true
                         Optional. Attribute type: constant, ${expression}.
                     </xs:documentation>
                 </xs:annotation>
@@ -4193,7 +4193,7 @@ under the License.
                 <xs:annotation>
                     <xs:documentation>
                         Clear the cache. Defaults to "true".
-                        
+                        Deprecated - should always be true
                         Optional. Attribute type: constant, ${expression}.
                     </xs:documentation>
                 </xs:annotation>
@@ -4221,7 +4221,7 @@ under the License.
                 <xs:annotation>
                     <xs:documentation>
                         Clear the cache. Defaults to "true".
-                        
+                        Deprecated - should always be true
                         Optional. Attribute type: constant, ${expression}.
                     </xs:documentation>
                 </xs:annotation>
@@ -4390,7 +4390,7 @@ under the License.
                 <xs:annotation>
                     <xs:documentation>
                         Clear the cache. Defaults to "true".
-                        
+                        Deprecated - should always be true
                         Optional. Attribute type: constant, ${expression}.
                     </xs:documentation>
                 </xs:annotation>
@@ -4420,7 +4420,7 @@ under the License.
                 <xs:annotation>
                     <xs:documentation>
                         Clear the cache. Defaults to "true".
-                        
+                        Deprecated - should always be true
                         Optional. Attribute type: constant, ${expression}.
                     </xs:documentation>
                 </xs:annotation>

Modified: ofbiz/branches/release12.04/framework/minilang/dtd/simple-methods.xsd
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/minilang/dtd/simple-methods.xsd?rev=1647121&r1=1647120&r2=1647121&view=diff
==============================================================================
--- ofbiz/branches/release12.04/framework/minilang/dtd/simple-methods.xsd (original)
+++ ofbiz/branches/release12.04/framework/minilang/dtd/simple-methods.xsd Sun Dec 21 11:10:25 2014
@@ -2990,7 +2990,8 @@ under the License.
         <xs:attribute name="do-cache-clear" default="true">
             <xs:annotation>
                 <xs:documentation>
-                    Clear the cache, defaults to true
+                    Clear the cache. Defaults to "true".
+                    Deprecated - should always be true
                 </xs:documentation>
             </xs:annotation>
             <xs:simpleType>
@@ -3036,7 +3037,8 @@ under the License.
         <xs:attribute name="do-cache-clear" default="true">
             <xs:annotation>
                 <xs:documentation>
-                    Clear the cache, defaults to true
+                    Clear the cache. Defaults to "true".
+                    Deprecated - should always be true
                 </xs:documentation>
             </xs:annotation>
             <xs:simpleType>
@@ -3101,7 +3103,8 @@ under the License.
         <xs:attribute name="do-cache-clear" default="true">
             <xs:annotation>
                 <xs:documentation>
-                    Clear the cache, defaults to true
+                    Clear the cache. Defaults to "true".
+                    Deprecated - should always be true
                 </xs:documentation>
             </xs:annotation>
             <xs:simpleType>
@@ -3165,7 +3168,8 @@ under the License.
         <xs:attribute name="do-cache-clear" default="true">
             <xs:annotation>
                 <xs:documentation>
-                    Clear the cache, defaults to true
+                    Clear the cache. Defaults to "true".
+                    Deprecated - should always be true
                 </xs:documentation>
             </xs:annotation>
             <xs:simpleType>
@@ -3205,7 +3209,8 @@ under the License.
         <xs:attribute name="do-cache-clear" default="true">
             <xs:annotation>
                 <xs:documentation>
-                    Clear the cache, defaults to true
+                    Clear the cache. Defaults to "true".
+                    Deprecated - should always be true
                 </xs:documentation>
             </xs:annotation>
             <xs:simpleType>
@@ -3358,7 +3363,8 @@ under the License.
         <xs:attribute name="do-cache-clear" default="true">
             <xs:annotation>
                 <xs:documentation>
-                    Clear the cache, defaults to true
+                    Clear the cache. Defaults to "true".
+                    Deprecated - should always be true
                 </xs:documentation>
             </xs:annotation>
             <xs:simpleType>
@@ -3391,7 +3397,8 @@ under the License.
         <xs:attribute name="do-cache-clear" default="true">
             <xs:annotation>
                 <xs:documentation>
-                    Clear the cache, defaults to true
+                    Clear the cache. Defaults to "true".
+                    Deprecated - should always be true
                 </xs:documentation>
             </xs:annotation>
             <xs:simpleType>

Modified: ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/CreateValue.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/CreateValue.java?rev=1647121&r1=1647120&r2=1647121&view=diff
==============================================================================
--- ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/CreateValue.java (original)
+++ ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/CreateValue.java Sun Dec 21 11:10:25 2014
@@ -39,6 +39,7 @@ public final class CreateValue extends M
     public static final String module = CreateValue.class.getName();
 
     private final boolean createOrStore;
+    @Deprecated
     private final boolean doCacheClear;
     private final FlexibleMapAccessor<GenericValue> valueFma;
 

Modified: ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/RefreshValue.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/RefreshValue.java?rev=1647121&r1=1647120&r2=1647121&view=diff
==============================================================================
--- ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/RefreshValue.java (original)
+++ ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/RefreshValue.java Sun Dec 21 11:10:25 2014
@@ -40,6 +40,7 @@ public final class RefreshValue extends
 
     public static final String module = RemoveValue.class.getName();
 
+    @Deprecated
     private final FlexibleStringExpander doCacheClearFse;
     private final FlexibleMapAccessor<GenericValue> valueFma;
 

Modified: ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveByAnd.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveByAnd.java?rev=1647121&r1=1647120&r2=1647121&view=diff
==============================================================================
--- ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveByAnd.java (original)
+++ ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveByAnd.java Sun Dec 21 11:10:25 2014
@@ -41,7 +41,7 @@ import org.w3c.dom.Element;
 public final class RemoveByAnd extends EntityOperation {
 
     public static final String module = RemoveByAnd.class.getName();
-
+    @Deprecated
     private final FlexibleStringExpander doCacheClearFse;
     private final FlexibleStringExpander entityNameFse;
     private final FlexibleMapAccessor<Map<String, ? extends Object>> mapFma;
@@ -61,6 +61,7 @@ public final class RemoveByAnd extends E
 
     @Override
     public boolean exec(MethodContext methodContext) throws MiniLangException {
+        @Deprecated
         boolean doCacheClear = !"false".equals(doCacheClearFse.expandString(methodContext.getEnvMap()));
         String entityName = entityNameFse.expandString(methodContext.getEnvMap());
         if (entityName.isEmpty()) {

Modified: ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveList.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveList.java?rev=1647121&r1=1647120&r2=1647121&view=diff
==============================================================================
--- ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveList.java (original)
+++ ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveList.java Sun Dec 21 11:10:25 2014
@@ -41,7 +41,7 @@ import org.w3c.dom.Element;
 public final class RemoveList extends EntityOperation {
 
     public static final String module = RemoveList.class.getName();
-
+    @Deprecated
     private final FlexibleStringExpander doCacheClearFse;
     private final FlexibleMapAccessor<List<GenericValue>> listFma;
 
@@ -63,6 +63,7 @@ public final class RemoveList extends En
         if (values == null) {
             throw new MiniLangRuntimeException("Entity value list not found with name: " + listFma, this);
         }
+        @Deprecated
         boolean doCacheClear = !"false".equals(doCacheClearFse.expandString(methodContext.getEnvMap()));
         try {
             Delegator delegator = getDelegator(methodContext);

Modified: ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveRelated.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveRelated.java?rev=1647121&r1=1647120&r2=1647121&view=diff
==============================================================================
--- ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveRelated.java (original)
+++ ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveRelated.java Sun Dec 21 11:10:25 2014
@@ -40,7 +40,7 @@ import org.w3c.dom.Element;
 public final class RemoveRelated extends MethodOperation {
 
     public static final String module = RemoveRelated.class.getName();
-
+    @Deprecated
     private final FlexibleStringExpander doCacheClearFse;
     private final FlexibleStringExpander relationNameFse;
     private final FlexibleMapAccessor<GenericValue> valueFma;
@@ -65,6 +65,7 @@ public final class RemoveRelated extends
             throw new MiniLangRuntimeException("Entity value not found with name: " + valueFma, this);
         }
         String relationName = relationNameFse.expandString(methodContext.getEnvMap());
+        @Deprecated
         boolean doCacheClear = !"false".equals(doCacheClearFse.expandString(methodContext.getEnvMap()));
         try {
             value.getDelegator().removeRelated(relationName, value, doCacheClear);

Modified: ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveValue.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveValue.java?rev=1647121&r1=1647120&r2=1647121&view=diff
==============================================================================
--- ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveValue.java (original)
+++ ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveValue.java Sun Dec 21 11:10:25 2014
@@ -39,7 +39,7 @@ import org.w3c.dom.Element;
 public final class RemoveValue extends MethodOperation {
 
     public static final String module = RemoveValue.class.getName();
-
+    @Deprecated
     private final FlexibleStringExpander doCacheClearFse;
     private final FlexibleMapAccessor<GenericValue> valueFma;
 
@@ -61,6 +61,7 @@ public final class RemoveValue extends M
         if (value == null) {
             throw new MiniLangRuntimeException("Entity value not found with name: " + valueFma, this);
         }
+        @Deprecated
         boolean doCacheClear = !"false".equals(doCacheClearFse.expandString(methodContext.getEnvMap()));
         try {
             value.getDelegator().removeValue(value, doCacheClear);

Modified: ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreList.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreList.java?rev=1647121&r1=1647120&r2=1647121&view=diff
==============================================================================
--- ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreList.java (original)
+++ ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreList.java Sun Dec 21 11:10:25 2014
@@ -41,7 +41,7 @@ import org.w3c.dom.Element;
 public final class StoreList extends EntityOperation {
 
     public static final String module = StoreList.class.getName();
-
+    @Deprecated
     private final FlexibleStringExpander doCacheClearFse;
     private final FlexibleMapAccessor<List<GenericValue>> listFma;
 
@@ -63,6 +63,7 @@ public final class StoreList extends Ent
         if (values == null) {
             throw new MiniLangRuntimeException("Entity value list not found with name: " + listFma, this);
         }
+        @Deprecated
         boolean doCacheClear = !"false".equals(doCacheClearFse.expandString(methodContext.getEnvMap()));
         try {
             Delegator delegator = getDelegator(methodContext);

Modified: ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreValue.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreValue.java?rev=1647121&r1=1647120&r2=1647121&view=diff
==============================================================================
--- ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreValue.java (original)
+++ ofbiz/branches/release12.04/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreValue.java Sun Dec 21 11:10:25 2014
@@ -39,7 +39,7 @@ import org.w3c.dom.Element;
 public final class StoreValue extends MethodOperation {
 
     public static final String module = StoreValue.class.getName();
-
+    @Deprecated
     private final FlexibleStringExpander doCacheClearFse;
     private final FlexibleMapAccessor<GenericValue> valueFma;
 
@@ -61,6 +61,7 @@ public final class StoreValue extends Me
         if (value == null) {
             throw new MiniLangRuntimeException("Entity value not found with name: " + valueFma, this);
         }
+        @Deprecated
         boolean doCacheClear = !"false".equals(doCacheClearFse.expandString(methodContext.getEnvMap()));
         try {
             value.getDelegator().store(value, doCacheClear);