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/07/24 10:57:49 UTC
svn commit: r559007 - in /incubator/nmaven/branches/SI_GAC:
components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/
components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/
components/dotnet-artifact/src/main/r...
Author: sisbell
Date: Tue Jul 24 03:57:47 2007
New Revision: 559007
URL: http://svn.apache.org/viewvc?view=rev&rev=559007
Log:
Removed the various references to mutiple repo formats. Cleaned up the old references to the maven resolver.
Removed:
incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/AssemblyRepositoryLayout.java
incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/GacRepositoryLayout.java
incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/UacRepositoryLayout.java
incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/test/java/org/apache/maven/dotnet/artifact/AssemblyRepositoryLayoutTest.java
Modified:
incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactContext.java
incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactMatchPolicy.java
incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/AssemblyResolver.java
incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java
incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/AssemblyResolverImpl.java
incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/resources/META-INF/plexus/components.xml
incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ProjectDao.java
incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImpl.java
incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImplTest.java
incubator/nmaven/branches/SI_GAC/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java
incubator/nmaven/branches/SI_GAC/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java
incubator/nmaven/branches/SI_GAC/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml
incubator/nmaven/branches/SI_GAC/plugins/maven-deploy-plugin/src/main/java/org/apache/maven/dotnet/plugins/DeployFileMojo.java
incubator/nmaven/branches/SI_GAC/plugins/maven-fxcop-plugin/src/main/java/org/apache/maven/dotnet/plugin/fxcop/FxCopAggregateMojo.java
incubator/nmaven/branches/SI_GAC/plugins/maven-fxcop-plugin/src/main/java/org/apache/maven/dotnet/plugin/fxcop/FxCopMojo.java
incubator/nmaven/branches/SI_GAC/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.java
incubator/nmaven/branches/SI_GAC/plugins/maven-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/test/TesterMojo.java
incubator/nmaven/branches/SI_GAC/plugins/maven-webapp-plugin/src/main/java/org/apache/maven/dotnet/plugin/webapp/NetAchiverMojo.java
incubator/nmaven/branches/SI_GAC/plugins/pom.xml
Modified: incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactContext.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactContext.java?view=diff&rev=559007&r1=559006&r2=559007
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactContext.java (original)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactContext.java Tue Jul 24 03:57:47 2007
@@ -40,19 +40,6 @@
String ROLE = ArtifactContext.class.getName();
/**
- * Returns the dependencies that exist directly within the pom (no transitive dependencies) for the specified artifact.
- *
- * @param artifact the artifact from which to get the direct dependencies. This value should not be null.
- * @param matchPolicies the list of policies for matching artifacts. This list may be null or empty, in which case
- * this method matches all dependencies for the given artifact.
- * @return the list of dependencies that exist directly within the pom (no transitive dependencies)
- * for the given artifact and match policies. This list may not be null.
- * @throws ArtifactException if there is a problem in matching the dependencies of the specified artifact
- */
- List<Artifact> getDirectDependenciesFor( Artifact artifact, List<ArtifactMatchPolicy> matchPolicies )
- throws ArtifactException;
-
- /**
* Returns the list of .NET module dependency artifacts that exist directly within the pom for the specified artifact
* (no transitive dependencies). This is a convenience method that has the same behavior as
* <code>getDirectDependenciesFor</code> but adds a .netmodule match policy. To get net modules, with additional match policies,
Modified: incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactMatchPolicy.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactMatchPolicy.java?view=diff&rev=559007&r1=559006&r2=559007
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactMatchPolicy.java (original)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactMatchPolicy.java Tue Jul 24 03:57:47 2007
@@ -24,7 +24,6 @@
* Provides a way for a developer to implement custom match policies for an artifact.
*
* @author Shane Isbell
- * @see ArtifactContext#getDirectDependenciesFor
*/
public interface ArtifactMatchPolicy
{
Modified: incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/AssemblyResolver.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/AssemblyResolver.java?view=diff&rev=559007&r1=559006&r2=559007
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/AssemblyResolver.java (original)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/AssemblyResolver.java Tue Jul 24 03:57:47 2007
@@ -26,6 +26,7 @@
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import java.util.List;
+import java.io.File;
/**
* Provides services for resolving .NET assembly artifacts.
@@ -43,7 +44,7 @@
/**
* Resolves transitive dependencies for the project.
*
- * @param project the maven project
+ * @param mavenProject
* @param sourceArtifact the artifact to which the resolved dependencies belong
* @param dependencies the list of dependencies of the specified artifact
* @param remoteArtifactRepositories
@@ -57,8 +58,8 @@
* @throws ArtifactResolutionException
* @throws ArtifactNotFoundException
*/
- void resolveTransitivelyFor( MavenProject project, Artifact sourceArtifact, List<Dependency> dependencies,
- List<ArtifactRepository> remoteArtifactRepositories, ArtifactRepository localArtifactRepository,
+ void resolveTransitivelyFor( MavenProject mavenProject, Artifact sourceArtifact, List<Dependency> dependencies,
+ List<ArtifactRepository> remoteArtifactRepositories, File localArtifactRepository,
boolean addResolvedDependenciesToProject )
throws ArtifactResolutionException, ArtifactNotFoundException;
}
Modified: incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java?view=diff&rev=559007&r1=559006&r2=559007
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java (original)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java Tue Jul 24 03:57:47 2007
@@ -29,14 +29,10 @@
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.DefaultArtifactRepository;
-import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
import org.apache.maven.artifact.resolver.*;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.model.Dependency;
/**
* Provides an implemenation of the <code>ArtifactContext</code> interface.
@@ -48,11 +44,6 @@
{
/**
- * A layout component used in the creation of a .NET artifact repository.
- */
- private ArtifactRepositoryLayout layout;
-
- /**
* Metadata component used by the <code>ArtifactResolver</code>.
*/
private ArtifactMetadataSource metadata;
@@ -73,12 +64,6 @@
private RepositoryRegistry repositoryRegistry;
/**
- * An artifact resolver component for locating artifacts and pulling them into the local repo if they do not
- * already exist.
- */
- private ArtifactResolver artifactResolver;
-
- /**
* The maven project
*/
private MavenProject project;
@@ -136,10 +121,9 @@
}
repository.init( artifactFactory );
List<Artifact> artifacts = repository.getArtifactsFor( groupId, artifactId, version, type );
- AssemblyRepositoryLayout layout = new AssemblyRepositoryLayout();
for ( Artifact artifact : artifacts )
{
- artifact.setFile( new File( localRepository + File.separator + layout.pathOf( artifact ) ) );
+ artifact.setFile( PathUtil.getUserAssemblyCacheFileFor( artifact, new File( localRepository ) ) );
}
return artifacts;
}
@@ -172,86 +156,10 @@
project.getBuild().getDirectory() ) );
}
- /**
- * @see ArtifactContext#getDirectDependenciesFor(org.apache.maven.artifact.Artifact,
- * java.util.List<org.apache.maven.dotnet.artifact.ArtifactMatchPolicy>)
- */
- public List<Artifact> getDirectDependenciesFor( Artifact artifact, List<ArtifactMatchPolicy> matchPolicies )
- throws ArtifactException
- {
- if ( artifact == null )
- {
- throw new ArtifactException( "NMAVEN-000-001: Cannot get dependenct artifacts of a null artifact" );
- }
-
- if ( matchPolicies == null )
- {
- matchPolicies = new ArrayList<ArtifactMatchPolicy>();
- }
-
- List<Artifact> dependencies = new ArrayList<Artifact>();
- ArtifactResolutionResult result;
- ArtifactRepository ar = new DefaultArtifactRepository( "local", "file://" + localRepository, layout );
-
- Set depSet = new HashSet();
- List<Dependency> dep = project.getDependencies();
-
- for ( Dependency dependency : dep )
- {
- String scope = ( dependency.getScope() == null ) ? Artifact.SCOPE_COMPILE : dependency.getScope();
- Artifact art = artifactFactory.createDependencyArtifact( dependency.getGroupId(),
- dependency.getArtifactId(),
- VersionRange.createFromVersion(
- dependency.getVersion() ),
- dependency.getType(), dependency.getClassifier(),
- scope, null );
- if ( !art.getType().startsWith( "gac" ) )
- {
- depSet.add( art );
- }
- }
-
- try
- {
- result = artifactResolver.resolveTransitively( depSet, project.getArtifact(),
- project.getRemoteArtifactRepositories(), ar, metadata );
- }
- catch ( ArtifactResolutionException e )
- {
- throw new ArtifactException( "NMAVEN-000-002: Failed to Resolve Artifact: File = " + artifact.getFile() +
- ", Local Repository = " + localRepository, e );
- }
- catch ( ArtifactNotFoundException e )
- {
- throw new ArtifactException( "NMAVEN-000-003: Artifact Not Found: File = " + artifact.getFile() +
- ", Local Repository = " + localRepository, e );
- }
- Set<ResolutionNode> nodes = result.getArtifactResolutionNodes();
- if ( nodes.size() == 0 )
- {
- logger.debug(
- "NMAVEN-000-004: Project has no direct or transitive dependencies. " + project.getArtifacts().size() );
- }
-
- for ( ResolutionNode node : nodes )
- {
- Artifact nodeArtifact = node.getArtifact();
- boolean isMatched = matchArtifacts( nodeArtifact, matchPolicies );
- logger.debug( "NMAVEN-000-005: Artifact = " + nodeArtifact.getFile().getAbsolutePath() + ", Depth = " +
- node.getDepth() + ", Matches Policies = " + isMatched );
- if ( isMatched && node.getDepth() == 1 )
- {
- dependencies.add( nodeArtifact );
- }
- }
-
- logger.debug( "NMAVEN-000-006: Resolved Artifact Dependencies: Count = " + dependencies.size() );
- return dependencies;
- }
-
- /**
+ /**
* @see ArtifactContext#getNetModulesFor(org.apache.maven.artifact.Artifact)
*/
+ //TODO: support temporarily removed
public List<Artifact> getNetModulesFor( Artifact artifact )
throws ArtifactException
{
@@ -261,7 +169,8 @@
}
List<ArtifactMatchPolicy> matchPolicies = new ArrayList<ArtifactMatchPolicy>();
matchPolicies.add( new NetModuleMatchPolicy() );
- return getDirectDependenciesFor( artifact, matchPolicies );
+ return null;
+ //return getDirectDependenciesFor( artifact, matchPolicies );
}
public List<Artifact> getAllNetArtifactsFromRepository( File repository )
Modified: incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java?view=diff&rev=559007&r1=559006&r2=559007
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java (original)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java Tue Jul 24 03:57:47 2007
@@ -19,25 +19,21 @@
package org.apache.maven.dotnet.artifact.impl;
import org.apache.maven.dotnet.artifact.ArtifactContext;
-import org.apache.maven.dotnet.artifact.AssemblyRepositoryLayout;
import org.apache.maven.dotnet.artifact.ApplicationConfig;
import org.apache.maven.dotnet.artifact.ArtifactType;
import org.apache.maven.dotnet.artifact.NetDependencyMatchPolicy;
import org.apache.maven.dotnet.artifact.NetDependenciesRepository;
import org.apache.maven.dotnet.artifact.AssemblyResolver;
-import org.apache.maven.dotnet.artifact.UacRepositoryLayout;
+import org.apache.maven.dotnet.artifact.PathUtil;
import org.apache.maven.dotnet.registry.RepositoryRegistry;
import org.apache.maven.dotnet.model.netdependency.NetDependency;
import org.apache.maven.dotnet.dao.ProjectDao;
import org.apache.maven.project.MavenProject;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.versioning.VersionRange;
-import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
-import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
-import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.installer.ArtifactInstallationException;
@@ -58,7 +54,6 @@
import java.io.IOException;
import java.io.FileWriter;
import java.io.FileReader;
-import java.io.FileNotFoundException;
import java.util.List;
import java.util.ArrayList;
import java.util.Set;
@@ -100,11 +95,6 @@
private ArtifactRepository artifactRepository;
/**
- * The default repository layout for .NET artifacts. This is used in the construction of the artifact repository.
- */
- private AssemblyRepositoryLayout assemblyRepositoryLayout;
-
- /**
* A logger for writing log messages
*/
private Logger logger;
@@ -171,11 +161,8 @@
matchPolicies.add( new ProfileMatchPolicy( profile ) );
dependencies.addAll( repository.getDependenciesFor( matchPolicies ) );
- ArtifactRepository localArtifactRepository = new DefaultArtifactRepository( "local", "file://" +
- localRepository.getAbsolutePath(), new AssemblyRepositoryLayout() );
-
assemblyResolver.resolveTransitivelyFor( project, project.getArtifact(), dependencies,
- remoteArtifactRepositories, localArtifactRepository, false );
+ remoteArtifactRepositories, localRepository, false );
//Do Library Installs for Net Dependencies
matchPolicies = new ArrayList<NetDependencyMatchPolicy>();
@@ -200,7 +187,7 @@
"jar" );
try
{
- resolver.resolve( javaBindingArtifact, remoteArtifactRepositories, localArtifactRepo);
+ resolver.resolve( javaBindingArtifact, remoteArtifactRepositories, localArtifactRepo );
}
catch ( ArtifactResolutionException e )
{
@@ -230,9 +217,7 @@
dependency.getType(),
dependency.getClassifier(), scope,
null );
- artifactDependency.setFile(
- new File( localRepository.getParentFile(), new UacRepositoryLayout().pathOf( artifactDependency ) ) );
-
+ artifactDependency.setFile( PathUtil.getUserAssemblyCacheFileFor( artifactDependency, localRepository ) );
artifactDependencies.add( artifactDependency );
}
@@ -288,8 +273,7 @@
File artifactFile = artifact.getFile();
try
{
- FileUtils.copyFile( artifactFile, new File( localRepository.getParentFile(),
- new UacRepositoryLayout().pathOf( artifact ) ) );
+ FileUtils.copyFile( artifactFile, PathUtil.getUserAssemblyCacheFileFor( artifact, localRepository ) );
}
catch ( IOException e )
{
@@ -329,7 +313,7 @@
try
{
- dao.storeModelAndResolveDependencies( model, pomFile.getParentFile(), new ArrayList<ArtifactRepository>() );
+ dao.storeModelAndResolveDependencies( model, pomFile.getParentFile(), null, new ArrayList<ArtifactRepository>() );
}
catch ( java.io.IOException e )
{
@@ -379,9 +363,6 @@
this.remoteArtifactRepositories = remoteArtifactRepositories;
this.localRepository = localRepository;
this.artifactContext = artifactContext;
- this.assemblyRepositoryLayout = new AssemblyRepositoryLayout();
- artifactRepository = new DefaultArtifactRepository( "local", "file://" + localRepository.getAbsolutePath(),
- assemblyRepositoryLayout );
}
private class ExecutableAndNetPluginAndAddinMatchPolicy
Modified: incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/AssemblyResolverImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/AssemblyResolverImpl.java?view=diff&rev=559007&r1=559006&r2=559007
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/AssemblyResolverImpl.java (original)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/AssemblyResolverImpl.java Tue Jul 24 03:57:47 2007
@@ -27,7 +27,6 @@
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
-import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
import org.apache.maven.model.Dependency;
@@ -38,6 +37,7 @@
import java.util.Set;
import java.util.HashSet;
import java.util.List;
+import java.io.File;
/**
* Provides a way to resolve transitive assemblies that do not have versions within their file name.
@@ -154,7 +154,7 @@
public void resolveTransitivelyFor( MavenProject mavenProject, Artifact sourceArtifact,
List<Dependency> dependencies,
List<ArtifactRepository> remoteArtifactRepositories,
- ArtifactRepository localArtifactRepository,
+ File localArtifactRepository,
boolean addResolvedDependenciesToProject )
throws ArtifactResolutionException, ArtifactNotFoundException
{
@@ -206,7 +206,8 @@
Set<Artifact> artifactDependencies = new HashSet<Artifact>();
try
{
- artifactDependencies = dao.storeProjectAndResolveDependencies( project, remoteArtifactRepositories );
+ artifactDependencies =
+ dao.storeProjectAndResolveDependencies( project, localArtifactRepository, remoteArtifactRepositories );
}
catch ( java.io.IOException e )
{
@@ -224,14 +225,5 @@
mavenProject.setDependencyArtifacts( artifactDependencies );
}
- }
-
- private static class GacFilter
- implements ArtifactFilter
- {
- public boolean include( org.apache.maven.artifact.Artifact artifact )
- {
- return !artifact.getType().startsWith( "gac" );
- }
}
}
Modified: incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/resources/META-INF/plexus/components.xml?view=diff&rev=559007&r1=559006&r2=559007
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/resources/META-INF/plexus/components.xml (original)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/resources/META-INF/plexus/components.xml Tue Jul 24 03:57:47 2007
@@ -99,19 +99,10 @@
</configuration>
</component>
<component>
- <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
- <role-hint>dummy</role-hint>
- <implementation>org.apache.maven.dotnet.artifact.DummyResolver</implementation>
- </component>
- <component>
<role>org.apache.maven.dotnet.artifact.ArtifactContext</role>
<implementation>org.apache.maven.dotnet.artifact.impl.ArtifactContextImpl</implementation>
<requirements>
<requirement>
- <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
- <role-hint>dummy</role-hint>
- </requirement>
- <requirement>
<role>org.apache.maven.artifact.metadata.ArtifactMetadataSource</role>
</requirement>
<requirement>
@@ -124,10 +115,6 @@
<role>org.apache.maven.dotnet.registry.RepositoryRegistry</role>
</requirement>
<requirement>
- <role>org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout</role>
- <role-hint>net</role-hint>
- </requirement>
- <requirement>
<role>org.apache.maven.artifact.handler.manager.ArtifactHandlerManager</role>
</requirement>
<requirement>
@@ -148,7 +135,6 @@
</requirement>
<requirement>
<role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
- <role-hint>dummy</role-hint>
</requirement>
<requirement>
<role>org.apache.maven.artifact.metadata.ArtifactMetadataSource</role>
@@ -163,11 +149,6 @@
<role>org.apache.maven.dotnet.registry.DataAccessObjectRegistry</role>
</requirement>
</requirements>
- </component>
- <component>
- <role>org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout</role>
- <implementation>org.apache.maven.dotnet.artifact.AssemblyRepositoryLayout</implementation>
- <role-hint>net</role-hint>
</component>
<component>
<role>org.apache.maven.dotnet.artifact.AssemblyResolver</role>
Modified: incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ProjectDao.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ProjectDao.java?view=diff&rev=559007&r1=559006&r2=559007
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ProjectDao.java (original)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ProjectDao.java Tue Jul 24 03:57:47 2007
@@ -30,10 +30,12 @@
Project getProjectFor( MavenProject mavenProject )
throws IOException;
- Set<Artifact> storeProjectAndResolveDependencies( Project project, List<ArtifactRepository> artifactRepositories )
+ Set<Artifact> storeProjectAndResolveDependencies( Project project, File localRepository,
+ List<ArtifactRepository> artifactRepositories )
throws IOException;
Set<Artifact> storeModelAndResolveDependencies( Model model, File pomFileDirectory,
+ File localArtifactRepository,
List<ArtifactRepository> artifactRepositories )
throws IOException;
Modified: incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImpl.java?view=diff&rev=559007&r1=559006&r2=559007
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImpl.java (original)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImpl.java Tue Jul 24 03:57:47 2007
@@ -120,8 +120,9 @@
tupleQuery.setBinding( ProjectUri.ARTIFACT_ID.getObjectBinding(),
valueFactory.createLiteral( artifactId ) );
tupleQuery.setBinding( ProjectUri.VERSION.getObjectBinding(), valueFactory.createLiteral( version ) );
-
+ long startQueryTime = System.currentTimeMillis();
TupleQueryResult result = tupleQuery.evaluate();
+ logger.info( "Get Project Query: Time = " + ( System.currentTimeMillis() - startQueryTime ) );
if ( !result.hasNext() )
{
if ( artifactType != null && artifactType.startsWith( "gac" ) )
@@ -217,7 +218,7 @@
mavenProject.getArtifact().getType(), mavenProject.getArtifact().getClassifier() );
}
- public Set<Artifact> storeProjectAndResolveDependencies( Project project,
+ public Set<Artifact> storeProjectAndResolveDependencies( Project project, File localRepository,
List<ArtifactRepository> artifactRepositories )
throws IOException, IllegalArgumentException
{
@@ -240,7 +241,6 @@
ValueFactory valueFactory = rdfRepository.getValueFactory();
URI id =
valueFactory.createURI( project.getGroupId() + ":" + project.getArtifactId() + ":" + project.getVersion() );
- //BNode id = valueFactory.createBNode();
URI groupId = valueFactory.createURI( ProjectUri.GROUP_ID.getPredicate() );
URI artifactId = valueFactory.createURI( ProjectUri.ARTIFACT_ID.getPredicate() );
URI version = valueFactory.createURI( ProjectUri.VERSION.getPredicate() );
@@ -283,7 +283,7 @@
":" + parentProject.getVersion() );
repositoryConnection.add( id, parent, pid );
artifactDependencies.addAll(
- storeProjectAndResolveDependencies( parentProject, artifactRepositories ) );
+ storeProjectAndResolveDependencies( parentProject, null, artifactRepositories ) );
}
for ( ProjectDependency projectDependency : project.getProjectDependencies() )
@@ -315,7 +315,7 @@
ProjectFactory.createArtifactFrom( projectDependency, artifactFactory );
artifactDependencies.add( assembly );
artifactDependencies.addAll( this.storeProjectAndResolveDependencies(
- projectDependency, artifactRepositories ) );
+ projectDependency, null, artifactRepositories ) );
}
}
catch ( IOException e )
@@ -412,7 +412,7 @@
{
//System.out.println( "Storing dependency: Artifact Id = " + model.getArtifactId() );
artifactDependencies.addAll( storeProjectAndResolveDependencies(
- ProjectFactory.createProjectFrom( model, null ), artifactRepositories ) );
+ ProjectFactory.createProjectFrom( model, null ), localRepository, artifactRepositories ) );
}
logger.info( "ProjectDao.storeProjectAndResolveDependencies - Artifact Id = " + project.getArtifactId() +
", Time = " + ( System.currentTimeMillis() - startTime ) + ", Count = " + storeCounter++ );
@@ -420,11 +420,12 @@
}
public Set<Artifact> storeModelAndResolveDependencies( Model model, File pomFileDirectory,
+ File localArtifactRepository,
List<ArtifactRepository> artifactRepositories )
throws IOException
{
return storeProjectAndResolveDependencies( ProjectFactory.createProjectFrom( model, pomFileDirectory ),
- artifactRepositories );
+ localArtifactRepository, artifactRepositories );
}
public String getClassName()
@@ -474,6 +475,7 @@
TupleQuery tq = repositoryConnection.prepareTupleQuery( QueryLanguage.SERQL, query );
tq.setBinding( "x", classifierUri );
TupleQueryResult result = tq.evaluate();
+
while ( result.hasNext() )
{
BindingSet set = result.next();
@@ -517,7 +519,9 @@
// "SELECT DISTINCT * FROM {x} <http://maven.apache.org/artifact/groupId> {groupIdValue}; <http://maven.apache.org/artifact/artifactId> {artifactIdValue}; <http://maven.apache.org/artifact/version> {versionValue}";
TupleQuery tq = repositoryConnection.prepareTupleQuery( QueryLanguage.SERQL, query );
tq.setBinding( "x", dependencyUri );
+ long startQueryTime = System.currentTimeMillis();
TupleQueryResult dependencyResult = tq.evaluate();
+ logger.info( "Query Dependencies: Time = " + ( System.currentTimeMillis() - startQueryTime ) );
while ( dependencyResult.hasNext() )
{
ProjectDependency projectDependency = new ProjectDependency();
Modified: incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImplTest.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImplTest.java?view=diff&rev=559007&r1=559006&r2=559007
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImplTest.java (original)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImplTest.java Tue Jul 24 03:57:47 2007
@@ -52,7 +52,7 @@
Set<Artifact> artifacts = null;
try
{
- artifacts = dao.storeProjectAndResolveDependencies( project, new ArrayList<ArtifactRepository>() );
+ artifacts = dao.storeProjectAndResolveDependencies( project, null, new ArrayList<ArtifactRepository>() );
}
catch ( java.io.IOException e )
{
@@ -121,7 +121,7 @@
Set<Artifact> artifacts = null;
try
{
- artifacts = dao.storeProjectAndResolveDependencies( project1, new ArrayList<ArtifactRepository>() );
+ artifacts = dao.storeProjectAndResolveDependencies( project1, null, new ArrayList<ArtifactRepository>() );
}
catch ( java.io.IOException e )
{
@@ -170,7 +170,7 @@
try
{
- artifacts = dao.storeProjectAndResolveDependencies( project, new ArrayList<ArtifactRepository>() );
+ artifacts = dao.storeProjectAndResolveDependencies( project, null, new ArrayList<ArtifactRepository>() );
}
catch ( java.io.IOException e )
{
@@ -211,7 +211,7 @@
Set<Artifact> artifacts = null;
try
{
- artifacts = dao.storeProjectAndResolveDependencies( project, new ArrayList<ArtifactRepository>() );
+ artifacts = dao.storeProjectAndResolveDependencies( project, null, new ArrayList<ArtifactRepository>() );
}
catch ( java.io.IOException e )
{
@@ -247,7 +247,7 @@
project.setVersion( "0.14.0.0" );
try
{
- dao.storeProjectAndResolveDependencies( project, new ArrayList<ArtifactRepository>() );
+ dao.storeProjectAndResolveDependencies( project, null, new ArrayList<ArtifactRepository>() );
}
catch ( java.io.IOException e )
{
Modified: incubator/nmaven/branches/SI_GAC/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java?view=diff&rev=559007&r1=559006&r2=559007
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java (original)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java Tue Jul 24 03:57:47 2007
@@ -27,7 +27,7 @@
import org.apache.maven.dotnet.vendor.IllegalStateException;
import org.apache.maven.dotnet.registry.RepositoryRegistry;
import org.apache.maven.dotnet.artifact.ArtifactContext;
-import org.apache.maven.dotnet.artifact.AssemblyRepositoryLayout;
+import org.apache.maven.dotnet.artifact.PathUtil;
import org.apache.maven.dotnet.InitializationException;
import org.apache.maven.dotnet.PlatformUnsupportedException;
import org.apache.maven.project.MavenProject;
@@ -150,8 +150,8 @@
Artifact artifact = artifactContext.getArtifactByID( netDependencyId );
if ( artifact != null )
{
- AssemblyRepositoryLayout layout = new AssemblyRepositoryLayout();
- File artifactPath = new File( compilerConfig.getLocalRepository(), layout.pathOf( artifact ) );
+ File artifactPath =
+ PathUtil.getPrivateApplicationBaseFileFor( artifact, compilerConfig.getLocalRepository() );
executionPaths.add( artifactPath.getParentFile().getAbsolutePath() );
}
}
@@ -188,8 +188,9 @@
"NMAVEN-066-021: Could not locate the plugin: GroupId = " + groupId + ", ArtifactId = " + artifactId );
}
- AssemblyRepositoryLayout layout = new AssemblyRepositoryLayout();
- File artifactPath = new File( localRepository + File.separator + layout.pathOf( artifact ) );
+ //AssemblyRepositoryLayout layout = new AssemblyRepositoryLayout();
+ File artifactPath = PathUtil.getPrivateApplicationBaseFileFor( artifact, new File( localRepository ) );
+
List<String> commands = new ArrayList<String>();
commands.add( "parameterFile=" + parameterFile.getAbsolutePath() );
commands.add( "assemblyFile=" + artifactPath.getAbsolutePath() );
@@ -197,16 +198,13 @@
Artifact pluginLoaderArtifact =
artifactContext.getArtifactsFor( "NMaven.Plugin", "NMaven.Plugin.Loader", null, null ).get( 0 );
- artifactPath = new File( localRepository + File.separator + layout.pathOf( pluginLoaderArtifact ) );
+ artifactPath = PathUtil.getPrivateApplicationBaseFileFor( pluginLoaderArtifact, new File( localRepository ) );
commands.add( "startProcessAssembly=" + artifactPath.getAbsolutePath() );
return getNetExecutableFromRepository( "NMaven.Plugin", "NMaven.Plugin.Runner", vendorInfo,
new File( localRepository ), commands, false );
}
- /**
- * @see NetExecutableFactory#getNetExecutableFromRepository(String, String, org.apache.maven.dotnet.vendor.VendorInfo, String, java.util.List<java.lang.String>, boolean)
- */
public NetExecutable getNetExecutableFromRepository( String groupId, String artifactId, VendorInfo vendorInfo,
File localRepository, List<String> commands,
boolean isIsolatedAppDomain )
@@ -229,13 +227,12 @@
groupId + ", ArtifactId = " + artifactId );
}
- AssemblyRepositoryLayout layout = new AssemblyRepositoryLayout();
- File artifactPath = new File( localRepository + File.separator + layout.pathOf( artifact ) );
+ File artifactPath = PathUtil.getPrivateApplicationBaseFileFor( artifact, localRepository );
commands.add( "startProcessAssembly=" + artifactPath.getAbsolutePath() );
-
- String pluginArtifactPath = new File( localRepository + File.separator + layout.pathOf(
- artifactContext.getArtifactsFor( "NMaven.Plugin", "NMaven.Plugin", null, null ).get(
- 0 ) ) ).getAbsolutePath();
+ //TODO: Replace
+ String pluginArtifactPath = PathUtil.getPrivateApplicationBaseFileFor(
+ artifactContext.getArtifactsFor( "NMaven.Plugin", "NMaven.Plugin", null, null ).get( 0 ),
+ localRepository ).getAbsolutePath();
commands.add( "pluginArtifactPath=" + pluginArtifactPath );
return getNetExecutableFromRepository( "NMaven.Plugin", "NMaven.Plugin.Runner", vendorInfo, localRepository,
@@ -271,8 +268,7 @@
logger.debug( "NMAVEN-066-003: Found Vendor: " + vendorInfo );
- AssemblyRepositoryLayout layout = new AssemblyRepositoryLayout();
- File artifactPath = new File( localRepository + File.separator + layout.pathOf( artifact ) );
+ File artifactPath = PathUtil.getPrivateApplicationBaseFileFor( artifact, localRepository );
List<String> modifiedCommands = new ArrayList<String>();
String exe = null;
if ( vendorInfo.getVendor().equals( Vendor.MONO ) )
@@ -285,7 +281,7 @@
if ( new File( executablePath.getAbsolutePath(), "mono.exe" ).exists() )
{
exe = new File( executablePath.getAbsolutePath(), "mono.exe" ).getAbsolutePath();
- commands.add( "vendor=MONO");//if forked process, it needs to know.
+ commands.add( "vendor=MONO" );//if forked process, it needs to know.
break;
}
}
@@ -297,7 +293,7 @@
"NMAVEN-066-005: Executable path for mono does not exist. Will attempt to execute MONO using" +
" the main PATH variable." );
exe = "mono";
- commands.add( "vendor=MONO");//if forked process, it needs to know.
+ commands.add( "vendor=MONO" );//if forked process, it needs to know.
}
modifiedCommands.add( artifactPath.getAbsolutePath() );
for ( String command : commands )
Modified: incubator/nmaven/branches/SI_GAC/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java?view=diff&rev=559007&r1=559006&r2=559007
==============================================================================
--- incubator/nmaven/branches/SI_GAC/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java (original)
+++ incubator/nmaven/branches/SI_GAC/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java Tue Jul 24 03:57:47 2007
@@ -23,13 +23,11 @@
import org.apache.maven.project.MavenProject;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.DefaultArtifactRepository;
import org.apache.maven.dotnet.InitializationException;
import org.apache.maven.dotnet.assembler.AssemblerContext;
import org.apache.maven.dotnet.artifact.AssemblyResolver;
-import org.apache.maven.dotnet.artifact.AssemblyRepositoryLayout;
+
import java.io.File;
@@ -56,7 +54,7 @@
* @parameter expression="${settings.localRepository}"
* @readonly
*/
- private String localRepository;
+ private File localRepository;
/**
* @parameter expression="${project.file}"
@@ -97,7 +95,7 @@
if ( localRepository == null )
{
- localRepository = new File( System.getProperty( "user.home" ), ".m2/repository" ).getAbsolutePath();
+ localRepository = new File( System.getProperty( "user.home" ), ".m2/repository" );
}
/*
for(String id : daoRegistry.getDaoIds())
@@ -115,13 +113,11 @@
System.out.println(p1.getArtifactId());
}
*/
- ArtifactRepository localArtifactRepository =
- new DefaultArtifactRepository( "local", "file://" + localRepository, new AssemblyRepositoryLayout() );
try
{
assemblyResolver.resolveTransitivelyFor( project, project.getArtifact(), project.getDependencies(),
- project.getRemoteArtifactRepositories(), localArtifactRepository,
+ project.getRemoteArtifactRepositories(), localRepository,
true );
}
catch ( ArtifactResolutionException e )
Modified: incubator/nmaven/branches/SI_GAC/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml?view=diff&rev=559007&r1=559006&r2=559007
==============================================================================
--- incubator/nmaven/branches/SI_GAC/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml (original)
+++ incubator/nmaven/branches/SI_GAC/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml Tue Jul 24 03:57:47 2007
@@ -1,10 +1,6 @@
<component-set>
<components>
<component>
- <role>org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout</role>
- <implementation>org.apache.maven.dotnet.artifact.AssemblyRepositoryLayout</implementation>
- </component>
- <component>
<role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
<role-hint>nar</role-hint>
<implementation>
Modified: incubator/nmaven/branches/SI_GAC/plugins/maven-deploy-plugin/src/main/java/org/apache/maven/dotnet/plugins/DeployFileMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/maven-deploy-plugin/src/main/java/org/apache/maven/dotnet/plugins/DeployFileMojo.java?view=diff&rev=559007&r1=559006&r2=559007
==============================================================================
--- incubator/nmaven/branches/SI_GAC/plugins/maven-deploy-plugin/src/main/java/org/apache/maven/dotnet/plugins/DeployFileMojo.java (original)
+++ incubator/nmaven/branches/SI_GAC/plugins/maven-deploy-plugin/src/main/java/org/apache/maven/dotnet/plugins/DeployFileMojo.java Tue Jul 24 03:57:47 2007
@@ -12,7 +12,6 @@
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.project.artifact.ProjectArtifactMetadata;
-import org.apache.maven.dotnet.artifact.AssemblyRepositoryLayout;
import java.io.File;
Modified: incubator/nmaven/branches/SI_GAC/plugins/maven-fxcop-plugin/src/main/java/org/apache/maven/dotnet/plugin/fxcop/FxCopAggregateMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/maven-fxcop-plugin/src/main/java/org/apache/maven/dotnet/plugin/fxcop/FxCopAggregateMojo.java?view=diff&rev=559007&r1=559006&r2=559007
==============================================================================
--- incubator/nmaven/branches/SI_GAC/plugins/maven-fxcop-plugin/src/main/java/org/apache/maven/dotnet/plugin/fxcop/FxCopAggregateMojo.java (original)
+++ incubator/nmaven/branches/SI_GAC/plugins/maven-fxcop-plugin/src/main/java/org/apache/maven/dotnet/plugin/fxcop/FxCopAggregateMojo.java Tue Jul 24 03:57:47 2007
@@ -4,12 +4,9 @@
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.MavenProject;
import org.apache.maven.dotnet.artifact.AssemblyResolver;
-import org.apache.maven.dotnet.artifact.AssemblyRepositoryLayout;
import org.apache.maven.dotnet.artifact.ArtifactType;
import org.apache.maven.dotnet.executable.ExecutionException;
import org.apache.maven.dotnet.PlatformUnsupportedException;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.DefaultArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.Artifact;
@@ -26,7 +23,6 @@
import java.util.Set;
import java.util.List;
import java.util.ArrayList;
-import java.util.HashSet;
/**
* @author Shane Isbell
@@ -77,7 +73,7 @@
* @parameter expression="${settings.localRepository}"
* @readonly
*/
- private String localRepository;
+ private File localRepository;
/**
* @parameter expression = "${project.build.directory}"
@@ -107,14 +103,10 @@
throw new MojoExecutionException("NMAVEN-000-000:");
}
-
- ArtifactRepository localArtifactRepository =
- new DefaultArtifactRepository( "local", "file://" + localRepository, new AssemblyRepositoryLayout() );
-
try
{
assemblyResolver.resolveTransitivelyFor( project, project.getArtifact(), aggregateDependencies,
- project.getRemoteArtifactRepositories(), localArtifactRepository,
+ project.getRemoteArtifactRepositories(), localRepository,
true );
}
catch ( ArtifactResolutionException e )
Modified: incubator/nmaven/branches/SI_GAC/plugins/maven-fxcop-plugin/src/main/java/org/apache/maven/dotnet/plugin/fxcop/FxCopMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/maven-fxcop-plugin/src/main/java/org/apache/maven/dotnet/plugin/fxcop/FxCopMojo.java?view=diff&rev=559007&r1=559006&r2=559007
==============================================================================
--- incubator/nmaven/branches/SI_GAC/plugins/maven-fxcop-plugin/src/main/java/org/apache/maven/dotnet/plugin/fxcop/FxCopMojo.java (original)
+++ incubator/nmaven/branches/SI_GAC/plugins/maven-fxcop-plugin/src/main/java/org/apache/maven/dotnet/plugin/fxcop/FxCopMojo.java Tue Jul 24 03:57:47 2007
@@ -4,12 +4,9 @@
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.dotnet.executable.ExecutionException;
import org.apache.maven.dotnet.PlatformUnsupportedException;
-import org.apache.maven.dotnet.artifact.AssemblyRepositoryLayout;
import org.apache.maven.dotnet.artifact.AssemblyResolver;
import org.apache.maven.dotnet.artifact.ArtifactType;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.DefaultArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.Artifact;
@@ -69,7 +66,7 @@
* @parameter expression="${settings.localRepository}"
* @readonly
*/
- private String localRepository;
+ private File localRepository;
/**
* @parameter expression = "${project.build.directory}"
@@ -96,12 +93,10 @@
rootDir = ( System.getProperty( "NMAVEN.ROOT_DIR" ) != null ) ? new File(
System.getProperty( "NMAVEN.ROOT_DIR" ) ) : null;
- ArtifactRepository localArtifactRepository =
- new DefaultArtifactRepository( "local", "file://" + localRepository, new AssemblyRepositoryLayout() );
try
{
assemblyResolver.resolveTransitivelyFor( project, project.getArtifact(), project.getDependencies(),
- project.getRemoteArtifactRepositories(), localArtifactRepository,
+ project.getRemoteArtifactRepositories(), localRepository,
true );
}
catch ( ArtifactResolutionException e )
Modified: incubator/nmaven/branches/SI_GAC/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.java?view=diff&rev=559007&r1=559006&r2=559007
==============================================================================
--- incubator/nmaven/branches/SI_GAC/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.java (original)
+++ incubator/nmaven/branches/SI_GAC/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.java Tue Jul 24 03:57:47 2007
@@ -28,7 +28,7 @@
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.dotnet.artifact.ArtifactContext;
import org.apache.maven.dotnet.artifact.ArtifactType;
-import org.apache.maven.dotnet.artifact.UacRepositoryLayout;
+import org.apache.maven.dotnet.artifact.PathUtil;
import org.apache.maven.dotnet.executable.NetExecutable;
import org.apache.maven.dotnet.executable.ExecutionException;
import org.apache.maven.dotnet.PlatformUnsupportedException;
@@ -188,8 +188,7 @@
artifact.getType().equals( ArtifactType.VISUAL_STUDIO_ADDIN.getPackagingType() ) ||
artifact.getType().equals( ArtifactType.SHARP_DEVELOP_ADDIN.getPackagingType() ) )
{
- File pab = new File( System.getProperty( "user.home" ),
- ".m2/pab/" + new UacRepositoryLayout().pathOf( artifact ) ).getParentFile();
+ File pab = PathUtil.getPrivateApplicationBaseFileFor( artifact, localRepository );
List<Dependency> dependencies = project.getDependencies();
try
{
@@ -240,7 +239,7 @@
try
{
- dao.storeProjectAndResolveDependencies( proj, new ArrayList<ArtifactRepository>() );
+ dao.storeProjectAndResolveDependencies( proj, null, new ArrayList<ArtifactRepository>() );
}
catch ( java.io.IOException e )
{
Modified: incubator/nmaven/branches/SI_GAC/plugins/maven-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/test/TesterMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/maven-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/test/TesterMojo.java?view=diff&rev=559007&r1=559006&r2=559007
==============================================================================
--- incubator/nmaven/branches/SI_GAC/plugins/maven-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/test/TesterMojo.java (original)
+++ incubator/nmaven/branches/SI_GAC/plugins/maven-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/test/TesterMojo.java Tue Jul 24 03:57:47 2007
@@ -37,7 +37,6 @@
import org.apache.maven.dotnet.executable.ExecutionException;
import org.apache.maven.dotnet.vendor.Vendor;
import org.apache.maven.dotnet.executable.CommandExecutor;
-import org.apache.maven.dotnet.artifact.AssemblyRepositoryLayout;
import org.apache.maven.dotnet.artifact.AssemblyResolver;
/**
@@ -105,7 +104,7 @@
* @parameter expression="${settings.localRepository}"
* @readonly
*/
- private String localRepository;
+ private File localRepository;
private String getExecutableFor( Vendor vendor, String home )
@@ -118,9 +117,10 @@
{
String finalName = project.getBuild().getFinalName();
List<String> commands = new ArrayList<String>();
- if(testAssemblyPath.startsWith( "/"))//nunit-console thinks *nix file format /home/user/ is an option due to / and fails.
+ if ( testAssemblyPath.startsWith(
+ "/" ) )//nunit-console thinks *nix file format /home/user/ is an option due to / and fails.
{
- testAssemblyPath = "/" + testAssemblyPath;
+ testAssemblyPath = "/" + testAssemblyPath;
}
commands.add( testAssemblyPath + File.separator + project.getArtifactId() + "-test.dll" );
@@ -157,16 +157,13 @@
if ( localRepository == null )
{
- localRepository = new File( System.getProperty( "user.home" ), ".m2/repository" ).getAbsolutePath();
+ localRepository = new File( System.getProperty( "user.home" ), ".m2/repository" );
}
- ArtifactRepository localArtifactRepository =
- new DefaultArtifactRepository( "local", "file://" + localRepository, new AssemblyRepositoryLayout() );
try
{
assemblyResolver.resolveTransitivelyFor( project, project.getArtifact(), project.getDependencies(),
- project.getRemoteArtifactRepositories(), localArtifactRepository,
- true );
+ project.getRemoteArtifactRepositories(), localRepository, true );
}
catch ( ArtifactResolutionException e )
{
@@ -182,7 +179,7 @@
for ( Artifact artifact : artifacts )
{
- if(artifact.getType().startsWith( "gac"))
+ if ( artifact.getType().startsWith( "gac" ) )
{
continue;
}
Modified: incubator/nmaven/branches/SI_GAC/plugins/maven-webapp-plugin/src/main/java/org/apache/maven/dotnet/plugin/webapp/NetAchiverMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/maven-webapp-plugin/src/main/java/org/apache/maven/dotnet/plugin/webapp/NetAchiverMojo.java?view=diff&rev=559007&r1=559006&r2=559007
==============================================================================
--- incubator/nmaven/branches/SI_GAC/plugins/maven-webapp-plugin/src/main/java/org/apache/maven/dotnet/plugin/webapp/NetAchiverMojo.java (original)
+++ incubator/nmaven/branches/SI_GAC/plugins/maven-webapp-plugin/src/main/java/org/apache/maven/dotnet/plugin/webapp/NetAchiverMojo.java Tue Jul 24 03:57:47 2007
@@ -55,25 +55,6 @@
/**
* Used to look up Artifacts in the remote repository.
*
- * @parameter expression="${component.org.apache.maven.artifact.resolver.ArtifactResolver}"
- * @required
- * @readonly
- */
- protected org.apache.maven.artifact.resolver.ArtifactResolver resolver;
-
- /**
- * Used to look up Artifacts in the remote repository.
- *
- * @parameter expression="${component.org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout}"
- * @role-hint default
- * @required
- * @readonly
- */
- protected org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout layout;
-
- /**
- * Used to look up Artifacts in the remote repository.
- *
* @parameter expression="${component.org.apache.maven.artifact.metadata.ArtifactMetadataSource}"
* @required
* @readonly
Modified: incubator/nmaven/branches/SI_GAC/plugins/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/pom.xml?view=diff&rev=559007&r1=559006&r2=559007
==============================================================================
--- incubator/nmaven/branches/SI_GAC/plugins/pom.xml (original)
+++ incubator/nmaven/branches/SI_GAC/plugins/pom.xml Tue Jul 24 03:57:47 2007
@@ -43,7 +43,6 @@
<module>maven-link-plugin</module>
<module>maven-mojo-generator-plugin</module>
<module>maven-resgen-plugin</module>
- <module>maven-repository-plugin</module>
<module>maven-resolver-plugin</module>
<module>maven-test-plugin</module>
<module>maven-vsinstaller-plugin</module>