[OFBiz] SVN: r7737 - in trunk/applications: order/script/org/ofbiz/order order/script/org/ofbiz/order/communication order/servicedef party/script/org/ofbiz/party/communication party/servicedef product/entitydef product/script/org/ofbiz/product product/script/org/ofbiz/product/communication product/servicedef

jacopo@svn.ofbiz.org jacopo at svn.ofbiz.org
Sat Jun 3 09:00:38 CDT 2006


Author: jacopo
Date: 2006-06-03 09:00:11 -0500 (Sat, 03 Jun 2006)
New Revision: 7737

Added:
   trunk/applications/order/script/org/ofbiz/order/communication/
   trunk/applications/order/script/org/ofbiz/order/communication/CommunicationEventServices.xml
   trunk/applications/product/script/org/ofbiz/product/communication/
   trunk/applications/product/script/org/ofbiz/product/communication/CommunicationEventServices.xml
Modified:
   trunk/applications/order/servicedef/services.xml
   trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml
   trunk/applications/party/servicedef/services.xml
   trunk/applications/product/entitydef/entitymodel.xml
   trunk/applications/product/servicedef/services.xml
Log:
Moved CommunicationEventOrder and CommunicationEventProduct related services view definitions from the party to the order and product components.

Added: trunk/applications/order/script/org/ofbiz/order/communication/CommunicationEventServices.xml
===================================================================
--- trunk/applications/order/script/org/ofbiz/order/communication/CommunicationEventServices.xml	2006-06-03 13:34:27 UTC (rev 7736)
+++ trunk/applications/order/script/org/ofbiz/order/communication/CommunicationEventServices.xml	2006-06-03 14:00:11 UTC (rev 7737)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+Copyright 2001-2006 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not
+use this file except in compliance with the License. You may obtain a copy of
+the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+License for the specific language governing permissions and limitations
+under the License.
+-->
+
+<simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+        xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/simple-methods.xsd">
+    <simple-method method-name="createCommunicationEventOrder" short-description="Create a CommunicationEventOrder">
+        <check-permission permission="ORDERMGR" action="_CREATE">
+            <fail-property resource="OrderUiLabels" property="OrderCreateCommunicationEventProductPermissionError"/>
+        </check-permission>
+        <check-errors/>
+        <make-value value-name="newEntity" entity-name="CommunicationEventOrder"/>
+        <set-pk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <create-value value-name="newEntity"/>    
+    </simple-method>
+    <simple-method method-name="removeCommunicationEventOrder" short-description="Remove a CommunicationEventOrder">
+        <check-permission permission="ORDERMGR" action="_CREATE">
+            <fail-property resource="OrderUiLabels" property="OrderRemoveCommunicationEventOrderPermissionError"/>
+        </check-permission>
+        <check-errors/>
+        <entity-one entity-name="CommunicationEventOrder" value-name="eventOrder"/>
+        <remove-value value-name="eventOrder"/>
+    </simple-method>
+</simple-methods>


Property changes on: trunk/applications/order/script/org/ofbiz/order/communication/CommunicationEventServices.xml
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + "Date Rev Author URL Id"
Name: svn:eol-style
   + native

Modified: trunk/applications/order/servicedef/services.xml
===================================================================
--- trunk/applications/order/servicedef/services.xml	2006-06-03 13:34:27 UTC (rev 7736)
+++ trunk/applications/order/servicedef/services.xml	2006-06-03 14:00:11 UTC (rev 7737)
@@ -480,5 +480,17 @@
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
+    
+    <!-- CommunicationEvents related to orders -->
+    <service name="createCommunicationEventOrder" engine="simple"
+            location="org/ofbiz/order/communication/CommunicationEventServices.xml" invoke="createCommunicationEventOrder" auth="true">
+        <description>Create a Communication Event Order</description>
+        <auto-attributes entity-name="CommunicationEventOrder" include="pk" mode="IN" optional="false"/>
+    </service>
+    <service name="removeCommunicationEventOrder" engine="simple"
+            location="org/ofbiz/order/communication/CommunicationEventServices.xml" invoke="removeCommunicationEventOrder" auth="true">
+        <description>Remove a Communication Event Order</description>
+        <auto-attributes entity-name="CommunicationEventOrder" include="pk" mode="IN" optional="false"/>
+    </service>
 </services>
 

