svn commit: r796165 - in /ofbiz/branches/executioncontext20090716/framework: context/src/org/ofbiz/context/service/ entity/src/org/ofbiz/entity/finder/ entity/src/org/ofbiz/entity/serialize/ minilang/src/org/ofbiz/minilang/ minilang/src/org/ofbiz/minil...

[jonesde]

Author: jonesde
Date: Tue Jul 21 06:48:16 2009
New Revision: 796165

URL: http://svn.apache.org/viewvc?rev=796165&view=rev
Log:
More import cleanups to use new interfaces

Modified:
    ofbiz/branches/executioncontext20090716/framework/context/src/org/ofbiz/context/service/LocalDispatcher.java
    ofbiz/branches/executioncontext20090716/framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java
    ofbiz/branches/executioncontext20090716/framework/entity/src/org/ofbiz/entity/finder/Finder.java
    ofbiz/branches/executioncontext20090716/framework/entity/src/org/ofbiz/entity/finder/ListFinder.java
    ofbiz/branches/executioncontext20090716/framework/entity/src/org/ofbiz/entity/serialize/XmlSerializer.java
    ofbiz/branches/executioncontext20090716/framework/minilang/src/org/ofbiz/minilang/SimpleMethod.java
    ofbiz/branches/executioncontext20090716/framework/minilang/src/org/ofbiz/minilang/SimpleServiceEngine.java
    ofbiz/branches/executioncontext20090716/framework/minilang/src/org/ofbiz/minilang/method/MethodContext.java
    ofbiz/branches/executioncontext20090716/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCondition.java
    ofbiz/branches/executioncontext20090716/framework/security/src/org/ofbiz/security/Security.java
    ofbiz/branches/executioncontext20090716/framework/security/src/org/ofbiz/security/SecurityFactory.java
    ofbiz/branches/executioncontext20090716/framework/security/src/org/ofbiz/security/authz/Authorization.java
    ofbiz/branches/executioncontext20090716/framework/security/src/org/ofbiz/security/authz/AuthorizationFactory.java
    ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/DispatchContext.java
    ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/GenericAbstractDispatcher.java
    ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/GenericDispatcher.java
    ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/ServiceAuthException.java
    ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/ServiceDispatcher.java
    ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/ServiceUtil.java
    ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/calendar/RecurrenceInfo.java
    ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/calendar/RecurrenceRule.java
    ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/calendar/TemporalExpressionWorker.java
    ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/eca/ServiceEcaAction.java
    ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/eca/ServiceEcaCondition.java
    ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/eca/ServiceEcaRule.java
    ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/eca/ServiceEcaUtil.java
    ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/engine/AbstractEngine.java
    ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/engine/GenericAsyncEngine.java
    ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/engine/GenericEngine.java
    ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/engine/GenericEngineFactory.java
    ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/jms/GenericMessageListener.java
    ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/jms/JmsListenerFactory.java
    ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/job/GenericServiceJob.java
    ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/job/InvalidJobException.java
    ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/job/JobManager.java
    ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/job/PersistedServiceJob.java
    ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/semaphore/SemaphoreFailException.java
    ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/semaphore/SemaphoreWaitException.java
    ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/semaphore/ServiceSemaphore.java

Modified: ofbiz/branches/executioncontext20090716/framework/context/src/org/ofbiz/context/service/LocalDispatcher.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/context/src/org/ofbiz/context/service/LocalDispatcher.java?rev=796165&r1=796164&r2=796165&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/context/src/org/ofbiz/context/service/LocalDispatcher.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/context/src/org/ofbiz/context/service/LocalDispatcher.java Tue Jul 21 06:48:16 2009
@@ -20,9 +20,12 @@
 
 import java.util.Map;
 
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.context.entity.GenericDelegator;
 import org.ofbiz.security.Security;
 import org.ofbiz.security.authz.Authorization;
+import org.ofbiz.service.DispatchContext;
+import org.ofbiz.service.ServiceAuthException;
+import org.ofbiz.service.ServiceValidationException;
 import org.ofbiz.service.jms.JmsListenerFactory;
 import org.ofbiz.service.job.JobManager;
 

Modified: ofbiz/branches/executioncontext20090716/framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java?rev=796165&r1=796164&r2=796165&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java Tue Jul 21 06:48:16 2009
@@ -38,8 +38,9 @@
 import org.ofbiz.base.util.UtilXml;
 import org.ofbiz.base.util.collections.FlexibleMapAccessor;
 import org.ofbiz.base.util.string.FlexibleStringExpander;
-import org.ofbiz.entity.GenericEntityException;
-import org.ofbiz.entity.GenericValue;
+import org.ofbiz.context.entity.EntityListIterator;
+import org.ofbiz.context.entity.GenericEntityException;
+import org.ofbiz.context.entity.GenericValue;
 import org.ofbiz.entity.condition.EntityComparisonOperator;
 import org.ofbiz.entity.condition.EntityCondition;
 import org.ofbiz.entity.condition.EntityFunction;
@@ -47,7 +48,6 @@
 import org.ofbiz.entity.condition.EntityOperator;
 import org.ofbiz.entity.model.ModelEntity;
 import org.ofbiz.entity.model.ModelFieldTypeReader;
