svn commit: r1804026 [2/2] - in /ofbiz/ofbiz-framework/trunk: applications/datamodel/entitydef/ framework/common/entitydef/ framework/entity/entitydef/ framework/entityext/entitydef/ framework/security/entitydef/ framework/service/entitydef/ framework/...

[Deepak Dixit-5]

Modified: ofbiz/ofbiz-framework/trunk/framework/common/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/entitydef/entitymodel.xml?rev=1804026&r1=1804025&r2=1804026&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/common/entitydef/entitymodel.xml (original)
+++ ofbiz/ofbiz-framework/trunk/framework/common/entitydef/entitymodel.xml Thu Aug  3 17:51:07 2017
@@ -75,7 +75,7 @@ under the License.
 
     <entity entity-name="EmailTemplateSetting" package-name="org.apache.ofbiz.common.email" title="Email Template Setting Entity">
         <field name="emailTemplateSettingId" type="id"></field>
-        <field name="emailType" type="id-ne"></field>
+        <field name="emailType" type="id"></field>
         <field name="description" type="description"></field>
         <field name="bodyScreenLocation" type="long-varchar"><description>if empty defaults to a screen based on the emailType</description></field>
         <field name="xslfoAttachScreenLocation" type="long-varchar"><description>if specified is used to generate XSL:FO that is transformed to a PDF via Apache FOP and attached to the email</description></field>
@@ -99,7 +99,7 @@ under the License.
             default-resource-name="CommonEntityLabels"
             title="Enumeration Entity">
       <field name="enumId" type="id"></field>
-      <field name="enumTypeId" type="id-ne"></field>
+      <field name="enumTypeId" type="id"></field>
       <field name="enumCode" type="short-varchar"></field>
       <field name="sequenceId" type="id"></field>
       <field name="description" type="description"></field>
@@ -439,7 +439,7 @@ under the License.
             default-resource-name="CommonEntityLabels"
             title="Status Entity">
       <field name="statusId" type="id"></field>
-      <field name="statusTypeId" type="id-ne"></field>
+      <field name="statusTypeId" type="id"></field>
       <field name="statusCode" type="short-varchar"></field>
       <field name="sequenceId" type="id"></field>
       <field name="description" type="description"></field>
@@ -551,7 +551,7 @@ under the License.
       <field name="uomId" type="id"></field>
       <field name="uomIdTo" type="id"></field>
       <field name="conversionFactor" type="floating-point"></field>
-      <field name="customMethodId" type="id-ne"></field>
+      <field name="customMethodId" type="id"></field>
       <field name="decimalScale" type="numeric"></field>
       <field name="roundingMode" type="id"></field>
       <prim-key field="uomId"/>
@@ -574,7 +574,7 @@ under the License.
       <field name="fromDate" type="date-time"></field>
       <field name="thruDate" type="date-time"></field>
       <field name="conversionFactor" type="floating-point"></field>
-      <field name="customMethodId" type="id-ne"></field>
+      <field name="customMethodId" type="id"></field>
       <field name="decimalScale" type="numeric"></field>
       <field name="roundingMode" type="id"></field>
       <field name="purposeEnumId" type="id"></field>
@@ -741,7 +741,7 @@ under the License.
         <!-- defined in an extend in content component to avoid dependencies between common and content
         <field name="helpContentId" type="id"><description>Used to give contentId which will be shown when help on this page will be called</description></field>
          -->
-        <field name="ownerUserLoginId" type="id-vlong-ne"></field>
+        <field name="ownerUserLoginId" type="id-vlong"></field>
         <field name="originalPortalPageId" type="id"><description>The system portal page this page is derived from</description></field>
         <field name="parentPortalPageId" type="id"><description>the parent this page is belonging to, normally the startpage of the portal page group</description></field>
         <field name="sequenceNum" type="numeric"></field>
@@ -788,7 +788,7 @@ under the License.
         <field name="portalPageId" type="id"></field>
         <field name="portalPortletId" type="id"></field>
         <field name="portletSeqId" type="id"><description>Identify the portalPortlet instance in case more copy of the same portalPortlet are present in the same portalPage</description></field>
