You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by me...@apache.org on 2006/09/17 21:49:15 UTC
svn commit: r447129 - in /incubator/tuscany/java/sca/services/maven/src:
main/java/org/apache/tuscany/services/maven/MavenArtifactRepository.java
test/java/org/apache/tuscany/services/maven/MavenArtifactRepositoryTest.java
Author: meerajk
Date: Sun Sep 17 12:49:14 2006
New Revision: 447129
URL: http://svn.apache.org/viewvc?view=rev&rev=447129
Log:
Re-edited.
Modified:
incubator/tuscany/java/sca/services/maven/src/main/java/org/apache/tuscany/services/maven/MavenArtifactRepository.java
incubator/tuscany/java/sca/services/maven/src/test/java/org/apache/tuscany/services/maven/MavenArtifactRepositoryTest.java
Modified: incubator/tuscany/java/sca/services/maven/src/main/java/org/apache/tuscany/services/maven/MavenArtifactRepository.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/maven/src/main/java/org/apache/tuscany/services/maven/MavenArtifactRepository.java?view=diff&rev=447129&r1=447128&r2=447129
==============================================================================
--- incubator/tuscany/java/sca/services/maven/src/main/java/org/apache/tuscany/services/maven/MavenArtifactRepository.java (original)
+++ incubator/tuscany/java/sca/services/maven/src/main/java/org/apache/tuscany/services/maven/MavenArtifactRepository.java Sun Sep 17 12:49:14 2006
@@ -97,16 +97,16 @@
public void resolve(Artifact rootArtifact) {
try {
-
+
org.apache.maven.artifact.Artifact mavenRootArtifact = artifactFactory.createArtifact(rootArtifact.getGroup(), rootArtifact.getName(),
- rootArtifact.getVersion(), org.apache.maven.artifact.Artifact.SCOPE_RUNTIME, rootArtifact.getType());
-
+ rootArtifact.getVersion(), org.apache.maven.artifact.Artifact.SCOPE_RUNTIME, rootArtifact.getType());
+
artifactResolver.resolve(mavenRootArtifact, remoteRepositories, localRepository);
rootArtifact.setUrl(mavenRootArtifact.getFile().toURL());
ResolutionGroup resolutionGroup = metadataSource.retrieve(mavenRootArtifact, localRepository, remoteRepositories);
- ArtifactResolutionResult result = artifactResolver.resolveTransitively(resolutionGroup.getArtifacts(), mavenRootArtifact, remoteRepositories,
- localRepository, metadataSource);
+ ArtifactResolutionResult result = artifactResolver.resolveTransitively(resolutionGroup.getArtifacts(), mavenRootArtifact,
+ remoteRepositories, localRepository, metadataSource);
// Add the artifacts to the deployment unit
for (Object depArtifact : result.getArtifacts()) {
@@ -118,7 +118,7 @@
artifact.setClassifier(transitiveDependency.getClassifier());
artifact.setUrl(transitiveDependency.getFile().toURL());
}
-
+
} catch (ArtifactResolutionException ex) {
// TODO Clarify the exception strategy with Jeremy
throw new RuntimeException(ex);
@@ -132,7 +132,7 @@
// TODO Clarify the exception strategy with Jeremy
throw new RuntimeException(ex);
}
-
+
}
/**
Modified: incubator/tuscany/java/sca/services/maven/src/test/java/org/apache/tuscany/services/maven/MavenArtifactRepositoryTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/maven/src/test/java/org/apache/tuscany/services/maven/MavenArtifactRepositoryTest.java?view=diff&rev=447129&r1=447128&r2=447129
==============================================================================
--- incubator/tuscany/java/sca/services/maven/src/test/java/org/apache/tuscany/services/maven/MavenArtifactRepositoryTest.java (original)
+++ incubator/tuscany/java/sca/services/maven/src/test/java/org/apache/tuscany/services/maven/MavenArtifactRepositoryTest.java Sun Sep 17 12:49:14 2006
@@ -22,7 +22,7 @@
/**
* @version $Rev$ $Date$
- *
+ *
*/
public class MavenArtifactRepositoryTest extends TestCase {
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org