- Fine tuned the wrapper generation
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/dd6d4194 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/dd6d4194 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/dd6d4194 Branch: refs/heads/as3httpclient-work Commit: dd6d4194f4c1b21fed64612785338a6716fa2125 Parents: 1a46b11 Author: Christofer Dutz <[email protected]> Authored: Sat Apr 25 12:07:47 2015 +0200 Committer: Christofer Dutz <[email protected]> Committed: Sat Apr 25 12:07:47 2015 +0200 ---------------------------------------------------------------------- .../converter/wrapper/WrapperConverter.java | 16 +++++++++++----- .../converter/mavenextension/FlexEventSpy.java | 3 ++- 2 files changed, 13 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/dd6d4194/mavenizer/converters/wrapper/src/main/java/org/apache/flex/utilities/converter/wrapper/WrapperConverter.java ---------------------------------------------------------------------- diff --git a/mavenizer/converters/wrapper/src/main/java/org/apache/flex/utilities/converter/wrapper/WrapperConverter.java b/mavenizer/converters/wrapper/src/main/java/org/apache/flex/utilities/converter/wrapper/WrapperConverter.java index 6a2b691..7e4af4c 100644 --- a/mavenizer/converters/wrapper/src/main/java/org/apache/flex/utilities/converter/wrapper/WrapperConverter.java +++ b/mavenizer/converters/wrapper/src/main/java/org/apache/flex/utilities/converter/wrapper/WrapperConverter.java @@ -32,19 +32,25 @@ public class WrapperConverter extends BaseConverter implements Converter { } try { - final File wrapperJar = File.createTempFile("SWFObjectWrapper-2.2", ".jar"); - generateZip(wrapperRootDir.listFiles(), wrapperJar); + // Rename the index.template.html to index.html + File indexHtml = new File(wrapperRootDir, "index.template.html"); + if(!indexHtml.renameTo(new File(wrapperRootDir, "index.html"))) { + System.out.println("Could not rename index.template.html to index.html."); + } + + final File wrapperWar = File.createTempFile("SWFObjectWrapper-2.2", ".war"); + generateZip(wrapperRootDir.listFiles(), wrapperWar); final MavenArtifact swfobjectWrapper = new MavenArtifact(); swfobjectWrapper.setGroupId("org.apache.flex.wrapper"); swfobjectWrapper.setArtifactId("swfobject"); swfobjectWrapper.setVersion(getFlexVersion(rootSourceDirectory)); - swfobjectWrapper.setPackaging("jar"); - swfobjectWrapper.addDefaultBinaryArtifact(wrapperJar); + swfobjectWrapper.setPackaging("war"); + swfobjectWrapper.addDefaultBinaryArtifact(wrapperWar); writeArtifact(swfobjectWrapper); } catch (IOException e) { - throw new ConverterException("Error creating wrapper jar.", e); + throw new ConverterException("Error creating wrapper war.", e); } } http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/dd6d4194/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java ---------------------------------------------------------------------- diff --git a/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java b/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java index e946db0..9adf892 100644 --- a/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java +++ b/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java @@ -131,7 +131,8 @@ public class FlexEventSpy extends AbstractEventSpy { // In order to compile some of the themes, we need to download a // playerglobal version. - logger.info("In order to convert the Apache Flex SDK, a Flash SDK has to be downloaded."); + 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"); FileUtils.copyDirectory(flashSdkRoot, sdkRoot);
