You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2007/02/19 20:53:08 UTC

svn commit: r509321 [2/7] - in /ofbiz/trunk/applications: content/data/ content/script/org/ofbiz/content/blog/ content/script/org/ofbiz/content/content/ content/script/org/ofbiz/content/data/ content/script/org/ofbiz/content/survey/ content/script/org/...

Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml?view=diff&rev=509321&r1=509320&r2=509321
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml Mon Feb 19 11:53:06 2007
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you 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.
--->
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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">
@@ -49,11 +49,12 @@
         <set field="content.createdDate" from-field="nowTimestamp"/>
 
         <create-value value-name="content"/>
-        <field-to-result field-name="content.contentId" result-name="contentId"/>
+
+        <field-to-result field-name="content.contentId" result-name="contentId"/>        
     </simple-method>
     <simple-method method-name="updateContent" short-description="Update a Content Record">
         <entity-one entity-name="Content" value-name="content" auto-field-map="true"/>
-        <set-nonpk-fields value-name="content"/>
+        <set-nonpk-fields value-name="content" map-name="parameters"/>
 
         <now-timestamp-to-env env-name="nowTimestamp"/>
         <set field="content.lastModifiedByUserLogin" from-field="userLogin.userLoginId"/>
@@ -62,35 +63,56 @@
         <store-value value-name="content"/>
         <field-to-result field-name="content.contentId" result-name="contentId"/>
     </simple-method>
-    <simple-method method-name="deleteContent" short-description="Delete a Content Record">
+    <simple-method method-name="removeContent" short-description="Remove a Content Record">
         <make-value entity-name="Content" value-name="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
-        <find-by-primary-key entity-name="Content" map-name="lookupKeyValue" value-name="lookedUpValue"/>
-        <remove-value value-name="lookedUpValue"/>
+        <find-by-primary-key entity-name="Content" map-name="lookupKeyValue" value-name="content"/>
+
+        <remove-value value-name="content"/>
+    </simple-method>
+
+    <!-- content assoc services -->
+    <simple-method method-name="createContentAssoc" short-description="Create a ContntAssoc Record">
+        <make-value value-name="assoc" entity-name="ContentAssoc"/>
+        <set-nonpk-fields value-name="assoc" map-name="parameters"/>
+        <set-pk-fields value-name="assoc" map-name="parameters"/>
+
+        <now-timestamp-to-env env-name="nowTimestamp"/>
+        <if-empty field-name="assoc.fromDate">
+            <set field="assoc.fromDate" from-field="nowTimestamp"/>
+        </if-empty>
+        
+        <set field="assoc.lastModifiedByUserLogin" from-field="userLogin.userLoginId"/>
+        <set field="assoc.createdByUserLogin" from-field="userLogin.userLoginId"/>
+        <set field="assoc.lastModifiedDate" from-field="nowTimestamp"/>
+        <set field="assoc.createdDate" from-field="nowTimestamp"/>
+
+        <create-value value-name="assoc"/>
     </simple-method>
+    <simple-method method-name="updateContentAssoc" short-description="Update a ContentAssoc Record">
+        <entity-one entity-name="ContentAssoc" value-name="assoc" auto-field-map="true"/>
+        <set-nonpk-fields value-name="assoc"/>
+
+        <now-timestamp-to-env env-name="nowTimestamp"/>
+        <set field="content.lastModifiedByUserLogin" from-field="userLogin.userLoginId"/>
+        <set field="content.lastModifiedDate" from-field="nowTimestamp"/>
 
-    <!-- other content services -->
+        <store-value value-name="assoc"/>
+    </simple-method>
+    <simple-method method-name="removeContentAssoc" short-description="Remove a Content Assoc Record">
+        <make-value entity-name="ContentAssoc" value-name="lookupKeyValue"/>
+        <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
+        <find-by-primary-key entity-name="Content" map-name="lookupKeyValue" value-name="assoc"/>
+
+        <remove-value value-name="assoc"/>
+    </simple-method>
+
+    <!-- update content; just status -->
     <simple-method method-name="setContentStatus" short-description="Set The Content Status">
     
         <entity-one entity-name="Content" value-name="content"/>
         <field-to-result field-name="content.statusId" result-name="oldStatusId"/>
-   
-        <!-- Test with content permission checking service -->
-        <set field="mapIn.targetOperationList[]" value="CONTENT_UPDATE"/>
-        <set field="mapIn.currentContent" from-field="content"/>
-        <set field="mapIn.userLogin" from-field="parameters.userLogin"/>
-   		<call-service service-name="checkContentPermission" in-map-name="mapIn">
-   			<result-to-field result-name="permissionStatus" field-name="permissionStatus"/>
-   		</call-service>
-       
-   		<if-compare operator="not-equals" field-name="permissionStatus" value="granted">
-	        <check-permission permission="CONTENTMGR" action="_CREATE">
-	            <fail-message message="Security Error: to change the Content Status you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/>
-	        </check-permission>
-        	<check-errors/>
-        
-    	</if-compare>
-         
+
        <if-compare-field field-name="content.statusId" operator="not-equals" to-field-name="parameters.statusId">
             <entity-one entity-name="StatusValidChange" value-name="statusChange" auto-field-map="false">
                 <field-map field-name="statusId" env-name="content.statusId"/>
@@ -109,11 +131,7 @@
         </if-compare-field>
     </simple-method>
 
-    <simple-method method-name="copyContentAndElectronicTextandAssoc" short-description="copy a content, electronic text and assocs and set status in progress">
-        <check-permission permission="CONTENTMGR" action="_CREATE">
-            <fail-message message="Security Error: to run copyContentAndElectronicTextandAssoc you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/></check-permission>
-        <check-errors/>
-        
+    <simple-method method-name="copyContentAndElectronicTextandAssoc" short-description="copy a content, electronic text and assocs and set status in progress">                
         <set-service-fields service-name="getContent" map-name="parameters" to-map-name="getC"/>
         <call-service service-name="getContent" in-map-name="getC">
             <result-to-field result-name="view" field-name="content"/>
