svn commit: r1335064 - in /ofbiz/trunk/framework/entity: entitydef/entitymodel.xml src/org/ofbiz/entity/GenericDelegator.java

[doogie-3]

Author: doogie
Date: Mon May  7 15:29:28 2012
New Revision: 1335064

URL: http://svn.apache.org/viewvc?rev=1335064&view=rev
Log:
FIX: There is a problem with tenant kek support, this should fix it.

Modified:
    ofbiz/trunk/framework/entity/entitydef/entitymodel.xml
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java

Modified: ofbiz/trunk/framework/entity/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/entitydef/entitymodel.xml?rev=1335064&r1=1335063&r2=1335064&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/framework/entity/entitydef/entitymodel.xml Mon May  7 15:29:28 2012
@@ -111,10 +111,8 @@ under the License.
             The jdbc fields will override the datasource -> inline-jdbc values for the per-tenant delegator.
         </description>
         <field name="tenantId" type="id-ne"/>
-        <field name="keyName" type="id-vlong-ne"></field>
-        <field name="keyText" type="long-varchar"></field>
+        <field name="kekText" type="long-varchar"></field>
         <prim-key field="tenantId"/>
-        <prim-key field="keyName"/>
         <relation type="one" fk-name="TNTKEK_TNT" rel-entity-name="Tenant">
             <key-map field-name="tenantId"/>
         </relation>

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java?rev=1335064&r1=1335063&r2=1335064&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java Mon May  7 15:29:28 2012
@@ -223,7 +223,7 @@ public class GenericDelegator implements
             }
             GenericValue kekValue = baseDelegator.findOne("TenantKeyEncryptingKey", true, "tenantId", getDelegatorTenantId());
             if (kekValue != null) {
-                kekText = kekValue.getString("keyText");
+                kekText = kekValue.getString("kekText");
             } else {
                 kekText = this.delegatorInfo.kekText;
             }