remove support of the 'with JRE' installer

9 files changed, 2 insertions, 199 deletions

diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 64e4c04bf963..57dd86c60098 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -2064,8 +2064,6 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
             {
                 # Adding child projects to installation dynamically (also in feature table)
                 installer::windows::idtglobal::add_childprojects($languageidtdir, $filesinproductlanguageresolvedarrayref, $allvariableshashref);
-                # setting Java variables for Java products
-                if ( $allvariableshashref->{'JAVAPRODUCT'} ) { installer::windows::java::update_java_tables($languageidtdir, $allvariableshashref); }
             }
 
             # Then the language specific msi database can be created
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm
index b0824efe996a..aacc15e07a90 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -483,8 +483,7 @@ sub set_addchildprojects
 {
     my ($allvariables) = @_;
 
-    if (( $allvariables->{'JAVAPRODUCT'} ) ||
-        ( $allvariables->{'ADAPRODUCT'} ) ||
+    if (( $allvariables->{'ADAPRODUCT'} ) ||
         ( $allvariables->{'UREPRODUCT'} ) ||
         ( $allvariables->{'ADDREQUIREDPACKAGES'} )) { $installer::globals::addchildprojects = 1; }
 
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index 76c1792191bd..ec133cbe7c6b 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -2962,14 +2962,6 @@ sub put_childprojects_into_installset
     # Create xpd file and put it into xpd directory
     # xpd file has to be created completely from module and package itself (-> no packagelist!)
 
-    if ( $allvariables->{'JAVAPRODUCT'} )
-    {
-        # Collect all modules with flag "JAVAMODULE"
-        my $allmodules = collect_modules_with_style("JAVAMODULE", $modulesarrayref);
-        $allmodules = remove_modules_without_package($allmodules);
-        copy_childproject_files($allmodules, $sopackpath, $destdir, $modulesarrayref, $allvariables, "jre", $includepatharrayref, 1);
-    }
-
     # Adding additional required packages (freetype).
     # This package names are stored in global array @installer::globals::requiredpackages
 
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index ea352ba910fd..33d6e0aa47cc 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -425,10 +425,6 @@ BEGIN
     $localinstalldirset = 0;
     $localinstalldir = "";
 
-    $javafilename = "";
-    $javafilename2 = "";
-    $javafilename3 = "";
-    $javafile = "";
     $urefile = "";
 
     $postprocess_specialepm = 0;
diff --git a/solenv/bin/modules/installer/windows/feature.pm b/solenv/bin/modules/installer/windows/feature.pm
index b057b0e27fd5..94d09f56b36f 100644
--- a/solenv/bin/modules/installer/windows/feature.pm
+++ b/solenv/bin/modules/installer/windows/feature.pm
@@ -388,7 +388,7 @@ sub create_feature_table
             # Java and Ada only, if the correct settings are set
             my $styles = "";
             if ( $onefeature->{'Styles'} ) { $styles = $onefeature->{'Styles'}; }
-            if (( $styles =~ /\bJAVAMODULE\b/ ) && ( ! ($allvariableshashref->{'JAVAPRODUCT'} ))) { next; }
+            if ( $styles =~ /\bJAVAMODULE\b/ )  { next; }
             if (( $styles =~ /\bADAMODULE\b/ ) && ( ! ($allvariableshashref->{'ADAPRODUCT'} ))) { next; }
 
             # Controlling the language!
diff --git a/solenv/bin/modules/installer/windows/file.pm b/solenv/bin/modules/installer/windows/file.pm
index c4315b43aceb..044a1af01c4b 100644
--- a/solenv/bin/modules/installer/windows/file.pm
+++ b/solenv/bin/modules/installer/windows/file.pm
@@ -892,7 +892,6 @@ sub create_files_table
 
         my $styles = "";
         if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; }
-        if (( $styles =~ /\bJAVAFILE\b/ ) && ( ! ($allvariables->{'JAVAPRODUCT'} ))) { next; }
 
         $file{'Component_'} = get_file_component_name($onefile, $filesref);
         $file{'File'} = generate_unique_filename_for_filetable($onefile, $file{'Component_'}, $uniquefilenamehashref);
diff --git a/solenv/bin/modules/installer/windows/idtglobal.pm b/solenv/bin/modules/installer/windows/idtglobal.pm
index 94b5dcc62399..53044f41202b 100644
--- a/solenv/bin/modules/installer/windows/idtglobal.pm
+++ b/solenv/bin/modules/installer/windows/idtglobal.pm
@@ -1682,10 +1682,8 @@ sub add_childprojects
     my $infoline = "";
     my $line = "";
 
-    $installer::globals::javafile = installer::worker::return_first_item_with_special_flag($filesref ,"JAVAFILE");
     $installer::globals::urefile = installer::worker::return_first_item_with_special_flag($filesref ,"UREFILE");
 
-    if (( $installer::globals::javafile eq "" ) && ( $allvariables->{'JAVAPRODUCT'} )) { installer::exiter::exit_program("ERROR: No JAVAFILE found in files collector!", "add_childprojects"); }
     if (( $installer::globals::urefile eq "" ) && ( $allvariables->{'UREPRODUCT'} )) { installer::exiter::exit_program("ERROR: No UREFILE found in files collector!", "add_childprojects"); }
 
     # Content for Directory table
@@ -1724,12 +1722,6 @@ sub add_childprojects
     my $subjavadir = "";
     my $suburedir = "";
 
-    if ( $allvariables->{'JAVAPRODUCT'} )
-    {
-        $dirname = get_directory_name_from_file($installer::globals::javafile);
-        $subjavadir = include_subdirname_into_directory_table($dirname, $directorytable, $directorytablename, $installer::globals::javafile);
-    }
-
     if ( $allvariables->{'UREPRODUCT'} )
     {
         $dirname = get_directory_name_from_file($installer::globals::urefile);
@@ -1739,20 +1731,10 @@ sub add_childprojects
     # Content for the Component table
     # The Java and Ada components have new directories
 
-    if ( $allvariables->{'JAVAPRODUCT'} ) { include_subdir_into_componenttable($subjavadir, $installer::globals::javafile, $componenttable); }
     if ( $allvariables->{'UREPRODUCT'} ) { include_subdir_into_componenttable($suburedir, $installer::globals::urefile, $componenttable); }
 
     # Content for CustomAction table
 
-    if ( $allvariables->{'JAVAPRODUCT'} )
-    {
-        $line = "InstallJava\t98\tSystemFolder\t[SourceDir]$installer::globals::javafile->{'Subdir'}\\$installer::globals::javafile->{'Name'} \/qb REBOOT=Suppress SPONSORS=0 DISABLEAD=1\n";
-        push(@{$customactiontable} ,$line);
-        installer::remover::remove_leading_and_ending_whitespaces(\$line);
-        $infoline = "Added $line into table $customactiontablename\n";
-        push(@installer::globals::logfileinfo, $infoline);
-    }
-
     if ( $allvariables->{'UREPRODUCT'} )
     {
         $line = "InstallUre\t98\tSystemFolder\t$installer::globals::urefile->{'Subdir'}\\$installer::globals::urefile->{'Name'} /S\n";
@@ -1762,15 +1744,6 @@ sub add_childprojects
         push(@installer::globals::logfileinfo, $infoline);
     }
 
-    if ( $allvariables->{'JAVAPRODUCT'} )
-    {
-        $line = "MaintenanceJava\t82\t$installer::globals::javafile->{'uniquename'}\t\/qb REBOOT=Suppress SPONSORS=0 DISABLEAD=1\n";
-        push(@{$customactiontable} ,$line);
-        installer::remover::remove_leading_and_ending_whitespaces(\$line);
-        $infoline = "Added $line into table $customactiontablename\n";
-        push(@installer::globals::logfileinfo, $infoline);
-    }
-
     if ( $allvariables->{'UREPRODUCT'} )
     {
         $line = "MaintenanceUre\t82\t$installer::globals::urefile->{'uniquename'}\t\/S\n";
@@ -1798,18 +1771,6 @@ sub add_childprojects
         push(@installer::globals::logfileinfo, $infoline);
     }
 
-    if ( $allvariables->{'JAVAPRODUCT'} )
-    {
-        $number = get_free_number_in_uisequence_table($installuitable) + 2;
-        $featurename = get_feature_name("_Java", $featuretable);
-        if ( $featurename ) { $line = "InstallJava\t\&$featurename\=3 And Not Installed And JAVAPATH\=\"\" And Not PATCH\t$number\n"; }
-        else { $line = "InstallJava\tNot Installed And JAVAPATH\=\"\" And Not PATCH\t$number\n"; } # feature belongs to root
-        push(@{$installuitable} ,$line);
-        installer::remover::remove_leading_and_ending_whitespaces(\$line);
-        $infoline = "Added $line into table $installuitablename\n";
-        push(@installer::globals::logfileinfo, $infoline);
-    }
-
     if ( $allvariables->{'ADAPRODUCT'} )
     {
         $number = get_free_number_in_uisequence_table($installuitable) + 4;
@@ -1821,18 +1782,6 @@ sub add_childprojects
         push(@installer::globals::logfileinfo, $infoline);
     }
 
-    if ( $allvariables->{'JAVAPRODUCT'} )
-    {
-        $number = get_free_number_in_uisequence_table($installuitable) + 6;
-        $featurename = get_feature_name("_Java", $featuretable);
-        if ( $featurename ) { $line = "MaintenanceJava\t\&$featurename\=3 And Installed And JAVAPATH\=\"\" And Not PATCH\t$number\n"; }
-        else { $line = "MaintenanceJava\tInstalled And JAVAPATH\=\"\" And Not PATCH\t$number\n"; } # feature belongs to root
-        push(@{$installuitable} ,$line);
-        installer::remover::remove_leading_and_ending_whitespaces(\$line);
-        $infoline = "Added $line into table $installuitablename\n";
-        push(@installer::globals::logfileinfo, $infoline);
-    }
-
     if ( $allvariables->{'UREPRODUCT'} )
     {
         $number = get_free_number_in_uisequence_table($installuitable) + 8;
diff --git a/solenv/bin/modules/installer/windows/java.pm b/solenv/bin/modules/installer/windows/java.pm
deleted file mode 100644
index 11ccd7076f71..000000000000
--- a/solenv/bin/modules/installer/windows/java.pm
+++ /dev/null
@@ -1,120 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::windows::java;
-
-use installer::exiter;
-use installer::files;
-use installer::globals;
-use installer::windows::idtglobal;
-
-####################################################################################
-# Writing content into RegLocat.idt and AppSearc.idt to find Java on system
-####################################################################################
-
-sub update_java_tables
-{
-    my ($basedir, $allvariables) = @_;
-
-    my $reglocatfile = "";
-    my $appsearchfile = "";
-
-    my $reglocatfilename = $basedir . $installer::globals::separator . "RegLocat.idt";
-    my $appsearchfilename = $basedir . $installer::globals::separator . "AppSearc.idt";
-    my $signaturefilename = $basedir . $installer::globals::separator . "Signatur.idt";
-
-    if ( -f $reglocatfilename )
-    {
-        $reglocatfile = installer::files::read_file($reglocatfilename);
-    }
-    else
-    {
-        my @reglocattable = ();
-        $reglocatfile = \@reglocattable;
-        installer::windows::idtglobal::write_idt_header($reglocatfile, "reglocat");
-    }
-
-    if ( -f $appsearchfilename )
-    {
-        $appsearchfile = installer::files::read_file($appsearchfilename);
-    }
-    else
-    {
-        my @appsearchtable = ();
-        $appsearchfile = \@appsearchtable;
-        installer::windows::idtglobal::write_idt_header($appsearchfile, "appsearch");
-    }
-
-    if ( -f $signaturefilename )
-    {
-        $signaturefile = installer::files::read_file($signaturefilename);
-    }
-    else
-    {
-        my @signaturetable = ();
-        $signaturefile = \@signaturetable;
-        installer::windows::idtglobal::write_idt_header($signaturefile, "signatur");
-    }
-
-    # Writing content into this tables
-    # Java version is saved in scp project
-    # $installer::globals::javafile was defined in installer::windows::idtglobal::add_childprojects
-
-    if ( ! $installer::globals::javafile->{'Javaversion'} ) { installer::exiter::exit_program("ERROR: \"Javaversion\" has to be defined in $installer::globals::javafile->{'gid'} in scp project!", "update_java_tables"); }
-
-    my $javastring = $installer::globals::javafile->{'Javaversion'};
-
-    my $signature = "JavaReg";
-    my $rootvalue = "2";
-    my $key = "Software\\JavaSoft\\Java Runtime Environment\\" . $javastring;
-    my $name = "JavaHome";
-    my $type = 2;
-    my $property = "JAVAPATH";
-
-    my $oneline = $signature . "\t" . $rootvalue . "\t" . $key . "\t" . $name . "\t" . $type . "\n";
-    push(@{$reglocatfile}, $oneline);
-
-    $oneline = $property . "\t" . $signature . "\n";
-    push(@{$appsearchfile}, $oneline);
-
-    # Saving the files
-
-    installer::files::save_file($reglocatfilename ,$reglocatfile);
-    my $infoline = "Updated idt file for Java: $reglocatfilename\n";
-    push(@installer::globals::logfileinfo, $infoline);
-
-    installer::files::save_file($appsearchfilename ,$appsearchfile);
-    $infoline = "Updated idt file for Java: $appsearchfilename\n";
-    push(@installer::globals::logfileinfo, $infoline);
-
-    installer::files::save_file($signaturefilename ,$signaturefile);
-    $infoline = "Updated idt file: $signaturefilename\n";
-    push(@installer::globals::logfileinfo, $infoline);
-
-}
-
-1;
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm
index 43e6ee3f4cde..8b8007a82a68 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -1235,16 +1235,6 @@ sub copy_child_projects_into_installset
     my $sourcefile = "";
     my $destdir = "";
 
-    # adding Java
-
-    if ( $allvariables->{'JAVAPRODUCT'} )
-    {
-        $sourcefile = $installer::globals::javafile->{'sourcepath'};
-        $destdir = $installdir . $installer::globals::separator . $installer::globals::javafile->{'Subdir'};
-        if ( ! -d $destdir) { installer::systemactions::create_directory($destdir); }
-        installer::systemactions::copy_one_file($sourcefile, $destdir);
-    }
-
     if ( $allvariables->{'UREPRODUCT'} )
     {
         $sourcefile = $installer::globals::urefile->{'sourcepath'};