@@ -202,41 +220,22 @@
         </if-compare>
         <check-errors/>
     </simple-method>
-
-    <simple-method method-name="removeContentAssoc" short-description="Remove a Content Assoc">
-        <check-permission permission="CONTENTMGR" action="_DELETE"><fail-message message="Security Error: to run removeContentAssoc you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/></check-permission>
-        <check-errors/>
-
-        <make-value entity-name="ContentAssoc" value-name="lookupKeyValue"/>
-        <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
-        <find-by-primary-key entity-name="ContentAssoc" map-name="lookupKeyValue" value-name="lookedUpValue"/>
-        <remove-value value-name="lookedUpValue"/>
-    </simple-method>    
-    
+        
     <!-- Methods for ContentMetaData -->
     <simple-method method-name="createContentMetaData" short-description="Create Content Meta Data">
-        <check-permission permission="CONTENTMGR" action="_CREATE"><fail-message message="Security Error: to run createContentMetaData you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/></check-permission>
-        <check-errors/>
-
         <make-value entity-name="ContentMetaData" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateContentMetaData" short-description="Update Content Meta Data">
-        <check-permission permission="CONTENTMGR" action="_UPDATE"><fail-message message="Security Error: to run updateContentMetaData you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/></check-permission>
-        <check-errors/>
-
         <make-value entity-name="ContentMetaData" value-name="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentMetaData" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
-    <simple-method method-name="removeContentMetaData" short-description="Remove Content Meta Data">
-        <check-permission permission="CONTENTMGR" action="_DELETE"><fail-message message="Security Error: to run removeContentMetaData you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/></check-permission>
-        <check-errors/>
-
+    <simple-method method-name="removeContentMetaData" short-description="Remove Content Meta Data">        
         <make-value entity-name="ContentMetaData" value-name="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentMetaData" map-name="lookupKeyValue" value-name="lookedUpValue"/>
@@ -245,9 +244,6 @@
     
     <!-- Methods for ContentRole -->
     <simple-method method-name="createContentRole" short-description="Create Content Role">
-        <check-permission permission="CONTENTMGR" action="_CREATE"><fail-message message="Security Error: to run createContentRole you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/></check-permission>
-        <check-errors/>
-
         <if-empty field-name="parameters.fromDate">
             <now-timestamp-to-env env-name="parameters.fromDate"/>
         </if-empty>
@@ -270,22 +266,13 @@
         <check-errors/>
     </simple-method>
     <simple-method method-name="updateContentRole" short-description="Update Content Role">
-        <check-permission permission="CONTENTMGR" action="_UPDATE"><fail-message message="Security Error: to run updateContentRole you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/></check-permission>
-        <check-errors/>
-
         <make-value entity-name="ContentRole" value-name="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentRole" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
-    <simple-method method-name="deactivateAllContentRoles" short-description="Update Content Role">
-        <if-compare-field field-name="partyId" map-name="parameters" to-map-name="userLogin" operator="not-equals">
-            <check-permission permission="CONTENTMGR" action="_UPDATE">
-                <fail-message message="Security Error: to run updateContentRole you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/>
-            </check-permission>
-        </if-compare-field>
-                
+    <simple-method method-name="deactivateAllContentRoles" short-description="Update Content Role">                        
         <make-value entity-name="ContentRole" value-name="lookupKeyValue"/>
         <set from-field="parameters.contentId" field="lookupKeyValue.contentId"/>
         <set from-field="parameters.partyId" field="lookupKeyValue.partyId"/>
@@ -297,10 +284,7 @@
             <store-value value-name="role"/>
         </iterate>
     </simple-method>
-    <simple-method method-name="removeContentRole" short-description="Remove Content Role">
-        <check-permission permission="CONTENTMGR" action="_DELETE"><fail-message message="Security Error: to run removeContentRole you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/></check-permission>
-        <check-errors/>
-
+    <simple-method method-name="removeContentRole" short-description="Remove Content Role">        
         <make-value entity-name="ContentRole" value-name="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentRole" map-name="lookupKeyValue" value-name="lookedUpValue"/>
@@ -310,10 +294,6 @@
     
   <!-- Methods for ContentType -->
     <simple-method method-name="createContentType" short-description="Create Content Type">
-        <check-permission action="_CREATE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run createContentType you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
         <make-value entity-name="ContentType" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
@@ -321,10 +301,6 @@
         <field-to-result map-name="newEntity" field-name="contentTypeId" />
     </simple-method>
     <simple-method method-name="updateContentType" short-description="Update Content Type">
-        <check-permission action="_UPDATE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run updateContentType you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
         <make-value entity-name="ContentType" value-name="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentType" map-name="lookupKeyValue" value-name="lookedUpValue"/>
@@ -332,10 +308,6 @@
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeContentType" short-description="Remove Content Type">
-        <check-permission action="_DELETE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run removeContentType you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
         <make-value entity-name="ContentType" value-name="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentType" map-name="lookupKeyValue" value-name="lookedUpValue"/>
@@ -344,20 +316,12 @@
     
     <!-- Methods for ContentTypeAttr -->
     <simple-method method-name="createContentTypeAttr" short-description="Create Content TypeAttr">
-        <check-permission action="_CREATE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run createContentTypeAttr you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
         <make-value entity-name="ContentTypeAttr" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="removeContentTypeAttr" short-description="Remove Content TypeAttr">
-        <check-permission action="_DELETE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run removeContentTypeAttr you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
         <make-value entity-name="ContentTypeAttr" value-name="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentTypeAttr" map-name="lookupKeyValue" value-name="lookedUpValue"/>
@@ -366,10 +330,6 @@
     
     <!-- Methods for ContentAssocType -->
     <simple-method method-name="createContentAssocType" short-description="Create Content AssocType">
