You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by er...@apache.org on 2015/02/19 10:58:49 UTC
[3/4] git commit: [flex-utilities] [refs/heads/develop] - Removing
dead code and adding additional logging to http/https call on the installer
config download.
Removing dead code and adding additional logging to http/https call on the installer config download.
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/45d5c8fc
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/45d5c8fc
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/45d5c8fc
Branch: refs/heads/develop
Commit: 45d5c8fc089b194d978ffdf0862cfafd816ffa3e
Parents: 0dfba59
Author: quetwo <ni...@theflexgroup.org>
Authored: Fri Feb 6 18:00:20 2015 -0500
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Thu Feb 19 10:58:22 2015 +0100
----------------------------------------------------------------------
installer/src/InstallApacheFlex.mxml | 26 +++++++++++---------------
1 file changed, 11 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/45d5c8fc/installer/src/InstallApacheFlex.mxml
----------------------------------------------------------------------
diff --git a/installer/src/InstallApacheFlex.mxml b/installer/src/InstallApacheFlex.mxml
index bf79c9c..341f060 100644
--- a/installer/src/InstallApacheFlex.mxml
+++ b/installer/src/InstallApacheFlex.mxml
@@ -425,12 +425,13 @@ variables are not required because the locations of these pieces are known.
{
loadXML();
}
- logVersion();
- if (!hasInternet)
+
+ else
{
log("Internet connection unavailable");
abortInstallation("Internet connection unavailable.");
}
+ logVersion();
}
private function uncaughtErrorHandler(event:UncaughtErrorEvent):void
@@ -1213,7 +1214,7 @@ variables are not required because the locations of these pieces are known.
loader.dataFormat = URLLoaderDataFormat.TEXT;
loader.addEventListener(Event.COMPLETE, handleInstallerXMLLoaded);
loader.addEventListener(ErrorEvent.ERROR, handleInstallerXMLError);
- loader.addEventListener(IOErrorEvent.IO_ERROR, handleInstallerXMLError);
+ loader.addEventListener(IOErrorEvent.IO_ERROR, handleInstallIOXMLError);
loader.load(req);
}
@@ -1269,7 +1270,6 @@ variables are not required because the locations of these pieces are known.
_installerComponentsDataProvider.addItem(vo);
}
usingXML = true;
- // progressLabels = data.progressLabels[0];
installStepsData = data.steps.step;
var strings:XMLList = data.strings.string;
for each (var x:XML in strings)
@@ -1324,6 +1324,13 @@ variables are not required because the locations of these pieces are known.
abortInstallation("Unable to load " + APACHE_FLEX_BIN_INSTALLER_URL);
}
+ protected function handleInstallIOXMLError(event:IOErrorEvent):void
+ {
+ // Stream Error 2032 here means that the SSL connection can't be created. TLS/SSL error?
+ log("Unable to load " + APACHE_FLEX_BIN_INSTALLER_URL + " with " + event.text);
+ abortInstallation("Unable to load " + APACHE_FLEX_BIN_INSTALLER_URL);
+ }
+
protected function showDefaultState():void
{
zeroStepGroup.visible = true;
@@ -2825,17 +2832,6 @@ variables are not required because the locations of these pieces are known.
{
var selectedItem:InstallerComponentVO = InstallerComponentVO(event.target.selectedItem);
optionalInstallsTxtArea.text = selectedItem.message;
- /*installChkBx.label = _viewResourceConstants.INSTALL_AGREE;
- if (selectedItem.answered) {
- if (selectedItem.selected) {
- installChkBx.selected = true;
- } else {
- installChkBx.selected = false;
- }
- } else {
- installChkBx.selected = false;
- }*/
-
licenseLinkBtn.includeInLayout = true;
_currentLicenseLabel = selectedItem.licenseName;
_currentLicenseURL = selectedItem.licenseURL;