[jbpm-commits] JBoss JBPM SVN: r3981 - in jbpm4/trunk/modules/distro: src/main/resources/installer and 1 other directory.

Author: tom.baeyens(a)jboss.com Date: 2009-02-20 09:36:09 -0500 (Fri, 20 Feb 2009) New Revision: 3981 Modified: jbpm4/trunk/modules/distro/scripts/assembly-deploy-artifacts.xml jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml jbpm4/trunk/modules/distro/src/main/resources/installer/user-input-spec.xml Log: added gpd and other installer improvements Modified: jbpm4/trunk/modules/distro/scripts/assembly-deploy-artifacts.xml =================================================================== --- jbpm4/trunk/modules/distro/scripts/assembly-deploy-artifacts.xml 2009-02-20 13:16:03 UTC (rev 3980) +++ jbpm4/trunk/modules/distro/scripts/assembly-deploy-artifacts.xml 2009-02-20 14:36:09 UTC (rev 3981) @@ -32,15 +32,13 @@ <scope>test</scope> <unpack>false</unpack> </dependencySet> - <!--dependencySet> + <dependencySet> <includes> <include>org.jbpm.jbpm4:jbpm-gpd:zip</include> </includes> <outputFileNameMapping>jbpm-gpd-site.zip</outputFileNameMapping> <outputDirectory>gpd</outputDirectory> - </dependencySet--> - - + </dependencySet> <!-- resources --> <dependencySet> <outputDirectory>resources/jbpm-jpdl-config</outputDirectory> Modified: jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml 2009-02-20 13:16:03 UTC (rev 3980) +++ jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml 2009-02-20 14:36:09 UTC (rev 3981) @@ -7,7 +7,7 @@ <info> <appname&gt;(a){product.name}&lt;/appname&gt; <appversion&gt;(a){product.version}&lt;/appversion&gt; - <uninstaller name="remove.task" write="yes" /> + <writeinstallationinformation>no</writeinstallationinformation> </info> <guiprefs width="600" height="440" resizable="yes"> <!-- @@ -107,8 +107,8 @@ ============================== --> - <pack name="jBPM4 Standalone" required="yes" preselected="yes"> - <description>The jBPM4 Standalone Components</description> + <pack name="jBPM Installation Files" required="yes" preselected="yes"> + <description>Installation directory containing docs, libs, examples and sources</description> <!-- jbpm4/ --> <file src=&quot;(a){deploy.artifacts.dir}/release.notes.html&quot; targetdir="$INSTALL_PATH" override="true" /> @@ -124,6 +124,9 @@ <!-- jbpm4/examples --> <fileset dir=&quot;(a){deploy.artifacts.dir}/examples&quot; targetdir="$INSTALL_PATH/examples" /> + <!-- jbpm4/gpd --> + <fileset dir=&quot;(a){deploy.artifacts.dir}/gpd&quot; targetdir="$INSTALL_PATH/gpd" /> + <!-- jbpm4/lib --> <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="$INSTALL_PATH/lib" override="true"> <include name="*.jar" /> @@ -139,9 +142,9 @@ ============================== --> - <pack name="jBPM4 JBoss Integration" required="no" preselected="yes"> + <pack name="Install jBPM in JBoss" required="no" preselected="yes"> - <description>The jBPM4 JBoss Integration</description> + <description>The Install jBPM in JBoss</description> <!-- jbpm/jbpm-service.sar --> <fileset dir=&quot;(a){deploy.artifacts.dir}/resources/jbpm-jpdl-config&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true"> @@ -244,17 +247,14 @@ <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true" condition="isMySQL"> <include name="mysql-connector-java.jar" /> </fileset> + + + <!-- + ============================== + GWT Console + ============================== + --> - </pack> - - <!-- - ============================== - GWT Console - ============================== - --> - - <pack name="GWT-Console" parent="jBPM4 JBoss Integration" required="no" preselected="yes"> - <description>GWT-Console</description> <file src=&quot;(a){deploy.artifacts.dir}/lib/gwt-console.war&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" unpack="false" override="true" /> <file src=&quot;(a){deploy.artifacts.dir}/lib/gwt-console-server.war&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" unpack="false" override="true" /> <file src=&quot;(a){deploy.artifacts.dir}/lib/gwt-console-server-integration.jar&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/lib/" unpack="false" override="true" /> @@ -262,24 +262,25 @@ <!--file src=&quot;(a){deploy.artifacts.dir}/lib/report-server.war&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" unpack="false" override="true" /> <file src=&quot;(a){deploy.artifacts.dir}/lib/gwt-console-server-report.zip&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/data/birt/" unpack="true" override="true" /> <file src=&quot;(a){deploy.artifacts.dir}/lib/report-engine.zip&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/data/birt/" unpack="true" override="true" /--> + </pack> <!-- ============================== Optional Components ============================== - --> - <pack name="Optional Components" required="no" preselected="no"> <description>Optional jBPM4 Components</description> </pack> + --> - <!-- JBoss-5.0.0 --> + <!-- JBoss-5.0.0 <pack name="Download JBoss-5.0.0" required="no" parent="Optional Components" preselected="no"> <description>Download and Install JBoss-5.0.0</description> - <!-- http://jira.codehaus.org/browse/IZPACK-158 --> + <!-- http://jira.codehaus.org/browse/IZPACK-158 <file src=&quot;(a){resources.dir}/installer/download-helper.xml&quot; targetdir="$INSTALL_PATH/Uninstaller"/> </pack> + --> <!-- Eclipse-3.4.0 --> <!--pack name="Download Eclipse-3.4.0" required="no" parent="Optional Components" preselected="no"> Modified: jbpm4/trunk/modules/distro/src/main/resources/installer/user-input-spec.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/resources/installer/user-input-spec.xml 2009-02-20 13:16:03 UTC (rev 3980) +++ jbpm4/trunk/modules/distro/src/main/resources/installer/user-input-spec.xml 2009-02-20 14:36:09 UTC (rev 3981) @@ -1,8 +1,8 @@ <userInput> <panel order="0"> - <createForPack name="jBPM4 JBoss Integration" /> + <createForPack name="Install jBPM in JBoss" /> <field type="radio" variable="jbossSelection"> - <description align="left" txt="Please choose your target server" /> + <description align="left" txt="Select your JBoss Version:" /> <spec> <choice txt="JBoss-5.0.0" value="jboss500" set="true"/> <choice txt="JBoss-4.2.3" value="jboss423"/> @@ -10,13 +10,20 @@ </spec> </field> <field type="text" variable="jbossTargetServer"> - <spec txt="Server:" size="15" set="default" /> + <spec txt="Server configuration:" size="15" set="default" /> </field> </panel> <panel order="1"> - <createForPack name="jBPM4 JBoss Integration" /> + <createForPack name="Install jBPM in JBoss" /> + <field type="dir" align="left" variable="jbossInstallPath"> + <description align="left" txt="Select your JBoss home directory" /> + <spec txt="JBoss Home:" size="25" set="${jboss.home}" /> + </field> + </panel> + <panel order="2"> + <createForPack name="Install jBPM in JBoss" /> <field type="radio" variable="dbSelection"> - <description align="left" txt="Please choose your target database" /> + <description align="left" txt="Select your target database" /> <spec> <choice txt="Hypersonic" value="hsqldb"/> <choice txt="MySQL" value="mysql" set="true"/> @@ -25,10 +32,4 @@ </spec> </field> </panel> - <panel order="2"> - <createForPack name="jBPM4 JBoss Integration" /> - <field type="dir" align="left" variable="jbossInstallPath"> - <spec txt="JBoss Home:" size="25" set="${jboss.home}" /> - </field> - </panel> </userInput> \ No newline at end of file