[jbpm-commits] JBoss JBPM SVN: r6850 - in jbpm3/branches/jbpm-3.2-soa/soa-distribution: resource and 1 other directory.

[do-not-reply at jboss.org]

Author: jcoleman at redhat.com
Date: 2010-12-01 09:33:51 -0500 (Wed, 01 Dec 2010)
New Revision: 6850

Modified:
   jbpm3/branches/jbpm-3.2-soa/soa-distribution/build.xml
   jbpm3/branches/jbpm-3.2-soa/soa-distribution/resource/autosetup.xml
Log:
Update our installation template and builder to catch up with the changes to
the installation template in the distribution directory.


Modified: jbpm3/branches/jbpm-3.2-soa/soa-distribution/build.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/soa-distribution/build.xml	2010-11-29 16:50:28 UTC (rev 6849)
+++ jbpm3/branches/jbpm-3.2-soa/soa-distribution/build.xml	2010-12-01 14:33:51 UTC (rev 6850)
@@ -63,12 +63,6 @@
           <fileset dir="${module_base_dir}/target/work/javadocs" includes="**/*" />
         </copy>
         
-        <!-- add files required for JBDS -->
-        <mkdir dir="${module_base_dir}/target/dist/jbpm-jpdl/src/resources/gpd" />
-        <copy todir="${module_base_dir}/target/dist/jbpm-jpdl/src/resources/gpd" file="${module_base_dir}/../distribution/src/main/etc/version.info.xml" />
-        <copy todir="${module_base_dir}/target/dist/jbpm-jpdl/src" file="${module_base_dir}/../distribution/target/assembly-modules/src/jbpm-jpdl-sources.jar" />
-        <copy todir="${module_base_dir}/target/dist/jbpm-jpdl/src" file="${module_base_dir}/../distribution/target/assembly-modules/src/jbpm-identity-sources.jar" />
-
         <zip destfile="${module_base_dir}/target/${module_build_finalName}.zip" > 
           <zipfileset dir="${module_base_dir}/target/dist" prefix="jbpm" includes="**/*" />
         </zip>

Modified: jbpm3/branches/jbpm-3.2-soa/soa-distribution/resource/autosetup.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/soa-distribution/resource/autosetup.xml	2010-11-29 16:50:28 UTC (rev 6849)
+++ jbpm3/branches/jbpm-3.2-soa/soa-distribution/resource/autosetup.xml	2010-12-01 14:33:51 UTC (rev 6850)
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
 <AutomatedInstallation langpack="eng">
   <com.izforge.izpack.panels.HelloPanel />
   <com.izforge.izpack.panels.TargetPanel>
@@ -4,29 +6,44 @@
     <installpath>@JBPM_INSTALL_PATH@</installpath>
   </com.izforge.izpack.panels.TargetPanel>
   <com.izforge.izpack.panels.TreePacksPanel>
-    <pack name="jBPM3 Standalone" index="0" selected="true"/>
-    <pack name="jBPM3 JBoss Integration" index="1" selected="true"/>
-    <pack name="JSF-Console" index="2" selected="true"/>
-    <pack name="Optional Components" index="3" selected="false"/>
-    <pack name="Download JBoss-5.0.0" index="4" selected="false"/>
-    <pack name="Download Eclipse-3.4.0" index="5" selected="false"/>
+    <pack name="jBPM Standalone" index="0" selected="true" />
+    <pack name="Process Engine" index="1" selected="true" />
+    <pack name="Documentation" index="2" selected="true" />
+    <pack name="Eclipse Designer" index="3" selected="true" />
+    <pack name="JBoss AS Integration" index="4" selected="false" />
+    <pack name="jBPM Service" index="5" selected="false" />
+    <pack name="JSF Console" index="6" selected="false" />
+    <pack name="Tomcat Integration" index="7" selected="false" />
+    <pack name="Optional Downloads" index="8" selected="false" />
+    <pack name="JBoss AS" index="9" selected="false" />
+    <pack name="Eclipse" index="10" selected="false" />
   </com.izforge.izpack.panels.TreePacksPanel>
   <com.izforge.izpack.panels.UserInputPanel>
     <userInput>
+      <entry key="jbossSelection" value="jboss423" />
       <entry key="jbossTargetServer" value="default" />
-      <entry key="jbossSelection" value="jboss423" />
     </userInput>
   </com.izforge.izpack.panels.UserInputPanel>
   <com.izforge.izpack.panels.UserInputPanel>
     <userInput>
-      <entry key="dbSelection" value="hsqldb"/>
+      <entry key="jbossInstallPath" value="@JBOSS_INSTALL_PATH@" />
     </userInput>
   </com.izforge.izpack.panels.UserInputPanel>
   <com.izforge.izpack.panels.UserInputPanel>
     <userInput>
-      <entry key="jbossInstallPath" value="@JBOSS_INSTALL_PATH@" />
+      <entry key="tomcatSelection" value="${container}" />
     </userInput>
   </com.izforge.izpack.panels.UserInputPanel>
+  <com.izforge.izpack.panels.UserInputPanel>
+    <userInput>
+      <entry key="tomcatInstallPath" value="${tomcat.home}" />
+    </userInput>
+  </com.izforge.izpack.panels.UserInputPanel>
+  <com.izforge.izpack.panels.UserInputPanel>
+    <userInput>
+      <entry key="dbSelection" value="hsqldb" />
+    </userInput>
+  </com.izforge.izpack.panels.UserInputPanel>
   <com.izforge.izpack.panels.SummaryPanel />
   <com.izforge.izpack.panels.InstallPanel />
   <com.izforge.izpack.panels.FinishPanel />