Commits

Javier A. Ortiz Bultron committed 273e460

Smart Iz-Pack installer generation

Comments (0)

Files changed (13)

Marauroa Application Manager/Marauroa Server Manager.xml

-<launch4jConfig>
-        <dontWrapJar>false</dontWrapJar>
-        <headerType>gui</headerType>
-        <jar>Marauroa Server Manager-Setup.jar</jar>
-        <outfile>Marauroa Server Manager-Setup.exe</outfile>
-    <errTitle/>
-    <cmdLine/>
-    <chdir/>
-    <priority>normal</priority>
-    <downloadUrl>http://java.com/download</downloadUrl>
-    <supportUrl/>
-    <customProcName>false</customProcName>
-    <stayAlive>false</stayAlive>
-    <manifest/>
-    <icon>nizpack.ico</icon>
-    <singleInstance>
-        <mutexName>NIzPack</mutexName>
-        <windowTitle/>
-    </singleInstance>
-    <jre>
-        <path/>
-        <minVersion>1.6.0</minVersion>
-        <maxVersion/>
-        <jdkPreference>jreOnly</jdkPreference>
-    </jre>
-</launch4jConfig>
-        

Marauroa Application Manager/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties

-#Tue, 07 Feb 2012 15:50:04 -0600
+#Thu, 09 Feb 2012 10:07:21 -0600
 #Updated by build script
 #Fri, 19 Aug 2011 09:42:33 -0500
-currentVersion=Marauroa Server Manager 0.1
+currentVersion=Marauroa Server Manager ${app.version}
 LBL_splash_window_title=Starting Marauroa Server Manager
 SplashProgressBarBounds=0,249,473,3
 SplashProgressBarColor=0x9900

Marauroa Application Manager/branding/core/core.jar/org/netbeans/core/startup/Bundle_es_PR.properties

-currentVersion=Adminstrador de Servidores Marauroa 0.1 
+currentVersion=Adminstrador de Servidores Marauroa ${app.version} 
 LBL_splash_window_title=Comenzando Adminstrador de Servidores Marauroa 
 SplashProgressBarBounds=0,249,473,3
 SplashRunningTextBounds=10,235,450,12

Marauroa Application Manager/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties

-#Tue, 07 Feb 2012 15:50:04 -0600
-CTL_MainWindow_Title=Marauroa Server Manager 0.1
-CTL_MainWindow_Title_No_Project=Marauroa Server Manager 0.1
+#Thu, 09 Feb 2012 10:07:21 -0600
+CTL_MainWindow_Title=Marauroa Server Manager ${app.version}
+CTL_MainWindow_Title_No_Project=Marauroa Server Manager ${app.version}

Marauroa Application Manager/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle_es_PR.properties

-CTL_MainWindow_Title=Adminstrador de Servidores Marauroa  0.1
-CTL_MainWindow_Title_No_Project=Adminstrador de Servidores Marauroa  0.1
+CTL_MainWindow_Title=Adminstrador de Servidores Marauroa  ${app.version}
+CTL_MainWindow_Title_No_Project=Adminstrador de Servidores Marauroa  ${app.version}

Marauroa Application Manager/build.xml

      ]]>
     </scriptdef>
     
+    <scriptdef name="lastIndexOf" language="javascript">
+        <attribute name="text"/>
+        <attribute name="searchstring"/>
+        <attribute name="property"/>
+     <![CDATA[
+       var text = attributes.get("text");
+       var searchString = attributes.get("searchstring");
+       project.setProperty(attributes.get("property"), text.lastIndexOf(searchString));
+     ]]>
+    </scriptdef>
+    
     <condition property="isWindows">
         <os family="windows" />
     </condition>
         </if>
         <antcall target="suite.build"/>
     </target>
-        
-    <target name="build-brand" depends="pre-init, -init">
+
+    <target name="build-brand" depends="-init-netbeans, -init-hudson">
         <if>
             <isset property="app.icon"/>
             <then>
 </properties>
 </project>]]>
         </echo>
