svn commit: r585803 [2/2] - in /ofbiz/trunk: applications/accounting/src/org/ofbiz/accounting/invoice/ applications/accounting/src/org/ofbiz/accounting/payment/ applications/accounting/src/org/ofbiz/accounting/tax/ applications/accounting/src/org/ofbiz...

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r585803 [2/2] - in /ofbiz/trunk: applications/accounting/src/org/ofbiz/accounting/invoice/ applications/accounting/src/org/ofbiz/accounting/payment/ applications/accounting/src/org/ofbiz/accounting/tax/ applications/accounting/src/org/ofbiz...

doogie-3
Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/EditFacility.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/EditFacility.bsh?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/EditFacility.bsh (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/EditFacility.bsh Wed Oct 17 19:46:57 2007
@@ -30,8 +30,8 @@
 GenericValue facility = delegator.findByPrimaryKey("Facility", UtilMisc.toMap("facilityId", facilityId));
 GenericValue facilityType = null;
 if(facility == null) {
-  facility = delegator.makeValue("Facility", null);
-  facilityType = delegator.makeValue("FacilityType", null);
+  facility = delegator.makeValue("Facility");
+  facilityType = delegator.makeValue("FacilityType");
 } else {
   facilityType = facility.getRelatedOne("FacilityType");
 }

Modified: ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/cert/CertificateServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/cert/CertificateServices.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/cert/CertificateServices.java (original)
+++ ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/cert/CertificateServices.java Wed Oct 17 19:46:57 2007
@@ -83,7 +83,7 @@
         // set the issuer provision
         Map x500Map = KeyStoreUtil.getCertX500Map(cert);      
         if (importIssuer != null && "Y".equalsIgnoreCase(importIssuer)) {
-            GenericValue provision = delegator.makeValue("X509IssuerProvision", null);
+            GenericValue provision = delegator.makeValue("X509IssuerProvision");
             provision.set("commonName", x500Map.get("CN"));
             provision.set("organizationalUnit", x500Map.get("OU"));
             provision.set("organizationName", x500Map.get("O"));

Modified: ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java (original)
+++ ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java Wed Oct 17 19:46:57 2007
@@ -464,7 +464,7 @@
 
                 try {
 
-                    GenericValue workEffortSearchResult = delegator.makeValue("WorkEffortSearchResult", null);
+                    GenericValue workEffortSearchResult = delegator.makeValue("WorkEffortSearchResult");
                     String workEffortSearchResultId = delegator.getNextSeqId("WorkEffortSearchResult");
 
                     workEffortSearchResult.set("workEffortSearchResultId", workEffortSearchResultId);

Modified: ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/OfbizStore.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/OfbizStore.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/OfbizStore.java (original)
+++ ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/OfbizStore.java Wed Oct 17 19:46:57 2007
@@ -67,7 +67,7 @@
     public int getSize() throws IOException {
         long count = 0;
         try {
-            count = delegator.findCountByAnd(entityName, null);
+            count = delegator.findCountByAnd(entityName);
         } catch (GenericEntityException e) {
             throw new IOException(e.getMessage());
         }
@@ -150,7 +150,7 @@
 
     public void clear() throws IOException {
         try {
-            delegator.removeByAnd(entityName, null);
+            delegator.removeAll(entityName);
         } catch (GenericEntityException e) {
             throw new IOException(e.getMessage());
         }
@@ -167,7 +167,7 @@
         byte[] obs = bos.toByteArray();
         int size = obs.length;
 
-        GenericValue sessionValue = delegator.makeValue(entityName, null);
+        GenericValue sessionValue = delegator.makeValue(entityName);
         sessionValue.setBytes("sessionInfo", obs);
         sessionValue.set("sessionId", session.getId());
         sessionValue.set("sessionSize", new Long(size));

Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java (original)
+++ ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java Wed Oct 17 19:46:57 2007
@@ -238,7 +238,7 @@
         GenericDelegator delegator = dctx.getDelegator();
 
         // attempt to create a DataSource entity w/ an invalid dataSourceTypeId
-        GenericValue newEntity = delegator.makeValue("DataSource", null);
+        GenericValue newEntity = delegator.makeValue("DataSource");
         newEntity.set("dataSourceId", "ENTITY_FAIL_TEST");
         newEntity.set("dataSourceTypeId", "ENTITY_FAIL_TEST");
         newEntity.set("description", "Entity Fail Test - Delete me if I am here");
@@ -289,7 +289,7 @@
         int count = ((Integer) context.get("count")).intValue();
 
         for (int i = 0; i < count; i++ ) {
-            GenericValue v = delegator.makeValue("Visit", null);
+            GenericValue v = delegator.makeValue("Visit");
             String seqId = delegator.getNextSeqId("Visit");
 
             v.set("visitId", seqId);
@@ -482,7 +482,7 @@
 
         long count = -1;
         try {
-            count = delegator.findCountByAnd("SequenceValueItem", null);
+            count = delegator.findCountByAnd("SequenceValueItem");
         } catch (GenericEntityException e) {
             Debug.logError(e.getMessage(), module);
             return ServiceUtil.returnError("Unable to connect to datasource!");

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java Wed Oct 17 19:46:57 2007
@@ -781,7 +781,7 @@
         }
 
         if (serializedPK != null) {
-            GenericValue entitySyncRemove = this.makeValue("EntitySyncRemove", null);
+            GenericValue entitySyncRemove = this.makeValue("EntitySyncRemove");
             entitySyncRemove.set("primaryKeyRemoved", serializedPK);
             this.createSetNextSeqId(entitySyncRemove);
         }
@@ -1662,7 +1662,7 @@
      *@return    List containing all Generic entities
      */
     public List findAllCache(String entityName, List orderBy) throws GenericEntityException {
-        GenericValue dummyValue = makeValue(entityName, null);
+        GenericValue dummyValue = makeValue(entityName);
         Map ecaEventMap = this.getEcaEntityEventMap(entityName);
         this.evalEcaRules(EntityEcaHandler.EV_CACHE_CHECK, EntityEcaHandler.OP_FIND, dummyValue, ecaEventMap, (ecaEventMap == null), false);
 
@@ -2520,7 +2520,7 @@
             entityName = entityName.substring(entityName.indexOf('-') + 1);
         if (entityName.indexOf(':') > 0)
             entityName = entityName.substring(entityName.indexOf(':') + 1);
-        GenericValue value = this.makeValue(entityName, null);
+        GenericValue value = this.makeValue(entityName);
 
         ModelEntity modelEntity = value.getModelEntity();
 
@@ -2677,7 +2677,7 @@
             String sequencedIdPrefix = this.getDelegatorInfo().sequencedIdPrefix;
 
             value.remove(seqFieldName);
-            GenericValue lookupValue = this.makeValue(value.getEntityName(), null);
+            GenericValue lookupValue = this.makeValue(value.getEntityName());
             lookupValue.setPKFields(value);
 
             boolean beganTransaction = false;

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericValue.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericValue.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericValue.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericValue.java Wed Oct 17 19:46:57 2007
@@ -448,7 +448,7 @@
                 if (count == 0) {
                     if (insertDummy) {
                         // create the new related value (dummy)
-                        GenericValue newValue = this.getDelegator().makeValue(relation.getRelEntityName(), null);
+                        GenericValue newValue = this.getDelegator().makeValue(relation.getRelEntityName());
                         Iterator keyMapIter = relation.getKeyMapsIterator();
                         boolean allFieldsSet = true;
                         while (keyMapIter.hasNext()) {

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/PrimaryKeyFinder.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/PrimaryKeyFinder.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/PrimaryKeyFinder.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/PrimaryKeyFinder.java Wed Oct 17 19:46:57 2007
@@ -79,7 +79,7 @@
         // assemble the field map
         Map entityContext = new HashMap();
         if (autoFieldMapBool) {
-            GenericValue tempVal = delegator.makeValue(entityName, null);
+            GenericValue tempVal = delegator.makeValue(entityName);
 
             // try a map called "parameters", try it first so values from here are overriden by values in the main context
             Object parametersObj = context.get("parameters");

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityCrypto.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityCrypto.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityCrypto.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityCrypto.java Wed Oct 17 19:46:57 2007
@@ -56,7 +56,7 @@
         // make sure there are some dummy keys
         synchronized(EntityCrypto.class) {
             try {
-                long size = delegator.findCountByAnd("EntityKeyStore", null);
+                long size = delegator.findCountByAnd("EntityKeyStore");
                 if (size == 0) {
                     for (int i = 0; i < 20; i++) {
                         String randomName = this.getRandomString();
@@ -113,7 +113,7 @@
             } catch (NoSuchAlgorithmException e) {
                 throw new EntityCryptoException(e);
             }
-            GenericValue newValue = delegator.makeValue("EntityKeyStore", null);
+            GenericValue newValue = delegator.makeValue("EntityKeyStore");
             newValue.set("keyText", StringUtil.toHexString(key.getEncoded()));
             newValue.set("keyName", keyName);
 

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntitySaxReader.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntitySaxReader.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntitySaxReader.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntitySaxReader.java Wed Oct 17 19:46:57 2007
@@ -522,7 +522,7 @@
             }
 
             try {
-                currentValue = delegator.makeValue(entityName, null);
+                currentValue = delegator.makeValue(entityName);
                 // TODO: do we really want this? it makes it so none of the values imported have create/update timestamps set
                 // DEJ 10/16/04 I think they should all be stamped, so commenting this out
                 // JAZ 12/10/04 I think it should be specified when creating the reader

Modified: ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataServices.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataServices.java (original)
+++ ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataServices.java Wed Oct 17 19:46:57 2007
@@ -268,7 +268,7 @@
     }
 
     private static GenericValue makeGenericValue(GenericDelegator delegator, String entityName, String[] header, String[] line) {
-        GenericValue newValue = delegator.makeValue(entityName, null);
+        GenericValue newValue = delegator.makeValue(entityName);
         for (int i = 0; i < header.length; i++) {
             String name = header[i].trim();
 

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/ClearCacheLine.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/ClearCacheLine.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/ClearCacheLine.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/ClearCacheLine.java Wed Oct 17 19:46:57 2007
@@ -46,7 +46,7 @@
         String entityName = methodContext.expandString(this.entityName);
         
         if (mapAcsr.isEmpty()) {
-            methodContext.getDelegator().clearCacheLine(entityName, null);
+            methodContext.getDelegator().clearCacheLine(entityName);
         } else {
             Map theMap = (Map) mapAcsr.get(methodContext);
             if (theMap == null) {

Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceInfo.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceInfo.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceInfo.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceInfo.java Wed Oct 17 19:46:57 2007
@@ -296,7 +296,7 @@
         try {
             RecurrenceRule r = RecurrenceRule.makeRule(delegator, frequency, interval, count, endTime);
             String ruleId = r.primaryKey();
-            GenericValue value = delegator.makeValue("RecurrenceInfo", null);
+            GenericValue value = delegator.makeValue("RecurrenceInfo");
 
             value.set("recurrenceRuleId", ruleId);
             value.set("startDateTime", new java.sql.Timestamp(startTime));

Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceRule.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceRule.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceRule.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceRule.java Wed Oct 17 19:46:57 2007
@@ -653,7 +653,7 @@
         String freqStr = freq[frequency];
 
         try {
-            GenericValue value = delegator.makeValue("RecurrenceRule", null);
+            GenericValue value = delegator.makeValue("RecurrenceRule");
 
             value.set("frequency", freqStr);
             value.set("intervalNumber", new Long(interval));

Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobManager.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobManager.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobManager.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobManager.java Wed Oct 17 19:46:57 2007
@@ -340,7 +340,7 @@
         // persist the context
         String dataId = null;
         try {
-            GenericValue runtimeData = delegator.makeValue("RuntimeData", null);
+            GenericValue runtimeData = delegator.makeValue("RuntimeData");
             runtimeData.set("runtimeInfo", XmlSerializer.serialize(context));
             runtimeData = delegator.createSetNextSeqId(runtimeData);
             dataId = runtimeData.getString("runtimeDataId");

Modified: ofbiz/trunk/framework/shark/src/org/ofbiz/shark/instance/Activity.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/shark/src/org/ofbiz/shark/instance/Activity.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/framework/shark/src/org/ofbiz/shark/instance/Activity.java (original)
+++ ofbiz/trunk/framework/shark/src/org/ofbiz/shark/instance/Activity.java Wed Oct 17 19:46:57 2007
@@ -60,7 +60,7 @@
     public Activity(EntityPersistentMgr mgr, GenericDelegator delegator) {
         super(mgr, delegator);
         this.newValue = true;
-        this.activity = delegator.makeValue(org.ofbiz.shark.SharkConstants.WfActivity, null);
+        this.activity = delegator.makeValue(org.ofbiz.shark.SharkConstants.WfActivity);
     }
 
     public static Activity getInstance(EntityPersistentMgr mgr, GenericValue activity) {

Modified: ofbiz/trunk/framework/shark/src/org/ofbiz/shark/instance/Assignment.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/shark/src/org/ofbiz/shark/instance/Assignment.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/framework/shark/src/org/ofbiz/shark/instance/Assignment.java (original)
+++ ofbiz/trunk/framework/shark/src/org/ofbiz/shark/instance/Assignment.java Wed Oct 17 19:46:57 2007
@@ -59,7 +59,7 @@
     public Assignment(EntityPersistentMgr mgr, GenericDelegator delegator) {
         super(mgr, delegator);
         this.newValue = true;
-        this.assignment = delegator.makeValue(org.ofbiz.shark.SharkConstants.WfAssignment, null);
+        this.assignment = delegator.makeValue(org.ofbiz.shark.SharkConstants.WfAssignment);
         Debug.log("******* New assignment created", module);
     }
 

Modified: ofbiz/trunk/framework/shark/src/org/ofbiz/shark/instance/Process.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/shark/src/org/ofbiz/shark/instance/Process.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/framework/shark/src/org/ofbiz/shark/instance/Process.java (original)
+++ ofbiz/trunk/framework/shark/src/org/ofbiz/shark/instance/Process.java Wed Oct 17 19:46:57 2007
@@ -66,7 +66,7 @@
     public Process(EntityPersistentMgr mgr, GenericDelegator delegator) {
         super(mgr, delegator);
         this.newValue = true;
-        this.process = delegator.makeValue(org.ofbiz.shark.SharkConstants.WfProcess, null);
+        this.process = delegator.makeValue(org.ofbiz.shark.SharkConstants.WfProcess);
     }
 
     public static Process getInstance(EntityPersistentMgr mgr, GenericValue process) {

Modified: ofbiz/trunk/framework/shark/src/org/ofbiz/shark/instance/Resource.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/shark/src/org/ofbiz/shark/instance/Resource.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/framework/shark/src/org/ofbiz/shark/instance/Resource.java (original)
+++ ofbiz/trunk/framework/shark/src/org/ofbiz/shark/instance/Resource.java Wed Oct 17 19:46:57 2007
@@ -59,7 +59,7 @@
     public Resource(EntityPersistentMgr mgr, GenericDelegator delegator) {
         super(mgr, delegator);
         this.newValue = true;
-        this.resource = delegator.makeValue(org.ofbiz.shark.SharkConstants.WfResource, null);
+        this.resource = delegator.makeValue(org.ofbiz.shark.SharkConstants.WfResource);
     }
 
     public static Resource getInstance(EntityPersistentMgr mgr, GenericValue resource) {

Modified: ofbiz/trunk/framework/shark/src/org/ofbiz/shark/mapping/EntityApplicationMap.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/shark/src/org/ofbiz/shark/mapping/EntityApplicationMap.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/framework/shark/src/org/ofbiz/shark/mapping/EntityApplicationMap.java (original)
+++ ofbiz/trunk/framework/shark/src/org/ofbiz/shark/mapping/EntityApplicationMap.java Wed Oct 17 19:46:57 2007
@@ -53,7 +53,7 @@
     public EntityApplicationMap(GenericDelegator delegator) {
         this.isNew = true;
         this.delegator = delegator;
-        this.application = delegator.makeValue("SharkApplicationMap", null);
+        this.application = delegator.makeValue("SharkApplicationMap");
     }
 
     public static EntityApplicationMap getInstance(GenericValue application) {

Modified: ofbiz/trunk/framework/shark/src/org/ofbiz/shark/repository/EntityRepositoryMgr.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/shark/src/org/ofbiz/shark/repository/EntityRepositoryMgr.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/framework/shark/src/org/ofbiz/shark/repository/EntityRepositoryMgr.java (original)
+++ ofbiz/trunk/framework/shark/src/org/ofbiz/shark/repository/EntityRepositoryMgr.java Wed Oct 17 19:46:57 2007
@@ -115,7 +115,7 @@
         Debug.log("XPDL Clear Repository", module);
         GenericDelegator delegator = SharkContainer.getDelegator();
         try {
-            delegator.removeByAnd(org.ofbiz.shark.SharkConstants.WfRepository, null);
+            delegator.removeAll(org.ofbiz.shark.SharkConstants.WfRepository);
         } catch (GenericEntityException e) {
             throw new RepositoryException(e);
         }
@@ -334,7 +334,7 @@
         }
         GenericDelegator delegator = SharkContainer.getDelegator();
         try {
-            GenericValue v = delegator.makeValue(org.ofbiz.shark.SharkConstants.WfRepository, null);
+            GenericValue v = delegator.makeValue(org.ofbiz.shark.SharkConstants.WfRepository);
             v.set(org.ofbiz.shark.SharkConstants.xpdlId, xpdlId);
             v.set(org.ofbiz.shark.SharkConstants.xpdlVersion, newVersion);
             v.set(org.ofbiz.shark.SharkConstants.isHistorical, "N");
@@ -380,7 +380,7 @@
     {
             Debug.log("Add XPDL Reference", module);
             GenericDelegator delegator = SharkContainer.getDelegator();
-            GenericValue ref = delegator.makeValue(org.ofbiz.shark.SharkConstants.WfRepositoryRef, null);
+            GenericValue ref = delegator.makeValue(org.ofbiz.shark.SharkConstants.WfRepositoryRef);
             ref.set(org.ofbiz.shark.SharkConstants.xpdlId, referringXPDLId);
             ref.set(org.ofbiz.shark.SharkConstants.xpdlVersion, referringXPDLVersion);
             ref.set(org.ofbiz.shark.SharkConstants.refXpdlId, referredXPDLId);

Modified: ofbiz/trunk/framework/shark/src/org/ofbiz/shark/user/GenericUserGroupMgr.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/shark/src/org/ofbiz/shark/user/GenericUserGroupMgr.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/framework/shark/src/org/ofbiz/shark/user/GenericUserGroupMgr.java (original)
+++ ofbiz/trunk/framework/shark/src/org/ofbiz/shark/user/GenericUserGroupMgr.java Wed Oct 17 19:46:57 2007
@@ -161,7 +161,7 @@
 
     public void createGroup(UserTransaction trans, String groupName, String description) throws RootException {
         GenericDelegator delegator = SharkContainer.getDelegator();
-        GenericValue group = delegator.makeValue(org.ofbiz.shark.SharkConstants.SharkGroup, null);
+        GenericValue group = delegator.makeValue(org.ofbiz.shark.SharkConstants.SharkGroup);
         group.set(org.ofbiz.shark.SharkConstants.groupName, groupName);
         group.set(org.ofbiz.shark.SharkConstants.description, description);
         try {
@@ -215,7 +215,7 @@
 
     public void addGroupToGroup(UserTransaction trans, String parentGroupName, String groupName) throws RootException {
         GenericDelegator delegator = SharkContainer.getDelegator();
-        GenericValue rollup = delegator.makeValue(org.ofbiz.shark.SharkConstants.SharkGroupRollup, null);
+        GenericValue rollup = delegator.makeValue(org.ofbiz.shark.SharkConstants.SharkGroupRollup);
         rollup.set(org.ofbiz.shark.SharkConstants.parentGroupName, parentGroupName);
         rollup.set(org.ofbiz.shark.SharkConstants.groupName, groupName);
         try {
@@ -261,7 +261,7 @@
 
     public void addUserToGroup(UserTransaction trans, String groupName, String username) throws RootException {
         GenericDelegator delegator = SharkContainer.getDelegator();
-        GenericValue member = delegator.makeValue(org.ofbiz.shark.SharkConstants.SharkGroupMember, null);
+        GenericValue member = delegator.makeValue(org.ofbiz.shark.SharkConstants.SharkGroupMember);
         member.set(org.ofbiz.shark.SharkConstants.groupName, groupName);
         member.set(org.ofbiz.shark.SharkConstants.userName, username);
         try {
@@ -299,7 +299,7 @@
 
     public void createUser(UserTransaction trans, String groupName, String username, String password, String firstName, String lastName, String email) throws RootException {
         GenericDelegator delegator = SharkContainer.getDelegator();
-        GenericValue user = delegator.makeValue(org.ofbiz.shark.SharkConstants.SharkUser, null);
+        GenericValue user = delegator.makeValue(org.ofbiz.shark.SharkConstants.SharkUser);
         user.set(org.ofbiz.shark.SharkConstants.userName, username);
         user.set(org.ofbiz.shark.SharkConstants.firstName, firstName);
         user.set(org.ofbiz.shark.SharkConstants.lastName, lastName);

Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/stats/ServerHitBin.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/stats/ServerHitBin.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/stats/ServerHitBin.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/stats/ServerHitBin.java Wed Oct 17 19:46:57 2007
@@ -548,7 +548,7 @@
 
                 // persist each bin when time ends if option turned on
                 if (UtilProperties.propertyValueEqualsIgnoreCase("serverstats", "stats.persist." + ServerHitBin.typeIds[type] + ".bin", "true")) {
-                    GenericValue serverHitBin = delegator.makeValue("ServerHitBin", null);
+                    GenericValue serverHitBin = delegator.makeValue("ServerHitBin");
                     serverHitBin.set("contentId", this.id);
                     serverHitBin.set("hitTypeId", ServerHitBin.typeIds[this.type]);
                     serverHitBin.set("binStartDateTime", new java.sql.Timestamp(this.startTime));
@@ -613,7 +613,7 @@
                 return;
             }
 
-            GenericValue serverHit = delegator.makeValue("ServerHit", null);
+            GenericValue serverHit = delegator.makeValue("ServerHit");
 
             serverHit.set("visitId", visitId);
             serverHit.set("hitStartDateTime", new java.sql.Timestamp(startTime));

Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/stats/VisitHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/stats/VisitHandler.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/stats/VisitHandler.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/stats/VisitHandler.java Wed Oct 17 19:46:57 2007
@@ -130,7 +130,7 @@
                                 Debug.logInfo(new Exception(), "The webappName was empty, somehow the initial request settings were missing.", module);
                             }
                             
-                            visit = delegator.makeValue("Visit", null);
+                            visit = delegator.makeValue("Visit");
                             visit.set("sessionId", session.getId());
                             visit.set("fromDate", new Timestamp(session.getCreationTime()));
 
@@ -222,7 +222,7 @@
                             
                             if (UtilValidate.isEmpty(cookieVisitorId)) {
                                 // no visitor cookie? create visitor and send back cookie too
-                                visitor = delegator.makeValue("Visitor", null);
+                                visitor = delegator.makeValue("Visitor");
                                 try {
                                     delegator.createSetNextSeqId(visitor);
                                 } catch (GenericEntityException e) {
@@ -234,7 +234,7 @@
                                     visitor = delegator.findByPrimaryKey("Visitor", UtilMisc.toMap("visitorId", cookieVisitorId));
                                     if (visitor == null) {
                                         // looks like we have an ID that doesn't exist in our database, so we'll create a new one
-                                        visitor = delegator.makeValue("Visitor", null);
+                                        visitor = delegator.makeValue("Visitor");
                                         visitor = delegator.createSetNextSeqId(visitor);
                                         if (Debug.infoOn()) Debug.logInfo("The visitorId [" + cookieVisitorId + "] found in cookie was invalid, creating new Visitor with ID [" + visitor.getString("visitorId") + "]", module);
                                     }

Modified: ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/GenericWebEvent.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/GenericWebEvent.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/GenericWebEvent.java (original)
+++ ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/GenericWebEvent.java Wed Oct 17 19:46:57 2007
@@ -113,7 +113,7 @@
             return "error";
         }
 
-        GenericValue findByEntity = delegator.makeValue(entityName, null);
+        GenericValue findByEntity = delegator.makeValue(entityName);
 
         // get the primary key parameters...
         String errMsgPk = "";

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=585803&r1=585802&r2=585803&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 Wed Oct 17 19:46:57 2007
@@ -66,7 +66,7 @@
 
 String curFindString = "entityName=" + entityName + "&amp;find=" + find;
 
-GenericEntity findByEntity = delegator.makeValue(entityName, null);
+GenericEntity findByEntity = delegator.makeValue(entityName);
 for (int fnum = 0; fnum < modelEntity.getFieldsSize(); fnum++) {
     ModelField field = modelEntity.getField(fnum);
     String fval = parameters.get(field.getName());

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=585803&r1=585802&r2=585803&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 Wed Oct 17 19:46:57 2007
@@ -63,7 +63,7 @@
 
 boolean useValue = true;
 String curFindString = "entityName=" + entityName;
-GenericPK findByPK = delegator.makePK(entityName, null);
+GenericPK findByPK = delegator.makePK(entityName);
 for(int fnum = 0; fnum < entity.getPksSize(); fnum++) {
     ModelField field = entity.getPk(fnum);
     ModelFieldType type = delegator.getEntityFieldType(entity, field.getType());

Modified: ofbiz/trunk/framework/workflow/src/org/ofbiz/workflow/definition/XpdlReader.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/workflow/src/org/ofbiz/workflow/definition/XpdlReader.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/framework/workflow/src/org/ofbiz/workflow/definition/XpdlReader.java (original)
+++ ofbiz/trunk/framework/workflow/src/org/ofbiz/workflow/definition/XpdlReader.java Wed Oct 17 19:46:57 2007
@@ -130,7 +130,7 @@
         if (!"Package".equals(packageElement.getTagName()))
             throw new DefinitionParserException("Tried to make Package from element not named Package");
 
-        GenericValue packageValue = delegator.makeValue("WorkflowPackage", null);
+        GenericValue packageValue = delegator.makeValue("WorkflowPackage");
 
         values.add(packageValue);
 
@@ -296,7 +296,7 @@
         while (responsibleIter.hasNext()) {
             Element responsibleElement = (Element) responsibleIter.next();
             String responsibleId = UtilXml.elementValue(responsibleElement);
-            GenericValue participantListValue = delegator.makeValue("WorkflowParticipantList", null);
+            GenericValue participantListValue = delegator.makeValue("WorkflowParticipantList");
 
             participantListValue.set("packageId", valueObject.getString("packageId"));
             participantListValue.set("packageVersion", valueObject.getString("packageVersion"));
@@ -322,7 +322,7 @@
 
         while (externalPackageIter.hasNext()) {
             Element externalPackageElement = (Element) externalPackageIter.next();
-            GenericValue externalPackageValue = delegator.makeValue("WorkflowPackageExternal", null);
+            GenericValue externalPackageValue = delegator.makeValue("WorkflowPackageExternal");
 
             values.add(externalPackageValue);
             externalPackageValue.set("packageId", packageId);
@@ -338,7 +338,7 @@
 
         while (typeDeclarationsIter.hasNext()) {
             Element typeDeclarationElement = (Element) typeDeclarationsIter.next();
-            GenericValue typeDeclarationValue = delegator.makeValue("WorkflowTypeDeclaration", null);
+            GenericValue typeDeclarationValue = delegator.makeValue("WorkflowTypeDeclaration");
 
             values.add(typeDeclarationValue);
 
@@ -372,7 +372,7 @@
     }
 
     protected void readWorkflowProcess(Element workflowProcessElement, String packageId, String packageVersion) throws DefinitionParserException {
-        GenericValue workflowProcessValue = delegator.makeValue("WorkflowProcess", null);
+        GenericValue workflowProcessValue = delegator.makeValue("WorkflowProcess");
 
         values.add(workflowProcessValue);
 
@@ -556,7 +556,7 @@
         if (activityElement == null)
             return;
 
-        GenericValue activityValue = delegator.makeValue("WorkflowActivity", null);
+        GenericValue activityValue = delegator.makeValue("WorkflowActivity");
 
         values.add(activityValue);
 
@@ -725,7 +725,7 @@
         if (subFlowElement == null)
             return;
 
-        GenericValue subFlowValue = delegator.makeValue("WorkflowActivitySubFlow", null);
+        GenericValue subFlowValue = delegator.makeValue("WorkflowActivitySubFlow");
 
         values.add(subFlowValue);
 
@@ -753,7 +753,7 @@
         if (loopElement == null)
             return;
 
-        GenericValue loopValue = delegator.makeValue("WorkflowActivityLoop", null);
+        GenericValue loopValue = delegator.makeValue("WorkflowActivityLoop");
 
         values.add(loopValue);
 
@@ -790,7 +790,7 @@
         if (toolElement == null)
             return;
 
-        GenericValue toolValue = delegator.makeValue("WorkflowActivityTool", null);
+        GenericValue toolValue = delegator.makeValue("WorkflowActivityTool");
 
         values.add(toolValue);
 
@@ -869,7 +869,7 @@
         if (transitionElement == null)
             return;
 
-        GenericValue transitionValue = delegator.makeValue("WorkflowTransition", null);
+        GenericValue transitionValue = delegator.makeValue("WorkflowTransition");
 
         values.add(transitionValue);
 
@@ -990,7 +990,7 @@
 
         while (transitionRefsIter.hasNext()) {
             Element transitionRefElement = (Element) transitionRefsIter.next();
-            GenericValue transitionRefValue = delegator.makeValue("WorkflowTransitionRef", null);
+            GenericValue transitionRefValue = delegator.makeValue("WorkflowTransitionRef");
 
             values.add(transitionRefValue);
 
@@ -1015,7 +1015,7 @@
         while (participantsIter.hasNext()) {
             Element participantElement = (Element) participantsIter.next();
             String participantId = participantElement.getAttribute("Id");
-            GenericValue participantValue = delegator.makeValue("WorkflowParticipant", null);
+            GenericValue participantValue = delegator.makeValue("WorkflowParticipant");
             
             values.add(participantValue);
             
@@ -1071,7 +1071,7 @@
                 Debug.logWarning(e, module);
             }
             if (testValue == null) {
-                GenericValue participantValue = delegator.makeValue("WorkflowParticipant", null);
+                GenericValue participantValue = delegator.makeValue("WorkflowParticipant");
 
                 values.add(participantValue);
                 participantValue.set("packageId", packageId);
@@ -1097,7 +1097,7 @@
             }
 
             // regardless of whether the participant was created, create a participant list entry
-            GenericValue participantListValue = delegator.makeValue("WorkflowParticipantList", null);
+            GenericValue participantListValue = delegator.makeValue("WorkflowParticipantList");
 
             values.add(participantListValue);
             participantListValue.set("participantListId", participantListId);
@@ -1116,7 +1116,7 @@
 
         while (applicationsIter.hasNext()) {
             Element applicationElement = (Element) applicationsIter.next();
-            GenericValue applicationValue = delegator.makeValue("WorkflowApplication", null);
+            GenericValue applicationValue = delegator.makeValue("WorkflowApplication");
 
             values.add(applicationValue);
 
@@ -1148,7 +1148,7 @@
 
         while (dataFieldsIter.hasNext()) {
             Element dataFieldElement = (Element) dataFieldsIter.next();
-            GenericValue dataFieldValue = delegator.makeValue("WorkflowDataField", null);
+            GenericValue dataFieldValue = delegator.makeValue("WorkflowDataField");
 
             values.add(dataFieldValue);
 
@@ -1203,7 +1203,7 @@
 
         while (formalParametersIter.hasNext()) {
             Element formalParameterElement = (Element) formalParametersIter.next();
-            GenericValue formalParameterValue = delegator.makeValue("WorkflowFormalParam", null);
+            GenericValue formalParameterValue = delegator.makeValue("WorkflowFormalParam");
 
             values.add(formalParameterValue);
 

Modified: ofbiz/trunk/specialpurpose/bi/src/org/ofbiz/bi/util/DimensionServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/bi/src/org/ofbiz/bi/util/DimensionServices.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/bi/src/org/ofbiz/bi/util/DimensionServices.java (original)
+++ ofbiz/trunk/specialpurpose/bi/src/org/ofbiz/bi/util/DimensionServices.java Wed Oct 17 19:46:57 2007
@@ -154,7 +154,7 @@
             }
             boolean newValue = (dateValue == null);
             if (newValue) {
-                dateValue = delegator.makeValue("DateDimension", null);
+                dateValue = delegator.makeValue("DateDimension");
                 dateValue.set("dimensionId", delegator.getNextSeqId("DateDimension"));
                 dateValue.set("dateValue", currentDate);
             }

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java Wed Oct 17 19:46:57 2007
@@ -120,7 +120,7 @@
 
         // setup the TX log
         String txLogId = session.getDelegator().getNextSeqId("PosTerminalLog");
-        txLog = session.getDelegator().makeValue("PosTerminalLog", null);
+        txLog = session.getDelegator().makeValue("PosTerminalLog");
         txLog.set("posTerminalLogId", txLogId);
         txLog.set("posTerminalId", terminalId);
         txLog.set("transactionId", transactionId);
@@ -391,7 +391,7 @@
     }
 
     public void addDiscount(String productId, double discount, boolean percent) {
-        GenericValue adjustment = session.getDelegator().makeValue("OrderAdjustment", null);
+        GenericValue adjustment = session.getDelegator().makeValue("OrderAdjustment");
         adjustment.set("orderAdjustmentTypeId", "DISCOUNT_ADJUSTMENT");
         if (percent) {
             adjustment.set("sourcePercentage", new Double(discount * 100));

Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java (original)
+++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java Wed Oct 17 19:46:57 2007
@@ -121,7 +121,7 @@
                         Debug.logError(e, module);
                     }
                 }
-                GenericValue state = pos.getSession().getDelegator().makeValue("PosTerminalState", null);
+                GenericValue state = pos.getSession().getDelegator().makeValue("PosTerminalState");
                 state.set("posTerminalId", pos.getSession().getId());
                 state.set("openedDate", UtilDateTime.nowTimestamp());
                 state.set("openedByUserLoginId", pos.getSession().getUserId());
@@ -432,7 +432,7 @@
                 return;
             }
 
-            GenericValue internTx = pos.getSession().getDelegator().makeValue("PosTerminalInternTx", null);
+            GenericValue internTx = pos.getSession().getDelegator().makeValue("PosTerminalInternTx");
             internTx.set("posTerminalLogId", trans.getTerminalLogId());                        
             try
             {