svn commit: r795024 [6/6] - in /ofbiz/branches/executioncontext20090716: ./ applications/content/src/org/ofbiz/content/content/ applications/order/src/org/ofbiz/order/order/ applications/party/src/org/ofbiz/party/party/ applications/product/src/org/ofb...

[jonesde]

Modified: ofbiz/branches/executioncontext20090716/framework/entity/src/org/ofbiz/entity/transaction/TransactionFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/entity/src/org/ofbiz/entity/transaction/TransactionFactory.java?rev=795024&r1=795023&r2=795024&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/entity/src/org/ofbiz/entity/transaction/TransactionFactory.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/entity/src/org/ofbiz/entity/transaction/TransactionFactory.java Fri Jul 17 09:56:47 2009
@@ -20,11 +20,12 @@
 
 import java.sql.Connection;
 import java.sql.SQLException;
+
 import javax.transaction.TransactionManager;
 import javax.transaction.UserTransaction;
 
 import org.ofbiz.base.util.Debug;
-import org.ofbiz.entity.GenericEntityException;
+import org.ofbiz.context.entity.GenericEntityException;
 import org.ofbiz.entity.config.DatasourceInfo;
 import org.ofbiz.entity.config.EntityConfigUtil;
 import org.ofbiz.entity.jdbc.CursorConnection;

Modified: ofbiz/branches/executioncontext20090716/framework/entity/src/org/ofbiz/entity/transaction/TransactionFactoryInterface.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/entity/src/org/ofbiz/entity/transaction/TransactionFactoryInterface.java?rev=795024&r1=795023&r2=795024&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/entity/src/org/ofbiz/entity/transaction/TransactionFactoryInterface.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/entity/src/org/ofbiz/entity/transaction/TransactionFactoryInterface.java Fri Jul 17 09:56:47 2009
@@ -18,10 +18,13 @@
  *******************************************************************************/
 package org.ofbiz.entity.transaction;
 
-import javax.transaction.*;
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.SQLException;
 
-import org.ofbiz.entity.*;
+import javax.transaction.TransactionManager;
+import javax.transaction.UserTransaction;
+
+import org.ofbiz.context.entity.GenericEntityException;
 
 /**
  * TransactionFactory - central source for JTA objects

Modified: ofbiz/branches/executioncontext20090716/framework/entity/src/org/ofbiz/entity/util/DistributedCacheClear.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/entity/src/org/ofbiz/entity/util/DistributedCacheClear.java?rev=795024&r1=795023&r2=795024&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/entity/src/org/ofbiz/entity/util/DistributedCacheClear.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/entity/src/org/ofbiz/entity/util/DistributedCacheClear.java Fri Jul 17 09:56:47 2009
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -15,13 +15,13 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- *******************************************************************************/
+ */
 package org.ofbiz.entity.util;
 
-import org.ofbiz.entity.GenericDelegator;
-import org.ofbiz.entity.GenericEntity;
-import org.ofbiz.entity.GenericPK;
-import org.ofbiz.entity.GenericValue;
+import org.ofbiz.context.entity.GenericDelegator;
+import org.ofbiz.context.entity.GenericEntity;
+import org.ofbiz.context.entity.GenericPK;
+import org.ofbiz.context.entity.GenericValue;
 import org.ofbiz.entity.condition.EntityCondition;
 
 /**

Modified: ofbiz/branches/executioncontext20090716/framework/entity/src/org/ofbiz/entity/util/EntityCrypto.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/entity/src/org/ofbiz/entity/util/EntityCrypto.java?rev=795024&r1=795023&r2=795024&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/entity/src/org/ofbiz/entity/util/EntityCrypto.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/entity/src/org/ofbiz/entity/util/EntityCrypto.java Fri Jul 17 09:56:47 2009
@@ -32,10 +32,10 @@
 import org.ofbiz.base.util.GeneralException;
 import org.ofbiz.base.util.StringUtil;
 import org.ofbiz.base.util.UtilObject;
+import org.ofbiz.context.entity.GenericDelegator;
+import org.ofbiz.context.entity.GenericEntityException;
+import org.ofbiz.context.entity.GenericValue;
 import org.ofbiz.entity.EntityCryptoException;
-import org.ofbiz.entity.GenericDelegator;
-import org.ofbiz.entity.GenericEntityException;
-import org.ofbiz.entity.GenericValue;
 import org.ofbiz.entity.transaction.GenericTransactionException;
 import org.ofbiz.entity.transaction.TransactionUtil;
 

Copied: ofbiz/branches/executioncontext20090716/framework/entity/src/org/ofbiz/entity/util/EntityListIteratorImpl.java (from r794912, ofbiz/branches/executioncontext20090716/framework/entity/src/org/ofbiz/entity/util/EntityListIterator.java)
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/entity/src/org/ofbiz/entity/util/EntityListIteratorImpl.java?p2=ofbiz/branches/executioncontext20090716/framework/entity/src/org/ofbiz/entity/util/EntityListIteratorImpl.java&p1=ofbiz/branches/executioncontext20090716/framework/entity/src/org/ofbiz/entity/util/EntityListIterator.java&r1=794912&r2=795024&rev=795024&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/entity/src/org/ofbiz/entity/util/EntityListIterator.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/entity/src/org/ofbiz/entity/util/EntityListIteratorImpl.java Fri Jul 17 09:56:47 2009
@@ -23,16 +23,17 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.List;
-import java.util.ListIterator;
 
 import javolution.util.FastList;
 
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.GeneralRuntimeException;
-import org.ofbiz.entity.GenericDelegator;
-import org.ofbiz.entity.GenericEntityException;
+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.GenericResultSetClosedException;
-import org.ofbiz.entity.GenericValue;
+import org.ofbiz.entity.GenericValueImpl;
 import org.ofbiz.entity.jdbc.SQLProcessor;
 import org.ofbiz.entity.jdbc.SqlJdbcUtil;
 import org.ofbiz.entity.model.ModelEntity;
@@ -43,10 +44,10 @@
 /**
  * Generic Entity Cursor List Iterator for Handling Cursored DB Results
  */