+    </target>
+
+    <target name="build-zip" depends="suite.build-zip">
+        <unzip src="${dist.dir}/${app.name}.zip" dest="${dist.dir}"/>
+        <replace file="${dist.dir}/${app.name}/etc/${app.name}.conf">
+            <replacefilter token="/dev" value="/${app.version}" />
+            <replacefilter token="-J-Xms24m -J-Xmx64m" value="${run.args.extra}" />
+        </replace>
+        <delete file="${dist.dir}/${app.name}.zip"/>
+        <zip destfile="${dist.dir}/${app.name}.zip" basedir="${dist.dir}"/>
+        <delete dir="${dist.dir}/${app.name}"/>
+    </target>
+
+	<!-- Windows-only target that replaces the icon for the launcher exe with our own icon. -->
+    <target name="replaceWindowsLauncherIcon" if="isWindows" description="Replace the icon for the Windows launcher exe">
+        <echo message="Replacing icon of Windows launcher executable."/>
+        <exec executable="../Simple Libs/tools/ReplaceVistaIcon.exe" resolveexecutable="true">
+            <arg line="build/launcher/bin/${app.name}.exe resources/${app.name}.ico"/>
+        </exec>
+    </target>
+
+    <target name="build-installer" description="Create Installer" depends="-init-netbeans, -init-hudson, build-brand">
+        <echo message="Setting property and task for installer creation" />
+        <property name="nbdist.dir" value="dist"/>
+        <property name="nbdist-app.dir" value="${nbdist.dir}/${app.name}"/>
+
+        <echo message="Preparing ...." />
+        <!--Delete the folder just in case-->
+        <delete dir="${app.name}"/>
+        <echo message="Creating zip distribution." />
+        <antcall target="build-zip"/>
+        <unzip src="${nbdist.dir}/${app.name}.zip" dest="${nbdist.dir}"/>
+
+        <replace file="${nbdist.dir}/${app.name}/etc/${app.name}.conf">
+            <replacefilter token="/dev" value="/${app.version}" />
+            <replacefilter token="-J-Xms24m -J-Xmx64m" value="${run.args.extra}" />
+        </replace>
+        <antcall target="-use-izpack"/>
+    </target>
+    
+    <target name="-update-izpack-config" depends="-init-netbeans, -init-hudson">
         <!-- Update nizpack.xml -->
         <echo file="${suite.dir}/nizpack.xml"><![CDATA[<installation version="1.0">
 <info>
     </conditions>
     <packs>
         <pack name="Core" installGroups="]]>${app.name}<![CDATA[" required="yes">
-            <description>Core Files</description>
-            <file targetdir="$INSTALL_PATH" src="dist/]]>${app.name}<![CDATA[/bin"/>
-            <file targetdir="$INSTALL_PATH" src="dist/]]>${app.name}<![CDATA[/etc"/>
-            <file targetdir="$INSTALL_PATH" src="dist/]]>${app.name}<![CDATA[/]]>${app.name}<![CDATA["/>]]>
+            <description>Core Files</description>]]>
         </echo>
-        <pathconvert pathsep="|" property="used.clusters">
+        <echo>Adding core Package definition</echo>
+        <length string="${suite.dir}" property="suite.dir.length" />
+        <length string="${suite.dir}/dist/${app.name}" property="suite.dir.app.folder.length" />
+        <pathconvert pathsep="|" property="optional.packages.names">
             <mapper type="flatten"/>
-            <path path="${cluster.path}"/>
+            <path path="${optional.packages}"/>
         </pathconvert>
-        <for list="${used.clusters}" delimiter="|" param="cur" trim="true">
+        <var name="core.package.excludes" value=""/>
+        <for list="${optional.packages.names}" delimiter="|" param="cur" trim="true">
             <sequential>
