Repository: flex-utilities Updated Branches: refs/heads/mavenizer-refactoring fac7e6fb3 -> 95be74110
Refactored the way the poms are generated: - Instead of hard-coded pom construction now velocity templates can be used. Fixed some Case-Problems in the Class names. Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/95be7411 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/95be7411 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/95be7411 Branch: refs/heads/mavenizer-refactoring Commit: 95be74110c439a8178857aa3024fb03ba108cdab Parents: fac7e6f Author: cdutz <[email protected]> Authored: Thu Jun 26 13:57:24 2014 +0200 Committer: cdutz <[email protected]> Committed: Thu Jun 26 13:57:24 2014 +0200 ---------------------------------------------------------------------- mavenizer/converters/base/pom.xml | 5 + .../flex/utilities/converter/BaseConverter.java | 123 ++++++++++--------- .../converter/model/MavenArtifact.java | 21 +++- .../src/main/resources/templates/default.vm | 21 ++++ .../base/src/main/resources/templates/pom.vm | 89 ++++++++++++++ .../base/src/main/resources/velocity.properties | 10 ++ .../utilities/converter/flex/FlexConverter.java | 2 + .../utilities/converter/core/AirDownloader.java | 4 +- .../converter/core/FlashDownloader.java | 4 +- .../utilities/converter/core/SdkConverter.java | 2 +- .../converter/retrievers/Retriever.java | 4 +- .../converter/retrievers/types/SdkType.java | 2 +- .../retrievers/download/DownloadRetriever.java | 24 ++-- 13 files changed, 229 insertions(+), 82 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/95be7411/mavenizer/converters/base/pom.xml ---------------------------------------------------------------------- diff --git a/mavenizer/converters/base/pom.xml b/mavenizer/converters/base/pom.xml index 25c5fc7..e919012 100644 --- a/mavenizer/converters/base/pom.xml +++ b/mavenizer/converters/base/pom.xml @@ -43,6 +43,11 @@ <artifactId>jettison</artifactId> <version>1.3.1</version> </dependency> + <dependency> + <groupId>org.apache.velocity</groupId> + <artifactId>velocity</artifactId> + <version>1.7</version> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/95be7411/mavenizer/converters/base/src/main/java/org/apache/flex/utilities/converter/BaseConverter.java ---------------------------------------------------------------------- diff --git a/mavenizer/converters/base/src/main/java/org/apache/flex/utilities/converter/BaseConverter.java b/mavenizer/converters/base/src/main/java/org/apache/flex/utilities/converter/BaseConverter.java index 47466d1..499b8e9 100644 --- a/mavenizer/converters/base/src/main/java/org/apache/flex/utilities/converter/BaseConverter.java +++ b/mavenizer/converters/base/src/main/java/org/apache/flex/utilities/converter/BaseConverter.java @@ -22,20 +22,13 @@ import com.sun.jersey.api.client.WebResource; import org.apache.flex.utilities.converter.exceptions.ConverterException; import org.apache.flex.utilities.converter.model.MavenArtifact; +import org.apache.velocity.VelocityContext; +import org.apache.velocity.app.VelocityEngine; import org.codehaus.jettison.json.JSONArray; import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; import org.codehaus.jettison.json.JSONTokener; -import org.w3c.dom.DOMImplementation; -import org.w3c.dom.Document; -import org.w3c.dom.Element; - -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.transform.*; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; + import java.io.*; import java.math.BigInteger; import java.security.MessageDigest; @@ -43,6 +36,7 @@ import java.security.NoSuchAlgorithmException; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Properties; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; @@ -53,7 +47,6 @@ public abstract class BaseConverter { protected final Map<String, MavenArtifact> checksums = new HashMap<String, MavenArtifact>(); - protected static final String MAVEN_SCHEMA_URI = "http://maven.apache.org/POM/4.0.0";; protected static final String MAVEN_CENTRAL_SHA_1_QUERY_URL = "http://search.maven.org/solrsearch/select?rows=20&wt=json&q=1:";; // Artifactory: "http://server:port/artifactory/api/search/checksum?repos=libs-release-local&md5=04040c7c184620af0a0a8a3682a75eb7 // Nexus: "http://repository.sonatype.org/service/local/data_index?a=04040c7c184620af0a0a8a3682a75eb7"; @@ -61,6 +54,8 @@ public abstract class BaseConverter { protected File rootSourceDirectory; protected File rootTargetDirectory; + private VelocityEngine velocityEngine; + protected BaseConverter(File rootSourceDirectory, File rootTargetDirectory) throws ConverterException { if(rootSourceDirectory == null) { throw new ConverterException("Air SDK directory is null."); @@ -71,6 +66,21 @@ public abstract class BaseConverter { this.rootSourceDirectory = rootSourceDirectory; this.rootTargetDirectory = rootTargetDirectory; + + try { + // Load some initial properties from the classpath. + final Properties properties = new Properties(); + final InputStream propertyInputStream = + getClass().getClassLoader().getResourceAsStream("velocity.properties"); + if(propertyInputStream != null) { + properties.load(propertyInputStream); + } + + // Instantiate the engine that will be used for every generation. + velocityEngine = new VelocityEngine(properties); + } catch (Exception e) { + throw new ConverterException("Error initializing the velocity template engine.", e); + } } public void convert() throws ConverterException { @@ -225,59 +235,50 @@ public abstract class BaseConverter { } } - /*protected void appendArtifact(MavenMetadata artifactMetadata, Element dependencies) { - final Document doc = dependencies.getOwnerDocument(); - final Element dependency = doc.createElementNS(MAVEN_SCHEMA_URI, "dependency"); - dependencies.appendChild(dependency); - - final Element groupId = doc.createElementNS(MAVEN_SCHEMA_URI, "groupId"); - groupId.setTextContent(artifactMetadata.getGroupId()); - dependency.appendChild(groupId); - final Element artifactId = doc.createElementNS(MAVEN_SCHEMA_URI, "artifactId"); - artifactId.setTextContent(artifactMetadata.getArtifactId()); - dependency.appendChild(artifactId); - final Element version = doc.createElementNS(MAVEN_SCHEMA_URI, "version"); - version.setTextContent(artifactMetadata.getVersion()); - dependency.appendChild(version); - if(!artifactMetadata.getPackaging().equals("jar")) { - final Element packaging = doc.createElementNS(MAVEN_SCHEMA_URI, "type"); - packaging.setTextContent(artifactMetadata.getPackaging()); - dependency.appendChild(packaging); - } - }*/ - protected void writePomArtifact(MavenArtifact pomData) throws ConverterException { - final Document pomDoc = createPomDocument(pomData); final File outputFile = pomData.getPomTargetFile(rootTargetDirectory); - writeDocument(pomDoc, outputFile); + createPomDocument(pomData, outputFile); } - protected void writeDocument(Document doc, File outputFile) throws ConverterException { - final Source source = new DOMSource(doc); - final File outputDirectory = outputFile.getParentFile(); - if(!outputDirectory.exists()) { - if(!outputDirectory.mkdirs()) { - throw new RuntimeException("Could not create directory: " + outputDirectory.getAbsolutePath()); + protected void createPomDocument(final MavenArtifact metadata, File outputFile) throws ConverterException { + try { + // Build a context to hold the model + final VelocityContext velocityContext = new VelocityContext(); + velocityContext.put("artifact", metadata); + + // Try to get a template "templates/{type}.vm". + final String templateName; + if(velocityEngine.resourceExists("templates/" + metadata.getPackaging() + ".vm")) { + templateName = "templates/" + metadata.getPackaging() + ".vm"; + } else if(velocityEngine.resourceExists("templates/default.vm")) { + templateName = "templates/default.vm"; + } else { + throw new ConverterException("No template found for generating pom output."); } - } - final Result result = new StreamResult(outputFile); + // Prepare an output stream to which the output can be generated. + FileWriter writer = null; + try { + if(!outputFile.getParentFile().exists()) { + if(!outputFile.getParentFile().mkdirs()) { + throw new ConverterException("Could not create template output directory."); + } + } + + writer = new FileWriter(outputFile); - final Transformer transformer; - try { - transformer = TransformerFactory.newInstance().newTransformer(); - transformer.setOutputProperty(OutputKeys.INDENT, "yes"); - transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount";, "4"); - transformer.transform(source, result); - } catch (TransformerConfigurationException e) { - throw new ConverterException("Error writing xml document.", e); - } catch (TransformerException e) { - throw new ConverterException("Error writing xml document.", e); + // Have velocity generate the output for the template. + velocityEngine.mergeTemplate(templateName, "utf-8", velocityContext, writer); + } finally { + if(writer != null) { + writer.close(); + } + } + } catch (Exception e) { + throw new ConverterException("Error generating template output.", e); } - } - protected Document createPomDocument(final MavenArtifact metadata) throws ConverterException { - final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); + /*final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); factory.setNamespaceAware(true); final DocumentBuilder builder; try { @@ -306,10 +307,10 @@ public abstract class BaseConverter { if((metadata.getDependencies() != null) && !metadata.getDependencies().isEmpty()) { final Element dependencies = pom.createElementNS(MAVEN_SCHEMA_URI, "dependencies"); root.appendChild(dependencies); - /*final Element dependencyManagement = pom.createElementNS(MAVEN_SCHEMA_URI, "dependencyManagement"); + final Element dependencyManagement = pom.createElementNS(MAVEN_SCHEMA_URI, "dependencyManagement"); final Element dependencyManagementDependencies = pom.createElementNS(MAVEN_SCHEMA_URI, "dependencies"); dependencyManagement.appendChild(dependencyManagementDependencies); - root.appendChild(dependencyManagement);*/ + root.appendChild(dependencyManagement); final Map<String, MavenArtifact> dependencyIndex = new HashMap<String, MavenArtifact>(); for(final MavenArtifact dependencyMetadata : metadata.getDependencies()) { @@ -336,20 +337,20 @@ public abstract class BaseConverter { } // Configure the dependency including version in the dependency management section of the pom. - /*dependency = pom.createElementNS(MAVEN_SCHEMA_URI, "dependency"); + dependency = pom.createElementNS(MAVEN_SCHEMA_URI, "dependency"); dependencyGroupId = pom.createElementNS(MAVEN_SCHEMA_URI, "groupId"); dependencyGroupId.setTextContent(dependencyMetadata.getGroupId()); dependency.appendChild(dependencyGroupId); dependencyArtifactId = pom.createElementNS(MAVEN_SCHEMA_URI, "artifactId"); dependencyArtifactId.setTextContent(dependencyMetadata.getArtifactId()); dependency.appendChild(dependencyArtifactId); - dependencyVersion = pom.createElementNS(MAVEN_SCHEMA_URI, "version"); + Element dependencyVersion = pom.createElementNS(MAVEN_SCHEMA_URI, "version"); dependencyVersion.setTextContent(dependencyMetadata.getVersion()); dependency.appendChild(dependencyVersion); dependencyPackaging = pom.createElementNS(MAVEN_SCHEMA_URI, "type"); dependencyPackaging.setTextContent(dependencyMetadata.getPackaging()); dependency.appendChild(dependencyPackaging); - dependencyManagementDependencies.appendChild(dependency);*/ + dependencyManagementDependencies.appendChild(dependency); dependencyIndex.put(dependencyMetadata.getArtifactId(), dependencyMetadata); } @@ -381,7 +382,7 @@ public abstract class BaseConverter { return pom; } catch (ParserConfigurationException e) { throw new ConverterException("Error creating pom document.", e); - } + }*/ } protected void writeDummy(final File targetFile) throws ConverterException { http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/95be7411/mavenizer/converters/base/src/main/java/org/apache/flex/utilities/converter/model/MavenArtifact.java ---------------------------------------------------------------------- diff --git a/mavenizer/converters/base/src/main/java/org/apache/flex/utilities/converter/model/MavenArtifact.java b/mavenizer/converters/base/src/main/java/org/apache/flex/utilities/converter/model/MavenArtifact.java index db5d4de..018542a 100644 --- a/mavenizer/converters/base/src/main/java/org/apache/flex/utilities/converter/model/MavenArtifact.java +++ b/mavenizer/converters/base/src/main/java/org/apache/flex/utilities/converter/model/MavenArtifact.java @@ -114,7 +114,11 @@ public class MavenArtifact { binaryArtifacts.put(classifier, binaryArtifact); } - public File getPomTargetFile(File targetRootDirectory) { + public boolean hasBinaryArtifact(String classifier) { + return binaryArtifacts != null && binaryArtifacts.containsKey(classifier); + } + + public File getPomTargetFile(File targetRootDirectory) { final String fileName = groupId.replace(".", File.separator) + File.separator + artifactId + File.separator + version + File.separator + artifactId + "-" + version + ((classifier != null) ? "-" + classifier : "") + ".pom"; @@ -146,4 +150,19 @@ public class MavenArtifact { return null; } + public boolean hasDependencies() { + return (dependencies != null) && (!dependencies.isEmpty()); + } + + public boolean isAtLeastOneDependencyRsl() { + if(dependencies != null) { + for(final MavenArtifact dependency : dependencies) { + if(dependency.hasBinaryArtifact("rsl")) { + return true; + } + } + } + return false; + } + } http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/95be7411/mavenizer/converters/base/src/main/resources/templates/default.vm ---------------------------------------------------------------------- diff --git a/mavenizer/converters/base/src/main/resources/templates/default.vm b/mavenizer/converters/base/src/main/resources/templates/default.vm new file mode 100644 index 0000000..7af9619 --- /dev/null +++ b/mavenizer/converters/base/src/main/resources/templates/default.vm @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<project xmlns="http://maven.apache.org/POM/4.0.0";> + <modelVersion>4.0.0</modelVersion> + + <groupId>${artifact.groupId}</groupId> + <artifactId>${artifact.artifactId}</artifactId> + <version>${artifact.version}</version> + <packaging>${artifact.packaging}</packaging> + + <dependencies> +#foreach( $dependency in $artifact.dependencies ) + <dependency> + <groupId>${dependency.groupId}</groupId> + <artifactId>${dependency.artifactId}</artifactId> + <version>${dependency.version}</version> + <type>${dependency.packaging}</type> + </dependency> +#end + </dependencies> + +</project> http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/95be7411/mavenizer/converters/base/src/main/resources/templates/pom.vm ---------------------------------------------------------------------- diff --git a/mavenizer/converters/base/src/main/resources/templates/pom.vm b/mavenizer/converters/base/src/main/resources/templates/pom.vm new file mode 100644 index 0000000..5ccb0d1 --- /dev/null +++ b/mavenizer/converters/base/src/main/resources/templates/pom.vm @@ -0,0 +1,89 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<project xmlns="http://maven.apache.org/POM/4.0.0";> + <modelVersion>4.0.0</modelVersion> + + <groupId>${artifact.groupId}</groupId> + <artifactId>${artifact.artifactId}</artifactId> + <version>${artifact.version}</version> + <packaging>${artifact.packaging}</packaging> + +#if ( $artifact.hasDependencies() ) + <dependencies> +#foreach( $dependency in $artifact.dependencies ) + <dependency> + <groupId>${dependency.groupId}</groupId> + <artifactId>${dependency.artifactId}</artifactId> +#if ($dependency.packaging != "jar") + <type>${dependency.packaging}</type> +#end + </dependency> +#end + </dependencies> + +#if ( $artifact.isAtLeastOneDependencyRsl() ) + <profiles> + <profile> + <id>default</id> + + <activation> + <activeByDefault>true</activeByDefault> + </activation> + + <dependencyManagement> +#foreach( $dependency in $artifact.dependencies ) + <dependency> + <groupId>${dependency.groupId}</groupId> + <artifactId>${dependency.artifactId}</artifactId> + <version>${dependency.version}</version> +#if ($dependency.packaging != "jar") + <type>${dependency.packaging}</type> +#end + </dependency> +#end + </dependencyManagement> + </profile> + + <profile> + <id>flex-rsl</id> + + <activation> + <property> + <name>flex.framework.scope</name> + <value>rsl</value> + </property> + </activation> + + <dependencyManagement> +#foreach( $dependency in $artifact.dependencies ) + <dependency> + <groupId>${dependency.groupId}</groupId> + <artifactId>${dependency.artifactId}</artifactId> + <version>${dependency.version}</version> +#if ($dependency.packaging != "jar") + <type>${dependency.packaging}</type> +#end +#if ($dependency.packaging == "swc" && $dependency.hasBinaryArtifact('rsl')) + <scope>rsl</scope> +#end + </dependency> +#end + </dependencyManagement> + </profile> + </profiles> +#else + <dependencyManagement> +#foreach( $dependency in $artifact.dependencies ) + <dependency> + <groupId>${dependency.groupId}</groupId> + <artifactId>${dependency.artifactId}</artifactId> + <version>${dependency.version}</version> +#if ($dependency.packaging != "jar") + <type>${dependency.packaging}</type> +#end + </dependency> +#end + </dependencyManagement> +#end +#end + +</project> http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/95be7411/mavenizer/converters/base/src/main/resources/velocity.properties ---------------------------------------------------------------------- diff --git a/mavenizer/converters/base/src/main/resources/velocity.properties b/mavenizer/converters/base/src/main/resources/velocity.properties new file mode 100644 index 0000000..2beb502 --- /dev/null +++ b/mavenizer/converters/base/src/main/resources/velocity.properties @@ -0,0 +1,10 @@ +# +# specify three resource loaders to use +# +resource.loader = class + +# +# for the loader we call 'class', use the ClasspathResourceLoader +# +class.resource.loader.description = Velocity Classpath Resource Loader +class.resource.loader.class = org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/95be7411/mavenizer/converters/flex/src/main/java/org/apache/flex/utilities/converter/flex/FlexConverter.java ---------------------------------------------------------------------- diff --git a/mavenizer/converters/flex/src/main/java/org/apache/flex/utilities/converter/flex/FlexConverter.java b/mavenizer/converters/flex/src/main/java/org/apache/flex/utilities/converter/flex/FlexConverter.java index 7d1c671..4aa9ba8 100644 --- a/mavenizer/converters/flex/src/main/java/org/apache/flex/utilities/converter/flex/FlexConverter.java +++ b/mavenizer/converters/flex/src/main/java/org/apache/flex/utilities/converter/flex/FlexConverter.java @@ -216,6 +216,7 @@ public class FlexConverter extends BaseConverter implements Converter { artifact.getBinaryTargetFile(rootTargetDirectory, MavenArtifact.DEFAULT_CLASSIFIER).getParent(), artifact.getArtifactId() + "-" + artifact.getVersion() + ".swf"); copyFile(rslSourceFile, rslTargetFile); + artifact.addBinaryArtifact("rsl", rslSourceFile); } // Copy the swzc. @@ -225,6 +226,7 @@ public class FlexConverter extends BaseConverter implements Converter { artifact.getBinaryTargetFile(rootTargetDirectory, MavenArtifact.DEFAULT_CLASSIFIER).getParent(), artifact.getArtifactId() + "-" + artifact.getVersion() + ".swz"); copyFile(signedRslSourceFile, signedRslTargetFile); + artifact.addBinaryArtifact("caching", rslSourceFile); } // Copy the language resources. http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/95be7411/mavenizer/core/src/main/java/org/apache/flex/utilities/converter/core/AirDownloader.java ---------------------------------------------------------------------- diff --git a/mavenizer/core/src/main/java/org/apache/flex/utilities/converter/core/AirDownloader.java b/mavenizer/core/src/main/java/org/apache/flex/utilities/converter/core/AirDownloader.java index f1df0f2..db1e7f4 100644 --- a/mavenizer/core/src/main/java/org/apache/flex/utilities/converter/core/AirDownloader.java +++ b/mavenizer/core/src/main/java/org/apache/flex/utilities/converter/core/AirDownloader.java @@ -19,7 +19,7 @@ package org.apache.flex.utilities.converter.core; import org.apache.flex.utilities.converter.air.AirConverter; 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.types.SDKType; +import org.apache.flex.utilities.converter.retrievers.types.SdkType; import java.io.File; @@ -42,7 +42,7 @@ public class AirDownloader { } final DownloadRetriever downloadRetriever = new DownloadRetriever(); - final File airSDKSourceDirectory = downloadRetriever.retrieve(SDKType.AIR, version, platformType); + final File airSDKSourceDirectory = downloadRetriever.retrieve(SdkType.AIR, version, platformType); final AirConverter airConverter = new AirConverter(airSDKSourceDirectory, targetDirectory); airConverter.convert(); http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/95be7411/mavenizer/core/src/main/java/org/apache/flex/utilities/converter/core/FlashDownloader.java ---------------------------------------------------------------------- diff --git a/mavenizer/core/src/main/java/org/apache/flex/utilities/converter/core/FlashDownloader.java b/mavenizer/core/src/main/java/org/apache/flex/utilities/converter/core/FlashDownloader.java index c75e250..a0e7976 100644 --- a/mavenizer/core/src/main/java/org/apache/flex/utilities/converter/core/FlashDownloader.java +++ b/mavenizer/core/src/main/java/org/apache/flex/utilities/converter/core/FlashDownloader.java @@ -18,7 +18,7 @@ package org.apache.flex.utilities.converter.core; import org.apache.flex.utilities.converter.flash.FlashConverter; import org.apache.flex.utilities.converter.retrievers.download.DownloadRetriever; -import org.apache.flex.utilities.converter.retrievers.types.SDKType; +import org.apache.flex.utilities.converter.retrievers.types.SdkType; import java.io.File; @@ -37,7 +37,7 @@ public class FlashDownloader { final File targetDirectory = new File(args[1]); final DownloadRetriever downloadRetriever = new DownloadRetriever(); - final File playerglobalSourceFile = downloadRetriever.retrieve(SDKType.FLASH, version); + final File playerglobalSourceFile = downloadRetriever.retrieve(SdkType.FLASH, version); final File tempSdkRoot = new File(playerglobalSourceFile.getParent(), playerglobalSourceFile.getName().substring(0, playerglobalSourceFile.getName().length() - 4) + http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/95be7411/mavenizer/core/src/main/java/org/apache/flex/utilities/converter/core/SdkConverter.java ---------------------------------------------------------------------- diff --git a/mavenizer/core/src/main/java/org/apache/flex/utilities/converter/core/SdkConverter.java b/mavenizer/core/src/main/java/org/apache/flex/utilities/converter/core/SdkConverter.java index f438dcd..e98cf5f 100644 --- a/mavenizer/core/src/main/java/org/apache/flex/utilities/converter/core/SdkConverter.java +++ b/mavenizer/core/src/main/java/org/apache/flex/utilities/converter/core/SdkConverter.java @@ -26,7 +26,7 @@ import java.io.File; /** * Created by cdutz on 24.05.2014. */ -public class SDKConverter { +public class SdkConverter { public static void main(String[] args) throws Exception { if(args.length != 2) { http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/95be7411/mavenizer/retrievers/base/src/main/java/org/apache/flex/utilities/converter/retrievers/Retriever.java ---------------------------------------------------------------------- diff --git a/mavenizer/retrievers/base/src/main/java/org/apache/flex/utilities/converter/retrievers/Retriever.java b/mavenizer/retrievers/base/src/main/java/org/apache/flex/utilities/converter/retrievers/Retriever.java index f38af43..ee863e3 100644 --- a/mavenizer/retrievers/base/src/main/java/org/apache/flex/utilities/converter/retrievers/Retriever.java +++ b/mavenizer/retrievers/base/src/main/java/org/apache/flex/utilities/converter/retrievers/Retriever.java @@ -18,7 +18,7 @@ package org.apache.flex.utilities.converter.retrievers; import org.apache.flex.utilities.converter.retrievers.exceptions.RetrieverException; import org.apache.flex.utilities.converter.retrievers.types.PlatformType; -import org.apache.flex.utilities.converter.retrievers.types.SDKType; +import org.apache.flex.utilities.converter.retrievers.types.SdkType; import java.io.File; @@ -27,6 +27,6 @@ import java.io.File; */ public interface Retriever { - File retrieve(SDKType sdkType, String version, PlatformType platformType) throws RetrieverException; + File retrieve(SdkType sdkType, String version, PlatformType platformType) throws RetrieverException; } http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/95be7411/mavenizer/retrievers/base/src/main/java/org/apache/flex/utilities/converter/retrievers/types/SdkType.java ---------------------------------------------------------------------- diff --git a/mavenizer/retrievers/base/src/main/java/org/apache/flex/utilities/converter/retrievers/types/SdkType.java b/mavenizer/retrievers/base/src/main/java/org/apache/flex/utilities/converter/retrievers/types/SdkType.java index f551ab1..da0b527 100644 --- a/mavenizer/retrievers/base/src/main/java/org/apache/flex/utilities/converter/retrievers/types/SdkType.java +++ b/mavenizer/retrievers/base/src/main/java/org/apache/flex/utilities/converter/retrievers/types/SdkType.java @@ -19,7 +19,7 @@ package org.apache.flex.utilities.converter.retrievers.types; /** * Created by cdutz on 18.05.2014. */ -public enum SDKType { +public enum SdkType { FLASH, AIR, http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/95be7411/mavenizer/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/DownloadRetriever.java ---------------------------------------------------------------------- diff --git a/mavenizer/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/DownloadRetriever.java b/mavenizer/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/DownloadRetriever.java index b8fa265..e9c6c07 100644 --- a/mavenizer/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/DownloadRetriever.java +++ b/mavenizer/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/DownloadRetriever.java @@ -19,7 +19,7 @@ package org.apache.flex.utilities.converter.retrievers.download; import org.apache.flex.utilities.converter.retrievers.BaseRetriever; import org.apache.flex.utilities.converter.retrievers.exceptions.RetrieverException; import org.apache.flex.utilities.converter.retrievers.types.PlatformType; -import org.apache.flex.utilities.converter.retrievers.types.SDKType; +import org.apache.flex.utilities.converter.retrievers.types.SdkType; import org.apache.flex.utilities.converter.retrievers.utils.ProgressBar; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -50,14 +50,14 @@ public class DownloadRetriever extends BaseRetriever { public static final String FLEX_INSTALLER_CONFIG_URL = "http://flex.apache.org/installer/sdk-installer-config-4.0.xml";; - public File retrieve(SDKType type, String version) throws RetrieverException { + public File retrieve(SdkType type, String version) throws RetrieverException { return retrieve(type, version, null); } @Override - public File retrieve(SDKType type, String version, PlatformType platformType) throws RetrieverException { + public File retrieve(SdkType type, String version, PlatformType platformType) throws RetrieverException { try { - if (type.equals(SDKType.FLASH) || type.equals(SDKType.AIR)) { + if (type.equals(SdkType.FLASH) || type.equals(SdkType.AIR)) { confirmLicenseAcceptance(type); } @@ -100,7 +100,7 @@ public class DownloadRetriever extends BaseRetriever { // Do the extracting. //////////////////////////////////////////////////////////////////////////////// - if(type.equals(SDKType.FLASH)) { + if(type.equals(SdkType.FLASH)) { return targetFile; } else { System.out.println("Extracting archive to temp directory."); @@ -122,7 +122,7 @@ public class DownloadRetriever extends BaseRetriever { } } - protected String getBinaryUrl(SDKType sdkType, String version, PlatformType platformType) + protected String getBinaryUrl(SdkType sdkType, String version, PlatformType platformType) throws RetrieverException { try { final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); @@ -139,7 +139,7 @@ public class DownloadRetriever extends BaseRetriever { } final StringBuilder stringBuilder = new StringBuilder(); - if (sdkType == SDKType.FLEX) { + if (sdkType == SdkType.FLEX) { final String path = artifactElement.getAttribute("path"); final String file = artifactElement.getAttribute("file"); if (!path.startsWith("http://";)) { @@ -176,7 +176,7 @@ public class DownloadRetriever extends BaseRetriever { } } - protected String getUrlXpath(SDKType sdkType, String version, PlatformType platformType) + protected String getUrlXpath(SdkType sdkType, String version, PlatformType platformType) throws RetrieverException { final StringBuilder stringBuilder = new StringBuilder(); switch (sdkType) { @@ -209,7 +209,7 @@ public class DownloadRetriever extends BaseRetriever { return stringBuilder.toString(); } - protected void confirmLicenseAcceptance(SDKType type) throws RetrieverException { + protected void confirmLicenseAcceptance(SdkType type) throws RetrieverException { final Properties questionProps = new Properties(); try { questionProps.load(DownloadRetriever.class.getClassLoader().getResourceAsStream("message.properties")); @@ -218,9 +218,9 @@ public class DownloadRetriever extends BaseRetriever { } final String question; - if(type.equals(SDKType.FLASH)) { + if(type.equals(SdkType.FLASH)) { question = questionProps.getProperty("ASK_ADOBE_FLASH_PLAYER_GLOBAL_SWC"); - } else if(type.equals(SDKType.AIR)) { + } else if(type.equals(SdkType.AIR)) { question = questionProps.getProperty("ASK_ADOBE_AIR_SDK"); } else { throw new RetrieverException("Unknown SDKType"); @@ -283,7 +283,7 @@ public class DownloadRetriever extends BaseRetriever { retriever.retrieve(SDKType.AIR, "13.0", PlatformType.WINDOWS); retriever.retrieve(SDKType.AIR, "13.0", PlatformType.MAC);*/ //retriever.retrieve(SDKType.AIR, "14.0", PlatformType.WINDOWS); - retriever.retrieve(SDKType.AIR, "14.0", PlatformType.MAC); + retriever.retrieve(SdkType.AIR, "14.0", PlatformType.MAC); // Test the retrieval of Flash SDKs /*retriever.retrieve(SDKType.FLASH, "10.2");