-import org.ofbiz.entity.util.EntityListIterator;
 import org.w3c.dom.Element;
 
 /**
@@ -148,6 +148,8 @@
     public static interface Condition extends Serializable {
         public EntityCondition createCondition(Map<String, ? extends Object> context, ModelEntity modelEntity, ModelFieldTypeReader modelFieldTypeReader);
     }
+    
+    @SuppressWarnings("serial")
     public static class ConditionExpr implements Condition {
         protected FlexibleStringExpander fieldNameExdr;
         protected FlexibleStringExpander operatorExdr;
@@ -260,6 +262,7 @@
         }
     }
 
+    @SuppressWarnings("serial")
     public static class ConditionList implements Condition {
         List<Condition> conditionList = new LinkedList<Condition>();
         FlexibleStringExpander combineExdr;
@@ -307,6 +310,8 @@
             return EntityCondition.makeCondition(entityConditionList, (EntityJoinOperator) operator);
         }
     }
+    
+    @SuppressWarnings("serial")
     public static class ConditionObject implements Condition {
         protected FlexibleMapAccessor<Object> fieldNameAcsr;
 
@@ -328,6 +333,8 @@
         public void handleOutput(EntityListIterator eli, Map<String, Object> context, FlexibleMapAccessor<Object> listAcsr);
         public void handleOutput(List<GenericValue> results, Map<String, Object> context, FlexibleMapAccessor<Object> listAcsr);
     }
+    
+    @SuppressWarnings("serial")
     public static class LimitRange implements OutputHandler {
         FlexibleStringExpander startExdr;
         FlexibleStringExpander sizeExdr;
@@ -382,6 +389,8 @@
             listAcsr.put(context, results.subList(start, end));
         }
     }
+    
+    @SuppressWarnings("serial")
     public static class LimitView implements OutputHandler {
         FlexibleStringExpander viewIndexExdr;
         FlexibleStringExpander viewSizeExdr;
@@ -438,6 +447,8 @@
             listAcsr.put(context, results.subList(begin, end));
         }
     }
+    
+    @SuppressWarnings("serial")
     public static class UseIterator implements OutputHandler {
         public UseIterator(Element useIteratorElement) {
             // no parameters, nothing to do
@@ -451,6 +462,8 @@
             throw new IllegalArgumentException("Cannot handle output with use-iterator when the query is cached, or the result in general is not an EntityListIterator");
         }
     }
+    
+    @SuppressWarnings("serial")
     public static class GetAll implements OutputHandler {
         public GetAll() {
             // no parameters, nothing to do

Modified: ofbiz/branches/executioncontext20090716/framework/entity/src/org/ofbiz/entity/finder/Finder.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/entity/src/org/ofbiz/entity/finder/Finder.java?rev=796165&r1=796164&r2=796165&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/entity/src/org/ofbiz/entity/finder/Finder.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/entity/src/org/ofbiz/entity/finder/Finder.java Tue Jul 21 06:48:16 2009
@@ -18,13 +18,13 @@
  *******************************************************************************/
 package org.ofbiz.entity.finder;
 
-import java.util.Map;
 import java.io.Serializable;
-import org.w3c.dom.Element;
+import java.util.Map;
 
 import org.ofbiz.base.util.GeneralException;
 import org.ofbiz.base.util.string.FlexibleStringExpander;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.context.entity.GenericDelegator;
