DPML Notify

[mcconnell AT netcompartner.com]

Author: mcconnell
Date: Fri Dec 17 22:24:12 2004
New Revision: 1242

Added:
   development/main/metro/modules/build.xml   (contents, props changed)
Modified:
   development/main/central/site/src/docs/about/resources/issues.xml
   development/main/central/site/src/docs/products/magic/navigation.xml
   
development/main/central/site/src/docs/products/metro/javadoc/navigation.xml
   development/main/central/site/src/docs/products/transit/navigation.xml
   development/main/magic/core/src/main/net/dpml/magic/tasks/ModuleTask.java
   development/main/magic/module.xml
Log:
Fix a couple of problems related to module generation : (a) module parts were 
not being included as imported module references, (b) resources not included 
in a module were generating empty uri module refs

Modified: development/main/central/site/src/docs/about/resources/issues.xml
==============================================================================
--- development/main/central/site/src/docs/about/resources/issues.xml   
(original)
+++ development/main/central/site/src/docs/about/resources/issues.xml   Fri 
Dec 17 22:24:12 2004
@@ -8,7 +8,7 @@
 
    <section name="Issue Tracking">
     <p>
-    Waiting for news from Nicals and Pete.
+    <a href="http://paris.dpml.net:8181/issues";>Scarab Issue Tracking</a>
     </p>
    </section>
   </body>

Modified: development/main/central/site/src/docs/products/magic/navigation.xml
==============================================================================
--- development/main/central/site/src/docs/products/magic/navigation.xml      
  (original)
+++ development/main/central/site/src/docs/products/magic/navigation.xml      
  Fri Dec 17 22:24:12 2004
@@ -29,7 +29,7 @@
       <item name="Antlib" href="antlib/index.html"/>
       <item name="Tasks" href="tasks/index.html"/>
       <item name="Plugins" href="plugins/index.html"/>
-      <item name="Javadoc" href="../../../@MAGIC-DOCS-PATH@/api/index.html"/>
+      <item name="Javadoc" href="../../../@MAGIC-DOCS-PATH@/index.html"/>
     </menu>
 
  </body>

Modified: 
development/main/central/site/src/docs/products/metro/javadoc/navigation.xml
==============================================================================
--- 
development/main/central/site/src/docs/products/metro/javadoc/navigation.xml  
      (original)
+++ 
development/main/central/site/src/docs/products/metro/javadoc/navigation.xml  
      Fri Dec 17 22:24:12 2004
@@ -26,13 +26,13 @@
 
     <menu>
       <item name="Component API" 
-         href="../../../../@METRO-PUBLIC-DOCS-PATH@/api/index.html"/>
+         href="../../../../@METRO-PUBLIC-DOCS-PATH@/index.html"/>
       <item name="Facilities API" 
-         href="../../../../@METRO-PROTECTED-DOCS-PATH@/api/index.html"/>
+         href="../../../../@METRO-PROTECTED-DOCS-PATH@/index.html"/>
       <item name="Tools API" 
-         href="../../../../@METRO-TOOLS-DOCS-PATH@/api/index.html"/>
+         href="../../../../@METRO-TOOLS-DOCS-PATH@/index.html"/>
       <item name="Implementation API" 
-         href="../../../../@METRO-PRIVATE-DOCS-PATH@/api/index.html"/>
+         href="../../../../@METRO-PRIVATE-DOCS-PATH@/index.html"/>
     </menu>
 
  </body>

Modified: 
development/main/central/site/src/docs/products/transit/navigation.xml
==============================================================================
--- development/main/central/site/src/docs/products/transit/navigation.xml    
  (original)
+++ development/main/central/site/src/docs/products/transit/navigation.xml    
  Fri Dec 17 22:24:12 2004
@@ -28,7 +28,7 @@
       <item name="Properties" href="properties/index.html"/>
       <item name="Protocol Specification" href="protocol.html"/>
       <!--<item name="Repository" href="repository.html"/>-->
-      <item name="Javadoc" 
href="../../../@TRANSIT-DOCS-PATH@/api/index.html"/>
+      <item name="Javadoc" href="../../../@TRANSIT-DOCS-PATH@/index.html"/>
     </menu>
 
  </body>

Modified: 
development/main/magic/core/src/main/net/dpml/magic/tasks/ModuleTask.java
==============================================================================
--- development/main/magic/core/src/main/net/dpml/magic/tasks/ModuleTask.java 
  (original)
+++ development/main/magic/core/src/main/net/dpml/magic/tasks/ModuleTask.java 
  Fri Dec 17 22:24:12 2004
@@ -196,6 +196,21 @@
             }
         }
 
+        ResourceRef[] parts = definition.getPartRefs();
+        if( parts.length > 0 )
+        {
+            writer.write( "\n\n    <!-- parts -->\n" );
+            for( int i=0; i<parts.length; i++ )
+            {
+                ResourceRef ref = parts[i];
+                Resource part = getIndex().getResource( ref );
+                if( "module".equals( part.getInfo().getType() ) )
+                {
+                   writer.write( "\n    <import uri=\"" + 
part.getInfo().getURI() + "\"/>" );
+                }
+            }
+        }
+
         writer.write( "\n\n    <!-- module resources -->" );
         for( int i=0; i<definitions.length; i++ )
         {
@@ -284,8 +299,9 @@
     {
         Resource resource = getPrivateIndex().getResource( reference );
         String module = resource.getModule();
-        if(( null != module ) && !modules.contains( module ) )
+        if(( null != module ) && !"".equals( module ) && !modules.contains( 
module ) )
         {
+            System.out.println( "## ADDING MODULE: [" + module + "] from " + 
resource ); 
             modules.add( module );
             ResourceRef[] refs =
               resource.getResourceRefs();

Modified: development/main/magic/module.xml
==============================================================================
--- development/main/magic/module.xml   (original)
+++ development/main/magic/module.xml   Fri Dec 17 22:24:12 2004
@@ -42,6 +42,7 @@
     <x:javadoc>
       <link href="http://java.sun.com/j2se/1.4/docs/api"/>
       <link href="http://www.dpml.net/asf/ant/1.6.2/api"/>
+      <link href="http://www.dpml.net/checkstyle/api/3.4"/>
       <group title="Magic Bootstrap">
         <package name="net.dpml.magic.bootstrap"/>
       </group>
@@ -58,6 +59,7 @@
         <package name="net.dpml.magic.publish"/>
         <package name="net.dpml.magic.upload"/>
         <package name="net.dpml.magic.checkstyle"/>
+        <package name="net.dpml.magic.style"/>
       </group>
     </x:javadoc>
   </target>

Added: development/main/metro/modules/build.xml
==============================================================================
--- (empty file)
+++ development/main/metro/modules/build.xml    Fri Dec 17 22:24:12 2004
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="dpml-metro-modules" default="default" basedir="." 
+    xmlns:magic="antlib:net.dpml.magic">
+
+  <magic:import uri="artifact:template:dpml/magic/reactor"/>
+
+</project>