? 32364.diff
Index: NB.xml
===================================================================
RCS file: /cvs/installer/NB.xml,v
retrieving revision 1.20
diff -u -b -B -r1.20 NB.xml
--- NB.xml	18 Mar 2003 14:58:26 -0000	1.20
+++ NB.xml	26 Mar 2003 16:27:10 -0000
@@ -1168,7 +1168,11 @@
                 <arrayItem type="com.ibm.wizard.platform.linux.LinuxLauncherDistribution">
                     <property name="enabled">True</property>
                     <property name="fileName">setuplinux.bin</property>
-                    <property array="True" length="5" name="JVMFileSources" type="com.installshield.util.jvm.JVMFile">
+                    <property array="True" length="6" name="JVMFileSources" type="com.installshield.util.jvm.JVMFile">
+                        <arrayItem type="com.installshield.util.jvm.JVMFile">
+                            <property name="fileName">$A(IS_HOME)/jvms/linux/sunjdk142.jvm</property>
+                            <property name="fullSearch">False</property>
+                        </arrayItem>
                         <arrayItem type="com.installshield.util.jvm.JVMFile">
                             <property name="fileName">$A(IS_HOME)/jvms/linux/sunjdk141.jvm</property>
                             <property name="fullSearch">False</property>
@@ -1205,7 +1209,15 @@
                 <arrayItem type="com.installshield.wizard.platform.solaris.distribution.SolarisLauncherDistributionSparc">
                     <property name="enabled">True</property>
                     <property name="fileName">setupsolarisSparc.bin</property>
-                    <property array="True" length="5" name="JVMFileSources" type="com.installshield.util.jvm.JVMFile">
+                    <property array="True" length="7" name="JVMFileSources" type="com.installshield.util.jvm.JVMFile">
+                        <arrayItem type="com.installshield.util.jvm.JVMFile">
+                            <property name="fileName">$A(IS_HOME)/jvms/solaris/sun.jdk.1.4.2.solaris.jvm</property>
+                            <property name="fullSearch">False</property>
+                        </arrayItem>
+                        <arrayItem type="com.installshield.util.jvm.JVMFile">
+                            <property name="fileName">$A(IS_HOME)/jvms/solaris/sun.jdk.1.4.1.solaris.jvm</property>
+                            <property name="fullSearch">False</property>
+                        </arrayItem>
                         <arrayItem type="com.installshield.util.jvm.JVMFile">
                             <property name="fileName">$A(IS_HOME)/jvms/solaris/sun.jre.1.4.0.solaris.jvm</property>
                             <property name="fullSearch">False</property>
@@ -1224,7 +1236,7 @@
                         </arrayItem>
                         <arrayItem type="com.installshield.util.jvm.JVMFile">
                             <property name="fileName">$A(IS_HOME)/jvms/solaris/sun.jdk.1.3.1.solaris.jvm</property>
-                            <property name="fullSearch">False</property>
+                            <property name="fullSearch">true</property>
                         </arrayItem>
                     </property>
                     <property name="bundledJVMSource"/>
@@ -1240,7 +1252,15 @@
                 <arrayItem type="com.installshield.wizard.platform.solaris.distribution.SolarisLauncherDistributionX86">
                     <property name="enabled">True</property>
                     <property name="fileName">setupsolarisX86.bin</property>
-                    <property array="True" length="5" name="JVMFileSources" type="com.installshield.util.jvm.JVMFile">
+                    <property array="True" length="7" name="JVMFileSources" type="com.installshield.util.jvm.JVMFile">
+                        <arrayItem type="com.installshield.util.jvm.JVMFile">
+                            <property name="fileName">$A(IS_HOME)/jvms/solaris/sun.jdk.1.4.2.solaris.jvm</property>
+                            <property name="fullSearch">False</property>
+                        </arrayItem>
+                        <arrayItem type="com.installshield.util.jvm.JVMFile">
+                            <property name="fileName">$A(IS_HOME)/jvms/solaris/sun.jdk.1.4.1.solaris.jvm</property>
+                            <property name="fullSearch">False</property>
+                        </arrayItem>
                         <arrayItem type="com.installshield.util.jvm.JVMFile">
                             <property name="fileName">$A(IS_HOME)/jvms/solaris/sun.jre.1.4.0.solaris.jvm</property>
                             <property name="fullSearch">False</property>
@@ -1259,7 +1279,7 @@
                         </arrayItem>
                         <arrayItem type="com.installshield.util.jvm.JVMFile">
                             <property name="fileName">$A(IS_HOME)/jvms/solaris/sun.jdk.1.3.1.solaris.jvm</property>
-                            <property name="fullSearch">False</property>
+                            <property name="fullSearch">true</property>
                         </arrayItem>
                     </property>
                     <property name="bundledJVMSource"/>
@@ -1275,19 +1295,23 @@
                 <arrayItem type="com.installshield.wizard.platform.win32.Win32LauncherDistribution">
                     <property name="enabled">True</property>
                     <property name="fileName">setupwin32.exe</property>
-                    <property array="True" length="4" name="JVMFileSources" type="com.installshield.util.jvm.JVMFile">
+                    <property array="True" length="5" name="JVMFileSources" type="com.installshield.util.jvm.JVMFile">
                         <arrayItem type="com.installshield.util.jvm.JVMFile">
-                            <property name="fileName">$A(IS_HOME)/jvms/win32/sun_win32_14.jvm</property>
+                            <property name="fileName">$A(IS_HOME)/jvms/win32/sun_win32_142.jvm</property>
                             <property name="fullSearch">False</property>
                         </arrayItem>
                         <arrayItem type="com.installshield.util.jvm.JVMFile">
-                            <property name="fileName">$A(IS_HOME)/jvms/win32/sun_win32_13X.jvm</property>
+                            <property name="fileName">$A(IS_HOME)/jvms/win32/sun_win32_141.jvm</property>
                             <property name="fullSearch">False</property>
-                            <property name="key">win32</property>
                         </arrayItem>
                         <arrayItem type="com.installshield.util.jvm.JVMFile">
-                            <property name="fileName">$A(IS_HOME)/jvms/win32/sun_win32_141.jvm</property>
+                            <property name="fileName">$A(IS_HOME)/jvms/win32/sun_win32_14.jvm</property>
+                            <property name="fullSearch">False</property>
+                        </arrayItem>
+                        <arrayItem type="com.installshield.util.jvm.JVMFile">
+                            <property name="fileName">$A(IS_HOME)/jvms/win32/sun_win32_13X.jvm</property>
                             <property name="fullSearch">False</property>
+                            <property name="key">win32</property>
                         </arrayItem>
                         <arrayItem type="com.installshield.util.jvm.JVMFile">
                             <property name="fileName">$A(IS_HOME)/jvms/win32/ibm_win32_131.jvm</property>
Index: jvms/win32/sun_win32_141.jvm
===================================================================
RCS file: /cvs/installer/jvms/win32/sun_win32_141.jvm,v
retrieving revision 1.3
diff -u -b -B -r1.3 sun_win32_141.jvm
--- jvms/win32/sun_win32_141.jvm	30 Oct 2002 09:15:35 -0000	1.3
+++ jvms/win32/sun_win32_141.jvm	26 Mar 2003 16:27:10 -0000
@@ -19,6 +19,8 @@
 	\JavaSoft\1.4.1_01
 	\Java\1.4.1		
 	\Java\1.4.1_01
+	\j2sdk1.4.1
+	\j2sdk1.4.1_01
 	
 	
 /: