You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by qu...@apache.org on 2015/06/01 00:19:04 UTC
[22/50] [abbrv] git commit: [flex-utilities]
[refs/heads/as3httpclient-work] - - Minor updates making the plugin run in
the lib/ext directory of a Maven 3.3.1 installation.
- Minor updates making the plugin run in the lib/ext directory of a Maven 3.3.1 installation.
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/cfcd4650
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/cfcd4650
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/cfcd4650
Branch: refs/heads/as3httpclient-work
Commit: cfcd4650661b6f0cb293d7af0bc2cb29efcdfdab
Parents: 2b96232
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Sat Apr 18 21:46:55 2015 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Sat Apr 18 21:46:55 2015 +0200
----------------------------------------------------------------------
mavenizer/maven-extension/pom.xml | 8 ++-
.../converter/mavenextension/FlexEventSpy.java | 61 +++++++++++---------
mavenizer/pom.xml | 2 +-
3 files changed, 40 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/cfcd4650/mavenizer/maven-extension/pom.xml
----------------------------------------------------------------------
diff --git a/mavenizer/maven-extension/pom.xml b/mavenizer/maven-extension/pom.xml
index 9b4a8e1..210a4e4 100644
--- a/mavenizer/maven-extension/pom.xml
+++ b/mavenizer/maven-extension/pom.xml
@@ -36,7 +36,7 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>sisu-maven-plugin</artifactId>
- <version>1.1</version>
+ <version>1.4</version>
<executions>
<execution>
<id>generate-index</id>
@@ -46,6 +46,7 @@
</execution>
</executions>
</plugin>
+
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.4</version>
@@ -55,7 +56,6 @@
</descriptorRefs>
<finalName>flex-maven-extension-${project.version}</finalName>
<appendAssemblyId>false</appendAssemblyId>
-
</configuration>
<executions>
<execution>
@@ -100,11 +100,13 @@
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<version>1</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
- <version>3.1.1</version>
+ <version>3.3.1</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/cfcd4650/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 b817beb..8c62236 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
@@ -18,6 +18,7 @@ import org.codehaus.plexus.logging.Logger;
import org.eclipse.aether.RepositoryEvent;
import org.eclipse.aether.artifact.Artifact;
+import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
import java.io.File;
@@ -29,20 +30,23 @@ import java.io.File;
@Singleton
public class FlexEventSpy extends AbstractEventSpy {
- protected Context context;
- protected PlexusContainer plexusContainer;
+ @Inject
protected RepositorySystem repositorySystem;
+
+ @Inject
protected Logger logger;
+ @Inject
+ protected PlexusContainer plexusContainer;
+
protected boolean internalLookup = false;
protected boolean flexSplashScreenShown = false;
+ public FlexEventSpy() {
+ }
+
@Override
public void init(Context context) throws Exception {
- this.context = context;
- plexusContainer = (PlexusContainer) context.getData().get("plexus");
- repositorySystem = plexusContainer.lookup(RepositorySystem.class);
- logger = plexusContainer.lookup(Logger.class);
}
@Override
@@ -54,28 +58,27 @@ public class FlexEventSpy extends AbstractEventSpy {
try {
internalLookup = true;
Artifact artifact = repositoryEvent.getArtifact();
- MavenSession session = plexusContainer.lookup(MavenSession.class);
if (artifact.getGroupId().startsWith("org.apache.flex")) {
if(!flexSplashScreenShown) {
showFlexSplashScreen();
}
if(resolve(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(),
- artifact.getExtension(), artifact.getClassifier(), session) == null) {
+ artifact.getExtension(), artifact.getClassifier()) == null) {
initFlex(artifact.getVersion());
}
} else if (artifact.getGroupId().startsWith("com.adobe.flash")) {
if(resolve(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(),
- artifact.getExtension(), artifact.getClassifier(), session) == null) {
+ artifact.getExtension(), artifact.getClassifier()) == null) {
initFlash(artifact.getVersion());
}
} else if (artifact.getGroupId().startsWith("com.adobe.air")) {
if(resolve(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(),
- artifact.getExtension(), artifact.getClassifier(), session) == null) {
+ artifact.getExtension(), artifact.getClassifier()) == null) {
initAir(artifact.getVersion());
}
} else if (artifact.getGroupId().equals("com.adobe") && artifact.getArtifactId().equals("fontkit")) {
if(resolve(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(),
- artifact.getExtension(), artifact.getClassifier(), session) == null) {
+ artifact.getExtension(), artifact.getClassifier()) == null) {
initFontkit();
}
}
@@ -88,7 +91,7 @@ public class FlexEventSpy extends AbstractEventSpy {
}
protected org.apache.maven.artifact.Artifact resolve(String groupId, String artifactId, String version,
- String type, String classifier, MavenSession session) {
+ String type, String classifier) {
org.apache.maven.artifact.Artifact artifact;
if((classifier == null) || (classifier.length() == 0)) {
artifact = repositorySystem.createArtifact(groupId, artifactId, version, type);
@@ -96,13 +99,17 @@ public class FlexEventSpy extends AbstractEventSpy {
artifact = repositorySystem.createArtifactWithClassifier(groupId, artifactId, version, type, classifier);
}
if (!artifact.isResolved()) {
-
- ArtifactResolutionRequest req = new ArtifactResolutionRequest();
- req.setArtifact(artifact);
- req.setLocalRepository(session.getLocalRepository());
- req.setRemoteRepositories(session.getRequest().getRemoteRepositories());
- ArtifactResolutionResult res = repositorySystem.resolve(req);
- if (!res.isSuccess()) {
+ try {
+ MavenSession mavenSession = plexusContainer.lookup(MavenSession.class);
+ ArtifactResolutionRequest req = new ArtifactResolutionRequest();
+ req.setArtifact(artifact);
+ req.setLocalRepository(mavenSession.getLocalRepository());
+ req.setRemoteRepositories(mavenSession.getRequest().getRemoteRepositories());
+ ArtifactResolutionResult res = repositorySystem.resolve(req);
+ if (!res.isSuccess()) {
+ return null;
+ }
+ } catch (Exception e) {
return null;
}
}
@@ -113,8 +120,8 @@ public class FlexEventSpy extends AbstractEventSpy {
logger.info("===========================================================");
logger.info(" - Installing Apache Flex SDK " + version);
try {
- MavenSession session = plexusContainer.lookup(MavenSession.class);
- File localRepoBaseDir = new File(session.getLocalRepository().getBasedir());
+ MavenSession mavenSession = plexusContainer.lookup(MavenSession.class);
+ File localRepoBaseDir = new File(mavenSession.getLocalRepository().getBasedir());
DownloadRetriever downloadRetriever = new DownloadRetriever();
File sdkRoot = downloadRetriever.retrieve(SdkType.FLEX, version);
@@ -139,8 +146,8 @@ public class FlexEventSpy extends AbstractEventSpy {
logger.info("===========================================================");
logger.info(" - Installing Adobe Flash SDK " + version);
try {
- MavenSession session = plexusContainer.lookup(MavenSession.class);
- File localRepoBaseDir = new File(session.getLocalRepository().getBasedir());
+ MavenSession mavenSession = plexusContainer.lookup(MavenSession.class);
+ File localRepoBaseDir = new File(mavenSession.getLocalRepository().getBasedir());
DownloadRetriever downloadRetriever = new DownloadRetriever();
File sdkRoot = downloadRetriever.retrieve(SdkType.FLASH, version);
FlashConverter converter = new FlashConverter(sdkRoot, localRepoBaseDir);
@@ -156,8 +163,8 @@ public class FlexEventSpy extends AbstractEventSpy {
logger.info("===========================================================");
logger.info(" - Installing Adobe AIR SDK " + version);
try {
- MavenSession session = plexusContainer.lookup(MavenSession.class);
- File localRepoBaseDir = new File(session.getLocalRepository().getBasedir());
+ MavenSession mavenSession = plexusContainer.lookup(MavenSession.class);
+ File localRepoBaseDir = new File(mavenSession.getLocalRepository().getBasedir());
DownloadRetriever downloadRetriever = new DownloadRetriever();
File sdkRoot = downloadRetriever.retrieve(SdkType.AIR, version);
AirConverter converter = new AirConverter(sdkRoot, localRepoBaseDir);
@@ -173,8 +180,8 @@ public class FlexEventSpy extends AbstractEventSpy {
logger.info("===========================================================");
logger.info(" - Installing Adobe Fontkit libraries");
try {
- MavenSession session = plexusContainer.lookup(MavenSession.class);
- File localRepoBaseDir = new File(session.getLocalRepository().getBasedir());
+ MavenSession mavenSession = plexusContainer.lookup(MavenSession.class);
+ File localRepoBaseDir = new File(mavenSession.getLocalRepository().getBasedir());
DownloadRetriever downloadRetriever = new DownloadRetriever();
File sdkRoot = downloadRetriever.retrieve(SdkType.FONTKIT);
FontkitConverter converter = new FontkitConverter(sdkRoot, localRepoBaseDir);
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/cfcd4650/mavenizer/pom.xml
----------------------------------------------------------------------
diff --git a/mavenizer/pom.xml b/mavenizer/pom.xml
index 285bb78..e5317f6 100644
--- a/mavenizer/pom.xml
+++ b/mavenizer/pom.xml
@@ -32,7 +32,7 @@
<packaging>pom</packaging>
<properties>
- <mavenVersion>3.1.0</mavenVersion>
+ <mavenVersion>3.1.1</mavenVersion>
<aetherVersion>0.9.0.M4</aetherVersion>
<wagonVersion>2.2</wagonVersion>
</properties>