Fixed update site generation.

Author: mpartel

build.xml

@@ -6,7 +6,7 @@
     <description>Builds the module suite tmc-netbeans.</description>
     <import file="nbproject/build-impl.xml"/>
 
-    <property name="mavenmodules-builddir" value="maven-wrapper/target/nbm/netbeans/extra"/>
+    <!-- Pull maven wrapper into the 'mavenmodules' cluster. Build it first if needed. -->
 
     <target name="-check-mavenmodules">
         <uptodate property="mavenmodules.uptodate"
@@ -22,7 +22,7 @@
         </exec>
         <delete dir="mavenmodules"/>
         <copy todir="mavenmodules">
-            <fileset dir="${mavenmodules-builddir}"/>
+            <fileset dir="maven-wrapper/target/nbm/netbeans/extra"/>
         </copy>
     </target>
 
@@ -32,4 +32,15 @@
 
     <target name="build" depends="-build-mavenmodules,suite.build"/>
     <target name="clean" depends="suite.clean,-clean-mavenmodules"/>
+    
+    <!-- Include maven-wrapper NBM in autoupdate site. -->
+    <target name="nbms" depends="-init,branding,release,-hide-excluded-modules" description="Build NBMs and an Auto Update site descriptor for all modules in the suite.">
+        <mkdir dir="${suite.build.dir}/updates"/>
+        <copy todir="${suite.build.dir}/updates">
+            <fileset dir="maven-wrapper/target/nbm">
+                <include name="*.nbm"/>
+            </fileset>
+        </copy>
+        <antcall target="suite.nbms"/>
+    </target>
 </project>

maven-wrapper/src/main/nbm/manifest.mf

@@ -2,3 +2,4 @@ Manifest-Version: 1.0
 OpenIDE-Module: fi.helsinki.cs.tmc.maven.wrapper
 OpenIDE-Module-Localizing-Bundle: fi/helsinki/cs/tmc/maven/wrapper/Bundle.properties
 OpenIDE-Module-Specification-Version: 1.0
+AutoUpdate-Show-In-Client: false

maven-wrapper/src/main/resources/fi/helsinki/cs/tmc/maven/wrapper/Bundle.properties

@@ -3,3 +3,5 @@
 #OpenIDE-Module-Short-Description=
 #OpenIDE-Module-Long-Description=
 #OpenIDE-Module-Display-Category=
+OpenIDE-Module-Name: TMC Maven Wrapper
+OpenIDE-Module-Display-Category=Education

tmc-plugin/.gitignore

@@ -1,4 +1,3 @@
 /build
 /nbproject/private
 /src/fi/helsinki/cs/tmc/tailoring/SelectedTailoring.properties
-/update_site.properties

tmc-plugin/build.xml

@@ -5,21 +5,4 @@
 <project name="tmc-netbeans" default="netbeans" basedir=".">
     <description>Builds, tests, and runs the project.</description>
     <import file="nbproject/build-impl.xml"/>
-    
-    <property file="update_site.properties" />
-    <target name="update-site" description="Make an update site" depends="nbm">
-        <fail unless="updates.base.url">Please set updates.base.url in update_site.properties</fail>
-        <pathfileset id="updater.jar">
-            <path refid="cluster.path.id"/>
-            <filename name="modules/ext/updater.jar"/>
-        </pathfileset>
-        <makeupdatedesc desc="${build.dir}/updates.xml" distbase="${updates.base.url}" automaticgrouping="true" uselicenseurl="false">
-            <fileset dir="${build.dir}">
-                <include name="*.nbm"/>
-            </fileset>
-            <updaterjar>
-                <resources refid="updater.jar"/>
-            </updaterjar>
-        </makeupdatedesc>
-    </target>
 </project>