Author: oching
Date: Wed Jun 15 11:03:10 2011
New Revision: 1135993
URL: http://svn.apache.org/viewvc?rev=1135993&view=rev
Log:
use getBasedir() in FileUtil in archiva-common
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/test/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverterTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-checksum/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-checksum/src/test/java/org/apache/archiva/checksum/AbstractChecksumTestCase.java
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-converter/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/NexusRepositorySearchTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/ChecksumPolicyTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/AbstractRepositoryLayerTestCase.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/RepositoryRequestTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-transaction/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/AbstractFileEventTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CopyFileEventTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CreateFileEventTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractActionTestCase.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/UploadActionTest.java
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/test/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverterTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/test/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverterTest.java?rev=1135993&r1=1135992&r2=1135993&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/test/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverterTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/test/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverterTest.java
Wed Jun 15 11:03:10 2011
@@ -22,6 +22,7 @@ package org.apache.maven.archiva.convert
import junit.framework.TestCase;
import org.apache.archiva.common.plexusbridge.PlexusSisuBridge;
import org.apache.commons.io.FileUtils;
+import org.apache.maven.archiva.common.utils.FileUtil;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
@@ -108,18 +109,7 @@ public class LegacyToDefaultConverterTes
public static File getTestFile( String path )
{
- return new File( getBasedir(), path );
- }
-
- public static String getBasedir()
- {
- String basedir = System.getProperty( "basedir" );
- if ( basedir == null )
- {
- basedir = new File( "" ).getAbsolutePath();
- }
-
- return basedir;
+ return new File( FileUtil.getBasedir(), path );
}
private void copyDirectoryStructure( File sourceDirectory, File
destinationDirectory )
@@ -440,7 +430,7 @@ public class LegacyToDefaultConverterTes
Artifact artifact =
createArtifact( "org.apache.maven.plugins", "maven-foo-plugin",
"1.0", "1.0", "maven-plugin" );
artifact.setFile(
- new File( getBasedir(),
"src/test/source-repository/test/plugins/maven-foo-plugin-1.0.jar" ) );
+ new File( FileUtil.getBasedir(),
"src/test/source-repository/test/plugins/maven-foo-plugin-1.0.jar" ) );
artifactConverter.convert( artifact, targetRepository );
// There is a warning but I can't figure out how to look at it.
Eyeballing the results it appears
// the plugin is being coverted correctly.
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-checksum/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-checksum/pom.xml?rev=1135993&r1=1135992&r2=1135993&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-checksum/pom.xml
(original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-checksum/pom.xml Wed Jun
15 11:03:10 2011
@@ -41,6 +41,10 @@
<dependencies>
<dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-common</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-checksum/src/test/java/org/apache/archiva/checksum/AbstractChecksumTestCase.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-checksum/src/test/java/org/apache/archiva/checksum/AbstractChecksumTestCase.java?rev=1135993&r1=1135992&r2=1135993&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-checksum/src/test/java/org/apache/archiva/checksum/AbstractChecksumTestCase.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-checksum/src/test/java/org/apache/archiva/checksum/AbstractChecksumTestCase.java
Wed Jun 15 11:03:10 2011
@@ -22,6 +22,7 @@ package org.apache.archiva.checksum;
import java.io.File;
import junit.framework.TestCase;
+import org.apache.maven.archiva.common.utils.FileUtil;
/**
* AbstractChecksumTestCase
@@ -31,28 +32,9 @@ import junit.framework.TestCase;
public abstract class AbstractChecksumTestCase
extends TestCase
{
- private File basedir;
-
- public File getBasedir()
- {
- if ( basedir == null )
- {
- String sysprop = System.getProperty( "basedir" );
- if ( sysprop != null )
- {
- basedir = new File( sysprop );
- }
- else
- {
- basedir = new File( System.getProperty( "user.dir" ) );
- }
- }
- return basedir;
- }
-
public File getTestOutputDir()
{
- File dir = new File( getBasedir(), "target/test-output/" + getName() );
+ File dir = new File( FileUtil.getBasedir(), "target/test-output/" +
getName() );
if ( dir.exists() == false )
{
if ( dir.mkdirs() == false )
@@ -65,7 +47,7 @@ public abstract class AbstractChecksumTe
public File getTestResource( String filename )
{
- File dir = new File( getBasedir(), "src/test/resources" );
+ File dir = new File( FileUtil.getBasedir(), "src/test/resources" );
File file = new File( dir, filename );
if ( file.exists() == false )
{
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java?rev=1135993&r1=1135992&r2=1135993&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java
Wed Jun 15 11:03:10 2011
@@ -22,6 +22,7 @@ package org.apache.maven.archiva.configu
import junit.framework.TestCase;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.StringUtils;
+import org.apache.maven.archiva.common.utils.FileUtil;
import org.codehaus.plexus.registry.RegistryException;
import org.codehaus.redback.components.springutils.ComponentContainer;
import org.custommonkey.xmlunit.XMLAssert;
@@ -48,20 +49,9 @@ public class ArchivaConfigurationTest
@Inject
private ComponentContainer componentContainer;
- public static String getBasedir()
- {
- String basedir = System.getProperty( "basedir" );
- if ( basedir == null )
- {
- basedir = new File( "" ).getAbsolutePath();
- }
-
- return basedir;
- }
-
public static File getTestFile( String path )
{
- return new File( getBasedir(), path );
+ return new File( FileUtil.getBasedir(), path );
}
/**
@@ -131,19 +121,19 @@ public class ArchivaConfigurationTest
public void
testGetConfigurationFromDefaultsWithDefaultRepoLocationAlreadyExisting()
throws Exception
{
- File repo = new File( getBasedir(),
"/target/test-classes/existing_snapshots" );
+ File repo = new File( FileUtil.getBasedir(),
"/target/test-classes/existing_snapshots" );
repo.mkdirs();
- repo = new File( getBasedir(),
"/target/test-classes/existing_internal" );
+ repo = new File( FileUtil.getBasedir(),
"/target/test-classes/existing_internal" );
repo.mkdirs();
String existingTestDefaultArchivaConfigFile =
FileUtils.readFileToString(
getTestFile(
"target/test-classes/org/apache/maven/archiva/configuration/test-default-archiva.xml"
) );
existingTestDefaultArchivaConfigFile =
- StringUtils.replace( existingTestDefaultArchivaConfigFile,
"${appserver.base}", getBasedir() );
+ StringUtils.replace( existingTestDefaultArchivaConfigFile,
"${appserver.base}", FileUtil.getBasedir() );
File generatedTestDefaultArchivaConfigFile =
- new File( getBasedir(),
"target/test-classes/org/apache/maven/archiva/configuration/default-archiva.xml"
);
+ new File( FileUtil.getBasedir(),
"target/test-classes/org/apache/maven/archiva/configuration/default-archiva.xml"
);
FileUtils.writeStringToFile( generatedTestDefaultArchivaConfigFile,
existingTestDefaultArchivaConfigFile,
null );
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-converter/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-converter/pom.xml?rev=1135993&r1=1135992&r2=1135993&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-converter/pom.xml
(original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-converter/pom.xml Wed
Jun 15 11:03:10 2011
@@ -49,6 +49,10 @@
<artifactId>archiva-plexus-bridge</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-common</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-i18n</artifactId>
</dependency>
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/NexusRepositorySearchTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/NexusRepositorySearchTest.java?rev=1135993&r1=1135992&r2=1135993&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/NexusRepositorySearchTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/NexusRepositorySearchTest.java
Wed Jun 15 11:03:10 2011
@@ -23,6 +23,7 @@ import junit.framework.TestCase;
import org.apache.archiva.common.plexusbridge.PlexusSisuBridge;
import org.apache.commons.io.FileUtils;
import org.apache.maven.archiva.common.utils.ArchivaNexusIndexerUtil;
+import org.apache.maven.archiva.common.utils.FileUtil;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.Configuration;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
@@ -100,26 +101,15 @@ public class NexusRepositorySearchTest
config.addManagedRepository( createRepositoryConfig( TEST_REPO_2 ) );
}
- public static String getBasedir()
- {
- String basedir = System.getProperty( "basedir" );
- if ( basedir == null )
- {
- basedir = new File( "" ).getAbsolutePath();
- }
-
- return basedir;
- }
-
private void createSimpleIndex()
throws IOException, UnsupportedExistingLuceneIndexException,
IllegalArtifactCoordinateException
{
List<File> files = new ArrayList<File>();
- files.add( new File( getBasedir(), "/target/test-classes/" +
TEST_REPO_1
+ files.add( new File( FileUtil.getBasedir(), "/target/test-classes/" +
TEST_REPO_1
+ "/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.jar"
) );
- files.add( new File( getBasedir(), "/target/test-classes/" +
TEST_REPO_1
+ files.add( new File( FileUtil.getBasedir(), "/target/test-classes/" +
TEST_REPO_1
+ "/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.jar" ) );
- files.add( new File( getBasedir(), "/target/test-classes/" +
TEST_REPO_1
+ files.add( new File( FileUtil.getBasedir(), "/target/test-classes/" +
TEST_REPO_1
+ "/org/apache/archiva/archiva-test/2.0/archiva-test-2.0.jar" ) );
createIndex( TEST_REPO_1, files );
@@ -129,19 +119,19 @@ public class NexusRepositorySearchTest
throws IOException, UnsupportedExistingLuceneIndexException,
IllegalArtifactCoordinateException
{
List<File> files = new ArrayList<File>();
- files.add( new File( getBasedir(), "/target/test-classes/" +
TEST_REPO_1
+ files.add( new File( FileUtil.getBasedir(), "/target/test-classes/" +
TEST_REPO_1
+ "/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.jar"
) );
- files.add( new File( getBasedir(), "/target/test-classes/" +
TEST_REPO_1
+ files.add( new File( FileUtil.getBasedir(), "/target/test-classes/" +
TEST_REPO_1
+ "/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.jar" ) );
- files.add( new File( getBasedir(), "/target/test-classes/" +
TEST_REPO_1
+ files.add( new File( FileUtil.getBasedir(), "/target/test-classes/" +
TEST_REPO_1
+ "/org/apache/archiva/archiva-test/2.0/archiva-test-2.0.jar" ) );
- files.add( new File( getBasedir(), "/target/test-classes/" +
TEST_REPO_1
+ files.add( new File( FileUtil.getBasedir(), "/target/test-classes/" +
TEST_REPO_1
+ "/org/apache/archiva/archiva-webapp/1.0/archiva-webapp-1.0.war"
) );
- files.add( new File( getBasedir(), "/target/test-classes/" +
TEST_REPO_1
+ files.add( new File( FileUtil.getBasedir(), "/target/test-classes/" +
TEST_REPO_1
+ "/com/artifactid-numeric/1.0/artifactid-numeric-1.0.jar" ) );
- files.add( new File( getBasedir(), "/target/test-classes/" +
TEST_REPO_1
+ files.add( new File( FileUtil.getBasedir(), "/target/test-classes/" +
TEST_REPO_1
+ "/com/artifactid-numeric123/1.0/artifactid-numeric123-1.0.jar" )
);
- files.add( new File( getBasedir(), "/target/test-classes/" +
TEST_REPO_1
+ files.add( new File( FileUtil.getBasedir(), "/target/test-classes/" +
TEST_REPO_1
+ "/com/classname-search/1.0/classname-search-1.0.jar" ) );
createIndex( TEST_REPO_1, files );
@@ -151,7 +141,7 @@ public class NexusRepositorySearchTest
{
ManagedRepositoryConfiguration repositoryConfig = new
ManagedRepositoryConfiguration();
repositoryConfig.setId( repository );
- repositoryConfig.setLocation( getBasedir() + "/target/test-classes/" +
repository );
+ repositoryConfig.setLocation( FileUtil.getBasedir() +
"/target/test-classes/" + repository );
repositoryConfig.setLayout( "default" );
repositoryConfig.setName( repository );
repositoryConfig.setScanned( true );
@@ -165,11 +155,11 @@ public class NexusRepositorySearchTest
public void tearDown()
throws Exception
{
- FileUtils.deleteDirectory( new File( getBasedir(),
"/target/test-classes/" + TEST_REPO_1 + "/.indexer" ) );
- assertFalse( new File( getBasedir(), "/target/test-classes/" +
TEST_REPO_1 + "/.indexer" ).exists() );
+ FileUtils.deleteDirectory( new File( FileUtil.getBasedir(),
"/target/test-classes/" + TEST_REPO_1 + "/.indexer" ) );
+ assertFalse( new File( FileUtil.getBasedir(), "/target/test-classes/"
+ TEST_REPO_1 + "/.indexer" ).exists() );
- FileUtils.deleteDirectory( new File( getBasedir(),
"/target/test-classes/" + TEST_REPO_2 + "/.indexer" ) );
- assertFalse( new File( getBasedir(), "/target/test-classes/" +
TEST_REPO_2 + "/.indexer" ).exists() );
+ FileUtils.deleteDirectory( new File( FileUtil.getBasedir(),
"/target/test-classes/" + TEST_REPO_2 + "/.indexer" ) );
+ assertFalse( new File( FileUtil.getBasedir(), "/target/test-classes/"
+ TEST_REPO_2 + "/.indexer" ).exists() );
super.tearDown();
}
@@ -178,8 +168,8 @@ public class NexusRepositorySearchTest
throws IOException, UnsupportedExistingLuceneIndexException,
IllegalArtifactCoordinateException
{
context = new DefaultIndexingContext( repository, repository,
- new File( getBasedir(),
"/target/test-classes/" + repository ),
- new File( getBasedir(),
+ new File( FileUtil.getBasedir(),
"/target/test-classes/" + repository ),
+ new File( FileUtil.getBasedir(),
"/target/test-classes/" + repository + "/.indexer" ), null,
null,
ArchivaNexusIndexerUtil.FULL_INDEX, false );
//indexer.addIndexingContext( repository, repository, new File(
getBasedir(), "/target/test-classes/" +
@@ -199,7 +189,7 @@ public class NexusRepositorySearchTest
//indexerEngine.endIndexing( context );
//indexer.removeIndexingContext( context, false );
- assertTrue( new File( getBasedir(), "/target/test-classes/" +
repository + "/.indexer" ).exists() );
+ assertTrue( new File( FileUtil.getBasedir(), "/target/test-classes/" +
repository + "/.indexer" ).exists() );
}
@Test
@@ -319,9 +309,9 @@ public class NexusRepositorySearchTest
createSimpleIndex();
List<File> files = new ArrayList<File>();
- files.add( new File( getBasedir(), "/target/test-classes/" +
TEST_REPO_2
+ files.add( new File( FileUtil.getBasedir(), "/target/test-classes/" +
TEST_REPO_2
+ "/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.jar"
) );
- files.add( new File( getBasedir(), "/target/test-classes/" +
TEST_REPO_2
+ files.add( new File( FileUtil.getBasedir(), "/target/test-classes/" +
TEST_REPO_2
+ "/org/apache/archiva/archiva-search/1.1/archiva-search-1.1.jar"
) );
createIndex( TEST_REPO_2, files );
@@ -447,9 +437,9 @@ public class NexusRepositorySearchTest
throws Exception
{
List<File> files = new ArrayList<File>();
- files.add( new File( getBasedir(), "/target/test-classes/" +
TEST_REPO_2
+ files.add( new File( FileUtil.getBasedir(), "/target/test-classes/" +
TEST_REPO_2
+ "/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.jar"
) );
- files.add( new File( getBasedir(), "/target/test-classes/" +
TEST_REPO_2
+ files.add( new File( FileUtil.getBasedir(), "/target/test-classes/" +
TEST_REPO_2
+ "/org/apache/archiva/archiva-search/1.1/archiva-search-1.1.jar"
) );
createIndex( TEST_REPO_2, files );
@@ -533,9 +523,9 @@ public class NexusRepositorySearchTest
throws Exception
{
List<File> files = new ArrayList<File>();
- files.add( new File( getBasedir(), "/target/test-classes/" +
TEST_REPO_1
+ files.add( new File( FileUtil.getBasedir(), "/target/test-classes/" +
TEST_REPO_1
+ "/com/artifactid-numeric/1.0/artifactid-numeric-1.0.jar" ) );
- files.add( new File( getBasedir(), "/target/test-classes/" +
TEST_REPO_1
+ files.add( new File( FileUtil.getBasedir(), "/target/test-classes/" +
TEST_REPO_1
+ "/com/artifactid-numeric123/1.0/artifactid-numeric123-1.0.jar" )
);
createIndex( TEST_REPO_1, files );
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/ChecksumPolicyTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/ChecksumPolicyTest.java?rev=1135993&r1=1135992&r2=1135993&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/ChecksumPolicyTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/ChecksumPolicyTest.java
Wed Jun 15 11:03:10 2011
@@ -21,6 +21,7 @@ package org.apache.maven.archiva.policie
import junit.framework.TestCase;
import org.apache.commons.io.FileUtils;
+import org.apache.maven.archiva.common.utils.FileUtil;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.test.context.ContextConfiguration;
@@ -357,22 +358,9 @@ public class ChecksumPolicyTest
return localFile;
}
-
-
- public static String getBasedir()
- {
- String basedir = System.getProperty( "basedir" );
- if ( basedir == null )
- {
- basedir = new File( "" ).getAbsolutePath();
- }
-
- return basedir;
- }
-
public static File getTestFile( String path )
{
- return new File( getBasedir(), path );
+ return new File( FileUtil.getBasedir(), path );
}
}
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/AbstractRepositoryLayerTestCase.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/AbstractRepositoryLayerTestCase.java?rev=1135993&r1=1135992&r2=1135993&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/AbstractRepositoryLayerTestCase.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/AbstractRepositoryLayerTestCase.java
Wed Jun 15 11:03:10 2011
@@ -41,17 +41,6 @@ public abstract class AbstractRepository
extends TestCase
{
- public static String getBasedir()
- {
- String basedir = System.getProperty( "basedir" );
- if ( basedir == null )
- {
- basedir = new File( "" ).getAbsolutePath();
- }
-
- return basedir;
- }
-
@Inject
protected ApplicationContext applicationContext;
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/RepositoryRequestTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/RepositoryRequestTest.java?rev=1135993&r1=1135992&r2=1135993&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/RepositoryRequestTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/RepositoryRequestTest.java
Wed Jun 15 11:03:10 2011
@@ -20,6 +20,7 @@ package org.apache.maven.archiva.reposit
*/
import org.apache.commons.lang.StringUtils;
+import org.apache.maven.archiva.common.utils.FileUtil;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.model.ArtifactReference;
import org.apache.maven.archiva.repository.AbstractRepositoryLayerTestCase;
@@ -369,7 +370,7 @@ public class RepositoryRequestTest
private ManagedRepositoryContent createManagedRepo( String layout )
throws Exception
{
- File repoRoot = new File( getBasedir() + "/target/test-repo" );
+ File repoRoot = new File( FileUtil.getBasedir() + "/target/test-repo"
);
return createManagedRepositoryContent( "test-internal", "Internal Test
Repo", repoRoot, layout );
}
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-transaction/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-transaction/pom.xml?rev=1135993&r1=1135992&r2=1135993&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-transaction/pom.xml
(original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-transaction/pom.xml Wed
Jun 15 11:03:10 2011
@@ -29,6 +29,10 @@
<description>API for managing transaction.</description>
<dependencies>
<dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-common</artifactId>
+ </dependency>
+ <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/AbstractFileEventTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/AbstractFileEventTest.java?rev=1135993&r1=1135992&r2=1135993&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/AbstractFileEventTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/AbstractFileEventTest.java
Wed Jun 15 11:03:10 2011
@@ -38,18 +38,6 @@ public abstract class AbstractFileEventT
{
protected List<Digester> digesters;
- public static String getBasedir()
- {
-
- String basedir = System.getProperty( "basedir" );
- if (basedir == null)
- {
- basedir = new File( "" ).getAbsolutePath();
- }
- return basedir;
-
- }
-
@SuppressWarnings( "unchecked" )
public void setUp()
throws Exception
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CopyFileEventTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CopyFileEventTest.java?rev=1135993&r1=1135992&r2=1135993&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CopyFileEventTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CopyFileEventTest.java
Wed Jun 15 11:03:10 2011
@@ -20,6 +20,7 @@ package org.apache.maven.archiva.transac
*/
import org.apache.commons.io.FileUtils;
+import org.apache.maven.archiva.common.utils.FileUtil;
import java.io.File;
import java.io.IOException;
@@ -29,11 +30,11 @@ import java.io.IOException;
public class CopyFileEventTest
extends AbstractFileEventTest
{
- private File testDir = new File( getBasedir(),
"target/transaction-tests/copy-file" );
+ private File testDir = new File( FileUtil.getBasedir(),
"target/transaction-tests/copy-file" );
private File testDest = new File( testDir, "test-file.txt" );
- private File testSource = new File( getBasedir(),
"target/transaction-tests/test-file.txt" );
+ private File testSource = new File( FileUtil.getBasedir(),
"target/transaction-tests/test-file.txt" );
private File testDestChecksum;
@@ -152,7 +153,7 @@ public class CopyFileEventTest
{
super.tearDown();
- FileUtils.deleteDirectory( new File( getBasedir(),
"target/transaction-tests" ) );
+ FileUtils.deleteDirectory( new File( FileUtil.getBasedir(),
"target/transaction-tests" ) );
}
protected void assertChecksumCommit( File file )
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CreateFileEventTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CreateFileEventTest.java?rev=1135993&r1=1135992&r2=1135993&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CreateFileEventTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CreateFileEventTest.java
Wed Jun 15 11:03:10 2011
@@ -22,13 +22,14 @@ package org.apache.maven.archiva.transac
import java.io.File;
import org.apache.commons.io.FileUtils;
+import org.apache.maven.archiva.common.utils.FileUtil;
/**
*/
public class CreateFileEventTest
extends AbstractFileEventTest
{
- private File testDir = new File( getBasedir(),
"target/transaction-tests/create-file" );
+ private File testDir = new File( FileUtil.getBasedir(),
"target/transaction-tests/create-file" );
public void testCreateCommitRollback()
throws Exception
@@ -52,7 +53,7 @@ public class CreateFileEventTest
assertChecksumRollback( testFile );
assertFalse( "Test file parent directories has been rolledback too",
testDir.exists() );
- assertTrue( "target directory still exists", new File( getBasedir(),
"target" ).exists() );
+ assertTrue( "target directory still exists", new File(
FileUtil.getBasedir(), "target" ).exists() );
}
public void testCreateCommitRollbackWithBackup()
@@ -114,6 +115,6 @@ public class CreateFileEventTest
{
super.tearDown();
- FileUtils.deleteDirectory( new File( getBasedir(),
"target/transaction-tests" ) );
+ FileUtils.deleteDirectory( new File( FileUtil.getBasedir(),
"target/transaction-tests" ) );
}
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractActionTestCase.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractActionTestCase.java?rev=1135993&r1=1135992&r2=1135993&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractActionTestCase.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/AbstractActionTestCase.java
Wed Jun 15 11:03:10 2011
@@ -221,15 +221,4 @@ public abstract class AbstractActionTest
stack.getContext().put( ActionContext.CONTAINER, container );
ActionContext.setContext( new ActionContext( stack.getContext() ) );
}
-
- public static String getBasedir()
- {
- String basedir = System.getProperty( "basedir" );
- if ( basedir == null )
- {
- basedir = new File( "" ).getAbsolutePath();
- }
-
- return basedir;
- }
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/UploadActionTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/UploadActionTest.java?rev=1135993&r1=1135992&r2=1135993&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/UploadActionTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/UploadActionTest.java
Wed Jun 15 11:03:10 2011
@@ -27,6 +27,7 @@ import org.apache.archiva.checksum.Check
import org.apache.archiva.scheduler.ArchivaTaskScheduler;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.StringUtils;
+import org.apache.maven.archiva.common.utils.FileUtil;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.Configuration;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
@@ -91,7 +92,7 @@ public class UploadActionTest
uploadAction.setConfiguration( archivaConfig );
uploadAction.setRepositoryFactory( repoFactory );
- File testRepo = new File( getBasedir(),
"target/test-classes/test-repo" );
+ File testRepo = new File( FileUtil.getBasedir(),
"target/test-classes/test-repo" );
testRepo.mkdirs();
assertTrue( testRepo.exists() );
@@ -289,9 +290,9 @@ public class UploadActionTest
public void testArtifactUploadWithPomSuccessful()
throws Exception
{
- setUploadParameters( "1.0", null, new File( getBasedir(),
+ setUploadParameters( "1.0", null, new File( FileUtil.getBasedir(),
"target/test-classes/upload-artifact-test/artifact-to-be-uploaded.jar" ),
- new File( getBasedir(),
"target/test-classes/upload-artifact-test/pom.xml" ), false );
+ new File( FileUtil.getBasedir(),
"target/test-classes/upload-artifact-test/pom.xml" ), false );
ManagedRepositoryContent content = new
ManagedDefaultRepositoryContent();
content.setRepository( config.findManagedRepositoryById( REPOSITORY_ID
) );
@@ -324,9 +325,9 @@ public class UploadActionTest
public void testArtifactUploadWithClassifier()
throws Exception
{
- setUploadParameters( "1.0", "tests", new File( getBasedir(),
+ setUploadParameters( "1.0", "tests", new File( FileUtil.getBasedir(),
"target/test-classes/upload-artifact-test/artifact-to-be-uploaded.jar" ),
- new File( getBasedir(),
"target/test-classes/upload-artifact-test/pom.xml" ), false );
+ new File( FileUtil.getBasedir(),
"target/test-classes/upload-artifact-test/pom.xml" ), false );
ManagedRepositoryContent content = new
ManagedDefaultRepositoryContent();
content.setRepository( config.findManagedRepositoryById( REPOSITORY_ID
) );
@@ -371,7 +372,7 @@ public class UploadActionTest
public void testArtifactUploadGeneratePomSuccessful()
throws Exception
{
- setUploadParameters( "1.0", null, new File( getBasedir(),
+ setUploadParameters( "1.0", null, new File( FileUtil.getBasedir(),
"target/test-classes/upload-artifact-test/artifact-to-be-uploaded.jar" ),
null, true );
@@ -406,7 +407,7 @@ public class UploadActionTest
public void testArtifactUploadNoPomSuccessful()
throws Exception
{
- setUploadParameters( "1.0", null, new File( getBasedir(),
+ setUploadParameters( "1.0", null, new File( FileUtil.getBasedir(),
"target/test-classes/upload-artifact-test/artifact-to-be-uploaded.jar" ),
null, false );
@@ -483,7 +484,7 @@ public class UploadActionTest
public void testArtifactUploadFailedRepositoryNotFound()
throws Exception
{
- setUploadParameters( "1.0", null, new File( getBasedir(),
+ setUploadParameters( "1.0", null, new File( FileUtil.getBasedir(),
"target/test-classes/upload-artifact-test/artifact-to-be-uploaded.jar" ),
null, false );
@@ -511,7 +512,7 @@ public class UploadActionTest
public void testArtifactUploadSnapshots()
throws Exception
{
- setUploadParameters( "1.0-SNAPSHOT", null, new File( getBasedir(),
+ setUploadParameters( "1.0-SNAPSHOT", null, new File(
FileUtil.getBasedir(),
"target/test-classes/upload-artifact-test/artifact-to-be-uploaded.jar" ),
null, true );
@@ -583,7 +584,7 @@ public class UploadActionTest
// MRM-1353
// upload snapshot artifact again and check if build number was
incremented
setUploadParameters( "1.0-SNAPSHOT", null,
- new File( getBasedir(),
+ new File( FileUtil.getBasedir(),
"target/test-classes/upload-artifact-test/artifact-to-be-uploaded.jar" ), null,
true );
@@ -640,7 +641,7 @@ public class UploadActionTest
public void testChecksumIsCorrectWhenArtifactIsReUploaded()
throws Exception
{
- setUploadParameters( "1.0", null, new File( getBasedir(),
+ setUploadParameters( "1.0", null, new File( FileUtil.getBasedir(),
"target/test-classes/upload-artifact-test/artifact-to-be-uploaded.jar" ),
null, true );
@@ -672,7 +673,7 @@ public class UploadActionTest
verifyProjectMetadataChecksums( repoLocation );
// RE-upload artifact
- setUploadParameters( "1.0", null, new File( getBasedir(),
+ setUploadParameters( "1.0", null, new File( FileUtil.getBasedir(),
"target/test-classes/upload-artifact-test/artifact-to-be-reuploaded.jar" ),
null, true );
@@ -706,7 +707,7 @@ public class UploadActionTest
public void testUploadArtifactAlreadyExistingRedeploymentsBlocked()
throws Exception
{
- setUploadParameters( "1.0", null, new File( getBasedir(),
+ setUploadParameters( "1.0", null, new File( FileUtil.getBasedir(),
"target/test-classes/upload-artifact-test/artifact-to-be-uploaded.jar" ),
null, true );
@@ -722,7 +723,7 @@ public class UploadActionTest
String returnString = uploadAction.doUpload();
assertEquals( Action.SUCCESS, returnString );
- setUploadParameters( "1.0", null, new File( getBasedir(),
+ setUploadParameters( "1.0", null, new File( FileUtil.getBasedir(),
"target/test-classes/upload-artifact-test/artifact-to-be-uploaded.jar" ),
null, true );
@@ -746,7 +747,7 @@ public class UploadActionTest
public void testUploadArtifactAlreadyExistingRedeploymentsAllowed()
throws Exception
{
- setUploadParameters( "1.0", null, new File( getBasedir(),
+ setUploadParameters( "1.0", null, new File( FileUtil.getBasedir(),
"target/test-classes/upload-artifact-test/artifact-to-be-uploaded.jar" ),
null, true );
@@ -764,7 +765,7 @@ public class UploadActionTest
String returnString = uploadAction.doUpload();
assertEquals( Action.SUCCESS, returnString );
- setUploadParameters( "1.0", null, new File( getBasedir(),
+ setUploadParameters( "1.0", null, new File( FileUtil.getBasedir(),
"target/test-classes/upload-artifact-test/artifact-to-be-uploaded.jar" ),
null, true );
