Author: brett
Date: Thu Jan 12 05:37:07 2012
New Revision: 1230403
URL: http://svn.apache.org/viewvc?rev=1230403&view=rev
Log:
remove unused method
Modified:
incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/ArtifactInstaller.java
incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/impl/ArtifactInstallerImpl.java
Modified:
incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/ArtifactInstaller.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/ArtifactInstaller.java?rev=1230403&r1=1230402&r2=1230403&view=diff
==============================================================================
---
incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/ArtifactInstaller.java
(original)
+++
incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/ArtifactInstaller.java
Thu Jan 12 05:37:07 2012
@@ -20,8 +20,8 @@ package npanday.artifact;
*/
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.installer.ArtifactInstallationException;
+import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.model.Dependency;
import org.apache.maven.project.MavenProject;
@@ -54,7 +54,7 @@ public interface ArtifactInstaller
*
* @param artifact the artifact to install
* @param pomFile the pom file of the installed artifact
- * @param modifyProjectMetadata
+ * @param modifyProjectMetadata (unused)
* @throws ArtifactInstallationException if there is a problem installing
the artifact
*/
void installArtifactWithPom( Artifact artifact, File pomFile, boolean
modifyProjectMetadata )
@@ -85,28 +85,15 @@ public interface ArtifactInstaller
* @param netDependencies additional .NET artifacts to resolve and
install.
* @param javaDependencies the Java Dependencies to resolve. Typically
these should be the java bindings for the
* .NET plugins.
- * @param project
+ * @param project project to resolve relaative to
* @throws IOException if there is a problem with installation
+ * @throws NPandayArtifactResolutionException if there is a problem with
the resolution
*/
void resolveAndInstallNetDependenciesForProfile( String profile,
List<Dependency> netDependencies,
List<Dependency>
javaDependencies, MavenProject project )
throws IOException, NPandayArtifactResolutionException;
/**
- * Installs both the artifact and all of its dependencies into the private
application base.
- *
- *
- * @param applicationBase the root directory of the private application
base
- * @param artifact the artifact to install
- * @param dependencies the dependencies to install
- * @param outputDir
- * @throws IOException if there is a problem installing any of the
artifacts into the private application base
- */
- void installArtifactAndDependenciesIntoPrivateApplicationBase( File
applicationBase, Artifact artifact,
-
List<Dependency> dependencies, File outputDir )
- throws IOException;
-
- /**
* Initializes the installer.
*
* @param artifactContext the artifact context associated with
this installer
Modified:
incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/impl/ArtifactInstallerImpl.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/impl/ArtifactInstallerImpl.java?rev=1230403&r1=1230402&r2=1230403&view=diff
==============================================================================
---
incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/impl/ArtifactInstallerImpl.java
(original)
+++
incubator/npanday/trunk/components/dotnet-artifact/src/main/java/npanday/artifact/impl/ArtifactInstallerImpl.java
Thu Jan 12 05:37:07 2012
@@ -39,7 +39,6 @@ import org.apache.maven.artifact.reposit
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolver;
-import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
@@ -209,55 +208,6 @@ public class ArtifactInstallerImpl
}
/**
- * TODO: this should be able to be removed - we're relying on copy
side-effects of getDotNetArtifact
- */
- public void installArtifactAndDependenciesIntoPrivateApplicationBase( File
localRepository, Artifact artifact,
-
List<Dependency> dependencies,
- File
outputDir )
- throws IOException
- {
-
- for ( Dependency dependency : dependencies )
- {
-
- String scope = ( dependency.getScope() == null ) ?
Artifact.SCOPE_COMPILE : dependency.getScope();
- Artifact artifactDependency =
artifactFactory.createDependencyArtifact( dependency.getGroupId(),
-
dependency.getArtifactId(),
-
VersionRange.createFromVersion(
-
dependency.getVersion() ),
-
dependency.getType(),
-
dependency.getClassifier(), scope,
-
null );
-
- File artifactDependencyFile = PathUtil.getDotNetArtifact(
artifactDependency , localRepository, outputDir );
-
- if ( artifactDependencyFile == null ||
!artifactDependencyFile.exists() )
- {
- if (!ArtifactTypeHelper.isDotnetAnyGac(
artifactDependency.getType() ))
- {
- logger.warn( "NPANDAY-000-017: Could not find artifact
dependency to copy in local repository: Artifact ID = " +
- artifactDependency.getId() + ", File Path = " +
- ( ( artifactDependencyFile != null ) ?
artifactDependencyFile.getAbsolutePath() : null ) );
- }
- continue;
- }
-
- artifactDependency.setFile( artifactDependencyFile );
- }
-
- if ( artifact != null )
- {
- File artifactFile = artifact.getFile();
- if ( artifactFile == null || !artifactFile.exists() )
- {
- throw new IOException( "NPANDAY-001-016: Could not find
artifact: Artifact ID = " +
- artifact.getArtifactId() + ", Path = " +
- ( ( artifactFile != null ) ?
artifactFile.getAbsolutePath() : null ) );
- }
- }
- }
-
- /**
* @see
npanday.artifact.ArtifactInstaller#installArtifactWithPom(org.apache.maven.artifact.Artifact,java.io.File,boolean)
*/
public void installArtifactWithPom( Artifact artifact, File pomFile,
boolean modifyProjectMetadata )
