Index: openide/build.xml
===================================================================
RCS file: /cvs/openide/build.xml,v
--- openide/build.xml	12 Apr 2005 15:45:20 -0000	1.186
+++ openide/build.xml	18 Apr 2005 13:44:47 -0000
@@ -54,7 +54,7 @@ 
     </copy>
   </target>
 
-  <target name="netbeans" depends="init,jars-from-libs,release,libs" description="Build everything needed for inclusion in the IDE.">
+  <target name="netbeans" depends="init,jars-from-libs,release" description="Build everything needed for inclusion in the IDE.">
     <genlist outputfiledir="${netbeans.dest.dir}/${cluster.dir}" module="${nb.lib.dir}/openide.jar">
       <fileset dir="${netbeans.dest.dir}/${cluster.dir}">
         <patternset refID="openide.files"/>
@@ -232,53 +232,72 @@ 
   -->
   <target name="do-lib-javac-localdir" if="localdir">
     <mkdir dir="${destdir}"/>
-    <javac sourcepath="" destdir="${destdir}" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.4">
-      <src path="src" />
-      <src path="${localdir}" />
-      <selector>
-        <or>
-          <selector refid="${selector}" />
-          <filename name="${include}" />
-          <filename name="org/netbeans/modules/openide/**/*.java" />
-        </or>
-      </selector>
-      <classpath refid="classpath" />
-    </javac>
-    <!-- copy non-java files into new direction -->
-    <copy todir="${destdir}" >
+    <mkdir dir="${localdir}"/>
+    
+    <taskdef name="jalopy"
+         classname="de.hunsicker.jalopy.plugin.ant.AntPlugin">
+      <classpath>
+        <fileset dir="/usr/share/java/">
+          <include name="*.jar" />
+        </fileset>
+      </classpath>
+    </taskdef>
+    
+    <copy todir="${localdir}" >
       <fileset dir="src" >
         <selector refid="${selector}" />
-        <exclude name="**/*.java" />
         <exclude name="**/*.class" />
+        <exclude name="**/*.java" />
       </fileset>
     </copy>
+
+    <!--
+    
+   <jalopy fileformat="unix"
+            convention="http://www.foo.com/myConvention.xml"
+            history="file"
+            historymethod="adler32"
+            loglevel="info"
+            threads="2"
+            destdir="${localdir}"
+            classpathref="classpath">
+    
+    -->
+    
+    <property name="netbeans.jalopy.convention" location="convention-netbeans.xml" />
+    
+   <jalopy fileformat="unix"
+            convention="${netbeans.jalopy.convention}"
+            history="file"
+            historymethod="adler32"
+            loglevel="info"
+            threads="2"
+            destdir="${localdir}"
+            classpathref="classpath">
+      <fileset dir="src" >
+        <selector>
+            <and>
+                <selector refid="${selector}" />
+                <filename name="**/*.java" />
+            </and>
+        </selector>
+      </fileset>
+    </jalopy>  
+    
+    <javac sourcepath="" destdir="${destdir}" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.4">
+      <src path="${localdir}" />
+      <classpath refid="classpath" />
+    </javac>
+    
     <copy todir="${destdir}">
       <fileset dir="${localdir}">
         <excludesfile name="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
       </fileset>
     </copy>
   </target>
+  
   <target name="do-lib-javac-nolocaldir" unless="localdir">
-    <mkdir dir="${destdir}"/>
-    <javac sourcepath="" destdir="${destdir}" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.4">
-      <src path="src" />
-      <selector>
-        <or>
-          <selector refid="${selector}" />
-          <filename name="${include}" />
-          <filename name="org/netbeans/modules/openide/**/*.java" />
-        </or>
-      </selector>
-      <classpath refid="classpath" />
-    </javac>
-    <!-- copy non-java files into new direction -->
-    <copy todir="${destdir}" >
-      <fileset dir="src" >
-        <selector refid="${selector}" />
-        <exclude name="**/*.java" />
-        <exclude name="**/*.class" />
-      </fileset>
-    </copy>
+    <fail message="There has to be localdir" />
   </target>
   <target name="do-lib-javac" depends="do-lib-javac-localdir,do-lib-javac-nolocaldir"/>
 
@@ -296,7 +315,7 @@ 
   </target>
 
   <!-- Build whole openide.jar from separate libraries -->
-  <target name="jars-from-libs" depends="init,libs,vers-prep" description="Create JAR files from copied directories." unless="no-openide.jar">
+  <target name="jars-from-libs" depends="init,vers-prep" description="Create JAR files from copied directories." unless="no-openide.jar">
     <property name="openide.jar" value="${netbeans.dest.dir}/${cluster.dir}/${nb.lib.dir}/openide.jar" />
     <mkdir dir="${netbeans.dest.dir}/${cluster.dir}/${nb.lib.dir}"/>
     <copy file="manifest.mf" tofile="build/manifest-subst.mf" filtering="on"/>
@@ -322,87 +341,156 @@ 
   <!-- Build separate libraries for the IDE -->
   
   <target name="libs" depends="
-    lib-actions, 
-    lib-dialogs,
-    lib-explorer,
-    lib-fs,
-    lib-nodes,
-    lib-modules,
-    lib-options,
-    lib-text,
-    lib-util,
-    lib-util-enum,
-    lib-windows,
-    lib-awt,
-    lib-compat" />
+    all-openide/actions, 
+    all-openide/dialogs,
+    all-openide/explorer,
+    all-openide/fs,
+    all-openide/nodes,
+    all-openide/modules,
+    all-openide/options,
+    all-openide/text,
+    all-openide/util,
+    all-openide/util-enum,
+    all-openide/windows,
+    all-openide/awt,
+    all-openide/compat" />
     
   <target name="libs-clean" >
-        <ant dir="awt" target="clean" />
-        <ant dir="actions" target="clean" />
-        <ant dir="dialogs" target="clean" />
-        <ant dir="explorer" target="clean" />
-        <ant dir="fs" target="clean" />
-        <ant dir="nodes" target="clean" />
-        <ant dir="modules" target="clean" />
-        <ant dir="options" target="clean" />
-        <ant dir="text" target="clean" />
-        <ant dir="util" target="clean" />
-        <ant dir="util/enum" target="clean" />
-        <ant dir="windows" target="clean" />
-        <ant dir="compat" target="clean" />
-  </target>
+     <delete dir="${nbroot}/openide/util/build/classes/"/>
+     <delete dir="${nbroot}/openide/nodes/build/classes/"/>
+     <delete dir="${nbroot}/openide/windows/build/classes/"/>
+     <delete dir="${nbroot}/openide/awt/build/classes/"/>
+     <delete dir="${nbroot}/openide/dialogs/build/classes/"/>
+     <delete dir="${nbroot}/openide/text/build/classes/"/>
+     <delete dir="${nbroot}/openide/options/build/classes/"/>
+     <delete dir="${nbroot}/openide/explorer/build/classes/"/>
+     <delete dir="${nbroot}/openide/fs/build/classes/"/>
+     <delete dir="${nbroot}/openide/actions/build/classes/"/>
+     <delete dir="${nbroot}/openide/compat/build/classes/"/>
+     <delete dir="${nbroot}/openide/modules/build/classes/"/>
+     <delete dir="${nbroot}/openide/util/enum/build/classes/"/>
+    </target>
     
-  
-  <target name="lib-actions" depends="lib-util,lib-nodes,lib-windows,lib-text,lib-explorer,lib-fs" >
-        <ant dir="actions" />
-  </target>        
-  
-  <target name="lib-awt" depends="lib-util" >
-        <ant dir="awt" />
+  <property name="nbroot" location="${nb_all}" />
+  <path id="classpath" >
+     <pathelement location="${nbroot}/openide/util/build/classes/"/>
+     <pathelement location="${nbroot}/openide/nodes/build/classes/"/>
+     <pathelement location="${nbroot}/openide/windows/build/classes/"/>
+     <pathelement location="${nbroot}/openide/awt/build/classes/"/>
+     <pathelement location="${nbroot}/openide/dialogs/build/classes/"/>
+     <pathelement location="${nbroot}/openide/text/build/classes/"/>
+     <pathelement location="${nbroot}/openide/options/build/classes/"/>
+     <pathelement location="${nbroot}/openide/explorer/build/classes/"/>
+     <pathelement location="${nbroot}/openide/fs/build/classes/"/>
+     <pathelement location="${nbroot}/openide/actions/build/classes/"/>
+     <pathelement location="${nbroot}/openide/compat/build/classes/"/>
+     <pathelement location="${nbroot}/openide/modules/build/classes/"/>
+     <pathelement location="${nbroot}/openide/util/enum/build/classes/"/>
+  </path>
+  
+    <target name="all-openide/actions" depends="all-openide/util,all-openide/nodes,all-openide/windows,all-openide/text,all-openide/explorer,all-openide/fs" >
+      <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
+          <property name="localdir" location="actions/src" />
+          <property name="destdir" location="actions/build/classes"/>
+          <property name="selector" value="openide.actions" />
+        </ant>
+    </target>        
+  
+  <target name="all-openide/awt" depends="all-openide/util" >
+    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
+      <property name="destdir" location="awt/build/classes"/>
+      <property name="localdir" location="awt/src" />
+      <property name="selector" value="openide.awt" />
+    </ant>
   </target>        
 
-  <target name="lib-dialogs" depends="lib-util,lib-awt" >
-        <ant dir="dialogs" />
+  <target name="all-openide/dialogs" depends="all-openide/util,all-openide/awt" >
+    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
+      <property name="localdir" location="dialogs/src" />
+      <property name="destdir" location="dialogs/build/classes"/>
+      <property name="selector" value="openide.dialogs" />
+    </ant>
   </target>        
   
-  <target name="lib-explorer" depends="lib-nodes" >
-        <ant dir="explorer" />
+  <target name="all-openide/explorer" depends="all-openide/nodes" >
+    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
+      <property name="destdir" location="explorer/build/classes"/>
+      <property name="localdir" location="explorer/src" />
+      <property name="selector" value="openide.explorer" />
+    </ant>
   </target>        
   
-  <target name="lib-fs" depends="lib-util" >
-        <ant dir="fs" />
+  <target name="all-openide/fs" depends="all-openide/util" >
+    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
+      <property name="localdir" location="fs/src" />
+      <property name="destdir" location="fs/build/classes"/>
+      <property name="selector" value="openide.fs" />
+    </ant>
   </target>
 
-  <target name="lib-nodes" depends="lib-util,lib-dialogs" >
-        <ant dir="nodes" />
+  <target name="all-openide/nodes" depends="all-openide/util,all-openide/dialogs" >
+    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
+      <property name="localdir" location="nodes/src" />
+      <property name="destdir" location="nodes/build/classes"/>
+      <property name="selector" value="openide.nodes" />
+    </ant>
   </target>        
 
-  <target name="lib-modules" depends="lib-util" >
-        <ant dir="modules" />
+  <target name="all-openide/modules" depends="all-openide/util" >
+    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
+      <property name="localdir" location="modules/src" />
+      <property name="destdir" location="modules/build/classes"/>
+      <property name="selector" value="openide.modules" />
+    </ant>
   </target>        
   
-  <target name="lib-options" depends="lib-util" >
-        <ant dir="options" />
+  <target name="all-openide/options" depends="all-openide/util" >
+    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
+      <property name="localdir" location="options/src" />
+      <property name="destdir" location="options/build/classes"/>
+      <property name="selector" value="openide.options" />
+    </ant>
   </target>        
 
-  <target name="lib-text" depends="lib-windows,lib-options" > <!-- JST-PENDING: Remove somehow dependency on options -->
-        <ant dir="text" />
+  <target name="all-openide/text" depends="all-openide/windows,all-openide/options" > <!-- JST-PENDING: Remove somehow dependency on options -->
+    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
+      <property name="localdir" location="text/src" />
+      <property name="destdir" location="text/build/classes"/>
+      <property name="selector" value="openide.text" />
+    </ant>
   </target>        
 
-  <target name="lib-util">
-        <ant dir="util" />
+  <target name="all-openide/util">
+    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
+      <property name="destdir" location="util/build/classes"/>
+      <property name="localdir" location="util/src" />
+      <property name="selector" value="openide.util" />
+    </ant>
   </target>
   
-  <target name="lib-util-enum">
-        <ant dir="util/enum" />
+  <target name="all-openide/util-enum">
+    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
+      <property name="localdir" location="util/enum/src" />
+      <property name="destdir" location="util/enum/build/classes"/>
+      <property name="selector" value="openide.util.enum" />
+    </ant>
   </target>        
   
-  <target name="lib-windows" depends="lib-nodes" >
-        <ant dir="windows" />
+  <target name="all-openide/windows" depends="all-openide/nodes" >
+    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
+      <property name="destdir" location="windows/build/classes"/>
+      <property name="localdir" location="windows/src" />
+      <property name="selector" value="openide.windows" />
+    </ant>
   </target>        
   
-  <target name="lib-compat" depends="lib-awt,lib-util,lib-nodes,lib-windows,lib-text,lib-explorer,lib-fs,lib-actions" >
-        <ant dir="compat" />
+  <target name="all-openide/compat" depends="all-openide/awt,all-openide/util,all-openide/nodes,all-openide/windows,all-openide/text,all-openide/explorer,all-openide/fs,all-openide/actions" >
+
+        <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
+          <property name="localdir" location="compat/src" />
+          <property name="destdir" location="compat/build/classes"/>
+          <property name="selector" value="openide.compat" />
+        </ant>
   </target>        
   
   
@@ -760,7 +848,7 @@ 
         </zip>
     </target>
 