Modified: trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml
===================================================================
--- trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml	2006-06-03 13:34:27 UTC (rev 7736)
+++ trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml	2006-06-03 14:00:11 UTC (rev 7737)
@@ -153,40 +153,4 @@
             </then>
         </if>        
     </simple-method>
-    <simple-method method-name="createCommunicationEventProduct" short-description="Create a CommunicationEventProduct">
-        <check-permission permission="PARTYMGR" action="_CME_UPDATE">
-            <fail-property resource="PartyUiLabels" property="PartyCreateCommunicationEventProductPermissionError"/>
-        </check-permission>
-        <check-errors/>
-        <make-value value-name="newEntity" entity-name="CommunicationEventProduct"/>
-        <set-pk-fields map-name="parameters" value-name="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
-        <create-value value-name="newEntity"/>    
-    </simple-method>
-    <simple-method method-name="removeCommunicationEventProduct" short-description="Remove a CommunicationEventProduct">
-        <check-permission permission="PARTYMGR" action="_CME_UPDATE">
-            <fail-property resource="PartyUiLabels" property="PartyRemoveCommunicationEventProductPermissionError"/>
-        </check-permission>
-        <check-errors/>
-        <entity-one entity-name="CommunicationEventProduct" value-name="eventProduct"/>
-        <remove-value value-name="eventProduct"/>
-    </simple-method>
-    <simple-method method-name="createCommunicationEventOrder" short-description="Create a CommunicationEventOrder">
-        <check-permission permission="PARTYMGR" action="_CME_UPDATE">
-            <fail-property resource="PartyUiLabels" property="PartyCreateCommunicationEventProductPermissionError"/>
-        </check-permission>
-        <check-errors/>
-        <make-value value-name="newEntity" entity-name="CommunicationEventOrder"/>
-        <set-pk-fields map-name="parameters" value-name="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
-        <create-value value-name="newEntity"/>    
-    </simple-method>
-    <simple-method method-name="removeCommunicationEventOrder" short-description="Remove a CommunicationEventOrder">
-        <check-permission permission="PARTYMGR" action="_CME_UPDATE">
-            <fail-property resource="PartyUiLabels" property="PartyRemoveCommunicationEventOrderPermissionError"/>
-        </check-permission>
-        <check-errors/>
-        <entity-one entity-name="CommunicationEventOrder" value-name="eventOrder"/>
-        <remove-value value-name="eventOrder"/>
-    </simple-method>
 </simple-methods>

Modified: trunk/applications/party/servicedef/services.xml
===================================================================
--- trunk/applications/party/servicedef/services.xml	2006-06-03 13:34:27 UTC (rev 7736)
+++ trunk/applications/party/servicedef/services.xml	2006-06-03 14:00:11 UTC (rev 7737)
@@ -628,26 +628,6 @@
         <auto-attributes include="pk" mode="INOUT" optional="true" entity-name="CommunicationEventWorkEff"/>
         <auto-attributes include="nonpk" mode="IN" optional="true" entity-name="CommunicationEventWorkEff"/>
     </service>
-    <service name="createCommunicationEventProduct" engine="simple"
-            location="org/ofbiz/party/communication/CommunicationEventServices.xml" invoke="createCommunicationEventProduct" auth="true">
-        <description>Create a Communication Event Product</description>
-        <auto-attributes entity-name="CommunicationEventProduct" include="pk" mode="IN" optional="false"/>
-    </service>
-    <service name="removeCommunicationEventProduct" engine="simple"
-            location="org/ofbiz/party/communication/CommunicationEventServices.xml" invoke="removeCommunicationEventProduct" auth="true">
-        <description>Remove a Communication Event Product</description>
-        <auto-attributes entity-name="CommunicationEventProduct" include="pk" mode="IN" optional="false"/>
-    </service>
-    <service name="createCommunicationEventOrder" engine="simple"
-            location="org/ofbiz/party/communication/CommunicationEventServices.xml" invoke="createCommunicationEventOrder" auth="true">
-        <description>Create a Communication Event Order</description>
-        <auto-attributes entity-name="CommunicationEventOrder" include="pk" mode="IN" optional="false"/>
-    </service>
-    <service name="removeCommunicationEventOrder" engine="simple"
-            location="org/ofbiz/party/communication/CommunicationEventServices.xml" invoke="removeCommunicationEventOrder" auth="true">
-        <description>Remove a Communication Event Order</description>
-        <auto-attributes entity-name="CommunicationEventOrder" include="pk" mode="IN" optional="false"/>
-    </service>
     <service name="markCommEventRead" engine="simple"
             location="org/ofbiz/party/communication/CommunicationEventServices.xml" invoke="markEventRead" auth="true">
         <description>Marks a communication event as read if in the entered/pending status</description>