-                <echo file="${suite.dir}/nizpack.xml" append="true"><![CDATA[<file targetdir="$INSTALL_PATH" src="dist/]]>${app.name}<![CDATA[/]]>@{cur}<![CDATA["/>]]>
+                <var name="core.package.excludes" value="^(?!.*(?i)@{cur})${core.package.excludes}"/>
+            </sequential>
+        </for>
+        <for param="file">
+            <fileset dir="dist/${app.name}">
+                <filename regex="${core.package.excludes}"/>
+            </fileset>
+            <sequential>
+                <length string="@{file}" property="file.length" />
+                <lastIndexOf text="@{file}" searchstring="\" property="result"/>
+                <substring text="@{file}" 
+                           start="${suite.dir.length}" 
+                           end="${file.length}" 
+                           property="final.path" />
+                <substring text="@{file}" 
+                           start="${suite.dir.app.folder.length}" 
+                           end="${result}" 
+                           property="final.install.path" />
+                <echo file="${suite.dir}/nizpack.xml" append="true"><![CDATA[<file targetdir="$INSTALL_PATH]]>${final.install.path}<![CDATA[" src="]]>${final.path}<![CDATA["/>]]>
+                </echo>
+                <var name="file.length" unset="true"/>
+                <var name="final.path" unset="true"/>
+                <var name="final.install.path" unset="true"/>
+                <var name="result" unset="true"/>
+            </sequential>
+        </for>
+        <echo file="${suite.dir}/nizpack.xml" append="true"><![CDATA[</pack>]]>
+        </echo>
+        <!--Now create the separate packages-->
+        <pathconvert pathsep="|" property="optional.packages.names">
+            <mapper type="flatten"/>
+            <path path="${optional.packages}"/>
+        </pathconvert>
+        <for list="${optional.packages.names}" delimiter="|" param="cur" trim="true">
+            <sequential>
+                <echo>Creating @{cur} package.</echo>
+                <echo file="${suite.dir}/nizpack.xml" append="true"><![CDATA[<pack name="]]>@{cur}<![CDATA[" preselected="no" installGroups="]]>${app.name}<![CDATA[" required="no" hidden="false">]]>
+                </echo>
+                <echo file="${suite.dir}/nizpack.xml" append="true"><![CDATA[<description>]]>@{cur}<![CDATA[ plugin</description>>]]>
+                </echo>
+                <for param="file">
+                    <fileset dir="dist/${app.name}">
+                        <filename regex="^(.*(?i)@{cur})"/>
+                    </fileset>
+                    <sequential>
+                        <length string="@{file}" property="file.length" />
+                        <lastIndexOf text="@{file}" searchstring="\" property="result"/>
+                        <substring text="@{file}" 
+                                   start="${suite.dir.length}" 
+                                   end="${file.length}" 
+                                   property="final.path" />
+                        <substring text="@{file}" 
+                                   start="${suite.dir.app.folder.length}" 
+                                   end="${result}" 
+                                   property="final.install.path" />
+                        <echo file="${suite.dir}/nizpack.xml" append="true"><![CDATA[<file targetdir="$INSTALL_PATH]]>${final.install.path}<![CDATA[" src="]]>${final.path}<![CDATA["/>]]>
+                        </echo>
+                        <var name="file.length" unset="true"/>
+                        <var name="final.path" unset="true"/>
+                        <var name="final.install.path" unset="true"/>
+                        <var name="result" unset="true"/>
+                    </sequential>
+                </for>
+                <echo file="${suite.dir}/nizpack.xml" append="true"><![CDATA[</pack>]]>
                 </echo>
             </sequential>
         </for>