-        <check-permission action="_CREATE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run createContentAssocType you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
         <make-value entity-name="ContentAssocType" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
@@ -377,10 +337,6 @@
         <field-to-result map-name="newEntity" field-name="contentAssocTypeId" />
     </simple-method>
     <simple-method method-name="updateContentAssocType" short-description="Update Content AssocType">
-        <check-permission action="_UPDATE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run updateContentAssocType you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
         <make-value entity-name="ContentAssocType" value-name="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentAssocType" map-name="lookupKeyValue" value-name="lookedUpValue"/>
@@ -388,10 +344,6 @@
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeContentAssocType" short-description="Remove Content AssocType">
-        <check-permission action="_DELETE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run removeContentAssocType you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
         <make-value entity-name="ContentAssocType" value-name="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentAssocType" map-name="lookupKeyValue" value-name="lookedUpValue"/>
@@ -400,10 +352,6 @@
     
     <!-- Methods for ContentPurposeType -->
     <simple-method method-name="createContentPurposeType" short-description="Create Content PurposeType">
-        <check-permission action="_CREATE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run createContentPurposeType you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
         <make-value entity-name="ContentPurposeType" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
@@ -414,10 +362,6 @@
         <field-to-result map-name="newEntity" field-name="contentPurposeTypeId" />
     </simple-method>
     <simple-method method-name="updateContentPurposeType" short-description="Update Content PurposeType">
-        <check-permission action="_UPDATE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run updateContentPurposeType you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
         <make-value entity-name="ContentPurposeType" value-name="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentPurposeType" map-name="lookupKeyValue" value-name="lookedUpValue"/>
@@ -425,10 +369,6 @@
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeContentPurposeType" short-description="Remove Content PurposeType">
-        <check-permission action="_DELETE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run removeContentPurposeType you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
         <make-value entity-name="ContentPurposeType" value-name="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentPurposeType" map-name="lookupKeyValue" value-name="lookedUpValue"/>
@@ -437,10 +377,6 @@
     
     <!-- Methods for ContentAssocPredicate -->
     <simple-method method-name="createContentAssocPredicate" short-description="Create Content AssocPredicate">
-        <check-permission action="_CREATE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run createContentAssocPredicate you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
         <make-value entity-name="ContentAssocPredicate" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
@@ -448,10 +384,6 @@
         <field-to-result map-name="newEntity" field-name="contentAssocPredicateId" />
     </simple-method>
     <simple-method method-name="updateContentAssocPredicate" short-description="Update Content AssocPredicate">
-        <check-permission action="_UPDATE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run updateContentAssocPredicate you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
         <make-value entity-name="ContentAssocPredicate" value-name="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentAssocPredicate" map-name="lookupKeyValue" value-name="lookedUpValue"/>
@@ -459,10 +391,6 @@
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeContentAssocPredicate" short-description="Remove Content AssocPredicate">
-        <check-permission action="_DELETE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run removeContentAssocPredicate you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
         <make-value entity-name="ContentAssocPredicate" value-name="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentAssocPredicate" map-name="lookupKeyValue" value-name="lookedUpValue"/>
@@ -471,20 +399,12 @@
     
     <!-- Methods for ContentPurposeOperation -->
     <simple-method method-name="createContentPurposeOperation" short-description="Create Content PurposeOperation">
-        <check-permission action="_CREATE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run createContentPurposeOperation you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
         <make-value entity-name="ContentPurposeOperation" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateContentPurposeOperation" short-description="Update Content PurposeOperation">
-        <check-permission action="_UPDATE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run updateContentPurposeOperation you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
         <make-value entity-name="ContentPurposeOperation" value-name="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentPurposeOperation" map-name="lookupKeyValue" value-name="lookedUpValue"/>
@@ -492,10 +412,6 @@
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeContentPurposeOperation" short-description="Remove Content PurposeOperation">
-        <check-permission action="_DELETE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run removeContentPurposeOperation you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
         <make-value entity-name="ContentPurposeOperation" value-name="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentPurposeOperation" map-name="lookupKeyValue" value-name="lookedUpValue"/>
@@ -504,20 +420,12 @@
     
     <!-- Methods for ContentPurpose -->
     <simple-method method-name="createContentPurpose" short-description="Create Content Purpose">
-        <check-permission action="_CREATE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run createContentPurpose you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
         <make-value entity-name="ContentPurpose" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateContentPurpose" short-description="Update Content Purpose">
-        <check-permission action="_UPDATE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run updateContentPurpose you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
         <make-value entity-name="ContentPurpose" value-name="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentPurpose" map-name="lookupKeyValue" value-name="lookedUpValue"/>
@@ -525,10 +433,6 @@
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeContentPurpose" short-description="Remove Content Purpose">
-        <check-permission action="_DELETE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run removeContentPurpose you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
         <make-value entity-name="ContentPurpose" value-name="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentPurpose" map-name="lookupKeyValue" value-name="lookedUpValue"/>
@@ -537,20 +441,12 @@
     
     <!-- Methods for ContentOperation -->
     <simple-method method-name="createContentOperation" short-description="Create Content Operation">
-        <check-permission action="_CREATE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run createContentOperation you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
         <make-value entity-name="ContentOperation" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateContentOperation" short-description="Update Content Operation">
-        <check-permission action="_UPDATE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run updateContentOperation you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
         <make-value entity-name="ContentOperation" value-name="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentOperation" map-name="lookupKeyValue" value-name="lookedUpValue"/>
@@ -558,10 +454,6 @@
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeContentOperation" short-description="Remove Content Operation">
-        <check-permission action="_DELETE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run removeContentOperation you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
         <make-value entity-name="ContentOperation" value-name="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentOperation" map-name="lookupKeyValue" value-name="lookedUpValue"/>
@@ -570,20 +462,12 @@
     
     <!-- Methods for ContentPurposeOperation -->
     <simple-method method-name="createContentPurposeOperation" short-description="Create Content PurposeOperation">
