Author: brett
Date: Wed Jun 29 04:17:55 2011
New Revision: 1140961
URL: http://svn.apache.org/viewvc?rev=1140961&view=rev
Log:
clean up some tests and avoid creating bad ~/.m2/archiva.xml descriptor
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context-DependencyTreeTest.xml
- copied, changed from r1140949,
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context.xml
Removed:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/META-INF/
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/rss/RssFeedServletTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/DependencyTreeTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context.xml
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DefaultDependencyTreeBuilder.java
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/rss/RssFeedServletTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/rss/RssFeedServletTest.java?rev=1140961&r1=1140960&r2=1140961&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/rss/RssFeedServletTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/rss/RssFeedServletTest.java
Wed Jun 29 04:17:55 2011
@@ -30,8 +30,8 @@ import org.apache.commons.codec.Encoder;
import org.apache.commons.codec.binary.Base64;
import sun.misc.BASE64Encoder;
-import javax.servlet.http.HttpServletResponse;
import java.io.File;
+import javax.servlet.http.HttpServletResponse;
public class RssFeedServletTest
extends TestCase
@@ -166,12 +166,6 @@ public class RssFeedServletTest
}
}
- //Override
- protected String getPlexusConfigLocation()
- {
- return "org/apache/maven/archiva/web/rss/RssFeedServletTest.xml";
- }
-
@Override
protected void tearDown()
throws Exception
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/DependencyTreeTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/DependencyTreeTest.java?rev=1140961&r1=1140960&r2=1140961&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/DependencyTreeTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/DependencyTreeTest.java
Wed Jun 29 04:17:55 2011
@@ -44,14 +44,15 @@ import org.springframework.context.Appli
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import javax.inject.Inject;
import java.util.List;
+import javax.inject.Inject;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@RunWith( SpringJUnit4ClassRunner.class )
-@ContextConfiguration( locations = {
"classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
+@ContextConfiguration( locations = {"classpath*:/META-INF/spring-context.xml",
"classpath:/spring-context.xml",
+ "classpath:/spring-context-DependencyTreeTest.xml"} )
public class DependencyTreeTest
extends TestCase
{
Copied:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context-DependencyTreeTest.xml
(from r1140949,
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context.xml)
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context-DependencyTreeTest.xml?p2=archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context-DependencyTreeTest.xml&p1=archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context.xml&r1=1140949&r2=1140961&rev=1140961&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context-DependencyTreeTest.xml
Wed Jun 29 04:17:55 2011
@@ -32,13 +32,6 @@
<context:annotation-config/>
<context:component-scan
base-package="org.apache.archiva.metadata.repository.memory"/>
- <alias name="repositorySessionFactory#test"
alias="repositorySessionFactory"/>
-
- <bean name="userRepositories#test"
class="org.apache.maven.archiva.security.UserRepositoriesStub"/>
-
- <alias name="userRepositories#test" alias="userRepositories"/>
-
- <bean name="metadataResolver#test"
class="org.apache.archiva.metadata.repository.memory.TestMetadataResolver"/>
- <alias name="metadataResolver#test" alias="metadataResolver#default"/>
-
-</beans>
\ No newline at end of file
+ <bean name="archivaConfiguration#test"
class="org.apache.archiva.configuration.TestConfiguration" />
+ <alias name="archivaConfiguration#test" alias="archivaConfiguration#default"
/>
+</beans>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context.xml?rev=1140961&r1=1140960&r2=1140961&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context.xml
Wed Jun 29 04:17:55 2011
@@ -40,5 +40,4 @@
<bean name="metadataResolver#test"
class="org.apache.archiva.metadata.repository.memory.TestMetadataResolver"/>
<alias name="metadataResolver#test" alias="metadataResolver#default"/>
-
-</beans>
\ No newline at end of file
+</beans>
Modified:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DefaultDependencyTreeBuilder.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DefaultDependencyTreeBuilder.java?rev=1140961&r1=1140960&r2=1140961&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DefaultDependencyTreeBuilder.java
(original)
+++
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DefaultDependencyTreeBuilder.java
Wed Jun 29 04:17:55 2011
@@ -43,7 +43,6 @@ import org.apache.maven.artifact.metadat
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactCollector;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
-import org.apache.maven.artifact.resolver.ResolutionListener;
import org.apache.maven.artifact.resolver.filter.AndArtifactFilter;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.artifact.resolver.filter.ExcludesArtifactFilter;
@@ -77,9 +76,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-import javax.inject.Named;
import java.io.File;
import java.util.ArrayList;
import java.util.Collection;
@@ -90,6 +86,9 @@ import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
+import javax.inject.Named;
/**
* Default implementation of <code>DependencyTreeBuilder</code>. Customized
wrapper for maven-dependency-tree to use
