svn commit: r573126 - in /ofbiz/trunk: applications/marketing/servicedef/services.xml framework/service/dtd/services.xsd

[jonesde]

Author: jonesde
Date: Wed Sep  5 17:47:47 2007
New Revision: 573126

URL: http://svn.apache.org/viewvc?rev=573126&view=rev
Log:
Fixed issue reported by Si in #OFBIZ-1226, and added comment to services.xsd to explain how this is used; BTW, the commit that caused this problem broke rule #1 of first do no harm, that broke existing functionality to add something new that didn't work either

Modified:
    ofbiz/trunk/applications/marketing/servicedef/services.xml
    ofbiz/trunk/framework/service/dtd/services.xsd

Modified: ofbiz/trunk/applications/marketing/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/servicedef/services.xml?rev=573126&r1=573125&r2=573126&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/marketing/servicedef/services.xml Wed Sep  5 17:47:47 2007
@@ -364,7 +364,7 @@
     <service name="marketingPermissionService" engine="simple"
              location="org/ofbiz/common/permission/CommonPermissionServices.xml" invoke="genericBasePermissionCheck">
         <implements service="permissionInterface"/>
-        <attribute name="primaryPermission" type="String" mode="IN" optional="false" default-value="MARKETING"/>
+        <attribute name="primaryPermission" type="String" mode="IN" optional="true" default-value="MARKETING"/>
         <attribute name="altPermission" type="String" mode="IN" optional="true"/>
     </service>    
  </services>

Modified: ofbiz/trunk/framework/service/dtd/services.xsd
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/dtd/services.xsd?rev=573126&r1=573125&r2=573126&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/dtd/services.xsd (original)
+++ ofbiz/trunk/framework/service/dtd/services.xsd Wed Sep  5 17:47:47 2007
@@ -294,7 +294,9 @@
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
-        <xs:attribute type="xs:string" name="default-value"/>
+        <xs:attribute type="xs:string" name="default-value">
+            <xs:annotation><xs:documentation>The value specified will be used for the attribute if no value is passed in. This will only happen if it is okay to not pass a value in, ie if optional=true. If optional=false a value must be passed in so this attribute would be ignored.</xs:documentation></xs:annotation>
+        </xs:attribute>
         <xs:attribute type="xs:string" name="form-label"/>
         <xs:attribute type="xs:string" name="entity-name"/>
         <xs:attribute type="xs:string" name="field-name"/>