You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2014/08/23 09:03:05 UTC
svn commit: r1619976 [2/2] - in /ofbiz/branches/framework-api-cleanup:
applications/product/src/org/ofbiz/product/product/
framework/entity/src/org/ofbiz/entity/
framework/entity/src/org/ofbiz/entity/config/
framework/entity/src/org/ofbiz/entity/config...
Modified: ofbiz/branches/framework-api-cleanup/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/framework-api-cleanup/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaUtil.java?rev=1619976&r1=1619975&r2=1619976&view=diff
==============================================================================
--- ofbiz/branches/framework-api-cleanup/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaUtil.java (original)
+++ ofbiz/branches/framework-api-cleanup/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaUtil.java Sat Aug 23 07:03:04 2014
@@ -38,7 +38,6 @@ import org.ofbiz.base.util.UtilXml;
import org.ofbiz.base.util.cache.UtilCache;
import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityConfException;
-import org.ofbiz.entity.config.EntityConfigUtil;
import org.ofbiz.entity.config.model.*;
import org.w3c.dom.Element;
@@ -64,7 +63,7 @@ public class EntityEcaUtil {
public static String getEntityEcaReaderName(String delegatorName) {
DelegatorElement delegatorInfo = null;
try {
- delegatorInfo = EntityConfigUtil.getDelegator(delegatorName);
+ delegatorInfo = EntityConfig.getInstance().getDelegator(delegatorName);
} catch (GenericEntityConfException e) {
Debug.logWarning(e, "Exception thrown while getting field type config: ", module);
}
@@ -78,7 +77,7 @@ public class EntityEcaUtil {
protected static void readConfig(String entityEcaReaderName, Map<String, Map<String, List<EntityEcaRule>>> ecaCache) {
EntityEcaReader entityEcaReaderInfo = null;
try {
- entityEcaReaderInfo = EntityConfigUtil.getEntityEcaReader(entityEcaReaderName);
+ entityEcaReaderInfo = EntityConfig.getInstance().getEntityEcaReader(entityEcaReaderName);
} catch (GenericEntityConfException e) {
Debug.logError(e, "Exception thrown while getting entity-eca-reader config with name: " + entityEcaReaderName, module);
}
@@ -89,7 +88,7 @@ public class EntityEcaUtil {
List<Future<List<EntityEcaRule>>> futures = FastList.newInstance();
for (Resource eecaResourceElement : entityEcaReaderInfo.getResourceList()) {
- ResourceHandler handler = new MainResourceHandler(EntityConfigUtil.ENTITY_ENGINE_XML_FILENAME, eecaResourceElement.getLoader(), eecaResourceElement.getLocation());
+ ResourceHandler handler = new MainResourceHandler(EntityConfig.ENTITY_ENGINE_XML_FILENAME, eecaResourceElement.getLoader(), eecaResourceElement.getLocation());
futures.add(ExecutionPool.GLOBAL_FORK_JOIN.submit(createEcaLoaderCallable(handler)));
}
Modified: ofbiz/branches/framework-api-cleanup/framework/geronimo/src/org/ofbiz/geronimo/GeronimoTransactionFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/framework-api-cleanup/framework/geronimo/src/org/ofbiz/geronimo/GeronimoTransactionFactory.java?rev=1619976&r1=1619975&r2=1619976&view=diff
==============================================================================
--- ofbiz/branches/framework-api-cleanup/framework/geronimo/src/org/ofbiz/geronimo/GeronimoTransactionFactory.java (original)
+++ ofbiz/branches/framework-api-cleanup/framework/geronimo/src/org/ofbiz/geronimo/GeronimoTransactionFactory.java Sat Aug 23 07:03:04 2014
@@ -32,7 +32,7 @@ import org.apache.geronimo.transaction.m
import org.ofbiz.base.util.Debug;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.config.model.Datasource;
-import org.ofbiz.entity.config.EntityConfigUtil;
+import org.ofbiz.entity.config.model.EntityConfig;
import org.ofbiz.entity.datasource.GenericHelperInfo;
import org.ofbiz.entity.jdbc.ConnectionFactory;
import org.ofbiz.entity.transaction.TransactionFactoryInterface;
@@ -77,7 +77,7 @@ public class GeronimoTransactionFactory
}
public Connection getConnection(GenericHelperInfo helperInfo) throws SQLException, GenericEntityException {
- Datasource datasourceInfo = EntityConfigUtil.getDatasource(helperInfo.getHelperBaseName());
+ Datasource datasourceInfo = EntityConfig.getDatasource(helperInfo.getHelperBaseName());
if (datasourceInfo != null && datasourceInfo.getInlineJdbc() != null) {
return ConnectionFactory.getManagedConnection(helperInfo, datasourceInfo.getInlineJdbc());
Modified: ofbiz/branches/framework-api-cleanup/framework/service/src/org/ofbiz/service/DispatchContext.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/framework-api-cleanup/framework/service/src/org/ofbiz/service/DispatchContext.java?rev=1619976&r1=1619975&r2=1619976&view=diff
==============================================================================
--- ofbiz/branches/framework-api-cleanup/framework/service/src/org/ofbiz/service/DispatchContext.java (original)
+++ ofbiz/branches/framework-api-cleanup/framework/service/src/org/ofbiz/service/DispatchContext.java Sat Aug 23 07:03:04 2014
@@ -40,8 +40,8 @@ import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.cache.UtilCache;
import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityConfException;
-import org.ofbiz.entity.config.EntityConfigUtil;
import org.ofbiz.entity.config.model.DelegatorElement;
+import org.ofbiz.entity.config.model.EntityConfig;
import org.ofbiz.security.Security;
import org.ofbiz.service.config.ServiceConfigUtil;
import org.ofbiz.service.config.model.GlobalServices;
@@ -84,7 +84,7 @@ public class DispatchContext implements
if (delegator != null) {
DelegatorElement delegatorInfo = null;
try {
- delegatorInfo = EntityConfigUtil.getDelegator(delegator.getDelegatorBaseName());
+ delegatorInfo = EntityConfig.getInstance().getDelegator(delegator.getDelegatorBaseName());
} catch (GenericEntityConfException e) {
Debug.logWarning(e, "Exception thrown while getting delegator config: ", module);
}
Modified: ofbiz/branches/framework-api-cleanup/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/framework-api-cleanup/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java?rev=1619976&r1=1619975&r2=1619976&view=diff
==============================================================================
--- ofbiz/branches/framework-api-cleanup/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java (original)
+++ ofbiz/branches/framework-api-cleanup/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java Sat Aug 23 07:03:04 2014
@@ -43,8 +43,8 @@ import org.ofbiz.base.util.GeneralExcept
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.base.util.cache.UtilCache;
import org.ofbiz.entity.GenericEntityException;
-import org.ofbiz.entity.config.EntityConfigUtil;
import org.ofbiz.entity.config.model.DelegatorElement;
+import org.ofbiz.entity.config.model.EntityConfig;
import org.ofbiz.entity.model.ModelEntity;
import org.ofbiz.entity.model.ModelReader;
import org.ofbiz.service.DispatchContext;
@@ -128,7 +128,7 @@ public class ArtifactInfoFactory {
protected ArtifactInfoFactory(String delegatorName) throws GeneralException {
this.delegatorName = delegatorName;
this.entityModelReader = ModelReader.getModelReader(delegatorName);
- DelegatorElement delegatorInfo = EntityConfigUtil.getDelegator(delegatorName);
+ DelegatorElement delegatorInfo = EntityConfig.getInstance().getDelegator(delegatorName);
String modelName;
if (delegatorInfo != null) {
modelName = delegatorInfo.getEntityModelReader();
Modified: ofbiz/branches/framework-api-cleanup/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/framework-api-cleanup/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java?rev=1619976&r1=1619975&r2=1619976&view=diff
==============================================================================
--- ofbiz/branches/framework-api-cleanup/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java (original)
+++ ofbiz/branches/framework-api-cleanup/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java Sat Aug 23 07:03:04 2014
@@ -42,7 +42,7 @@ import org.ofbiz.base.util.UtilXml;
import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityConfException;
import org.ofbiz.entity.config.model.DelegatorElement;
-import org.ofbiz.entity.config.EntityConfigUtil;
+import org.ofbiz.entity.config.model.EntityConfig;
import org.ofbiz.entity.model.ModelEntity;
import org.ofbiz.entity.model.ModelField;
import org.ofbiz.service.DispatchContext;
@@ -73,7 +73,7 @@ public class LabelReferences {
this.labels = factory.getLabels();
DelegatorElement delegatorInfo = null;
try {
- delegatorInfo = EntityConfigUtil.getDelegator(delegator.getDelegatorBaseName());
+ delegatorInfo = EntityConfig.getInstance().getDelegator(delegator.getDelegatorBaseName());
} catch (GenericEntityConfException e) {
Debug.logWarning(e, "Exception thrown while getting delegator config: ", module);
}
Modified: ofbiz/branches/framework-api-cleanup/framework/webtools/webapp/webtools/entity/ModelWriter.jsp
URL: http://svn.apache.org/viewvc/ofbiz/branches/framework-api-cleanup/framework/webtools/webapp/webtools/entity/ModelWriter.jsp?rev=1619976&r1=1619975&r2=1619976&view=diff
==============================================================================
--- ofbiz/branches/framework-api-cleanup/framework/webtools/webapp/webtools/entity/ModelWriter.jsp (original)
+++ ofbiz/branches/framework-api-cleanup/framework/webtools/webapp/webtools/entity/ModelWriter.jsp Sat Aug 23 07:03:04 2014
@@ -99,7 +99,7 @@ under the License.
String originalLoaderName = request.getParameter("originalLoaderName");
String originalLocation = request.getParameter("originalLocation");
if (originalLoaderName != null && originalLocation != null) {
- ec = reader.getResourceHandlerEntities(new MainResourceHandler(EntityConfigUtil.ENTITY_ENGINE_XML_FILENAME, originalLoaderName, originalLocation));
+ ec = reader.getResourceHandlerEntities(new MainResourceHandler(EntityConfig.ENTITY_ENGINE_XML_FILENAME, originalLoaderName, originalLocation));
} else {
ec = reader.getEntityNames();
}