-        <check-permission action="_CREATE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run createContentPurposeOperation you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
         <make-value entity-name="ContentPurposeOperation" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateContentPurposeOperation" short-description="Update Content PurposeOperation">
-        <check-permission action="_UPDATE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run updateContentPurposeOperation you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
         <make-value entity-name="ContentPurposeOperation" value-name="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentPurposeOperation" map-name="lookupKeyValue" value-name="lookedUpValue"/>
@@ -591,10 +475,6 @@
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeContentPurposeOperation" short-description="Remove Content PurposeOperation">
-        <check-permission action="_DELETE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run removeContentPurposeOperation you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
         <make-value entity-name="ContentPurposeOperation" value-name="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentPurposeOperation" map-name="lookupKeyValue" value-name="lookedUpValue"/>
@@ -603,31 +483,19 @@
     
     <!-- Methods for ContentAttribute -->
     <simple-method method-name="createContentAttribute" short-description="Create Content Attribute">
-        <check-permission action="_CREATE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run createContentAttribute you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
         <make-value entity-name="ContentAttribute" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateContentAttribute" short-description="Update Content Attribute">
-        <check-permission action="_UPDATE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run updateContentAttribute you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
         <make-value entity-name="ContentAttribute" value-name="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentAttribute" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
-    <simple-method method-name="removeContentAttribute" short-description="Remove Content Attribute">
-        <check-permission action="_DELETE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run removeContentAttribute you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
+    <simple-method method-name="removeContentAttribute" short-description="Remove Content Attribute">        
         <make-value entity-name="ContentAttribute" value-name="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentAttribute" map-name="lookupKeyValue" value-name="lookedUpValue"/>
@@ -636,30 +504,19 @@
     
     <!-- Methods for ContentMetaData -->
     <simple-method method-name="createContentMetaData" short-description="Create Content MetaData">
-        <check-permission action="_CREATE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run createContentMetaData you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
         <make-value entity-name="ContentMetaData" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateContentMetaData" short-description="Update Content MetaData">
-        <check-permission action="_UPDATE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run updateContentMetaData you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
         <make-value entity-name="ContentMetaData" value-name="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ContentMetaData" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
-    <simple-method method-name="removeContentMetaData" short-description="Remove Content MetaData">
-        <check-permission action="_DELETE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run removeContentMetaData you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
+    <simple-method method-name="removeContentMetaData" short-description="Remove Content MetaData">        
         <check-errors/>
         <make-value entity-name="ContentMetaData" value-name="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
@@ -1043,9 +900,7 @@
     </simple-method>
     
     <!-- retrieve Data resource information -->
-    <simple-method method-name="getDataResource" short-description="get the content and relasted resource information" login-required="false">
-        <!--check-permission permission="CONTENTMGR" action="_READ"><fail-message message="Security Error: to retrieve content information you must have the CONTENTMGR_READ permission"/></check-permission>
-        <check-errors/-->
+    <simple-method method-name="getDataResource" short-description="get the content and relasted resource information" login-required="false">        
         <entity-one entity-name="DataResource" value-name="resultData.dataResource">
             <field-map field-name="dataResourceId" env-name="parameters.dataResourceId"/>
         </entity-one>
@@ -1063,10 +918,6 @@
     </simple-method>
         
     <simple-method method-name="getContentAndDataResource" short-description="get the content and related resource information" login-required="false">
-        <if-empty field-name="publicForumMessage">
-            <check-permission permission="CONTENTMGR" action="_READ"><fail-message message="Security Error: to retrieve content information you must have the CONTENTMGR_READ permission"/></check-permission>
-            <check-errors/>
-        </if-empty>
         <entity-one entity-name="Content" value-name="resultDataContent.content">
             <field-map field-name="contentId" env-name="parameters.contentId"/>
         </entity-one>
@@ -1085,5 +936,42 @@
     <simple-method method-name="getPublicForumMessage" short-description="get the content and related resource information without security" login-required="false">
         <set field="publicForumMessage" value="true"/>
         <call-simple-method method-name="getContentAndDataResource"/>
+    </simple-method>
+
+    <!-- eca helper services -->
+    <simple-method method-name="checkContentAssocIds" short-description="Checks and prepares contentIdTo and contentId for ContentAssoc service">
+        <if>
+            <condition>
+                <and>
+                    <not>
+                        <if-empty field-name="parameters.contentIdFrom"/>
+                    </not>
+                    <not>
+                        <if-empty field-name="parameters.contentId"/>
+                    </not>
+                    <if-empty field-name="parameters.contentIdTo"/>
+                </and>
+            </condition>
+            <then>
+                <field-to-result field-name="contentIdFrom" map-name="parameters" result-name="contentId"/>
+                <field-to-result field-name="contentId" map-name="parameters" result-name="contentIdTo"/>
+                <log level="info" message="Converted 'contentId' to 'contentIdTo' and 'contentIdFrom' to 'contentId'"/>
+            </then>
+            <else-if>
+                <condition>
+                    <not>
+                        <if-empty field-name="parameters.contentIdTo"/>
+                    </not>
+                </condition>
+                <then>
+                    <field-to-result field-name="contentIdTo" map-name="parameters" result-name="contentIdTo"/>
+                    <field-to-result field-name="contentId" map-name="parameters" result-name="contentId"/>
+                    <log level="info" message="Returned 'contentId' as 'contentId' and 'contentIdTo' as 'contentIdTo'"/>
+                </then>
+            </else-if>
+            <else>
+                <log level="warning" message="Illegal values passed; should be either contentIdTo/contentId or contentIdFrom/contentId :: ${parameters}"/>
+            </else>
+        </if>
     </simple-method>
 </simple-methods>

Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml?view=diff&rev=509321&r1=509320&r2=509321
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/data/DataServices.xml Mon Feb 19 11:53:06 2007
@@ -21,39 +21,56 @@
 <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
         xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/simple-methods.xsd">
 	<!-- Methods for DataResource -->
