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/24 18:40:45 UTC

svn commit: r449432 - in /incubator/tuscany/java/sca/services/maven/src: main/java/org/apache/tuscany/services/maven/MavenHelper.java test/java/org/apache/tuscany/services/maven/MavenArtifactRepositoryTest.java

Author: meerajk
Date: Sun Sep 24 09:40:45 2006
New Revision: 449432

URL: http://svn.apache.org/viewvc?view=rev&rev=449432
Log:
First working version, needs more tests.

Modified:
    incubator/tuscany/java/sca/services/maven/src/main/java/org/apache/tuscany/services/maven/MavenHelper.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/MavenHelper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/maven/src/main/java/org/apache/tuscany/services/maven/MavenHelper.java?view=diff&rev=449432&r1=449431&r2=449432
==============================================================================
--- incubator/tuscany/java/sca/services/maven/src/main/java/org/apache/tuscany/services/maven/MavenHelper.java (original)
+++ incubator/tuscany/java/sca/services/maven/src/main/java/org/apache/tuscany/services/maven/MavenHelper.java Sun Sep 24 09:40:45 2006
@@ -37,7 +37,6 @@
 import org.apache.maven.artifact.resolver.ArtifactResolutionException;
 import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
 import org.apache.maven.artifact.resolver.ArtifactResolver;
-
 import org.apache.tuscany.spi.services.artifact.Artifact;
 import org.codehaus.classworlds.ClassWorld;
 import org.codehaus.classworlds.DuplicateRealmException;
@@ -53,7 +52,7 @@
 public class MavenHelper {
 
     /** Local repository */
-    private static final File LOCAL_REPO = new File(System.getProperty("user.home") + File.separator + "m2" + File.separator + "repository");
+    private static final File LOCAL_REPO = new File(System.getProperty("user.home") + File.separator + ".m2" + File.separator + "repository");
 
     /** Remote repository URLs */
     private final String[] remoteRepositoryUrls;
@@ -157,6 +156,7 @@
                 rootArtifact.setUrl(mavenRootArtifact.getFile().toURL());
                 resolveDependencies(rootArtifact, mavenRootArtifact, true);
             } else if (resolve(mavenRootArtifact, remoteRepositories, localRepository)) {
+                rootArtifact.setUrl(mavenRootArtifact.getFile().toURL());
                 resolveDependencies(rootArtifact, mavenRootArtifact, false);
             } else {
                 throw new TuscanyMavenException("Unable to resolve artifact " + mavenRootArtifact.toString());
@@ -205,10 +205,10 @@
                         snapshotsPolicy, releasesPolicy));
             }
 
-            ArtifactRepositoryPolicy deployedRepositorySnapshotsPolicy = new ArtifactRepositoryPolicy(true,
-                    ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS, ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN);
-            ArtifactRepositoryPolicy deployedRepositoryReleasesPolicy = new ArtifactRepositoryPolicy(true,
-                    ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS, ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN);
+            ArtifactRepositoryPolicy deployedRepositorySnapshotsPolicy = new ArtifactRepositoryPolicy(false,
+                    ArtifactRepositoryPolicy.UPDATE_POLICY_NEVER, ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN);
+            ArtifactRepositoryPolicy deployedRepositoryReleasesPolicy = new ArtifactRepositoryPolicy(false,
+                    ArtifactRepositoryPolicy.UPDATE_POLICY_NEVER, ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN);
 
             deployedRepository = artifactRepositoryFactory.createArtifactRepository("local", deployedRepositoryUrl.toExternalForm(), layout,
                     deployedRepositorySnapshotsPolicy, deployedRepositoryReleasesPolicy);

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=449432&r1=449431&r2=449432
==============================================================================
--- 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 24 09:40:45 2006
@@ -48,9 +48,11 @@
     /*
      * Test method for 'org.apache.tuscany.services.maven.MavenArtifactRepository.resolve(Artifact)'
      */
-    public void testResolveArtifactFromLocalRepository() throws Exception {
+    public void testResolveArtifact() throws Exception {
 
-        final URL BASE_URL = new File(System.getProperty("user.home") + File.separator + "m3").toURL();
+        // Test uses the local maven repo as the deployed repo
+        // TODO Need a more realistic test
+        final URL BASE_URL = new File(System.getProperty("user.home") + File.separator + ".m2").toURL();
         String[] remoteRepoUrls = { "http://repo1.maven.org/maven2/" };
         MavenArtifactRepository repository = new MavenArtifactRepository(remoteRepoUrls, new RuntimeInfo() {
             public File getApplicationRootDirectory() { return null; }
@@ -66,14 +68,8 @@
         repository.resolve(artifact);
 
         Set<URL> urls = artifact.getUrls();
+        
         assertEquals(2, urls.size());
-
-    }
-
-    /*
-     * Test method for 'org.apache.tuscany.services.maven.MavenArtifactRepository.resolve(Collection<? extends Artifact>)'
-     */
-    public void testResolveCollectionOfQextendsArtifact() {
 
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org