-        <field name="columnSeqId" type="id-ne"></field>
+        <field name="columnSeqId" type="id"></field>
         <field name="sequenceNum" type="numeric"></field>
         <prim-key field="portalPageId"/>
         <prim-key field="portalPortletId"/>

Modified: ofbiz/ofbiz-framework/trunk/framework/entity/entitydef/entitymodel_test.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/entitydef/entitymodel_test.xml?rev=1804026&r1=1804025&r2=1804026&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/entity/entitydef/entitymodel_test.xml (original)
+++ ofbiz/ofbiz-framework/trunk/framework/entity/entitydef/entitymodel_test.xml Thu Aug  3 17:51:07 2017
@@ -49,7 +49,7 @@ under the License.
         package-name="org.apache.ofbiz.entity.test"
         title="Testing Entity">
         <field name="testingId" type="id"/>
-        <field name="testingTypeId" type="id-ne"/>
+        <field name="testingTypeId" type="id"/>
         <field name="testingName" type="name" enable-audit-log="true"/>
         <field name="description" type="description"/>
         <field name="comments" type="comment"/>
@@ -99,8 +99,8 @@ under the License.
             title="Entity for testing EntityStatus concept">
         <description>An entity for testing EntityStatus concept</description>
         <field name="testingStatusId" type="id"/>
-        <field name="testingId" type="id-ne" />
-        <field name="statusId" type="id-ne"/>
+        <field name="testingId" type="id" />
+        <field name="statusId" type="id"/>
         <field name="statusDate" type="date-time"/>
         <field name="changeByUserLoginId" type="id-vlong"/>
         <prim-key field="testingStatusId"/>
@@ -220,7 +220,7 @@ under the License.
         package-name="org.apache.ofbiz.entity.test"
         title="Testing Crypto Entity">
         <field name="testingCryptoId" type="id"/>
-        <field name="testingCryptoTypeId" type="id-ne"/>
+        <field name="testingCryptoTypeId" type="id"/>
         <field name="unencryptedValue" type="description"/>
         <field name="encryptedValue" type="description" encrypt="true"/>
         <field name="saltedEncryptedValue" type="description" encrypt="salt"/>

Modified: ofbiz/ofbiz-framework/trunk/framework/entityext/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entityext/entitydef/entitymodel.xml?rev=1804026&r1=1804025&r2=1804026&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/entityext/entitydef/entitymodel.xml (original)
+++ ofbiz/ofbiz-framework/trunk/framework/entityext/entitydef/entitymodel.xml Thu Aug  3 17:51:07 2017
@@ -52,7 +52,7 @@ under the License.
             title="Entity Grouping Entity">
       <field name="entityGroupId" type="id"></field>
       <field name="entityOrPackage" type="long-varchar"></field>
-      <field name="applEnumId" type="id-ne"></field>
+      <field name="applEnumId" type="id"></field>
       <prim-key field="entityGroupId"/>
       <prim-key field="entityOrPackage"/>
       <relation type="one" fk-name="ENTGRP_GRP" rel-entity-name="EntityGroup">
@@ -68,7 +68,7 @@ under the License.
             package-name="org.apache.ofbiz.entity.synchronization"
             title="Entity Synchronization Entity">
       <field name="entitySyncId" type="id"></field>
-      <field name="runStatusId" type="id-ne"></field>
+      <field name="runStatusId" type="id"></field>
       <field name="lastSuccessfulSynchTime" type="date-time"></field>
       <field name="lastHistoryStartDate" type="date-time"></field>
       <field name="preOfflineSynchTime" type="date-time"></field>
@@ -95,7 +95,7 @@ under the License.
             title="Entity Synchronization History Entity">
       <field name="entitySyncId" type="id"></field>
       <field name="startDate" type="date-time"></field>
-      <field name="runStatusId" type="id-ne"></field>
+      <field name="runStatusId" type="id"></field>
       <field name="beginningSynchTime" type="date-time"></field>
       <field name="lastSuccessfulSynchTime" type="date-time"></field>
       <field name="lastCandidateEndTime" type="date-time"></field>
