cvs server: Diffing nbbuild/plans
Index: nbbuild/plans/all_features.xml
===================================================================
RCS file: /cvs/nbbuild/plans/all_features.xml,v
retrieving revision 1.8
diff -u -t -r1.8 all_features.xml
--- nbbuild/plans/all_features.xml	2001/06/15 16:56:50	1.8
+++ nbbuild/plans/all_features.xml	2001/06/16 23:08:04
@@ -13,7 +13,7 @@
 Microsystems, Inc. All Rights Reserved.
 -->
 
-<!DOCTYPE XTeam [
+<!DOCTYPE xteam [
     <!ENTITY nbbuild            SYSTEM "../../nbbuild/www/plans/features.xml">
     <!ENTITY javacvs            SYSTEM "../../javacvs/www/plans/features.xml">
     <!ENTITY vcsgeneric         SYSTEM "../../vcsgeneric/www/plans/features.xml">
@@ -30,12 +30,12 @@
     <!ENTITY icebrowser         SYSTEM "../../icebrowser/www/plans/features.xml">
     <!ENTITY rmi                SYSTEM "../../rmi/www/plans/features.xml">
     <!ENTITY core               SYSTEM "../../core/www/plans/features.xml">
+    <!ENTITY ant                SYSTEM "../../ant/www/plans/features.xml">
+    <!ENTITY apisupport         SYSTEM "../../apisupport/www/plans/features.xml">
+    <!ENTITY openide            SYSTEM "../../openide/www/plans/features.xml">
    
     <!-- 
-    <!ENTITY ant                SYSTEM "../../ant/www/plans/features.xml">
     <!ENTITY antlr              SYSTEM "../../antlr/www/plans/features.xml">
-    <!ENTITY apisupport         SYSTEM "../../apisupport/www/plans/features.xml">
-    <!ENTITY apisupportx        SYSTEM "../../apisupportx/www/plans/features.xml">
     <!ENTITY autoupdate         SYSTEM "../../autoupdate/www/plans/features.xml">
     <!ENTITY cpplite            SYSTEM "../../cpplite/www/plans/features.xml">
     <!ENTITY crosscompile       SYSTEM "../../crosscompile/www/plans/features.xml">
@@ -56,7 +56,6 @@
     <!ENTITY multicompile       SYSTEM "../../multicompile/www/plans/features.xml">
     <!ENTITY nbbuild            SYSTEM "../../nbbuild/www/plans/features.xml">
     <!ENTITY objectbrowser      SYSTEM "../../objectbrowser/www/plans/features.xml">
-    <!ENTITY openide            SYSTEM "../../openide/www/plans/features.xml">
     <!ENTITY openidex           SYSTEM "../../openidex/www/plans/features.xml">
     <!ENTITY projects           SYSTEM "../../projects/www/plans/features.xml">
     <!ENTITY properties         SYSTEM "../../properties/www/plans/features.xml">
@@ -82,12 +81,26 @@
     <!ENTITY debuggerjpda       SYSTEM "../../debuggerjpda/www/plans/features.xml">
     <!ENTITY debuggertools      SYSTEM "../../debuggertools/www/plans/features.xml">
     <!ENTITY html               SYSTEM "../../html/www/plans/features.xml">
+    <!ENTITY apisupportx        SYSTEM "../../apisupportx/www/plans/features.xml">
 
 -->
 
 
     <!ENTITY modules            SYSTEM "modules.xml">  
 
+<!-- Declaration of format. -->
+<!ELEMENT xteam (requirements, dev-object)>
+<!ELEMENT requirements (module-requirements)*>
+<!ELEMENT dev-object (dev-object)*>
+<!ATTLIST dev-object
+          id CDATA #REQUIRED
+          type CDATA #REQUIRED
+          name CDATA #IMPLIED
+          list-in-overview CDATA #IMPLIED
+>
+<!ENTITY % mod-reqs-dtd SYSTEM "../../www/www/dtds/module_features-1_0.dtd">
+%mod-reqs-dtd;
+
 ]>
 <xteam>
     <requirements>
@@ -99,6 +112,7 @@
         &rmi;
         &ui;
         &core;
+        &ant; &apisupport; &openide;
     </requirements>
     &modules;    
 </xteam>
Index: nbbuild/plans/build.xml
===================================================================
RCS file: /cvs/nbbuild/plans/build.xml,v
retrieving revision 1.8
diff -u -t -r1.8 build.xml
--- nbbuild/plans/build.xml	2001/06/15 16:56:50	1.8
+++ nbbuild/plans/build.xml	2001/06/16 23:08:04
@@ -49,5 +49,13 @@
     <target name="icebrowser"><antcall target="module-reqs"><param name="module_name" value="icebrowser"/></antcall></target>
     <target name="rmi"><antcall target="module-reqs"><param name="module_name" value="rmi"/></antcall></target>
     <target name="core"><antcall target="module-reqs"><param name="module_name" value="core"/></antcall></target>
+    <target name="ant"><antcall target="module-reqs"><param name="module_name" value="ant"/></antcall></target>
+    <target name="apisupport"><antcall target="module-reqs"><param name="module_name" value="apisupport"/></antcall></target>
+    <target name="openide"><antcall target="module-reqs"><param name="module_name" value="openide"/></antcall></target>
+
+    <target name="check">
+        <!-- WARNING: you need a dev version of Ant to run this task: -->
+        <xmlvalidate file="all_features.xml"/>
+    </target>
    
 </project>
Index: nbbuild/plans/nb33-features-module.xsl
===================================================================
RCS file: /cvs/nbbuild/plans/nb33-features-module.xsl,v
retrieving revision 1.3
diff -u -t -r1.3 nb33-features-module.xsl
--- nbbuild/plans/nb33-features-module.xsl	2001/06/14 15:56:15	1.3
+++ nbbuild/plans/nb33-features-module.xsl	2001/06/16 23:08:04
@@ -136,7 +136,7 @@
     <TABLE BORDER="0" CELLPADDING="3" CELLSPACING="1" WIDTH="100%">
 
         <TR class="tablecbg">
-            <TD ALIGN="CENTER" width="100%" colspan="5">
+            <TD ALIGN="CENTER" width="100%" colspan="4">
                 <font class="tablecfont"><b>
                     <xsl:call-template name="makeLink">
                         <xsl:with-param name="name"><xsl:value-of select="@name"/>
@@ -194,7 +194,7 @@
         </TR>
 
         <TR class="tablerbg">
-            <TD ALIGN="LEFT" colspan="5" width="100%">
+            <TD ALIGN="LEFT" colspan="4" width="100%">
             <xsl:choose>
               <xsl:when test="string-length(long-description)>0" >
                    <xsl:apply-templates select="long-description"/>
@@ -222,16 +222,16 @@
                         </UL>
                     </xsl:when>
                     <xsl:otherwise>
-                        <xsl:text>.</xsl:text>
+                        <xsl:text disable-output-escaping="yes"><![CDATA[&nbsp;]]></xsl:text>
                     </xsl:otherwise>
                 </xsl:choose>
             </TD>
 
             <TD ALIGN="LEFT" colspan="2" width="50%">
-                <xsl:if test="count(roles/person)>0" >
-                    <DL>
+                <xsl:choose><xsl:when test="count(roles/person)>0" >
+                    <!--<DL>-->
                         <xsl:for-each select="roles/person"> 
-                            <DD>
+                            <!--<DD>-->
                                 <xsl:choose>
                                     <xsl:when test="string-length(e-mail)>0" >
                                         <xsl:call-template name="makeReference">
@@ -246,10 +246,14 @@
 
                                 <xsl:for-each select="role"> - <xsl:value-of select="@name"/>
                                 </xsl:for-each>
-                            </DD>
+                            <!--</DD>--><BR/>
                         </xsl:for-each>
-                    </DL>
-                </xsl:if>
+                    <!--</DL>-->
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:text disable-output-escaping="yes"><![CDATA[&nbsp;]]></xsl:text>
+                </xsl:otherwise>
+                </xsl:choose>
             </TD>
         </TR>
     </TABLE>