DPML Notify

[mcconnell at BerliOS <mcconnell AT mail.berlios.de>]

Author: mcconnell
Date: 2006-05-01 19:25:01 +0200 (Mon, 01 May 2006)
New Revision: 1423

Modified:
   trunk/main/lang/process/etc/process.xsd
   trunk/main/lang/process/etc/test/sample.xml
Log:
improvements to filtering semantics within a process dependency inclusion 
selection

Modified: trunk/main/lang/process/etc/process.xsd
===================================================================
--- trunk/main/lang/process/etc/process.xsd     2006-05-01 16:48:46 UTC (rev 
1422)
+++ trunk/main/lang/process/etc/process.xsd     2006-05-01 17:25:01 UTC (rev 
1423)
@@ -98,6 +98,7 @@
     <complexType name="InputType">
       <attribute name="id" type="string" use="required"/>
       <attribute name="policy" type="this:PolicyType" default="optional"/>
+      <attribute name="filtering" type="boolean" default="false"/>
     </complexType>
     
     <complexType name="Selection">
@@ -115,7 +116,6 @@
     
     <complexType name="SelectorType">
       <attribute name="name" type="string"/>
-      <attribute name="filter" type="boolean" default="true"/>
     </complexType>
     
     <complexType name="OutputType">

Modified: trunk/main/lang/process/etc/test/sample.xml
===================================================================
--- trunk/main/lang/process/etc/test/sample.xml 2006-05-01 16:48:46 UTC (rev 
1422)
+++ trunk/main/lang/process/etc/test/sample.xml 2006-05-01 17:25:01 UTC (rev 
1423)
@@ -55,13 +55,11 @@
   
   <process name="prepare-main" 
class="net.dpml.tools.process.PrepareMainProcess">
     <consumes>
-      <input xsi:type="Selection" id="etc.main" policy="optional">
-        <include name="*.*"/>
-        <exclude name=""/>
+      <input xsi:type="Selection" id="etc.main" filtering="false">
+        <include 
name="**/*.exe,**/*.jar*,**/*.dll,**/*.gif,**/*.jpeg,**/*.jpg,**/*.ico,**/*.png,**/*.keystore"/>
       </input>
-      <input xsi:type="Selection" id="src.main" policy="optional">
-        <include name="*.*"/>
-        <exclude name=""/>
+      <input xsi:type="Selection" id="etc.main" filtering="true">
+        <exclude 
name="**/*.exe,**/*.jar*,**/*.dll,**/*.gif,**/*.jpeg,**/*.jpg,**/*.ico,**/*.png,**/*.keystore"/>
       </input>
     </consumes>
     <produces id="target.build.main.dir"/>
@@ -69,7 +67,7 @@
   
   <process name="prepare-test" 
class="net.dpml.tools.process.PrepareTestProcess">
     <consumes policy="conditional">
-      <input id="target.build.main.dir" policy="optional"/>
+      <input id="target.build.main.dir"/>
       <input id="src.test" policy="optional"/>
     </consumes>
     <produces id="target.build.test.dir"/>
@@ -84,7 +82,7 @@
   
   <process name="compile-test" 
class="net.dpml.tools.process.CompileTestProcess" implicit="true">
     <consumes>
-      <input id="target.classes.main.dir" policy="optional"/>
+      <input id="target.classes.main.dir"/>
       <input id="target.build.test.dir" policy="conditional"/>
     </consumes>
     <produces id="target.classes.test.dir"/>
@@ -95,7 +93,7 @@
       <include id="prepare-test"/>
     </dependencies>
     <consumes policy="conditional">
-      <input id="etc.test" policy="optional"/>
+      <input id="etc.test"/>
     </consumes>
     <produces id="target.test.dir"/>
   </process>
@@ -106,7 +104,7 @@
       <include id="compile-test"/>
     </dependencies>
     <consumes>
-      <input id="target.test.dir" policy="optional"/>
+      <input id="target.test.dir"/>
       <input id="target.classes.test.dir" policy="conditional"/>
       <input id="target.classes.main.dir"/>
     </consumes>
@@ -134,7 +132,7 @@
   
   <process name="part" class="net.dpml.tools.process.PartProcess">
     <consumes>
-      <input id="target.classes.main.dir" policy="optional"/>
+      <input id="target.classes.main.dir"/>
     </consumes>
     <produces id="target.deliverables.part"/>
   </process>