diff options
author | Olivier Lamy <olamy@apache.org> | 2011-05-28 22:14:41 +0000 |
---|---|---|
committer | Olivier Lamy <olamy@apache.org> | 2011-05-28 22:14:41 +0000 |
commit | 26c1c112527a1985c434275aecbef07555a8398e (patch) | |
tree | 9066bc587d9735254cdaf7fb61e935449dea446e | |
parent | 7abf32f3171212a3d7197673e1a29b780631ee4d (diff) | |
download | archiva-26c1c112527a1985c434275aecbef07555a8398e.tar.gz archiva-26c1c112527a1985c434275aecbef07555a8398e.zip |
no need of this configuration as it s done in setup and avoid null in directory as unit tests use getName for directories
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1128782 13f79535-47bb-0310-9956-ffa450edef68
3 files changed, 12 insertions, 1 deletions
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/AbstractProxyTestCase.java b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/AbstractProxyTestCase.java index 6a030dd4c..d71e396d5 100644 --- a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/AbstractProxyTestCase.java +++ b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/AbstractProxyTestCase.java @@ -23,6 +23,7 @@ import junit.framework.TestCase; import org.apache.archiva.common.plexusbridge.PlexusSisuBridge; import org.apache.commons.io.FileUtils; import org.apache.commons.lang.ArrayUtils; +import org.apache.commons.lang.StringUtils; import org.apache.maven.archiva.configuration.ArchivaConfiguration; import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.maven.archiva.configuration.ProxyConnectorConfiguration; @@ -189,6 +190,12 @@ public abstract class AbstractProxyTestCase System.out.println( "\n.\\ " + getName() + "() \\._________________________________________\n" ); } + @Override + public String getName() + { + return StringUtils.substringAfterLast( getClass().getName(), "." ); + } + protected static final ArgumentsMatcher customWagonGetIfNewerMatcher = new ArgumentsMatcher() { diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MockConfiguration.java b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MockConfiguration.java index 6e3572f24..cb21dc0e1 100644 --- a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MockConfiguration.java +++ b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MockConfiguration.java @@ -85,7 +85,7 @@ public class MockConfiguration createRepository( AbstractProxyTestCase.ID_DEFAULT_MANAGED, "Default Managed Repository", repoPath, "default" ); ManagedRepositoryConfiguration repoConfig = managedDefaultRepository.getRepository(); - configuration.addManagedRepository( repoConfig ); + //configuration.addManagedRepository( repoConfig ); configuration.setRepositoryScanning( new RepositoryScanningConfiguration(){ @Override diff --git a/init-git-svn.sh b/init-git-svn.sh new file mode 100755 index 000000000..241ec802e --- /dev/null +++ b/init-git-svn.sh @@ -0,0 +1,4 @@ +cd .git;wget http://git.apache.org/authors.txt; cd .. +git config svn.authorsfile ".git/authors.txt" +git svn init --prefix=origin/ --tags=tags --trunk=trunk --branches=branches https://svn.apache.org/repos/asf/archiva +git svn rebase |