remove support of the 'bundle Adabas' feature of installer

4 files changed, 1 insertions, 34 deletions

diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm
index aacc15e07a90..0b1032080c71 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->{'ADAPRODUCT'} ) ||
-        ( $allvariables->{'UREPRODUCT'} ) ||
+    if (( $allvariables->{'UREPRODUCT'} ) ||
         ( $allvariables->{'ADDREQUIREDPACKAGES'} )) { $installer::globals::addchildprojects = 1; }
 
     if ( $installer::globals::patch )
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index ec133cbe7c6b..8d78f6226b57 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -2956,12 +2956,6 @@ sub put_childprojects_into_installset
 
     my $sourcefile = "";
 
-    # Finding the modules defined in scp (with flag JAVAMODULE, ADAMODULE, ...)
-    # Getting name of package from scp-Module
-    # Copy file into installation set
-    # Create xpd file and put it into xpd directory
-    # xpd file has to be created completely from module and package itself (-> no packagelist!)
-
     # Adding additional required packages (freetype).
     # This package names are stored in global array @installer::globals::requiredpackages
 
diff --git a/solenv/bin/modules/installer/windows/feature.pm b/solenv/bin/modules/installer/windows/feature.pm
index 94d09f56b36f..d570ec017518 100644
--- a/solenv/bin/modules/installer/windows/feature.pm
+++ b/solenv/bin/modules/installer/windows/feature.pm
@@ -388,8 +388,6 @@ 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/ )  { next; }
-            if (( $styles =~ /\bADAMODULE\b/ ) && ( ! ($allvariableshashref->{'ADAPRODUCT'} ))) { next; }
 
             # Controlling the language!
             # Only language independent feature or feature with the correct language will be included into the table
diff --git a/solenv/bin/modules/installer/windows/idtglobal.pm b/solenv/bin/modules/installer/windows/idtglobal.pm
index 53044f41202b..76e49888d34b 100644
--- a/solenv/bin/modules/installer/windows/idtglobal.pm
+++ b/solenv/bin/modules/installer/windows/idtglobal.pm
@@ -1754,34 +1754,10 @@ sub add_childprojects
     }
 
     # Content for InstallUISequence table
-    # InstallAdabas &gm_o_Adabas=3 825
-    # InstallJava &gm_o_Java=3 827
 
     my $number = "";
     my $featurename = "";
 
-    if ( $allvariables->{'ADAPRODUCT'} )
-    {
-        $number = get_free_number_in_uisequence_table($installuitable);
-        $featurename = get_feature_name("_Adabas", $featuretable);
-        $line = "InstallAdabas\t\&$featurename\=3 And Not Installed And Not PATCH\t$number\n";
-        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;
-        $featurename = get_feature_name("_Adabas", $featuretable);
-        $line = "MaintenanceAdabas\t\&$featurename\=3 And Installed And Not PATCH\t$number\n";
-        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;