You are viewing a plain text version of this content. The canonical link for it is here.
Posted to nmaven-commits@incubator.apache.org by si...@apache.org on 2007/05/11 05:24:51 UTC
svn commit: r537101 - in /incubator/nmaven/branches/SI_XPT/components:
dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/
dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/
dotnet-core/src/main/java/org/apache/maven/dotne...
Author: sisbell
Date: Thu May 10 22:24:50 2007
New Revision: 537101
URL: http://svn.apache.org/viewvc?view=rev&rev=537101
Log:
Removed unneeded MavenProject references that bled into the API.
Modified:
incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ApplicationConfig.java
incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java
incubator/nmaven/branches/SI_XPT/components/dotnet-core/src/main/java/org/apache/maven/dotnet/NMavenContext.java
incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/ExecutableContext.java
incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/RepositoryExecutableContext.java
incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java
incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/DefaultNetExecutable.java
incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/DefaultRepositoryNetExecutable.java
incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/ExecutableContextImpl.java
incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java
incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/RepositoryExecutableContextImpl.java
incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/ThreadedNetExecutable.java
Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ApplicationConfig.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ApplicationConfig.java?view=diff&rev=537101&r1=537100&r2=537101
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ApplicationConfig.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ApplicationConfig.java Thu May 10 22:24:50 2007
@@ -67,7 +67,8 @@
* @return the application config for the specified artifact
*/
public static ApplicationConfig createDefaultApplicationConfig( final Artifact artifact,
- final MavenProject project )
+ final File projectBaseDirectory,
+ final File projectBuildDirectory)
{
return new ApplicationConfig()
{
@@ -75,13 +76,13 @@
public String getConfigSourcePath()
{
return new File(
- project.getBasedir() + "/src/main/config/" + artifact.getArtifactId() + ".exe.config" )
+ projectBaseDirectory + "/src/main/config/" + artifact.getArtifactId() + ".exe.config" )
.getAbsolutePath();
}
public String getConfigDestinationPath()
{
- return project.getBuild().getDirectory() + File.separator + artifact.getArtifactId() +
+ return projectBuildDirectory + File.separator + artifact.getArtifactId() +
".exe.config";
}
};
Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java?view=diff&rev=537101&r1=537100&r2=537101
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java Thu May 10 22:24:50 2007
@@ -162,7 +162,8 @@
*/
public ApplicationConfig getApplicationConfigFor( Artifact artifact )
{
- return ApplicationConfig.Factory.createDefaultApplicationConfig( artifact, project );
+ return ApplicationConfig.Factory.createDefaultApplicationConfig( artifact, project.getBasedir(), new File(
+ project.getBuild().getDirectory() ) );
}
/**
@@ -172,11 +173,6 @@
public List<Artifact> getDirectDependenciesFor( Artifact artifact, List<ArtifactMatchPolicy> matchPolicies )
throws ArtifactException
{
- if ( project == null )
- {
- throw new ArtifactException( "NMAVEN-000-000: Artifact Context has not been initialized" );
- }
-
if ( artifact == null )
{
throw new ArtifactException( "NMAVEN-000-001: Cannot get dependenct artifacts of a null artifact" );
@@ -264,7 +260,7 @@
public List<Artifact> getAllNetArtifactsFromRepository( File repository )
{
- return null;
+ return null;
}
/**
Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-core/src/main/java/org/apache/maven/dotnet/NMavenContext.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-core/src/main/java/org/apache/maven/dotnet/NMavenContext.java?view=diff&rev=537101&r1=537100&r2=537101
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-core/src/main/java/org/apache/maven/dotnet/NMavenContext.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-core/src/main/java/org/apache/maven/dotnet/NMavenContext.java Thu May 10 22:24:50 2007
@@ -58,11 +58,4 @@
*/
Logger getLogger();
- /**
- * Returns Maven Project
- *
- * @return the Maven Project
- */
- MavenProject getMavenProject();
-
}
Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/ExecutableContext.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/ExecutableContext.java?view=diff&rev=537101&r1=537100&r2=537101
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/ExecutableContext.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/ExecutableContext.java Thu May 10 22:24:50 2007
@@ -78,12 +78,11 @@
*
* @param executableRequirement
* @param executableConfig
- * @param project the maven project
* @param capabilityMatcher
* @throws org.apache.maven.dotnet.PlatformUnsupportedException
*
*/
- void init( ExecutableRequirement executableRequirement, ExecutableConfig executableConfig, MavenProject project,
+ void init( ExecutableRequirement executableRequirement, ExecutableConfig executableConfig,
CapabilityMatcher capabilityMatcher )
throws PlatformUnsupportedException;
Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/RepositoryExecutableContext.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/RepositoryExecutableContext.java?view=diff&rev=537101&r1=537100&r2=537101
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/RepositoryExecutableContext.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/RepositoryExecutableContext.java Thu May 10 22:24:50 2007
@@ -51,9 +51,8 @@
* Initializes this context.
*
* @param executableConfig the executable config for this context
- * @param project the maven project
* @throws org.apache.maven.dotnet.InitializationException if the context cannot be initialized
*/
- void init( ExecutableConfig executableConfig, MavenProject project )
+ void init( ExecutableConfig executableConfig )
throws InitializationException;
}
Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java?view=diff&rev=537101&r1=537100&r2=537101
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java Thu May 10 22:24:50 2007
@@ -232,11 +232,6 @@
}
- public MavenProject getMavenProject()
- {
- return project;
- }
-
public Repository find( String repositoryName )
throws RepositoryNotFoundException
{
Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/DefaultNetExecutable.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/DefaultNetExecutable.java?view=diff&rev=537101&r1=537100&r2=537101
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/DefaultNetExecutable.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/DefaultNetExecutable.java Thu May 10 22:24:50 2007
@@ -22,7 +22,6 @@
import org.apache.maven.dotnet.executable.*;
import org.apache.maven.dotnet.NMavenContext;
import org.apache.maven.dotnet.vendor.Vendor;
-import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.logging.Logger;
import java.util.List;
@@ -39,8 +38,6 @@
protected ExecutableContext executableContext;
- private MavenProject project;
-
/**
* A logger for writing log messages
*/
@@ -118,7 +115,6 @@
public void init( NMavenContext nmavenContext )
{
this.executableContext = (ExecutableContext) nmavenContext;
- this.project = executableContext.getMavenProject();
this.logger = executableContext.getLogger();
}
}
Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/DefaultRepositoryNetExecutable.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/DefaultRepositoryNetExecutable.java?view=diff&rev=537101&r1=537100&r2=537101
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/DefaultRepositoryNetExecutable.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/DefaultRepositoryNetExecutable.java Thu May 10 22:24:50 2007
@@ -23,7 +23,6 @@
import org.apache.maven.dotnet.executable.*;
import org.apache.maven.dotnet.NMavenContext;
import org.apache.maven.dotnet.vendor.Vendor;
-import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.logging.Logger;
import java.util.List;
@@ -39,11 +38,6 @@
private RepositoryExecutableContext executableContext;
/**
- * The maven project
- */
- private MavenProject project;
-
- /**
* A logger for writing log messages
*/
private Logger logger;
@@ -142,7 +136,6 @@
public void init( NMavenContext nmavenContext )
{
this.executableContext = (RepositoryExecutableContext) nmavenContext;
- this.project = executableContext.getMavenProject();
this.logger = executableContext.getLogger();
}
}
Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/ExecutableContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/ExecutableContextImpl.java?view=diff&rev=537101&r1=537100&r2=537101
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/ExecutableContextImpl.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/ExecutableContextImpl.java Thu May 10 22:24:50 2007
@@ -19,19 +19,13 @@
package org.apache.maven.dotnet.executable.impl;
import org.apache.maven.dotnet.executable.*;
-import org.apache.maven.project.MavenProject;
import org.apache.maven.dotnet.registry.Repository;
import org.apache.maven.dotnet.registry.RepositoryRegistry;
import org.apache.maven.dotnet.PlatformUnsupportedException;
import org.apache.maven.dotnet.RepositoryNotFoundException;
-import org.apache.maven.dotnet.vendor.Vendor;
-import org.apache.maven.dotnet.vendor.VendorFactory;
-import org.apache.maven.dotnet.vendor.impl.SettingsRepository;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.logging.LogEnabled;
-import java.io.File;
-
/**
* Provides an implementation of the executable context.
*
@@ -41,11 +35,6 @@
implements ExecutableContext, LogEnabled
{
- /**
- * The maven project
- */
- private MavenProject project;
-
private ExecutableRequirement executableRequirement;
private RepositoryRegistry repositoryRegistry;
@@ -94,11 +83,6 @@
return netExecutable;
}
- public MavenProject getMavenProject()
- {
- return project;
- }
-
public CommandFilter getCommandFilter()
{
return commandFilter;
@@ -117,11 +101,9 @@
}
public void init( ExecutableRequirement executableRequirement, ExecutableConfig executableConfig,
- MavenProject project, CapabilityMatcher capabilityMatcher )
+ CapabilityMatcher capabilityMatcher )
throws PlatformUnsupportedException
{
-
- this.project = project;
this.executableRequirement = executableRequirement;
this.executableConfig = executableConfig;
Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java?view=diff&rev=537101&r1=537100&r2=537101
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java Thu May 10 22:24:50 2007
@@ -320,7 +320,7 @@
try
{
- repositoryExecutableContext.init( executableConfig, project );
+ repositoryExecutableContext.init( executableConfig );
}
catch ( InitializationException e )
{
@@ -404,7 +404,7 @@
logger.info( "NMAVEN-066-016: Did not find executable path, will try system path" );
}
executableConfig.setExecutionPaths( executablePaths );
- executableContext.init( executableRequirement, executableConfig, project, capabilityMatcher );
+ executableContext.init( executableRequirement, executableConfig, capabilityMatcher );
try
{
Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/RepositoryExecutableContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/RepositoryExecutableContextImpl.java?view=diff&rev=537101&r1=537100&r2=537101
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/RepositoryExecutableContextImpl.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/RepositoryExecutableContextImpl.java Thu May 10 22:24:50 2007
@@ -24,7 +24,6 @@
import org.apache.maven.dotnet.InitializationException;
import org.codehaus.plexus.logging.LogEnabled;
import org.codehaus.plexus.logging.Logger;
-import org.apache.maven.project.MavenProject;
import org.apache.maven.dotnet.registry.RepositoryRegistry;
import org.apache.maven.dotnet.registry.Repository;
@@ -37,11 +36,6 @@
implements RepositoryExecutableContext, LogEnabled
{
- /**
- * The maven project
- */
- private MavenProject project;
-
private RepositoryRegistry repositoryRegistry;
private NetExecutable netExecutable;
@@ -77,11 +71,6 @@
return netExecutable;
}
- public MavenProject getMavenProject()
- {
- return project;
- }
-
public Repository find( String repositoryName )
throws RepositoryNotFoundException
{
@@ -94,11 +83,10 @@
return repository;
}
- public void init( ExecutableConfig executableConfig, MavenProject project )
+ public void init( ExecutableConfig executableConfig )
throws InitializationException
{
this.executableConfig = executableConfig;
- this.project = project;
netExecutable = new DefaultRepositoryNetExecutable();
netExecutable.init( this );
}
Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/ThreadedNetExecutable.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/ThreadedNetExecutable.java?view=diff&rev=537101&r1=537100&r2=537101
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/ThreadedNetExecutable.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/ThreadedNetExecutable.java Thu May 10 22:24:50 2007
@@ -25,7 +25,6 @@
import org.apache.maven.dotnet.executable.CommandExecutor;
import org.apache.maven.dotnet.NMavenContext;
import org.apache.maven.dotnet.vendor.Vendor;
-import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.logging.Logger;
import java.util.List;
@@ -43,11 +42,6 @@
private ExecutableContext executableContext;
/**
- * The maven project
- */
- private MavenProject project;
-
- /**
* A logger for writing log messages
*/
private Logger logger;
@@ -127,7 +121,6 @@
public void init( NMavenContext nmavenContext )
{
this.executableContext = (ExecutableContext) nmavenContext;
- this.project = executableContext.getMavenProject();
this.logger = executableContext.getLogger();
}
}