-        <!-- Note: DEPRECATED for method in DataServices.java -->
-<!--
     <simple-method method-name="createDataResource" short-description="Create a Data Resource">
-        <check-permission permission="CONTENTMGR" action="_CREATE"><fail-message message="Security Error: to run createDataResource you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/></check-permission>
-        <check-errors/>
-
         <make-value entity-name="DataResource" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
 
+        <if-empty field-name="newEntity.dataResourceId">
+            <sequenced-id-to-env sequence-name="DataResource" env-name="dataResourceId"/>
+            <set field="newEntity.dataResourceId" from-field="dataResourceId"/>
+        </if-empty>
+
+        <now-timestamp-to-env env-name="nowTimestamp"/>
+        <set field="newEntity.lastModifiedByUserLogin" from-field="userLogin.userLoginId"/>
+        <set field="newEntity.createdByUserLogin" from-field="userLogin.userLoginId"/>
+        <set field="newEntity.lastModifiedDate" from-field="nowTimestamp"/>
+        <set field="newEntity.createdDate" from-field="nowTimestamp"/>
+
+        <if-empty field-name="dataTemplateTypeId">
+            <set field="newEntity.dataTemplateTypeId" value="NONE"/>
+        </if-empty>
+
+        <if-empty field-name="content.statusId">
+            <!-- get the first status item -->
+            <entity-and entity-name="StatusItem" list-name="contentStatus">
+                <field-map field-name="statusTypeId" value="CONTENT_STATUS"/>
+                <order-by field-name="sequenceId"/>
+            </entity-and>
+            <first-from-list entry-name="statusItem" list-name="contentStatus"/>
+            <set field="newEntity.statusId" from-field="statusItem.statusId"/>
+        </if-empty>
+
         <create-value value-name="newEntity"/>
         <field-to-result field-name="dataResourceId" map-name="newEntity"/>
     </simple-method>
--->
 
-        <!-- Note: DEPRECATED for method in DataServices.java -->
-<!--
     <simple-method method-name="updateDataResource" short-description="Update a Data Resource">
-        <check-permission permission="CONTENTMGR" action="_UPDATE"><fail-message message="Security Error: to run updateDataResource you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/></check-permission>
-        <check-errors/>
-
         <make-value entity-name="DataResource" value-name="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="DataResource" map-name="lookupKeyValue" value-name="lookedUpValue"/>
-	<to-string map-name="parameters" field-name="locale" />
+
+        <to-string map-name="parameters" field-name="locale" />
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+
+        <now-timestamp-to-env env-name="nowTimestamp"/>
+        <set field="lookedUpValue.lastModifiedByUserLogin" from-field="userLogin.userLoginId"/>
+        <set field="lookedUpValue.lastModifiedDate" from-field="nowTimestamp"/>
+
         <store-value value-name="lookedUpValue"/>
     </simple-method>
--->
-    <simple-method method-name="deleteDataResource" short-description="Delete a Data Resource">
-        <check-permission permission="CONTENTMGR" action="_DELETE"><fail-message message="Security Error: to run updateDataResource you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/></check-permission>
-        <check-errors/>
 
+    <simple-method method-name="deleteDataResource" short-description="Delete a Data Resource">        
         <make-value entity-name="DataResource" value-name="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="DataResource" map-name="lookupKeyValue" value-name="lookedUpValue"/>
@@ -62,9 +79,6 @@
 
 	<!-- Methods for DataCategory -->
     <simple-method method-name="createDataCategory" short-description="Create a Data Category">
-        <check-permission permission="CONTENTMGR" action="_CREATE"><fail-message message="Security Error: to run createDataCategory you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/></check-permission>
-        <check-errors/>
-
         <make-value entity-name="DataCategory" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
@@ -73,9 +87,6 @@
         <field-to-result field-name="dataCategoryId" map-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateDataCategory" short-description="Update a Data Category">
-        <check-permission permission="CONTENTMGR" action="_UPDATE"><fail-message message="Security Error: to run updateDataCategory you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/></check-permission>
-        <check-errors/>
-
         <make-value entity-name="DataCategory" value-name="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="DataCategory" map-name="lookupKeyValue" value-name="lookedUpValue"/>
@@ -83,9 +94,6 @@
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="deleteDataCategory" short-description="Delete a Data Category">
-        <check-permission permission="CONTENTMGR" action="_DELETE"><fail-message message="Security Error: to run updateDataCategory you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/></check-permission>
-        <check-errors/>
-
         <make-value entity-name="DataCategory" value-name="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="DataCategory" map-name="lookupKeyValue" value-name="lookedUpValue"/>
@@ -154,28 +162,25 @@
     
 	<!-- Methods for DataResourceRole -->
     <simple-method method-name="createDataResourceRole" short-description="Create Data Resource Role">
-        <check-permission permission="CONTENTMGR" action="_CREATE"><fail-message message="Security Error: to run createDataResourceRole you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/></check-permission>
-        <check-errors/>
-
         <make-value entity-name="DataResourceRole" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
+
+        <if-empty field-name="newEntity.fromDate">
+            <now-timestamp-to-env env-name="nowTimestamp"/>
+            <set field="newEntity.fromDate" from-field="nowTimestamp"/>
+        </if-empty>
+        
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateDataResourceRole" short-description="Update Data Resource Role">
-        <check-permission permission="CONTENTMGR" action="_UPDATE"><fail-message message="Security Error: to run updateDataResourceRole you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/></check-permission>
-        <check-errors/>
-
         <make-value entity-name="DataResourceRole" value-name="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="DataResourceRole" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
-    <simple-method method-name="removeDataResourceRole" short-description="Remove Data Resource Role">
-        <check-permission permission="CONTENTMGR" action="_DELETE"><fail-message message="Security Error: to run removeDataResourceRole you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/></check-permission>
-        <check-errors/>
-
+    <simple-method method-name="removeDataResourceRole" short-description="Remove Data Resource Role">        
         <make-value entity-name="DataResourceRole" value-name="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="DataResourceRole" map-name="lookupKeyValue" value-name="lookedUpValue"/>
