svn commit: r1660055 - in /ofbiz/branches/release14.12: ./ applications/content/entitydef/entitymodel.xml applications/party/entitydef/entitymodel.xml applications/product/entitydef/entitymodel_shipment.xml

[jacopoc]

Author: jacopoc
Date: Mon Feb 16 09:00:13 2015
New Revision: 1660055

URL: http://svn.apache.org/r1660055
Log:
Applied fix from trunk for revision: 1660053
===

OFBIZ-6068: patch by Rohit Koushal that fixes a series of ClassCastException happening since rev. 1553890 when accessing some blog fields.


Modified:
    ofbiz/branches/release14.12/   (props changed)
    ofbiz/branches/release14.12/applications/content/entitydef/entitymodel.xml
    ofbiz/branches/release14.12/applications/party/entitydef/entitymodel.xml
    ofbiz/branches/release14.12/applications/product/entitydef/entitymodel_shipment.xml

Propchange: ofbiz/branches/release14.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 16 09:00:13 2015
@@ -8,4 +8,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1649393,1649742,1650240,1650583,1650642,1650678,1650882,1650887,1650938,1651593,1652361,1652706,1652725,1652731,1652739,1653248,1653456,1654175,1654273,1654509,1655046,1655668,1655979,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1660031
+/ofbiz/trunk:1649393,1649742,1650240,1650583,1650642,1650678,1650882,1650887,1650938,1651593,1652361,1652706,1652725,1652731,1652739,1653248,1653456,1654175,1654273,1654509,1655046,1655668,1655979,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1660031,1660053

Modified: ofbiz/branches/release14.12/applications/content/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/content/entitydef/entitymodel.xml?rev=1660055&r1=1660054&r2=1660055&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/content/entitydef/entitymodel.xml (original)
+++ ofbiz/branches/release14.12/applications/content/entitydef/entitymodel.xml Mon Feb 16 09:00:13 2015
@@ -728,7 +728,7 @@ under the License.
             package-name="org.ofbiz.content.data"
             title="Other Data Object Entity">
       <field name="dataResourceId" type="id-ne"></field>
-      <field name="audioData" type="blob"></field>
+      <field name="audioData" type="object"></field>
       <prim-key field="dataResourceId"/>
       <relation type="one" fk-name="DATA_REC_AUDIO" rel-entity-name="DataResource">
         <key-map field-name="dataResourceId"/>
@@ -1039,7 +1039,7 @@ under the License.
             package-name="org.ofbiz.content.data"
             title="Other Data Object Entity">
       <field name="dataResourceId" type="id-ne"></field>
-      <field name="dataResourceContent" type="blob"></field>
+      <field name="dataResourceContent" type="object"></field>
       <prim-key field="dataResourceId"/>
       <relation type="one" fk-name="DATA_REC_OTHER" rel-entity-name="DataResource">
         <key-map field-name="dataResourceId"/>
@@ -1049,7 +1049,7 @@ under the License.
             package-name="org.ofbiz.content.data"
             title="Other Data Object Entity">
       <field name="dataResourceId" type="id-ne"></field>
-      <field name="videoData" type="blob"></field>
+      <field name="videoData" type="object"></field>
       <prim-key field="dataResourceId"/>
       <relation type="one" fk-name="DATA_REC_VIDEO" rel-entity-name="DataResource">
         <key-map field-name="dataResourceId"/>
@@ -1069,7 +1069,7 @@ under the License.
       <field name="comments" type="comment"></field>
       <field name="documentLocation" type="long-varchar"></field>
       <field name="documentText" type="long-varchar"></field>
-      <field name="imageData" type="blob"></field>
+      <field name="imageData" type="object"></field>
       <prim-key field="documentId"/>
       <relation type="one" fk-name="DOCUMENT_TO_TYPE" rel-entity-name="DocumentType">
         <key-map field-name="documentTypeId"/>

Modified: ofbiz/branches/release14.12/applications/party/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/party/entitydef/entitymodel.xml?rev=1660055&r1=1660054&r2=1660055&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/party/entitydef/entitymodel.xml (original)
+++ ofbiz/branches/release14.12/applications/party/entitydef/entitymodel.xml Mon Feb 16 09:00:13 2015
@@ -155,7 +155,7 @@ under the License.
       <field name="agreementItemTypeId" type="id"></field>
       <field name="currencyUomId" type="id"></field>
       <field name="agreementText" type="very-long"></field>
-      <field name="agreementImage" type="blob"></field>
+      <field name="agreementImage" type="object"></field>
       <prim-key field="agreementId"/>
       <prim-key field="agreementItemSeqId"/>
       <relation type="one" fk-name="AGRMNT_ITEM_AGR" rel-entity-name="Agreement">

Modified: ofbiz/branches/release14.12/applications/product/entitydef/entitymodel_shipment.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/product/entitydef/entitymodel_shipment.xml?rev=1660055&r1=1660054&r2=1660055&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/product/entitydef/entitymodel_shipment.xml (original)
+++ ofbiz/branches/release14.12/applications/product/entitydef/entitymodel_shipment.xml Mon Feb 16 09:00:13 2015
@@ -1225,11 +1225,11 @@ under the License.
       <field name="shipmentRouteSegmentId" type="id-ne"></field>
       <field name="trackingCode" type="short-varchar"></field>
       <field name="boxNumber" type="short-varchar"></field>
-      <field name="labelImage" type="blob"></field>
-      <field name="labelIntlSignImage" type="blob"></field>
+      <field name="labelImage" type="byte-array"></field>
+      <field name="labelIntlSignImage" type="byte-array"></field>
       <field name="labelHtml" type="very-long"></field>
       <field name="labelPrinted" type="indicator"></field> <!-- tracks if a label has been printed -->
-      <field name="internationalInvoice" type="blob"></field>
+      <field name="internationalInvoice" type="byte-array"></field>
       <field name="packageTransportCost" type="currency-amount"></field>
       <field name="packageServiceCost" type="currency-amount"></field>
       <field name="packageOtherCost" type="currency-amount"></field>
@@ -1292,7 +1292,7 @@ under the License.
       <field name="thirdPartyAccountNumber" type="id"></field>
       <field name="thirdPartyPostalCode" type="id"></field>
       <field name="thirdPartyCountryGeoCode" type="id"></field>
-      <field name="upsHighValueReport" type="blob"></field>
+      <field name="upsHighValueReport" type="byte-array"></field>
       <prim-key field="shipmentId"/>
       <prim-key field="shipmentRouteSegmentId"/>
       <relation type="one" fk-name="SHPMT_RTSEG_SHPMT" rel-entity-name="Shipment">