@@ -130,7 +130,7 @@ under the License.
             title="Entity Synchronization Include Entity">
       <field name="entitySyncId" type="id"></field>
       <field name="entityOrPackage" type="long-varchar"></field>
-      <field name="applEnumId" type="id-ne"></field>
+      <field name="applEnumId" type="id"></field>
       <prim-key field="entitySyncId"/>
       <prim-key field="entityOrPackage"/>
       <relation type="one" fk-name="ENTSYNC_INCSNC" rel-entity-name="EntitySync">

Modified: ofbiz/ofbiz-framework/trunk/framework/security/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/security/entitydef/entitymodel.xml?rev=1804026&r1=1804025&r2=1804026&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/security/entitydef/entitymodel.xml (original)
+++ ofbiz/ofbiz-framework/trunk/framework/security/entitydef/entitymodel.xml Thu Aug  3 17:51:07 2017
@@ -73,10 +73,10 @@ under the License.
       <field name="lastTimeZone" type="id-long"></field>
       <field name="disabledDateTime" type="date-time"></field>
       <field name="successiveFailedLogins" type="numeric"></field>
-      <field name="externalAuthId" type="id-vlong-ne">
+      <field name="externalAuthId" type="id-vlong">
           <description>For use with external authentication; the userLdapDn should be replaced with this</description>
       </field>
-      <field name="userLdapDn" type="id-vlong-ne">
+      <field name="userLdapDn" type="id-vlong">
           <description>The user's LDAP Distinguished Name - used for LDAP authentication</description>
       </field>
       <field name="disabledBy" type="id-vlong"></field>

Modified: ofbiz/ofbiz-framework/trunk/framework/service/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/entitydef/entitymodel.xml?rev=1804026&r1=1804025&r2=1804026&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/service/entitydef/entitymodel.xml (original)
+++ ofbiz/ofbiz-framework/trunk/framework/service/entitydef/entitymodel.xml Thu Aug  3 17:51:07 2017
@@ -95,8 +95,8 @@ under the License.
       <field name="startDateTime" type="date-time"></field>
       <field name="exceptionDateTimes" type="very-long"></field>
       <field name="recurrenceDateTimes" type="very-long"></field>
-      <field name="exceptionRuleId" type="id-ne"></field>
-      <field name="recurrenceRuleId" type="id-ne"></field>
+      <field name="exceptionRuleId" type="id"></field>
+      <field name="recurrenceRuleId" type="id"></field>
       <field name="recurrenceCount" type="numeric"><description>Not recommended - more than one process could be using this RecurrenceInfo</description></field>
       <prim-key field="recurrenceInfoId"/>
       <relation type="one" fk-name="REC_INFO_RCRLE" rel-entity-name="RecurrenceRule">
@@ -141,7 +141,7 @@ under the License.
             package-name="org.apache.ofbiz.service.schedule"
             title="Temporal Expression">
       <field name="tempExprId" type="id"></field>
-      <field name="tempExprTypeId" type="id-ne"></field>
+      <field name="tempExprTypeId" type="id"></field>
       <field name="description" type="description"></field>
       <field name="date1" type="date-time"></field>
       <field name="date2" type="date-time"></field>

Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/entitydef/entitymodel.xml?rev=1804026&r1=1804025&r2=1804026&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webapp/entitydef/entitymodel.xml (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webapp/entitydef/entitymodel.xml Thu Aug  3 17:51:07 2017
@@ -91,8 +91,8 @@ under the License.
     </entity>
     <entity entity-name="ServerHitBin" package-name="org.apache.ofbiz.webapp.visit" never-cache="true" title="Server Hit Bin Entity" no-auto-stamp="true">
       <field name="serverHitBinId" type="id"></field>
-      <field name="contentId" type="id-vlong-ne"></field>
-      <field name="hitTypeId" type="id-ne"></field>
+      <field name="contentId" type="id-vlong"></field>
+      <field name="hitTypeId" type="id"></field>
       <field name="serverIpAddress" type="id"></field>
       <field name="serverHostName" type="long-varchar"></field>
       <field name="binStartDateTime" type="date-time"></field>