@@ -183,33 +188,21 @@
     </simple-method>
     
   <!-- Methods for DataCategory -->
-    <simple-method method-name="createDataCategory" short-description="Create Data Resource Role">
-        <check-permission action="_CREATE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run createDataCategory you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
+    <simple-method method-name="createDataCategory" short-description="Create Data Category">
         <make-value entity-name="DataCategory" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
         <field-to-result field-name="dataCategoryId" map-name="newEntity"/>
     </simple-method>
-    <simple-method method-name="updateDataCategory" short-description="Update Data Resource Role">
-        <check-permission action="_UPDATE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run updateDataCategory you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
+    <simple-method method-name="updateDataCategory" short-description="Update Data Category">
         <make-value entity-name="DataCategory" value-name="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="DataCategory" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
-    <simple-method method-name="removeDataCategory" short-description="Remove Data Resource Role">
-        <check-permission action="_DELETE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run removeDataCategory you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
+    <simple-method method-name="removeDataCategory" short-description="Remove Data DateCategory">       
         <make-value entity-name="DataCategory" value-name="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="DataCategory" map-name="lookupKeyValue" value-name="lookedUpValue"/>
@@ -217,33 +210,21 @@
     </simple-method>
 
     <!-- Methods for DataResourceType -->
-    <simple-method method-name="createDataResourceType" short-description="Create Data Resource Role">
-        <check-permission action="_CREATE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run createDataResourceType you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
+    <simple-method method-name="createDataResourceType" short-description="Create Data Resource Type">
         <make-value entity-name="DataResourceType" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
         <field-to-result field-name="dataResourceTypeId" map-name="newEntity"/>
     </simple-method>
-    <simple-method method-name="updateDataResourceType" short-description="Update Data Resource Role">
-        <check-permission action="_UPDATE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run updateDataResourceType you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
+    <simple-method method-name="updateDataResourceType" short-description="Update Data Resource Type">
         <make-value entity-name="DataResourceType" value-name="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="DataResourceType" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
-    <simple-method method-name="removeDataResourceType" short-description="Remove Data Resource Role">
-        <check-permission action="_DELETE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run removeDataResourceType you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
+    <simple-method method-name="removeDataResourceType" short-description="Remove Data Resource Type">
         <make-value entity-name="DataResourceType" value-name="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="DataResourceType" map-name="lookupKeyValue" value-name="lookedUpValue"/>
@@ -251,87 +232,34 @@
     </simple-method>
     
     <!-- Methods for DataResourceAttribute -->
-    <simple-method method-name="createDataResourceAttribute" short-description="Create Data Resource Role">
-        <check-permission action="_CREATE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run createDataResourceAttribute you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
+    <simple-method method-name="createDataResourceAttribute" short-description="Create Data Resource Attribute">
         <make-value entity-name="DataResourceAttribute" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateDataResourceAttribute" short-description="Update Data Resource Attribute">
-        <check-permission action="_UPDATE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run updateDataResourceAttribute you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
         <make-value entity-name="DataResourceAttribute" value-name="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="DataResourceAttribute" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
-    <simple-method method-name="removeDataResourceAttribute" short-description="Remove Data Resource Attribute">
-        <check-permission action="_DELETE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run removeDataResourceAttribute you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
+    <simple-method method-name="removeDataResourceAttribute" short-description="Remove Data Resource Attribute">        
         <make-value entity-name="DataResourceAttribute" value-name="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="DataResourceAttribute" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
     </simple-method>
-
-    <!-- Methods for DataResourceRole -->
-    <simple-method method-name="createDataResourceRole" short-description="Create Data Resource Role">
-        <check-permission action="_CREATE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run createDataResourceRole you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
-        <make-value entity-name="DataResourceRole" value-name="newEntity"/>
-        <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
-        <set-pk-fields map-name="parameters" value-name="newEntity"/>
-        <create-value value-name="newEntity"/>
-    </simple-method>
-    <simple-method method-name="updateDataResourceRole" short-description="Update Data Resource Role">
-        <check-permission action="_UPDATE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run updateDataResourceRole you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
-        <make-value entity-name="DataResourceRole" value-name="lookupKeyValue"/>
-        <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
-        <find-by-primary-key entity-name="DataResourceRole" map-name="lookupKeyValue" value-name="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
-        <store-value value-name="lookedUpValue"/>
-    </simple-method>
-    <simple-method method-name="removeDataResourceRole" short-description="Remove Data Resource Role">
-        <check-permission action="_DELETE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run removeDataResourceRole you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
-        <make-value entity-name="DataResourceRole" value-name="lookupKeyValue"/>
-        <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
-        <find-by-primary-key entity-name="DataResourceRole" map-name="lookupKeyValue" value-name="lookedUpValue"/>
-        <remove-value value-name="lookedUpValue"/>
-    </simple-method>
-    
+   
     <!-- Methods for DataResourceTypeAttr -->
-    <simple-method method-name="createDataResourceTypeAttr" short-description="Create Data Resource Role">
-        <check-permission action="_CREATE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run createDataResourceTypeAttr you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
+    <simple-method method-name="createDataResourceTypeAttr" short-description="Create Data Resource Type Attribute">
         <make-value entity-name="DataResourceTypeAttr" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>
-    <simple-method method-name="removeDataResourceTypeAttr" short-description="Remove Data Resource Role">
-        <check-permission action="_DELETE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run removeDataResourceTypeAttr you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
+    <simple-method method-name="removeDataResourceTypeAttr" short-description="Remove Data Resource Type Attribute">        
         <make-value entity-name="DataResourceTypeAttr" value-name="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="DataResourceTypeAttr" map-name="lookupKeyValue" value-name="lookedUpValue"/>
