svn commit: r821643 [12/15] - in /ofbiz/trunk: applications/accounting/script
Locked
svn commit: r821643 [12/15] - in /ofbiz/trunk: applications/accounting/script
 
|
Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/ExpressionUiHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/ExpressionUiHelper.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/ExpressionUiHelper.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/ExpressionUiHelper.java Mon Oct 5 00:08:27 2009 @@ -30,7 +30,7 @@ import javolution.util.FastSet; import org.ofbiz.base.util.UtilMisc; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.condition.EntityCondition; @@ -139,7 +139,7 @@ * for inclusion * @return Set of candidate tempExprId Strings */ - public static Set<String> getCandidateIncludeIds(GenericDelegator delegator, String tempExprId) throws GenericEntityException { + public static Set<String> getCandidateIncludeIds(Delegator delegator, String tempExprId) throws GenericEntityException { List<GenericValue> findList = delegator.findList("TemporalExpressionAssoc", EntityCondition.makeCondition("fromTempExprId", tempExprId), null, null, null, true); Set<String> excludedIds = FastSet.newInstance(); for (GenericValue value : findList) { 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=821643&r1=821642&r2=821643&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 Mon Oct 5 00:08:27 2009 @@ -29,7 +29,7 @@ import org.ofbiz.base.util.StringUtil; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.service.calendar.TemporalExpression; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; @@ -296,17 +296,17 @@ return info.getString("recurrenceInfoId"); } - public static RecurrenceInfo makeInfo(GenericDelegator delegator, long startTime, int frequency, + public static RecurrenceInfo makeInfo(Delegator delegator, long startTime, int frequency, int interval, int count) throws RecurrenceInfoException { return makeInfo(delegator, startTime, frequency, interval, count, 0); } - public static RecurrenceInfo makeInfo(GenericDelegator delegator, long startTime, int frequency, + public static RecurrenceInfo makeInfo(Delegator delegator, long startTime, int frequency, int interval, long endTime) throws RecurrenceInfoException { return makeInfo(delegator, startTime, frequency, interval, -1, endTime); } - public static RecurrenceInfo makeInfo(GenericDelegator delegator, long startTime, int frequency, + public static RecurrenceInfo makeInfo(Delegator delegator, long startTime, int frequency, int interval, int count, long endTime) throws RecurrenceInfoException { try { RecurrenceRule r = RecurrenceRule.makeRule(delegator, frequency, interval, count, endTime); 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=821643&r1=821642&r2=821643&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 Mon Oct 5 00:08:27 2009 @@ -27,7 +27,7 @@ import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.StringUtil; import org.ofbiz.base.util.UtilValidate; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; @@ -742,17 +742,17 @@ return rule.getString("recurrenceRuleId"); } - public static RecurrenceRule makeRule(GenericDelegator delegator, int frequency, int interval, int count) + public static RecurrenceRule makeRule(Delegator delegator, int frequency, int interval, int count) throws RecurrenceRuleException { return makeRule(delegator, frequency, interval, count, 0); } - public static RecurrenceRule makeRule(GenericDelegator delegator, int frequency, int interval, long endTime) + public static RecurrenceRule makeRule(Delegator delegator, int frequency, int interval, long endTime) throws RecurrenceRuleException { return makeRule(delegator, frequency, interval, -1, endTime); } - public static RecurrenceRule makeRule(GenericDelegator delegator, int frequency, int interval, int count, long endTime) + public static RecurrenceRule makeRule(Delegator delegator, int frequency, int interval, int count, long endTime) throws RecurrenceRuleException { String freq[] = {"", "SECONDLY", "MINUTELY", "HOURLY", "DAILY", "WEEKLY", "MONTHLY", "YEARLY"}; Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/TemporalExpressionWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/TemporalExpressionWorker.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/TemporalExpressionWorker.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/TemporalExpressionWorker.java Mon Oct 5 00:08:27 2009 @@ -25,7 +25,7 @@ import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilValidate; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.condition.EntityCondition; @@ -54,7 +54,7 @@ * @return A <code>TemporalExpression</code> instance based on <code>tempExprId</code> * @throws GenericEntityException */ - public static TemporalExpression getTemporalExpression(GenericDelegator delegator, String tempExprId) throws GenericEntityException { + public static TemporalExpression getTemporalExpression(Delegator delegator, String tempExprId) throws GenericEntityException { if (UtilValidate.isEmpty(tempExprId)) { throw new IllegalArgumentException("tempExprId argument cannot be empty"); } @@ -73,7 +73,7 @@ * @return A <code>TemporalExpression</code> instance based on <code>exprValue</code> * @throws GenericEntityException */ - public static TemporalExpression makeTemporalExpression(GenericDelegator delegator, GenericValue exprValue) throws GenericEntityException { + public static TemporalExpression makeTemporalExpression(Delegator delegator, GenericValue exprValue) throws GenericEntityException { String tempExprId = exprValue.getString("tempExprId"); String tempExprTypeId = exprValue.getString("tempExprTypeId"); if (DateRange.equals(tempExprTypeId)) { @@ -114,7 +114,7 @@ return TemporalExpressions.NullExpression; } - protected static Set<TemporalExpression> getChildExpressions(GenericDelegator delegator, String tempExprId) throws GenericEntityException { + protected static Set<TemporalExpression> getChildExpressions(Delegator delegator, String tempExprId) throws GenericEntityException { List<GenericValue> valueList = delegator.findList("TemporalExpressionAssoc", EntityCondition.makeCondition("fromTempExprId", tempExprId), null, null, null, true); if (UtilValidate.isEmpty(valueList)) { throw new IllegalArgumentException("tempExprId argument invalid - no child expressions found"); Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/HttpEngine.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/HttpEngine.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/HttpEngine.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/HttpEngine.java Mon Oct 5 00:08:27 2009 @@ -31,7 +31,7 @@ import org.ofbiz.base.util.HttpClient; import org.ofbiz.base.util.HttpClientException; import org.ofbiz.base.util.UtilGenerics; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.serialize.XmlSerializer; import org.ofbiz.service.DispatchContext; import org.ofbiz.service.GenericServiceException; @@ -109,7 +109,7 @@ */ public static String httpEngine(HttpServletRequest request, HttpServletResponse response) { LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher"); - GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator"); + Delegator delegator = (Delegator) request.getAttribute("delegator"); String serviceName = request.getParameter("serviceName"); String serviceMode = request.getParameter("serviceMode"); 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=821643&r1=821642&r2=821643&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 Mon Oct 5 00:08:27 2009 @@ -33,7 +33,7 @@ import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilValidate; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.condition.EntityCondition; @@ -62,15 +62,15 @@ public static final String dispatcherName = "JobDispatcher"; public static Map<String, JobManager> registeredManagers = FastMap.newInstance(); - protected GenericDelegator delegator; + protected Delegator delegator; protected JobPoller jp; /** Creates a new JobManager object. */ - public JobManager(GenericDelegator delegator) { + public JobManager(Delegator delegator) { this(delegator, true); } - public JobManager(GenericDelegator delegator, boolean enabled) { + public JobManager(Delegator delegator, boolean enabled) { if (delegator == null) { throw new GeneralRuntimeException("ERROR: null delegator passed, cannot create JobManager"); } @@ -83,7 +83,7 @@ JobManager.registeredManagers.put(delegator.getDelegatorName(), this); } - public static JobManager getInstance(GenericDelegator delegator, boolean enabled) + public static JobManager getInstance(Delegator delegator, boolean enabled) { JobManager jm = JobManager.registeredManagers.get(delegator.getDelegatorName()); if (jm == null) { @@ -105,8 +105,8 @@ return thisDispatcher; } - /** Returns the GenericDelegator. */ - public GenericDelegator getDelegator() { + /** Returns the Delegator. */ + public Delegator getDelegator() { return this.delegator; } @@ -189,7 +189,7 @@ // only rollback the transaction if we started one... TransactionUtil.rollback(beganTransaction, errMsg, t); } catch (GenericEntityException e2) { - Debug.logError(e2, "[GenericDelegator] Could not rollback transaction: " + e2.toString(), module); + Debug.logError(e2, "[Delegator] Could not rollback transaction: " + e2.toString(), module); } } finally { try { Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/job/PersistedServiceJob.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/job/PersistedServiceJob.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/job/PersistedServiceJob.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/job/PersistedServiceJob.java Mon Oct 5 00:08:27 2009 @@ -35,7 +35,7 @@ import org.ofbiz.base.util.UtilValidate; import org.ofbiz.service.calendar.TemporalExpression; import org.ofbiz.service.calendar.TemporalExpressionWorker; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.condition.EntityCondition; @@ -57,7 +57,7 @@ public static final String module = PersistedServiceJob.class.getName(); - private transient GenericDelegator delegator = null; + private transient Delegator delegator = null; private Timestamp storedDate = null; private long nextRecurrence = -1; private long maxRetry = -1; Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java Mon Oct 5 00:08:27 2009 @@ -35,6 +35,7 @@ import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.UtilMisc; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericDelegator; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.GenericEntityException; @@ -47,7 +48,7 @@ public static final String module = JavaMailContainer.class.getName(); public static final String INBOX = "INBOX"; - protected GenericDelegator delegator = null; + protected Delegator delegator = null; protected LocalDispatcher dispatcher = null; protected GenericValue userLogin = null; protected long timerDelay = 300000; Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/rmi/RmiServiceContainer.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/rmi/RmiServiceContainer.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/rmi/RmiServiceContainer.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/rmi/RmiServiceContainer.java Mon Oct 5 00:08:27 2009 @@ -29,6 +29,7 @@ import org.ofbiz.base.container.Container; import org.ofbiz.base.container.ContainerConfig; import org.ofbiz.base.container.ContainerException; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericDelegator; import org.ofbiz.service.GenericDispatcher; import org.ofbiz.service.LocalDispatcher; @@ -120,7 +121,7 @@ } // get the delegator for this container - GenericDelegator delegator = GenericDelegator.getGenericDelegator(delegatorProp.value); + Delegator delegator = GenericDelegator.getGenericDelegator(delegatorProp.value); // create the LocalDispatcher LocalDispatcher dispatcher = GenericDispatcher.getLocalDispatcher(name, delegator); Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/semaphore/ServiceSemaphore.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/semaphore/ServiceSemaphore.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/semaphore/ServiceSemaphore.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/semaphore/ServiceSemaphore.java Mon Oct 5 00:08:27 2009 @@ -21,7 +21,7 @@ import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilDateTime; import org.ofbiz.base.util.UtilMisc; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.transaction.GenericTransactionException; @@ -47,7 +47,7 @@ public static final int SEMAPHORE_MODE_WAIT = 1; public static final int SEMAPHORE_MODE_NONE = 2; - protected GenericDelegator delegator; + protected Delegator delegator; protected GenericValue lock; protected ModelService model; @@ -55,7 +55,7 @@ protected int mode = SEMAPHORE_MODE_NONE; protected Timestamp lockTime = null; - public ServiceSemaphore(GenericDelegator delegator, ModelService model) { + public ServiceSemaphore(Delegator delegator, ModelService model) { this.delegator = delegator; this.mode = "wait".equals(model.semaphore) ? SEMAPHORE_MODE_WAIT : ("fail".equals(model.semaphore) ? SEMAPHORE_MODE_FAIL : SEMAPHORE_MODE_NONE); this.model = model; Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/test/ServiceEngineTestServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/test/ServiceEngineTestServices.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/test/ServiceEngineTestServices.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/test/ServiceEngineTestServices.java Mon Oct 5 00:08:27 2009 @@ -25,7 +25,7 @@ import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilMisc; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.transaction.TransactionUtil; @@ -68,7 +68,7 @@ } public static Map<String, Object> testServiceDeadLockRetryThreadA(DispatchContext dctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); try { // grab entity SVCLRT_A by changing, then wait, then find and change SVCLRT_B @@ -102,7 +102,7 @@ return ServiceUtil.returnSuccess(); } public static Map<String, Object> testServiceDeadLockRetryThreadB(DispatchContext dctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); try { // grab entity SVCLRT_B by changing, then wait, then change SVCLRT_A @@ -166,7 +166,7 @@ return ServiceUtil.returnSuccess(); } public static Map<String, Object> testServiceLockWaitTimeoutRetryGrabber(DispatchContext dctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); try { // grab entity SVCLWTRT by changing, then wait a LONG time, ie more than the wait timeout @@ -192,7 +192,7 @@ return ServiceUtil.returnSuccess(); } public static Map<String, Object> testServiceLockWaitTimeoutRetryWaiter(DispatchContext dctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); try { // wait for a small amount of time to make sure the grabber does it's thing first @@ -238,7 +238,7 @@ * @return */ public static Map<String, Object> testServiceLockWaitTimeoutRetryCantRecover(DispatchContext dctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); try { // grab entity SVCLWTRTCR by changing, then wait a LONG time, ie more than the wait timeout @@ -266,7 +266,7 @@ return ServiceUtil.returnSuccess(); } public static Map<String, Object> testServiceLockWaitTimeoutRetryCantRecoverWaiter(DispatchContext dctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); try { Debug.logInfo("In testServiceLockWaitTimeoutRetryCantRecoverWaiter updating SVCLWTRTCR", module); @@ -303,7 +303,7 @@ return ServiceUtil.returnSuccess(); } public static Map<String, Object> testServiceOwnTxSubServiceAfterSetRollbackOnlyInParent(DispatchContext dctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); try { // change the SVC_SRBO value first to test that the rollback really does revert/reset @@ -348,7 +348,7 @@ return ServiceUtil.returnSuccess(); } public static Map<String, Object> testServiceEcaGlobalEventExecOnCommit(DispatchContext dctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); try { GenericValue testingType = delegator.findOne("TestingType", false, "testingTypeId", "SVC_SECAGC"); @@ -367,7 +367,7 @@ return ServiceUtil.returnError("Intentional rollback to test global-rollback"); } public static Map<String, Object> testServiceEcaGlobalEventExecOnRollback(DispatchContext dctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); try { GenericValue testingType = delegator.findOne("TestingType", false, "testingTypeId", "SVC_SECAGR"); Modified: ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/EntityXmlAssertTest.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/EntityXmlAssertTest.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/EntityXmlAssertTest.java (original) +++ ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/EntityXmlAssertTest.java Mon Oct 5 00:08:27 2009 @@ -22,7 +22,7 @@ import junit.framework.AssertionFailedError; import org.w3c.dom.Element; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.util.EntityDataAssert; import org.ofbiz.entity.util.EntitySaxReader; Modified: ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/ModelTestSuite.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/ModelTestSuite.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/ModelTestSuite.java (original) +++ ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/ModelTestSuite.java Mon Oct 5 00:08:27 2009 @@ -33,6 +33,7 @@ import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.UtilXml; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericDelegator; import org.ofbiz.entity.testtools.EntityTestCase; import org.ofbiz.service.GenericDispatcher; @@ -52,7 +53,7 @@ protected String originalDelegatorName; protected String originalDispatcherName; - protected GenericDelegator delegator; + protected Delegator delegator; protected LocalDispatcher dispatcher; protected List<Test> testList = FastList.newInstance(); @@ -130,7 +131,7 @@ return this.suiteName; } - GenericDelegator getDelegator() { + Delegator getDelegator() { return this.delegator; } Modified: ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java (original) +++ ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java Mon Oct 5 00:08:27 2009 @@ -26,7 +26,7 @@ import org.ofbiz.base.container.Container; import org.ofbiz.base.container.ContainerException; import org.ofbiz.base.util.Debug; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import java.io.*; import java.util.Enumeration; @@ -113,7 +113,7 @@ } for (ModelTestSuite modelSuite: jsWrapper.getModelTestSuites()) { - GenericDelegator testDelegator = modelSuite.getDelegator(); + Delegator testDelegator = modelSuite.getDelegator(); TestSuite suite = modelSuite.makeTestSuite(); JUnitTest test = new JUnitTest(); test.setName(suite.getName()); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java Mon Oct 5 00:08:27 2009 @@ -50,6 +50,7 @@ import org.ofbiz.base.util.UtilHttp; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.UtilObject; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericDelegator; import org.ofbiz.security.Security; import org.ofbiz.security.SecurityConfigurationException; @@ -283,7 +284,7 @@ protected LocalDispatcher getDispatcher() { LocalDispatcher dispatcher = (LocalDispatcher) config.getServletContext().getAttribute("dispatcher"); if (dispatcher == null) { - GenericDelegator delegator = getDelegator(); + Delegator delegator = getDelegator(); if (delegator == null) { Debug.logError("[ContextFilter.init] ERROR: delegator not defined.", module); @@ -320,8 +321,8 @@ return dispatcher; } - protected GenericDelegator getDelegator() { - GenericDelegator delegator = (GenericDelegator) config.getServletContext().getAttribute("delegator"); + protected Delegator getDelegator() { + Delegator delegator = (Delegator) config.getServletContext().getAttribute("delegator"); if (delegator == null) { String delegatorName = config.getServletContext().getInitParameter("entityDelegatorName"); @@ -341,7 +342,7 @@ protected Authorization getAuthz() { Authorization authz = (Authorization) config.getServletContext().getAttribute("authorization"); if (authz == null) { - GenericDelegator delegator = (GenericDelegator) config.getServletContext().getAttribute("delegator"); + Delegator delegator = (Delegator) config.getServletContext().getAttribute("delegator"); if (delegator != null) { try { @@ -362,7 +363,7 @@ protected Security getSecurity() { Security security = (Security) config.getServletContext().getAttribute("security"); if (security == null) { - GenericDelegator delegator = (GenericDelegator) config.getServletContext().getAttribute("delegator"); + Delegator delegator = (Delegator) config.getServletContext().getAttribute("delegator"); if (delegator != null) { try { Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java Mon Oct 5 00:08:27 2009 @@ -36,6 +36,7 @@ import org.ofbiz.base.util.UtilJ2eeCompat; import org.ofbiz.base.util.UtilTimer; import org.ofbiz.base.util.UtilValidate; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericDelegator; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.transaction.GenericTransactionException; @@ -145,13 +146,13 @@ // for convenience, and necessity with event handlers, make security and delegator available in the request: // try to get it from the session first so that we can have a delegator/dispatcher/security for a certain user if desired - GenericDelegator delegator = null; + Delegator delegator = null; String delegatorName = (String) session.getAttribute("delegatorName"); if (UtilValidate.isNotEmpty(delegatorName)) { delegator = GenericDelegator.getGenericDelegator(delegatorName); } if (delegator == null) { - delegator = (GenericDelegator) getServletContext().getAttribute("delegator"); + delegator = (Delegator) getServletContext().getAttribute("delegator"); } if (delegator == null) { Debug.logError("[ControlServlet] ERROR: delegator not found in ServletContext", module); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java Mon Oct 5 00:08:27 2009 @@ -49,7 +49,7 @@ import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.StringUtil.StringWrapper; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.condition.EntityCondition; @@ -151,7 +151,7 @@ } } - public static void setLoggedOut(String userLoginId, GenericDelegator delegator) { + public static void setLoggedOut(String userLoginId, Delegator delegator) { if (UtilValidate.isEmpty(userLoginId)) { Debug.logWarning("Called setLogged out with empty userLoginId", module); } @@ -484,7 +484,7 @@ public static void doBasicLogout(GenericValue userLogin, HttpServletRequest request) { HttpSession session = request.getSession(); - GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator"); + Delegator delegator = (Delegator) request.getAttribute("delegator"); Security security = (Security) request.getAttribute("security"); if (security != null && userLogin != null) { @@ -511,7 +511,7 @@ } public static String autoLoginSet(HttpServletRequest request, HttpServletResponse response) { - GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator"); + Delegator delegator = (Delegator) request.getAttribute("delegator"); HttpSession session = request.getSession(); GenericValue userLogin = (GenericValue) session.getAttribute("userLogin"); String domain = UtilProperties.getPropertyValue("url.properties", "cookie.domain"); @@ -547,13 +547,13 @@ } public static String autoLoginCheck(HttpServletRequest request, HttpServletResponse response) { - GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator"); + Delegator delegator = (Delegator) request.getAttribute("delegator"); HttpSession session = request.getSession(); return autoLoginCheck(delegator, session, getAutoUserLoginId(request)); } - private static String autoLoginCheck(GenericDelegator delegator, HttpSession session, String autoUserLoginId) { + private static String autoLoginCheck(Delegator delegator, HttpSession session, String autoUserLoginId) { if (autoUserLoginId != null) { Debug.logInfo("Running autoLogin check.", module); try { @@ -625,7 +625,7 @@ * @return Returns "success" if user could be logged in or "error" if there was a problem. */ private static String loginUserWithUserLoginId(HttpServletRequest request, HttpServletResponse response, String userLoginId) { - GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator"); + Delegator delegator = (Delegator) request.getAttribute("delegator"); try { GenericValue userLogin = delegator.findOne("UserLogin", false, "userLoginId", userLoginId); if (userLogin != null) { @@ -696,7 +696,7 @@ public static String check509CertLogin(HttpServletRequest request, HttpServletResponse response) { boolean doCheck = "true".equalsIgnoreCase(UtilProperties.getPropertyValue("security.properties", "security.login.cert.allow", "true")); if (doCheck) { - GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator"); + Delegator delegator = (Delegator) request.getAttribute("delegator"); HttpSession session = request.getSession(); GenericValue currentUserLogin = (GenericValue) session.getAttribute("userLogin"); if (currentUserLogin != null) { @@ -765,7 +765,7 @@ return "success"; } - protected static boolean checkValidIssuer(GenericDelegator delegator, Map<String, String> x500Map, BigInteger serialNumber) throws GeneralException { + protected static boolean checkValidIssuer(Delegator delegator, Map<String, String> x500Map, BigInteger serialNumber) throws GeneralException { List<EntityCondition> conds = FastList.newInstance(); conds.add(EntityCondition.makeCondition(EntityOperator.OR, EntityCondition.makeConditionMap("commonName", x500Map.get("CN")), EntityCondition.makeConditionMap("commonName", null), @@ -877,7 +877,7 @@ } public static Map<String, Object> getUserLoginSession(GenericValue userLogin) { - GenericDelegator delegator = userLogin.getDelegator(); + Delegator delegator = userLogin.getDelegator(); GenericValue userLoginSession; Map<String, Object> userLoginSessionMap = null; try { Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ProtectViewWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ProtectViewWorker.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ProtectViewWorker.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ProtectViewWorker.java Mon Oct 5 00:08:27 2009 @@ -32,7 +32,7 @@ import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilValidate; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.service.ServiceUtil; @@ -60,7 +60,7 @@ HttpSession session = request.getSession(); String viewNameId = RequestHandler.getRequestUri(request.getPathInfo()); GenericValue userLogin = (GenericValue) session.getAttribute("userLogin"); - GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator"); + Delegator delegator = (Delegator) request.getAttribute("delegator"); String returnValue = "success"; if (userLogin != null) { Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java Mon Oct 5 00:08:27 2009 @@ -46,7 +46,7 @@ import org.ofbiz.base.util.UtilObject; import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilValidate; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.webapp.event.EventFactory; @@ -98,13 +98,13 @@ public void doRequest(HttpServletRequest request, HttpServletResponse response, String requestUri) throws RequestHandlerException { HttpSession session = request.getSession(); - GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator"); + Delegator delegator = (Delegator) request.getAttribute("delegator"); GenericValue userLogin = (GenericValue) session.getAttribute("userLogin"); doRequest(request, response, requestUri, userLogin, delegator); } public void doRequest(HttpServletRequest request, HttpServletResponse response, String chain, - GenericValue userLogin, GenericDelegator delegator) throws RequestHandlerException { + GenericValue userLogin, Delegator delegator) throws RequestHandlerException { HttpSession session = request.getSession(); @@ -699,7 +699,7 @@ } private void renderView(String view, boolean allowExtView, HttpServletRequest req, HttpServletResponse resp, String saveName) throws RequestHandlerException { GenericValue userLogin = (GenericValue) req.getSession().getAttribute("userLogin"); - GenericDelegator delegator = (GenericDelegator) req.getAttribute("delegator"); + Delegator delegator = (Delegator) req.getAttribute("delegator"); // workaraound if we are in the root webapp String cname = UtilHttp.getApplicationName(req); String oldView = view; @@ -913,7 +913,7 @@ } public String makeLink(HttpServletRequest request, HttpServletResponse response, String url, boolean fullPath, boolean secure, boolean encode) { - GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator"); + Delegator delegator = (Delegator) request.getAttribute("delegator"); String webSiteId = WebSiteWorker.getWebSiteId(request); String httpsPort = null; Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/CoreEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/CoreEvents.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/CoreEvents.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/CoreEvents.java Mon Oct 5 00:08:27 2009 @@ -43,6 +43,7 @@ import org.ofbiz.base.util.UtilHttp; import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilValidate; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericDelegator; import org.ofbiz.entity.GenericEntity; import org.ofbiz.entity.GenericValue; @@ -117,7 +118,7 @@ return "error"; } - GenericDelegator delegator = GenericDelegator.getGenericDelegator(delegatorName); + Delegator delegator = GenericDelegator.getGenericDelegator(delegatorName); if (delegator == null) { String errMsg = UtilProperties.getMessage(CoreEvents.err_resource, "coreEvents.no_delegator_name_defined", locale); @@ -171,7 +172,7 @@ return "error"; } - GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator"); + Delegator delegator = (Delegator) request.getAttribute("delegator"); ServiceDispatcher sd = ServiceDispatcher.getInstance(dispatcherName, delegator); if (sd == null) { @@ -202,7 +203,7 @@ GenericValue userLogin = (GenericValue) request.getSession().getAttribute("userLogin"); Authorization authz = (Authorization) request.getAttribute("authz"); LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher"); - //GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator"); + //Delegator delegator = (Delegator) request.getAttribute("delegator"); Locale locale = UtilHttp.getLocale(request); TimeZone timeZone = UtilHttp.getTimeZone(request); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/ServiceStreamHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/ServiceStreamHandler.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/ServiceStreamHandler.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/ServiceStreamHandler.java Mon Oct 5 00:08:27 2009 @@ -32,6 +32,7 @@ import javolution.util.FastMap; import org.ofbiz.base.util.Debug; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericDelegator; import org.ofbiz.service.GenericDispatcher; import org.ofbiz.service.GenericServiceException; @@ -48,7 +49,7 @@ public static final String module = ServiceStreamHandler.class.getName(); public static final String dispatcherName = "sstream-dispatcher"; protected LocalDispatcher dispatcher; - protected GenericDelegator delegator; + protected Delegator delegator; public void init(ServletContext context) throws EventHandlerException { String delegatorName = context.getInitParameter("entityDelegatorName"); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/XmlRpcEventHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/XmlRpcEventHandler.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/XmlRpcEventHandler.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/XmlRpcEventHandler.java Mon Oct 5 00:08:27 2009 @@ -49,6 +49,7 @@ import org.apache.xmlrpc.util.HttpUtil; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilValidate; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericDelegator; import org.ofbiz.service.DispatchContext; import org.ofbiz.service.GenericDispatcher; @@ -66,7 +67,7 @@ public static final String module = XmlRpcEventHandler.class.getName(); public static final String dispatcherName = "xmlrpc-dispatcher"; - protected GenericDelegator delegator; + protected Delegator delegator; protected LocalDispatcher dispatcher; private Boolean enabledForExtensions = null; 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=821643&r1=821642&r2=821643&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 Mon Oct 5 00:08:27 2009 @@ -33,6 +33,7 @@ import org.ofbiz.base.util.UtilHttp; import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilProperties; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericDelegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; @@ -56,32 +57,32 @@ public static final String[] typeIds = {"", "REQUEST", "EVENT", "VIEW", "ENTITY", "SERVICE"}; public static void countRequest(String id, HttpServletRequest request, long startTime, long runningTime, GenericValue userLogin, - GenericDelegator delegator) { + Delegator delegator) { countHit(id, REQUEST, request, startTime, runningTime, userLogin, delegator); } public static void countEvent(String id, HttpServletRequest request, long startTime, long runningTime, GenericValue userLogin, - GenericDelegator delegator) { + Delegator delegator) { countHit(id, EVENT, request, startTime, runningTime, userLogin, delegator); } public static void countView(String id, HttpServletRequest request, long startTime, long runningTime, GenericValue userLogin, - GenericDelegator delegator) { + Delegator delegator) { countHit(id, VIEW, request, startTime, runningTime, userLogin, delegator); } public static void countEntity(String id, HttpServletRequest request, long startTime, long runningTime, GenericValue userLogin, - GenericDelegator delegator) { + Delegator delegator) { countHit(id, ENTITY, request, startTime, runningTime, userLogin, delegator); } public static void countService(String id, HttpServletRequest request, long startTime, long runningTime, GenericValue userLogin, - GenericDelegator delegator) { + Delegator delegator) { countHit(id, SERVICE, request, startTime, runningTime, userLogin, delegator); } public static void countHit(String id, int type, HttpServletRequest request, long startTime, long runningTime, GenericValue userLogin, - GenericDelegator delegator) { + Delegator delegator) { // only count hits if enabled, if not specified defaults to false if (!"true".equals(UtilProperties.getPropertyValue("serverstats", "stats.enable." + typeIds[type]))) return; countHit(id, type, request, startTime, runningTime, userLogin, delegator, true); @@ -110,7 +111,7 @@ } protected static void countHit(String id, int type, HttpServletRequest request, long startTime, long runningTime, GenericValue userLogin, - GenericDelegator delegator, boolean isOriginal) { + Delegator delegator, boolean isOriginal) { if (delegator == null) { throw new IllegalArgumentException("The delegator passed to countHit cannot be null"); } @@ -224,7 +225,7 @@ } static void countHitSinceStart(String id, int type, long startTime, long runningTime, boolean isOriginal, - GenericDelegator delegator) { + Delegator delegator) { if (delegator == null) { throw new IllegalArgumentException("The delegator passed to countHitSinceStart cannot be null"); } @@ -325,7 +326,7 @@ public static Map<String, ServerHitBin> entitySinceStarted = FastMap.newInstance(); public static Map<String, ServerHitBin> serviceSinceStarted = FastMap.newInstance(); - GenericDelegator delegator; + Delegator delegator; String delegatorName; String id; int type; @@ -337,7 +338,7 @@ long minTime; long maxTime; - public ServerHitBin(String id, int type, boolean limitLength, GenericDelegator delegator) { + public ServerHitBin(String id, int type, boolean limitLength, Delegator delegator) { super(); if (delegator == null) { throw new IllegalArgumentException("The delegator passed to countHitSinceStart cannot be null"); @@ -351,7 +352,7 @@ reset(getEvenStartingTime()); } - public GenericDelegator getDelegator() { + public Delegator getDelegator() { if (this.delegator == null) { this.delegator = GenericDelegator.getGenericDelegator(this.delegatorName); } 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=821643&r1=821642&r2=821643&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 Mon Oct 5 00:08:27 2009 @@ -32,6 +32,7 @@ import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilValidate; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericDelegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; @@ -102,7 +103,7 @@ synchronized (session) { visit = (GenericValue) session.getAttribute("visit"); if (visit == null) { - GenericDelegator delegator = null; + Delegator delegator = null; // first try the session attribute delegatorName String delegatorName = (String) session.getAttribute("delegatorName"); @@ -112,7 +113,7 @@ // then try the ServletContext attribute delegator, should always be there... if (delegator == null) { - delegator = (GenericDelegator) session.getServletContext().getAttribute("delegator"); + delegator = (Delegator) session.getServletContext().getAttribute("delegator"); } if (delegator == null) { @@ -195,7 +196,7 @@ synchronized (session) { visitor = (GenericValue) session.getAttribute("visitor"); if (visitor == null) { - GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator"); + Delegator delegator = (Delegator) request.getAttribute("delegator"); String delegatorName = (String) session.getAttribute("delegatorName"); if (delegator == null && UtilValidate.isNotEmpty(delegatorName)) { Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/DataVisionViewHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/DataVisionViewHandler.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/DataVisionViewHandler.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/DataVisionViewHandler.java Mon Oct 5 00:08:27 2009 @@ -30,7 +30,7 @@ import org.ofbiz.base.util.Debug; import org.ofbiz.webapp.control.ContextFilter; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.jdbc.ConnectionFactory; /** @@ -63,7 +63,7 @@ // tell the ContextFilter we are forwarding request.setAttribute(ContextFilter.FORWARDED_FROM_SERVLET, Boolean.TRUE); - GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator"); + Delegator delegator = (Delegator) request.getAttribute("delegator"); if (delegator == null) { throw new ViewHandlerException("The delegator object was null, how did that happen?"); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JasperReportsJXlsViewHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JasperReportsJXlsViewHandler.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JasperReportsJXlsViewHandler.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JasperReportsJXlsViewHandler.java Mon Oct 5 00:08:27 2009 @@ -40,7 +40,7 @@ import org.ofbiz.base.util.cache.UtilCache; import org.ofbiz.webapp.control.ContextFilter; import org.ofbiz.webapp.view.AbstractViewHandler; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.jdbc.ConnectionFactory; @@ -74,7 +74,7 @@ // tell the ContextFilter we are forwarding request.setAttribute(ContextFilter.FORWARDED_FROM_SERVLET, Boolean.valueOf(true)); - GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator"); + Delegator delegator = (Delegator) request.getAttribute("delegator"); if (delegator == null) { throw new ViewHandlerException("The delegator object was null, how did that happen?"); } Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JasperReportsPdfViewHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JasperReportsPdfViewHandler.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JasperReportsPdfViewHandler.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JasperReportsPdfViewHandler.java Mon Oct 5 00:08:27 2009 @@ -39,7 +39,7 @@ import org.ofbiz.base.util.cache.UtilCache; import org.ofbiz.webapp.control.ContextFilter; import org.ofbiz.webapp.view.AbstractViewHandler; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.jdbc.ConnectionFactory; /** @@ -72,7 +72,7 @@ // tell the ContextFilter we are forwarding request.setAttribute(ContextFilter.FORWARDED_FROM_SERVLET, Boolean.valueOf(true)); - GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator"); + Delegator delegator = (Delegator) request.getAttribute("delegator"); if (delegator == null) { throw new ViewHandlerException("The delegator object was null, how did that happen?"); } Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JasperReportsPoiXlsViewHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JasperReportsPoiXlsViewHandler.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JasperReportsPoiXlsViewHandler.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JasperReportsPoiXlsViewHandler.java Mon Oct 5 00:08:27 2009 @@ -40,7 +40,7 @@ import org.ofbiz.base.util.cache.UtilCache; import org.ofbiz.webapp.control.ContextFilter; import org.ofbiz.webapp.view.AbstractViewHandler; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.jdbc.ConnectionFactory; @@ -74,7 +74,7 @@ // tell the ContextFilter we are forwarding request.setAttribute(ContextFilter.FORWARDED_FROM_SERVLET, Boolean.valueOf(true)); - GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator"); + Delegator delegator = (Delegator) request.getAttribute("delegator"); if (delegator == null) { throw new ViewHandlerException("The delegator object was null, how did that happen?"); } Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JasperReportsXmlViewHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JasperReportsXmlViewHandler.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JasperReportsXmlViewHandler.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JasperReportsXmlViewHandler.java Mon Oct 5 00:08:27 2009 @@ -38,7 +38,7 @@ import org.ofbiz.base.util.UtilHttp; import org.ofbiz.webapp.control.ContextFilter; import org.ofbiz.webapp.view.AbstractViewHandler; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.jdbc.ConnectionFactory; /** @@ -71,7 +71,7 @@ // tell the ContextFilter we are forwarding request.setAttribute(ContextFilter.FORWARDED_FROM_SERVLET, Boolean.valueOf(true)); - GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator"); + Delegator delegator = (Delegator) request.getAttribute("delegator"); if (delegator == null) { throw new ViewHandlerException("The delegator object was null, how did that happen?"); Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/WebDavServlet.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/WebDavServlet.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/WebDavServlet.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/webdav/WebDavServlet.java Mon Oct 5 00:08:27 2009 @@ -32,6 +32,7 @@ import org.ofbiz.base.util.CachedClassLoader; import org.ofbiz.base.util.Debug; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericDelegator; import org.ofbiz.security.Security; import org.ofbiz.security.SecurityFactory; @@ -54,7 +55,7 @@ public static final String module = WebDavServlet.class.getName(); protected Authorization authz = null; - protected GenericDelegator delegator = null; + protected Delegator delegator = null; protected LocalDispatcher dispatcher = null; protected RequestHandlerFactory handlerFactory = null; protected Security security = null; Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/website/WebSiteWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/website/WebSiteWorker.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/website/WebSiteWorker.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/website/WebSiteWorker.java Mon Oct 5 00:08:27 2009 @@ -23,7 +23,7 @@ import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilMisc; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; @@ -46,7 +46,7 @@ if (webSiteId == null) { return null; } - GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator"); + Delegator delegator = (Delegator) request.getAttribute("delegator"); try { return delegator.findByPrimaryKeyCache("WebSite", UtilMisc.toMap("webSiteId", webSiteId)); Modified: ofbiz/trunk/framework/webslinger/src/org/ofbiz/webslinger/EntityHttpUtil.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webslinger/src/org/ofbiz/webslinger/EntityHttpUtil.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/webslinger/src/org/ofbiz/webslinger/EntityHttpUtil.java (original) +++ ofbiz/trunk/framework/webslinger/src/org/ofbiz/webslinger/EntityHttpUtil.java Mon Oct 5 00:08:27 2009 @@ -31,7 +31,7 @@ import org.ofbiz.base.util.UtilHttp; import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilValidate; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.jdbc.SqlJdbcUtil; import org.ofbiz.entity.model.ModelEntity; @@ -53,7 +53,7 @@ } public static GenericValue makeValidValue(String entityName, boolean includePks, HttpServletRequest request) throws GeneralException { - GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator"); + Delegator delegator = (Delegator) request.getAttribute("delegator"); GenericValue value = delegator.makeValue(entityName); ModelEntity model = value.getModelEntity(); Iterator<ModelField> it = includePks ? model.getFieldsIterator() : model.getNopksIterator(); Modified: ofbiz/trunk/framework/webslinger/src/org/ofbiz/webslinger/StatsUpdater.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webslinger/src/org/ofbiz/webslinger/StatsUpdater.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/webslinger/src/org/ofbiz/webslinger/StatsUpdater.java (original) +++ ofbiz/trunk/framework/webslinger/src/org/ofbiz/webslinger/StatsUpdater.java Mon Oct 5 00:08:27 2009 @@ -28,7 +28,7 @@ import java.util.concurrent.atomic.AtomicReference; import org.ofbiz.base.util.UtilMisc; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericPK; import org.ofbiz.entity.GenericValue; @@ -39,7 +39,7 @@ public class StatsUpdater { private static final Updater UPDATER = new Updater(); - public static void updateStats(GenericDelegator delegator, String entityName, Map<String, ? extends Object> keyFields, Map<String, ? extends Long> updateCountFields) throws GenericEntityException { + public static void updateStats(Delegator delegator, String entityName, Map<String, ? extends Object> keyFields, Map<String, ? extends Long> updateCountFields) throws GenericEntityException { GenericPK pk = delegator.makePK(entityName, keyFields); Map<String, Long> value = UPDATER.getValue(pk); synchronized (value) { Modified: ofbiz/trunk/framework/webslinger/src/org/ofbiz/webslinger/WebslingerContextMapper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webslinger/src/org/ofbiz/webslinger/WebslingerContextMapper.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/webslinger/src/org/ofbiz/webslinger/WebslingerContextMapper.java (original) +++ ofbiz/trunk/framework/webslinger/src/org/ofbiz/webslinger/WebslingerContextMapper.java Mon Oct 5 00:08:27 2009 @@ -33,6 +33,7 @@ import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilProperties; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericDelegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; @@ -52,7 +53,7 @@ public class WebslingerContextMapper extends AbstractMappingWebslingerServletContextFactory { protected ServletContext servletContext; - protected GenericDelegator delegator; + protected Delegator delegator; protected final ArrayList<URL> globalReaderURLs = new ArrayList<URL>(); public void init(ServletConfig config) throws ServletException, IOException { Modified: ofbiz/trunk/framework/webslinger/src/org/ofbiz/webslinger/WebslingerServerEngine.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webslinger/src/org/ofbiz/webslinger/WebslingerServerEngine.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/webslinger/src/org/ofbiz/webslinger/WebslingerServerEngine.java (original) +++ ofbiz/trunk/framework/webslinger/src/org/ofbiz/webslinger/WebslingerServerEngine.java Mon Oct 5 00:08:27 2009 @@ -26,7 +26,7 @@ import org.ofbiz.base.util.UtilGenerics; import org.ofbiz.base.util.UtilMisc; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.util.EntityUtil; import org.ofbiz.service.GenericServiceException; @@ -48,7 +48,7 @@ @Override public Map<String, Object> runSync(String localName, ModelService modelService, Map<String, Object> context) throws GenericServiceException { - GenericDelegator delegator = dispatcher.getDelegator(); + Delegator delegator = dispatcher.getDelegator(); try { GenericValue found = EntityUtil.getFirst(delegator.findByAndCache("WebslingerLayout", UtilMisc.toMap("webslingerServerId", modelService.location))); if (found == null) throw new GenericServiceException("Couldn't find server mapping for(" + modelService.location + ")"); 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=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/GenericWebEvent.java (original) +++ ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/GenericWebEvent.java Mon Oct 5 00:08:27 2009 @@ -31,7 +31,7 @@ import org.ofbiz.base.util.UtilHttp; import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilProperties; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.model.ModelEntity; @@ -68,7 +68,7 @@ } Security security = (Security) request.getAttribute("security"); - GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator"); + Delegator delegator = (Delegator) request.getAttribute("delegator"); if (security == null) { String errMsg = UtilProperties.getMessage(GenericWebEvent.err_resource,"genericWebEvent.security_object_not_found", locale) + "."; Modified: ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java (original) +++ ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java Mon Oct 5 00:08:27 2009 @@ -62,6 +62,7 @@ import org.ofbiz.base.util.UtilURL; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.UtilProperties.UtilResourceBundle; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericDelegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; @@ -349,7 +350,7 @@ } String groupNameToUse = overrideGroup != null ? overrideGroup : "org.ofbiz"; - GenericDelegator delegator = UtilValidate.isNotEmpty(overrideDelegator) ? GenericDelegator.getGenericDelegator(overrideDelegator) : dctx.getDelegator(); + Delegator delegator = UtilValidate.isNotEmpty(overrideDelegator) ? GenericDelegator.getGenericDelegator(overrideDelegator) : dctx.getDelegator(); String helperName = delegator.getGroupHelperName(groupNameToUse); if (helperName == null) { @@ -430,7 +431,7 @@ } public static Map<String, Object> parseEntityXmlFile(DispatchContext dctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); URL url = (URL) context.get("url"); String xmltext = (String) context.get("xmltext"); @@ -468,7 +469,7 @@ } public static Map<String, Object> entityExportAll(DispatchContext dctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); String outpath = (String)context.get("outpath"); // mandatory Integer txTimeout = (Integer)context.get("txTimeout"); @@ -607,7 +608,7 @@ </li></ul> * */ public static Map<String, Object> getEntityRefData(DispatchContext dctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); Locale locale = (Locale) context.get("locale"); ClassLoader loader = Thread.currentThread().getContextClassLoader(); Map<String, Object> resultMap = ServiceUtil.returnSuccess(); Modified: ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java (original) +++ ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java Mon Oct 5 00:08:27 2009 @@ -39,7 +39,7 @@ import org.ofbiz.base.util.UtilFormatOut; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.UtilXml; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.model.ModelEntity; import org.ofbiz.entity.model.ModelField; import org.ofbiz.service.DispatchContext; @@ -59,13 +59,13 @@ private static final String getMessage = "UtilProperties.getMessage("; protected Map<String, Map<String, Integer>> references = new TreeMap<String, Map<String, Integer>>(); - protected GenericDelegator delegator; + protected Delegator delegator; protected DispatchContext dispatchContext; protected Map<String, LabelInfo> labels; protected Set<String> labelSet = FastSet.newInstance(); protected Set<String> rootFolders = FastSet.newInstance(); - public LabelReferences(GenericDelegator delegator, LabelManagerFactory factory) { + public LabelReferences(Delegator delegator, LabelManagerFactory factory) { this.delegator = delegator; this.labels = factory.getLabels(); this.dispatchContext = new DispatchContext("LabelManagerDispCtx:" + delegator.getDelegatorName(), null, this.getClass().getClassLoader(), null); Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/artifactinfo/ArtifactInfo.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/artifactinfo/ArtifactInfo.groovy?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/artifactinfo/ArtifactInfo.groovy (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/artifactinfo/ArtifactInfo.groovy Mon Oct 5 00:08:27 2009 @@ -17,7 +17,7 @@ * under the License. */ -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.webtools.artifactinfo.*; import org.ofbiz.base.util.*; import javolution.util.FastList; Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/CheckDb.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/CheckDb.groovy?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/CheckDb.groovy (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/CheckDb.groovy Mon Oct 5 00:08:27 2009 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.security.Security; import org.ofbiz.entity.jdbc.DatabaseUtil; import org.ofbiz.entity.model.ModelEntity; Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/EntityMaint.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/EntityMaint.groovy?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/EntityMaint.groovy (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/EntityMaint.groovy Mon Oct 5 00:08:27 2009 @@ -19,7 +19,7 @@ import javolution.util.FastList; import org.ofbiz.base.util.UtilValidate; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.model.ModelGroupReader; import org.ofbiz.entity.model.ModelReader; import org.ofbiz.entity.model.ModelEntity; Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/EntityRefList.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/EntityRefList.groovy?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/EntityRefList.groovy (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/EntityRefList.groovy Mon Oct 5 00:08:27 2009 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.security.Security; import org.ofbiz.entity.model.ModelReader; import org.ofbiz.entity.model.ModelEntity; Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/FindGeneric.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/FindGeneric.groovy?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/FindGeneric.groovy (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/FindGeneric.groovy Mon Oct 5 00:08:27 2009 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.security.Security; Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/ViewGeneric.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/ViewGeneric.groovy?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/ViewGeneric.groovy (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/ViewGeneric.groovy Mon Oct 5 00:08:27 2009 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericPK; import org.ofbiz.entity.GenericValue; import org.ofbiz.security.Security; Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/ViewRelations.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/ViewRelations.groovy?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/ViewRelations.groovy (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/ViewRelations.groovy Mon Oct 5 00:08:27 2009 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.security.Security; import org.ofbiz.entity.model.ModelReader; import org.ofbiz.entity.model.ModelEntity; Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/labelmanager/LabelManager.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/labelmanager/LabelManager.groovy?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/labelmanager/LabelManager.groovy (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/labelmanager/LabelManager.groovy Mon Oct 5 00:08:27 2009 @@ -17,7 +17,7 @@ * under the License. */ -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.webtools.labelmanager.*; LabelManagerFactory factory = LabelManagerFactory.getInstance(); Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/labelmanager/UpdateManager.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/labelmanager/UpdateManager.groovy?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/labelmanager/UpdateManager.groovy (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/labelmanager/UpdateManager.groovy Mon Oct 5 00:08:27 2009 @@ -17,7 +17,7 @@ * under the License. */ -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.webtools.labelmanager.*; LabelManagerFactory factory = LabelManagerFactory.getInstance(); Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/labelmanager/ViewReferences.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/labelmanager/ViewReferences.groovy?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/labelmanager/ViewReferences.groovy (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/labelmanager/ViewReferences.groovy Mon Oct 5 00:08:27 2009 @@ -17,7 +17,7 @@ * under the License. */ -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.webtools.labelmanager.*; LabelManagerFactory factory = LabelManagerFactory.getInstance(); Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ContentWorkerInterface.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ContentWorkerInterface.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ContentWorkerInterface.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ContentWorkerInterface.java Mon Oct 5 00:08:27 2009 @@ -24,7 +24,7 @@ import java.util.Map; import org.ofbiz.base.util.GeneralException; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.service.LocalDispatcher; @@ -35,14 +35,14 @@ public interface ContentWorkerInterface { // helper methods - public GenericValue getCurrentContentExt(GenericDelegator delegator, List<Map<String, ? extends Object>> trail, GenericValue userLogin, Map<String, Object> ctx, Boolean nullThruDatesOnly, String contentAssocPredicateId) throws GeneralException; - public GenericValue getWebSitePublishPointExt(GenericDelegator delegator, String contentId, boolean ignoreCache) throws GenericEntityException; - public String getMimeTypeIdExt(GenericDelegator delegator, GenericValue view, Map<String, Object> ctx); + public GenericValue getCurrentContentExt(Delegator delegator, List<Map<String, ? extends Object>> trail, GenericValue userLogin, Map<String, Object> ctx, Boolean nullThruDatesOnly, String contentAssocPredicateId) throws GeneralException; + public GenericValue getWebSitePublishPointExt(Delegator delegator, String contentId, boolean ignoreCache) throws GenericEntityException; + public String getMimeTypeIdExt(Delegator delegator, GenericValue view, Map<String, Object> ctx); // new rendering methods - public void renderContentAsTextExt(LocalDispatcher dispatcher, GenericDelegator delegator, String contentId, Appendable out, Map<String, Object> templateContext, Locale locale, String mimeTypeId, boolean cache) throws GeneralException, IOException; - public String renderContentAsTextExt(LocalDispatcher dispatcher, GenericDelegator delegator, String contentId, Map<String, Object> templateContext, Locale locale, String mimeTypeId, boolean cache) throws GeneralException, IOException; + public void renderContentAsTextExt(LocalDispatcher dispatcher, Delegator delegator, String contentId, Appendable out, Map<String, Object> templateContext, Locale locale, String mimeTypeId, boolean cache) throws GeneralException, IOException; + public String renderContentAsTextExt(LocalDispatcher dispatcher, Delegator delegator, String contentId, Map<String, Object> templateContext, Locale locale, String mimeTypeId, boolean cache) throws GeneralException, IOException; - public void renderSubContentAsTextExt(LocalDispatcher dispatcher, GenericDelegator delegator, String contentId, Appendable out, String mapKey, Map<String, Object> templateContext, Locale locale, String mimeTypeId, boolean cache) throws GeneralException, IOException; - public String renderSubContentAsTextExt(LocalDispatcher dispatcher, GenericDelegator delegator, String contentId, String mapKey, Map<String, Object> templateContext, Locale locale, String mimeTypeId, boolean cache) throws GeneralException, IOException; + public void renderSubContentAsTextExt(LocalDispatcher dispatcher, Delegator delegator, String contentId, Appendable out, String mapKey, Map<String, Object> templateContext, Locale locale, String mimeTypeId, boolean cache) throws GeneralException, IOException; + public String renderSubContentAsTextExt(LocalDispatcher dispatcher, Delegator delegator, String contentId, String mapKey, Map<String, Object> templateContext, Locale locale, String mimeTypeId, boolean cache) throws GeneralException, IOException; } Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/DataResourceWorkerInterface.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/DataResourceWorkerInterface.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/DataResourceWorkerInterface.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/DataResourceWorkerInterface.java Mon Oct 5 00:08:27 2009 @@ -23,15 +23,15 @@ import java.util.Map; import org.ofbiz.base.util.GeneralException; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; /** * ContentWorkerInterface */ public interface DataResourceWorkerInterface { - public String renderDataResourceAsTextExt(GenericDelegator delegator, String dataResourceId, Map<String, Object> templateContext, + public String renderDataResourceAsTextExt(Delegator delegator, String dataResourceId, Map<String, Object> templateContext, Locale locale, String targetMimeTypeId, boolean cache) throws GeneralException, IOException; - public void renderDataResourceAsTextExt(GenericDelegator delegator, String dataResourceId, Appendable out, Map<String, Object> templateContext, + public void renderDataResourceAsTextExt(Delegator delegator, String dataResourceId, Appendable out, Map<String, Object> templateContext, Locale locale, String targetMimeTypeId, boolean cache) throws GeneralException, IOException; } Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/FormFactory.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/FormFactory.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/FormFactory.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/FormFactory.java Mon Oct 5 00:08:27 2009 @@ -31,7 +31,7 @@ import org.ofbiz.base.util.UtilHttp; import org.ofbiz.base.util.UtilXml; import org.ofbiz.base.util.cache.UtilCache; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.model.ModelReader; import org.ofbiz.service.DispatchContext; import org.ofbiz.service.LocalDispatcher; @@ -103,7 +103,7 @@ modelForm = formWebappCache.get(cacheKey); if (modelForm == null) { ServletContext servletContext = (ServletContext) request.getAttribute("servletContext"); - GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator"); + Delegator delegator = (Delegator) request.getAttribute("delegator"); LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher"); URL formFileUrl = servletContext.getResource(resourceName); Document formFileDoc = UtilXml.readXmlDocument(formFileUrl, true); Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java Mon Oct 5 00:08:27 2009 @@ -46,7 +46,7 @@ import org.ofbiz.base.util.collections.FlexibleMapAccessor; import org.ofbiz.base.util.collections.MapStack; import org.ofbiz.base.util.string.FlexibleStringExpander; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.model.ModelEntity; import org.ofbiz.entity.model.ModelField; @@ -1741,8 +1741,8 @@ return dispatcher; } - public GenericDelegator getDelegator(Map<String, Object> context) { - GenericDelegator delegator = (GenericDelegator) context.get("delegator"); + public Delegator getDelegator(Map<String, Object> context) { + Delegator delegator = (Delegator) context.get("delegator"); return delegator; } |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |