Author: brett
Date: Tue Dec 6 04:44:10 2011
New Revision: 1210778
URL: http://svn.apache.org/viewvc?rev=1210778&view=rev
Log:
[NPANDAY-284] remove remaining references to ~/.m2/repository - in mojos, Maven
always makes sure a valid entry is passed in
Modified:
incubator/npanday/trunk/plugins/maven-aspx-plugin/src/main/java/npanday/plugin/aspx/AspxCompilerMojo.java
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/AbstractCompilerMojo.java
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/ComponentInitializerMojo.java
incubator/npanday/trunk/plugins/maven-install-plugin/src/main/java/npanday/plugin/install/InstallerMojo.java
incubator/npanday/trunk/plugins/maven-repository-plugin/src/main/java/npanday/plugin/repository/ArtifactManagerMojo.java
incubator/npanday/trunk/plugins/maven-repository-plugin/src/main/java/npanday/plugin/repository/RepositoryAssemblerMojo.java
incubator/npanday/trunk/plugins/maven-repository-plugin/src/main/java/npanday/plugin/repository/RepositoryRdfExporterMojo.java
incubator/npanday/trunk/plugins/maven-resolver-plugin/src/main/java/npanday/plugin/resolver/NetDependencyResolverMojo.java
incubator/npanday/trunk/plugins/maven-test-plugin/src/main/java/npanday/plugin/test/TesterMojo.java
Modified:
incubator/npanday/trunk/plugins/maven-aspx-plugin/src/main/java/npanday/plugin/aspx/AspxCompilerMojo.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-aspx-plugin/src/main/java/npanday/plugin/aspx/AspxCompilerMojo.java?rev=1210778&r1=1210777&r2=1210778&view=diff
==============================================================================
---
incubator/npanday/trunk/plugins/maven-aspx-plugin/src/main/java/npanday/plugin/aspx/AspxCompilerMojo.java
(original)
+++
incubator/npanday/trunk/plugins/maven-aspx-plugin/src/main/java/npanday/plugin/aspx/AspxCompilerMojo.java
Tue Dec 6 04:44:10 2011
@@ -181,11 +181,6 @@ public class AspxCompilerMojo
profileAssemblyPath.getAbsolutePath() );
}
- if ( localRepository == null )
- {
- localRepository = new File( System.getProperty( "user.home" ),
".m2/repository" );
- }
-
File tmpDir;
try
{
Modified:
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/AbstractCompilerMojo.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/AbstractCompilerMojo.java?rev=1210778&r1=1210777&r2=1210778&view=diff
==============================================================================
---
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/AbstractCompilerMojo.java
(original)
+++
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/AbstractCompilerMojo.java
Tue Dec 6 04:44:10 2011
@@ -1120,12 +1120,6 @@ public abstract class AbstractCompilerMo
throw new MojoExecutionException( "NPANDAY-900-012: Error reading
settings from " + settingsPath, e );
}
- if (localRepository == null)
- {
-
- localRepository = new
File(System.getProperty("user.home"), ".m2/repository");
- }
-
initializeDefaults();
try
Modified:
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/ComponentInitializerMojo.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/ComponentInitializerMojo.java?rev=1210778&r1=1210777&r2=1210778&view=diff
==============================================================================
---
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/ComponentInitializerMojo.java
(original)
+++
incubator/npanday/trunk/plugins/maven-compile-plugin/src/main/java/npanday/plugin/compile/ComponentInitializerMojo.java
Tue Dec 6 04:44:10 2011
@@ -77,11 +77,6 @@ public class ComponentInitializerMojo
{
long startTime = System.currentTimeMillis();
- if ( localRepository == null )
- {
- localRepository = new File( System.getProperty( "user.home" ),
".m2/repository" );
- }
-
try
{
assemblyResolver.resolveTransitivelyFor( project,
project.getDependencies(),
Modified:
incubator/npanday/trunk/plugins/maven-install-plugin/src/main/java/npanday/plugin/install/InstallerMojo.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-install-plugin/src/main/java/npanday/plugin/install/InstallerMojo.java?rev=1210778&r1=1210777&r2=1210778&view=diff
==============================================================================
---
incubator/npanday/trunk/plugins/maven-install-plugin/src/main/java/npanday/plugin/install/InstallerMojo.java
(original)
+++
incubator/npanday/trunk/plugins/maven-install-plugin/src/main/java/npanday/plugin/install/InstallerMojo.java
Tue Dec 6 04:44:10 2011
@@ -129,11 +129,6 @@ public class InstallerMojo
{
long startTime = System.currentTimeMillis();
- if ( localRepository == null )
- {
- localRepository = new File( System.getProperty( "user.home" ),
".m2/repository" );
- }
-
ProjectDao dao = (ProjectDao) daoRegistry.find( "dao:project" );
dao.init( artifactFactory, artifactResolver );
dao.openConnection();
Modified:
incubator/npanday/trunk/plugins/maven-repository-plugin/src/main/java/npanday/plugin/repository/ArtifactManagerMojo.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-repository-plugin/src/main/java/npanday/plugin/repository/ArtifactManagerMojo.java?rev=1210778&r1=1210777&r2=1210778&view=diff
==============================================================================
---
incubator/npanday/trunk/plugins/maven-repository-plugin/src/main/java/npanday/plugin/repository/ArtifactManagerMojo.java
(original)
+++
incubator/npanday/trunk/plugins/maven-repository-plugin/src/main/java/npanday/plugin/repository/ArtifactManagerMojo.java
Tue Dec 6 04:44:10 2011
@@ -76,11 +76,6 @@ public class ArtifactManagerMojo
public void execute()
throws MojoExecutionException, MojoFailureException
{
- if ( localRepository == null )
- {
- localRepository = new File( System.getProperty( "user.home" ),
".m2/repository" );
- }
-
String artifactValue = System.getProperty( "artifact" );
String[] tokens = artifactValue.split( "[:]" );
Modified:
incubator/npanday/trunk/plugins/maven-repository-plugin/src/main/java/npanday/plugin/repository/RepositoryAssemblerMojo.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-repository-plugin/src/main/java/npanday/plugin/repository/RepositoryAssemblerMojo.java?rev=1210778&r1=1210777&r2=1210778&view=diff
==============================================================================
---
incubator/npanday/trunk/plugins/maven-repository-plugin/src/main/java/npanday/plugin/repository/RepositoryAssemblerMojo.java
(original)
+++
incubator/npanday/trunk/plugins/maven-repository-plugin/src/main/java/npanday/plugin/repository/RepositoryAssemblerMojo.java
Tue Dec 6 04:44:10 2011
@@ -126,12 +126,6 @@ public class RepositoryAssemblerMojo
public void execute()
throws MojoExecutionException, MojoFailureException
{
-
- if ( localRepository == null )
- {
- localRepository = new File( System.getProperty( "user.home" ),
".m2/repository" );
- }
-
org.openrdf.repository.Repository rdfRepository = new SailRepository(
new MemoryStore( localRepository ) );
try
Modified:
incubator/npanday/trunk/plugins/maven-repository-plugin/src/main/java/npanday/plugin/repository/RepositoryRdfExporterMojo.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-repository-plugin/src/main/java/npanday/plugin/repository/RepositoryRdfExporterMojo.java?rev=1210778&r1=1210777&r2=1210778&view=diff
==============================================================================
---
incubator/npanday/trunk/plugins/maven-repository-plugin/src/main/java/npanday/plugin/repository/RepositoryRdfExporterMojo.java
(original)
+++
incubator/npanday/trunk/plugins/maven-repository-plugin/src/main/java/npanday/plugin/repository/RepositoryRdfExporterMojo.java
Tue Dec 6 04:44:10 2011
@@ -53,11 +53,6 @@ public class RepositoryRdfExporterMojo
public void execute()
throws MojoExecutionException, MojoFailureException
{
- if ( localRepository == null )
- {
- localRepository = new File( System.getProperty( "user.home" ),
".m2/repository" );
- }
-
org.openrdf.repository.Repository rdfRepository = new SailRepository(
new MemoryStore( localRepository ) );
try
{
Modified:
incubator/npanday/trunk/plugins/maven-resolver-plugin/src/main/java/npanday/plugin/resolver/NetDependencyResolverMojo.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-resolver-plugin/src/main/java/npanday/plugin/resolver/NetDependencyResolverMojo.java?rev=1210778&r1=1210777&r2=1210778&view=diff
==============================================================================
---
incubator/npanday/trunk/plugins/maven-resolver-plugin/src/main/java/npanday/plugin/resolver/NetDependencyResolverMojo.java
(original)
+++
incubator/npanday/trunk/plugins/maven-resolver-plugin/src/main/java/npanday/plugin/resolver/NetDependencyResolverMojo.java
Tue Dec 6 04:44:10 2011
@@ -122,11 +122,6 @@ public class NetDependencyResolverMojo
return;
}
- if ( localRepository == null )
- {
- localRepository = new File( System.getProperty( "user.home" ),
".m2/repository" );
- }
-
String profile = System.getProperty( "dependencyProfile" );
RepositoryRegistry repositoryRegistry;
Modified:
incubator/npanday/trunk/plugins/maven-test-plugin/src/main/java/npanday/plugin/test/TesterMojo.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-test-plugin/src/main/java/npanday/plugin/test/TesterMojo.java?rev=1210778&r1=1210777&r2=1210778&view=diff
==============================================================================
---
incubator/npanday/trunk/plugins/maven-test-plugin/src/main/java/npanday/plugin/test/TesterMojo.java
(original)
+++
incubator/npanday/trunk/plugins/maven-test-plugin/src/main/java/npanday/plugin/test/TesterMojo.java
Tue Dec 6 04:44:10 2011
@@ -295,11 +295,6 @@ extends AbstractMojo
return;
}
- if ( localRepository == null )
- {
- localRepository = new File( System.getProperty( "user.home" ),
".m2/repository" );
- }
-
try
{
assemblyResolver.resolveTransitivelyFor( project,
project.getDependencies(),