@@ -339,33 +267,21 @@
     </simple-method>
     
     <!-- Methods for CharacterSet -->
-    <simple-method method-name="createCharacterSet" short-description="Create Data Resource Role">
-        <check-permission action="_CREATE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run createCharacterSet you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
+    <simple-method method-name="createCharacterSet" short-description="Create Character Set">
         <make-value entity-name="CharacterSet" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
         <field-to-result field-name="characterSetId" map-name="newEntity"/>
     </simple-method>
-    <simple-method method-name="updateCharacterSet" short-description="Update Data Resource Role">
-        <check-permission action="_UPDATE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run updateCharacterSet you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
+    <simple-method method-name="updateCharacterSet" short-description="Update Character Set">
         <make-value entity-name="CharacterSet" value-name="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="CharacterSet" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
-    <simple-method method-name="removeCharacterSet" short-description="Remove Data Resource Role">
-        <check-permission action="_DELETE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run removeCharacterSet you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
+    <simple-method method-name="removeCharacterSet" short-description="Remove Character Set">
         <make-value entity-name="CharacterSet" value-name="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="CharacterSet" map-name="lookupKeyValue" value-name="lookedUpValue"/>
@@ -374,10 +290,6 @@
     
     <!-- Methods for FileExtension -->
     <simple-method method-name="createFileExtension" short-description="Create Data Resource Role">
-        <check-permission action="_CREATE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run createFileExtension you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
         <make-value entity-name="FileExtension" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
@@ -385,10 +297,6 @@
         <field-to-result field-name="fileExtensionId" map-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateFileExtension" short-description="Update Data Resource Role">
-        <check-permission action="_UPDATE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run updateFileExtension you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
         <make-value entity-name="FileExtension" value-name="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="FileExtension" map-name="lookupKeyValue" value-name="lookedUpValue"/>
@@ -396,10 +304,6 @@
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeFileExtension" short-description="Remove Data Resource Role">
-        <check-permission action="_DELETE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run removeFileExtension you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
         <make-value entity-name="FileExtension" value-name="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="FileExtension" map-name="lookupKeyValue" value-name="lookedUpValue"/>
@@ -408,10 +312,6 @@
     
     <!-- Methods for MetaDataPredicate -->
     <simple-method method-name="createMetaDataPredicate" short-description="Create Data Resource Role">
-        <check-permission action="_CREATE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run createMetaDataPredicate you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
         <make-value entity-name="MetaDataPredicate" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
@@ -419,10 +319,6 @@
         <field-to-result field-name="metaDataPredicateId" map-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateMetaDataPredicate" short-description="Update Data Resource Role">
-        <check-permission action="_UPDATE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run updateMetaDataPredicate you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
         <make-value entity-name="MetaDataPredicate" value-name="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="MetaDataPredicate" map-name="lookupKeyValue" value-name="lookedUpValue"/>
@@ -430,10 +326,6 @@
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeMetaDataPredicate" short-description="Remove Data Resource Role">
-        <check-permission action="_DELETE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run removeMetaDataPredicate you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
         <make-value entity-name="MetaDataPredicate" value-name="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="MetaDataPredicate" map-name="lookupKeyValue" value-name="lookedUpValue"/>
@@ -441,33 +333,21 @@
     </simple-method>
     
     <!-- Methods for MimeType -->
-    <simple-method method-name="createMimeType" short-description="Create Data Resource Role">
-        <check-permission action="_CREATE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run createMimeType you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
+    <simple-method method-name="createMimeType" short-description="Create MimeType">
         <make-value entity-name="MimeType" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
         <field-to-result field-name="mimeTypeId" map-name="newEntity"/>
     </simple-method>
-    <simple-method method-name="updateMimeType" short-description="Update Data Resource Role">
-        <check-permission action="_UPDATE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run updateMimeType you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
+    <simple-method method-name="updateMimeType" short-description="Update MimeType">
         <make-value entity-name="MimeType" value-name="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="MimeType" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
-    <simple-method method-name="removeMimeType" short-description="Remove Data Resource Role">
-        <check-permission action="_DELETE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run removeMimeType you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
+    <simple-method method-name="removeMimeType" short-description="Remove MimeType">        
         <make-value entity-name="MimeType" value-name="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="MimeType" map-name="lookupKeyValue" value-name="lookedUpValue"/>
@@ -475,82 +355,48 @@
     </simple-method>
 
     <!-- Methods for ElectronicText -->
-<!--
     <simple-method method-name="createElectronicText" short-description="Create Electronic Text">
-        <check-permission action="_CREATE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run createElectronicText you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
         <make-value entity-name="ElectronicText" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
-        <if-empty field-name="dataResourceId" map-name="newEntity">
-            <string-to-field string="ELECTRONIC_TEXT" field-name="dataResourceTypeId" map-name="serviceCtx"/>
-            <call-service service-name="createDataResource" in-map-name="serviceCtx">
-                <result-to-field result-name="dataResourceId" map-name="newEntity"/>
-            </call-service>
-        </if-empty>
+
         <create-value value-name="newEntity"/>
+        <field-to-result field-name="dataResourceId" map-name="newEntity"/> 
     </simple-method>
--->
-<!--
+
     <simple-method method-name="updateElectronicText" short-description="Update Electronic Text">
-        <check-permission action="_UPDATE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run updateElectronicText you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
         <make-value entity-name="ElectronicText" value-name="lookupKeyValue"/>
+
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="ElectronicText" map-name="lookupKeyValue" value-name="lookedUpValue"/>
+
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
         <field-to-result field-name="dataResourceId" map-name="lookedUpValue"/>
     </simple-method>
--->
     <simple-method method-name="removeElectronicText" short-description="Remove Electronic Text">
-        <check-permission action="_DELETE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run removeElectronicText you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
         <make-value entity-name="ElectronicText" value-name="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