-    <target name="standalone-fs-prepare" depends="lib-util,lib-fs">
+    <target name="standalone-fs-prepare" depends="all-openide/util,all-openide/fs">
         <mkdir dir="build/standalone"/>
         <echo file="build/standalone/README-FS.txt"><![CDATA[Filesystems Library
 ===================
Index: openide/convention-netbeans.xml
===================================================================
RCS file: openide/convention-netbeans.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openide/convention-netbeans.xml	18 Apr 2005 13:44:47 -0000
@@ -0,0 +1,300 @@ 
+<?xml version="1.0" encoding="UTF-8"?>
+<jalopy>
+  <general>
+    <compliance>
+      <version>14</version>
+    </compliance>
+    <style>
+      <description>Sun Java Coding Convention</description>
+      <name>Sun</name>
+    </style>
+  </general>
+  <internal>
+    <version>6</version>
+  </internal>
+  <misc>
+    <threadCount>1</threadCount>
+  </misc>
+  <printer>
+    <alignment>
+      <methodCallChain>true</methodCallChain>
+      <parameterMethodDeclaration>false</parameterMethodDeclaration>
+      <ternaryOperator>true</ternaryOperator>
+      <variableAssignment>false</variableAssignment>
+      <variableIdentifier>false</variableIdentifier>
+    </alignment>
+    <backup>
+      <directory>bak</directory>
+      <level>0</level>
+    </backup>
+    <blanklines>
+      <after>
+        <block>1</block>
+        <braceLeft>0</braceLeft>
+        <class>1</class>
+        <declaration>0</declaration>
+        <footer>1</footer>
+        <header>0</header>
+        <interface>1</interface>
+        <lastImport>2</lastImport>
+        <method>1</method>
+        <package>1</package>
+      </after>
+      <before>
+        <block>1</block>
+        <braceRight>0</braceRight>
+        <caseBlock>1</caseBlock>
+        <comment>
+          <javadoc>1</javadoc>
+          <multiline>1</multiline>
+          <singleline>1</singleline>
+        </comment>
+        <controlStatement>1</controlStatement>
+        <declaration>1</declaration>
+        <footer>0</footer>
+        <header>0</header>
+      </before>
+      <keepUpTo>1</keepUpTo>
+    </blanklines>
+    <braces>
+      <empty>
+        <cuddle>false</cuddle>
+        <insertStatement>false</insertStatement>
+      </empty>
+      <insert>
+        <dowhile>true</dowhile>
+        <for>true</for>
+        <ifelse>true</ifelse>
+        <while>true</while>
+      </insert>
+      <remove>
+        <block>true</block>
+        <dowhile>false</dowhile>
+        <for>false</for>
+        <ifelse>false</ifelse>
+        <while>false</while>
+      </remove>
+      <treatDifferent>
+        <methodClass>false</methodClass>
+        <methodClassIfWrapped>false</methodClassIfWrapped>
+      </treatDifferent>
+    </braces>
+    <chunks>
+      <blanklines>true</blanklines>
+      <comments>true</comments>
+    </chunks>
+    <comments>
+      <format>
+        <multiline>false</multiline>
+      </format>
+      <javadoc>
+        <check>
+          <innerclass>false</innerclass>
+          <tags>false</tags>
+          <throwsTags>false</throwsTags>
+        </check>
+        <fieldsShort>true</fieldsShort>
+        <generate>
+          <class>0</class>
+          <constructor>0</constructor>
+          <field>0</field>
+          <method>0</method>
+        </generate>
+        <parseComments>false</parseComments>
+        <tags>
+          <in-line />
+          <standard />
+        </tags>
+        <templates>
+          <method>
+            <bottom>*/</bottom>
+            <exception>* @throws $exceptionType$ DOCUMENT ME!</exception>
+            <param>* @param $paramType$ DOCUMENT ME!</param>
+            <return>* @return DOCUMENT ME!</return>
+            <top>/**| * DOCUMENT ME!</top>
+          </method>
+        </templates>
+      </javadoc>
+      <remove>
+        <javadoc>false</javadoc>
+        <multiline>false</multiline>
+        <singleline>false</singleline>
+      </remove>
+      <separator>
+        <fillCharacter>-</fillCharacter>
+        <insert>false</insert>
+        <insertRecursive>false</insertRecursive>
+        <text>
+          <class>Inner Classes</class>
+          <constructor>Constructors</constructor>
+          <field>Instance fields</field>
+          <initializer>Instance initializers</initializer>
+          <interface>Inner Interfaces</interface>
+          <method>Methods</method>
+          <static>Static fields/initializers</static>
+        </text>
+      </separator>
+    </comments>
+    <environment />
+    <footer>
+      <keys />
+      <smartMode>0</smartMode>
+      <use>false</use>
+    </footer>
+    <header>
+      <keys />
+      <smartMode>0</smartMode>
+      <use>false</use>
+    </header>
+    <history>
+      <policy>disabled</policy>
+    </history>
+    <imports>
+      <grouping>
+        <defaultDepth>3</defaultDepth>
+        <packages>*:0|gnu:2|java:2|javax:2</packages>
+      </grouping>
+      <policy>disabled</policy>
+      <sort>true</sort>
+    </imports>
+    <indentation>
+      <caseFromSwitch>false</caseFromSwitch>
+      <continuation>
+        <block>true</block>
+        <operator>false</operator>
+      </continuation>
+      <firstColumnComments>true</firstColumnComments>
+      <label>false</label>
+      <policy>
+        <deep>false</deep>
+      </policy>
+      <sizes>
+        <braceCuddled>1</braceCuddled>
+        <braceLeft>1</braceLeft>
+        <braceRight>0</braceRight>
+        <braceRightAfter>1</braceRightAfter>
+        <continuation>4</continuation>
+        <deep>55</deep>
+        <extends>0</extends>
+        <general>4</general>
+        <implements>0</implements>
+        <leading>0</leading>
+        <tabs>8</tabs>
+        <throws>0</throws>
+        <trailingComment>1</trailingComment>
+      </sizes>
+      <tabs>
+        <enable>false</enable>
+        <onlyLeading>false</onlyLeading>
+      </tabs>
+    </indentation>
+    <misc>
+      <arrayBracketsAfterIdent>false</arrayBracketsAfterIdent>
+      <forceFormatting>false</forceFormatting>
+      <insertExpressionParentheses>true</insertExpressionParentheses>
+      <insertLoggingConditional>false</insertLoggingConditional>
+      <insertTrailingNewline>true</insertTrailingNewline>
+      <insertUID>false</insertUID>
+    </misc>
+    <sorting>
+      <declaration>
+        <class>false</class>
+        <constructor>false</constructor>
+        <enable>true</enable>
+        <interface>false</interface>
+        <method>false</method>
+        <order>static|field|initializer|constructor|method|interface|class</order>
+        <variable>false</variable>
+      </declaration>
+      <modifier>
+        <enable>false</enable>
+        <order>public|protected|private|abstract|static|final|synchronized|transient|volatile|native|strictfp</order>
+      </modifier>
+    </sorting>
+    <whitespace>
+      <after>
+        <comma>true</comma>
+        <semicolon>true</semicolon>
+        <typeCast>true</typeCast>
+      </after>
+      <before>
+        <braces>true</braces>
+        <brackets>false</brackets>
+        <bracketsTypes>false</bracketsTypes>
+        <caseColon>false</caseColon>
+        <operator>
+          <not>false</not>
+        </operator>
+        <parentheses>
+          <methodCall>false</methodCall>
+          <methodDeclaration>false</methodDeclaration>
+          <statement>true</statement>
+        </parentheses>
+      </before>
+      <padding>
+        <braces>true</braces>
+        <brackets>false</brackets>
+        <operator>
+          <assignment>true</assignment>
+          <bitwise>true</bitwise>
+          <logical>true</logical>
+          <mathematical>true</mathematical>
+          <relational>true</relational>
+          <shift>true</shift>
+        </operator>
+        <parenthesis>false</parenthesis>
+        <typeCast>false</typeCast>
+      </padding>
+    </whitespace>
+    <wrapping>
+      <always>
+        <after>
+          <arrayElement>0</arrayElement>
+          <braceRight>false</braceRight>
+          <extendsTypes>false</extendsTypes>
+          <implementsTypes>false</implementsTypes>
+          <label>true</label>
+          <methodCallChained>false</methodCallChained>
+          <ternaryOperator>
+            <first>false</first>
+            <second>false</second>
+          </ternaryOperator>
+          <throwsTypes>false</throwsTypes>
+        </after>
+        <before>
+          <braceLeft>false</braceLeft>
+          <extends>false</extends>
+          <implements>true</implements>
+          <throws>false</throws>
+        </before>
+        <parameter>
+          <methodCall>false</methodCall>
+          <methodCallNested>false</methodCallNested>
+          <methodDeclaration>false</methodDeclaration>
+        </parameter>
+      </always>
+      <general>
+        <beforeOperator>false</beforeOperator>
+        <enable>true</enable>
+        <lineLength>80</lineLength>
+      </general>
+      <ondemand>
+        <after>
+          <assignment>false</assignment>
+          <leftParenthesis>true</leftParenthesis>
+          <parameter>false</parameter>
+          <types>
+            <extends>false</extends>
+            <implements>false</implements>
+            <throws>false</throws>
+          </types>
+        </after>
+        <before>
+          <rightParenthesis>true</rightParenthesis>
+        </before>
+        <groupingParentheses>false</groupingParentheses>
+      </ondemand>
+    </wrapping>
+  </printer>
+</jalopy>
+
Index: openide/actions/build.xml
===================================================================
RCS file: /cvs/openide/actions/build.xml,v
--- openide/actions/build.xml	25 Mar 2004 16:05:26 -0000	1.8
+++ openide/actions/build.xml	18 Apr 2005 13:44:47 -0000
@@ -1,4 +1,4 @@ 
-<?xml version='1.0' encoding='ISO-8859-1' ?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
                 Sun Public License Notice
 
@@ -13,56 +13,7 @@ 
 -->
 
 <project name="openide/actions" default="netbeans" basedir=".">
-  <property name="nbroot" location="../.." />
 
-  <path id="classpath" >
-     <pathelement location="${nbroot}/openide/util/build/netbeans/lib/openide-util.jar"/>
-     <pathelement location="${nbroot}/openide/nodes/build/netbeans/lib/openide-nodes.jar"/>
-     <pathelement location="${nbroot}/openide/windows/build/netbeans/lib/openide-windows.jar"/>
-     <pathelement location="${nbroot}/openide/awt/build/netbeans/lib/openide-awt.jar"/>
-     <pathelement location="${nbroot}/openide/dialogs/build/netbeans/lib/openide-dialogs.jar"/>
-     <pathelement location="${nbroot}/openide/text/build/netbeans/lib/openide-text.jar"/>
-     <pathelement location="${nbroot}/openide/options/build/netbeans/lib/openide-options.jar"/>
-     <pathelement location="${nbroot}/openide/explorer/build/netbeans/lib/openide-explorer.jar"/>
-     <pathelement location="${nbroot}/openide/fs/build/netbeans/lib/openide-fs.jar"/>
-  </path>
-  
-  <target name="compile" >
-    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
-      <property name="destdir" location="build/classes"/>
-      <property name="selector" value="openide.actions" />
-    </ant>
-  </target>
-
-  
-  <target name="jars" depends="compile">
-    <mkdir dir="build/netbeans/lib"/>
-    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
-    <copy file="manifest.mf" tofile="build/manifest-subst.mf" filtering="on"/>
-    <jar jarfile="build/netbeans/lib/openide-actions.jar" manifest="build/manifest-subst.mf" compress="false">
-      <fileset dir="build/classes"/>
-    </jar>
-  </target>
-
-  <target name="netbeans" depends="jars"/>
-
-  <target name="javadoc">
-    <ant dir=".." target="do-lib-javadoc" inheritRefs="true" >
-      <property name="selector" value="openide.actions" />
-      
-      <property name="javadoc.base" location="."/>
-      <property name="javadoc.name" value="ActionsAPI"/>
-      <property name="javadoc.title" value="Old Actions API"/>
-      <!-- <property name="javadoc.apichanges" location="../api/doc/changes/apichanges.xml"/> -->
-      <property name="javadoc.arch" location="../arch/arch-openide-actions.xml"/>
-      <!-- <property name="javadoc.docfiles" location="api/doc"/> -->
-      <!-- <property name="javadoc.overview" location="api/doc/overview.html"/> -->
-    </ant>
-  </target>
-
-  <target name="clean">
-    <delete dir="build"/>
-    <delete dir="javadoc"/>
-  </target>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 
 </project>
Index: openide/actions/manifest.mf
===================================================================
RCS file: /cvs/openide/actions/manifest.mf,v
--- openide/actions/manifest.mf	21 Aug 2003 09:21:31 -0000	1.2
+++ openide/actions/manifest.mf	18 Apr 2005 13:44:47 -0000
@@ -1,8 +1,5 @@ 
 Manifest-Version: 1.0
-OpenIDE-Module: org.openide.actions/1
-OpenIDE-Module-Module-Dependencies: org.openide.util/1 > 1.0, org.openide.nodes/1 > 1.0, org.openide.dialogs/1 > 1.0, org.openide.explorer/1 > 1.0, org.openide.windows/1 > 1.0, org.openide.text/1 > 1.0, org.openide.filesystems/1 > 1.0, org.openide.options/1 > 1.0, org.openide.awt/1 > 1.0
-X-COMMENT: XXX WRONG!
-OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
-OpenIDE-Module-Specification-Version: @SPEC_VERS_SUBST@
-OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
+OpenIDE-Module: org.openide.actions
+OpenIDE-Module-Specification-Version: 6.2
+OpenIDE-Module-Localizing-Bundle: org/openide/actions/Bundle.properties
 
Index: openide/actions/nbproject/.cvsignore
===================================================================
RCS file: openide/actions/nbproject/.cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openide/actions/nbproject/.cvsignore	18 Apr 2005 13:44:47 -0000
@@ -0,0 +1, @@ 
+private
Index: openide/actions/nbproject/project.properties
===================================================================
RCS file: openide/actions/nbproject/project.properties
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openide/actions/nbproject/project.properties	18 Apr 2005 13:44:47 -0000
@@ -0,0 +1,19 @@ 
+#                 Sun Public License Notice
+# 
+# The contents of this file are subject to the Sun Public License
+# Version 1.0 (the "License"). You may not use this file except in
+# compliance with the License. A copy of the License is available at
+# http://www.sun.com/
+# 
+# The Original Code is NetBeans. The Initial Developer of the Original
+# Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
+# Microsystems, Inc. All Rights Reserved.
+
+is.autoload=true
+javadoc.name=ActionsAPI
+javadoc.title=Actions API
+javadoc.main.page=org/openide/actions/doc-files/api.html
+javadoc.arch=${basedir}/../arch/arch-openide-actions.xml
+#javadoc.docfiles=${basedir}/api/doc
+#javadoc.apichanges=${basedir}/api/apichanges.xml
+
Index: openide/actions/nbproject/project.xml
===================================================================
RCS file: openide/actions/nbproject/project.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openide/actions/nbproject/project.xml	18 Apr 2005 13:44:47 -0000
@@ -0,0 +1,92 @@ 
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+                Sun Public License Notice
+
+The contents of this file are subject to the Sun Public License
+Version 1.0 (the "License"). You may not use this file except in
+compliance with the License. A copy of the License is available at
+http://www.sun.com/
+
+The Original Code is NetBeans. The Initial Developer of the Original
+Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
+Microsystems, Inc. All Rights Reserved.
+-->
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.apisupport.project</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/nb-module-project/1">
+            <code-name-base>org.openide.actions</code-name-base>
+            <path>openide/actions</path>
+            <module-dependencies>
+                <dependency>
+                    <code-name-base>org.openide.util</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.2</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.nodes</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.2</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.awt</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.2</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.options</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.2</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.text</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.2</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.explorer</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.2</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.dialogs</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.2</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.windows</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.2</specification-version>
+                    </run-dependency>
+                </dependency>
+            </module-dependencies>
+            <public-packages>
+                <package>org.openide.actions</package>
+            </public-packages>
+            <javadoc/>
+        </data>
+    </configuration>
+</project>
Index: openide/awt/build.xml
===================================================================
RCS file: /cvs/openide/awt/build.xml,v
--- openide/awt/build.xml	25 Mar 2004 16:05:24 -0000	1.5
+++ openide/awt/build.xml	18 Apr 2005 13:44:47 -0000
@@ -1,4 +1,4 @@ 
-<?xml version='1.0' encoding='ISO-8859-1' ?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
                 Sun Public License Notice
 
@@ -13,49 +13,7 @@ 
 -->
 
 <project name="openide/awt" default="netbeans" basedir=".">
-  <property name="nbroot" location="../.." />
 
-  <path id="classpath" >
-    <pathelement location="${nbroot}/openide/util/build/netbeans/lib/openide-util.jar" />
-  </path>
-    
-  <target name="compile" >
-    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
-      <property name="destdir" location="build/classes"/>
-      <property name="localdir" location="src" />
-      <property name="selector" value="openide.awt" />
-    </ant>
-  </target>
-  
-  <target name="jars" depends="compile">
-    <mkdir dir="build/netbeans/lib"/>
-    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
-    <copy file="manifest.mf" tofile="build/manifest-subst.mf" filtering="on"/>
-    <jar jarfile="build/netbeans/lib/openide-awt.jar" manifest="build/manifest-subst.mf" compress="false">
-      <fileset dir="build/classes"/>
-    </jar>
-  </target>
-
-  <target name="netbeans" depends="jars"/>
-
-  <target name="javadoc">
-    <ant dir=".." target="do-lib-javadoc" inheritRefs="true" >
-      <property name="localdir" location="src" />
-      <property name="selector" value="openide.awt" />
-      
-      <property name="javadoc.base" location="."/>
-      <property name="javadoc.name" value="AWTAPI"/>
-      <property name="javadoc.title" value="AWT Extensions API"/>
-      <!-- <property name="javadoc.apichanges" location="../api/doc/changes/apichanges.xml"/> -->
-      <!-- <property name="javadoc.arch" location="../arch/arch-openide-utilities.xml"/> -->
-      <!-- <property name="javadoc.docfiles" location="api/doc"/> -->
-      <!-- <property name="javadoc.overview" location="api/doc/overview.html"/> -->
-    </ant>
-  </target>
-
-  <target name="clean">
-    <delete dir="build"/>
-    <delete dir="javadoc"/>
-  </target>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 
 </project>
Index: openide/awt/manifest.mf
===================================================================
RCS file: /cvs/openide/awt/manifest.mf,v
--- openide/awt/manifest.mf	21 Aug 2003 09:21:33 -0000	1.2
+++ openide/awt/manifest.mf	18 Apr 2005 13:44:47 -0000
@@ -1,8 +1,5 @@ 
 Manifest-Version: 1.0
-OpenIDE-Module: org.openide.awt/1
-OpenIDE-Module-Module-Dependencies: org.openide.util/1
-X-COMMENT: XXX WRONG!
-OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
-OpenIDE-Module-Specification-Version: @SPEC_VERS_SUBST@
-OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
+OpenIDE-Module: org.openide.awt
+OpenIDE-Module-Specification-Version: 6.2
+OpenIDE-Module-Localizing-Bundle: org/openide/awt/Bundle.properties
 
Index: openide/awt/nbproject/.cvsignore
===================================================================
RCS file: openide/awt/nbproject/.cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openide/awt/nbproject/.cvsignore	18 Apr 2005 13:44:47 -0000
@@ -0,0 +1, @@ 
+private
Index: openide/awt/nbproject/project.properties
===================================================================
RCS file: openide/awt/nbproject/project.properties
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openide/awt/nbproject/project.properties	18 Apr 2005 13:44:47 -0000
@@ -0,0 +1,19 @@ 
+#                 Sun Public License Notice
+# 
+# The contents of this file are subject to the Sun Public License
+# Version 1.0 (the "License"). You may not use this file except in
+# compliance with the License. A copy of the License is available at
+# http://www.sun.com/
+# 
+# The Original Code is NetBeans. The Initial Developer of the Original
+# Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
+# Microsystems, Inc. All Rights Reserved.
+
+is.autoload=true
+javadoc.name=AWTAPI
+javadoc.title=UI Utilities API
+javadoc.main.page=org/openide/awt/doc-files/api.html
+javadoc.arch=${basedir}/../arch/arch-openide-awt.xml
+#javadoc.docfiles=${basedir}/api/doc
+#javadoc.apichanges=${basedir}/api/apichanges.xml
+
Index: openide/awt/nbproject/project.xml
===================================================================
RCS file: openide/awt/nbproject/project.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openide/awt/nbproject/project.xml	18 Apr 2005 13:44:47 -0000
@@ -0,0 +1,36 @@ 
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+                Sun Public License Notice
+
+The contents of this file are subject to the Sun Public License
+Version 1.0 (the "License"). You may not use this file except in
+compliance with the License. A copy of the License is available at
+http://www.sun.com/
+
+The Original Code is NetBeans. The Initial Developer of the Original
+Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
+Microsystems, Inc. All Rights Reserved.
+-->
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.apisupport.project</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/nb-module-project/1">
+            <code-name-base>org.openide.awt</code-name-base>
+            <path>openide/awt</path>
+            <module-dependencies>
+                <dependency>
+                    <code-name-base>org.openide.util</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.2</specification-version>
+                    </run-dependency>
+                </dependency>
+            </module-dependencies>
+            <public-packages>
+                <package>org.openide.awt</package>
+            </public-packages>
+            <javadoc/>
+        </data>
+    </configuration>
+</project>
Index: openide/compat/build.xml
===================================================================
RCS file: /cvs/openide/compat/build.xml,v
--- openide/compat/build.xml	25 Mar 2004 16:05:22 -0000	1.7
+++ openide/compat/build.xml	18 Apr 2005 13:44:47 -0000
@@ -1,4 +1,4 @@ 
-<?xml version='1.0' encoding='ISO-8859-1' ?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
                 Sun Public License Notice
 
@@ -12,45 +12,8 @@ 
 Microsystems, Inc. All Rights Reserved.
 -->
 
-<project name="openide/compat" default="netbeans" basedir=".">
-  <import file="../../nbbuild/default.xml"/>
+<project name="openide/windows" default="netbeans" basedir=".">
 
-  <property name="nbroot" location="${nb_all}" />
-
-  <path id="classpath" >
-    <pathelement location="${nbroot}/openide/util/build/netbeans/lib/openide-util.jar" />
-    <pathelement location="${nbroot}/openide/fs/build/netbeans/lib/openide-fs.jar" />
-    <pathelement location="${nbroot}/openide/nodes/build/netbeans/lib/openide-nodes.jar" />
-    <pathelement location="${nbroot}/openide/windows/build/netbeans/lib/openide-windows.jar" />
-    <pathelement location="${nbroot}/openide/explorer/build/netbeans/lib/openide-explorer.jar" />
-    <pathelement location="${nbroot}/openide/dialogs/build/netbeans/lib/openide-dialogs.jar" />
-    <pathelement location="${nbroot}/openide/actions/build/netbeans/lib/openide-actions.jar" />
-    <pathelement location="${nbroot}/openide/awt/build/netbeans/lib/openide-awt.jar" />
-  </path>
-  
-  <target name="compile" depends="init">
-    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
-      <property name="destdir" location="build/classes"/>
-      <property name="selector" value="openide.compat" />
-    </ant>
-  </target>
-  
-  <target name="jars" depends="compile">
-    <mkdir dir="build/netbeans/lib"/>
-    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
-    <copy file="manifest.mf" tofile="build/manifest-subst.mf" filtering="on"/>
-    <jar jarfile="build/netbeans/lib/openide-compat.jar" manifest="build/manifest-subst.mf" compress="false">
-      <fileset dir="build/classes"/>
-      <fileset dir="../src">
-        <include name="META-INF/netbeans/translate.names"/>
-      </fileset>
-    </jar>
-  </target>
-
-  <target name="netbeans" depends="jars"/>
-
-  <target name="clean">
-    <delete dir="build"/>
-  </target>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 
 </project>
Index: openide/compat/manifest.mf
===================================================================
RCS file: /cvs/openide/compat/manifest.mf,v
--- openide/compat/manifest.mf	21 Nov 2003 17:20:09 -0000	1.2
+++ openide/compat/manifest.mf	18 Apr 2005 13:44:47 -0000
@@ -1,8 +1,5 @@ 
 Manifest-Version: 1.0
-OpenIDE-Module: org.openide.compat/1
-OpenIDE-Module-Module-Dependencies: org.openide.util/1 > 1.0, org.openide.nodes/1 > 1.0, org.openide.dialogs/1 > 1.0, org.openide.explorer/1 > 1.0, org.openide.windows/1 > 1.0, org.openide.text/1 > 1.0, org.openide.filesystems/1 > 1.0, org.openide.options/1 > 1.0, org.openide.awt/1 > 1.0, org.openide.actions/1 > 1.0
-X-COMMENT: XXX WRONG!
-OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
-OpenIDE-Module-Specification-Version: @SPEC_VERS_SUBST@
-OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
+OpenIDE-Module: org.openide.windows
+OpenIDE-Module-Specification-Version: 6.2
+OpenIDE-Module-Localizing-Bundle: org/openide/windows/Bundle.properties
 
Index: openide/compat/nbproject/.cvsignore
===================================================================
RCS file: openide/compat/nbproject/.cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openide/compat/nbproject/.cvsignore	18 Apr 2005 13:44:47 -0000
@@ -0,0 +1, @@ 
+private
Index: openide/compat/nbproject/project.properties
===================================================================
RCS file: openide/compat/nbproject/project.properties
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openide/compat/nbproject/project.properties	18 Apr 2005 13:44:47 -0000
@@ -0,0 +1,19 @@ 
+#                 Sun Public License Notice
+# 
+# The contents of this file are subject to the Sun Public License
+# Version 1.0 (the "License"). You may not use this file except in
+# compliance with the License. A copy of the License is available at
+# http://www.sun.com/
+# 
+# The Original Code is NetBeans. The Initial Developer of the Original
+# Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
+# Microsystems, Inc. All Rights Reserved.
+
+is.autoload=true
+javadoc.name=OpenideCompatAPI
+javadoc.title=Deprecated Compatibility API
+#javadoc.main.page=org/openide/windows/doc-files/api.html
+#javadoc.arch=${basedir}/../arch/arch-openide-windows.xml
+#javadoc.docfiles=${basedir}/api/doc
+#javadoc.apichanges=${basedir}/api/apichanges.xml
+
Index: openide/compat/nbproject/project.xml
===================================================================
RCS file: openide/compat/nbproject/project.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openide/compat/nbproject/project.xml	18 Apr 2005 13:44:47 -0000
@@ -0,0 +1,109 @@ 
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+                Sun Public License Notice
+
+The contents of this file are subject to the Sun Public License
+Version 1.0 (the "License"). You may not use this file except in
+compliance with the License. A copy of the License is available at
+http://www.sun.com/
+
+The Original Code is NetBeans. The Initial Developer of the Original
+Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
+Microsystems, Inc. All Rights Reserved.
+-->
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.apisupport.project</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/nb-module-project/1">
+            <code-name-base>org.openide.compat</code-name-base>
+            <path>openide/compat</path>
+            <module-dependencies>
+                <dependency>
+                    <code-name-base>org.openide.util</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.2</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.nodes</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.2</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.awt</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.2</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.options</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.2</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.text</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.2</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.explorer</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.2</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.dialogs</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.2</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.windows</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.2</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.actions</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.2</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.filesystems</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.2</specification-version>
+                    </run-dependency>
+                </dependency>
+            </module-dependencies>
+            <public-packages>
+                <package>org.openide.explorer</package>
+                <package>org.openide.util</package>
+            </public-packages>
+            <javadoc/>
+        </data>
+    </configuration>
+</project>
Index: openide/dialogs/build.xml
===================================================================
RCS file: /cvs/openide/dialogs/build.xml,v
--- openide/dialogs/build.xml	25 Mar 2004 16:05:11 -0000	1.5
+++ openide/dialogs/build.xml	18 Apr 2005 13:44:47 -0000
@@ -1,4 +1,4 @@ 
-<?xml version='1.0' encoding='ISO-8859-1' ?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
                 Sun Public License Notice
 
@@ -13,48 +13,7 @@ 
 -->
 
 <project name="openide/dialogs" default="netbeans" basedir=".">
-  <property name="nbroot" location="../.." />
 
-  <path id="classpath" >
-    <pathelement location="${nbroot}/openide/util/build/netbeans/lib/openide-util.jar" />
-    <pathelement location="${nbroot}/openide/awt/build/netbeans/lib/openide-awt.jar" />
-  </path>
-  
-  <target name="compile" >
-    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
-      <property name="destdir" location="build/classes"/>
-      <property name="selector" value="openide.dialogs" />
-    </ant>
-  </target>
-
-  <target name="jars" depends="compile">
-    <mkdir dir="build/netbeans/lib"/>
-    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
-    <copy file="manifest.mf" tofile="build/manifest-subst.mf" filtering="on"/>
-    <jar jarfile="build/netbeans/lib/openide-dialogs.jar" manifest="build/manifest-subst.mf" compress="false">
-      <fileset dir="build/classes"/>
-    </jar>
-  </target>
-
-  <target name="netbeans" depends="jars"/>
-
-  <target name="javadoc">
-    <ant dir=".." target="do-lib-javadoc" inheritRefs="true" >
-      <property name="selector" value="openide.dialogs" />
-      
-      <property name="javadoc.base" location="."/>
-      <property name="javadoc.name" value="DialogsAPI"/>
-      <property name="javadoc.title" value="Dialogs and Wizards API"/>
-      <!-- <property name="javadoc.apichanges" location="../api/doc/changes/apichanges.xml"/> -->
-      <property name="javadoc.arch" location="../arch/arch-openide-dialogs.xml"/>
-      <!-- <property name="javadoc.docfiles" location="api/doc"/> -->
-      <!-- <property name="javadoc.overview" location="api/doc/overview.html"/> -->
-    </ant>
-  </target>
-  
-  <target name="clean">
-    <delete dir="build"/>
-    <delete dir="javadoc"/>
-  </target>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 
 </project>
Index: openide/dialogs/manifest.mf
===================================================================
RCS file: /cvs/openide/dialogs/manifest.mf,v
--- openide/dialogs/manifest.mf	21 Aug 2003 09:21:37 -0000	1.2
+++ openide/dialogs/manifest.mf	18 Apr 2005 13:44:47 -0000
@@ -1,8 +1,5 @@ 
 Manifest-Version: 1.0
-OpenIDE-Module: org.openide.dialogs/1
-OpenIDE-Module-Module-Dependencies: org.openide.util/1 > 1.0, org.openide.awt/1 > 1.0
-X-COMMENT: XXX WRONG!
+OpenIDE-Module: org.openide.dialogs
+OpenIDE-Module-Specification-Version: 6.2
 OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
-OpenIDE-Module-Specification-Version: @SPEC_VERS_SUBST@
-OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
 
Index: openide/dialogs/nbproject/.cvsignore
===================================================================
RCS file: openide/dialogs/nbproject/.cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openide/dialogs/nbproject/.cvsignore	18 Apr 2005 13:44:47 -0000
@@ -0,0 +1, @@ 
+private
Index: openide/dialogs/nbproject/project.properties
===================================================================
RCS file: openide/dialogs/nbproject/project.properties
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openide/dialogs/nbproject/project.properties	18 Apr 2005 13:44:47 -0000
@@ -0,0 +1,19 @@ 
+#                 Sun Public License Notice
+# 
+# The contents of this file are subject to the Sun Public License
+# Version 1.0 (the "License"). You may not use this file except in
+# compliance with the License. A copy of the License is available at
+# http://www.sun.com/
+# 
+# The Original Code is NetBeans. The Initial Developer of the Original
+# Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
+# Microsystems, Inc. All Rights Reserved.
+
+is.autoload=true
+javadoc.name=DialogsAPI
+javadoc.title=Dialogs API
+javadoc.main.page=org/openide/doc-files/api.html
+javadoc.arch=${basedir}/../arch/arch-openide-dialogs.xml
+#javadoc.docfiles=${basedir}/api/doc
+#javadoc.apichanges=${basedir}/api/apichanges.xml
+
Index: openide/dialogs/nbproject/project.xml
===================================================================
RCS file: openide/dialogs/nbproject/project.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openide/dialogs/nbproject/project.xml	18 Apr 2005 13:44:47 -0000
@@ -0,0 +1,44 @@ 
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+                Sun Public License Notice
+
+The contents of this file are subject to the Sun Public License
+Version 1.0 (the "License"). You may not use this file except in
+compliance with the License. A copy of the License is available at
+http://www.sun.com/
+
+The Original Code is NetBeans. The Initial Developer of the Original
+Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
+Microsystems, Inc. All Rights Reserved.
+-->
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.apisupport.project</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/nb-module-project/1">
+            <code-name-base>org.openide.dialogs</code-name-base>
+            <path>openide/dialogs</path>
+            <module-dependencies>
+                <dependency>
+                    <code-name-base>org.openide.util</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.2</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.awt</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.2</specification-version>
+                    </run-dependency>
+                </dependency>
+            </module-dependencies>
+            <public-packages>
+                <package>org.openide</package>
+            </public-packages>
+            <javadoc/>
+        </data>
+    </configuration>
+</project>
Index: openide/explorer/build.xml
===================================================================
RCS file: /cvs/openide/explorer/build.xml,v
--- openide/explorer/build.xml	25 Mar 2004 16:05:10 -0000	1.6
+++ openide/explorer/build.xml	18 Apr 2005 13:44:47 -0000
@@ -1,4 +1,4 @@ 
-<?xml version='1.0' encoding='ISO-8859-1' ?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
                 Sun Public License Notice
 
@@ -13,55 +13,7 @@ 
 -->
 
 <project name="openide/explorer" default="netbeans" basedir=".">
-  <import file="../../nbbuild/default.xml"/>
 
-  <property name="nbroot" location="../.." />
-
-  <path id="classpath" >
-       <pathelement location="${nbroot}/openide/util/build/netbeans/lib/openide-util.jar"/>
-       <pathelement location="${nbroot}/openide/nodes/build/netbeans/lib/openide-nodes.jar"/>
-       <pathelement location="${nbroot}/openide/awt/build/netbeans/lib/openide-awt.jar"/>
-       <pathelement location="${nbroot}/openide/dialogs/build/netbeans/lib/openide-dialogs.jar"/>
-       <pathelement location="${nbroot}/openide/options/build/netbeans/lib/openide-options.jar"/>
-  </path>
-  
-  <target name="compile" depends="init">
-    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
-      <property name="destdir" location="build/classes"/>
-      <property name="localdir" location="src" />
-      <property name="selector" value="openide.explorer" />
-    </ant>
-  </target>
-  
-  <target name="jars" depends="compile">
-    <mkdir dir="build/netbeans/lib"/>
-    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
-    <copy file="manifest.mf" tofile="build/manifest-subst.mf" filtering="on"/>
-    <jar jarfile="build/netbeans/lib/openide-explorer.jar" manifest="build/manifest-subst.mf" compress="false">
-      <fileset dir="build/classes"/>
-    </jar>
-  </target>
-
-  <target name="netbeans" depends="jars"/>
-
-  <target name="javadoc">
-    <ant dir=".." target="do-lib-javadoc" inheritRefs="true" >
-      <property name="localdir" location="src" />
-      <property name="selector" value="openide.explorer" />
-      
-      <property name="javadoc.base" location="."/>
-      <property name="javadoc.name" value="ExplorerAPI"/>
-      <property name="javadoc.title" value="Explorer API"/>
-      <!-- <property name="javadoc.apichanges" location="../api/doc/changes/apichanges.xml"/> -->
-      <property name="javadoc.arch" location="../arch/arch-openide-explorer.xml"/>
-      <!-- <property name="javadoc.docfiles" location="api/doc"/> -->
-      <!-- <property name="javadoc.overview" location="api/doc/overview.html"/> -->
-    </ant>
-  </target>
-
-  <target name="clean">
-    <delete dir="build"/>
-    <delete dir="javadoc"/>
-  </target>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 
 </project>
Index: openide/explorer/manifest.mf
===================================================================
RCS file: /cvs/openide/explorer/manifest.mf,v
--- openide/explorer/manifest.mf	21 Aug 2003 09:21:38 -0000	1.2
+++ openide/explorer/manifest.mf	18 Apr 2005 13:44:47 -0000
@@ -1,8 +1,5 @@ 
 Manifest-Version: 1.0
-OpenIDE-Module: org.openide.explorer/1
-OpenIDE-Module-Module-Dependencies: org.openide.util/1 > 1.0,org.openide.nodes/1 > 1.0,org.openide.dialogs/1 > 1.0, org.openide.options/1 > 1.0, org.openide.awt/1 > 1.0
-X-COMMENT: XXX WRONG!
-OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
-OpenIDE-Module-Specification-Version: @SPEC_VERS_SUBST@
-OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
+OpenIDE-Module: org.openide.explorer
+OpenIDE-Module-Specification-Version: 6.2
+OpenIDE-Module-Localizing-Bundle: org/openide/explorer/Bundle.properties
 
Index: openide/explorer/nbproject/.cvsignore
===================================================================
RCS file: openide/explorer/nbproject/.cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openide/explorer/nbproject/.cvsignore	18 Apr 2005 13:44:47 -0000
@@ -0,0 +1, @@ 
+private
Index: openide/explorer/nbproject/project.properties
===================================================================
RCS file: openide/explorer/nbproject/project.properties
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openide/explorer/nbproject/project.properties	18 Apr 2005 13:44:47 -0000
@@ -0,0 +1,19 @@ 
+#                 Sun Public License Notice
+# 
+# The contents of this file are subject to the Sun Public License
+# Version 1.0 (the "License"). You may not use this file except in
+# compliance with the License. A copy of the License is available at
+# http://www.sun.com/
+# 
+# The Original Code is NetBeans. The Initial Developer of the Original
+# Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
+# Microsystems, Inc. All Rights Reserved.
+
+is.autoload=true
+javadoc.name=ExplorerAPI
+javadoc.title=Explorer API
+javadoc.main.page=org/openide/explorer/doc-files/api.html
+javadoc.arch=${basedir}/../arch/arch-openide-explorer.xml
+#javadoc.docfiles=${basedir}/api/doc
+#javadoc.apichanges=${basedir}/api/apichanges.xml
+
Index: openide/explorer/nbproject/project.xml
===================================================================
RCS file: openide/explorer/nbproject/project.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openide/explorer/nbproject/project.xml	18 Apr 2005 13:44:47 -0000
@@ -0,0 +1,68 @@ 
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+                Sun Public License Notice
+
+The contents of this file are subject to the Sun Public License
+Version 1.0 (the "License"). You may not use this file except in
+compliance with the License. A copy of the License is available at
+http://www.sun.com/
+
+The Original Code is NetBeans. The Initial Developer of the Original
+Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
+Microsystems, Inc. All Rights Reserved.
+-->
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.apisupport.project</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/nb-module-project/1">
+            <code-name-base>org.openide.explorer</code-name-base>
+            <path>openide/explorer</path>
+            <module-dependencies>
+                <dependency>
+                    <code-name-base>org.openide.util</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.2</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.nodes</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.2</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.awt</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.2</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.dialogs</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.2</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.options</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.2</specification-version>
+                    </run-dependency>
+                </dependency>
+            </module-dependencies>
+            <public-packages>
+                <package>org.openide.options</package>
+            </public-packages>
+            <javadoc/>
+        </data>
+    </configuration>
+</project>
Index: openide/fs/build.xml
===================================================================
RCS file: /cvs/openide/fs/build.xml,v
--- openide/fs/build.xml	25 Mar 2004 16:05:08 -0000	1.6
+++ openide/fs/build.xml	18 Apr 2005 13:44:47 -0000
@@ -1,4 +1,4 @@ 
-<?xml version='1.0' encoding='ISO-8859-1' ?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
                 Sun Public License Notice
 
@@ -13,49 +13,7 @@ 
 -->
 
 <project name="openide/fs" default="netbeans" basedir=".">
-  <import file="../../nbbuild/default.xml"/>
 
-  <property name="nbroot" location="../.." />
-
-  <path id="classpath" >
-    <pathelement location="${nbroot}/openide/util/build/netbeans/lib/openide-util.jar" />
-  </path>
-  
-  <target name="compile" depends="init">
-    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
-      <property name="destdir" location="build/classes"/>
-      <property name="selector" value="openide.fs" />
-    </ant>
-  </target>
-
-  <target name="jars" depends="compile">
-    <mkdir dir="build/netbeans/lib"/>
-    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
-    <copy file="manifest.mf" tofile="build/manifest-subst.mf" filtering="on"/>
-    <jar jarfile="build/netbeans/lib/openide-fs.jar" manifest="build/manifest-subst.mf" compress="false">
-      <fileset dir="build/classes"/>
-    </jar>
-  </target>
-
-  <target name="netbeans" depends="jars"/>
-
-  <target name="javadoc">
-    <ant dir=".." target="do-lib-javadoc" inheritRefs="true" >
-      <property name="selector" value="openide.fs" />
-      
-      <property name="javadoc.base" location="."/>
-      <property name="javadoc.name" value="FsAPI"/>
-      <property name="javadoc.title" value="FileSystems API"/>
-      <!-- <property name="javadoc.apichanges" location="../api/doc/changes/apichanges.xml"/> -->
-      <property name="javadoc.arch" location="../arch/arch-openide-filesystems.xml"/>
-      <!-- <property name="javadoc.docfiles" location="api/doc"/> -->
-      <!-- <property name="javadoc.overview" location="api/doc/overview.html"/> -->
-    </ant>
-  </target>
-
-  <target name="clean">
-    <delete dir="build"/>
-    <delete dir="javadoc"/>
-  </target>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 
 </project>
Index: openide/fs/manifest.mf
===================================================================
RCS file: /cvs/openide/fs/manifest.mf,v
--- openide/fs/manifest.mf	21 Aug 2003 09:21:40 -0000	1.2
+++ openide/fs/manifest.mf	18 Apr 2005 13:44:47 -0000
@@ -1,8 +1,5 @@ 
 Manifest-Version: 1.0
-OpenIDE-Module: org.openide.filesystems/1
-OpenIDE-Module-Module-Dependencies: org.openide.util/1
-X-COMMENT: XXX WRONG!
-OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
-OpenIDE-Module-Specification-Version: @SPEC_VERS_SUBST@
-OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
+OpenIDE-Module: org.openide.filesystems
+OpenIDE-Module-Specification-Version: 6.2
+OpenIDE-Module-Localizing-Bundle: org/openide/filesystems/Bundle.properties
 
Index: openide/fs/nbproject/.cvsignore
===================================================================
RCS file: openide/fs/nbproject/.cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openide/fs/nbproject/.cvsignore	18 Apr 2005 13:44:47 -0000
@@ -0,0 +1, @@ 
+private
Index: openide/fs/nbproject/project.properties
===================================================================
RCS file: openide/fs/nbproject/project.properties
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openide/fs/nbproject/project.properties	18 Apr 2005 13:44:47 -0000
@@ -0,0 +1,20 @@ 
+#                 Sun Public License Notice
+# 
+# The contents of this file are subject to the Sun Public License
+# Version 1.0 (the "License"). You may not use this file except in
+# compliance with the License. A copy of the License is available at
+# http://www.sun.com/
+# 
+# The Original Code is NetBeans. The Initial Developer of the Original
+# Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
+# Microsystems, Inc. All Rights Reserved.
+
+is.autoload=true
+module.jar.dir=core
+javadoc.name=FileSystemsAPI
+javadoc.title=File Systems API
+javadoc.main.page=org/openide/filesystems/doc-files/api.html
+javadoc.arch=${basedir}/../arch/arch-openide-fs.xml
+#javadoc.docfiles=${basedir}/api/doc
+#javadoc.apichanges=${basedir}/api/apichanges.xml
+
Index: openide/fs/nbproject/project.xml
===================================================================
RCS file: openide/fs/nbproject/project.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openide/fs/nbproject/project.xml	18 Apr 2005 13:44:47 -0000
@@ -0,0 +1,36 @@ 
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+                Sun Public License Notice
+
+The contents of this file are subject to the Sun Public License
+Version 1.0 (the "License"). You may not use this file except in
+compliance with the License. A copy of the License is available at
+http://www.sun.com/
+
+The Original Code is NetBeans. The Initial Developer of the Original
+Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
+Microsystems, Inc. All Rights Reserved.
+-->
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.apisupport.project</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/nb-module-project/1">
+            <code-name-base>org.openide.fs</code-name-base>
+            <path>openide/fs</path>
+            <module-dependencies>
+                <dependency>
+                    <code-name-base>org.openide.util</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.2</specification-version>
+                    </run-dependency>
+                </dependency>
+            </module-dependencies>
+            <public-packages>
+                <package>org.openide.filesystems</package>
+            </public-packages>
+            <javadoc/>
+        </data>
+    </configuration>
+</project>
Index: openide/modules/build.xml
===================================================================
RCS file: /cvs/openide/modules/build.xml,v
--- openide/modules/build.xml	25 Mar 2004 16:05:01 -0000	1.5
+++ openide/modules/build.xml	18 Apr 2005 13:44:47 -0000
@@ -1,4 +1,4 @@ 
-<?xml version='1.0' encoding='ISO-8859-1' ?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
                 Sun Public License Notice
 
@@ -13,49 +13,7 @@ 
 -->
 
 <project name="openide/modules" default="netbeans" basedir=".">
-  <property name="nbroot" location="../.." />
 
-  <path id="classpath" >
-    <pathelement location="${nbroot}/openide/util/build/netbeans/lib/openide-util.jar" />
-  </path>
-
-  <target name="compile" >
-    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
-      <property name="destdir" location="build/classes"/>
-      <property name="selector" value="openide.modules" />
-    </ant>
-  </target>
-
-  <target name="jars" depends="compile">
-    <mkdir dir="build/netbeans/lib"/>
-    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
-    <copy file="manifest.mf" tofile="build/manifest-subst.mf" filtering="on"/>
-    <jar jarfile="build/netbeans/lib/openide-modules.jar" manifest="build/manifest-subst.mf" compress="false">
-      <fileset dir="build/classes"/>
-    </jar>
-  </target>
-
-  <target name="netbeans" depends="jars"/>
-
-  <target name="javadoc">
-    <ant dir=".." target="do-lib-javadoc" inheritRefs="true" >
-      <property name="localdir" location="src" />
-      <property name="selector" value="openide.modules" />
-      
-      <property name="javadoc.base" location="."/>
-      <property name="javadoc.name" value="ModulesAPI"/>
-      <property name="javadoc.title" value="Modules API"/>
-      <!-- <property name="javadoc.apichanges" location="../api/doc/changes/apichanges.xml"/> -->
-      <property name="javadoc.arch" location="../arch/arch-openide-modules.xml"/>
-      <!-- <property name="javadoc.docfiles" location="api/doc"/> -->
-      <!-- <property name="javadoc.overview" location="api/doc/overview.html"/> -->
-    </ant>
-  </target>
-
-
-  <target name="clean">
-    <delete dir="build"/>
-    <delete dir="javadoc"/>
-  </target>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 
 </project>
Index: openide/modules/manifest.mf
===================================================================
RCS file: /cvs/openide/modules/manifest.mf,v
--- openide/modules/manifest.mf	25 Aug 2003 19:29:45 -0000	1.3
+++ openide/modules/manifest.mf	18 Apr 2005 13:44:47 -0000
@@ -1,20 +1,5 @@ 
 Manifest-Version: 1.0
-X-Comment: CAREFUL; Specification-Title, Specification-Version, and Implementation-Version should not be changed gratuitously (they are used by Modules API!)
-Specification-Title: IDE/1
-X-Comment-2: change specification version in openide-spec-vers.properties
-Specification-Version: @SPEC_VERS_SUBST@
-Specification-Vendor: NetBeans
-Implementation-Title: NetBeans Modules API
-Implementation-Version: @BUILD_NUMBER_SUBST@
-Implementation-Vendor: NetBeans
-OpenIDE-Module: org.openide.modules/1
-OpenIDE-Module-Module-Dependencies: org.openide.util/1
-X-Comment-3: XXX WRONG!
-OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
-OpenIDE-Module-Specification-Version: @SPEC_VERS_SUBST@
-OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
-
-Name: /org/openide/modules/
-Package-Title: org.openide.modules
-X-Comment-4: also needs to be left here so Package.getPackage("org.openide.modules") works
+OpenIDE-Module: org.openide.modules
+OpenIDE-Module-Specification-Version: 6.2
+OpenIDE-Module-Localizing-Bundle: org/openide/modules/Bundle.properties
 
Index: openide/modules/nbproject/.cvsignore
===================================================================
RCS file: openide/modules/nbproject/.cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openide/modules/nbproject/.cvsignore	18 Apr 2005 13:44:47 -0000
@@ -0,0 +1, @@ 
+private
Index: openide/modules/nbproject/project.properties
===================================================================
RCS file: openide/modules/nbproject/project.properties
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openide/modules/nbproject/project.properties	18 Apr 2005 13:44:47 -0000
@@ -0,0 +1,19 @@ 
+#                 Sun Public License Notice
+# 
+# The contents of this file are subject to the Sun Public License
+# Version 1.0 (the "License"). You may not use this file except in
+# compliance with the License. A copy of the License is available at
+# http://www.sun.com/
+# 
+# The Original Code is NetBeans. The Initial Developer of the Original
+# Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
+# Microsystems, Inc. All Rights Reserved.
+
+module.dir=lib
+javadoc.name=ModulesAPI
+javadoc.title=Modules API
+javadoc.main.page=org/openide/modules/doc-files/api.html
+javadoc.arch=${basedir}/../arch/arch-openide-modules.xml
+#javadoc.docfiles=${basedir}/api/doc
+#javadoc.apichanges=${basedir}/api/apichanges.xml
+
Index: openide/modules/nbproject/project.xml
===================================================================
RCS file: openide/modules/nbproject/project.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openide/modules/nbproject/project.xml	18 Apr 2005 13:44:47 -0000
@@ -0,0 +1,36 @@ 
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+                Sun Public License Notice
+
+The contents of this file are subject to the Sun Public License
+Version 1.0 (the "License"). You may not use this file except in
+compliance with the License. A copy of the License is available at
+http://www.sun.com/
+
+The Original Code is NetBeans. The Initial Developer of the Original
+Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
+Microsystems, Inc. All Rights Reserved.
+-->
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.apisupport.project</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/nb-module-project/1">
+            <code-name-base>org.openide.modules</code-name-base>
+            <path>openide/modules</path>
+            <module-dependencies>
+                <dependency>
+                    <code-name-base>org.openide.util</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.2</specification-version>
+                    </run-dependency>
+                </dependency>
+            </module-dependencies>
+            <public-packages>
+                <package>org.openide.modules</package>
+            </public-packages>
+            <javadoc/>
+        </data>
+    </configuration>
+</project>
Index: openide/nodes/build.xml
===================================================================
RCS file: /cvs/openide/nodes/build.xml,v
--- openide/nodes/build.xml	25 Mar 2004 16:04:59 -0000	1.6
+++ openide/nodes/build.xml	18 Apr 2005 13:44:47 -0000
@@ -1,4 +1,4 @@ 
-<?xml version='1.0' encoding='ISO-8859-1' ?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
                 Sun Public License Notice
 
@@ -13,52 +13,7 @@ 
 -->
 
 <project name="openide/nodes" default="netbeans" basedir=".">
-  <import file="../../nbbuild/default.xml"/>
 
-  <property name="nbroot" location="../.." />
-
-  <path id="classpath" >
-    <pathelement location="${nbroot}/openide/util/build/netbeans/lib/openide-util.jar" />
-    <pathelement location="${nbroot}/openide/awt/build/netbeans/lib/openide-awt.jar" />
-    <pathelement location="${nbroot}/openide/dialogs/build/netbeans/lib/openide-dialogs.jar" />
-  </path>
-  
-  <target name="compile" depends="init">
-    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
-      <property name="destdir" location="build/classes"/>
-      <property name="selector" value="openide.nodes" />
-    </ant>
-  </target>
-
-  <target name="jars" depends="compile">
-    <mkdir dir="build/netbeans/lib"/>
-    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
-    <copy file="manifest.mf" tofile="build/manifest-subst.mf" filtering="on"/>
-    <jar jarfile="build/netbeans/lib/openide-nodes.jar" manifest="build/manifest-subst.mf" compress="false">
-      <fileset dir="build/classes"/>
-    </jar>
-  </target>
-
-  <target name="netbeans" depends="jars"/>
-
-  <target name="javadoc">
-    <ant dir=".." target="do-lib-javadoc" inheritRefs="true" >
-      <property name="selector" value="openide.nodes" />
-      
-      <property name="javadoc.base" location="."/>
-      <property name="javadoc.name" value="NodesAPI"/>
-      <property name="javadoc.title" value="Nodes API"/>
-      <!-- <property name="javadoc.apichanges" location="../api/doc/changes/apichanges.xml"/> -->
-      <property name="javadoc.arch" location="../arch/arch-openide-nodes.xml"/>
-      <!-- <property name="javadoc.docfiles" location="api/doc"/> -->
-      <!-- <property name="javadoc.overview" location="api/doc/overview.html"/> -->
-    </ant>
-  </target>
-
-
-  <target name="clean">
-    <delete dir="build"/>
-    <delete dir="javadoc"/>
-  </target>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 
 </project>
Index: openide/nodes/manifest.mf
===================================================================
RCS file: /cvs/openide/nodes/manifest.mf,v
--- openide/nodes/manifest.mf	21 Aug 2003 09:21:43 -0000	1.2
+++ openide/nodes/manifest.mf	18 Apr 2005 13:44:47 -0000
@@ -1,8 +1,5 @@ 
 Manifest-Version: 1.0
-OpenIDE-Module: org.openide.nodes/1
-OpenIDE-Module-Module-Dependencies: org.openide.util/1 > 1.0, org.openide.dialogs/1 > 1.0, org.openide.awt/1 > 1.0
-X-COMMENT: XXX WRONG!
-OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
-OpenIDE-Module-Specification-Version: @SPEC_VERS_SUBST@
-OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
+OpenIDE-Module: org.openide.nodes
+OpenIDE-Module-Specification-Version: 6.2
+OpenIDE-Module-Localizing-Bundle: org/openide/nodes/Bundle.properties
 
Index: openide/nodes/nbproject/.cvsignore
===================================================================
RCS file: openide/nodes/nbproject/.cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openide/nodes/nbproject/.cvsignore	18 Apr 2005 13:44:47 -0000
@@ -0,0 +1, @@ 
+private
Index: openide/nodes/nbproject/project.properties
===================================================================
RCS file: openide/nodes/nbproject/project.properties
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openide/nodes/nbproject/project.properties	18 Apr 2005 13:44:47 -0000
@@ -0,0 +1,19 @@ 
+#                 Sun Public License Notice
+# 
+# The contents of this file are subject to the Sun Public License
+# Version 1.0 (the "License"). You may not use this file except in
+# compliance with the License. A copy of the License is available at
+# http://www.sun.com/
+# 
+# The Original Code is NetBeans. The Initial Developer of the Original
+# Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
+# Microsystems, Inc. All Rights Reserved.
+
+is.autoload=true
+javadoc.name=NodesAPI
+javadoc.title=Nodes API
+javadoc.main.page=org/openide/nodes/doc-files/api.html
+javadoc.arch=${basedir}/../arch/arch-openide-nodes.xml
+#javadoc.docfiles=${basedir}/api/doc
+#javadoc.apichanges=${basedir}/api/apichanges.xml
+
Index: openide/nodes/nbproject/project.xml
===================================================================
RCS file: openide/nodes/nbproject/project.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openide/nodes/nbproject/project.xml	18 Apr 2005 13:44:47 -0000
@@ -0,0 +1,52 @@ 
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+                Sun Public License Notice
+
+The contents of this file are subject to the Sun Public License
+Version 1.0 (the "License"). You may not use this file except in
+compliance with the License. A copy of the License is available at
+http://www.sun.com/
+
+The Original Code is NetBeans. The Initial Developer of the Original
+Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
+Microsystems, Inc. All Rights Reserved.
+-->
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.apisupport.project</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/nb-module-project/1">
+            <code-name-base>org.openide.nodes</code-name-base>
+            <path>openide/nodes</path>
+            <module-dependencies>
+                <dependency>
+                    <code-name-base>org.openide.util</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.2</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.awt</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.2</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.dialogs</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.2</specification-version>
+                    </run-dependency>
+                </dependency>
+            </module-dependencies>
+            <public-packages>
+                <package>org.openide.nodes</package>
+            </public-packages>
+            <javadoc/>
+        </data>
+    </configuration>
+</project>
Index: openide/options/build.xml
===================================================================
RCS file: /cvs/openide/options/build.xml,v
--- openide/options/build.xml	25 Mar 2004 16:04:59 -0000	1.5
+++ openide/options/build.xml	18 Apr 2005 13:44:47 -0000
@@ -1,4 +1,4 @@ 
-<?xml version='1.0' encoding='ISO-8859-1' ?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
                 Sun Public License Notice
 
@@ -13,47 +13,7 @@ 
 -->
 
 <project name="openide/options" default="netbeans" basedir=".">
-  <property name="nbroot" location="../.." />
 
-  <path id="classpath" >
-    <pathelement location="${nbroot}/openide/util/build/netbeans/lib/openide-util.jar" />
-  </path>
-    
-  <target name="compile" >
-    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
-      <property name="destdir" location="build/classes"/>
-      <property name="selector" value="openide.options" />
-    </ant>
-  </target>
-
-  <target name="jars" depends="compile">
-    <mkdir dir="build/netbeans/lib"/>
-    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
-    <copy file="manifest.mf" tofile="build/manifest-subst.mf" filtering="on"/>
-    <jar jarfile="build/netbeans/lib/openide-options.jar" manifest="build/manifest-subst.mf" compress="false">
-      <fileset dir="build/classes"/>
-    </jar>
-  </target>
-
-  <target name="netbeans" depends="jars"/>
-
-  <target name="javadoc">
-    <ant dir=".." target="do-lib-javadoc" inheritRefs="true" >
-      <property name="selector" value="openide.options" />
-      
-      <property name="javadoc.base" location="."/>
-      <property name="javadoc.name" value="OptionsAPI"/>
-      <property name="javadoc.title" value="Options API"/>
-      <!-- <property name="javadoc.apichanges" location="../api/doc/changes/apichanges.xml"/> -->
-      <property name="javadoc.arch" location="../arch/arch-openide-settings.xml"/>
-      <!-- <property name="javadoc.docfiles" location="api/doc"/> -->
-      <!-- <property name="javadoc.overview" location="api/doc/overview.html"/> -->
-    </ant>
-  </target>
-
-  <target name="clean">
-    <delete dir="build"/>
-    <delete dir="javadoc"/>
-  </target>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 
 </project>
Index: openide/options/manifest.mf
===================================================================
RCS file: /cvs/openide/options/manifest.mf,v
--- openide/options/manifest.mf	21 Aug 2003 09:21:44 -0000	1.2
+++ openide/options/manifest.mf	18 Apr 2005 13:44:47 -0000
@@ -1,8 +1,5 @@ 
 Manifest-Version: 1.0
-OpenIDE-Module: org.openide.options/1
-OpenIDE-Module-Module-Dependencies: org.openide.util/1
-X-COMMENT: XXX WRONG!
-OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
-OpenIDE-Module-Specification-Version: @SPEC_VERS_SUBST@
-OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
+OpenIDE-Module: org.openide.options
+OpenIDE-Module-Specification-Version: 6.2
+OpenIDE-Module-Localizing-Bundle: org/openide/options/Bundle.properties
 
Index: openide/options/nbproject/.cvsignore
===================================================================
RCS file: openide/options/nbproject/.cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openide/options/nbproject/.cvsignore	18 Apr 2005 13:44:47 -0000
@@ -0,0 +1, @@ 
+private
Index: openide/options/nbproject/project.properties
===================================================================
RCS file: openide/options/nbproject/project.properties
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openide/options/nbproject/project.properties	18 Apr 2005 13:44:47 -0000
@@ -0,0 +1,19 @@ 
+#                 Sun Public License Notice
+# 
+# The contents of this file are subject to the Sun Public License
+# Version 1.0 (the "License"). You may not use this file except in
+# compliance with the License. A copy of the License is available at
+# http://www.sun.com/
+# 
+# The Original Code is NetBeans. The Initial Developer of the Original
+# Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
+# Microsystems, Inc. All Rights Reserved.
+
+is.autoload=true
+javadoc.name=OptionsAPI
+javadoc.title=Options Settings API
+javadoc.main.page=org/openide/options/doc-files/api.html
+javadoc.arch=${basedir}/../arch/arch-openide-settings.xml
+#javadoc.docfiles=${basedir}/api/doc
+#javadoc.apichanges=${basedir}/api/apichanges.xml
+
Index: openide/options/nbproject/project.xml
===================================================================
RCS file: openide/options/nbproject/project.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openide/options/nbproject/project.xml	18 Apr 2005 13:44:47 -0000
@@ -0,0 +1,36 @@ 
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+                Sun Public License Notice
+
+The contents of this file are subject to the Sun Public License
+Version 1.0 (the "License"). You may not use this file except in
+compliance with the License. A copy of the License is available at
+http://www.sun.com/
+
+The Original Code is NetBeans. The Initial Developer of the Original
+Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
+Microsystems, Inc. All Rights Reserved.
+-->
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.apisupport.project</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/nb-module-project/1">
+            <code-name-base>org.openide.options</code-name-base>
+            <path>openide/options</path>
+            <module-dependencies>
+                <dependency>
+                    <code-name-base>org.openide.util</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.2</specification-version>
+                    </run-dependency>
+                </dependency>
+            </module-dependencies>
+            <public-packages>
+                <package>org.openide.options</package>
+            </public-packages>
+            <javadoc/>
+        </data>
+    </configuration>
+</project>
Index: openide/src/org/openide/modules/Bundle.properties
===================================================================
RCS file: openide/src/org/openide/modules/Bundle.properties
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openide/src/org/openide/modules/Bundle.properties	18 Apr 2005 13:44:47 -0000
@@ -0,0 +1,13 @@ 
+#                 Sun Public License Notice
+# 
+# The contents of this file are subject to the Sun Public License
+# Version 1.0 (the "License"). You may not use this file except in
+# compliance with the License. A copy of the License is available at
+# http://www.sun.com/
+# 
+# The Original Code is NetBeans. The Initial Developer of the Original
+# Code is Sun Microsystems, Inc. Portions Copyright 1997-2005 Sun
+# Microsystems, Inc. All Rights Reserved.
+
+
+
Index: openide/src/org/openide/util/enum/Bundle.properties
===================================================================
RCS file: openide/src/org/openide/util/enum/Bundle.properties
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openide/src/org/openide/util/enum/Bundle.properties	18 Apr 2005 13:44:47 -0000
@@ -0,0 +1,13 @@ 
+#                 Sun Public License Notice
+# 
+# The contents of this file are subject to the Sun Public License
+# Version 1.0 (the "License"). You may not use this file except in
+# compliance with the License. A copy of the License is available at
+# http://www.sun.com/
+# 
+# The Original Code is NetBeans. The Initial Developer of the Original
+# Code is Sun Microsystems, Inc. Portions Copyright 1997-2005 Sun
+# Microsystems, Inc. All Rights Reserved.
+
+
+
Index: openide/text/build.xml
===================================================================
RCS file: /cvs/openide/text/build.xml,v
--- openide/text/build.xml	25 Mar 2004 16:04:51 -0000	1.7
+++ openide/text/build.xml	18 Apr 2005 13:44:49 -0000
@@ -1,4 +1,4 @@ 
-<?xml version='1.0' encoding='ISO-8859-1' ?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
                 Sun Public License Notice
 
@@ -12,55 +12,8 @@ 
 Microsystems, Inc. All Rights Reserved.
 -->
 
-<project name="openide/text" default="netbeans" basedir=".">
-  <import file="../../nbbuild/default.xml"/>
+<project name="openide/windows" default="netbeans" basedir=".">
 
-  <property name="nbroot" location="${nb_all}" />
-
-  <path id="classpath" >
-       <pathelement location="${nbroot}/openide/windows/build/netbeans/lib/openide-windows.jar"/>
-       <pathelement location="${nbroot}/openide/util/build/netbeans/lib/openide-util.jar"/>
-       <pathelement location="${nbroot}/openide/nodes/build/netbeans/lib/openide-nodes.jar"/>
-       <pathelement location="${nbroot}/openide/awt/build/netbeans/lib/openide-awt.jar"/>
-       <pathelement location="${nbroot}/openide/dialogs/build/netbeans/lib/openide-dialogs.jar"/>
-       <pathelement location="${nbroot}/openide/options/build/netbeans/lib/openide-options.jar"/>
-  </path>
-  
-  <target name="compile" depends="init">
-    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
-      <property name="destdir" location="build/classes"/>
-      <property name="selector" value="openide.text" />
-    </ant>
-  </target>
-
-  <target name="jars" depends="compile">
-    <mkdir dir="build/netbeans/lib"/>
-    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
-    <copy file="manifest.mf" tofile="build/manifest-subst.mf" filtering="on"/>
-    <jar jarfile="build/netbeans/lib/openide-text.jar" manifest="build/manifest-subst.mf" compress="false">
-      <fileset dir="build/classes"/>
-    </jar>
-  </target>
-
-  <target name="netbeans" depends="jars"/>
-
-  <target name="javadoc">
-    <ant dir=".." target="do-lib-javadoc" inheritRefs="true" >
-      <property name="selector" value="openide.text" />
-      
-      <property name="javadoc.base" location="."/>
-      <property name="javadoc.name" value="TextAPI"/>
-      <property name="javadoc.title" value="Text API"/>
-      <!-- <property name="javadoc.apichanges" location="../api/doc/changes/apichanges.xml"/> -->
-      <property name="javadoc.arch" location="../arch/arch-openide-editor.xml"/>
-      <!-- <property name="javadoc.docfiles" location="api/doc"/> -->
-      <!-- <property name="javadoc.overview" location="api/doc/overview.html"/> -->
-    </ant>
-  </target>
-
-  <target name="clean">
-    <delete dir="build"/>
-    <delete dir="javadoc"/>
-  </target>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 
 </project>
Index: openide/text/manifest.mf
===================================================================
RCS file: /cvs/openide/text/manifest.mf,v
--- openide/text/manifest.mf	21 Aug 2003 09:21:49 -0000	1.2
+++ openide/text/manifest.mf	18 Apr 2005 13:44:49 -0000
@@ -1,8 +1,5 @@ 
 Manifest-Version: 1.0
-OpenIDE-Module: org.openide.text/1
-OpenIDE-Module-Module-Dependencies: org.openide.util/1 > 1.0, org.openide.windows/1 > 1.0, org.openide.nodes/1 > 1.0, org.openide.dialogs/1 > 1.0, org.openide.options/1 > 1.0, org.openide.awt/1 > 1.0
-X-COMMENT: XXX WRONG!
-OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
-OpenIDE-Module-Specification-Version: @SPEC_VERS_SUBST@
-OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
+OpenIDE-Module: org.openide.windows
+OpenIDE-Module-Specification-Version: 6.2
+OpenIDE-Module-Localizing-Bundle: org/openide/windows/Bundle.properties
 
Index: openide/text/nbproject/.cvsignore
===================================================================
RCS file: openide/text/nbproject/.cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openide/text/nbproject/.cvsignore	18 Apr 2005 13:44:49 -0000
@@ -0,0 +1, @@ 
+private
Index: openide/text/nbproject/project.properties
===================================================================
RCS file: openide/text/nbproject/project.properties
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openide/text/nbproject/project.properties	18 Apr 2005 13:44:49 -0000
@@ -0,0 +1,19 @@ 
+#                 Sun Public License Notice
+# 
+# The contents of this file are subject to the Sun Public License
+# Version 1.0 (the "License"). You may not use this file except in
+# compliance with the License. A copy of the License is available at
+# http://www.sun.com/
+# 
+# The Original Code is NetBeans. The Initial Developer of the Original
+# Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
+# Microsystems, Inc. All Rights Reserved.
+
+is.autoload=true
+javadoc.name=WindowsAPI
+javadoc.title=Windows API
+javadoc.main.page=org/openide/windows/doc-files/api.html
+javadoc.arch=${basedir}/../arch/arch-openide-windows.xml
+#javadoc.docfiles=${basedir}/api/doc
+#javadoc.apichanges=${basedir}/api/apichanges.xml
+
Index: openide/text/nbproject/project.xml
===================================================================
RCS file: openide/text/nbproject/project.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openide/text/nbproject/project.xml	18 Apr 2005 13:44:49 -0000
@@ -0,0 +1,76 @@ 
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+                Sun Public License Notice
+
+The contents of this file are subject to the Sun Public License
+Version 1.0 (the "License"). You may not use this file except in
+compliance with the License. A copy of the License is available at
+http://www.sun.com/
+
+The Original Code is NetBeans. The Initial Developer of the Original
+Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
+Microsystems, Inc. All Rights Reserved.
+-->
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.apisupport.project</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/nb-module-project/1">
+            <code-name-base>org.openide.text</code-name-base>
+            <path>openide/text</path>
+            <module-dependencies>
+                <dependency>
+                    <code-name-base>org.openide.util</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.2</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.nodes</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.2</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.awt</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.2</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.windows</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.2</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.dialogs</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.2</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.options</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.2</specification-version>
+                    </run-dependency>
+                </dependency>
+            </module-dependencies>
+            <public-packages>
+                <package>org.openide.text</package>
+            </public-packages>
+            <javadoc/>
+        </data>
+    </configuration>
+</project>
Index: openide/util/build.xml
===================================================================
RCS file: /cvs/openide/util/build.xml,v
--- openide/util/build.xml	25 Mar 2004 16:04:50 -0000	1.7
+++ openide/util/build.xml	18 Apr 2005 13:44:49 -0000
@@ -1,4 +1,4 @@ 
-<?xml version='1.0' encoding='ISO-8859-1' ?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
                 Sun Public License Notice
 
@@ -13,50 +13,7 @@ 
 -->
 
 <project name="openide/util" default="netbeans" basedir=".">
-  <import file="../../nbbuild/default.xml"/>
 
-  <property name="nbroot" location="${nb_all}" />
-
-  <path id="classpath"/>
-  
-  <target name="compile" depends="init">
-    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
-      <property name="destdir" location="build/classes"/>
-      <property name="localdir" location="src" />
-      <property name="selector" value="openide.util" />
-    </ant>
-  </target>
-  
-  <target name="jars" depends="compile">
-    <mkdir dir="build/netbeans/lib"/>
-    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
-    <copy file="manifest.mf" tofile="build/manifest-subst.mf" filtering="on"/>
-    <jar jarfile="build/netbeans/lib/openide-util.jar" manifest="build/manifest-subst.mf" compress="false">
-      <fileset dir="build/classes"/>
-    </jar>
-  </target>
-
-  <target name="netbeans" depends="jars"/>
-
-  <target name="javadoc">
-    <ant dir=".." target="do-lib-javadoc" inheritRefs="true" >
-      <property name="localdir" location="src" />
-      <property name="selector" value="openide.util" />
-      
-      <property name="javadoc.base" location="."/>
-      <property name="javadoc.name" value="UtilitiesAPI"/>
-      <property name="javadoc.title" value="Utilities API"/>
-      <!-- <property name="javadoc.apichanges" location="../api/doc/changes/apichanges.xml"/> -->
-      <property name="javadoc.arch" location="../arch/arch-openide-utilities.xml"/>
-      <!-- <property name="javadoc.docfiles" location="api/doc"/> -->
-      <!-- <property name="javadoc.overview" location="api/doc/overview.html"/> -->
-    </ant>
-  </target>
-  
-
-  <target name="clean">
-    <delete dir="build"/>
-    <delete dir="javadoc"/>
-  </target>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 
 </project>
Index: openide/util/manifest.mf
===================================================================
RCS file: /cvs/openide/util/manifest.mf,v
--- openide/util/manifest.mf	21 Aug 2003 09:21:50 -0000	1.2
+++ openide/util/manifest.mf	18 Apr 2005 13:44:49 -0000
@@ -1,7 +1,5 @@ 
 Manifest-Version: 1.0
-OpenIDE-Module: org.openide.util/1
-X-COMMENT: XXX WRONG!
-OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
-OpenIDE-Module-Specification-Version: @SPEC_VERS_SUBST@
-OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
+OpenIDE-Module: org.openide.util
+OpenIDE-Module-Specification-Version: 6.2
+OpenIDE-Module-Localizing-Bundle: org/openide/util/Bundle.properties
 
Index: openide/util/enum/build.xml
===================================================================
RCS file: /cvs/openide/util/enum/build.xml,v
--- openide/util/enum/build.xml	12 Apr 2005 15:45:21 -0000	1.1
+++ openide/util/enum/build.xml	18 Apr 2005 13:44:49 -0000
@@ -1,4 +1,4 @@ 
-<?xml version='1.0' encoding='ISO-8859-1' ?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
                 Sun Public License Notice
 
@@ -13,50 +13,7 @@ 
 -->
 
 <project name="openide/util/enum" default="netbeans" basedir=".">
-  <import file="../../../nbbuild/default.xml"/>
 
-  <property name="nbroot" location="${nb_all}" />
-
-  <path id="classpath"/>
-  
-  <target name="compile" depends="init">
-    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
-      <property name="destdir" location="build/classes"/>
-      <!-- <property name="localdir" location="src" /> -->
-      <property name="selector" value="openide.util.enum" />
-    </ant>
-  </target>
-  
-  <target name="jars" depends="compile">
-    <mkdir dir="build/netbeans/lib"/>
-    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
-    <copy file="manifest.mf" tofile="build/manifest-subst.mf" filtering="on"/>
-    <jar jarfile="build/netbeans/lib/openide-util-enum.jar" manifest="build/manifest-subst.mf" compress="false">
-      <fileset dir="build/classes"/>
-    </jar>
-  </target>
-
-  <target name="netbeans" depends="jars"/>
-
-  <target name="javadoc">
-    <ant dir=".." target="do-lib-javadoc" inheritRefs="true" >
-      <property name="localdir" location="src" />
-      <property name="selector" value="openide.util.enum" />
-      
-      <property name="javadoc.base" location="."/>
-      <property name="javadoc.name" value="OldEnumerationAPI"/>
-      <property name="javadoc.title" value="Old Enumeration API"/>
-      <!-- <property name="javadoc.apichanges" location="../api/doc/changes/apichanges.xml"/> -->
-      <!-- <property name="javadoc.arch" location="../arch/arch-openide-utilities.xml"/> -->
-      <!-- <property name="javadoc.docfiles" location="api/doc"/> -->
-      <!-- <property name="javadoc.overview" location="api/doc/overview.html"/> -->
-    </ant>
-  </target>
-  
-
-  <target name="clean">
-    <delete dir="build"/>
-    <delete dir="javadoc"/>
-  </target>
+    <import file="../../../nbbuild/templates/projectized.xml"/>
 
 </project>
Index: openide/util/enum/manifest.mf
===================================================================
RCS file: /cvs/openide/util/enum/manifest.mf,v
--- openide/util/enum/manifest.mf	12 Apr 2005 15:45:22 -0000	1.1
+++ openide/util/enum/manifest.mf	18 Apr 2005 13:44:49 -0000
@@ -1,7 +1,5 @@ 
 Manifest-Version: 1.0
-OpenIDE-Module: org.openide.util.enum/1
-X-COMMENT: XXX WRONG!
-OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
-OpenIDE-Module-Specification-Version: @SPEC_VERS_SUBST@
-OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
+OpenIDE-Module: org.openide.util.enum
+OpenIDE-Module-Specification-Version: 6.2
+OpenIDE-Module-Localizing-Bundle: org/openide/util/enum/Bundle.properties
 
Index: openide/util/enum/nbproject/.cvsignore
===================================================================
RCS file: openide/util/enum/nbproject/.cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openide/util/enum/nbproject/.cvsignore	18 Apr 2005 13:44:49 -0000
@@ -0,0 +1, @@ 
+private
Index: openide/util/enum/nbproject/project.properties
===================================================================
RCS file: openide/util/enum/nbproject/project.properties
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openide/util/enum/nbproject/project.properties	18 Apr 2005 13:44:49 -0000
@@ -0,0 +1,19 @@ 
+#                 Sun Public License Notice
+# 
+# The contents of this file are subject to the Sun Public License
+# Version 1.0 (the "License"). You may not use this file except in
+# compliance with the License. A copy of the License is available at
+# http://www.sun.com/
+# 
+# The Original Code is NetBeans. The Initial Developer of the Original
+# Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
+# Microsystems, Inc. All Rights Reserved.
+
+javadoc.name=OldEnumerationAPI
+javadoc.title=Old Enumeration API
+is.autoload=true
+#javadoc.main.page=org/openide/util/doc-files/api.html
+#javadoc.arch=${basedir}/../arch/arch-openide-util.xml
+#javadoc.docfiles=${basedir}/api/doc
+#javadoc.apichanges=${basedir}/api/apichanges.xml
+
Index: openide/util/enum/nbproject/project.xml
===================================================================
RCS file: openide/util/enum/nbproject/project.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openide/util/enum/nbproject/project.xml	18 Apr 2005 13:44:49 -0000
@@ -0,0 +1,39 @@ 
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+                Sun Public License Notice
+
+The contents of this file are subject to the Sun Public License
+Version 1.0 (the "License"). You may not use this file except in
+compliance with the License. A copy of the License is available at
+http://www.sun.com/
+
+The Original Code is NetBeans. The Initial Developer of the Original
+Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
+Microsystems, Inc. All Rights Reserved.
+-->
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.apisupport.project</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/nb-module-project/1">
+            <code-name-base>org.openide.util.enum</code-name-base>
+            <path>openide/util/enum</path>
+            <module-dependencies>
+            <!--
+                <dependency>
+                    <code-name-base>org.openide</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>1</release-version>
+                        <specification-version>4.48</specification-version>
+                    </run-dependency>
+                </dependency>
+                -->
+            </module-dependencies>
+            <public-packages>
+                <package>org.openide.util.enum</package>
+            </public-packages>
+            <javadoc/>
+        </data>
+    </configuration>
+</project>
Index: openide/util/nbproject/.cvsignore
===================================================================
RCS file: openide/util/nbproject/.cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openide/util/nbproject/.cvsignore	18 Apr 2005 13:44:49 -0000
@@ -0,0 +1, @@ 
+private
Index: openide/util/nbproject/project.properties
===================================================================
RCS file: openide/util/nbproject/project.properties
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openide/util/nbproject/project.properties	18 Apr 2005 13:44:49 -0000
@@ -0,0 +1,19 @@ 
+#                 Sun Public License Notice
+# 
+# The contents of this file are subject to the Sun Public License
+# Version 1.0 (the "License"). You may not use this file except in
+# compliance with the License. A copy of the License is available at
+# http://www.sun.com/
+# 
+# The Original Code is NetBeans. The Initial Developer of the Original
+# Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
+# Microsystems, Inc. All Rights Reserved.
+
+module.jar.dir=lib
+javadoc.name=UtilitiesAPI
+javadoc.title=Utilities API
+javadoc.main.page=org/openide/util/doc-files/api.html
+javadoc.arch=${basedir}/../arch/arch-openide-util.xml
+#javadoc.docfiles=${basedir}/api/doc
+#javadoc.apichanges=${basedir}/api/apichanges.xml
+
Index: openide/util/nbproject/project.xml
===================================================================
RCS file: openide/util/nbproject/project.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openide/util/nbproject/project.xml	18 Apr 2005 13:44:49 -0000
@@ -0,0 +1,45 @@ 
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+                Sun Public License Notice
+
+The contents of this file are subject to the Sun Public License
+Version 1.0 (the "License"). You may not use this file except in
+compliance with the License. A copy of the License is available at
+http://www.sun.com/
+
+The Original Code is NetBeans. The Initial Developer of the Original
+Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
+Microsystems, Inc. All Rights Reserved.
+-->
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.apisupport.project</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/nb-module-project/1">
+            <code-name-base>org.openide.util</code-name-base>
+            <path>openide/util</path>
+            <module-dependencies>
+            <!--
+                <dependency>
+                    <code-name-base>org.openide</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>1</release-version>
+                        <specification-version>4.48</specification-version>
+                    </run-dependency>
+                </dependency>
+                -->
+            </module-dependencies>
+            <public-packages>
+                <package>org.openide</package>
+                <package>org.openide.util</package>
+                <package>org.openide.util.datatransfer</package>
+                <package>org.openide.util.actions</package>
+                <package>org.openide.util.lookup</package>
+                <package>org.openide.util.io</package>
+                <package>org.openide.xml</package>
+            </public-packages>
+            <javadoc/>
+        </data>
+    </configuration>
+</project>
Index: openide/windows/build.xml
===================================================================
RCS file: /cvs/openide/windows/build.xml,v
--- openide/windows/build.xml	25 Mar 2004 16:04:48 -0000	1.9
+++ openide/windows/build.xml	18 Apr 2005 13:44:49 -0000
@@ -1,4 +1,4 @@ 
-<?xml version='1.0' encoding='ISO-8859-1' ?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
                 Sun Public License Notice
 
@@ -13,54 +13,7 @@ 
 -->
 
 <project name="openide/windows" default="netbeans" basedir=".">
-  <import file="../../nbbuild/default.xml"/>
 
-  <property name="nbroot" location="../.." />
-
-  <path id="classpath" >
-       <pathelement location="${nbroot}/openide/util/build/netbeans/lib/openide-util.jar"/>
-       <pathelement location="${nbroot}/openide/nodes/build/netbeans/lib/openide-nodes.jar"/>
-       <pathelement location="${nbroot}/openide/awt/build/netbeans/lib/openide-awt.jar"/>
-       <pathelement location="${nbroot}/openide/dialogs/build/netbeans/lib/openide-dialogs.jar"/>
-  </path>
-  
-  <target name="compile" depends="init">
-    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
-      <property name="destdir" location="build/classes"/>
-      <property name="localdir" location="src" />
-      <property name="selector" value="openide.windows" />
-    </ant>
-  </target>
-
-  <target name="jars" depends="compile">
-    <mkdir dir="build/netbeans/lib"/>
-    <filter token="BUILD_NUMBER_SUBST" value="${buildnumber}"/>
-    <copy file="manifest.mf" tofile="build/manifest-subst.mf" filtering="on"/>
-    <jar jarfile="build/netbeans/lib/openide-windows.jar" manifest="build/manifest-subst.mf" compress="false">
-      <fileset dir="build/classes"/>
-    </jar>
-  </target>
-
-  <target name="netbeans" depends="jars"/>
-
-  <target name="javadoc">
-    <ant dir=".." target="do-lib-javadoc" inheritRefs="true" >
-      <property name="localdir" location="src" />
-      <property name="selector" value="openide.windows" />
-      
-      <property name="javadoc.base" location="."/>
-      <property name="javadoc.name" value="WindowsAPI"/>
-      <property name="javadoc.title" value="Windows API"/>
-      <!-- <property name="javadoc.apichanges" location="../api/doc/changes/apichanges.xml"/> -->
-      <property name="javadoc.arch" location="../arch/arch-openide-windowsystem.xml"/>
-      <!-- <property name="javadoc.docfiles" location="api/doc"/> -->
-      <!-- <property name="javadoc.overview" location="api/doc/overview.html"/> -->
-    </ant>
-  </target>
-
-  <target name="clean">
-    <delete dir="build"/>
-    <delete dir="javadoc"/>
-  </target>
+    <import file="../../nbbuild/templates/projectized.xml"/>
 
 </project>
Index: openide/windows/manifest.mf
===================================================================
RCS file: /cvs/openide/windows/manifest.mf,v
--- openide/windows/manifest.mf	21 Aug 2003 09:21:51 -0000	1.2
+++ openide/windows/manifest.mf	18 Apr 2005 13:44:49 -0000
@@ -1,9 +1,5 @@ 
 Manifest-Version: 1.0
-OpenIDE-Module: org.openide.windows/1
-X-COMMENT: XXX WRONG!
-OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
-OpenIDE-Module-Module-Dependencies: org.openide.util/1 > 1.0, org.openide.nodes/1 > 1.0, org.openide.dialogs/1 > 1.0, org.openide.awt/1 > 1.0
-OpenIDE-Module-Specification-Version: @SPEC_VERS_SUBST@
-OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
-OpenIDE-Module-Public-Packages: org.openide.**
+OpenIDE-Module: org.openide.windows
+OpenIDE-Module-Specification-Version: 6.2
+OpenIDE-Module-Localizing-Bundle: org/openide/windows/Bundle.properties
 
Index: openide/windows/nbproject/.cvsignore
===================================================================
RCS file: openide/windows/nbproject/.cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openide/windows/nbproject/.cvsignore	18 Apr 2005 13:44:49 -0000
@@ -0,0 +1, @@ 
+private
Index: openide/windows/nbproject/project.properties
===================================================================
RCS file: openide/windows/nbproject/project.properties
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openide/windows/nbproject/project.properties	18 Apr 2005 13:44:49 -0000
@@ -0,0 +1,19 @@ 
+#                 Sun Public License Notice
+# 
+# The contents of this file are subject to the Sun Public License
+# Version 1.0 (the "License"). You may not use this file except in
+# compliance with the License. A copy of the License is available at
+# http://www.sun.com/
+# 
+# The Original Code is NetBeans. The Initial Developer of the Original
+# Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
+# Microsystems, Inc. All Rights Reserved.
+
+is.autoload=true
+javadoc.name=WindowsAPI
+javadoc.title=Windows API
+javadoc.main.page=org/openide/windows/doc-files/api.html
+javadoc.arch=${basedir}/../arch/arch-openide-windows.xml
+#javadoc.docfiles=${basedir}/api/doc
+#javadoc.apichanges=${basedir}/api/apichanges.xml
+
Index: openide/windows/nbproject/project.xml
===================================================================
RCS file: openide/windows/nbproject/project.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openide/windows/nbproject/project.xml	18 Apr 2005 13:44:49 -0000
@@ -0,0 +1,52 @@ 
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+                Sun Public License Notice
+
+The contents of this file are subject to the Sun Public License
+Version 1.0 (the "License"). You may not use this file except in
+compliance with the License. A copy of the License is available at
+http://www.sun.com/
+
+The Original Code is NetBeans. The Initial Developer of the Original
+Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
+Microsystems, Inc. All Rights Reserved.
+-->
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.apisupport.project</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/nb-module-project/1">
+            <code-name-base>org.openide.windows</code-name-base>
+            <path>openide/windows</path>
+            <module-dependencies>
+                <dependency>
+                    <code-name-base>org.openide.util</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.2</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.nodes</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.2</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.awt</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.2</specification-version>
+                    </run-dependency>
+                </dependency>
+            </module-dependencies>
+            <public-packages>
+                <package>org.openide.windows</package>
+            </public-packages>
+            <javadoc/>
+        </data>
+    </configuration>
+</project>
Index: nbbuild/build.xml
===================================================================
RCS file: /cvs/nbbuild/build.xml,v
--- nbbuild/build.xml	11 Apr 2005 16:41:58 -0000	1.657
+++ nbbuild/build.xml	18 Apr 2005 13:45:05 -0000
@@ -148,9 +148,143 @@ 
     <property name="sanitystart.args" value="-J-Dnetbeans.close=true ${sanitystart.args.additional}"/>
 
   </target>
+  
+  
+  <!-- New openide parts -->
 
+  
+  <target name="all-openide/actions" depends="init,all-openide/util,all-openide/nodes,all-openide/windows,all-openide/text,all-openide/explorer,all-openide/fs" >
+    <echo message="Building openide/actions..."/>
+    <getdependsclusters name="dependsClusters" list="${nb.clusters.list}"/>
+    <antcall target="build-one-cluster-dependencies" inheritAll="false">
+      <param name="one.cluster.dependencies" value="${dependsClusters}"/>
+      <param name="one.cluster.name" value="this-cluster"/>
+    </antcall>
+    <ant dir="../openide/actions" target="netbeans"/>
+  </target>        
+  
+  <target name="all-openide/awt" depends="init,all-openide/util" >
+    <echo message="Building openide/awt..."/>
+    <getdependsclusters name="dependsClusters" list="${nb.clusters.list}"/>
+    <antcall target="build-one-cluster-dependencies" inheritAll="false">
+      <param name="one.cluster.dependencies" value="${dependsClusters}"/>
+      <param name="one.cluster.name" value="this-cluster"/>
+    </antcall>
+    <ant dir="../openide/awt" target="netbeans"/>
+  </target>        
+
+  <target name="all-openide/dialogs" depends="init,all-openide/util,all-openide/awt" >
+    <echo message="Building openide/dialogs..."/>
+    <getdependsclusters name="dependsClusters" list="${nb.clusters.list}"/>
+    <antcall target="build-one-cluster-dependencies" inheritAll="false">
+      <param name="one.cluster.dependencies" value="${dependsClusters}"/>
+      <param name="one.cluster.name" value="this-cluster"/>
+    </antcall>
+    <ant dir="../openide/dialogs" target="netbeans"/>
+  </target>        
+  
+  <target name="all-openide/explorer" depends="init,all-openide/nodes" >
+    <echo message="Building openide/explorer..."/>
+    <getdependsclusters name="dependsClusters" list="${nb.clusters.list}"/>
+    <antcall target="build-one-cluster-dependencies" inheritAll="false">
+      <param name="one.cluster.dependencies" value="${dependsClusters}"/>
+      <param name="one.cluster.name" value="this-cluster"/>
+    </antcall>
+    <ant dir="../openide/explorer" target="netbeans"/>
+  </target>        
+  
+  <target name="all-openide/fs" depends="init,all-openide/util" >
+    <echo message="Building openide/fs..."/>
+    <getdependsclusters name="dependsClusters" list="${nb.clusters.list}"/>
+    <antcall target="build-one-cluster-dependencies" inheritAll="false">
+      <param name="one.cluster.dependencies" value="${dependsClusters}"/>
+      <param name="one.cluster.name" value="this-cluster"/>
+    </antcall>
+    <ant dir="../openide/fs" target="netbeans"/>
+  </target>
+
+  <target name="all-openide/nodes" depends="init,all-openide/util,all-openide/dialogs" >
+    <echo message="Building openide/nodes..."/>
+    <getdependsclusters name="dependsClusters" list="${nb.clusters.list}"/>
+    <antcall target="build-one-cluster-dependencies" inheritAll="false">
+      <param name="one.cluster.dependencies" value="${dependsClusters}"/>
+      <param name="one.cluster.name" value="this-cluster"/>
+    </antcall>
+    <ant dir="../openide/nodes" target="netbeans"/>
+  </target>        
+
+  <target name="all-openide/modules" depends="init,all-openide/util" >
+    <echo message="Building openide/modules..."/>
+    <getdependsclusters name="dependsClusters" list="${nb.clusters.list}"/>
+    <antcall target="build-one-cluster-dependencies" inheritAll="false">
+      <param name="one.cluster.dependencies" value="${dependsClusters}"/>
+      <param name="one.cluster.name" value="this-cluster"/>
+    </antcall>
+    <ant dir="../openide/modules" target="netbeans"/>
+  </target>        
+  
+  <target name="all-openide/options" depends="init,all-openide/util" >
+    <echo message="Building openide/options..."/>
+    <getdependsclusters name="dependsClusters" list="${nb.clusters.list}"/>
+    <antcall target="build-one-cluster-dependencies" inheritAll="false">
+      <param name="one.cluster.dependencies" value="${dependsClusters}"/>
+      <param name="one.cluster.name" value="this-cluster"/>
+    </antcall>
+    <ant dir="../openide/options" target="netbeans"/>
+  </target>        
+
+  <target name="all-openide/text" depends="init,all-openide/windows,all-openide/options" >
+    <echo message="Building openide/text..."/>
+    <getdependsclusters name="dependsClusters" list="${nb.clusters.list}"/>
+    <antcall target="build-one-cluster-dependencies" inheritAll="false">
+      <param name="one.cluster.dependencies" value="${dependsClusters}"/>
+      <param name="one.cluster.name" value="this-cluster"/>
+    </antcall>
+    <ant dir="../openide/text" target="netbeans"/>
+  </target>        
+
+  <target name="all-openide/util" depends="init" >
+    <echo message="Building openide/util..."/>
+    <getdependsclusters name="dependsClusters" list="${nb.clusters.list}"/>
+    <antcall target="build-one-cluster-dependencies" inheritAll="false">
+      <param name="one.cluster.dependencies" value="${dependsClusters}"/>
+      <param name="one.cluster.name" value="this-cluster"/>
+    </antcall>
+    <ant dir="../openide/util" target="netbeans"/>
+  </target>
+  
+  <target name="all-openide/util/enum" depends="init" >
+    <echo message="Building openide/util/enum..."/>
+    <getdependsclusters name="dependsClusters" list="${nb.clusters.list}"/>
+    <antcall target="build-one-cluster-dependencies" inheritAll="false">
+      <param name="one.cluster.dependencies" value="${dependsClusters}"/>
+      <param name="one.cluster.name" value="this-cluster"/>
+    </antcall>
+    <ant dir="../openide/util/enum" target="netbeans"/>
+  </target>        
+  
+  <target name="all-openide/windows" depends="init,all-openide/nodes" >
+    <echo message="Building openide/windows..."/>
+    <getdependsclusters name="dependsClusters" list="${nb.clusters.list}"/>
+    <antcall target="build-one-cluster-dependencies" inheritAll="false">
+      <param name="one.cluster.dependencies" value="${dependsClusters}"/>
+      <param name="one.cluster.name" value="this-cluster"/>
+    </antcall>
+    <ant dir="../openide/windows" target="netbeans"/>
+  </target>        
+  
+  <target name="all-openide/compat" depends="init,all-openide/awt,all-openide/util,all-openide/nodes,all-openide/windows,all-openide/text,all-openide/explorer,all-openide/fs,all-openide/actions" >
+    <echo message="Building openide/compat..."/>
+    <getdependsclusters name="dependsClusters" list="${nb.clusters.list}"/>
+    <antcall target="build-one-cluster-dependencies" inheritAll="false">
+      <param name="one.cluster.dependencies" value="${dependsClusters}"/>
+      <param name="one.cluster.name" value="this-cluster"/>
+    </antcall>
+    <ant dir="../openide/compat" target="netbeans"/>
+  </target>        
+  
   <!-- Platform modules: -->
-  <target name="all-openide" depends="init">
+  <target name="all-openide" depends="init,all-openide/awt,all-openide/util,all-openide/nodes,all-openide/windows,all-openide/text,all-openide/explorer,all-openide/fs,all-openide/actions,all-openide/compat,all-openide/util/enum,all-openide/modules">
     <echo message="Building Open APIs..."/>
     <getdependsclusters name="dependsClusters" list="${nb.clusters.list}"/>
     <antcall target="build-one-cluster-dependencies" inheritAll="false">
Index: nbbuild/cluster.properties
===================================================================
RCS file: /cvs/nbbuild/cluster.properties,v
--- nbbuild/cluster.properties	5 Apr 2005 18:23:11 -0000	1.80
+++ nbbuild/cluster.properties	18 Apr 2005 13:45:05 -0000
@@ -40,6 +40,7 @@ 
 
 #List of clusters in standard build
 nb.clusters.list=nb.cluster.platform, \
+        nb.cluster.platform.extra, \
         nb.cluster.ide, \
         nb.cluster.j2ee, \
         nb.cluster.nb
@@ -48,16 +49,20 @@ 
         ${nb.clusters.list}, \
         ${clusters.extra.list}
 
-nb.cluster.platform.extra.dir=platform5
-nb.cluster.platform.extra.depends=nb.cluster.platform
+nb.cluster.platform.extra.dir=tmp
+nb.cluster.platform.extra.depends=
 nb.cluster.platform.extra=openide/util, \
         openide/actions, \
+        openide/options, \
+        openide/compat, \
         openide/awt, \
         openide/dialogs, \
         openide/nodes, \
         openide/explorer, \
         openide/fs, \
+        openide/modules, \
         openide/text, \
+        openide/util/enum, \
         openide/windows
 
 nb.cluster.platform.dir=platform5
Index: nbbuild/templates/modules.xml
===================================================================
RCS file: /cvs/nbbuild/templates/modules.xml,v
--- nbbuild/templates/modules.xml	16 Apr 2005 19:27:51 -0000	1.97
+++ nbbuild/templates/modules.xml	18 Apr 2005 13:45:05 -0000
@@ -570,6 +570,56 @@ 
         <jar>lib/openide.jar</jar>
     </module>
     <module>
+        <path>openide/util</path>
+        <cnb>org.openide.util</cnb>
+        <jar>bin/org-openide-util.jar</jar>
+    </module>
+    <module>
+        <path>openide/util/enum</path>
+        <cnb>org.openide.util.enum</cnb>
+    </module>
+    <module>
+        <path>openide/options</path>
+        <cnb>org.openide.options</cnb>
+    </module>
+    <module>
+        <path>openide/modules</path>
+        <cnb>org.openide.modules</cnb>
+    </module>
+    <module>
+        <path>openide/fs</path>
+        <cnb>org.openide.filesystems</cnb>
+        <jar>lib/org-openide-fs.jar</jar>
+    </module>
+    <module>
+        <path>openide/awt</path>
+        <cnb>org.openide.awt</cnb>
+    </module>
+    <module>
+        <path>openide/dialogs</path>
+        <cnb>org.openide.dialogs</cnb>
+    </module>
+    <module>
+        <path>openide/nodes</path>
+        <cnb>org.openide.nodes</cnb>
+    </module>
+    <module>
+        <path>openide/explorer</path>
+        <cnb>org.openide.explorer</cnb>
+    </module>
+    <module>
+        <path>openide/windows</path>
+        <cnb>org.openide.windows</cnb>
+    </module>
+    <module>
+        <path>openide/text</path>
+        <cnb>org.openide.text</cnb>
+    </module>
+    <module>
+        <path>openide/actions</path>
+        <cnb>org.openide.actions</cnb>
+    </module>
+    <module>
         <path>openide/convertor</path>
         <cnb>org.netbeans.modules.convertor</cnb>
     </module>
Index: ide/golden/files-layout.txt
===================================================================
RCS file: /cvs/ide/golden/files-layout.txt,v
--- ide/golden/files-layout.txt	16 Apr 2005 19:27:37 -0000	1.41
+++ ide/golden/files-layout.txt	18 Apr 2005 13:45:11 -0000
@@ -833,6 +833,7 @@ 
 nb.cluster.j2ee.built
 nb.cluster.nb.built
 nb.cluster.platform.built
+nb.cluster.platform.extra.built
 nb4.1/config/Modules/org-netbeans-modules-applemenu.xml
 nb4.1/config/Modules/org-netbeans-modules-ide-branding.xml
 nb4.1/config/Modules/org-netbeans-modules-updatecenters.xml