Author: sisbell
Date: Fri May 11 01:12:14 2007
New Revision: 537126
URL: http://svn.apache.org/viewvc?view=rev&rev=537126
Log:
Small cleanup ofAPI.
Modified:
incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/AssemblyResolver.java
incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/AssemblyResolverImpl.java
incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java
Modified:
incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/AssemblyResolver.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/AssemblyResolver.java?view=diff&rev=537126&r1=537125&r2=537126
==============================================================================
---
incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/AssemblyResolver.java
(original)
+++
incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/AssemblyResolver.java
Fri May 11 01:12:14 2007
@@ -25,7 +25,6 @@
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
-import java.io.File;
import java.util.List;
/**
@@ -48,7 +47,7 @@
* @param sourceArtifact the artifact to which the resolved
dependencies belong
* @param dependencies the list of dependencies of the specified
artifact
* @param remoteArtifactRepositories
- * @param localRepositoryPath the path of the local Maven repository
+ * @param localArtifactRepository
* @param addResolvedDependenciesToProject
* true, if the resolved dependencies should be
added the the specified
* maven project, otherwise false. This value
should be set to false if it is resolving
@@ -59,7 +58,7 @@
* @throws ArtifactNotFoundException
*/
void resolveTransitivelyFor( MavenProject project, Artifact
sourceArtifact, List<Dependency> dependencies,
- List<ArtifactRepository>
remoteArtifactRepositories, String localRepositoryPath,
+ List<ArtifactRepository>
remoteArtifactRepositories, ArtifactRepository localArtifactRepository,
boolean addResolvedDependenciesToProject )
throws ArtifactResolutionException, ArtifactNotFoundException;
}
Modified:
incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java?view=diff&rev=537126&r1=537125&r2=537126
==============================================================================
---
incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
(original)
+++
incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
Fri May 11 01:12:14 2007
@@ -158,8 +158,11 @@
matchPolicies.add( new ProfileMatchPolicy( profile ) );
dependencies.addAll( repository.getDependenciesFor( matchPolicies ) );
+ ArtifactRepository localArtifactRepository =
+ new DefaultArtifactRepository( "local", "file://" +
localRepository, new AssemblyRepositoryLayout() );
+
assemblyResolver.resolveTransitivelyFor( project,
project.getArtifact(), dependencies,
- remoteArtifactRepositories,
localRepository.getAbsolutePath(), false );
+ remoteArtifactRepositories,
localArtifactRepository, false );
//Do Library Installs for Net Dependencies
matchPolicies = new ArrayList<NetDependencyMatchPolicy>();
Modified:
incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/AssemblyResolverImpl.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/AssemblyResolverImpl.java?view=diff&rev=537126&r1=537125&r2=537126
==============================================================================
---
incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/AssemblyResolverImpl.java
(original)
+++
incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/AssemblyResolverImpl.java
Fri May 11 01:12:14 2007
@@ -32,7 +32,6 @@
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.DefaultArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
-import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.model.Dependency;
@@ -42,7 +41,6 @@
import java.util.Set;
import java.util.HashSet;
import java.util.List;
-import java.util.ArrayList;
import java.io.File;
@@ -99,7 +97,7 @@
* @see AssemblyResolver#resolveTransitivelyFor
*/
public void resolveTransitivelyFor( MavenProject project, Artifact
sourceArtifact, List<Dependency> dependencies,
- List<ArtifactRepository>
remoteArtifactRepositories, String localRepositoryPath,
+ List<ArtifactRepository>
remoteArtifactRepositories, ArtifactRepository localArtifactRepository,
boolean
addResolvedDependenciesToProject )
throws ArtifactResolutionException, ArtifactNotFoundException
{
@@ -128,14 +126,9 @@
artifactDependencies.add( artifact );
}
}
- //ArtifactRepository remoteArtifactRepository = new
DefaultArtifactRepository( "nmaven",
- //
"http://localhost:8080/repository";,
- //
new DefaultRepositoryLayout() );
- // ArrayList remoteReps = new ArrayList();
- // remoteReps.add( remoteArtifactRepository );
ArtifactRepository localArtifactRepository =
- new DefaultArtifactRepository( "local", "file://" +
localRepositoryPath, new AssemblyRepositoryLayout() );
+ new DefaultArtifactRepository( "local", "file://" +
localArtifactRepository, new AssemblyRepositoryLayout() );
ArtifactResolutionResult result = resolver.resolveTransitively(
artifactDependencies, sourceArtifact,
localArtifactRepository,
remoteArtifactRepositories,
@@ -148,7 +141,7 @@
for ( Artifact artifact : resolvedDependencies )
{
File orginalFileWithVersion = artifact.getFile();
- orginalFileWithVersion.renameTo( new File( localRepositoryPath
+ "/" + layout.pathOf( artifact ) ) );
+ orginalFileWithVersion.renameTo( new File(
localArtifactRepository + "/" + layout.pathOf( artifact ) ) );
}
resolvedDependencies.addAll( gacDependencies );
Modified:
incubator/nmaven/branches/SI_XPT/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_XPT/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java?view=diff&rev=537126&r1=537125&r2=537126
==============================================================================
---
incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java
(original)
+++
incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java
Fri May 11 01:12:14 2007
@@ -23,10 +23,13 @@
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;
@@ -87,15 +90,14 @@
{
long startTime = System.currentTimeMillis();
- if(localRepository == null)
- {
- localRepository = new File(System.getProperty("user.home"),
".m2/repository").getAbsolutePath();
- }
+ ArtifactRepository localArtifactRepository =
+ new DefaultArtifactRepository( "local", "file://" +
localRepositoryPath, new AssemblyRepositoryLayout() );
try
{
- assemblyResolver.resolveTransitivelyFor( project,
project.getArtifact(), project.getDependencies(),
project.getRemoteArtifactRepositories(),
- localRepository, true );
+ assemblyResolver.resolveTransitivelyFor( project,
project.getArtifact(), project.getDependencies(),
+
project.getRemoteArtifactRepositories(), localArtifactRepository,
+ true );
}
catch ( ArtifactResolutionException e )
{
@@ -116,6 +118,6 @@
}
long endTime = System.currentTimeMillis();
- getLog().info( "Mojo Execution Time = " + (endTime - startTime));
+ getLog().info( "Mojo Execution Time = " + ( endTime - startTime ) );
}
}