-public class EntityListIterator implements ListIterator<GenericValue> {
+public class EntityListIteratorImpl implements EntityListIterator {
 
     /** Module Name Used for debugging */
-    public static final String module = EntityListIterator.class.getName();
+    public static final String module = EntityListIteratorImpl.class.getName();
 
     protected SQLProcessor sqlp;
     protected ResultSet resultSet;
@@ -59,7 +60,7 @@
 
     private boolean haveShowHasNextWarning = false;
 
-    public EntityListIterator(SQLProcessor sqlp, ModelEntity modelEntity, List<ModelField> selectFields, ModelFieldTypeReader modelFieldTypeReader) {
+    public EntityListIteratorImpl(SQLProcessor sqlp, ModelEntity modelEntity, List<ModelField> selectFields, ModelFieldTypeReader modelFieldTypeReader) {
         this.sqlp = sqlp;
         this.resultSet = sqlp.getResultSet();
         this.modelEntity = modelEntity;
@@ -67,7 +68,7 @@
         this.modelFieldTypeReader = modelFieldTypeReader;
     }
 
-    public EntityListIterator(ResultSet resultSet, ModelEntity modelEntity, List<ModelField> selectFields, ModelFieldTypeReader modelFieldTypeReader) {
+    public EntityListIteratorImpl(ResultSet resultSet, ModelEntity modelEntity, List<ModelField> selectFields, ModelFieldTypeReader modelFieldTypeReader) {
         this.sqlp = null;
         this.resultSet = resultSet;
         this.modelEntity = modelEntity;
@@ -156,7 +157,7 @@
     public GenericValue currentGenericValue() throws GenericEntityException {
         if (closed) throw new GenericResultSetClosedException("This EntityListIterator has been closed, this operation cannot be performed");
 
-        GenericValue value = GenericValue.create(modelEntity);
+        GenericValue value = GenericValueImpl.create(modelEntity);
 
         for (int j = 0; j < selectFields.size(); j++) {
             ModelField curField = selectFields.get(j);

Modified: ofbiz/branches/executioncontext20090716/framework/entity/src/org/ofbiz/entity/util/EntityUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/entity/src/org/ofbiz/entity/util/EntityUtil.java?rev=795024&r1=795023&r2=795024&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/entity/src/org/ofbiz/entity/util/EntityUtil.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/entity/src/org/ofbiz/entity/util/EntityUtil.java Fri Jul 17 09:56:47 2009
@@ -37,10 +37,10 @@
 import org.ofbiz.base.util.UtilGenerics;
 import org.ofbiz.base.util.UtilMisc;
 import org.ofbiz.base.util.UtilValidate;
-import org.ofbiz.entity.GenericDelegator;
-import org.ofbiz.entity.GenericEntity;
-import org.ofbiz.entity.GenericEntityException;
-import org.ofbiz.entity.GenericValue;
+import org.ofbiz.context.entity.GenericDelegator;
+import org.ofbiz.context.entity.GenericEntity;
+import org.ofbiz.context.entity.GenericEntityException;
+import org.ofbiz.context.entity.GenericValue;
 import org.ofbiz.entity.condition.EntityCondition;
 import org.ofbiz.entity.condition.EntityDateFilterCondition;
 import org.ofbiz.entity.condition.OrderByList;

Modified: ofbiz/branches/executioncontext20090716/framework/entity/src/org/ofbiz/entity/util/SequenceUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/entity/src/org/ofbiz/entity/util/SequenceUtil.java?rev=795024&r1=795023&r2=795024&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/entity/src/org/ofbiz/entity/util/SequenceUtil.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/entity/src/org/ofbiz/entity/util/SequenceUtil.java Fri Jul 17 09:56:47 2009
@@ -28,7 +28,7 @@
 import javax.transaction.Transaction;
 
 import org.ofbiz.base.util.Debug;
-import org.ofbiz.entity.GenericEntityException;
+import org.ofbiz.context.entity.GenericEntityException;
 import org.ofbiz.entity.jdbc.ConnectionFactory;
 import org.ofbiz.entity.model.ModelEntity;
 import org.ofbiz.entity.model.ModelField;

Modified: ofbiz/branches/executioncontext20090716/framework/entityext/src/org/ofbiz/entityext/eca/DelegatorEcaHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/entityext/src/org/ofbiz/entityext/eca/DelegatorEcaHandler.java?rev=795024&r1=795023&r2=795024&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/entityext/src/org/ofbiz/entityext/eca/DelegatorEcaHandler.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/entityext/src/org/ofbiz/entityext/eca/DelegatorEcaHandler.java Fri Jul 17 09:56:47 2009
@@ -24,11 +24,10 @@
 import java.util.TreeSet;
 
 import org.ofbiz.base.util.Debug;
-import static org.ofbiz.base.util.UtilGenerics.checkList;
-import org.ofbiz.entity.GenericDelegator;
-import org.ofbiz.entity.GenericEntity;
-import org.ofbiz.entity.GenericEntityException;
-import org.ofbiz.entity.eca.EntityEcaHandler;
+import org.ofbiz.context.entity.EntityEcaHandler;
+import org.ofbiz.context.entity.GenericDelegator;
+import org.ofbiz.context.entity.GenericEntity;
+import org.ofbiz.context.entity.GenericEntityException;
 import org.ofbiz.entityext.EntityServiceFactory;
 import org.ofbiz.service.DispatchContext;
 

Modified: ofbiz/branches/executioncontext20090716/framework/service/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/service/build.xml?rev=795024&r1=795023&r2=795024&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/service/build.xml (original)
+++ ofbiz/branches/executioncontext20090716/framework/service/build.xml Fri Jul 17 09:56:47 2009
@@ -36,6 +36,7 @@
         <fileset dir="../base/lib/j2eespecs" includes="*.jar"/>
         <fileset dir="../base/lib/scripting" includes="*.jar"/>
         <fileset dir="../base/build/lib" includes="*.jar"/>
+        <fileset dir="../context/build/lib" includes="*.jar"/>
         <fileset dir="../entity/lib" includes="*.jar"/>
         <fileset dir="../entity/build/lib" includes="*.jar"/>
         <fileset dir="../security/build/lib" includes="*.jar"/>

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=795024&r1=795023&r2=795024&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 Fri Jul 17 09:56:47 2009
@@ -21,11 +21,10 @@
 import java.io.Serializable;
 import java.net.URL;
 import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
+
 import javax.wsdl.WSDLException;
 
 import javolution.util.FastMap;
@@ -34,6 +33,8 @@
 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;
@@ -42,13 +43,13 @@
 import org.ofbiz.security.authz.Authorization;
 import org.ofbiz.service.config.ServiceConfigUtil;
 import org.ofbiz.service.eca.ServiceEcaUtil;
-
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
 /**
  * Dispatcher Context
  */
+@SuppressWarnings("serial")
 public class DispatchContext implements Serializable {
 
     public static final String module = DispatchContext.class.getName();

Modified: ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/ModelService.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/ModelService.java?rev=795024&r1=795023&r2=795024&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/ModelService.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/ModelService.java Fri Jul 17 09:56:47 2009
@@ -55,6 +55,8 @@
 import javolution.util.FastList;
 import javolution.util.FastMap;
 
+import org.ofbiz.context.service.GenericServiceException;
+import org.ofbiz.context.service.LocalDispatcher;
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.GeneralException;
 import org.ofbiz.base.util.ObjectType;

Modified: ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/ServiceValidationException.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/ServiceValidationException.java?rev=795024&r1=795023&r2=795024&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/ServiceValidationException.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/service/src/org/ofbiz/service/ServiceValidationException.java Fri Jul 17 09:56:47 2009
@@ -18,14 +18,16 @@
  *******************************************************************************/
 package org.ofbiz.service;
 
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 
+import org.ofbiz.context.service.GenericServiceException;
 import org.ofbiz.base.util.UtilValidate;
 
 /**
  * ServiceValidationException
  */
+@SuppressWarnings("serial")
 public class ServiceValidationException extends GenericServiceException {
 
     protected List<String> messages = new ArrayList<String>();

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=795024&r1=795023&r2=795024&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 Fri Jul 17 09:56:47 2009
@@ -18,6 +18,8 @@
  *******************************************************************************/
 package org.ofbiz.service.job;
 
+import org.ofbiz.context.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=795024&r1=795023&r2=795024&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 Fri Jul 17 09:56:47 2009
@@ -27,6 +27,10 @@
 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;
@@ -34,7 +38,6 @@
 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.entity.condition.EntityCondition;
 import org.ofbiz.entity.condition.EntityConditionList;
@@ -46,7 +49,6 @@
 import org.ofbiz.entity.transaction.TransactionUtil;
 import org.ofbiz.service.DispatchContext;
 import org.ofbiz.service.GenericDispatcher;
-import org.ofbiz.service.LocalDispatcher;
 import org.ofbiz.service.calendar.RecurrenceInfo;
 import org.ofbiz.service.calendar.RecurrenceInfoException;
 import org.ofbiz.service.config.ServiceConfigUtil;
@@ -54,7 +56,7 @@
 /**
  * JobManager
  */
-public class JobManager {
+public class JobManager implements JobScheduler {
 
     public static final String instanceId = UtilProperties.getPropertyValue("general.properties", "unique.instanceId", "ofbiz0");
     public static final Map<String, Object> updateFields = UtilMisc.<String, Object>toMap("runByInstanceId", instanceId, "statusId", "SERVICE_QUEUED");

Modified: ofbiz/branches/executioncontext20090716/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java?rev=795024&r1=795023&r2=795024&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java Fri Jul 17 09:56:47 2009
@@ -219,7 +219,9 @@
         if (serviceEventMap == null) return;
         for (List<ServiceEcaRule> ecaRuleList: serviceEventMap.values()) {
             for (ServiceEcaRule ecaRule: ecaRuleList) {
-                this.serviceEcasTriggeredByThisService.add(aif.getServiceEcaArtifactInfo(ecaRule));
+                ServiceEcaArtifactInfo seai = aif.getServiceEcaArtifactInfo(ecaRule);
+                this.serviceEcasTriggeredByThisService.add(seai);
+                if (Debug.infoOn()) Debug.logInfo("Adding triggered Service ECA (now " + this.serviceEcasTriggeredByThisService.size() + " in Set): " + seai.toString(), module);
                 // the reverse reference
                 UtilMisc.addToSortedSetInMap(this, aif.allServiceInfosReferringToServiceEcaRule, ecaRule);
             }

Modified: ofbiz/branches/executioncontext20090716/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceEcaArtifactInfo.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceEcaArtifactInfo.java?rev=795024&r1=795023&r2=795024&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceEcaArtifactInfo.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceEcaArtifactInfo.java Fri Jul 17 09:56:47 2009
@@ -193,4 +193,8 @@
             return false;
         }
     }
+    
+    public String toString() {
+        return "ServiceEcaArtifactInfo:" + this.displayPrefix + "_" + this.displaySuffixNum + "::" + this.serviceEcaRule.toString();
+    }
 }

Modified: ofbiz/branches/executioncontext20090716/framework/widget/src/org/ofbiz/widget/ContentWorkerInterface.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090716/framework/widget/src/org/ofbiz/widget/ContentWorkerInterface.java?rev=795024&r1=795023&r2=795024&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090716/framework/widget/src/org/ofbiz/widget/ContentWorkerInterface.java (original)
+++ ofbiz/branches/executioncontext20090716/framework/widget/src/org/ofbiz/widget/ContentWorkerInterface.java Fri Jul 17 09:56:47 2009
@@ -24,10 +24,10 @@
 import java.util.Map;
 
 import org.ofbiz.base.util.GeneralException;
-import org.ofbiz.entity.GenericDelegator;
-import org.ofbiz.entity.GenericEntityException;
-import org.ofbiz.entity.GenericValue;
-import org.ofbiz.service.LocalDispatcher;
+import org.ofbiz.context.entity.GenericDelegator;
+import org.ofbiz.context.entity.GenericEntityException;
+import org.ofbiz.context.entity.GenericValue;
+import org.ofbiz.context.service.LocalDispatcher;
 
 /**
  * ContentWorkerInterface