- Rule and action tasks for 1.4

- Updated W/S include paths

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3526 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/rule/ruleModel.xml

@@ -16,7 +16,6 @@
       <namespace uri="http://www.alfresco.org/model/rule/1.0" prefix="rule"/>
    </namespaces>
 
-   
    <types>
    
 	  <type name="rule:rule">
@@ -36,6 +35,11 @@
                <type>d:boolean</type>
                <mandatory>true</mandatory>
             </property>
+            <property name="rule:disabled">
+               <type>d:boolean</type>
+               <mandatory>true</mandatory>
+               <default>false</default>
+            </property>
          </properties>          
          <associations>
             <child-association name="rule:action">
@@ -68,6 +72,10 @@
             </child-association>
          </associations>  
       </aspect>
+      
+      <aspect name="rule:ignoreInheritedRules">
+         <title>Ignore Inherited Rules</title>           
+      </aspect>
          
 	</aspects>