Modified: trunk/applications/product/entitydef/entitymodel.xml
===================================================================
--- trunk/applications/product/entitydef/entitymodel.xml	2006-06-03 13:34:27 UTC (rev 7736)
+++ trunk/applications/product/entitydef/entitymodel.xml	2006-06-03 14:00:11 UTC (rev 7737)
@@ -1704,7 +1704,7 @@
       </relation>
     </entity>
     <view-entity entity-name="CommunicationEventAndProduct"
-                 package-name="org.ofbiz.party.communication"
+                 package-name="org.ofbiz.product.communication"
                  title="Communication Event And Product View Entity">
       <member-entity entity-alias="CP" entity-name="CommunicationEventProduct"/>
       <member-entity entity-alias="CE" entity-name="CommunicationEvent"/>

Added: trunk/applications/product/script/org/ofbiz/product/communication/CommunicationEventServices.xml
===================================================================
--- trunk/applications/product/script/org/ofbiz/product/communication/CommunicationEventServices.xml	2006-06-03 13:34:27 UTC (rev 7736)
+++ trunk/applications/product/script/org/ofbiz/product/communication/CommunicationEventServices.xml	2006-06-03 14:00:11 UTC (rev 7737)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+Copyright 2001-2006 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not
+use this file except in compliance with the License. You may obtain a copy of
+the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+License for the specific language governing permissions and limitations
+under the License.
+-->
+
+<simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+        xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/simple-methods.xsd">
+    <simple-method method-name="createCommunicationEventProduct" short-description="Create a CommunicationEventProduct">
+        <check-permission permission="CATALOG" action="_CREATE">
+            <fail-property resource="ProductUiLabels" property="ProductCreateCommunicationEventProductPermissionError"/>
+        </check-permission>
+        <check-errors/>
+        <make-value value-name="newEntity" entity-name="CommunicationEventProduct"/>
+        <set-pk-fields map-name="parameters" value-name="newEntity"/>
+        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+        <create-value value-name="newEntity"/>    
+    </simple-method>
+    <simple-method method-name="removeCommunicationEventProduct" short-description="Remove a CommunicationEventProduct">
+        <check-permission permission="CATALOG" action="_DELETE">
+            <fail-property resource="PartyUiLabels" property="ProductRemoveCommunicationEventProductPermissionError"/>
+        </check-permission>
+        <check-errors/>
+        <entity-one entity-name="CommunicationEventProduct" value-name="eventProduct"/>
+        <remove-value value-name="eventProduct"/>
+    </simple-method>
+</simple-methods>


Property changes on: trunk/applications/product/script/org/ofbiz/product/communication/CommunicationEventServices.xml
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + "Date Rev Author URL Id"
Name: svn:eol-style
   + native

Modified: trunk/applications/product/servicedef/services.xml
===================================================================
--- trunk/applications/product/servicedef/services.xml	2006-06-03 13:34:27 UTC (rev 7736)
+++ trunk/applications/product/servicedef/services.xml	2006-06-03 14:00:11 UTC (rev 7737)
@@ -979,5 +979,15 @@
         <description>Delete a ProductMeter</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
+    <service name="createCommunicationEventProduct" engine="simple"
+            location="org/ofbiz/product/communication/CommunicationEventServices.xml" invoke="createCommunicationEventProduct" auth="true">
+        <description>Create a Communication Event Product</description>
+        <auto-attributes entity-name="CommunicationEventProduct" include="pk" mode="IN" optional="false"/>
+    </service>
+    <service name="removeCommunicationEventProduct" engine="simple"
+            location="org/ofbiz/product/communication/CommunicationEventServices.xml" invoke="removeCommunicationEventProduct" auth="true">
+        <description>Remove a Communication Event Product</description>
+        <auto-attributes entity-name="CommunicationEventProduct" include="pk" mode="IN" optional="false"/>
+    </service>
     
 </services>



More information about the Svn mailing list