DPML Notify

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

Author: mcconnell
Date: 2006-05-25 08:02:59 +0200 (Thu, 25 May 2006)
New Revision: 1457

Added:
   trunk/main/depot/library/etc/data/samples/jar-type.xml
Removed:
   trunk/main/depot/library/etc/data/samples/rmic.xml
Modified:
   
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/PrepareTask.java
   trunk/main/lang/module/etc/module.xsd
Log:
housekeeping


Copied: trunk/main/depot/library/etc/data/samples/jar-type.xml (from rev 
1454, trunk/main/depot/library/etc/data/samples/rmic.xml)
===================================================================
--- trunk/main/depot/library/etc/data/samples/rmic.xml  2006-05-23 05:52:18 
UTC (rev 1454)
+++ trunk/main/depot/library/etc/data/samples/jar-type.xml      2006-05-25 
06:02:59 UTC (rev 1457)
@@ -0,0 +1,82 @@
+<?xml version="1.0"?>
+
+<library xmlns="@MODULE-XSD-URI@" 
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+
+  <modules>
+    <module name="acme">
+      <project name="widget" basedir=".">
+        <types>
+          <type xsi:type="jar" compress="false" index="false">
+            <src>
+              <include name="batman"/>
+              <exclude name="robin"/>
+            </src>
+            <rmic>
+              <include name="red"/>
+              <include name="white"/>
+              <include name="blue"/>
+              <exclude name="pink"/>
+              <exclude name="magenta"/>
+            </rmic>
+          </type>
+        </types>
+      </project>
+    </module>
+  </modules>
+  
+  <!--
+  <project name="widget" basedir=".">
+    <data src="classic" work="target">
+      <process xsi:type="normalization">
+        <copy from="classic:src.main" to="target:build.main">
+          <selection>
+            <include name="**/*"/>
+          </selection>
+          <filtered>
+            <include name="**/*.java"/>
+            <include name="**/*.x*"/>
+            <include name="**/*.properties"/>
+            <include name="**/*.html"/>
+          </filtered>
+        </copy>
+        <copy from="classic:src.test" to="target:build.test">
+        
+        </copy>
+        <copy from="classic:etc.main" to="target:build.main"/>
+        <copy from="classic:etc.test" to="target:build.test"/>
+        <copy from="classic:etc.data" to="target:test"/>
+      </process>
+      <process xsi:type="compilation">
+        <compile src="build.main" dest="compile.main"
+      </process>
+       
+      <process xsi:type="selection" id="compile-main">
+        <include name="**/*.java"/>
+      </process>
+      <type xsi:type="jar" compress="false" index="false" 
depends="compile-main">
+        <src>
+          <include name="batman"/>
+          <exclude name="robin"/>
+        </src>
+        <rmic>
+          <include name="red"/>
+          <include name="white"/>
+          <include name="blue"/>
+          <exclude name="pink"/>
+          <exclude name="magenta"/>
+        </rmic>
+      </type>
+      <process xsi:type="selection" id="prepare-test">
+        <fileset dir="
+        <include name="**/*.java"/>
+      </process>
+      <process xsi:type="selection" id="compile-test">
+        <include name="**/*.java"/>
+      </process>
+    </data>
+  </project>
+  -->
+
+</library>
+

Deleted: trunk/main/depot/library/etc/data/samples/rmic.xml
===================================================================
--- trunk/main/depot/library/etc/data/samples/rmic.xml  2006-05-23 17:08:35 
UTC (rev 1456)
+++ trunk/main/depot/library/etc/data/samples/rmic.xml  2006-05-25 06:02:59 
UTC (rev 1457)
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-
-<library xmlns="@MODULE-XSD-URI@" 
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
-
-  <modules>
-    <module name="acme">
-      <types>
-        <data xsi:type="RMICType">
-          <include name="red"/>
-          <include name="white"/>
-          <include name="blue"/>
-          <exclude name="pink"/>
-          <exclude name="magenta"/>
-        </data>
-      </types>
-    </module>
-  </modules>
-
-</library>

Modified: 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/PrepareTask.java
===================================================================
--- 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/PrepareTask.java 
      2006-05-23 17:08:35 UTC (rev 1456)
+++ 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/PrepareTask.java 
      2006-05-25 06:02:59 UTC (rev 1457)
@@ -161,7 +161,6 @@
             //
             
             final File etcTest = context.getEtcTestDirectory();
-            //final File test = context.getTargetDirectory( "test" );
             final File test = context.getTargetDirectory( "build/test" );
             copy( etcTest, test, true, includes, excludes );
             copy( etcTest, test, false, excludes, "" );

Modified: trunk/main/lang/module/etc/module.xsd
===================================================================
--- trunk/main/lang/module/etc/module.xsd       2006-05-23 17:08:35 UTC (rev 
1456)
+++ trunk/main/lang/module/etc/module.xsd       2006-05-25 06:02:59 UTC (rev 
1457)
@@ -196,11 +196,13 @@
       </complexContent>
     </complexType>
     
+    <!--
     <complexType name="RMICType">
       <complexContent>
         <extension base="this:PatternCollectionType"/>
       </complexContent>
     </complexType>
+    -->
     
     <complexType name="PatternCollectionType">
       <choice minOccurs="0" maxOccurs="unbounded">