svn commit: r220314 - in /maven/components/trunk: maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/ maven-plugins/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/ maven-project/src/main/java/org/apache/maven/project/ ma...

[brett]

Author: brett
Date: Fri Jul 22 05:50:26 2005
New Revision: 220314

URL: http://svn.apache.org/viewcvs?rev=220314&view=rev
Log:
TODOs and cleanup

Modified:
    
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/InstallTask.java
    
maven/components/trunk/maven-plugins/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
    
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
    
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java

Modified: 
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/InstallTask.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/InstallTask.java?rev=220314&r1=220313&r2=220314&view=diff
==============================================================================
--- 
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/InstallTask.java
 (original)
+++ 
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/InstallTask.java
 Fri Jul 22 05:50:26 2005
@@ -17,7 +17,6 @@
  */
 
 import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.installer.ArtifactInstallationException;
 import org.apache.maven.artifact.installer.ArtifactInstaller;
 import org.apache.maven.artifact.metadata.ArtifactMetadata;

Modified: 
maven/components/trunk/maven-plugins/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java?rev=220314&r1=220313&r2=220314&view=diff
==============================================================================
--- 
maven/components/trunk/maven-plugins/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
 (original)
+++ 
maven/components/trunk/maven-plugins/maven-install-plugin/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
 Fri Jul 22 05:50:26 2005
@@ -17,7 +17,6 @@
  */
 
 import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.DefaultArtifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.installer.ArtifactInstallationException;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -79,6 +78,7 @@
     public void execute()
         throws MojoExecutionException
     {
+        // TODO: validate
         // TODO: maybe not strictly correct, while we should enfore that 
packaging has a type handler of the same id, we don't
         Artifact artifact = artifactFactory.createArtifact( groupId, 
artifactId, version, null, packaging );
 

Modified: 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=220314&r1=220313&r2=220314&view=diff
==============================================================================
--- 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
 (original)
+++ 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
 Fri Jul 22 05:50:26 2005
@@ -615,7 +615,7 @@
                 version = p.getVersion();
             }
 
-            Artifact artifact = null;
+            Artifact artifact;
             try
             {
                 artifact = artifactFactory.createPluginArtifact( 
p.getGroupId(), p.getArtifactId(),

Modified: 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?rev=220314&r1=220313&r2=220314&view=diff
==============================================================================
--- 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
 (original)
+++ 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
 Fri Jul 22 05:50:26 2005
@@ -122,6 +122,8 @@
 
         try
         {
+            // TODO: we could possibly use p.getDependencyArtifacts instead, 
but they haven't been filtered or used the
+            // scope (should that be passed to the buildFromRepository method 
above?
             Set artifacts = createArtifacts( artifactFactory, 
p.getDependencies(), artifact.getScope(),
                                              artifact.getDependencyFilter() );
 
@@ -143,6 +145,7 @@
         {
             Dependency d = (Dependency) i.next();
 
+            // TODO: validate
             VersionRange versionRange = VersionRange.createFromVersionSpec( 
d.getVersion() );
             Artifact artifact = artifactFactory.createDependencyArtifact( 
d.getGroupId(), d.getArtifactId(),
                                                                           
versionRange, d.getType(), d.getScope(),



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]