+        
         <find-by-primary-key entity-name="ElectronicText" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <remove-value value-name="lookedUpValue"/>
     </simple-method>
 
     <!-- Methods for OtherDataResource -->
     <simple-method method-name="createOtherDataResource" short-description="Create Other Data Resource">
-        <check-permission action="_CREATE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run createElectronicText you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
         <make-value entity-name="OtherDataResource" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
-        <if-empty field-name="dataResourceId" map-name="newEntity">
-            <set field="serviceCtx.dataResourceTypeId" value="OTHER_OBJECT"/>
-            <call-service service-name="createDataResource" in-map-name="serviceCtx">
-                <result-to-field result-name="dataResourceId" map-name="newEntity"/>
-            </call-service>
-        </if-empty>
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateOtherDataResource" short-description="Update Other Data Resource">
-        <check-permission action="_UPDATE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run updateElectronicText you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
         <make-value entity-name="OtherDataResource" value-name="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="OtherDataResource" map-name="lookupKeyValue" value-name="lookedUpValue"/>
         <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
         <store-value value-name="lookedUpValue"/>
     </simple-method>
-    <simple-method method-name="removeOtherDataResource" short-description="Remove Other Data Resource">
-        <check-permission action="_DELETE" permission="CONTENTMGR">
-            <fail-message message="Security Error: to run removeElectronicText you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
+    <simple-method method-name="removeOtherDataResource" short-description="Remove Other Data Resource">        
         <make-value entity-name="OtherDataResource" value-name="lookupKeyValue"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="OtherDataResource" map-name="lookupKeyValue" value-name="lookedUpValue"/>

Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/survey/SurveyServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/survey/SurveyServices.xml?view=diff&rev=509321&r1=509320&r2=509321
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/survey/SurveyServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/survey/SurveyServices.xml Mon Feb 19 11:53:06 2007
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you 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.
--->
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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">
@@ -607,6 +607,7 @@
             </if-validate-method>
         </if-compare>
     </simple-method>
+
     <simple-method method-name="processSurveyResponseInline" short-description="processSurveyResponseInline" login-required="false">
         <if-not-empty field-name="currentAnswers">
             <set field="responseAnswer" from-field="currentAnswers.${currentFieldName}"/>

Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml?view=diff&rev=509321&r1=509320&r2=509321
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml Mon Feb 19 11:53:06 2007
@@ -20,26 +20,23 @@
 
 <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="createWebSite" short-description="Create an WebSite">
-        <check-permission permission="CATALOG" action="_CREATE">
-        	<alt-permission permission="CONTENTMGR" action="_CREATE"/>
-        	<fail-message message="Security Error: to run createWebSite you must have the CATALOG_CREATE or CATALOG_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
 
+    <!-- WebSite Services -->
+    <simple-method method-name="createWebSite" short-description="Create a WebSite">
         <make-value value-name="newEntity" entity-name="WebSite"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         
         <create-value value-name="newEntity"/>
     </simple-method>
-    <simple-method method-name="updateWebSite" short-description="Update an WebSite">
-        <check-permission permission="CATALOG" action="_UPDATE">
-        	<alt-permission permission="CONTENTMGR" action="_UPDATE"/>
-        	<fail-message message="Security Error: to run updateWebSite you must have the CATALOG_UPDATE or CATALOG_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
-
+    <simple-method method-name="updateWebSite" short-description="Update a WebSite">
+        <make-value value-name="lookupKeyValue" entity-name="WebSite"/>
+        <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
+        <find-by-primary-key entity-name="WebSite" map-name="lookupKeyValue" value-name="lookedUpValue"/>
+        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+        <store-value value-name="lookedUpValue"/>
+    </simple-method>
+    <simple-method method-name="removeWebSite" short-description="Remove a WebSite">
         <make-value value-name="lookupKeyValue" entity-name="WebSite"/>
         <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
         <find-by-primary-key entity-name="WebSite" map-name="lookupKeyValue" value-name="lookedUpValue"/>
@@ -47,14 +44,8 @@
         <store-value value-name="lookedUpValue"/>
     </simple-method>
 
-    <!-- Party and WebSite services -->
-    <simple-method method-name="addWebSiteRole" short-description="Add WebSite Role">
-        <check-permission permission="CONTENTMGR" action="_CREATE">
-        	<alt-permission permission="PARTYMGR" action="_CREATE"/>
-        	<fail-message message="Security Error: to run addWebSiteRole you must have the CONTENT_CREATE or CONTENT_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
-
+    <!-- WebSite Role Services -->
+    <simple-method method-name="createWebSiteRole" short-description="Create WebSite Role">
         <make-value value-name="newEntity" entity-name="WebSiteRole"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
@@ -67,12 +58,6 @@
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateWebSiteRole" short-description="Update WebSite Role">
-        <check-permission permission="CONTENTMGR" action="_UPDATE">
-        	<alt-permission permission="PARTYMGR" action="_UPDATE"/>
-        	<fail-message message="Security Error: to run updateWebSiteRole you must have the CONTENT_UPDATE or CONTENT_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
-
         <make-value value-name="lookupPKMap" entity-name="WebSiteRole"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key entity-name="WebSiteRole" map-name="lookupPKMap" value-name="lookedUpValue"/>
@@ -80,12 +65,6 @@
         <store-value value-name="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="removeWebSiteRole" short-description="Remove WebSite Role">
-        <check-permission permission="CONTENTMGR" action="_DELETE">
-        	<alt-permission permission="PARTYMGR" action="_DELETE"/>
-        	<fail-message message="Security Error: to run removeWebSiteRole you must have the CONTENT_DELETE or CONTENT_ADMIN permission"/>
-        </check-permission>
-        <check-errors/>
-
         <make-value value-name="lookupPKMap" entity-name="WebSiteRole"/>
         <set-pk-fields map-name="parameters" value-name="lookupPKMap"/>
         <find-by-primary-key entity-name="WebSiteRole" map-name="lookupPKMap" value-name="lookedUpValue"/>