You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sn...@apache.org on 2007/06/23 15:24:55 UTC

svn commit: r550042 - in /maven/shared/trunk/maven-repository-builder: pom.xml src/test/java/org/apache/maven/shared/repository/DefaultRepositoryBuilderTest.java

Author: snicoll
Date: Sat Jun 23 06:24:54 2007
New Revision: 550042

URL: http://svn.apache.org/viewvc?view=rev&rev=550042
Log:
Fixed john's test with the remote repository. Still need to resolve the maven project properly.

Modified:
    maven/shared/trunk/maven-repository-builder/pom.xml
    maven/shared/trunk/maven-repository-builder/src/test/java/org/apache/maven/shared/repository/DefaultRepositoryBuilderTest.java

Modified: maven/shared/trunk/maven-repository-builder/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-repository-builder/pom.xml?view=diff&rev=550042&r1=550041&r2=550042
==============================================================================
--- maven/shared/trunk/maven-repository-builder/pom.xml (original)
+++ maven/shared/trunk/maven-repository-builder/pom.xml Sat Jun 23 06:24:54 2007
@@ -48,6 +48,12 @@
       <version>1.2_Java1.3</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven.wagon</groupId>
+      <artifactId>wagon-file</artifactId>
+      <version>1.0-beta-2</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <plugins>

Modified: maven/shared/trunk/maven-repository-builder/src/test/java/org/apache/maven/shared/repository/DefaultRepositoryBuilderTest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-repository-builder/src/test/java/org/apache/maven/shared/repository/DefaultRepositoryBuilderTest.java?view=diff&rev=550042&r1=550041&r2=550042
==============================================================================
--- maven/shared/trunk/maven-repository-builder/src/test/java/org/apache/maven/shared/repository/DefaultRepositoryBuilderTest.java (original)
+++ maven/shared/trunk/maven-repository-builder/src/test/java/org/apache/maven/shared/repository/DefaultRepositoryBuilderTest.java Sat Jun 23 06:24:54 2007
@@ -16,10 +16,13 @@
 import org.apache.maven.project.ProjectBuildingException;
 import org.apache.maven.shared.repository.model.DefaultRepositoryInfo;
 import org.codehaus.plexus.PlexusTestCase;
+import org.codehaus.plexus.logging.Logger;
+import org.codehaus.plexus.logging.console.ConsoleLogger;
 
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
+import java.util.ArrayList;
 
 public class DefaultRepositoryBuilderTest
     extends PlexusTestCase
@@ -104,6 +107,8 @@
         throws ProjectBuildingException, RepositoryAssemblyException, IOException
     {
         MavenProject project = getProject( "projects/massembly-210-direct-parent/pom.xml" );
+        // TODO: jdcasey, the project loaded that way as no initialized Artifact objects
+        // TODO: with this non resolved content the repository assembler does not run!
 
         TestRepositoryBuilderConfigSource cs = new TestRepositoryBuilderConfigSource();
         cs.setProject( project );
@@ -112,10 +117,14 @@
         DefaultRepositoryAssembler assembler = new DefaultRepositoryAssembler( artifactFactory, artifactResolver,
                                                                                defaultLayout, repoFactory,
                                                                                metadataSource, projectBuilder );
+        // TODO: NPE thrown if logger not set
+        assembler.enableLogging( new ConsoleLogger( Logger.LEVEL_DEBUG, "console"));
 
         File repositoryDirectory = new File( getBasedir(), "target/test-repositories/massembly-210-direct-parent" );
 
         DefaultRepositoryInfo repoInfo = new DefaultRepositoryInfo();
+        // TODO: NPE if we don't call this - no clue what it's supposed to represent
+        repoInfo.setGroupVersionAlignments( new ArrayList());
 
         assembler.buildRemoteRepository( repositoryDirectory, repoInfo, cs );