svn commit: r1553936 - in /ofbiz/branches/release12.04: ./ applications/content/script/org/ofbiz/content/data/DataServices.xml specialpurpose/scrum/script/org/ofbiz/scrum/test/ProductBacklogTest.xml

Author: jleroux
Date: Sat Dec 28 21:53:07 2013
New Revision: 1553936

URL: http://svn.apache.org/r1553936
Log:
"Applied fix from trunk for revision: 1364218"
------------------------------------------------------------------------
r1364218 | jacopoc | 2012-07-22 09:03:34 +0200 (dim. 22 juil. 2012) | 1 ligne

Removed duplicated service implementations (there were 2 copies in the same file).
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release12.04/   (props changed)
    ofbiz/branches/release12.04/applications/content/script/org/ofbiz/content/data/DataServices.xml
    ofbiz/branches/release12.04/specialpurpose/scrum/script/org/ofbiz/scrum/test/ProductBacklogTest.xml

Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1364218

Modified: ofbiz/branches/release12.04/applications/content/script/org/ofbiz/content/data/DataServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/content/script/org/ofbiz/content/data/DataServices.xml?rev=1553936&r1=1553935&r2=1553936&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/content/script/org/ofbiz/content/data/DataServices.xml (original)
+++ ofbiz/branches/release12.04/applications/content/script/org/ofbiz/content/data/DataServices.xml Sat Dec 28 21:53:07 2013
@@ -106,28 +106,6 @@ under the License.
        <if-compare field="dataResource.dataResourceTypeId" operator="equals" value="IMAGE_OBJECT"><return response-code="${dataResource.dataResourceTypeId}"/></if-compare>      
     </simple-method>
 
-  <!-- Methods for DataCategory -->
-    <simple-method method-name="createDataCategory" short-description="Create a Data Category">
-        <make-value entity-name="DataCategory" value-field="newEntity"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-        <create-value value-field="newEntity"/>
-        <field-to-result field="newEntity.dataCategoryId" result-name="dataCategoryId"/>
-    </simple-method>
-    <simple-method method-name="updateDataCategory" short-description="Update a Data Category">
-        <make-value entity-name="DataCategory" value-field="lookupKeyValue"/>
-        <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
-        <find-by-primary-key entity-name="DataCategory" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
-    <simple-method method-name="deleteDataCategory" short-description="Delete a Data Category">
-        <make-value entity-name="DataCategory" value-field="lookupKeyValue"/>
-        <set-pk-fields map="parameters" value-field="lookupKeyValue"/>
-        <find-by-primary-key entity-name="DataCategory" map="lookupKeyValue" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
-
   <!-- Methods for DataResourceMetaData -->
     <simple-method method-name="createDataResourceMetaData" short-description="Create Data Resource Meta Data">
         <check-permission permission="CONTENTMGR" action="_CREATE">

Modified: ofbiz/branches/release12.04/specialpurpose/scrum/script/org/ofbiz/scrum/test/ProductBacklogTest.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/specialpurpose/scrum/script/org/ofbiz/scrum/test/ProductBacklogTest.xml?rev=1553936&r1=1553935&r2=1553936&view=diff
==============================================================================
--- ofbiz/branches/release12.04/specialpurpose/scrum/script/org/ofbiz/scrum/test/ProductBacklogTest.xml (original)
+++ ofbiz/branches/release12.04/specialpurpose/scrum/script/org/ofbiz/scrum/test/ProductBacklogTest.xml Sat Dec 28 21:53:07 2013
@@ -183,20 +183,6 @@ under the License.
     
     <simple-method method-name="testNewProductBacklogEmail" short-description="Test New Product Backlog Email" login-required="false">
         <entity-one value-field="userLogin" entity-name="UserLogin">
-            <field-map field-name="userLoginId" value="admin"/>
-        </entity-one>
-        <set-current-user-login value-field="userLogin"/>
-        <set field="parameters.productId" value="DEMO-PRODUCT-1"/>
-        <set field="parameters.custRequestId" value="TEST10"/>
-        <set field="parameters.communicationEventTypeId" value="EMAIL_COMMUNICATION" />
-        <set field="parameters.partyIdFrom" value="DemoCustomer-1"/>
-        <set field="parameters.partyIdTo" value="SCRUMASTER"/>
-        <set field="parameters.subject" value="Test New Product Backlog Email"/>
-        <call-service service-name="createCommunicationEvent" in-map-name="parameters"></call-service>
-    </simple-method>
-    
-    <simple-method method-name="testNewProductBacklogEmail" short-description="Test New Product Backlog Email" login-required="false">
-        <entity-one value-field="userLogin" entity-name="UserLogin">
             <field-map field-name="userLoginId" value="system"/>
         </entity-one>
         <set field="serviceCtx.userLogin" from-field="userLogin"/>