+import org.w3c.dom.Element;
 
 @SuppressWarnings("serial")
 public abstract class Finder implements Serializable {

Modified: ofbiz/branches/executioncontext20090716/framework/entity/src/org/ofbiz/entity/finder/ListFinder.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/entity/src/org/ofbiz/entity/finder/ListFinder.java?rev=796165&r1=796164&r2=796165&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/entity/src/org/ofbiz/entity/finder/ListFinder.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/entity/src/org/ofbiz/entity/finder/ListFinder.java Tue Jul 21 06:48:16 2009
@@ -32,9 +32,13 @@
 import org.ofbiz.base.util.UtilXml;
 import org.ofbiz.base.util.collections.FlexibleMapAccessor;
 import org.ofbiz.base.util.string.FlexibleStringExpander;
-import org.ofbiz.entity.GenericDelegator;
-import org.ofbiz.entity.GenericEntityException;
-import org.ofbiz.entity.GenericValue;
+import org.ofbiz.context.entity.EntityFindOptions;
+import org.ofbiz.context.entity.EntityListIterator;
+import org.ofbiz.context.entity.GenericDelegator;
+import org.ofbiz.context.entity.GenericEntityException;
+import org.ofbiz.context.entity.GenericValue;
+import org.ofbiz.context.entity.ModelEntityInterface;
+import org.ofbiz.entity.GenericDelegatorImpl;
 import org.ofbiz.entity.condition.EntityCondition;
 import org.ofbiz.entity.finder.EntityFinderUtil.GetAll;
 import org.ofbiz.entity.finder.EntityFinderUtil.LimitRange;
@@ -44,8 +48,6 @@
 import org.ofbiz.entity.model.ModelEntity;
 import org.ofbiz.entity.model.ModelFieldTypeReader;
 import org.ofbiz.entity.transaction.TransactionUtil;
-import org.ofbiz.entity.util.EntityFindOptions;
-import org.ofbiz.entity.util.EntityListIterator;
 import org.ofbiz.entity.util.EntityUtil;
 import org.w3c.dom.Element;
 
@@ -121,7 +123,7 @@
         String filterByDateStr = this.filterByDateStrExdr.expandString(context);
         String distinctStr = this.distinctStrExdr.expandString(context);
         String delegatorName = this.delegatorNameExdr.expandString(context);
-        ModelEntity modelEntity = delegator.getModelEntity(entityName);
+        ModelEntityInterface modelEntity = delegator.getModelEntity(entityName);
         String resultSetTypeString = this.resultSetTypeExdr.expandString(context);
 
         if (modelEntity == null) {
@@ -136,11 +138,11 @@
             resultSetType = ResultSet.TYPE_FORWARD_ONLY;
 
         if (delegatorName != null && delegatorName.length() > 0) {
-            delegator = GenericDelegator.getGenericDelegator(delegatorName);
+            delegator = GenericDelegatorImpl.getGenericDelegator(delegatorName);
         }
 
-        EntityCondition whereEntityCondition = getWhereEntityCondition(context, modelEntity, delegator.getModelFieldTypeReader(modelEntity));
-        EntityCondition havingEntityCondition = getHavingEntityCondition(context, modelEntity, delegator.getModelFieldTypeReader(modelEntity));
+        EntityCondition whereEntityCondition = getWhereEntityCondition(context, (ModelEntity) modelEntity, ((GenericDelegatorImpl) delegator).getModelFieldTypeReader((ModelEntity) modelEntity));
+        EntityCondition havingEntityCondition = getHavingEntityCondition(context, (ModelEntity) modelEntity, ((GenericDelegatorImpl) delegator).getModelFieldTypeReader((ModelEntity) modelEntity));
         if (useCache) {
             // if useCache == true && outputHandler instanceof UseIterator, throw exception; not a valid combination
             if (outputHandler instanceof UseIterator) {

Modified: ofbiz/branches/executioncontext20090716/framework/entity/src/org/ofbiz/entity/serialize/XmlSerializer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/entity/src/org/ofbiz/entity/serialize/XmlSerializer.java?rev=796165&r1=796164&r2=796165&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/entity/src/org/ofbiz/entity/serialize/XmlSerializer.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/entity/src/org/ofbiz/entity/serialize/XmlSerializer.java Tue Jul 21 06:48:16 2009
@@ -43,14 +43,14 @@
 
 import javax.xml.parsers.ParserConfigurationException;
 
-import org.ofbiz.base.util.UtilMisc;
-import org.ofbiz.base.util.UtilXml;
 import org.ofbiz.base.util.Debug;
-import org.ofbiz.base.util.UtilObject;
 import org.ofbiz.base.util.StringUtil;
-import org.ofbiz.entity.GenericDelegator;
-import org.ofbiz.entity.GenericPK;
-import org.ofbiz.entity.GenericValue;
+import org.ofbiz.base.util.UtilMisc;
+import org.ofbiz.base.util.UtilObject;
+import org.ofbiz.base.util.UtilXml;
+import org.ofbiz.context.entity.GenericDelegator;
+import org.ofbiz.context.entity.GenericPK;
+import org.ofbiz.context.entity.GenericValue;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;

Modified: ofbiz/branches/executioncontext20090716/framework/minilang/src/org/ofbiz/minilang/SimpleMethod.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/minilang/src/org/ofbiz/minilang/SimpleMethod.java?rev=796165&r1=796164&r2=796165&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/minilang/src/org/ofbiz/minilang/SimpleMethod.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/minilang/src/org/ofbiz/minilang/SimpleMethod.java Tue Jul 21 06:48:16 2009
@@ -45,8 +45,8 @@
 import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.base.util.UtilXml;
 import org.ofbiz.base.util.cache.UtilCache;
-import org.ofbiz.entity.GenericEntity;
-import org.ofbiz.entity.GenericValue;
+import org.ofbiz.context.entity.GenericValue;
+import org.ofbiz.entity.GenericEntityImpl;
 import org.ofbiz.entity.transaction.GenericTransactionException;
 import org.ofbiz.entity.transaction.TransactionUtil;
 import org.ofbiz.minilang.method.MethodContext;
@@ -58,14 +58,14 @@
 import org.ofbiz.minilang.method.callops.SetServiceFields;
 import org.ofbiz.minilang.method.conditional.MasterIf;
 import org.ofbiz.minilang.method.conditional.While;
-import org.ofbiz.minilang.method.entityops.GetRelated;
-import org.ofbiz.minilang.method.entityops.GetRelatedOne;
 import org.ofbiz.minilang.method.entityops.EntityAnd;
 import org.ofbiz.minilang.method.entityops.EntityCondition;
 import org.ofbiz.minilang.method.entityops.EntityCount;
 import org.ofbiz.minilang.method.entityops.EntityOne;
 import org.ofbiz.minilang.method.entityops.FindByAnd;
 import org.ofbiz.minilang.method.entityops.FindByPrimaryKey;
+import org.ofbiz.minilang.method.entityops.GetRelated;
+import org.ofbiz.minilang.method.entityops.GetRelatedOne;
 import org.ofbiz.minilang.method.entityops.MakeValue;
 import org.ofbiz.minilang.method.envops.Iterate;
 import org.ofbiz.minilang.method.envops.IterateMap;
@@ -82,7 +82,6 @@
 import org.ofbiz.service.ModelService;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
-
 import org.webslinger.invoker.Wrap;
 
 /**
@@ -632,8 +631,8 @@
     /** Execute the Simple Method operations */
     public String exec(MethodContext methodContext) {
         // always put the null field object in as "null"
-        methodContext.putEnv("null", GenericEntity.NULL_FIELD);
-        methodContext.putEnv("nullField", GenericEntity.NULL_FIELD);
+        methodContext.putEnv("null", GenericEntityImpl.NULL_FIELD);
+        methodContext.putEnv("nullField", GenericEntityImpl.NULL_FIELD);
 
         methodContext.putEnv(delegatorName, methodContext.getDelegator());
         methodContext.putEnv(securityName, methodContext.getSecurity());

Modified: ofbiz/branches/executioncontext20090716/framework/minilang/src/org/ofbiz/minilang/SimpleServiceEngine.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/minilang/src/org/ofbiz/minilang/SimpleServiceEngine.java?rev=796165&r1=796164&r2=796165&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/minilang/src/org/ofbiz/minilang/SimpleServiceEngine.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/minilang/src/org/ofbiz/minilang/SimpleServiceEngine.java Tue Jul 21 06:48:16 2009
@@ -20,8 +20,8 @@
 
 import java.util.Map;
 
+import org.ofbiz.context.service.GenericServiceException;
 import org.ofbiz.service.DispatchContext;
-import org.ofbiz.service.GenericServiceException;
 import org.ofbiz.service.ModelService;
 import org.ofbiz.service.ServiceDispatcher;
 import org.ofbiz.service.engine.GenericAsyncEngine;

Modified: ofbiz/branches/executioncontext20090716/framework/minilang/src/org/ofbiz/minilang/method/MethodContext.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/minilang/src/org/ofbiz/minilang/method/MethodContext.java?rev=796165&r1=796164&r2=796165&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/minilang/src/org/ofbiz/minilang/method/MethodContext.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/minilang/src/org/ofbiz/minilang/method/MethodContext.java Tue Jul 21 06:48:16 2009
@@ -28,17 +28,17 @@
 
 import javolution.util.FastMap;
 
-import org.ofbiz.base.util.UtilMisc;
 import org.ofbiz.base.util.UtilHttp;
+import org.ofbiz.base.util.UtilMisc;
 import org.ofbiz.base.util.collections.FlexibleMapAccessor;
 import org.ofbiz.base.util.string.FlexibleStringExpander;
-import org.ofbiz.entity.GenericDelegator;
-import org.ofbiz.entity.GenericValue;
+import org.ofbiz.context.entity.GenericDelegator;
+import org.ofbiz.context.entity.GenericValue;
+import org.ofbiz.context.service.LocalDispatcher;
 import org.ofbiz.minilang.SimpleMethod;
 import org.ofbiz.security.Security;
 import org.ofbiz.security.authz.Authorization;
 import org.ofbiz.service.DispatchContext;
-import org.ofbiz.service.LocalDispatcher;
 
 /**
  * A single operation, does the specified operation on the given field

Modified: ofbiz/branches/executioncontext20090716/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCondition.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCondition.java?rev=796165&r1=796164&r2=796165&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCondition.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCondition.java Tue Jul 21 06:48:16 2009
@@ -20,7 +20,7 @@
 
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.GeneralException;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.context.entity.GenericDelegator;
 import org.ofbiz.entity.finder.ByConditionFinder;
 import org.ofbiz.minilang.SimpleMethod;
 import org.ofbiz.minilang.method.MethodContext;

Modified: ofbiz/branches/executioncontext20090716/framework/security/src/org/ofbiz/security/Security.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/security/src/org/ofbiz/security/Security.java?rev=796165&r1=796164&r2=796165&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/security/src/org/ofbiz/security/Security.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/security/src/org/ofbiz/security/Security.java Tue Jul 21 06:48:16 2009
@@ -24,8 +24,8 @@
 import javax.servlet.http.HttpSession;
 
 import org.ofbiz.base.util.cache.UtilCache;
-import org.ofbiz.entity.GenericDelegator;
-import org.ofbiz.entity.GenericValue;
+import org.ofbiz.context.entity.GenericDelegator;
+import org.ofbiz.context.entity.GenericValue;
 
 /**
  * Security handler: This class is an abstract implementation for all commononly used security aspects.

Modified: ofbiz/branches/executioncontext20090716/framework/security/src/org/ofbiz/security/SecurityFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/security/src/org/ofbiz/security/SecurityFactory.java?rev=796165&r1=796164&r2=796165&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/security/src/org/ofbiz/security/SecurityFactory.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/security/src/org/ofbiz/security/SecurityFactory.java Tue Jul 21 06:48:16 2009
@@ -23,7 +23,7 @@
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.UtilProperties;
 import org.ofbiz.base.util.UtilValidate;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.context.entity.GenericDelegator;
 import org.w3c.dom.Element;
 
 /**

Modified: ofbiz/branches/executioncontext20090716/framework/security/src/org/ofbiz/security/authz/Authorization.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/security/src/org/ofbiz/security/authz/Authorization.java?rev=796165&r1=796164&r2=796165&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/security/src/org/ofbiz/security/authz/Authorization.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/security/src/org/ofbiz/security/authz/Authorization.java Tue Jul 21 06:48:16 2009
@@ -22,7 +22,7 @@
 
 import javax.servlet.http.HttpSession;
 
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.context.entity.GenericDelegator;
 
 public interface Authorization {
 

Modified: ofbiz/branches/executioncontext20090716/framework/security/src/org/ofbiz/security/authz/AuthorizationFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/security/src/org/ofbiz/security/authz/AuthorizationFactory.java?rev=796165&r1=796164&r2=796165&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/security/src/org/ofbiz/security/authz/AuthorizationFactory.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/security/src/org/ofbiz/security/authz/AuthorizationFactory.java Tue Jul 21 06:48:16 2009
@@ -23,7 +23,7 @@
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.UtilProperties;
 import org.ofbiz.base.util.UtilValidate;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.context.entity.GenericDelegator;
 import org.ofbiz.security.SecurityConfigurationException;
 import org.w3c.dom.Element;
 

Modified: ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/DispatchContext.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/DispatchContext.java?rev=796165&r1=796164&r2=796165&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/DispatchContext.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/DispatchContext.java Tue Jul 21 06:48:16 2009
@@ -33,12 +33,12 @@
 import org.ofbiz.base.config.GenericConfigException;
 import org.ofbiz.base.config.MainResourceHandler;
 import org.ofbiz.base.config.ResourceHandler;
-import org.ofbiz.context.service.GenericServiceException;
-import org.ofbiz.context.service.LocalDispatcher;
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.UtilXml;
 import org.ofbiz.base.util.cache.UtilCache;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.context.entity.GenericDelegator;
+import org.ofbiz.context.service.GenericServiceException;
+import org.ofbiz.context.service.LocalDispatcher;
 import org.ofbiz.security.Security;
 import org.ofbiz.security.authz.Authorization;
 import org.ofbiz.service.config.ServiceConfigUtil;

Modified: ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/GenericAbstractDispatcher.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/GenericAbstractDispatcher.java?rev=796165&r1=796164&r2=796165&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/GenericAbstractDispatcher.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/GenericAbstractDispatcher.java Tue Jul 21 06:48:16 2009
@@ -23,14 +23,17 @@
 
 import javax.transaction.xa.XAException;
 
-import org.ofbiz.service.calendar.RecurrenceRule;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.base.util.Debug;
+import org.ofbiz.context.entity.GenericDelegator;
+import org.ofbiz.context.service.GenericServiceCallback;
+import org.ofbiz.context.service.GenericServiceException;
+import org.ofbiz.context.service.JobManagerException;
+import org.ofbiz.context.service.LocalDispatcher;
 import org.ofbiz.security.Security;
 import org.ofbiz.security.authz.Authorization;
+import org.ofbiz.service.calendar.RecurrenceRule;
 import org.ofbiz.service.jms.JmsListenerFactory;
 import org.ofbiz.service.job.JobManager;
-import org.ofbiz.service.job.JobManagerException;
-import org.ofbiz.base.util.Debug;
 
 /**
  * Generic Services Local Dispatcher

Modified: ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/GenericDispatcher.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/GenericDispatcher.java?rev=796165&r1=796164&r2=796165&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/GenericDispatcher.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/GenericDispatcher.java Tue Jul 21 06:48:16 2009
@@ -26,7 +26,11 @@
 import javolution.util.FastMap;
 
 import org.ofbiz.base.util.Debug;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.context.entity.GenericDelegator;
+import org.ofbiz.context.service.GenericRequester;
+import org.ofbiz.context.service.GenericResultWaiter;
+import org.ofbiz.context.service.GenericServiceException;
+import org.ofbiz.context.service.LocalDispatcher;
 
 /**
  * Generic Services Local Dispatcher

Modified: ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/ServiceAuthException.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/ServiceAuthException.java?rev=796165&r1=796164&r2=796165&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/ServiceAuthException.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/ServiceAuthException.java Tue Jul 21 06:48:16 2009
@@ -18,9 +18,12 @@
  *******************************************************************************/
 package org.ofbiz.service;
 
+import org.ofbiz.context.service.GenericServiceException;
+
 /**
  * ServiceAuthException
  */
+@SuppressWarnings("serial")
 public class ServiceAuthException extends GenericServiceException {
 
     public ServiceAuthException() {

Modified: ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/ServiceDispatcher.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/ServiceDispatcher.java?rev=796165&r1=796164&r2=796165&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/ServiceDispatcher.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/ServiceDispatcher.java Tue Jul 21 06:48:16 2009
@@ -21,6 +21,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+
 import javax.transaction.Transaction;
 
 import javolution.util.FastList;
@@ -34,9 +35,15 @@
 import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.base.util.UtilXml;
 import org.ofbiz.base.util.collections.LRUMap;
-import org.ofbiz.entity.GenericDelegator;
-import org.ofbiz.entity.GenericEntityException;
-import org.ofbiz.entity.GenericValue;
+import org.ofbiz.context.entity.GenericDelegator;
+import org.ofbiz.context.entity.GenericEntityException;
+import org.ofbiz.context.entity.GenericValue;
+import org.ofbiz.context.service.GenericRequester;
+import org.ofbiz.context.service.GenericServiceCallback;
+import org.ofbiz.context.service.GenericServiceException;
+import org.ofbiz.context.service.JobManagerException;
+import org.ofbiz.context.service.LocalDispatcher;
+import org.ofbiz.entity.GenericDelegatorImpl;
 import org.ofbiz.entity.transaction.DebugXaResource;
 import org.ofbiz.entity.transaction.GenericTransactionException;
 import org.ofbiz.entity.transaction.TransactionUtil;
@@ -53,7 +60,6 @@
 import org.ofbiz.service.group.ServiceGroupReader;
 import org.ofbiz.service.jms.JmsListenerFactory;
 import org.ofbiz.service.job.JobManager;
-import org.ofbiz.service.job.JobManagerException;
 import org.ofbiz.service.semaphore.ServiceSemaphore;
 import org.w3c.dom.Element;
 
@@ -104,7 +110,7 @@
         try {
             GenericDelegator origDelegator = this.delegator;
             if (!this.delegator.getOriginalDelegatorName().equals(this.delegator.getDelegatorName())) {
-                origDelegator = GenericDelegator.getGenericDelegator(this.delegator.getOriginalDelegatorName());
+                origDelegator = GenericDelegatorImpl.getGenericDelegator(this.delegator.getOriginalDelegatorName());
             }
             this.jm = JobManager.getInstance(origDelegator, enableJM);
         } catch (GeneralRuntimeException e) {

Modified: ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/ServiceUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/ServiceUtil.java?rev=796165&r1=796164&r2=796165&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/ServiceUtil.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/ServiceUtil.java Tue Jul 21 06:48:16 2009
@@ -19,7 +19,6 @@
 package org.ofbiz.service;
 
 import java.sql.Timestamp;
-import com.ibm.icu.util.Calendar;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
@@ -37,19 +36,21 @@
 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.GenericEntityException;
-import org.ofbiz.entity.GenericValue;
+import org.ofbiz.context.entity.EntityFindOptions;
+import org.ofbiz.context.entity.EntityListIterator;
+import org.ofbiz.context.entity.GenericDelegator;
+import org.ofbiz.context.entity.GenericEntityException;
+import org.ofbiz.context.entity.GenericValue;
 import org.ofbiz.entity.condition.EntityCondition;
 import org.ofbiz.entity.condition.EntityExpr;
 import org.ofbiz.entity.condition.EntityOperator;
 import org.ofbiz.entity.transaction.GenericTransactionException;
 import org.ofbiz.entity.transaction.TransactionUtil;
-import org.ofbiz.entity.util.EntityFindOptions;
-import org.ofbiz.entity.util.EntityListIterator;
 import org.ofbiz.security.Security;
 import org.ofbiz.service.config.ServiceConfigUtil;
 
+import com.ibm.icu.util.Calendar;
+
 /**
  * Generic Service Utility Class
  */

Modified: ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/calendar/RecurrenceInfo.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/calendar/RecurrenceInfo.java?rev=796165&r1=796164&r2=796165&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/calendar/RecurrenceInfo.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/calendar/RecurrenceInfo.java Tue Jul 21 06:48:16 2009
@@ -19,7 +19,6 @@
 package org.ofbiz.service.calendar;
 
 import java.util.ArrayList;
-import com.ibm.icu.util.Calendar;
 import java.util.Collections;
 import java.util.Date;
 import java.util.Iterator;
@@ -28,10 +27,11 @@
 import org.ofbiz.base.util.Debug;
 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.GenericEntityException;
-import org.ofbiz.entity.GenericValue;
+import org.ofbiz.context.entity.GenericDelegator;
+import org.ofbiz.context.entity.GenericEntityException;
+import org.ofbiz.context.entity.GenericValue;
+
+import com.ibm.icu.util.Calendar;
 
 /**
  * Recurrence Info Object

Modified: ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/calendar/RecurrenceRule.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/calendar/RecurrenceRule.java?rev=796165&r1=796164&r2=796165&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/calendar/RecurrenceRule.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/calendar/RecurrenceRule.java Tue Jul 21 06:48:16 2009
@@ -19,7 +19,6 @@
 package org.ofbiz.service.calendar;
 
 import java.util.Arrays;
-import com.ibm.icu.util.Calendar;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
@@ -27,9 +26,11 @@
 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.GenericEntityException;
-import org.ofbiz.entity.GenericValue;
+import org.ofbiz.context.entity.GenericDelegator;
+import org.ofbiz.context.entity.GenericEntityException;
+import org.ofbiz.context.entity.GenericValue;
+
+import com.ibm.icu.util.Calendar;
 
 /**
  * Recurrence Rule Object

Modified: ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/calendar/TemporalExpressionWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/calendar/TemporalExpressionWorker.java?rev=796165&r1=796164&r2=796165&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/calendar/TemporalExpressionWorker.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/calendar/TemporalExpressionWorker.java Tue Jul 21 06:48:16 2009
@@ -18,19 +18,20 @@
  *******************************************************************************/
 package org.ofbiz.service.calendar;
 
-import com.ibm.icu.util.Calendar;
 import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
 
 import org.ofbiz.base.util.UtilMisc;
 import org.ofbiz.base.util.UtilValidate;
-import org.ofbiz.entity.GenericDelegator;
-import org.ofbiz.entity.GenericEntityException;
-import org.ofbiz.entity.GenericValue;
+import org.ofbiz.context.entity.GenericDelegator;
+import org.ofbiz.context.entity.GenericEntityException;
+import org.ofbiz.context.entity.GenericValue;
 import org.ofbiz.entity.condition.EntityCondition;
 import org.ofbiz.entity.util.EntityUtil;
 
+import com.ibm.icu.util.Calendar;
+
 /** TemporalExpression persistence worker. */
 public class TemporalExpressionWorker {
 

Modified: ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/eca/ServiceEcaAction.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/eca/ServiceEcaAction.java?rev=796165&r1=796164&r2=796165&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/eca/ServiceEcaAction.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/eca/ServiceEcaAction.java Tue Jul 21 06:48:16 2009
@@ -18,26 +18,29 @@
  *******************************************************************************/
 package org.ofbiz.service.eca;
 
-import java.util.*;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
 import javax.transaction.xa.XAException;
 
 import javolution.util.FastMap;
 
+import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.UtilGenerics;
-import org.ofbiz.base.util.UtilMisc;
 import org.ofbiz.base.util.UtilValidate;
-import org.ofbiz.base.util.Debug;
+import org.ofbiz.context.service.GenericServiceException;
+import org.ofbiz.context.service.LocalDispatcher;
 import org.ofbiz.service.DispatchContext;
-import org.ofbiz.service.GenericServiceException;
-import org.ofbiz.service.LocalDispatcher;
 import org.ofbiz.service.ModelService;
-import org.ofbiz.service.ServiceXaWrapper;
 import org.ofbiz.service.ServiceUtil;
+import org.ofbiz.service.ServiceXaWrapper;
 import org.w3c.dom.Element;
 
 /**
  * ServiceEcaAction
  */
+@SuppressWarnings("serial")
 public class ServiceEcaAction implements java.io.Serializable {
 
     public static final String module = ServiceEcaAction.class.getName();

Modified: ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/eca/ServiceEcaCondition.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/eca/ServiceEcaCondition.java?rev=796165&r1=796164&r2=796165&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/eca/ServiceEcaCondition.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/eca/ServiceEcaCondition.java Tue Jul 21 06:48:16 2009
@@ -27,15 +27,16 @@
 import org.ofbiz.base.util.UtilGenerics;
 import org.ofbiz.base.util.UtilMisc;
 import org.ofbiz.base.util.UtilValidate;
+import org.ofbiz.context.service.GenericServiceException;
+import org.ofbiz.context.service.LocalDispatcher;
 import org.ofbiz.service.DispatchContext;
-import org.ofbiz.service.GenericServiceException;
-import org.ofbiz.service.LocalDispatcher;
 import org.ofbiz.service.ServiceUtil;
 import org.w3c.dom.Element;
 
 /**
  * ServiceEcaCondition
  */
+@SuppressWarnings("serial")
 public class ServiceEcaCondition implements java.io.Serializable {
 
     public static final String module = ServiceEcaCondition.class.getName();

Modified: ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/eca/ServiceEcaRule.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/eca/ServiceEcaRule.java?rev=796165&r1=796164&r2=796165&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/eca/ServiceEcaRule.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/eca/ServiceEcaRule.java Tue Jul 21 06:48:16 2009
@@ -28,8 +28,8 @@
 import org.ofbiz.base.util.UtilMisc;
 import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.base.util.UtilXml;
+import org.ofbiz.context.service.GenericServiceException;
 import org.ofbiz.service.DispatchContext;
-import org.ofbiz.service.GenericServiceException;
 import org.w3c.dom.Element;
 
 /**

Modified: ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/eca/ServiceEcaUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/eca/ServiceEcaUtil.java?rev=796165&r1=796164&r2=796165&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/eca/ServiceEcaUtil.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/eca/ServiceEcaUtil.java Tue Jul 21 06:48:16 2009
@@ -33,8 +33,8 @@
 import org.ofbiz.base.config.ResourceHandler;
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.UtilXml;
+import org.ofbiz.context.service.GenericServiceException;
 import org.ofbiz.service.DispatchContext;
-import org.ofbiz.service.GenericServiceException;
 import org.ofbiz.service.config.ServiceConfigUtil;
 import org.w3c.dom.Element;
 

Modified: ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/engine/AbstractEngine.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/engine/AbstractEngine.java?rev=796165&r1=796164&r2=796165&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/engine/AbstractEngine.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/engine/AbstractEngine.java Tue Jul 21 06:48:16 2009
@@ -18,21 +18,20 @@
  *******************************************************************************/
 package org.ofbiz.service.engine;
 
-import java.util.Map;
-import java.util.List;
 import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 
 import javolution.util.FastMap;
 
-import org.ofbiz.service.ServiceDispatcher;
-import org.ofbiz.service.ModelService;
-import org.ofbiz.service.GenericServiceException;
-import org.ofbiz.service.GenericServiceCallback;
-import org.ofbiz.service.config.ServiceConfigUtil;
 import org.ofbiz.base.config.GenericConfigException;
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.UtilXml;
-
+import org.ofbiz.context.service.GenericServiceCallback;
+import org.ofbiz.context.service.GenericServiceException;
+import org.ofbiz.service.ModelService;
+import org.ofbiz.service.ServiceDispatcher;
+import org.ofbiz.service.config.ServiceConfigUtil;
 import org.w3c.dom.Element;
 
 /**

Modified: ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/engine/GenericAsyncEngine.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/engine/GenericAsyncEngine.java?rev=796165&r1=796164&r2=796165&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/engine/GenericAsyncEngine.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/engine/GenericAsyncEngine.java Tue Jul 21 06:48:16 2009
@@ -21,27 +21,25 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
 import java.util.Map;
 
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.UtilDateTime;
 import org.ofbiz.base.util.UtilMisc;
 import org.ofbiz.base.util.UtilValidate;
-import org.ofbiz.entity.GenericEntityException;
-import org.ofbiz.entity.GenericValue;
+import org.ofbiz.context.entity.GenericEntityException;
+import org.ofbiz.context.entity.GenericValue;
+import org.ofbiz.context.service.GenericRequester;
+import org.ofbiz.context.service.GenericServiceException;
+import org.ofbiz.context.service.JobManagerException;
 import org.ofbiz.entity.serialize.SerializeException;
 import org.ofbiz.entity.serialize.XmlSerializer;
 import org.ofbiz.service.DispatchContext;
-import org.ofbiz.service.GenericRequester;
-import org.ofbiz.service.GenericServiceException;
 import org.ofbiz.service.ModelService;
 import org.ofbiz.service.ServiceDispatcher;
 import org.ofbiz.service.config.ServiceConfigUtil;
 import org.ofbiz.service.job.GenericServiceJob;
 import org.ofbiz.service.job.Job;
-import org.ofbiz.service.job.JobManagerException;
 import org.ofbiz.service.job.JobManager;
 
 /**

Modified: ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/engine/GenericEngine.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/engine/GenericEngine.java?rev=796165&r1=796164&r2=796165&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/engine/GenericEngine.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/engine/GenericEngine.java Tue Jul 21 06:48:16 2009
@@ -20,8 +20,8 @@
 
 import java.util.Map;
 
-import org.ofbiz.service.GenericRequester;
-import org.ofbiz.service.GenericServiceException;
+import org.ofbiz.context.service.GenericRequester;
+import org.ofbiz.context.service.GenericServiceException;
 import org.ofbiz.service.ModelService;
 
 /**

Modified: ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/engine/GenericEngineFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/engine/GenericEngineFactory.java?rev=796165&r1=796164&r2=796165&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/engine/GenericEngineFactory.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/engine/GenericEngineFactory.java Tue Jul 21 06:48:16 2009
@@ -24,10 +24,10 @@
 import javolution.util.FastMap;
 
 import org.ofbiz.base.config.GenericConfigException;
-import org.ofbiz.service.GenericServiceException;
+import org.ofbiz.base.util.UtilXml;
+import org.ofbiz.context.service.GenericServiceException;
 import org.ofbiz.service.ServiceDispatcher;
 import org.ofbiz.service.config.ServiceConfigUtil;
-import org.ofbiz.base.util.UtilXml;
 import org.w3c.dom.Element;
 
 /**

Modified: ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/jms/GenericMessageListener.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/jms/GenericMessageListener.java?rev=796165&r1=796164&r2=796165&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/jms/GenericMessageListener.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/jms/GenericMessageListener.java Tue Jul 21 06:48:16 2009
@@ -20,7 +20,7 @@
 
 import javax.jms.MessageListener;
 
-import org.ofbiz.service.GenericServiceException;
+import org.ofbiz.context.service.GenericServiceException;
 
 /**
  * GenericMessageListener - Estension to MessageListener

Modified: ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/jms/JmsListenerFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/jms/JmsListenerFactory.java?rev=796165&r1=796164&r2=796165&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/jms/JmsListenerFactory.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/jms/JmsListenerFactory.java Tue Jul 21 06:48:16 2009
@@ -19,19 +19,16 @@
 package org.ofbiz.service.jms;
 
 import java.lang.reflect.Constructor;
-import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import javolution.util.FastMap;
 
-import org.ofbiz.service.GenericServiceException;
-import org.ofbiz.service.ServiceDispatcher;
-import org.ofbiz.service.config.ServiceConfigUtil;
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.UtilMisc;
 import org.ofbiz.base.util.UtilXml;
+import org.ofbiz.context.service.GenericServiceException;
+import org.ofbiz.service.ServiceDispatcher;
+import org.ofbiz.service.config.ServiceConfigUtil;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 

Modified: ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/job/GenericServiceJob.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/job/GenericServiceJob.java?rev=796165&r1=796164&r2=796165&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/job/GenericServiceJob.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/job/GenericServiceJob.java Tue Jul 21 06:48:16 2009
@@ -21,14 +21,15 @@
 import java.util.Map;
 
 import org.ofbiz.base.util.Debug;
+import org.ofbiz.context.service.GenericRequester;
+import org.ofbiz.context.service.LocalDispatcher;
 import org.ofbiz.service.DispatchContext;
-import org.ofbiz.service.GenericRequester;
-import org.ofbiz.service.LocalDispatcher;
 import org.ofbiz.service.ModelService;
 
 /**
  * Generic Service Job - A generic async-service Job.
  */
+@SuppressWarnings("serial")
 public class GenericServiceJob extends AbstractJob {
 
     public static final String module = GenericServiceJob.class.getName();

Modified: ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/job/InvalidJobException.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/job/InvalidJobException.java?rev=796165&r1=796164&r2=796165&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/job/InvalidJobException.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/job/InvalidJobException.java Tue Jul 21 06:48:16 2009
@@ -18,7 +18,7 @@
  *******************************************************************************/
 package org.ofbiz.service.job;
 
-import org.ofbiz.context.JobManagerException;
+import org.ofbiz.context.service.JobManagerException;
 
 public class InvalidJobException extends JobManagerException {
 

Modified: ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/job/JobManager.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/job/JobManager.java?rev=796165&r1=796164&r2=796165&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/job/JobManager.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/job/JobManager.java Tue Jul 21 06:48:16 2009
@@ -27,18 +27,19 @@
 import javolution.util.FastList;
 import javolution.util.FastMap;
 
-import org.ofbiz.context.entity.GenericEntityException;
-import org.ofbiz.context.service.JobManagerException;
-import org.ofbiz.context.service.JobScheduler;
-import org.ofbiz.context.service.LocalDispatcher;
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.GeneralRuntimeException;
 import org.ofbiz.base.util.UtilDateTime;
 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.GenericValue;
+import org.ofbiz.context.entity.GenericDelegator;
+import org.ofbiz.context.entity.GenericEntityException;
+import org.ofbiz.context.entity.GenericValue;
+import org.ofbiz.context.service.JobManagerException;
+import org.ofbiz.context.service.JobScheduler;
+import org.ofbiz.context.service.LocalDispatcher;
+import org.ofbiz.entity.GenericValueImpl;
 import org.ofbiz.entity.condition.EntityCondition;
 import org.ofbiz.entity.condition.EntityConditionList;
 import org.ofbiz.entity.condition.EntityExpr;
@@ -240,7 +241,7 @@
                             if (pJobId == null) {
                                 pJobId = job.getString("jobId");
                             }
-                            GenericValue newJob = GenericValue.create(job);
+                            GenericValue newJob = GenericValueImpl.create(job);
                             newJob.set("statusId", "SERVICE_PENDING");
                             newJob.set("runTime", now);
                             newJob.set("previousJobId", job.getString("jobId"));

Modified: ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/job/PersistedServiceJob.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/job/PersistedServiceJob.java?rev=796165&r1=796164&r2=796165&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/job/PersistedServiceJob.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/job/PersistedServiceJob.java Tue Jul 21 06:48:16 2009
@@ -20,7 +20,6 @@
 
 import java.io.IOException;
 import java.sql.Timestamp;
-import com.ibm.icu.util.Calendar;
 import java.util.Date;
 import java.util.Map;
 
@@ -33,22 +32,25 @@
 import org.ofbiz.base.util.UtilGenerics;
 import org.ofbiz.base.util.UtilProperties;
 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.GenericEntityException;
-import org.ofbiz.entity.GenericValue;
+import org.ofbiz.context.entity.GenericDelegator;
+import org.ofbiz.context.entity.GenericEntityException;
+import org.ofbiz.context.entity.GenericValue;
+import org.ofbiz.context.service.GenericRequester;
+import org.ofbiz.entity.GenericValueImpl;
 import org.ofbiz.entity.condition.EntityCondition;
 import org.ofbiz.entity.condition.EntityFieldMap;
 import org.ofbiz.entity.serialize.SerializeException;
 import org.ofbiz.entity.serialize.XmlSerializer;
 import org.ofbiz.service.DispatchContext;
-import org.ofbiz.service.GenericRequester;
 import org.ofbiz.service.ServiceUtil;
 import org.ofbiz.service.calendar.RecurrenceInfo;
+import org.ofbiz.service.calendar.TemporalExpression;
+import org.ofbiz.service.calendar.TemporalExpressionWorker;
 import org.ofbiz.service.config.ServiceConfigUtil;
 import org.xml.sax.SAXException;
 
+import com.ibm.icu.util.Calendar;
+
 /**
  * Entity Service Job - Store => Schedule => Run
  */
@@ -186,7 +188,7 @@
             if (pJobId == null) {
                 pJobId = job.getString("jobId");
             }
-            GenericValue newJob = GenericValue.create(job);
+            GenericValue newJob = GenericValueImpl.create(job.create());
             newJob.remove("jobId");
             newJob.set("previousJobId", job.getString("jobId"));
             newJob.set("parentJobId", pJobId);

Modified: ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/semaphore/SemaphoreFailException.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/semaphore/SemaphoreFailException.java?rev=796165&r1=796164&r2=796165&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/semaphore/SemaphoreFailException.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/semaphore/SemaphoreFailException.java Tue Jul 21 06:48:16 2009
@@ -1,10 +1,11 @@
 package org.ofbiz.service.semaphore;
 
-import org.ofbiz.service.GenericServiceException;
+import org.ofbiz.context.service.GenericServiceException;
 
 /**
  * SemaphoreFailException
  */
+@SuppressWarnings("serial")
 public class SemaphoreFailException extends GenericServiceException {
 
     public SemaphoreFailException() {

Modified: ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/semaphore/SemaphoreWaitException.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/semaphore/SemaphoreWaitException.java?rev=796165&r1=796164&r2=796165&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/semaphore/SemaphoreWaitException.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/semaphore/SemaphoreWaitException.java Tue Jul 21 06:48:16 2009
@@ -1,10 +1,11 @@
 package org.ofbiz.service.semaphore;
 
-import org.ofbiz.service.GenericServiceException;
+import org.ofbiz.context.service.GenericServiceException;
 
 /**
  * SemaphoreWaitException
  */
+@SuppressWarnings("serial")
 public class SemaphoreWaitException extends GenericServiceException {
 
     public SemaphoreWaitException() {

Modified: ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/semaphore/ServiceSemaphore.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/semaphore/ServiceSemaphore.java?rev=796165&r1=796164&r2=796165&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/semaphore/ServiceSemaphore.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/semaphore/ServiceSemaphore.java Tue Jul 21 06:48:16 2009
@@ -1,22 +1,18 @@
 package org.ofbiz.service.semaphore;
 
+import java.sql.Timestamp;
+
+import javax.transaction.Transaction;
+
 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.GenericEntityException;
-import org.ofbiz.entity.GenericValue;
+import org.ofbiz.context.entity.GenericDelegator;
+import org.ofbiz.context.entity.GenericEntityException;
+import org.ofbiz.context.entity.GenericValue;
 import org.ofbiz.entity.transaction.GenericTransactionException;
-import org.ofbiz.entity.transaction.GenericXaResource;
 import org.ofbiz.entity.transaction.TransactionUtil;
 import org.ofbiz.service.ModelService;
 
-import javax.transaction.Transaction;
-import javax.transaction.xa.Xid;
-import javax.transaction.xa.XAException;
-import java.sql.Timestamp;
-import java.util.Map;
-
 /**
  * ServiceSemaphore
  */