-        <echo file="${suite.dir}/nizpack.xml" append="true"><![CDATA[</pack>
-        </packs>
+        <echo file="${suite.dir}/nizpack.xml" append="true"><![CDATA[</packs>
         </installation>]]>
         </echo>
-        <!--<echo file="${suite.dir}/nizpack.xml" append="true"><![CDATA[
-            <file targetdir="$INSTALL_PATH/]]>${app.name}<![CDATA[/config/Modules/" src="dist/]]>${app.name}<![CDATA[/]]>${app.name}<![CDATA[/config/Modules/marauroa-lib.xml"/>
-            <file targetdir="$INSTALL_PATH/]]>${app.name}<![CDATA[/config/Modules/" src="dist/]]>${app.name}<![CDATA[/]]>${app.name}<![CDATA[/config/Modules/simple-marauroa-application-api.xml"/>
-            <file targetdir="$INSTALL_PATH/]]>${app.name}<![CDATA[/config/Modules/" src="dist/]]>${app.name}<![CDATA[/]]>${app.name}<![CDATA[/config/Modules/simple-marauroa-application-core.xml"/>
-            <file targetdir="$INSTALL_PATH/]]>${app.name}<![CDATA[/config/Modules/" src="dist/]]>${app.name}<![CDATA[/]]>${app.name}<![CDATA[/config/Modules/simple-marauroa-application-core-db.xml"/>
-            <file targetdir="$INSTALL_PATH/]]>${app.name}<![CDATA[/config/Modules/" src="dist/]]>${app.name}<![CDATA[/]]>${app.name}<![CDATA[/config/Modules/simple-marauroa-application-gui.xml"/>
-            <file targetdir="$INSTALL_PATH/]]>${app.name}<![CDATA[/config/Modules/" src="dist/]]>${app.name}<![CDATA[/]]>${app.name}<![CDATA[/config/Modules/eclipselink.xml"/>
-            <file targetdir="$INSTALL_PATH/]]>${app.name}<![CDATA[/config/Modules/" src="dist/]]>${app.name}<![CDATA[/]]>${app.name}<![CDATA[/config/Modules/simple-marauroa-application-monitor.xml"/>
-            <file targetdir="$INSTALL_PATH/]]>${app.name}<![CDATA[/config/Modules/" src="dist/]]>${app.name}<![CDATA[/]]>${app.name}<![CDATA[/config/Modules/simple-marauroa-client-lib.xml"/>
-            <file targetdir="$INSTALL_PATH/]]>${app.name}<![CDATA[/config/Modules/" src="dist/]]>${app.name}<![CDATA[/]]>${app.name}<![CDATA[/config/Modules/simple-server-lib.xml"/>
-            <file targetdir="$INSTALL_PATH/]]>${app.name}<![CDATA[/core" src="dist/]]>${app.name}<![CDATA[/]]>${app.name}<![CDATA[/core"/>
-            <file targetdir="$INSTALL_PATH/]]>${app.name}<![CDATA[/core/locale" src="dist/]]>${app.name}<![CDATA[/]]>${app.name}<![CDATA[/core/locale/core_]]>${app.name}<![CDATA[.jar"/>
-            <file targetdir="$INSTALL_PATH/]]>${app.name}<![CDATA[/update_tracking" src="dist/]]>${app.name}<![CDATA[/]]>${app.name}<![CDATA[/update_tracking/marauroa-lib.xml"/>
-            <file targetdir="$INSTALL_PATH/]]>${app.name}<![CDATA[/update_tracking" src="dist/]]>${app.name}<![CDATA[/]]>${app.name}<![CDATA[/update_tracking/simple-marauroa-application-api.xml"/>
-            <file targetdir="$INSTALL_PATH/]]>${app.name}<![CDATA[/update_tracking" src="dist/]]>${app.name}<![CDATA[/]]>${app.name}<![CDATA[/update_tracking/simple-marauroa-application-core.xml"/>
-            <file targetdir="$INSTALL_PATH/]]>${app.name}<![CDATA[/update_tracking" src="dist/]]>${app.name}<![CDATA[/]]>${app.name}<![CDATA[/update_tracking/simple-marauroa-application-core-db.xml"/>
-            <file targetdir="$INSTALL_PATH/]]>${app.name}<![CDATA[/update_tracking" src="dist/]]>${app.name}<![CDATA[/]]>${app.name}<![CDATA[/update_tracking/simple-marauroa-application-gui.xml"/>
-            <file targetdir="$INSTALL_PATH/]]>${app.name}<![CDATA[/update_tracking" src="dist/]]>${app.name}<![CDATA[/]]>${app.name}<![CDATA[/update_tracking/eclipselink.xml"/>
-            <file targetdir="$INSTALL_PATH/]]>${app.name}<![CDATA[/update_tracking" src="dist/]]>${app.name}<![CDATA[/]]>${app.name}<![CDATA[/update_tracking/simple-marauroa-application-monitor.xml"/>
-            <file targetdir="$INSTALL_PATH/]]>${app.name}<![CDATA[/update_tracking" src="dist/]]>${app.name}<![CDATA[/]]>${app.name}<![CDATA[/update_tracking/simple-marauroa-client-lib.xml"/>
-            <file targetdir="$INSTALL_PATH/]]>${app.name}<![CDATA[/update_tracking" src="dist/]]>${app.name}<![CDATA[/]]>${app.name}<![CDATA[/update_tracking/simple-server-lib.xml"/>
-            <file targetdir="$INSTALL_PATH/]]>${app.name}<![CDATA[/modules" src="dist/]]>${app.name}<![CDATA[/]]>${app.name}<![CDATA[/modules/ext"/>
-            <file targetdir="$INSTALL_PATH/]]>${app.name}<![CDATA[/modules" src="dist/]]>${app.name}<![CDATA[/]]>${app.name}<![CDATA[/modules/locale"/>
-            <file targetdir="$INSTALL_PATH/]]>${app.name}<![CDATA[/modules" src="dist/]]>${app.name}<![CDATA[/]]>${app.name}<![CDATA[/modules/marauroa-lib.jar"/>
-            <file targetdir="$INSTALL_PATH/]]>${app.name}<![CDATA[/modules" src="dist/]]>${app.name}<![CDATA[/]]>${app.name}<![CDATA[/modules/simple-marauroa-application-api.jar"/>
-            <file targetdir="$INSTALL_PATH/]]>${app.name}<![CDATA[/modules" src="dist/]]>${app.name}<![CDATA[/]]>${app.name}<![CDATA[/modules/simple-marauroa-application-core.jar"/>
-            <file targetdir="$INSTALL_PATH/]]>${app.name}<![CDATA[/modules" src="dist/]]>${app.name}<![CDATA[/]]>${app.name}<![CDATA[/modules/simple-marauroa-application-core-db.jar"/>
-            <file targetdir="$INSTALL_PATH/]]>${app.name}<![CDATA[/modules" src="dist/]]>${app.name}<![CDATA[/]]>${app.name}<![CDATA[/modules/simple-marauroa-application-gui.jar"/>
-            <file targetdir="$INSTALL_PATH/]]>${app.name}<![CDATA[/modules" src="dist/]]>${app.name}<![CDATA[/]]>${app.name}<![CDATA[/modules/eclipselink.jar"/>
-            <file targetdir="$INSTALL_PATH/]]>${app.name}<![CDATA[/modules" src="dist/]]>${app.name}<![CDATA[/]]>${app.name}<![CDATA[/modules/simple-marauroa-application-monitor.jar"/>
-            <file targetdir="$INSTALL_PATH/]]>${app.name}<![CDATA[/modules" src="dist/]]>${app.name}<![CDATA[/]]>${app.name}<![CDATA[/modules/simple-marauroa-client-lib.jar"/>
-            <file targetdir="$INSTALL_PATH/]]>${app.name}<![CDATA[/modules" src="dist/]]>${app.name}<![CDATA[/]]>${app.name}<![CDATA[/modules/simple-server-lib.jar"/>
-            <file targetdir="$INSTALL_PATH/]]>${app.name}<![CDATA[/" src="dist/]]>${app.name}<![CDATA[/]]>${app.name}<![CDATA[/resources"/>
-        </pack>
-        <pack name="jWrestling" preselected="no" installGroups="]]>${app.name}<![CDATA[" required="no" hidden="false">
-            <description>jWrestling plugin</description>
-            <file targetdir="$INSTALL_PATH/]]>${app.name}<![CDATA[/modules" src="dist/]]>${app.name}<![CDATA[/]]>${app.name}<![CDATA[/modules/games-jwrestling-application.jar"/>
-            <file targetdir="$INSTALL_PATH/]]>${app.name}<![CDATA[/config/Modules/" src="dist/]]>${app.name}<![CDATA[/]]>${app.name}<![CDATA[/config/Modules/games-jwrestling-application.xml"/>
-            <file targetdir="$INSTALL_PATH/]]>${app.name}<![CDATA[/modules/docs" src="dist/]]>${app.name}<![CDATA[/]]>${app.name}<![CDATA[/modules/docs/games-jwrestling-application.jar"/>
-            <file targetdir="$INSTALL_PATH/]]>${app.name}<![CDATA[/update_tracking" src="dist/]]>${app.name}<![CDATA[/]]>${app.name}<![CDATA[/update_tracking/games-jwrestling-application.xml"/>
-        </pack>
-    </packs>
-</installation>]]>
-        </echo>-->
         <antcall target="suite.branding"/>
     </target>
     
-    <target name="x" depends="">     
-        <foreach target="loop" param="loop.param">        
-            <dirset dir="${src.dir}" />     
-        </foreach>  
-    </target>  
-    <target name="loop">     
-        <echo message="${loop.param}"/>  
-        <basename property="dir.name" file="${loop.param}"/>  
-        <echo message="${dir.name}"/>  
-    </target>  
-
-    <target name="build-zip" depends="suite.build-zip">
-        <unzip src="${dist.dir}/${app.name}.zip" dest="${dist.dir}"/>
-        <replace file="${dist.dir}/${app.name}/etc/${app.name}.conf">
-            <replacefilter token="/dev" value="/${app.version}" />
-            <replacefilter token="-J-Xms24m -J-Xmx64m" value="${run.args.extra}" />
-        </replace>
-        <delete file="${dist.dir}/${app.name}.zip"/>
-        <zip destfile="${dist.dir}/${app.name}.zip" basedir="${dist.dir}"/>
-        <delete dir="${dist.dir}/${app.name}"/>
-    </target>
-
-	<!-- Windows-only target that replaces the icon for the launcher exe with our own icon. -->
-    <target name="replaceWindowsLauncherIcon" if="isWindows" description="Replace the icon for the Windows launcher exe">
-        <echo message="Replacing icon of Windows launcher executable."/>
-        <exec executable="../Simple Libs/tools/ReplaceVistaIcon.exe" resolveexecutable="true">
-            <arg line="build/launcher/bin/${app.name}.exe resources/${app.name}.ico"/>
-        </exec>
-    </target>
-
-    <target name="build-installer" description="Create Installer" depends="-init-netbeans, -init-hudson, build-brand">
-        <echo message="Setting property and task for installer creation" />
-        <property name="nbdist.dir" value="dist"/>
-        <property name="nbdist-app.dir" value="${nbdist.dir}/${app.name}"/>
-
-        <echo message="Preparing ...." />
-        <!--Delete the folder just in case-->
-        <delete dir="${app.name}"/>
-        <echo message="Creating zip distribution." />
-        <antcall target="build-zip"/>
-        <unzip src="${nbdist.dir}/${app.name}.zip" dest="${nbdist.dir}"/>
-
-        <replace file="${nbdist.dir}/${app.name}/etc/${app.name}.conf">
-            <replacefilter token="/dev" value="/${app.version}" />
-            <replacefilter token="-J-Xms24m -J-Xmx64m" value="${run.args.extra}" />
-        </replace>    
-        <antcall target="-use-izpack"/>
-    </target>
-    
-    <target name="-use-izpack">
+    <target name="-use-izpack" depends="-init-netbeans, -init-hudson, -update-izpack-config">
         <property name="izpack.dir" location="../Simple Libs/tools/IzPack"/>
         <property name="exeName" value="${app.title}-Setup"/>
         <property name="izpack-installer" value="${exeName}.jar"/>
         <pathconvert property="lookup-lib" refid="finder" />
         <copy file="${lookup-lib}" tofile="../Simple Libs/org-openide-util-lookup.jar"/>
     </target>
-    
-    <target name="smart-izpack" depends="-init-netbeans, -init-hudson">
-        <pathconvert pathsep="|" property="used.modules">
-            <mapper type="flatten"/>
-            <path path="${modules}"/>
-        </pathconvert>
-        <for list="${used.modules}" delimiter="|" param="cur" trim="true">
-            <sequential>
-                <echo>@{cur}</echo>
-            </sequential>
-        </for>
-    </target>
 </project>

Marauroa Application Manager/nbproject/genfiles.properties

 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
 nbproject/build-impl.xml.data.CRC32=fac833b9
 nbproject/build-impl.xml.script.CRC32=ddd68912
-nbproject/build-impl.xml.stylesheet.CRC32=0f381476@2.46
+nbproject/build-impl.xml.stylesheet.CRC32=0f381476@2.47.1
 nbproject/platform.xml.data.CRC32=fac833b9
 nbproject/platform.xml.script.CRC32=db9e1f43
 nbproject/platform.xml.stylesheet.CRC32=df8ac4dd@2.46

Marauroa Application Manager/nbproject/private/private.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <project-private xmlns="http://www.netbeans.org/ns/project-private/1">
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
+    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/1">
+        <file>file:/Z:/NetBeans/Simple%20Marauroa/Marauroa%20Application%20Manager/nbproject/project.properties</file>
+        <file>file:/Z:/NetBeans/Simple%20Marauroa/Marauroa%20Application%20Manager/build.xml</file>
+    </open-files>
 </project-private>

Marauroa Application Manager/nbproject/project.properties

 keystore= ${keystore.location}${keystore.name}
 #---------------------------------------------------------------------
 #Installer settings
-optional.package.jwrestling=games.jwrestling.application
-optional.package.jwrestling.desc=jWrestling
+optional.packages=\
+    jWrestling

Marauroa Application Manager/nizpack.xml

-<installation version="1.0">
-<info>
-    <appname>Marauroa Server Manager</appname>
-    <appversion>0.1</appversion>
-    <appsubpath>Marauroa Server Manager</appsubpath>
-    <javaversion>1.6+</javaversion>
-    <authors>
-        <author name="Javier A. Ortiz Bultr&#xf3;n" email="javier.ortiz.78@gmail.com"/>
-    </authors>
-</info>
-<guiprefs height="450" resizable="yes" width="600">
-    <modifier key="useFlags" value="no"/>
-    <modifier key="langDisplayType" value="native"/>
-    <modifier key="allYGap" value="8"/>
-    <modifier key="allXGap" value="4"/>
-    <modifier key="layoutAnchor" value="NORTHWEST"/>
-    <modifier key="useHeadingPanel" value="yes"/>
-    <modifier key="headingLineCount" value="1"/>
-</guiprefs>
-<locale>
-    <langpack iso3="eng"/>
-</locale>
-<native name="ShellLink.dll" type="izpack">
-    <os family="windows"/>
-</native>
-<native stage="both" name="COIOSHelper.dll" type="3rdparty">
-    <os family="windows"/>
-</native>
-<listeners>
-    <listener installer="RegistryInstallerListener" uninstaller="RegistryUninstallerListener">
-        <os family="windows"/>
-    </listener>
-    <listener installer="SummaryLoggerInstallerListener" uninstaller="RegistryUninstallerListener">
-        <os family="windows"/>
-    </listener>
-</listeners>
-<variables/>
-<resources>
-    <res src="resources/marauroa_server_manager.gif" id="Installer.image"/>
-    <res src="resources/marauroa_server_manager.gif" id="Heading.image"/>
-    <res src="shortcutSpec.xml" id="shortcutSpec.xml"/>
-    <res src="resources/License.txt" id="HTMLLicencePanel.licence"/>
-</resources>
-<panels>
-    <panel classname="CheckedHelloPanel"/>
-    <panel classname="HTMLLicencePanel"/>
-    <panel classname="TargetPanel"/>
-    <panel classname="PacksPanel"/>
-    <panel classname="InstallPanel"/>
-    <panel classname="ShortcutPanel"/>
-    <panel classname="SimpleFinishPanel"/>
-</panels>
-<conditions>
-        <condition type="packselection" id="jWrestling_Selected">
-            <packid>jWrestling</packid>
-        </condition>
-    </conditions>
-    <packs>
-        <pack name="Core" installGroups="marauroa_server_manager" required="yes">
-            <description>Core Files</description>
-            <file targetdir="$INSTALL_PATH" src="dist/marauroa_server_manager/bin"/>
-            <file targetdir="$INSTALL_PATH" src="dist/marauroa_server_manager/etc"/>
-            <file targetdir="$INSTALL_PATH" src="dist/marauroa_server_manager/marauroa_server_manager"/>
-        <file targetdir="$INSTALL_PATH" src="dist/marauroa_server_manager/extra"/>
-                <file targetdir="$INSTALL_PATH" src="dist/marauroa_server_manager/ide"/>
-                <file targetdir="$INSTALL_PATH" src="dist/marauroa_server_manager/nb"/>
-                <file targetdir="$INSTALL_PATH" src="dist/marauroa_server_manager/platform"/>
-                <file targetdir="$INSTALL_PATH" src="dist/marauroa_server_manager/sappy"/>
-                </pack>
-        </packs>
-        </installation>

Marauroa Application Manager/pom.xml

     <modelVersion>4.0.0</modelVersion>
     <groupId>simple.marauroa.rcp.server</groupId>
     <artifactId>MSM</artifactId>
-    <version>0.1</version>
+    <version>${app.version}</version>
     <packaging>pom</packaging>
     <name>Marauroa Server Manager</name>
     <build>

Marauroa Application Manager/preparation.xml

         <available file="../../Simple Libs" type="dir"/>
     </condition>
 
-    <target name="unzip-custom-clusters" depends="--init-netbeans, --init-hudson">
+    <target name="unzip-custom-clusters" depends="-init-netbeans, -init-hudson">
         <!--Hudson needs to run this task first as it gets the core modules as zip from version control-->
         <for param="file"> 
             <path> 
         <basename property="ant-contrib-filename" file="${ant-contrib-jar}"/>
     </target>
 
-    <target name="--init-netbeans" depends="check-env" if="isNetbeans">
+    <target name="-init-netbeans" depends="check-env" if="isNetbeans">
         <echo>Configuring ant-contrib for Netbeans use...</echo>
         <property name="ant-contrib-loc" value="${lib.dir}/${ant-contrib-filename}"/>
         <available file="${ant-contrib-loc}" property="ant-contrib.present"/>
         </taskdef>
     </target>
 
-    <target name="--init-hudson" depends="check-env" unless="isNetbeans">
+    <target name="-init-hudson" depends="check-env" unless="isNetbeans">
         <echo>Configuring ant-contrib for Hudson use...</echo>
         <!--Import Hudson environment variables-->
         <property environment="env"/>

Marauroa Application Manager/shortcutSpec.xml

-<shortcuts>
-    <skipIfNotSupported/>
-    <programGroup location="applications" defaultName="$APP_NAME"/>
-    <shortcut name="marauroa_server_manager" type="Application" 
-    encoding="UTF-8" description="$APP_NAME" 
-    target="$INSTALL_PATH/bin/marauroa_server_manager.exe" applications="no" 
-    programGroup="yes" desktop="yes"/>
-    <shortcut name="Uninstall $APP_NAME" type="Application" 
-    encoding="UTF-8" description="$APP_NAME Uninstaller" 
-    target="$INSTALL_PATH/Uninstaller/uninstaller.jar" 
-    programGroup="yes"/>
-</shortcuts>
-