Repository: flex-utilities Updated Branches: refs/heads/develop 548d30ef3 -> bbb98e984
- Made the proxy authentication available for all types of 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/bbb98e98 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/bbb98e98 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/bbb98e98 Branch: refs/heads/develop Commit: bbb98e984f5506e60468602f6513239215ee29d3 Parents: 548d30e Author: Christofer Dutz <[email protected]> Authored: Tue Jul 28 13:52:19 2015 +0200 Committer: Christofer Dutz <[email protected]> Committed: Tue Jul 28 13:52:19 2015 +0200 ---------------------------------------------------------------------- .../converter/mavenextension/FlexEventSpy.java | 61 ++++++++++---------- .../retrievers/download/DownloadRetriever.java | 1 + 2 files changed, 30 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/bbb98e98/flex-maven-tools/flex-sdk-converter/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java ---------------------------------------------------------------------- diff --git a/flex-maven-tools/flex-sdk-converter/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java b/flex-maven-tools/flex-sdk-converter/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java index 4ee9915..8584634 100644 --- a/flex-maven-tools/flex-sdk-converter/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java +++ b/flex-maven-tools/flex-sdk-converter/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java @@ -7,8 +7,8 @@ import org.apache.flex.utilities.converter.flash.FlashConverter; import org.apache.flex.utilities.converter.flex.FlexConverter; import org.apache.flex.utilities.converter.fontkit.FontkitConverter; import org.apache.flex.utilities.converter.retrievers.download.DownloadRetriever; -import org.apache.flex.utilities.converter.retrievers.types.PlatformType; import org.apache.flex.utilities.converter.retrievers.model.ProxySettings; +import org.apache.flex.utilities.converter.retrievers.types.PlatformType; import org.apache.flex.utilities.converter.retrievers.types.SdkType; import org.apache.flex.utilities.converter.wrapper.WrapperConverter; import org.apache.maven.MavenExecutionException; @@ -140,20 +140,22 @@ public class FlexEventSpy extends AbstractEventSpy { logger.info("==========================================================="); logger.info(" - Installing Apache Flex SDK " + version); try { + ProxySettings proxySettings = getProxySettings(); + File localRepoBaseDir = new File(mavenSession.getLocalRepository().getBasedir()); DownloadRetriever downloadRetriever = new DownloadRetriever(); - File sdkRoot = downloadRetriever.retrieve(SdkType.FLEX, version); + File sdkRoot = downloadRetriever.retrieve(SdkType.FLEX, version, null, proxySettings); // In order to create a fully functional wrapper we need to download // SWFObject and merge that with the fdk first. - File swfObjectRoot = downloadRetriever.retrieve(SdkType.SWFOBJECT); + File swfObjectRoot = downloadRetriever.retrieve(SdkType.SWFOBJECT, null, null, proxySettings); FileUtils.copyDirectory(swfObjectRoot, sdkRoot); // In order to compile some of the themes, we need to download a // playerglobal version. logger.info("In order to convert some of the skins in the Apache Flex SDK, " + "a Flash SDK has to be downloaded."); - File flashSdkRoot = downloadRetriever.retrieve(SdkType.FLASH, "10.2"); + File flashSdkRoot = downloadRetriever.retrieve(SdkType.FLASH, "10.2", null, proxySettings); FileUtils.copyDirectory(flashSdkRoot, sdkRoot); // Convert the FDK itself. @@ -176,7 +178,7 @@ public class FlexEventSpy extends AbstractEventSpy { try { File localRepoBaseDir = new File(mavenSession.getLocalRepository().getBasedir()); DownloadRetriever downloadRetriever = new DownloadRetriever(); - File sdkRoot = downloadRetriever.retrieve(SdkType.FLASH, version); + File sdkRoot = downloadRetriever.retrieve(SdkType.FLASH, version, null, getProxySettings()); FlashConverter converter = new FlashConverter(sdkRoot, localRepoBaseDir); converter.convert(); } catch (Throwable ce) { @@ -193,31 +195,13 @@ public class FlexEventSpy extends AbstractEventSpy { File localRepoBaseDir = new File(mavenSession.getLocalRepository().getBasedir()); DownloadRetriever downloadRetriever = new DownloadRetriever(); - final ProxySettings proxySettings; - if(mavenSession.getSettings().getActiveProxy() != null) { - proxySettings = getProxySettings(); - if(!StringUtils.isEmpty(proxySettings.getUsername()) && - !StringUtils.isEmpty(proxySettings.getPassword())) { - Authenticator authenticator = new Authenticator() { - @Override - protected PasswordAuthentication getPasswordAuthentication() { - return new PasswordAuthentication(proxySettings.getUsername(), - proxySettings.getPassword().toCharArray()); - } - }; - Authenticator.setDefault(authenticator); - } - } else { - proxySettings = null; - } - PlatformType platformType; if(System.getProperty("platform-type") == null) { platformType = PlatformType.getCurrent(); } else { platformType = PlatformType.valueOf(System.getProperty("platform-type")); } - File sdkRoot = downloadRetriever.retrieve(SdkType.AIR, version, platformType, proxySettings); + File sdkRoot = downloadRetriever.retrieve(SdkType.AIR, version, platformType, getProxySettings()); AirConverter converter = new AirConverter(sdkRoot, localRepoBaseDir); converter.convert(); } catch (Throwable ce) { @@ -233,7 +217,7 @@ public class FlexEventSpy extends AbstractEventSpy { try { File localRepoBaseDir = new File(mavenSession.getLocalRepository().getBasedir()); DownloadRetriever downloadRetriever = new DownloadRetriever(); - File sdkRoot = downloadRetriever.retrieve(SdkType.FONTKIT); + File sdkRoot = downloadRetriever.retrieve(SdkType.FONTKIT, null, null, getProxySettings()); FontkitConverter converter = new FontkitConverter(sdkRoot, localRepoBaseDir); converter.convert(); } catch (Throwable ce) { @@ -281,14 +265,27 @@ public class FlexEventSpy extends AbstractEventSpy { protected ProxySettings getProxySettings() { org.apache.maven.settings.Proxy settingsProxy = mavenSession.getSettings().getActiveProxy(); - String protocol = settingsProxy.getProtocol(); - String host = settingsProxy.getHost(); - int port = settingsProxy.getPort(); - String nonProxyHost = settingsProxy.getNonProxyHosts(); - String username = settingsProxy.getUsername(); - String password = settingsProxy.getPassword(); + if(settingsProxy != null) { + String protocol = settingsProxy.getProtocol(); + String host = settingsProxy.getHost(); + int port = settingsProxy.getPort(); + String nonProxyHost = settingsProxy.getNonProxyHosts(); + final String username = settingsProxy.getUsername(); + final String password = settingsProxy.getPassword(); + + if (!StringUtils.isEmpty(username) && !StringUtils.isEmpty(password)) { + Authenticator authenticator = new Authenticator() { + @Override + protected PasswordAuthentication getPasswordAuthentication() { + return new PasswordAuthentication(username, password.toCharArray()); + } + }; + Authenticator.setDefault(authenticator); + } - return new ProxySettings(protocol, host, port, nonProxyHost, username, password); + return new ProxySettings(protocol, host, port, nonProxyHost, username, password); + } + return null; } } http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/bbb98e98/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/DownloadRetriever.java ---------------------------------------------------------------------- diff --git a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/DownloadRetriever.java b/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/DownloadRetriever.java index 490f8c0..4b686d2 100644 --- a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/DownloadRetriever.java +++ b/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/DownloadRetriever.java @@ -289,6 +289,7 @@ public class DownloadRetriever extends BaseRetriever { SocketAddress socketAddress = new InetSocketAddress(proxySettings.getHost(), proxySettings.getPort()); Proxy proxy = new Proxy(Proxy.Type.valueOf(proxySettings.getProtocol().toUpperCase()), socketAddress); connection = configUrl.openConnection(proxy); + System.out.println("Using proxy: " + proxySettings.getHost()); } else { connection = configUrl.openConnection(); }
