Author: jonesde
Date: Tue Mar 24 02:53:31 2009
New Revision: 757639
URL:
http://svn.apache.org/viewvc?rev=757639&view=revLog:
Moved EntityDiagramGroupData.xml from entityext to commonext to resolve framework dependency; a few other little cleanups as well
Added:
ofbiz/trunk/applications/commonext/data/
ofbiz/trunk/applications/commonext/data/EntityDiagramGroupData.xml
- copied unchanged from r757637, ofbiz/trunk/framework/entityext/data/EntityDiagramGroupData.xml
Removed:
ofbiz/trunk/framework/entityext/data/EntityDiagramGroupData.xml
Modified:
ofbiz/trunk/framework/base/config/test-containers.xml
ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/ModelDataFile.java
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java
Modified: ofbiz/trunk/framework/base/config/test-containers.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/config/test-containers.xml?rev=757639&r1=757638&r2=757639&view=diff==============================================================================
--- ofbiz/trunk/framework/base/config/test-containers.xml (original)
+++ ofbiz/trunk/framework/base/config/test-containers.xml Tue Mar 24 02:53:31 2009
@@ -221,8 +221,6 @@
<property name="base-test" value="org.ofbiz.base.test.BaseUnitTests"/>
<!-- this is now run through the new testtools stuff <property name="entity-test" value="org.ofbiz.entity.test.EntityTestSuite"/> -->
<!-- this is now run through the new testtools stuff <property name="service-test" value="org.ofbiz.service.test.ServiceEngineTests"/> -->
- <!-- <property name="usps-test" value="org.ofbiz.shipment.thirdparty.usps.UspsServicesTests"/> -->
- <!-- For the jxtests component: <property name="jxunit-test" value="net.sourceforge.jxunit.JXTestCase"/> -->
</container>
<container name="testtools-container" class="org.ofbiz.testtools.TestRunContainer"/>
Modified: ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/ModelDataFile.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/ModelDataFile.java?rev=757639&r1=757638&r2=757639&view=diff==============================================================================
--- ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/ModelDataFile.java (original)
+++ ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/ModelDataFile.java Tue Mar 24 02:53:31 2009
@@ -38,10 +38,10 @@
/** The type code of the File, ususally contained somewhere in the file and can be used to identify it */
public String typeCode = "";
- /** The party that generally sends the file */
+ /** The entity that generally sends the file */
public String sender = "";
- /** The party that generally receives the file */
+ /** The entity that generally receives the file */
public String receiver = "";
/** The length in bytes of a single record, ONLY if it uses fixed length records */
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java?rev=757639&r1=757638&r2=757639&view=diff==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java Tue Mar 24 02:53:31 2009
@@ -283,7 +283,7 @@
// do primary key matching check
if (checkPks && ccInfo.isPk && !field.getIsPk()) {
String message = "WARNING: Column [" + ccInfo.columnName + "] of table [" + entity.getTableName(datasourceInfo) + "] of entity [" +
- entity.getEntityName() + "] IS a primary key in the database, but IS NOT a primary key in the entity definition. The primary key for this table needs to be re-created or modified so that this column is NOT party of the primary key.";
+ entity.getEntityName() + "] IS a primary key in the database, but IS NOT a primary key in the entity definition. The primary key for this table needs to be re-created or modified so that this column is NOT part of the primary key.";
Debug.logError(message, module);
if (messages != null) messages.add(message);
}
Modified: ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java?rev=757639&r1=757638&r2=757639&view=diff==============================================================================
--- ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java (original)
+++ ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java Tue Mar 24 02:53:31 2009
@@ -18,9 +18,10 @@
*******************************************************************************/
package org.ofbiz.entityext.permission;
+import static org.ofbiz.base.util.UtilGenerics.checkList;
+
import java.sql.Timestamp;
import java.util.Arrays;
-import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
import java.util.Map;
@@ -36,7 +37,6 @@
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.StringUtil;
import org.ofbiz.base.util.UtilDateTime;
-import static org.ofbiz.base.util.UtilGenerics.checkList;
import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.base.util.UtilXml;
Locked
