Skip to content
Snippets Groups Projects
Commit 6eee23a8 authored by felmer's avatar felmer
Browse files

SP-71, BIS-52: bug concerning updating using console fixed.

SVN: 25524
parent 44a6a5ad
No related branches found
No related tags found
No related merge requests found
...@@ -45,6 +45,8 @@ public class SetEnableTechnologiesVariableAction implements PanelAction ...@@ -45,6 +45,8 @@ public class SetEnableTechnologiesVariableAction implements PanelAction
static final String DISABLED_TECHNOLOGIES_VARNAME = "DISABLED_TECHNOLOGIES"; static final String DISABLED_TECHNOLOGIES_VARNAME = "DISABLED_TECHNOLOGIES";
static final String DISABLED_CORE_PLUGINS_KEY = "disabled-core-plugins"; static final String DISABLED_CORE_PLUGINS_KEY = "disabled-core-plugins";
private final SetTechnologyCheckBoxesAction technologyCheckBoxesAction = new SetTechnologyCheckBoxesAction();
@Override @Override
public void initialize(PanelActionConfiguration configuration) public void initialize(PanelActionConfiguration configuration)
{ {
...@@ -53,6 +55,13 @@ public class SetEnableTechnologiesVariableAction implements PanelAction ...@@ -53,6 +55,13 @@ public class SetEnableTechnologiesVariableAction implements PanelAction
@Override @Override
public void executeAction(AutomatedInstallData data, AbstractUIHandler handler) public void executeAction(AutomatedInstallData data, AbstractUIHandler handler)
{ {
// The technologyCheckBoxesAction is a 'preactivate' action to populate the technology check
// boxes.
// But in case of console installation the 'preactivate' action isn't execute. We can
// execute it here without any check whether we are console or GUI based installation
// because the GUI sets the technology flags and naothing will be populated from existing
// service.properties.
technologyCheckBoxesAction.executeAction(data, handler);
boolean isFirstTimeInstallation = GlobalInstallationContext.isFirstTimeInstallation; boolean isFirstTimeInstallation = GlobalInstallationContext.isFirstTimeInstallation;
File installDir = GlobalInstallationContext.installDir; File installDir = GlobalInstallationContext.installDir;
updateEnabledTechnologyProperty(data, isFirstTimeInstallation, installDir); updateEnabledTechnologyProperty(data, isFirstTimeInstallation, installDir);
...@@ -165,6 +174,7 @@ public class SetEnableTechnologiesVariableAction implements PanelAction ...@@ -165,6 +174,7 @@ public class SetEnableTechnologiesVariableAction implements PanelAction
builder.append(technology.toLowerCase()); builder.append(technology.toLowerCase());
} }
} }
System.out.println("disabled technologies:"+builder);
return builder.toString(); return builder.toString();
} }
......
...@@ -28,7 +28,7 @@ import com.izforge.izpack.data.PanelAction; ...@@ -28,7 +28,7 @@ import com.izforge.izpack.data.PanelAction;
/** /**
* Action which sets the variables which are the values of check boxes on the technology page. If * Action which sets the variables which are the values of check boxes on the technology page. If
* the variable is already set nothing is done. Otherwise the behavior depends on whether this is * the variable is already set nothing is done. Otherwise the behavior depends on whether this is
* installation or upgrading. In case of installation the flag will be <code>true</code>. In case of * installation or upgrading. In case of installation the flag will be <code>false</code>. In case of
* upgrading <code>service.properties</code> file of AS is scanned in order to check whether a certain * upgrading <code>service.properties</code> file of AS is scanned in order to check whether a certain
* technology is enabled or not. * technology is enabled or not.
* *
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment